diff --git a/AtlasTest/DatabaseTest/IOVDbTestAlg/src/IOVDbTestCoolDCS.cxx b/AtlasTest/DatabaseTest/IOVDbTestAlg/src/IOVDbTestCoolDCS.cxx
index 3cf49e3caef06ee4d3cb2348976d6ef877d655e7..35f1426a15ba2d8efe35d05235df5405ed8e69b0 100755
--- a/AtlasTest/DatabaseTest/IOVDbTestAlg/src/IOVDbTestCoolDCS.cxx
+++ b/AtlasTest/DatabaseTest/IOVDbTestAlg/src/IOVDbTestCoolDCS.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 // IOVDbTestCoolDCS.cxx
@@ -50,7 +50,7 @@ StatusCode IOVDbTestCoolDCS::execute() {
   }
 
   // print all the AthenaAttributeList
-  const AthenaAttributeList* atrlist;
+  const AthenaAttributeList* atrlist = nullptr;;
   for (std::vector<std::string>::const_iterator itr=m_par_atrlist.begin();
        itr!=m_par_atrlist.end();++itr) {
     if (StatusCode::SUCCESS==detStore()->retrieve(atrlist,*itr)) {
diff --git a/Build/AtlasBuildScripts/checkout_atlasexternals.sh b/Build/AtlasBuildScripts/checkout_atlasexternals.sh
index 144719018741dfc5357f2c46694ba84d4e47cdff..ed81eb02514d8766140f0bcbc53f4f72cde5e9ff 100755
--- a/Build/AtlasBuildScripts/checkout_atlasexternals.sh
+++ b/Build/AtlasBuildScripts/checkout_atlasexternals.sh
@@ -23,8 +23,8 @@ usage() {
     echo "  AtlasExternals_URL and AtlasExternals_REF to override"
     echo "  other values (even those on the command line)."
     echo "  If AtlasExternals_URL is set to 'current' then"
-	echo "  no clone or checkout is done and the working copy"
-	echo "  in the source directory is left untouched."
+    echo "  no clone or checkout is done and the working copy"
+    echo "  in the source directory is left untouched."
 }
 
 _max_retry_=5
@@ -46,7 +46,7 @@ _retry_ () {
 # Parse the command line arguments:
 TAGBRANCH=""
 SOURCEDIR=""
-EXTERNALSURL="https://:@gitlab.cern.ch:8443/atlas/atlasexternals.git"
+EXTERNALSURL="https://gitlab.cern.ch/atlas/atlasexternals.git"
 while getopts ":t:o:s:e:h" opt; do
     case $opt in
         t)
diff --git a/Control/AthLinksSA/AthLinks/ElementLink.h b/Control/AthLinksSA/AthLinks/ElementLink.h
index 6793225b3379ab784b1597403f82f99ef8c25b31..e5b9d36f5f9325e7f41ed2fac2cd9a9fe4f2e57b 100644
--- a/Control/AthLinksSA/AthLinks/ElementLink.h
+++ b/Control/AthLinksSA/AthLinks/ElementLink.h
@@ -154,6 +154,11 @@ public:
    /// Get the key that we reference, as a hash
    sgkey_t key() const { return persKey(); }
 
+   /// Comparison operator
+   bool operator==( const ElementLink& rhs ) const;
+   /// Comparison operator
+   bool operator!=( const ElementLink& rhs ) const;
+
    /// Get a reference to the object in question
    ElementConstReference operator*() const;
 
diff --git a/Control/AthLinksSA/AthLinks/ElementLink.icc b/Control/AthLinksSA/AthLinks/ElementLink.icc
index da4ef6b421cc4f037a65ed9705527674eeb406c2..56357d164e7aafd8ef3a0218b10a98bbd3b744a8 100644
--- a/Control/AthLinksSA/AthLinks/ElementLink.icc
+++ b/Control/AthLinksSA/AthLinks/ElementLink.icc
@@ -381,6 +381,18 @@ ElementLink< STORABLE >::dataID() const {
    return m_event->getName( persKey() );
 }
 
+template< typename STORABLE >
+bool ElementLink< STORABLE >::operator==( const ElementLink& rhs ) const {
+
+   return ( ( key() == rhs.key() ) && ( index() == rhs.index() ) );
+}
+
+template< typename STORABLE >
+bool ElementLink< STORABLE >::operator!=( const ElementLink& rhs ) const {
+
+   return ( ! ( *this == rhs ) );
+}
+
 template< typename STORABLE >
 typename ElementLink< STORABLE >::ElementConstReference
 ElementLink< STORABLE >::operator*() const {
diff --git a/Control/AthLinksSA/AthLinks/ElementLinkVector.h b/Control/AthLinksSA/AthLinks/ElementLinkVector.h
index f3a32b0cd0c379c46fb62cdefc69bb91abd443c1..051f57a9cd2aacd3fadde4499b0b319339b7a0cc 100644
--- a/Control/AthLinksSA/AthLinks/ElementLinkVector.h
+++ b/Control/AthLinksSA/AthLinks/ElementLinkVector.h
@@ -79,6 +79,11 @@ public:
    /// Assignment operator
    ElemLinkVec& operator=( const ElemLinkVec& rhs );
 
+   /// Comparison operator
+   bool operator==( const ElementLinkVector& rhs ) const;
+   /// Comparison operator
+   bool operator!=( const ElementLinkVector& rhs ) const;   
+
    /// @name Vector iterator functions
    /// @{
 
diff --git a/Control/AthLinksSA/AthLinks/ElementLinkVector.icc b/Control/AthLinksSA/AthLinks/ElementLinkVector.icc
index 2fc137a491641b295be211a3536973f722a9b98a..9767c09ee2244f55f35447795b6d52a458bf4505 100644
--- a/Control/AthLinksSA/AthLinks/ElementLinkVector.icc
+++ b/Control/AthLinksSA/AthLinks/ElementLinkVector.icc
@@ -51,6 +51,28 @@ ElementLinkVector< CONTAINER >::operator=( const ElemLinkVec& rhs ) {
    return *this;
 }
 
+template< class CONTAINER >
+bool ElementLinkVector< CONTAINER >::
+operator==( const ElementLinkVector& rhs ) const {
+
+   if( m_elVec.size() != rhs.m_elVec.size() ) {
+      return false;
+   }
+   for( std::size_t i = 0; i < m_elVec.size(); ++i ) {
+      if( m_elVec[ i ] != rhs.m_elVec[ i ] ) {
+         return false;
+      }
+   }
+   return true;
+}
+
+template< class CONTAINER >
+bool ElementLinkVector< CONTAINER >::
+operator!=( const ElementLinkVector& rhs ) const {
+
+   return ( ! ( *this == rhs ) );
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 //
 //              Implementation of the vector capacity functions
diff --git a/Control/AthToolSupport/AsgTools/AsgTools/AnaToolHandle.h b/Control/AthToolSupport/AsgTools/AsgTools/AnaToolHandle.h
index 19f5b17a73d452e7f3f7378fe7b5039a51cf64b5..01f1ee11b47375653fb6abe80435853160515c84 100644
--- a/Control/AthToolSupport/AsgTools/AsgTools/AnaToolHandle.h
+++ b/Control/AthToolSupport/AsgTools/AsgTools/AnaToolHandle.h
@@ -1,3 +1,7 @@
+// Dear emacs, this is -*- c++ -*-
+//
+// Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+//
 #ifndef ASG_TOOLS__ANA_TOOL_HANDLE_H
 #define ASG_TOOLS__ANA_TOOL_HANDLE_H
 
@@ -24,7 +28,7 @@
 
 namespace asg
 {
-#ifdef ROOTCORE
+#ifdef XAOD_STANDALONE
    typedef INamedInterface parentType_t;
    typedef IAsgTool interfaceType_t;
 #else
@@ -99,7 +103,7 @@ namespace asg
     public:
       virtual ~AnaToolProperty () noexcept = default;
 
-#ifdef ROOTCORE
+#ifdef XAOD_STANDALONE
       /// \brief apply the property to the given tool in RootCore
       /// \par Guarantee
       ///   basic
@@ -114,7 +118,7 @@ namespace asg
 	const = 0;
 #endif
 
-#ifndef ROOTCORE
+#ifndef XAOD_STANDALONE
       /// \brief store the property in the configuration service in
       /// Athena
       /// \par Guarantee
@@ -171,7 +175,7 @@ namespace asg
     public:
       void setType (std::string type) noexcept;
 
-#ifdef ROOTCORE
+#ifdef XAOD_STANDALONE
       /// \brief register the new of the given type as factory
       ///
       /// If this is set, it is used instead of \ref type to allocate
@@ -206,7 +210,7 @@ namespace asg
       setProperty (const std::string& val_name,
 		   const AnaToolHandle<Type>& val_value);
 
-#ifndef ROOTCORE
+#ifndef XAOD_STANDALONE
       /// \copydoc setProperty
     public:
       template<typename Type> StatusCode
@@ -264,7 +268,7 @@ namespace asg
                     AnaToolCleanup& cleanup) const;
 
 
-#ifndef ROOTCORE
+#ifndef XAOD_STANDALONE
       /// \brief store the properties in the configuration service in
       /// Athena
       /// \par Guarantee
@@ -296,7 +300,7 @@ namespace asg
       std::map<std::string,std::shared_ptr<AnaToolProperty> > m_properties;
 
 
-#ifdef ROOTCORE
+#ifdef XAOD_STANDALONE
       /// \brief create, configure and initialize the tool (in
       /// RootCore)
       /// \par Guarantee
@@ -310,7 +314,7 @@ namespace asg
 #endif
 
 
-#ifdef ROOTCORE
+#ifdef XAOD_STANDALONE
       /// \brief allocate the tool
       /// \par Guarantee
       ///   basic
@@ -610,7 +614,7 @@ namespace asg
   public:
     void setType (std::string val_type) noexcept;
 
-#ifdef ROOTCORE
+#ifdef XAOD_STANDALONE
     /// \brief set the value of \ref type and a factory based on the
     /// standard tool constructor
     ///
@@ -855,7 +859,7 @@ namespace asg
   //   ToolHandle<T>& handle () {
   //     return *m_handleUser;};
 
-#ifdef ROOTCORE
+#ifdef XAOD_STANDALONE
   public:
     template<class T2>
     ASG_DEPRECATED ("please use setTypeRegisterNew() instead")
@@ -990,7 +994,7 @@ namespace asg
   (ASG_SET_ANA_TOOL_TYPE(handle,type), StatusCode (StatusCode::SUCCESS))
 
 /// \brief set the tool type on the tool handle, using new in rootcore
-#ifdef ROOTCORE
+#ifdef XAOD_STANDALONE
 #define ASG_SET_ANA_TOOL_TYPE(handle,type)	\
   (handle).template setTypeRegisterNew<type> (#type)
 #else
diff --git a/Control/AthToolSupport/AsgTools/AsgTools/AnaToolHandle.icc b/Control/AthToolSupport/AsgTools/AsgTools/AnaToolHandle.icc
index 5a0606fb034d56323a81af9439e9982fe7150e41..6478617a39ec8277f9de6bd857d73a1f2742bb0f 100644
--- a/Control/AthToolSupport/AsgTools/AsgTools/AnaToolHandle.icc
+++ b/Control/AthToolSupport/AsgTools/AsgTools/AnaToolHandle.icc
@@ -1,8 +1,15 @@
+// Dear emacs, this is -*- c++ -*-
+//
+// Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+//
+#ifndef ASGTOOLS_ANATOOLHANDLE_ICC
+#define ASGTOOLS_ANATOOLHANDLE_ICC
+
 #include <AsgTools/MessageCheck.h>
 #include <assert.h>
 #include <cstdlib>
 
-#ifndef ROOTCORE
+#ifndef XAOD_STANDALONE
 #include "GaudiKernel/IJobOptionsSvc.h"
 #endif
 
@@ -11,7 +18,7 @@ namespace asg
 {
   namespace detail
   {
-#ifdef ROOTCORE
+#ifdef XAOD_STANDALONE
     StatusCode makeToolRootCore (const std::string& type,
 				 const std::string& name,
 				 AsgTool*& tool);
@@ -37,7 +44,7 @@ namespace asg
     {
       using namespace msgUserCode;
 
-#ifdef ROOTCORE
+#ifdef XAOD_STANDALONE
       to = ToolHandle<T1> (dynamic_cast<T1*>(&*from));
       if (!from.empty() && &*to == nullptr)
       {
@@ -166,7 +173,7 @@ namespace asg
 
 
 
-#ifndef ROOTCORE
+#ifndef XAOD_STANDALONE
     /// \brief manage a single property in the job options service
 
     struct PropertyValueManager
@@ -218,7 +225,7 @@ namespace asg
 
 
 
-#ifdef ROOTCORE
+#ifdef XAOD_STANDALONE
     /// \brief a \ref AnaToolProperty containing a regular value in
     /// RootCore
 
@@ -261,7 +268,7 @@ namespace asg
 	: m_config (val_config)
       {}
 
-#ifdef ROOTCORE
+#ifdef XAOD_STANDALONE
     public:
       virtual StatusCode
       applyPropertyRootCore (AsgTool& tool, const std::string& name,
@@ -278,7 +285,7 @@ namespace asg
       }
 #endif
 
-#ifndef ROOTCORE
+#ifndef XAOD_STANDALONE
     private:
       virtual StatusCode
       applyPropertyAthena (const std::string& toolName,
@@ -310,7 +317,7 @@ namespace asg
 
 
 
-#ifndef ROOTCORE
+#ifndef XAOD_STANDALONE
     /// \brief a \ref AnaToolProperty copying a tool configuration
     /// from the job options service to a new place
 
@@ -353,7 +360,7 @@ namespace asg
 	: m_name (val_name), m_config (val_config)
       {}
 
-#ifdef ROOTCORE
+#ifdef XAOD_STANDALONE
     public:
       virtual StatusCode
       applyPropertyRootCore (AsgTool& tool, const std::string& name,
@@ -372,7 +379,7 @@ namespace asg
       }
 #endif
 
-#ifndef ROOTCORE
+#ifndef XAOD_STANDALONE
     private:
       virtual StatusCode
       applyPropertyAthena (const std::string& toolName,
@@ -412,7 +419,7 @@ namespace asg
 
 
 
-#ifdef ROOTCORE
+#ifdef XAOD_STANDALONE
     template<typename Type> void AnaToolConfig ::
     registerNew ()
     {
@@ -423,7 +430,7 @@ namespace asg
 
 
 
-#ifdef ROOTCORE
+#ifdef XAOD_STANDALONE
     template<typename Type> StatusCode AnaToolConfig ::
     setProperty (const std::string& val_name, const Type& val_value)
     {
@@ -484,7 +491,7 @@ namespace asg
 
 
 
-#ifndef ROOTCORE
+#ifndef XAOD_STANDALONE
     template<typename Type> StatusCode AnaToolConfig ::
     setProperty (const std::string& val_name,
 		 const ToolHandle<Type>& val_value)
@@ -551,7 +558,7 @@ namespace asg
       ANA_CHECK (makeBaseTool (name, parent, baseTH, baseCleanup));
       ANA_CHECK (toolHandleCast (th, baseTH));
       cleanup.swap (baseCleanup);
-#ifndef ROOTCORE
+#ifndef XAOD_STANDALONE
       baseTH->release ();
 #endif
       return StatusCode::SUCCESS;
@@ -577,10 +584,6 @@ namespace asg
     // General requirements
     CHECK_INVARIANT (&*this != nullptr);
     CHECK_INVARIANT (m_handleUser != nullptr);
-    // CHECK_INVARIANT (m_parentPtr == nullptr || m_parentPtr->name() == m_parentName);
-    // #ifndef ROOTCORE
-    // CHECK_INVARIANT (m_parentPtr == m_handleUser->parent());
-    // #endif
 
 #undef CHECK_INVARIANT
   }
@@ -630,7 +633,7 @@ namespace asg
       m_cleanup = that.m_cleanup;
     }
 
-#ifndef ROOTCORE
+#ifndef XAOD_STANDALONE
     if (!m_handleUser->empty())
       (*m_handleUser)->release();
 #endif
@@ -668,7 +671,7 @@ namespace asg
     std::swap (m_parentPtr, that.m_parentPtr);
     {
       ToolHandle<T> tmp = *m_handleUser;
-#ifndef ROOTCORE
+#ifndef XAOD_STANDALONE
       if (!tmp.empty())
         tmp->release();
 #endif
@@ -827,7 +830,7 @@ namespace asg
     case detail::AnaToolHandleMode::RETRIEVE_SHARED:
       assert (sharedTool != nullptr);
       ANA_CHECK (detail::toolHandleCast (th, sharedTool->th()));
-#ifndef ROOTCORE
+#ifndef XAOD_STANDALONE
       if (!th.empty())
         th->release ();
 #endif
@@ -847,7 +850,7 @@ namespace asg
     ANA_CHECK (makeToolRetrieve (toolPtr, th));
 
     *m_handleUser = th;
-#ifndef ROOTCORE
+#ifndef XAOD_STANDALONE
     if (!th.empty())
       th->release ();
 #endif
@@ -1024,7 +1027,7 @@ namespace asg
 
 
 
-#ifdef ROOTCORE
+#ifdef XAOD_STANDALONE
   template <class T> template <class T2> void AnaToolHandle<T> ::
   setTypeRegisterNew (std::string val_type)
   {
@@ -1068,7 +1071,7 @@ namespace asg
 #ifndef NDEBUG
     this->testInvariant ();
 #endif
-#ifndef ROOTCORE
+#ifndef XAOD_STANDALONE
     return m_handleUser->parentName() + "." + name();
 #else
     std::string toolName;
@@ -1099,7 +1102,7 @@ namespace asg
         m_handleUser->typeAndName() != m_originalTypeAndName)
       return detail::AnaToolHandleMode::USER;
 
-#ifdef ROOTCORE
+#ifdef XAOD_STANDALONE
     if (!m_parentName.empty())
     {
       if (m_handleUser->parentName() != m_parentName)
@@ -1116,14 +1119,14 @@ namespace asg
       if ((sharedTool = detail::AnaToolShareList::singleton()
 	     .getShare (fullName())))
 	return detail::AnaToolHandleMode::RETRIEVE_SHARED;
-#ifdef ROOTCORE
+#ifdef XAOD_STANDALONE
       /// \todo check whether this is actually what we want to do
       if (ToolStore::contains<T> (m_handleUser->name()))
 	return detail::AnaToolHandleMode::USER;
 #endif
     }
 
-#ifndef ROOTCORE
+#ifndef XAOD_STANDALONE
     //for athena, all we do here is check if the tool already exists
     interfaceType_t *tool = nullptr;
     if( detail::toolExists( fullName(), tool ) )
@@ -1349,3 +1352,5 @@ namespace asg
     m_allowEmpty = val_allowEmpty;
   }
 }
+
+#endif // ASGTOOLS_ANATOOLHANDLE_ICC
diff --git a/Control/AthToolSupport/AsgTools/AsgTools/IMessagePrinter.h b/Control/AthToolSupport/AsgTools/AsgTools/IMessagePrinter.h
index 568b18c19c361ff3de3ecefae2ce506675f19918..d98e80b9e6c0213e37af7ff1ef82686633b1f846 100644
--- a/Control/AthToolSupport/AsgTools/AsgTools/IMessagePrinter.h
+++ b/Control/AthToolSupport/AsgTools/AsgTools/IMessagePrinter.h
@@ -1,3 +1,7 @@
+// Dear emacs, this is -*- c++ -*-
+//
+// Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+//
 #ifndef ASG_TOOLS__I_MESSAGE_PRINTER_H
 #define ASG_TOOLS__I_MESSAGE_PRINTER_H
 
@@ -14,7 +18,7 @@
 #include <AsgTools/MsgLevel.h>
 #include <sstream>
 
-#ifdef ROOTCORE
+#ifdef XAOD_STANDALONE
 
 namespace asg
 {
diff --git a/Control/AthToolSupport/AsgTools/AsgTools/MessageCheck.h b/Control/AthToolSupport/AsgTools/AsgTools/MessageCheck.h
index 26f279c47dc6df6064098f15e6457ba6a72fd0a4..1bbc172acb5894e162e442268007f6e6f68ee140 100644
--- a/Control/AthToolSupport/AsgTools/AsgTools/MessageCheck.h
+++ b/Control/AthToolSupport/AsgTools/AsgTools/MessageCheck.h
@@ -1,3 +1,7 @@
+// Dear emacs, this is -*- c++ -*-
+//
+// Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+//
 #ifndef ASG_TOOLS__MESSAGE_CHECK_H
 #define ASG_TOOLS__MESSAGE_CHECK_H
 
@@ -79,7 +83,7 @@
 #include <type_traits>
 
 #include <xAODRootAccess/tools/TReturnCode.h>
-#ifdef ROOTCORE
+#ifdef XAOD_STANDALONE
 #include <AsgTools/MsgStream.h>
 #else
 #include "AthenaBaseComps/AthMessaging.h"
@@ -118,7 +122,7 @@
   void setMsgLevel (MSG::Level level); }
 
 
-#ifdef ROOTCORE
+#ifdef XAOD_STANDALONE
 #define ASG_TOOLS_MSG_STREAM(NAME,TITLE)	\
   static MsgStream NAME (TITLE);
 #else
@@ -254,7 +258,7 @@ namespace asg
 
   namespace detail
   {
-#ifndef ROOTCORE
+#ifndef XAOD_STANDALONE
     /// Get the Athena message service
     /// TODO: Look into using AthenaKernel/MsgStreamMember.h
     IMessageSvc* getMessageSvcAthena();
diff --git a/Control/AthToolSupport/AsgTools/AsgTools/MessagePrinter.h b/Control/AthToolSupport/AsgTools/AsgTools/MessagePrinter.h
index d6f11b298cc08c1458b8798ed23fbd5b8f5625d5..c493b4a018f0eaf017a2bf597e89912b5e3fd8a5 100644
--- a/Control/AthToolSupport/AsgTools/AsgTools/MessagePrinter.h
+++ b/Control/AthToolSupport/AsgTools/AsgTools/MessagePrinter.h
@@ -1,3 +1,7 @@
+// Dear emacs, this is -*- c++ -*-
+//
+// Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+//
 #ifndef ASG_TOOLS__MESSAGE_PRINTER_H
 #define ASG_TOOLS__MESSAGE_PRINTER_H
 
@@ -11,7 +15,7 @@
 // reports, feature suggestions, praise and complaints.
 
 
-#ifdef ROOTCORE
+#ifdef XAOD_STANDALONE
 
 #include <AsgTools/IMessagePrinter.h>
 
diff --git a/Control/AthToolSupport/AsgTools/AsgTools/MessagePrinterErrorCollect.h b/Control/AthToolSupport/AsgTools/AsgTools/MessagePrinterErrorCollect.h
index cbe207f01ea459d88ed48c4f5c2f551bcb909a54..94ab56ff211cb9b4e08644f094fec68e0be43384 100644
--- a/Control/AthToolSupport/AsgTools/AsgTools/MessagePrinterErrorCollect.h
+++ b/Control/AthToolSupport/AsgTools/AsgTools/MessagePrinterErrorCollect.h
@@ -1,3 +1,7 @@
+// Dear emacs, this is -*- c++ -*-
+//
+// Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+//
 #ifndef ASG_TOOLS__MESSAGE_PRINTER_ERROR_COLLECT_H
 #define ASG_TOOLS__MESSAGE_PRINTER_ERROR_COLLECT_H
 
@@ -11,7 +15,7 @@
 // reports, feature suggestions, praise and complaints.
 
 
-#ifdef ROOTCORE
+#ifdef XAOD_STANDALONE
 
 #include <AsgTools/IMessagePrinter.h>
 #include <vector>
diff --git a/Control/AthToolSupport/AsgTools/AsgTools/MessagePrinterMock.h b/Control/AthToolSupport/AsgTools/AsgTools/MessagePrinterMock.h
index 32a55787cb7dea04d4391528a0d97fc806271c38..ccde2361c525dce1d4db0a27ddeb7547726b9539 100644
--- a/Control/AthToolSupport/AsgTools/AsgTools/MessagePrinterMock.h
+++ b/Control/AthToolSupport/AsgTools/AsgTools/MessagePrinterMock.h
@@ -1,3 +1,7 @@
+// Dear emacs, this is -*- c++ -*-
+//
+// Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+//
 #ifndef ASG_TOOLS__MESSAGE_PRINTER_MOCK_H
 #define ASG_TOOLS__MESSAGE_PRINTER_MOCK_H
 
@@ -14,7 +18,7 @@
 #include <AsgTools/IMessagePrinter.h>
 #include <gmock/gmock.h>
 
-#ifdef ROOTCORE
+#ifdef XAOD_STANDALONE
 
 namespace asg
 {
diff --git a/Control/AthToolSupport/AsgTools/AsgTools/SgTEvent.icc b/Control/AthToolSupport/AsgTools/AsgTools/SgTEvent.icc
index ab8493df8f4c48374d23521af0842bc97c2c795d..a58e14b52dd669a834315090fe2378afd8f8c0f6 100644
--- a/Control/AthToolSupport/AsgTools/AsgTools/SgTEvent.icc
+++ b/Control/AthToolSupport/AsgTools/AsgTools/SgTEvent.icc
@@ -1,5 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
-// $Id: SgTEvent.icc 687011 2015-08-03 09:25:07Z krasznaa $
+//
+// Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+//
 #ifndef ASGTOOLS_SGTEVENT_ICC
 #define ASGTOOLS_SGTEVENT_ICC
 
@@ -7,10 +9,10 @@
 #include <iostream>
 
 // xAOD include(s):
-#ifdef ROOTCORE
+#ifdef XAOD_STANDALONE
 #   include "xAODRootAccess/TEvent.h"
 #   include "xAODRootAccess/TStore.h"
-#endif // ROOTCORE
+#endif // XAOD_STANDALONE
 
 namespace asg {
 
diff --git a/Control/AthToolSupport/AsgTools/AsgTools/SgTEventMeta.icc b/Control/AthToolSupport/AsgTools/AsgTools/SgTEventMeta.icc
index 7083f1bbc21e298d607cf6774fe412188718df78..4e22675492100f4b72d113cb19e4bbcd171d0663 100644
--- a/Control/AthToolSupport/AsgTools/AsgTools/SgTEventMeta.icc
+++ b/Control/AthToolSupport/AsgTools/AsgTools/SgTEventMeta.icc
@@ -1,5 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
-// $Id: SgTEventMeta.icc 687011 2015-08-03 09:25:07Z krasznaa $
+//
+// Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+//
 #ifndef ASGTOOLS_SGTEVENTMETA_ICC
 #define ASGTOOLS_SGTEVENTMETA_ICC
 
@@ -7,9 +9,9 @@
 #include <iostream>
 
 // xAOD include(s):
-#ifdef ROOTCORE
+#ifdef XAOD_STANDALONE
 #   include "xAODRootAccess/TEvent.h"
-#endif // ROOTCORE
+#endif // XAOD_STANDALONE
 
 namespace asg {
 
diff --git a/Control/AthToolSupport/AsgTools/AsgTools/ToolStore.h b/Control/AthToolSupport/AsgTools/AsgTools/ToolStore.h
index 780e2d1a1d37c110d8a0dfb91807efbc3668be8c..e8cabc345a876f67bbba3a7bc97a19cd95ab6dd8 100644
--- a/Control/AthToolSupport/AsgTools/AsgTools/ToolStore.h
+++ b/Control/AthToolSupport/AsgTools/AsgTools/ToolStore.h
@@ -1,5 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
-// $Id: ToolStore.h 802972 2017-04-15 18:13:17Z krumnack $
+//
+// Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+//
 #ifndef ASGTOOLS_TOOLSTORE_H
 #define ASGTOOLS_TOOLSTORE_H
 
@@ -60,7 +62,7 @@ namespace asg {
       /// Remove a tool with a given name from the store
       static StatusCode remove( const std::string& name );
 
-#ifdef ROOTCORE
+#ifdef XAOD_STANDALONE
      /// dump the tool configuration for all tools to std::cout
      static void dumpToolConfig ();
 #endif
diff --git a/Control/AthToolSupport/AsgTools/AsgTools/UnitTest.h b/Control/AthToolSupport/AsgTools/AsgTools/UnitTest.h
index b64098a72e58f72083b765b7a3677732f8ff3537..c635bf01a8aa121bef667153d1be9f0a9a541cc7 100644
--- a/Control/AthToolSupport/AsgTools/AsgTools/UnitTest.h
+++ b/Control/AthToolSupport/AsgTools/AsgTools/UnitTest.h
@@ -1,3 +1,7 @@
+// Dear emacs, this is -*- c++ -*-
+//
+// Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+//
 #ifndef ASG_TOOLS__UNIT_TEST_H
 #define ASG_TOOLS__UNIT_TEST_H
 
@@ -46,7 +50,7 @@ namespace asg
   EXPECT_EQ (asg::CheckHelper<decltype(x)>::failureCode(), x)
 
 
-#ifndef ROOTCORE
+#ifndef XAOD_STANDALONE
 #define ASSERT_FAILURE_REGEX(x,regex)                           \
   ASSERT_FAILURE(x)
 #define EXPECT_FAILURE_REGEX(x,regex)                           \
diff --git a/Control/AthToolSupport/AsgTools/Root/AnaToolHandle.cxx b/Control/AthToolSupport/AsgTools/Root/AnaToolHandle.cxx
index 6677692c1249a86c678740b8ca5c02a1daa17643..de859d56b380fd58283fd391119c7a05296a20e6 100644
--- a/Control/AthToolSupport/AsgTools/Root/AnaToolHandle.cxx
+++ b/Control/AthToolSupport/AsgTools/Root/AnaToolHandle.cxx
@@ -1,3 +1,6 @@
+//
+// Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+//
 //        
 //                  Author: Nils Krumnack
 // Distributed under the Boost Software License, Version 1.0.
@@ -16,7 +19,7 @@
 
 #include "AsgTools/ToolStore.h"
 
-#ifdef ROOTCORE
+#ifdef XAOD_STANDALONE
 #include <TInterpreter.h>
 #include <TROOT.h>
 #else
@@ -105,7 +108,7 @@ namespace asg
       AnaToolCleanup cleanup;
       ANA_CHECK (config.makeTool (name, nullptr, th, cleanup));
       res_result.reset (new AnaToolShare (th, cleanup));
-#ifndef ROOTCORE
+#ifndef XAOD_STANDALONE
       if (!th.empty())
       {
 	th->release ();
@@ -123,7 +126,7 @@ namespace asg
 // legacy code
 //
 
-#ifdef ROOTCORE
+#ifdef XAOD_STANDALONE
 
 namespace asg
 {
@@ -307,7 +310,7 @@ namespace asg
 	return false;
       if (!m_type.empty())
 	return false;
-#ifdef ROOTCORE
+#ifdef XAOD_STANDALONE
       if (m_factory)
 	return false;
 #endif
@@ -341,7 +344,7 @@ namespace asg
 
 
 
-#ifdef ROOTCORE
+#ifdef XAOD_STANDALONE
   StatusCode AnaToolConfig ::
   allocateTool (AsgTool*& toolPtr, const std::string& toolName) const
   {
@@ -373,7 +376,7 @@ namespace asg
 
 
 
-#ifndef ROOTCORE
+#ifndef XAOD_STANDALONE
     StatusCode AnaToolConfig ::
     applyPropertiesAthena (const std::string& toolName,
 			   AnaToolCleanup& cleanup) const
@@ -411,7 +414,7 @@ namespace asg
 
 
 
-#ifdef ROOTCORE
+#ifdef XAOD_STANDALONE
     StatusCode AnaToolConfig ::
     makeToolRootCore (const std::string& toolName, IAsgTool*& toolPtr,
 		      AnaToolCleanup& cleanup) const
@@ -438,7 +441,7 @@ namespace asg
 #endif
 
 
-#ifndef ROOTCORE
+#ifndef XAOD_STANDALONE
     /// \brief manage the reference count on a tool
 
     struct ToolRefManager
@@ -509,7 +512,7 @@ namespace asg
       else
         toolName = "ToolSvc." + name;
 
-#ifdef ROOTCORE
+#ifdef XAOD_STANDALONE
       interfaceType_t *baseToolPtr = nullptr;
       AnaToolCleanup baseCleanup;
       ANA_CHECK (makeToolRootCore (toolName, baseToolPtr, baseCleanup));
@@ -582,7 +585,7 @@ namespace asg
 
 
 
-#ifndef ROOTCORE
+#ifndef XAOD_STANDALONE
     AnaToolPropertyCopyTool ::
     AnaToolPropertyCopyTool (const std::string& val_type,
                              const std::string& val_name)
diff --git a/Control/AthToolSupport/AsgTools/Root/MessageCheck.cxx b/Control/AthToolSupport/AsgTools/Root/MessageCheck.cxx
index 1b94b1d0635ba0bb68505fad760db5d235cf52d4..e68c52ad671653d1db8abe55bbce5e4c1c3dbf51 100644
--- a/Control/AthToolSupport/AsgTools/Root/MessageCheck.cxx
+++ b/Control/AthToolSupport/AsgTools/Root/MessageCheck.cxx
@@ -1,3 +1,6 @@
+//
+// Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+//
 //        
 //                  Author: Nils Krumnack
 // Distributed under the Boost Software License, Version 1.0.
@@ -16,7 +19,7 @@
 
 #include <stdexcept>
 
-#ifndef ROOTCORE
+#ifndef XAOD_STANDALONE
 #include <GaudiKernel/Bootstrap.h>
 #include <GaudiKernel/ISvcLocator.h>
 #endif
@@ -33,7 +36,7 @@ namespace asg
 
   namespace detail
   {
-#ifndef ROOTCORE
+#ifndef XAOD_STANDALONE
     // Get the Athena message service
     IMessageSvc* getMessageSvcAthena()
     {
diff --git a/Control/AthToolSupport/AsgTools/Root/MessagePrinterErrorCollect.cxx b/Control/AthToolSupport/AsgTools/Root/MessagePrinterErrorCollect.cxx
index fe304e405f8ef6bee25840680c29190f15f2498f..936c36843365a627a259df631409479bc6658e5f 100644
--- a/Control/AthToolSupport/AsgTools/Root/MessagePrinterErrorCollect.cxx
+++ b/Control/AthToolSupport/AsgTools/Root/MessagePrinterErrorCollect.cxx
@@ -1,3 +1,6 @@
+//
+// Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+//
 //        
 //                  Author: Nils Krumnack
 // Distributed under the Boost Software License, Version 1.0.
@@ -20,7 +23,7 @@
 // method implementations
 //
 
-#ifdef ROOTCORE
+#ifdef XAOD_STANDALONE
 
 namespace asg
 {
diff --git a/Control/AthToolSupport/AsgTools/Root/SgTEvent.cxx b/Control/AthToolSupport/AsgTools/Root/SgTEvent.cxx
index db96cc4aa3889e832c6180ad9de5ca043e2b44a3..59313943f31b5d51d1459df1bd16796a52115d69 100644
--- a/Control/AthToolSupport/AsgTools/Root/SgTEvent.cxx
+++ b/Control/AthToolSupport/AsgTools/Root/SgTEvent.cxx
@@ -1,4 +1,6 @@
-// $Id: SgTEvent.cxx 687011 2015-08-03 09:25:07Z krasznaa $
+//
+// Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+//
 
 // System include(s):
 #include <iostream>
@@ -7,10 +9,10 @@
 #include "AsgTools/SgTEvent.h"
 
 // RootCore include(s):
-#ifdef ROOTCORE
+#ifdef XAOD_STANDALONE
 #   include "xAODRootAccessInterfaces/TActiveEvent.h"
 #   include "xAODRootAccess/TActiveStore.h"
-#endif
+#endif // XAOD_STANDALONE
 
 namespace asg {
 
diff --git a/Control/AthToolSupport/AsgTools/Root/SgTEventMeta.cxx b/Control/AthToolSupport/AsgTools/Root/SgTEventMeta.cxx
index 98be017fe90d49e8b67299562835d4c2079c239d..78ca53bccbb03fb0eedbc01bf0deba7e6f20b019 100644
--- a/Control/AthToolSupport/AsgTools/Root/SgTEventMeta.cxx
+++ b/Control/AthToolSupport/AsgTools/Root/SgTEventMeta.cxx
@@ -1,10 +1,12 @@
-// $Id: SgTEventMeta.cxx 687011 2015-08-03 09:25:07Z krasznaa $
+//
+// Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+//
 
 // xAOD include(s):
-#ifdef ROOTCORE
+#ifdef XAOD_STANDALONE
 #   include "xAODRootAccessInterfaces/TActiveEvent.h"
 #   include "xAODRootAccess/TEvent.h"
-#endif // ROOTCORE
+#endif // XAOD_STANDALONE
 
 // Local include(s):
 #include "AsgTools/SgTEventMeta.h"
diff --git a/Control/AthToolSupport/AsgTools/Root/ToolStore.cxx b/Control/AthToolSupport/AsgTools/Root/ToolStore.cxx
index 705192955623e44422832b41513a89bc880c1cb4..a351eee15ee93c25ce6f62cf041ff3494941db99 100644
--- a/Control/AthToolSupport/AsgTools/Root/ToolStore.cxx
+++ b/Control/AthToolSupport/AsgTools/Root/ToolStore.cxx
@@ -1,4 +1,6 @@
-// $Id: ToolStore.cxx 802972 2017-04-15 18:13:17Z krumnack $
+//
+// Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+//
 
 // System include(s):
 #include <map>
@@ -116,7 +118,7 @@ namespace asg {
    }
 
 
-#ifdef ROOTCORE
+#ifdef XAOD_STANDALONE
   void ToolStore::dumpToolConfig () {
     using namespace asg::msgProperty;
 
diff --git a/Control/AthToolSupport/AsgTools/test/gt_AsgTool.cxx b/Control/AthToolSupport/AsgTools/test/gt_AsgTool.cxx
index 0b8b04cd473fe79841d669109c008272600e98df..563631f0c5b86f8cfd4fd26dab2d7eab01fede22 100644
--- a/Control/AthToolSupport/AsgTools/test/gt_AsgTool.cxx
+++ b/Control/AthToolSupport/AsgTools/test/gt_AsgTool.cxx
@@ -1,3 +1,6 @@
+//
+// Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+//
 //        
 //                  Author: Nils Krumnack
 // Distributed under the Boost Software License, Version 1.0.
@@ -23,7 +26,7 @@
 #include <gtest/gtest-spi.h>
 #include <gmock/gmock.h>
 
-#ifdef ROOTCORE
+#ifdef XAOD_STANDALONE
 #include <xAODRootAccess/Init.h>
 #endif
 
diff --git a/Control/AthToolSupport/AsgTools/test/gt_MessageCheck.cxx b/Control/AthToolSupport/AsgTools/test/gt_MessageCheck.cxx
index af989c815a6730ccf3c42b31b1e9fbf0a19daa37..cf7e9466ee029c95576dfe7075baa32050a522ad 100644
--- a/Control/AthToolSupport/AsgTools/test/gt_MessageCheck.cxx
+++ b/Control/AthToolSupport/AsgTools/test/gt_MessageCheck.cxx
@@ -1,3 +1,6 @@
+//
+// Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+//
 //        
 //                  Author: Nils Krumnack
 // Distributed under the Boost Software License, Version 1.0.
@@ -23,7 +26,7 @@
 #include <gtest/gtest-spi.h>
 #include <gmock/gmock.h>
 
-#ifdef ROOTCORE
+#ifdef XAOD_STANDALONE
 #include <xAODRootAccess/Init.h>
 #endif
 
diff --git a/Control/AthToolSupport/AsgTools/test/gt_TProperty.cxx b/Control/AthToolSupport/AsgTools/test/gt_TProperty.cxx
index d5352d06125eadc8585b76b99b9eb000f5875b43..6bfedb7712597f71f0b658415c0e5c78cfde33ab 100644
--- a/Control/AthToolSupport/AsgTools/test/gt_TProperty.cxx
+++ b/Control/AthToolSupport/AsgTools/test/gt_TProperty.cxx
@@ -1,3 +1,6 @@
+//
+// Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+//
 //        
 //                  Author: Nils Krumnack
 // Distributed under the Boost Software License, Version 1.0.
@@ -19,7 +22,7 @@
 #include <gtest/gtest.h>
 #include <gtest/gtest-spi.h>
 
-#ifdef ROOTCORE
+#ifdef XAOD_STANDALONE
 #include <xAODRootAccess/Init.h>
 #endif
 
diff --git a/Control/AthToolSupport/AsgTools/test/gt_UnitTest_test.cxx b/Control/AthToolSupport/AsgTools/test/gt_UnitTest_test.cxx
index d6742d00dcfb467414c052f0ec43447d45aee00f..fde3a3215128f3b910ab9729201a1b4445b50218 100644
--- a/Control/AthToolSupport/AsgTools/test/gt_UnitTest_test.cxx
+++ b/Control/AthToolSupport/AsgTools/test/gt_UnitTest_test.cxx
@@ -1,3 +1,6 @@
+//
+// Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+//
 //        
 //                  Author: Nils Krumnack
 // Distributed under the Boost Software License, Version 1.0.
@@ -19,7 +22,7 @@
 #include <gtest/gtest.h>
 #include <gtest/gtest-spi.h>
 
-#ifdef ROOTCORE
+#ifdef XAOD_STANDALONE
 #include <xAODRootAccess/Init.h>
 #endif
 
@@ -98,7 +101,7 @@ namespace asg
     EXPECT_FAILURE_REGEX (functionFailure("match"),".*match.*");
   }
 
-#ifdef ROOTCORE
+#ifdef XAOD_STANDALONE
   TEST (AssertTest, failure_regex_failure_missmatch)
 #else
   TEST (AssertTest, DISABLED_failure_regex_failure_missmatch)
@@ -107,7 +110,7 @@ namespace asg
     EXPECT_FATAL_FAILURE (ASSERT_FAILURE_REGEX (functionFailure("text 1"),".*different text.*"), "functionFailure");
   }
 
-#ifdef ROOTCORE
+#ifdef XAOD_STANDALONE
   TEST (AssertTest, failure_regex_failure_missing)
 #else
   TEST (AssertTest, DISABLED_failure_regex_failure_missing)
@@ -203,7 +206,7 @@ namespace asg
     EXPECT_FAILURE_REGEX (functionFailure("match"),".*match.*");
   }
 
-#ifdef ROOTCORE
+#ifdef XAOD_STANDALONE
   TEST (ExpectTest, failure_regex_failure_missmatch)
 #else
   TEST (ExpectTest, DISABLED_failure_regex_failure_missmatch)
@@ -212,7 +215,7 @@ namespace asg
     EXPECT_NONFATAL_FAILURE (EXPECT_FAILURE_REGEX (functionFailure("text 1"),".*different text.*"), "functionFailure");
   }
 
-#ifdef ROOTCORE
+#ifdef XAOD_STANDALONE
   TEST (ExpectTest, failure_regex_failure_missing)
 #else
   TEST (ExpectTest, DISABLED_failure_regex_failure_missing)
@@ -266,7 +269,7 @@ namespace asg
 
 int main (int argc, char **argv)
 {
-#ifdef ROOTCORE
+#ifdef XAOD_STANDALONE
   StatusCode::enableFailure();
   ANA_CHECK (xAOD::Init ());
 #endif
diff --git a/Control/AthenaCommon/CMakeLists.txt b/Control/AthenaCommon/CMakeLists.txt
index 68b6abb7516397436190722ad3c9ce9c43f0442a..a29b6dca8c2a5a6d3a5b553f41eacd849e669c86 100644
--- a/Control/AthenaCommon/CMakeLists.txt
+++ b/Control/AthenaCommon/CMakeLists.txt
@@ -33,5 +33,5 @@ atlas_add_test( CFElementsTest SCRIPT python -m unittest -v AthenaCommon.CFEleme
 
 # Check python syntax:
 atlas_add_test( flake8
-   SCRIPT flake8 --select=F,E101,E112,E113,E7,E9,W6 --ignore=E701 ${CMAKE_CURRENT_SOURCE_DIR}/python
+   SCRIPT flake8 --select=F,E101,E112,E113,E7,E9,W6 --ignore=E701,E741 ${CMAKE_CURRENT_SOURCE_DIR}/python
    POST_EXEC_SCRIPT nopost.sh )
diff --git a/Control/AthenaCommon/python/AlgSequence.py b/Control/AthenaCommon/python/AlgSequence.py
index d99ea4587dbe14c6bffe49abe6931f02dd00769e..107e372c1019d492803305bd096b025c345ce9cf 100755
--- a/Control/AthenaCommon/python/AlgSequence.py
+++ b/Control/AthenaCommon/python/AlgSequence.py
@@ -103,72 +103,6 @@ if hasattr(GaudiSequencerConf, 'AthRetrySequencer'):
     pass # monkey-patching AthRetrySequencer
 
 
-
-### AthAnalysisSequencer ----------------------------------------------------------
-if hasattr(GaudiSequencerConf, 'AthAnalysisSequencer'):
-    # create a new base class type to replace the old configurable
-    class AthAnalysisSequencer( GaudiSequencerConf.AthAnalysisSequencer ):
-        """Sequence of Gaudi algorithms"""
-
-        def __init__( self, name = "AthAnalysisSequencer", **kwargs ):
-            # call base class __init__ to pass new name
-            super( AthAnalysisSequencer, self ).__init__( name, **kwargs )
-
-        def getProperties( self ):
-            ## call base class
-            props = super( AthAnalysisSequencer, self ).getProperties()
-
-            ## correctly display the value of 'Members' by gathering children
-            if 'Members' in props:
-                props['Members'] = [ c.getFullName() for c in self.getChildren() ]
-            return props
-
-        def insert( self, index, item ):
-            self.__iadd__( item, index = index )
-
-        def filterHistogramTools( self, cutname):
-            tools = []
-            for tool in self.HistToolList:
-                if not tool.OnlyAtCutStages or cutname in tool.OnlyAtCutStages:
-                    tools.append(tool)
-            return tools
-
-        def setup( self ):
-            ## it is the defining property of the AthAnalysisSequener
-            ## that it adds a HistAlg to each and every algorithm to
-            ## produce some histograms this is achieved by the
-            ## following lines
-            try:
-                from HistogramUtils.HistogramUtilsConf import HistAlg
-                for i in xrange(len(self.getChildren())-1,-1,-1):
-                    oldName = self.getChildren()[i].name()
-                    newName = oldName+"_histogram"
-                    self.insert(i+1,HistAlg(newName, HistToolList = self.filterHistogramTools(oldName)))
-            except ImportError:
-                print("WARNING: unable to import package HistogramUtils for usage in AthAnalysisSequencer - auto-booking of histograms will not work!")
-
-            ## synchronize the list of Members with our Configurable children
-            self.Members = [ c.getFullName() for c in self.getChildren() ]
-
-            import Logging
-            msg = Logging.logging.getLogger( "AthAnalysisSequencer" )
-            msg.debug( 'setup of sequence: %s', self.getName() )
-            if msg.isEnabledFor( Logging.logging.VERBOSE ):
-                # call of __repr__ is relatively expensive
-                msg.verbose( 'layout of sequence: %s\n%s', self.getName(), str(self) )
-
-            ## delegate to base class...
-            super( AthAnalysisSequencer, self ).setup()
-        pass # AthAnalysisSequencer
-    # store the new AthAnalysisSequencer into CfgMgr to make it available
-    import CfgMgr
-    setattr( CfgMgr, 'AthAnalysisSequencer', AthAnalysisSequencer )
-    del CfgMgr
-    pass # monkey-patching AthAnalysisSequencer
-
-
-
-
 ### sequence of Gaudi configurables
 class AlgSequence( AthSequencer ):
     __slots__ = ()
diff --git a/Control/AthenaCommon/python/AppMgr.py b/Control/AthenaCommon/python/AppMgr.py
index 2969d7ac9671bfec72b28c59e78d62a9489c6423..d7d3bdfb4e568cbb5a1a04ac48a3944df5c880b4 100755
--- a/Control/AthenaCommon/python/AppMgr.py
+++ b/Control/AthenaCommon/python/AppMgr.py
@@ -993,3 +993,4 @@ topSequence  = AlgSequence.AlgSequence( "TopAlg" )     # for backward compatibil
 # execution of the AthAlgSeq sequence
 # this is mainly for backward compatibility reasons
 athAlgSeq.StopOverride=True
+athOutSeq.StopOverride=True
diff --git a/Control/AthenaCommon/python/CfgMergerLib.py b/Control/AthenaCommon/python/CfgMergerLib.py
index f0d05cf7e6303771779c554517bd11f9f638aee6..4eb2394b4994bb014e0cb0e3dad6eca0ac859b41 100644
--- a/Control/AthenaCommon/python/CfgMergerLib.py
+++ b/Control/AthenaCommon/python/CfgMergerLib.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 
 # @file AthenaCommon/python/CfgMergerLib
 # @purpose a set of python tools to analyze configurables and find candidates
@@ -188,7 +188,7 @@ def dump_josvc_content(fname='josvc.ascii'):
 
     cfg = dict(cfg)
     print >> f, "# content of the joboptions-svc"
-    print >> f, "josvc_catalog = \ "
+    print >> f, "josvc_catalog = \\ "
 
     from pprint import pprint
     pprint(cfg, stream=f)
diff --git a/Control/AthenaCommon/python/ConfigurationShelve.py b/Control/AthenaCommon/python/ConfigurationShelve.py
index e3add9820caf944045547fcc1721cccae941ac89..4038da3a33a3e1e818c25f02f16e78789c085cad 100644
--- a/Control/AthenaCommon/python/ConfigurationShelve.py
+++ b/Control/AthenaCommon/python/ConfigurationShelve.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 
 # @file: AthenaCommon/python/ConfigurationShelve.py
 # @author: Wim Lavrijsen (WLavrijsen@lbl.gov)
@@ -311,7 +311,7 @@ def loadJobOptionsCatalogue( cfg_fname ):
          p = gaudi.StringProperty( n, '' )
          try:
             p.fromString(v).ignore()
-         except:
+         except Exception:
             print "Failed to convert",n,v
 
          if not josvc.addPropertyToCatalogue( client, p ).isSuccess():
diff --git a/Control/AthenaCommon/python/DumpProperties.py b/Control/AthenaCommon/python/DumpProperties.py
index d914322c3f9075cbe58e1014eea8915252669403..21f5805c2fab5104e0d21e9ddb5040e141270e7f 100755
--- a/Control/AthenaCommon/python/DumpProperties.py
+++ b/Control/AthenaCommon/python/DumpProperties.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 
 # File: AthenaCommon/python/DumpProperties.py
 # Author: Wim Lavrijsen (WLavrijsen@lbl.gov)
@@ -76,7 +76,7 @@ def pprint( obj, stream = sys.stdout ):
       if not obj._ip:
          try:
             value = eval( value )
-         except:
+         except Exception:
             pass
 
       if value and type(value) == list:
diff --git a/Control/AthenaCommon/python/Include.py b/Control/AthenaCommon/python/Include.py
index 6081b56bf06caf9d116bed1a5334693512975af2..e7816b84f537a739627c79198a31a32963cbce76 100755
--- a/Control/AthenaCommon/python/Include.py
+++ b/Control/AthenaCommon/python/Include.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 
 # File: AthenaCommon/python/Include.py
 # Author: Wim Lavrijsen (WLavrijsen@lbl.gov)
@@ -57,7 +57,7 @@ class IncludeError( RuntimeError ):
 ### files locator ------------------------------------------------------------
 try:
    optionsPathEnv = os.environ[ 'JOBOPTSEARCHPATH' ]
-except:
+except Exception:
    optionsPathEnv = os.curdir
 
 optionsPath = re.split( ',|' + os.pathsep, optionsPathEnv )
@@ -232,7 +232,7 @@ class Include( object ):
             try:
                if 'import' in _filecache[ f.f_code.co_filename ][ f.f_lineno ]:
                   return self._trace_include
-            except:
+            except Exception:
                pass
             f = f.f_back
          del f
diff --git a/Control/AthenaCommon/python/JobProperties.py b/Control/AthenaCommon/python/JobProperties.py
index 2b19ec588ba06194274c8b406bf69c58be97c629..4afe912fc3e60abdc08d04481d689ebc9cc3c253 100755
--- a/Control/AthenaCommon/python/JobProperties.py
+++ b/Control/AthenaCommon/python/JobProperties.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 
 #=======================================================================
 # File: JobProperties/python/JobProperties.py
@@ -483,13 +483,13 @@ class JobPropertyContainer (object):
                   closestMatch=get_close_matches(name,self.__dict__.keys(),1)
                   if len(closestMatch)>0:
                       errString+=". Did you mean \'%s\'?" %  closestMatch[0] 
-              except:
+              except Exception:
                   pass #No execption from here
                   
               raise AttributeError(errString)
         try: 
             protected=hasattr(self.__dict__[name],'_context_name') 
-        except:
+        except Exception:
             protected=False 
         if not protected:
             self.__dict__[name] = n_value
diff --git a/Control/AthenaConfiguration/python/AllConfigFlags.py b/Control/AthenaConfiguration/python/AllConfigFlags.py
index b4ab8c54cb17d22ec0197b2f0b0dba2898f0c4aa..135e9ca10c1e2026f31f605f8b129077447c1af0 100644
--- a/Control/AthenaConfiguration/python/AllConfigFlags.py
+++ b/Control/AthenaConfiguration/python/AllConfigFlags.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 
 from AthenaConfiguration.AthConfigFlags import AthConfigFlags
 from AthenaCommon.SystemOfUnits import TeV
@@ -40,6 +40,7 @@ def _createCfgFlags():
     acf.addFlag('Output.RDOFileName','myROD.pool.root')
     acf.addFlag('Output.ESDFileName','myESD.pool.root')
     acf.addFlag('Output.AODFileName','myAOD.pool.root')
+    acf.addFlag('Output.HISTFileName','myHIST.root')
 
 
 #Geo Model Flags:
@@ -97,6 +98,18 @@ def _createCfgFlags():
         from MuonConfig.MuonConfigFlags import createMuonConfigFlags
         acf.join( createMuonConfigFlags() )
 
+# DQ
+    try:
+        import AthenaMonitoring # Suppress flake8 unused import warning: # noqa: F401
+        haveDQConfig = True
+    except ImportError:
+        haveDQConfig = False
+
+    if haveDQConfig:
+        from AthenaMonitoring.DQConfigFlags import createDQConfigFlags, createComplexDQConfigFlags
+        acf.join( createDQConfigFlags() )
+        createComplexDQConfigFlags(acf)
+
     return acf
 
 
diff --git a/Control/AthenaConfiguration/python/ComponentAccumulator.py b/Control/AthenaConfiguration/python/ComponentAccumulator.py
index 735130e1666b2c17100a92e1072362e05b5e6fe7..a85a9ffc3d2a1fbb4a153ceaefa517b3b1af8924 100644
--- a/Control/AthenaConfiguration/python/ComponentAccumulator.py
+++ b/Control/AthenaConfiguration/python/ComponentAccumulator.py
@@ -11,7 +11,7 @@ from GaudiKernel.GaudiHandles import PublicToolHandle, PublicToolHandleArray, Se
 import ast
 import collections
 
-from UnifyProperties import unifyProperty, unifySet
+from UnifyProperties import unifyProperty, unifySet, matchProperty
 
 
 class DeduplicationFailed(RuntimeError):
@@ -90,13 +90,13 @@ class ComponentAccumulator(object):
                         return seq.getValuedProperties()[name]                    
                     return seq.getDefaultProperties()[name]
 
-                self._msg.info( " "*nestLevel +"\__ "+ seq.name() +" (seq: %s %s)" %(  "SEQ" if __prop("Sequential") else "PAR", "OR" if __prop("ModeOR") else "AND"  ) )
+                self._msg.info( " "*nestLevel +"\\__ "+ seq.name() +" (seq: %s %s)" %(  "SEQ" if __prop("Sequential") else "PAR", "OR" if __prop("ModeOR") else "AND"  ) )
                 nestLevel += 3
                 for c in seq.getChildren():
                     if isSequence(c):
                         printSeqAndAlgs(c, nestLevel )
                     else:
-                        self._msg.info( " "*nestLevel +"\__ "+ c.name() +" (alg)" )
+                        self._msg.info( " "*nestLevel +"\\__ "+ c.name() +" (alg)" )
                         if summariseProps:
                             printProperties(c, nestLevel)
             printSeqAndAlgs(self._sequence) 
@@ -175,8 +175,12 @@ class ComponentAccumulator(object):
         for algo in algorithms:
             if not isinstance(algo, ConfigurableAlgorithm):
                 raise TypeError("Attempt to add wrong type: %s as event algorithm" % type( algo ).__name__)
-             
-            seq+=algo #TODO: Deduplication necessary?
+
+            existingAlg = findAlgorithm(seq, algo.getName())
+            if existingAlg:
+                self._deduplicateComponent(algo, existingAlg)
+            else:
+                seq+=algo #TODO: Deduplication necessary?
             pass
         return None
 
@@ -247,7 +251,7 @@ class ComponentAccumulator(object):
         #The following is to work with internal list of service as well as gobal svcMgr as second parameter
         try:
             compList.append(newComp)
-        except:
+        except Exception:
             compList+=newComp
             pass
         return True #True means something got added
@@ -271,11 +275,13 @@ class ComponentAccumulator(object):
                 if type(oldprop) != type(newprop):
                     raise DeduplicationFailed(" '%s' defined multiple times with conflicting types %s and %s" % \
                                                       (comp.getJobOptName(),type(oldprop),type(newprop)))
-                
+
+                propid = "%s.%s" % (comp.getType(), str(prop))
+
                 #Note that getattr for a list property works, even if it's not in ValuedProperties
                 if (oldprop!=newprop):
                     #found property mismatch
-                    if isinstance(oldprop,PublicToolHandle) or isinstance(oldprop,ServiceHandle): 
+                    if isinstance(oldprop,PublicToolHandle) or isinstance(oldprop,ServiceHandle):
                         if oldprop.getFullName()==newprop.getFullName():
                             # For public tools/services we check only their full name because they are already de-duplicated in addPublicTool/addSerivce
                             continue
@@ -283,24 +289,29 @@ class ComponentAccumulator(object):
                             raise DeduplicationFailed("PublicToolHandle / ServiceHandle '%s.%s' defined multiple times with conflicting values %s and %s" % \
                                                               (comp.getJobOptName(),oldprop.getFullName(),newprop.getFullName()))
                     elif isinstance(oldprop,PublicToolHandleArray):
-                            for newtool in newprop:
-                                if newtool not in oldprop: 
-                                    oldprop+=[newtool,]
-                            continue
+                        for newtool in newprop:
+                            if newtool not in oldprop:
+                                oldprop+=[newtool,]
+                        continue
                     elif isinstance(oldprop,ConfigurableAlgTool):
                         self._deduplicateComponent(oldprop,newprop)
                         pass
                     elif isinstance(oldprop,GaudiHandles.GaudiHandleArray):
+
+                        if matchProperty(propid):
+                            mergeprop = unifyProperty(propid, oldprop, newprop)
+                            setattr(comp, prop, mergeprop)
+                            continue
+
                         for newTool in newprop:
                             self._deduplicate(newTool,oldprop)
                         pass
                     elif isinstance(oldprop,list): #if properties are mergeable, do that!
-                        propid="%s.%s" % (comp.getType(),str(prop))
                         #Try merging this property. Will raise on failure
                         mergeprop=unifyProperty(propid,oldprop,newprop)
                         setattr(comp,prop,mergeprop)
                     elif isinstance(oldprop,dict): #Dicts/maps can be unified
-                        #find conflicting keys 
+                        #find conflicting keys
                         doubleKeys= set(oldprop.keys()) & set(prop.keys())
                         for k in doubleKeys():
                             if oldprop[k]!= prop[k]:
@@ -426,8 +437,8 @@ class ComponentAccumulator(object):
                 else: # an algorithm
                     existingAlg = findAlgorithm( dest, c.name(), depth=1 )
                     if existingAlg:
-                        if existingAlg != c: # if it is the same we can just skip it, else this indicates an error
-                            raise ConfigurationError( "Duplicate algorithm %s in source and destination sequences %s" % ( c.name(), src.name()  ) )
+                        if existingAlg != c:
+                            self._deduplicate(c, existingAlg)
                     else: # absent, adding
                         self._msg.debug("  Merging algorithm %s to a sequence %s", c.name(), dest.name() )
                         dest += c
diff --git a/Control/AthenaConfiguration/python/TestDefaults.py b/Control/AthenaConfiguration/python/TestDefaults.py
index d1c17095f61fbfb02548d872148b4873477d1fd5..0a984d5f1ed4e0f6a258a324e9431fe7a81e1205 100644
--- a/Control/AthenaConfiguration/python/TestDefaults.py
+++ b/Control/AthenaConfiguration/python/TestDefaults.py
@@ -6,5 +6,5 @@ class defaultTestFiles():
                        '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art')
     RAW = [d + "/TrigP1Test/data17_13TeV.00327265.physics_EnhancedBias.merge.RAW._lb0100._SFO-1._0001.1"]
     RDO = ["myRDO.pool.root"]#needs a test RDO
-    AOD = ["myAOD.pool.root"]#needs a test AOD
+    AOD = [d + '/CommonInputs/data16_13TeV.00311321.physics_Main.recon.AOD.r9264/AOD.11038520._000001.pool.root.1']
     ESD = ["myESD.pool.root"]#needs a test ESD
diff --git a/Control/AthenaConfiguration/python/UnifyProperties.py b/Control/AthenaConfiguration/python/UnifyProperties.py
index e75ac7e02eb53a5792b55dfab3e89e8ec59e6fa0..2781f6d40a1cf5bfa0100dff59849e8f64562b78 100644
--- a/Control/AthenaConfiguration/python/UnifyProperties.py
+++ b/Control/AthenaConfiguration/python/UnifyProperties.py
@@ -48,20 +48,43 @@ _propsToUnify={"GeoModelSvc.DetectorTools":unifySet,
                "AtRndmGenSvc.Seeds": unifySet,
                }
 
-def matchPropName(propname):
+
+def getUnificationKey(propname):
     if propname in _propsToUnify:
-        return True
+        return propname
     try:
         objectName, variableName = propname.split('.')[-2:]
-        return '*.{}'.format(variableName) in _propsToUnify or '{}.*'.format(objectName) in _propsToUnify
-    except:
-        return False
+
+        matchingByVariable = '*.{}'.format(variableName)
+        if matchingByVariable in _propsToUnify:
+            return matchingByVariable
+
+        matchingByObject = '{}.*'.format(objectName)
+        if matchingByObject in _propsToUnify:
+            return matchingByObject
+
+    except Exception:
+        pass
+
+    return None
+
+
+def matchProperty(propname):
+    return getUnificationKey(propname) is not None
+
+
+def getUnificationFunc(propname):
+    unificationKey = getUnificationKey(propname)
+    if unificationKey is None:
+        return None
+    return _propsToUnify[unificationKey]
 
 
 def unifyProperty(propname,prop1,prop2):
-    if not matchPropName(propname):
+    unificationFunc = getUnificationFunc(propname)
+    if unificationFunc is None:
         from AthenaConfiguration.ComponentAccumulator import DeduplicationFailed
         raise DeduplicationFailed("List property %s defined multiple times with conflicting values.\n " % propname \
                                       + str(prop1) +"\n and \n" +str(prop2) \
                                       + "\nIf this property should be merged, consider adding it to AthenaConfiguration/UnifyProperties.py")
-    return _propsToUnify[propname](prop1,prop2)
+    return unificationFunc(prop1,prop2)
diff --git a/Control/AthenaExamples/AthExHelloWorld/AthExHelloWorld/ATLAS_CHECK_THREAD_SAFETY b/Control/AthenaExamples/AthExHelloWorld/AthExHelloWorld/ATLAS_CHECK_THREAD_SAFETY
new file mode 100644
index 0000000000000000000000000000000000000000..0a4738bcd4423628a619c257868c94bf09bc7936
--- /dev/null
+++ b/Control/AthenaExamples/AthExHelloWorld/AthExHelloWorld/ATLAS_CHECK_THREAD_SAFETY
@@ -0,0 +1 @@
+Control/AthenaExamples/AthExHelloWorld
diff --git a/Control/AthenaExamples/AthExHelloWorld/CMakeLists.txt b/Control/AthenaExamples/AthExHelloWorld/CMakeLists.txt
index fe06e5d007766bbfcbcc1cef9e571e88318b5be9..552f735fab9aad73278af27e670052ee0b111581 100644
--- a/Control/AthenaExamples/AthExHelloWorld/CMakeLists.txt
+++ b/Control/AthenaExamples/AthExHelloWorld/CMakeLists.txt
@@ -37,7 +37,7 @@ atlas_add_test( AthExHelloWorldMT_1
 atlas_add_test( AthExHelloWorldMT_2
     ENVIRONMENT THREADS=2
 		SCRIPT test/test_AthExHelloWorld.sh
-    EXTRA_PATTERNS "AthenaHiveEventLoopMgr.* processing event" #processing order can change
+    EXTRA_PATTERNS "AthenaHiveEventLoopMgr.* processing event|^HelloWorld .*(INFO|WARNING A WARNING|ERROR An ERROR|FATAL A FATAL" #processing order can change
 		)
 
 atlas_add_test( AthExHelloWorld_CfgTest    SCRIPT python -m AthExHelloWorld.HelloWorldConfig    POST_EXEC_SCRIPT nopost.sh )
diff --git a/Control/AthenaKernel/AthenaKernel/IItemListSvc.h b/Control/AthenaKernel/AthenaKernel/IItemListSvc.h
index 670bb68b9b2f66050e614ac2fb25b290bb057eec..f05185046d6556a0b734d83de6393d04a8df9272 100644
--- a/Control/AthenaKernel/AthenaKernel/IItemListSvc.h
+++ b/Control/AthenaKernel/AthenaKernel/IItemListSvc.h
@@ -22,6 +22,7 @@
 #include <vector>
 #include <string>
 #include <map>
+#include <mutex>
 
 // fwd declares
 class INamedInterface;
@@ -56,10 +57,18 @@ public:
   // get the items for a given stream
   virtual std::vector<std::string> getItemsForStream(const std::string stream) const = 0;
 
+  // get mutex for streaming itemlist to output
+  virtual std::mutex& streamMutex();
+
+
 public:
 
   static const InterfaceID& interfaceID();
   
+private:
+
+  std::mutex m_stream_mut;
+
 }; 
 
 /////////////////////////////////////////////////////////////////// 
@@ -74,6 +83,12 @@ IItemListSvc::interfaceID()
   return IID_IItemListSvc; 
 }
 
+inline
+std::mutex&
+IItemListSvc::streamMutex()
+{
+  return m_stream_mut;
+}
 
 #endif //> !ATHENAKERNEL_IITEMLISTSVC_H
 
diff --git a/Control/AthenaMonitoring/AthenaMonitoring/AthMonitorAlgorithm.h b/Control/AthenaMonitoring/AthenaMonitoring/AthMonitorAlgorithm.h
new file mode 100644
index 0000000000000000000000000000000000000000..c1b3c8ff979acc6694b4f10834d07342c25c6a6c
--- /dev/null
+++ b/Control/AthenaMonitoring/AthenaMonitoring/AthMonitorAlgorithm.h
@@ -0,0 +1,320 @@
+/*
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+*/
+
+/**
+ * @class AthMonitorAlgorithm
+ * @author C. Burton <burton@utexas.edu>
+ * @author P. Onyisi <ponyisi@utexas.edu>
+ * @date 2018/12/31
+ * @brief Base class for Athena Monitoring Algorithms
+ * 
+ * A class in the AthenaMonitoring package which is subclassed to implement algorithms for
+ * the data monitoring system. An example subclass is given in ExampleMonitorAlgorithm. In
+ * the subclass, the user is required to implement the fillHistograms() function.
+ */
+
+#ifndef ATHMONITORALGORITHM_H
+#define ATHMONITORALGORITHM_H
+
+#include "AthenaBaseComps/AthReentrantAlgorithm.h"
+
+#include "AthenaMonitoring/GenericMonitoringTool.h"
+#include "AthenaMonitoring/IDQFilterTool.h"
+#include "AthenaMonitoring/IMonitorToolBase.h"
+#include "AthenaMonitoring/ITriggerTranslatorTool.h"
+#include "AthenaMonitoring/Monitored.h"
+
+#include "LumiBlockComps/ILuminosityTool.h"
+#include "TrigDecisionInterface/ITrigDecisionTool.h"
+#include "LumiBlockComps/ITrigLivefractionTool.h"
+
+#include "StoreGate/ReadHandleKey.h"
+#include "xAODEventInfo/EventInfo.h"
+
+class AthMonitorAlgorithm : public AthReentrantAlgorithm {
+public:
+
+    /** 
+     * Constructor
+     */
+    AthMonitorAlgorithm(const std::string& name, ISvcLocator* pSvcLocator );
+
+
+    /**
+     * Destructor
+     */
+    virtual ~AthMonitorAlgorithm();
+
+
+    /** 
+     * initialize
+     * 
+     * @return StatusCode
+     */
+    virtual StatusCode initialize() override;
+
+
+    /** 
+     * Applies filters and trigger requirements. Then, calls fillHistograms().
+     * 
+     * @param ctx event context for reentrant Athena call
+     * @return StatusCode
+     */
+    virtual StatusCode execute(const EventContext& ctx) const override;
+
+
+    /** 
+     * adds event to the monitoring histograms
+     * 
+     * User will overwrite this function. Histogram booking is no longer done in C++. 
+     * This function is called in execute once the filters are all passed.
+     *
+     * @param ctx forwarded from execute
+     * @return StatusCode
+     */
+    virtual StatusCode fillHistograms(const EventContext& ctx) const = 0;
+
+
+    /**
+     * Adds variables from an event to a group by name.
+     * 
+     * @param groupName The string name of the GenericMonitoringTool
+     * @param variables Variables desired to be saved.
+     * @return StatusCode
+     */
+    template <typename... T>
+    void fill( const std::string& groupName, T&&... variables ) const {
+        fill(getGroup(groupName),std::forward<T>(variables)...);
+    }
+
+
+    /**
+     * Adds variables from an event to a group by the group's object reference.
+     * 
+     * At the end of the fillHistograms routine, one should save the monitored variables 
+     * to the group. This function wraps the process of getting the desired group by a 
+     * call to AthMonitorAlgorithm::getGroup() and a call to Monitored::Group::fill(), 
+     * which also disables the auto-fill feature to avoid double-filling. Note, users 
+     * should avoid using this specific function name in daughter classes.
+     * 
+     * @param groupHandle A reference of the GenericMonitoringTool to which add variables.
+     * @param variables Variables desired to be saved
+     * @return StatusCode
+     */
+    template <typename... T>
+    void fill( const ToolHandle<GenericMonitoringTool>& groupHandle, T&&... variables ) const {
+        Monitored::Group(groupHandle,std::forward<T>(variables)...).fill();
+    }
+
+
+    /**
+     * Specifies the processing environment.
+     * 
+     * The running environment may be used to select which histograms are produced, and 
+     * where they are located in the output. For example, the output paths of the 
+     * histograms are different for the "user", "online" and the various offline flags. 
+     * Strings of the same names may be given as jobOptions.
+     */
+    enum class Environment_t {
+        user = 0, ///< 
+        online, ///< 
+        tier0, ///< 
+        tier0Raw, ///< 
+        tier0ESD, ///< 
+        AOD, ///< 
+        altprod, ///< 
+    };
+
+
+    /**
+     * Specifies what type of input data is being monitored.
+     * 
+     * An enumeration of the different types of data the monitoring application may be 
+     * running over. This can be used to select which histograms to produce, e.g. to 
+     * prevent the production of colliding-beam histograms when running on cosmic-ray data.
+     * Strings of the same names may be given as jobOptions.
+     */
+    enum class DataType_t {
+        userDefined = 0, ///< 
+        monteCarlo, ///< 
+        collisions, ///< 
+        cosmics, ///< 
+        heavyIonCollisions, ///< 
+    };
+
+
+    /** 
+     * Accessor functions for the environment.
+     *
+     * @return the current value of the class's Environment_t instance.
+     */
+    Environment_t environment() const;
+
+
+    /**
+     * Convert the environment string from the python configuration to an enum object.
+     *
+     * @return a value in the Environment_t enumeration which matches the input string.
+     */
+    Environment_t envStringToEnum( const std::string& str ) const;
+
+
+    /** 
+     * Accessor functions for the data type.
+     *
+     * @return the current value of the class's DataType_t instance.
+     */
+    DataType_t dataType() const;
+
+
+    /** 
+     * Convert the data type string from the python configuration to an enum object.
+     * 
+     * @return a value in the DataType_t enumeration which matches the input string.
+     */
+    DataType_t dataTypeStringToEnum( const std::string& str ) const;
+
+
+    /** 
+     * Get a specific monitoring tool from the tool handle array.
+     * 
+     * Finds a specific GenericMonitoringTool instance from the list of monitoring
+     * tools (a ToolHandleArray). Throws a FATAL warning if the object found is 
+     * empty.
+     * 
+     * @param name string name of the desired tool
+     * @return reference to the desired monitoring tool
+     */
+    ToolHandle<GenericMonitoringTool> getGroup( const std::string& name ) const;
+
+    /** 
+     * Get the trigger decision tool member.
+     * 
+     * The trigger decision tool is used to check whether a specific trigger is 
+     * passed by an event.
+     * 
+     * @return m_trigDecTool
+     */
+    const ToolHandle<Trig::ITrigDecisionTool>& getTrigDecisionTool();
+
+
+    /** 
+     * Check whether triggers are passed
+     * 
+     * For the event, use the trigger decision tool to check that at least one 
+     * of the triggers listed in the supplied vector is passed.
+     * 
+     * @param vTrigNames List of trigger names.
+     * @return If empty input, default to true. If at least one trigger is 
+     *  specified, returns whether at least one trigger was passed.
+     */
+    bool trigChainsArePassed( const std::vector<std::string>& vTrigNames ) const;
+
+    /** 
+     * Return a ReadHandle for an EventInfo object (get run/event numbers, etc.)
+     *
+     * @param ctx EventContext for the event
+     * @return a SG::ReadHandle<xAOD::EventInfo>
+     */
+    SG::ReadHandle<xAOD::EventInfo> GetEventInfo(const EventContext&) const;
+
+    /** @defgroup lumi Luminosity Functions
+     *  A group of functions which all deal with calculating luminosity.
+     *  @{
+     */
+
+    /**
+     * Calculate the average mu, i.e. <mu>.
+     */
+    virtual float lbAverageInteractionsPerCrossing() const;
+
+    /**
+     * Calculate instantaneous number of interactions, i.e. mu.
+     */
+    virtual float lbInteractionsPerCrossing() const;
+
+    /**
+     * Calculate average luminosity (in ub-1 s-1 => 10^30 cm-2 s-1).
+     */
+    virtual float lbAverageLuminosity() const;
+
+    /**
+     * Calculate the instantaneous luminosity per bunch crossing.
+     */
+    virtual float lbLuminosityPerBCID() const;
+
+    /**
+     *  Calculate the duration of the luminosity block (in seconds)
+     */
+    virtual double lbDuration() const;
+
+    /**
+     * Calculate the average luminosity livefraction
+     */
+    virtual float lbAverageLivefraction() const;
+
+    /**
+     * Calculate the live fraction per bunch crossing ID.
+     */
+    virtual float livefractionPerBCID() const;
+
+    /**
+     * Calculate the average integrated luminosity multiplied by the live fraction.
+     */
+    virtual double lbLumiWeight() const;
+
+    /** @} */ // end of lumi group
+
+
+    /**
+     * Parse a string into a vector
+     * 
+     * The input string is a single long string of all of the trigger names. It parses this string
+     * and turns it into a vector, where each element is one trigger or trigger category.
+     * 
+     * @param line The input string.
+     * @param result The parsed output vector of strings.
+     * @return StatusCode
+     */
+    virtual StatusCode parseList( const std::string& line, std::vector<std::string>& result );
+
+
+    /**
+     * Expands trigger categories.
+     * 
+     * Searches through the vector of trigger names. If a trigger category is found, it finds the 
+     * constituent triggers in that category and expands the vector to include each one.
+     * 
+     * @param vTrigChainNames A vector of triggers which is modified.
+     */
+    virtual void unpackTriggerCategories( std::vector<std::string>& vTrigChainNames );
+
+
+protected:
+    // Using the new way to declare JO properties: Gaudi::Property<int> m_myProperty {this,"MyProperty",0};
+    ToolHandleArray<GenericMonitoringTool> m_tools {this,"GMTools",{}}; ///< Array of Generic Monitoring Tools
+    ToolHandle<Trig::ITrigDecisionTool> m_trigDecTool {this,"TrigDecisionTool",""}; ///< Tool to tell whether a specific trigger is passed
+    ToolHandle<ITriggerTranslatorTool> m_trigTranslator {this,"TriggerTranslatorTool",""}; ///< Tool to unpack trigger categories into a trigger list
+    ToolHandleArray<IDQFilterTool> m_DQFilterTools {this,"FilterTools",{}}; ///< Array of Data Quality filter tools
+
+    ToolHandle<ILuminosityTool> m_lumiTool {this,"lumiTool","LuminosityTool"}; ///< Tool for calculating various luminosity quantities
+    ToolHandle<ITrigLivefractionTool> m_liveTool {this,"liveTool","TrigLivefractionTool"}; ///< Tool for calculating various live luminosity quantities
+
+    AthMonitorAlgorithm::Environment_t m_environment; ///< Instance of the Environment_t enum
+    AthMonitorAlgorithm::DataType_t m_dataType; ///< Instance of the DataType_t enum
+    Gaudi::Property<std::string> m_environmentStr {this,"Environment","user"}; ///< Environment string pulled from the job option and converted to enum
+    Gaudi::Property<std::string> m_dataTypeStr {this,"DataType","userDefined"}; ///< DataType string pulled from the job option and converted to enum
+
+    Gaudi::Property<std::string> m_triggerChainString {this,"TriggerChain",""}; ///< Trigger chain string pulled from the job option and parsed into a vector
+    std::vector<std::string> m_vTrigChainNames; ///< Vector of trigger chain names parsed from trigger chain string
+
+    Gaudi::Property<std::string> m_fileKey {this,"FileKey",""}; ///< Internal Athena name for file
+    bool m_hasRetrievedLumiTool; ///< Allows use of various luminosity functions
+    Gaudi::Property<bool> m_useLumi {this,"EnableLumi",false}; ///< Allows use of various luminosity functions
+    Gaudi::Property<float> m_defaultLBDuration {this,"DefaultLBDuration",60.}; ///< Default duration of one lumi block
+    Gaudi::Property<int> m_detailLevel {this,"DetailLevel",0}; ///< Sets the level of detail used in the monitoring
+    SG::ReadHandleKey<xAOD::EventInfo> m_EventInfoKey {this,"EventInfoKey","EventInfo"}; ///< Key for retrieving EventInfo from StoreGate
+};
+
+#endif
diff --git a/Control/AthenaMonitoring/AthenaMonitoring/ExampleMonitorAlgorithm.h b/Control/AthenaMonitoring/AthenaMonitoring/ExampleMonitorAlgorithm.h
new file mode 100644
index 0000000000000000000000000000000000000000..5b1b8aac4ac453824ee7a762ea3e6737df2762ab
--- /dev/null
+++ b/Control/AthenaMonitoring/AthenaMonitoring/ExampleMonitorAlgorithm.h
@@ -0,0 +1,22 @@
+/*
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef EXAMPLEMONITORALGORITHM_H
+#define EXAMPLEMONITORALGORITHM_H
+
+#include "AthenaMonitoring/AthMonitorAlgorithm.h"
+#include "AthenaMonitoring/Monitored.h"
+
+#include "TRandom3.h"
+
+class ExampleMonitorAlgorithm : public AthMonitorAlgorithm {
+public:
+    ExampleMonitorAlgorithm( const std::string& name, ISvcLocator* pSvcLocator );
+    virtual ~ExampleMonitorAlgorithm();
+    StatusCode initialize();
+    virtual StatusCode fillHistograms( const EventContext& ctx ) const override;
+private:
+	Gaudi::Property<bool> m_doRandom {this,"RandomHist",false};
+};
+#endif
diff --git a/Control/AthenaMonitoring/AthenaMonitoring/MonitoredGroup.h b/Control/AthenaMonitoring/AthenaMonitoring/MonitoredGroup.h
index 88844d2caef6b69d8c0a9a9e0c5547f79610eb2b..0ecb084d3d778ffc04dbf5c5c98d86785076a4b7 100644
--- a/Control/AthenaMonitoring/AthenaMonitoring/MonitoredGroup.h
+++ b/Control/AthenaMonitoring/AthenaMonitoring/MonitoredGroup.h
@@ -58,29 +58,36 @@ namespace Monitored {
       }
 
       /**
-       * @brief explicitely fill the monitoring output
+       * @brief Explicitly fill the monitoring histograms and disable autoFill
+       *
+       * This will fill the monitoring histograms and also call setAutoFill(false)
+       * in order to disable the automatic filling when the Monitored::Group goes
+       * out of scope. A typical use-pattern is in tight loops in order not to
+       * re-create the Monitored::Group object many times:
+       *
+       * \code
+       *   auto pt = Monitored::Scalar("pt");
+       *   auto mon = Monitored::Group(m_monTool, pt);
+       *   for (...) {
+       *      pt = ...;    // assign pt
+       *      mon.fill();  // fill pt histogram
+       *   }
+       * \endcode
+       *
        **/
       virtual void fill() {
+        setAutoFill(false);
         for (auto filler : m_histogramsFillers) {
           filler->fill();
         }
       }
+
       /**
        * @brief enables/disables filling when Monitored::Group leaves the scope
        *
        * By default Monitored::Group will perform a one time fill each time it goes
-       * out of scope. In tight loops one may want to re-use the same Monitored::Group
-       * and instead trigger the filling manually:
-       *
-       * \code
-       *   auto pt = Monitored::Scalar("pt");
-       *   auto mon = Monitored::Group(m_monTool, pt);
-       *   mon.setAutoFill(false);
-       *   for (...) {
-       *      // fill pt
-       *      mon.fill();
-       *   }
-       * \endcode
+       * out of scope. This feature can be disabled by calling setAutoFill(false).
+       * The same is achieved by calling fill() manually.
        **/
       void setAutoFill(bool isEnabled) { m_autoFill = isEnabled; }
 
diff --git a/Control/AthenaMonitoring/doc/Monitored_page.h b/Control/AthenaMonitoring/doc/Monitored_page.h
index d72db19fca17076dbcaada44707f6dd3081f989f..e2f86319ce3eb9b8e209ec40f27aa67827abf3af 100644
--- a/Control/AthenaMonitoring/doc/Monitored_page.h
+++ b/Control/AthenaMonitoring/doc/Monitored_page.h
@@ -67,7 +67,7 @@
 
    ## Advanced usage ##
    ### Filling in tight loops ###
-   @copydetails Monitored::impl::Group::setAutoFill()
+   @copydetails Monitored::impl::Group::fill()
 
    ### Monitoring of collections (of objects) ###
    Existing iterable collections can be monitored directly without the need to create temporaries.
diff --git a/Control/AthenaMonitoring/python/AthMonitorCfgHelper.py b/Control/AthenaMonitoring/python/AthMonitorCfgHelper.py
new file mode 100644
index 0000000000000000000000000000000000000000..900e7de07ebb1dedf0f78330be9be016a5cbbbd7
--- /dev/null
+++ b/Control/AthenaMonitoring/python/AthMonitorCfgHelper.py
@@ -0,0 +1,197 @@
+#
+#  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+#
+
+'''@file AthMonitorCfgHelper.py
+@author C. D. Burton
+@author P. Onyisi
+@date 2019-01-25
+@brief Helper classes for Run 3 monitoring algorithm configuration
+'''
+
+class AthMonitorCfgHelper(object):
+    '''
+    This class is for the Run 3-style configuration framework. It is intended to be instantiated once
+    per group of related monitoring algorithms.
+    '''
+    def __init__(self, inputFlags, monName):
+        '''
+        Create the configuration helper. Needs the global flags and the name of the set of
+        monitoring algorithms.
+
+        Arguments:
+        inputFlags -- the global configuration flag object
+        monName -- the name you want to assign the family of algorithms
+        '''
+        from AthenaCommon.AlgSequence import AthSequencer
+        from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
+        self.inputFlags = inputFlags
+        self.monName = monName
+        self.monSeq = AthSequencer('AthMonSeq_' + monName)
+        self.resobj = ComponentAccumulator()
+
+    def addAlgorithm(self, algClassOrObj, name = None, *args, **kwargs):
+        '''
+        Instantiate/add a monitoring algorithm
+
+        Arguments:
+        algClassOrObj -- the Configurable class object of the algorithm to create, or an instance
+                         of the algorithm Configurable. The former is recommended.  In the former case,
+                         the name argument is required.
+        name -- the name of the algorithm to create. Required when passing a Configurable class object
+                as algClassOrObj.  No effect if a Configurable instance is passed.
+        *args, **kwargs -- additional arguments will be forwarded to the Configurable constructor if
+                           a Configurable class object is passed. No effect if a Configurable instance
+                           is passed.
+
+        Returns:
+        algObj -- an algorithm Configurable object
+        '''
+        from AthenaCommon.Configurable import Configurable
+        if issubclass(algClassOrObj, Configurable):
+            if name is None:
+                raise TypeError('addAlgorithm with a class argument requires a name for the algorithm')
+            algObj = algClassOrObj(name, *args, **kwargs)
+        else:
+            algObj = algClassOrObj
+        
+        # configure these properties; users really should have no reason to override them
+        algObj.Environment = self.inputFlags.DQ.Environment
+        algObj.DataType = self.inputFlags.DQ.DataType
+
+        self.monSeq += algObj
+        return algObj
+
+    def addGroup(self, alg, name, topPath=''):
+        '''
+        Add a "group" (technically, a GenericMonitoringTool instance) to an algorithm. The name given
+        here can be used to retrieve the group from within the algorithm when calling the fill()
+        function.  (Note this is *not* the same thing as the Monitored::Group class.)
+
+        Arguments:
+        alg -- algorithm Configurable object (e.g. one returned from addAlgorithm)
+        name -- name of the group
+        topPath -- directory name in the output ROOT file under which histograms will be produced
+
+        Returns:
+        tool -- a GenericMonitoringTool Configurable object. This can be used to define histograms
+                associated with that group (using defineHistogram).
+        '''
+        from AthenaMonitoring.GenericMonitoringTool import GenericMonitoringTool
+        tool = GenericMonitoringTool(name)
+        acc, histsvc = getDQTHistSvc(self.inputFlags)
+        self.resobj.merge(acc)
+        tool.THistSvc = histsvc
+        tool.HistPath = self.inputFlags.DQ.FileKey + ('/%s' % topPath if topPath else '')
+        alg.GMTools += [tool]
+        return tool
+
+    def result(self):
+        '''
+        This function should be called to finalize the creation of the set of monitoring algorithms.
+
+        Returns:
+        (resobj, monSeq) -- a tuple with a ComponentAccumulator and an AthSequencer
+        '''
+        self.resobj.addSequence(self.monSeq)
+        return self.resobj,self.monSeq
+
+class AthMonitorCfgHelperOld(object):
+    ''' 
+    This is the version of the AthMonitorCfgHelper for the old-style jobOptions framework
+    '''
+    def __init__(self, dqflags, monName):
+        '''
+        Create the configuration helper. Needs the global flags and the name of the set of
+        monitoring algorithms.
+
+        Arguments:
+        dqflags -- the DQMonFlags object
+        monName -- the name you want to assign the family of algorithms
+        '''
+        from AthenaCommon.AlgSequence import AthSequencer
+        self.dqflags = dqflags
+        self.monName = monName
+        self.monSeq = AthSequencer('AthMonSeq_' + monName)
+
+    def addAlgorithm(self,algClassOrObj, *args, **kwargs):
+        '''
+        Instantiate/add a monitoring algorithm
+
+        Arguments:
+        algClassOrObj -- the Configurable class object of the algorithm to create, or an instance
+                         of the algorithm Configurable. The former is recommended.  In the former case,
+                         the name argument is required.
+        name -- the name of the algorithm to create. Required when passing a Configurable class object
+                as algClassOrObj.  No effect if a Configurable instance is passed.
+        *args, **kwargs -- additional arguments will be forwarded to the Configurable constructor if
+                           a Configurable class object is passed. No effect if a Configurable instance
+                           is passed.
+
+        Returns:
+        algObj -- an algorithm Configurable object
+        '''
+        from AthenaCommon.Configurable import Configurable
+        if issubclass(algClassOrObj, Configurable):
+            algObj = algClassOrObj(*args, **kwargs)
+        else:
+            algObj = algClassOrObj
+        
+        # configure these properties; users really should have no reason to override them
+        algObj.Environment = self.dqflags.monManEnvironment()
+        algObj.DataType = self.dqflags.monManDataType()
+
+        self.monSeq += algObj
+        return algObj
+
+    def addGroup(self, alg, name, topPath=''):
+        '''
+        Add a "group" (technically, a GenericMonitoringTool instance) to an algorithm. The name given
+        here can be used to retrieve the group from within the algorithm when calling the fill()
+        function.  (Note this is *not* the same thing as the Monitored::Group class.)
+
+        Arguments:
+        alg -- algorithm Configurable object (e.g. one returned from addAlgorithm)
+        name -- name of the group
+        topPath -- directory name in the output ROOT file under which histograms will be produced
+
+        Returns:
+        tool -- a GenericMonitoringTool Configurable object. This can be used to define histograms
+                associated with that group (using defineHistogram).
+        '''
+        from AthenaMonitoring.GenericMonitoringTool import GenericMonitoringTool
+        tool = GenericMonitoringTool(name)
+        from AthenaCommon.AppMgr import ServiceMgr as svcMgr
+        if not hasattr(svcMgr, 'THistSvc'):
+            from GaudiSvc.GaudiSvcConf import THistSvc
+            svcMgr += THistSvc()
+        tool.THistSvc = svcMgr.THistSvc
+        tool.HistPath = self.dqflags.monManFileKey() + ('/%s' % topPath if topPath else '')
+        alg.GMTools += [tool]
+        return tool
+
+    def result(self):
+        '''
+        This function should be called to finalize the creation of the set of monitoring algorithms.
+
+        Returns:
+        monSeq -- an AthSequencer
+        '''
+        return self.monSeq
+
+def getDQTHistSvc(inputFlags):
+    '''
+    This function creates a THistSvc - used for the new-style job configuration
+    
+    Returns:
+    (result, histsvc) -- a tuple of (ComponentAccumulator, THistSvc Configurable object)
+    '''
+    from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
+    from GaudiSvc.GaudiSvcConf import THistSvc
+
+    result = ComponentAccumulator()
+    histsvc = THistSvc()
+    histsvc.Output += ["%s DATAFILE='%s' OPT='RECREATE'" % (inputFlags.DQ.FileKey, 
+                                                            inputFlags.Output.HISTFileName)]
+    result.addService(histsvc)
+    return result, histsvc
diff --git a/Control/AthenaMonitoring/python/DQConfigFlags.py b/Control/AthenaMonitoring/python/DQConfigFlags.py
new file mode 100644
index 0000000000000000000000000000000000000000..1d19f8c680309e6ee073930798d4f22701bb4e26
--- /dev/null
+++ b/Control/AthenaMonitoring/python/DQConfigFlags.py
@@ -0,0 +1,43 @@
+#
+#  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+#
+
+from AthenaConfiguration.AthConfigFlags import AthConfigFlags
+
+def createDQConfigFlags():
+    acf=AthConfigFlags()
+    acf.addFlag('DQ.doMonitoring', True)
+    acf.addFlag('DQ.doGlobalMon', True)
+    acf.addFlag('DQ.doStreamAwareMon', True)
+    acf.addFlag('DQ.disableAtlasReadyFilter', False)
+    acf.addFlag('DQ.FileKey', 'CombinedMonitoring')
+    return acf
+
+def createComplexDQConfigFlags( acf ):
+    acf.addFlag('DQ.Environment', getEnvironment )
+    acf.addFlag('DQ.DataType', getDataType )
+
+def getDataType(flags):
+    if flags.Input.isMC:
+        return 'monteCarlo'
+    elif (False): # this is the HI test, needs HI flags
+        return 'heavyioncollisions'
+    elif flags.Beam.Type == 'cosmics':
+        return 'cosmics'
+    elif flags.Beam.Type == 'collisions':
+        return 'collisions'
+    elif flags.Beam.Type == 'singlebeam':
+        # historically, singlebeam treated as collisions
+        return 'collisions'
+    else:
+        import logging
+        local_logger = logging.getLogger('DQConfigFlags_getDataType')
+        local_logger.warning('Unable to figure out beam type for DQ; using "user"')
+        return 'user'
+
+def getEnvironment(flags):
+    if flags.Common.isOnline:
+        return 'online'
+    else:
+        # this could use being rethought to properly encode input and output types perhaps ...
+        return 'tier0'
diff --git a/Control/AthenaMonitoring/python/ExampleMonitorAlgorithm.py b/Control/AthenaMonitoring/python/ExampleMonitorAlgorithm.py
new file mode 100644
index 0000000000000000000000000000000000000000..0c50180230cead0cf8023458c9cc62d030e032f6
--- /dev/null
+++ b/Control/AthenaMonitoring/python/ExampleMonitorAlgorithm.py
@@ -0,0 +1,134 @@
+#
+#  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+#
+
+'''@file ExampleMonitorAlgorithm.py
+@author C. D. Burton
+@author P. Onyisi
+@date 2018-01-11
+@brief Example python configuration for the Run III AthenaMonitoring package
+'''
+
+def ExampleMonitoringConfig(inputFlags):
+    '''Function to configures some algorithms in the monitoring system.'''
+
+    ### STEP 1 ###
+    # Define one top-level monitoring algorithm. The new configuration 
+    # framework uses a component accumulator.
+    from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
+    result = ComponentAccumulator()
+
+    # The following class will make a sequence, configure algorithms, and link
+    # them to GenericMonitoringTools
+    from AthenaMonitoring import AthMonitorCfgHelper
+    helper = AthMonitorCfgHelper(inputFlags,'ExampleAthMonitorCfg')
+
+
+    ### STEP 2 ###
+    # Adding an algorithm to the helper. Here, we will use the example 
+    # algorithm in the AthenaMonitoring package. Just pass the type to the 
+    # helper. Then, the helper will instantiate an instance and set up the 
+    # base class configuration following the inputFlags. The returned object 
+    # is the algorithm.
+    from AthenaMonitoring.AthenaMonitoringConf import ExampleMonitorAlgorithm
+    exampleMonAlg = helper.addAlgorithm(ExampleMonitorAlgorithm,'ExampleMonAlg')
+
+    # You can actually make multiple instances of the same algorithm and give 
+    # them different configurations
+    anotherExampleMonAlg = helper.addAlgorithm(ExampleMonitorAlgorithm,'AnotherExampleMonAlg')
+
+    # # If for some really obscure reason you need to instantiate an algorithm
+    # # yourself, the AddAlgorithm method will still configure the base 
+    # # properties and add the algorithm to the monitoring sequence.
+    # helper.AddAlgorithm(myExistingAlg)
+
+
+    ### STEP 3 ###
+    # Edit properties of a algorithm
+    exampleMonAlg.TriggerChain = ''
+
+    ### STEP 4 ###
+    # Add some tools. N.B. Do not use your own trigger decion tool. Use the
+    # standard one that is included with AthMonitorAlgorithm.
+
+    # # First, add a tool that's set up by a different configuration function. 
+    # # In this case, CaloNoiseToolCfg returns its own component accumulator, 
+    # # which must be merged with the one from this function.
+    # from CaloTools.CaloNoiseToolConfig import CaloNoiseToolCfg
+    # caloNoiseAcc, caloNoiseTool = CaloNoiseToolCfg(inputFlags)
+    # result.merge(caloNoiseAcc)
+    # exampleMonAlg.CaloNoiseTool = caloNoiseTool
+
+    # # Then, add a tool that doesn't have its own configuration function. In
+    # # this example, no accumulator is returned, so no merge is necessary.
+    # from MyDomainPackage.MyDomainPackageConf import MyDomainTool
+    # exampleMonAlg.MyDomainTool = MyDomainTool()
+
+    # Add a generic monitoring tool (a "group" in old language). The returned 
+    # object here is the standard GenericMonitoringTool.
+    myGroup = helper.addGroup(
+        exampleMonAlg,
+        'ExampleMonitor',
+        'OneRing/'
+    )
+
+    # Add a GMT for the other example monitor algorithm
+    anotherGroup = helper.addGroup(anotherExampleMonAlg,'ExampleMonitor')
+
+    ### STEP 5 ###
+    # Configure histograms
+    myGroup.defineHistogram('lumiPerBCID;lumiPerBCID', title='Luminosity;L/BCID;Events',
+                            path='ToRuleThemAll',xbins=10,xmin=0.0,xmax=10.0)
+    myGroup.defineHistogram('lb;lb', title='Luminosity Block;lb;Events',
+                            path='ToFindThem',xbins=1000,xmin=-0.5,xmax=999.5)
+    myGroup.defineHistogram('random;random', title='LB;x;Events',
+                            path='ToBringThemAll',xbins=30,xmin=0,xmax=1)
+
+
+    anotherGroup.defineHistogram('lbWithFilter;lbWithFilter',title='Lumi;lb;Events',
+                                 path='top',xbins=1000,xmin=-0.5,xmax=999.5)
+    anotherGroup.defineHistogram('run;run',title='Run Number;run;Events',
+                                 path='top',xbins=1000000,xmin=-0.5,xmax=999999.5)
+
+    ### STEP 6 ###
+    # Finalize. The return value should be a tuple of the ComponentAccumulator
+    # and the sequence containing the created algorithms. If we haven't called
+    # any configuration other than the AthMonitorCfgHelper here, then we can 
+    # just return directly (and not create "result" above)
+    return helper.result()
+    
+    # # Otherwise, merge with result object and return
+    # acc, seq = helper.result()
+    # result.merge(acc)
+    # return result, seq
+
+
+if __name__=='__main__':
+    # Setup the Run III behavior
+    from AthenaCommon.Configurable import Configurable
+    Configurable.configurableRun3Behavior = 1
+
+    # Setup logs
+    from AthenaCommon.Logging import log
+    from AthenaCommon.Constants import DEBUG,INFO
+    log.setLevel(INFO)
+
+    # Set the Athena configuration flags
+    from AthenaConfiguration.AllConfigFlags import ConfigFlags
+    nightly = '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/CommonInputs/'
+    file = 'data16_13TeV.00311321.physics_Main.recon.AOD.r9264/AOD.11038520._000001.pool.root.1'
+    ConfigFlags.Input.Files = [nightly+file]
+    ConfigFlags.Input.isMC = False
+    ConfigFlags.Output.HISTFileName = 'ExampleMonitorOutput.root'
+    ConfigFlags.lock()
+
+    # Initialize configuration object, add accumulator, merge, and run.
+    from AthenaConfiguration.MainServicesConfig import MainServicesSerialCfg 
+    from AthenaPoolCnvSvc.PoolReadConfig import PoolReadCfg
+    cfg = MainServicesSerialCfg()
+    cfg.merge(PoolReadCfg(ConfigFlags))
+
+    exampleMonitorAcc,exampleMonitorAlg = ExampleMonitoringConfig(ConfigFlags)
+    
+    cfg.merge(exampleMonitorAcc)
+    cfg.run()
diff --git a/Control/AthenaMonitoring/python/GenericMonitoringTool.py b/Control/AthenaMonitoring/python/GenericMonitoringTool.py
index 5377698106e820c8a44253df73aca650c6e41bd3..ec41c1758d456eb45f968bbef40187b50dff4ceb 100644
--- a/Control/AthenaMonitoring/python/GenericMonitoringTool.py
+++ b/Control/AthenaMonitoring/python/GenericMonitoringTool.py
@@ -13,6 +13,8 @@ class GenericMonitoringTool(_GenericMonitoringTool):
     def __init__(self, name, **kwargs):
         super(GenericMonitoringTool, self).__init__(name, **kwargs)
 
+    def defineHistogram(self, *args, **kwargs):
+        self.Histograms.append(defineHistogram(*args, **kwargs))
 
 ## Generate histogram definition string for the `GenericMonitoringTool.Histograms` property
 #
@@ -23,11 +25,16 @@ class GenericMonitoringTool(_GenericMonitoringTool):
 #  @param title    Histogram title and optional axis title (same syntax as in TH constructor)
 #  @param opt      Histrogram options (see GenericMonitoringTool)
 #  @param labels   List of bin labels (for a 2D histogram, sequential list of x- and y-axis labels)
-def defineHistogram(varname, type='TH1F', path='EXPERT',
+def defineHistogram(varname, type='TH1F', path=None,
                     title=None,
                     xbins=100, xmin=0, xmax=1,
                     ybins=None, ymin=None, ymax=None, zmin=None, zmax=None, opt='', labels=None):
 
+    if path is None:
+        import warnings
+        warnings.warn("Calling defineHistrogram without path is deprecated. Specify e.g. path='EXPERT'", stacklevel=2)
+        path = 'EXPERT'
+
     if title is None: title=varname
     coded = "%s, %s, %s, %s, %d, %f, %f" % (path, type, varname, title, xbins, xmin, xmax)
     if ybins is not None:
diff --git a/Control/AthenaMonitoring/python/__init__.py b/Control/AthenaMonitoring/python/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..93e6266cb2b2a27b3876ab193bd31a34b1edc9af
--- /dev/null
+++ b/Control/AthenaMonitoring/python/__init__.py
@@ -0,0 +1,6 @@
+#
+#  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+#
+
+from AthMonitorCfgHelper import AthMonitorCfgHelper, AthMonitorCfgHelperOld
+from AtlasReadyFilterTool import GetAtlasReadyFilterTool
diff --git a/Control/AthenaMonitoring/share/ExampleMonitorAlgorithm_jobOptions.py b/Control/AthenaMonitoring/share/ExampleMonitorAlgorithm_jobOptions.py
new file mode 100644
index 0000000000000000000000000000000000000000..1a519e83225851d35e02d46287a61a345d965bc3
--- /dev/null
+++ b/Control/AthenaMonitoring/share/ExampleMonitorAlgorithm_jobOptions.py
@@ -0,0 +1,38 @@
+#
+#  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+#
+
+'''@file ExampleMonitorAlgorithm_jobOptions.py
+@author C. D. Burton
+@author P. Onyisi
+@date 2018-01-11
+@brief Example python configuration for the Run III AthenaMonitoring package (old jobOptions)
+'''
+
+# The following class will make a sequence, configure algorithms, and link
+# them to GenericMonitoringTools
+from AthenaMonitoring import AthMonitorCfgHelperOld
+helper = AthMonitorCfgHelperOld(DQMonFlags, "ExampleMonitor")
+
+### STEP 2 ###
+# Adding an algorithm to the helper. Here, we will use the example 
+# algorithm in the AthenaMonitoring package. Just pass the type to the 
+# helper. Then, the helper will instantiate an instance and set up the 
+# base class configuration following the inputFlags. The returned object 
+# is the algorithm.
+from AthenaMonitoring.AthenaMonitoringConf import ExampleMonitorAlgorithm
+exampleMonAlg = helper.AddAlgorithm(ExampleMonitorAlgorithm, "ExampleMonAlg")
+
+myGroup = helper.AddGroup( exampleMonAlg,
+        "ExampleMonitor",
+        "OneRing/"
+    )
+
+myGroup.defineHistogram("lumiPerBCID;lumiPerBCID", title="Luminosity;L/BCID;Events",
+                        path='ToRuleThemAll',xbins=10,xmin=0.0,xmax=10.0)
+myGroup.defineHistogram("lb;lb", title="Luminosity Block;lb;Events",
+                        path='ToFindThem',xbins=1000,xmin=-0.5,xmax=999.5)
+myGroup.defineHistogram("random;random", title="LB;x;Events",
+                        path='ToBringThemAll',xbins=30,xmin=0,xmax=1)
+
+topSequence += helper.result()
diff --git a/Control/AthenaMonitoring/src/AthMonitorAlgorithm.cxx b/Control/AthenaMonitoring/src/AthMonitorAlgorithm.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..bcfda26e746ec90669dbdc20941cbd66951a428c
--- /dev/null
+++ b/Control/AthenaMonitoring/src/AthMonitorAlgorithm.cxx
@@ -0,0 +1,327 @@
+/*
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+*/
+
+#include "AthenaMonitoring/AthMonitorAlgorithm.h"
+
+AthMonitorAlgorithm::AthMonitorAlgorithm( const std::string& name, ISvcLocator* pSvcLocator )
+:AthReentrantAlgorithm(name,pSvcLocator)
+,m_environment(Environment_t::user)
+,m_dataType(DataType_t::userDefined)
+,m_vTrigChainNames({})
+,m_hasRetrievedLumiTool(false)
+{}
+
+
+AthMonitorAlgorithm::~AthMonitorAlgorithm() {}
+
+
+StatusCode AthMonitorAlgorithm::initialize() {
+    StatusCode sc;
+
+    // Retrieve the generic monitoring tools (a ToolHandleArray)
+    if ( !m_tools.empty() ) {
+        ATH_CHECK( m_tools.retrieve() );
+    }
+
+    // Retrieve the trigger decision tool if requested
+    if ( !m_trigDecTool.empty() ) {
+        ATH_CHECK( m_trigDecTool.retrieve() );
+
+        // If the trigger chain is specified, parse it into a list.
+        if ( m_triggerChainString!="" ) {
+            sc = parseList(m_triggerChainString,m_vTrigChainNames);
+            if ( !sc.isSuccess() ) {
+                ATH_MSG_WARNING("Error parsing trigger chain list, using empty list instead." << endmsg);
+                m_vTrigChainNames.clear();
+            }
+
+            // Then, retrieve the trigger translator if requested. Finally, convert 
+            // into a usable format using the unpackTriggerCategories function.
+            if (!m_trigTranslator.empty()) {
+                ATH_CHECK( m_trigTranslator.retrieve() );
+                unpackTriggerCategories(m_vTrigChainNames);
+            }
+        }
+    }
+
+    // Convert the data type and environment strings from the python configuration into the
+    // enum class types DataType_t and Environment_t
+    m_dataType = dataTypeStringToEnum(m_dataTypeStr);
+    m_environment = envStringToEnum(m_environmentStr);
+
+    // Retrieve the luminosity tool if requested and whenever not using Monte Carlo
+    if (m_useLumi) {
+        if (m_dataType == DataType_t::monteCarlo) {
+            ATH_MSG_WARNING("Lumi tool requested, but AthMonitorAlgorithm is configured for MC. Disabling lumi tool.");
+        } else {
+            // Retrieve the luminosity and live fraction tools
+            StatusCode sc_lumiTool = m_lumiTool.retrieve();
+            StatusCode sc_liveTool = m_liveTool.retrieve();
+
+            // Set m_hasRetrievedLumiTool to true if both tools are retrieved successfully
+            if ( sc_lumiTool.isSuccess() && sc_liveTool.isSuccess() ) {
+               m_hasRetrievedLumiTool = true;
+            }
+        }
+    }
+
+    // get event info key
+    ATH_CHECK( m_EventInfoKey.initialize() );
+
+    // end of initialization
+    ATH_MSG_DEBUG("Exiting AthMonitorAlgorithm::initialize() successfully.");
+    return sc;
+}
+
+
+StatusCode AthMonitorAlgorithm::execute( const EventContext& ctx ) const {
+
+    // Checks that all of the  DQ filters are passed. If any one of the filters
+    // fails, return SUCCESS code and do not fill the histograms with the event.
+    for ( const auto& filterItr : m_DQFilterTools ) {
+        if (!filterItr->accept()) {
+            return StatusCode::SUCCESS;
+        }
+    }
+
+    // Trigger: If there is a decision tool and the chains fail, skip the event.
+    if ( !m_trigDecTool.empty() && !trigChainsArePassed(m_vTrigChainNames) ) {
+        return StatusCode::SUCCESS;
+    }
+
+    return fillHistograms(ctx);
+}
+
+
+SG::ReadHandle<xAOD::EventInfo> AthMonitorAlgorithm::GetEventInfo( const EventContext& ctx ) const {
+    return SG::ReadHandle<xAOD::EventInfo>(m_EventInfoKey, ctx);
+}
+
+
+AthMonitorAlgorithm::Environment_t AthMonitorAlgorithm::environment() const {
+    return m_environment;
+}
+
+
+AthMonitorAlgorithm::Environment_t AthMonitorAlgorithm::envStringToEnum( const std::string& str ) const {
+    // convert the string to all lowercase
+    std::string lowerCaseStr = str;
+    std::transform(lowerCaseStr.begin(), lowerCaseStr.end(), lowerCaseStr.begin(), ::tolower);
+
+    // check if it matches one of the enum choices
+    if( lowerCaseStr == "user" ) {
+        return Environment_t::user;
+    } else if( lowerCaseStr == "online" ) {
+        return Environment_t::online;
+    } else if( lowerCaseStr == "tier0" ) {
+        return Environment_t::tier0;
+    } else if( lowerCaseStr == "tier0raw" ) {
+        return Environment_t::tier0Raw;
+    } else if( lowerCaseStr == "tier0esd" ) {
+        return Environment_t::tier0ESD;
+    } else if( lowerCaseStr == "aod" ) {
+        return Environment_t::AOD;
+    } else if( lowerCaseStr == "altprod" ) {
+        return Environment_t::altprod;
+    } else { // otherwise, warn the user and return "user"
+        ATH_MSG_WARNING("AthMonitorAlgorithm::envStringToEnum(): Unknown environment "
+            <<str<<", returning user."<<endmsg);
+        return Environment_t::user;
+    }
+}
+
+
+AthMonitorAlgorithm::DataType_t AthMonitorAlgorithm::dataType() const {
+    return m_dataType;
+}
+
+
+AthMonitorAlgorithm::DataType_t AthMonitorAlgorithm::dataTypeStringToEnum( const std::string& str ) const {
+    // convert the string to all lowercase
+    std::string lowerCaseStr = str;
+    std::transform(lowerCaseStr.begin(), lowerCaseStr.end(), lowerCaseStr.begin(), ::tolower);
+
+    // check if it matches one of the enum choices
+    if( lowerCaseStr == "userdefined" ) {
+        return DataType_t::userDefined;
+    } else if( lowerCaseStr == "montecarlo" ) {
+        return DataType_t::monteCarlo;
+    } else if( lowerCaseStr == "collisions" ) {
+        return DataType_t::collisions;
+    } else if( lowerCaseStr == "cosmics" ) {
+        return DataType_t::cosmics;
+    } else if( lowerCaseStr == "heavyioncollisions" ) {
+        return DataType_t::heavyIonCollisions;
+    } else { // otherwise, warn the user and return "userDefined"
+        ATH_MSG_WARNING("AthMonitorAlgorithm::dataTypeStringToEnum(): Unknown data type "
+            <<str<<", returning userDefined."<<endmsg);
+        return DataType_t::userDefined;
+    }
+}
+
+
+ToolHandle<GenericMonitoringTool> AthMonitorAlgorithm::getGroup( const std::string& name ) const {
+    // get the pointer to the tool, and check that it exists
+    const ToolHandle<GenericMonitoringTool> toolHandle = *(m_tools[name]);
+    if ( toolHandle.empty() ) {
+        ATH_MSG_FATAL("The tool "<<name<<" could not be found in the monitoring algorithm's tool array."<<endmsg);
+    }
+    // return the tool handle
+    return toolHandle;
+}
+
+
+
+const ToolHandle<Trig::ITrigDecisionTool>& AthMonitorAlgorithm::getTrigDecisionTool() {
+    return m_trigDecTool;
+}
+
+
+bool AthMonitorAlgorithm::trigChainsArePassed( const std::vector<std::string>& vTrigNames ) const {
+    // Check whether ANY of the triggers in the list are passed
+    for ( auto& trigName : vTrigNames ) {
+        if ( m_trigDecTool->isPassed(trigName) ) {
+            return true;
+        }
+    }
+    // If no triggers were given, return true. Otherwise, the trigger requirement failed
+    return vTrigNames.size()==0;
+}
+
+
+float AthMonitorAlgorithm::lbAverageInteractionsPerCrossing() const {
+    if ( m_hasRetrievedLumiTool ) {
+        return m_lumiTool->lbAverageInteractionsPerCrossing();
+    } else {
+        ATH_MSG_DEBUG("AthMonitorAlgorithm::lbAverageInteractionsPerCrossing() - luminosity tools are not retrieved.");
+        return -1.0;
+    }
+}
+
+
+float AthMonitorAlgorithm::lbInteractionsPerCrossing() const {
+    if ( m_hasRetrievedLumiTool ) {
+        float instmu = 0.;
+        if (m_lumiTool->muToLumi() > 0.) {
+            instmu = m_lumiTool->lbLuminosityPerBCID()/m_lumiTool->muToLumi();
+        }
+        return instmu;
+    } else {
+        ATH_MSG_DEBUG("AthMonitorAlgorithm::lbInteractionsPerCrossing() - luminosity tools are not retrieved.");
+        return -1.0;
+    }
+}
+
+
+float AthMonitorAlgorithm::lbAverageLuminosity() const {
+    if ( m_hasRetrievedLumiTool ) {
+        return m_lumiTool->lbAverageLuminosity();
+    } else {
+        ATH_MSG_DEBUG("AthMonitorAlgorithm::lbAverageLuminosity() - luminosity tools are not retrieved.");
+        return -1.0;
+    }
+}
+
+
+float AthMonitorAlgorithm::lbLuminosityPerBCID() const {
+    if ( m_hasRetrievedLumiTool ) {
+        return m_lumiTool->lbLuminosityPerBCID();
+    } else {
+        ATH_MSG_DEBUG("AthMonitorAlgorithm::lbLuminosityPerBCID() - luminosity tools are not retrieved.");
+        return -1.0;
+    }
+}
+
+
+float AthMonitorAlgorithm::lbAverageLivefraction() const {
+    if (m_environment == Environment_t::online) {
+        return 1.0;
+    }
+
+    if ( m_hasRetrievedLumiTool ) {
+        return m_liveTool->lbAverageLivefraction();
+    } else {
+        ATH_MSG_DEBUG("AthMonitorAlgorithm::lbAverageLivefraction() - luminosity tools are not retrieved.");
+        return -1.0;
+    }
+}
+
+
+float AthMonitorAlgorithm::livefractionPerBCID() const {
+    if (m_environment == Environment_t::online) {
+        return 1.0;
+    }
+
+    if ( m_hasRetrievedLumiTool ) {
+        return m_liveTool->livefractionPerBCID();
+    } else {
+        ATH_MSG_DEBUG("AthMonitorAlgorithm::livefractionPerBCID() - luminosity tools are not retrieved.");
+        return -1.0;
+    }
+}
+
+
+double AthMonitorAlgorithm::lbLumiWeight() const {
+    if ( m_hasRetrievedLumiTool ) {
+        return (lbAverageLuminosity()*lbDuration())*lbAverageLivefraction();
+    } else {
+        ATH_MSG_DEBUG("AthMonitorAlgorithm::lbLumiWeight() - luminosity tools are not retrieved.");
+        return -1.0;
+    }
+}
+
+
+double AthMonitorAlgorithm::lbDuration() const {
+    if ( m_environment == Environment_t::online ) {
+        return m_defaultLBDuration;
+    }
+
+    if ( m_hasRetrievedLumiTool ) {
+        return m_lumiTool->lbDuration();
+    } else {
+        ATH_MSG_DEBUG("AthMonitorAlgorithm::lbDuration() - luminosity tools are not retrieved.");
+        return m_defaultLBDuration;
+    }
+}
+
+
+StatusCode AthMonitorAlgorithm::parseList(const std::string& line, std::vector<std::string>& result) {
+    std::string item;
+    std::stringstream ss(line);
+
+    ATH_MSG_DEBUG("AthMonitorAlgorithm::parseList()" << endmsg);
+
+    while ( std::getline(ss, item, ',') ) {
+        std::stringstream iss(item); // remove whitespace
+        iss >> item;
+        result.push_back(item);
+    }
+
+    return StatusCode::SUCCESS;
+}
+
+
+void AthMonitorAlgorithm::unpackTriggerCategories(std::vector<std::string>& vTrigChainNames) {
+    for (size_t i = 0; i < vTrigChainNames.size(); ++i) {
+        std::string& thisName = vTrigChainNames[i];
+
+        if (thisName.substr(0,9) == "CATEGORY_") {
+            ATH_MSG_DEBUG("Found a trigger category: " << thisName << ". Unpacking.");
+            std::vector<std::string> triggers = m_trigTranslator->translate(thisName.substr(9,std::string::npos));
+            std::ostringstream oss;
+            oss << "(";
+            for (size_t itrig = 0; itrig < triggers.size(); ++itrig) {
+                if (itrig != 0) { 
+                    oss << "|";
+                }
+                oss << triggers[itrig];
+            }
+            oss << ")";
+            // replace with new value
+            std::string newval = oss.str();
+            ATH_MSG_DEBUG("Replaced with " << newval);
+            vTrigChainNames[i] = newval;
+        }
+    }
+}
diff --git a/Control/AthenaMonitoring/src/AthenaMonManager.cxx b/Control/AthenaMonitoring/src/AthenaMonManager.cxx
index 811743a9ce84bedb9bff901c92a736aaede990e1..d2207e7825b7a2b10d70ef04efe3694608177da9 100755
--- a/Control/AthenaMonitoring/src/AthenaMonManager.cxx
+++ b/Control/AthenaMonitoring/src/AthenaMonManager.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 // **********************************************************************
diff --git a/Control/AthenaMonitoring/src/ExampleMonitorAlgorithm.cxx b/Control/AthenaMonitoring/src/ExampleMonitorAlgorithm.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..ed0bfd7abca7b27764319c21d4a8f0f6fbc12100
--- /dev/null
+++ b/Control/AthenaMonitoring/src/ExampleMonitorAlgorithm.cxx
@@ -0,0 +1,46 @@
+/*
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+*/
+
+#include "AthenaMonitoring/ExampleMonitorAlgorithm.h"
+
+ExampleMonitorAlgorithm::ExampleMonitorAlgorithm( const std::string& name, ISvcLocator* pSvcLocator )
+:AthMonitorAlgorithm(name,pSvcLocator)
+,m_doRandom(false)
+{}
+
+
+ExampleMonitorAlgorithm::~ExampleMonitorAlgorithm() {}
+
+
+StatusCode ExampleMonitorAlgorithm::initialize() {
+    return AthMonitorAlgorithm::initialize();
+}
+
+
+StatusCode ExampleMonitorAlgorithm::fillHistograms( const EventContext& ctx ) const {
+    using namespace Monitored;
+
+    // Declare the quantities which should be monitored
+    auto lumiPerBCID = Monitored::Scalar<float>("lumiPerBCID",0.0);
+    auto lb = Monitored::Scalar<int>("lb",0);
+    auto run = Monitored::Scalar<int>("run",0);
+    auto random = Monitored::Scalar<float>("random",0.0);
+    // Set the values of the monitored variables for the event
+    lumiPerBCID = lbAverageInteractionsPerCrossing();
+    lb = GetEventInfo(ctx)->lumiBlock();
+    run = GetEventInfo(ctx)->runNumber();
+    if (m_doRandom) {
+      TRandom r(ctx.eventID().event_number());
+      random = r.Rndm();
+    }
+
+    // Fill. First argument is the tool name, all others are the variables to be saved.
+    fill("ExampleMonitor",lumiPerBCID,lb,random);
+
+    // Alternative fill method. Get the group yourself, and pass it to the fill function.
+    auto tool = getGroup("ExampleMonitor");
+    fill(tool,run);
+    
+    return StatusCode::SUCCESS;
+}
diff --git a/Control/AthenaMonitoring/src/components/AthenaMonitoring_entries.cxx b/Control/AthenaMonitoring/src/components/AthenaMonitoring_entries.cxx
index c4924ca33ce288ad366ae7e2daa49e33094498ba..ed03084a43a266fa93da9452c0b92e17c404dee1 100644
--- a/Control/AthenaMonitoring/src/components/AthenaMonitoring_entries.cxx
+++ b/Control/AthenaMonitoring/src/components/AthenaMonitoring_entries.cxx
@@ -1,3 +1,7 @@
+/*
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+*/
+
 #include "AthenaMonitoring/AthenaMon.h"
 #include "AthenaMonitoring/AthenaMonManager.h"
 #include "AthenaMonitoring/ManagedMonitorToolTest.h"
@@ -8,6 +12,7 @@
 #include "AthenaMonitoring/DQBadLBFilterAlg.h"
 #include "AthenaMonitoring/TriggerTranslatorSimple.h"
 #include "AthenaMonitoring/GenericMonitoringTool.h"
+#include "AthenaMonitoring/ExampleMonitorAlgorithm.h"
 
 
 DECLARE_COMPONENT( AthenaMon )
@@ -20,3 +25,4 @@ DECLARE_COMPONENT( DQBadLBFilterTool )
 DECLARE_COMPONENT( DQBadLBFilterAlg )
 DECLARE_COMPONENT( TriggerTranslatorToolSimple )
 DECLARE_COMPONENT( GenericMonitoringTool )
+DECLARE_COMPONENT( ExampleMonitorAlgorithm )
\ No newline at end of file
diff --git a/Control/AthenaMonitoring/test/GenericMonFilling_test.cxx b/Control/AthenaMonitoring/test/GenericMonFilling_test.cxx
index d2c4adfd6f1303d3e446cb309571f3d747b0ceb6..1d49367f1061ce8b618cde312f4e6b2d7bd8181f 100644
--- a/Control/AthenaMonitoring/test/GenericMonFilling_test.cxx
+++ b/Control/AthenaMonitoring/test/GenericMonFilling_test.cxx
@@ -168,6 +168,8 @@ bool fillExplcitelyWorked( ToolHandle<GenericMonitoringTool>& monTool, ITHistSvc
   resetHists( histSvc );
   auto roiPhi = Monitored::Scalar( "Phi", -99.0 );
   auto roiEta = Monitored::Scalar( "Eta", -99.0 );
+
+  // Check disabling of filling
   {
     auto monitorIt = Monitored::Group( monTool, roiEta, roiPhi );
     monitorIt.setAutoFill( false );
@@ -178,15 +180,25 @@ bool fillExplcitelyWorked( ToolHandle<GenericMonitoringTool>& monTool, ITHistSvc
   VALUE( getHist( histSvc, "/EXPERT/TestGroup/Eta" )->GetEntries() ) EXPECTED( 0 ); //  auto filling was disabled so no entries
   VALUE( getHist( histSvc, "/EXPERT/TestGroup/Phi" )->GetEntries() ) EXPECTED( 0 ); //  auto filling was disabled so no entries  
 
-  auto monitorIt = Monitored::Group( monTool, roiEta, roiPhi );
-  monitorIt.setAutoFill( false );
-  for ( size_t i = 0; i < 3; ++i ) {
-    monitorIt.fill();
+  // Check explicit fill in loops
+  {
+    auto monitorIt = Monitored::Group( monTool, roiEta, roiPhi );
+    for ( size_t i = 0; i < 3; ++i ) {
+      monitorIt.fill();   // this will fill and disable autoFill
+    }
   }
   VALUE( getHist( histSvc, "/EXPERT/TestGroup/Eta_vs_Phi" )->GetEntries() ) EXPECTED( 3 ); 
   VALUE( getHist( histSvc, "/EXPERT/TestGroup/Eta" )->GetEntries() ) EXPECTED( 3 ); 
   VALUE( getHist( histSvc, "/EXPERT/TestGroup/Phi" )->GetEntries() ) EXPECTED( 3 ); 
-  
+
+  // Check explicit one-time fill via temporary Group instance
+  {
+    Monitored::Group( monTool, roiEta, roiPhi ).fill();
+  }
+  VALUE( getHist( histSvc, "/EXPERT/TestGroup/Eta_vs_Phi" )->GetEntries() ) EXPECTED( 4 );
+  VALUE( getHist( histSvc, "/EXPERT/TestGroup/Eta" )->GetEntries() ) EXPECTED( 4 );
+  VALUE( getHist( histSvc, "/EXPERT/TestGroup/Phi" )->GetEntries() ) EXPECTED( 4 );
+
   return true;
 }
 
diff --git a/Control/AthenaServices/src/AthenaEventLoopMgr.cxx b/Control/AthenaServices/src/AthenaEventLoopMgr.cxx
index 8e1470482a73073e0bebcf3f9df204bb84246a86..a09eef98d06020856d9eb4a5b0b70fb0b54fd05a 100644
--- a/Control/AthenaServices/src/AthenaEventLoopMgr.cxx
+++ b/Control/AthenaServices/src/AthenaEventLoopMgr.cxx
@@ -54,7 +54,7 @@ AthenaEventLoopMgr::AthenaEventLoopMgr(const std::string& nam,
   : MinimalEventLoopMgr(nam, svcLoc), 
     m_incidentSvc ( "IncidentSvc",  nam ), 
     m_eventStore( "StoreGateSvc", nam ), 
-    m_evtSelector(nullptr), m_evtContext(nullptr),
+    m_evtSelector(nullptr), m_evtSelCtxt(nullptr),
     m_histoDataMgrSvc( "HistogramDataSvc",         nam ), 
     m_histoPersSvc   ( "HistogramPersistencySvc",  nam ), 
     m_activeStoreSvc ( "ActiveStoreSvc",           nam ),
@@ -252,7 +252,7 @@ StatusCode AthenaEventLoopMgr::initialize()
       m_evtSelector = theEvtSel;
       
       // reset iterator
-      if (m_evtSelector->createContext(m_evtContext).isFailure()) {
+      if (m_evtSelector->createContext(m_evtSelCtxt).isFailure()) {
 	fatal() << "Can not create the event selector Context." 
                 << endmsg;
 	return StatusCode::FAILURE;
@@ -408,7 +408,7 @@ StatusCode AthenaEventLoopMgr::finalize()
   m_evtSelector   = releaseInterface(m_evtSelector);
   m_incidentSvc.release().ignore();
 
-  delete m_evtContext; m_evtContext = nullptr;
+  delete m_evtSelCtxt; m_evtSelCtxt = nullptr;
 
   if(m_useTools) {
     tool_iterator firstTool = m_tools.begin();
@@ -621,7 +621,7 @@ StatusCode AthenaEventLoopMgr::executeEvent(void* /*par*/)
   const EventInfo* pEvent(nullptr);
   std::unique_ptr<EventInfo> pEventPtr;
   unsigned int conditionsRun = EventIDBase::UNDEFNUM;
-  if ( m_evtContext )
+  if ( m_evtSelCtxt )
   { // Deal with the case when an EventSelector is provided
     // Retrieve the Event object
     const AthenaAttributeList* pAttrList = eventStore()->tryConstRetrieve<AthenaAttributeList>();
@@ -908,12 +908,12 @@ StatusCode AthenaEventLoopMgr::nextEvent(int maxevt)
     //-----------------------------------------------------------------------
     // we need an EventInfo Object to fire the incidents. 
     //-----------------------------------------------------------------------
-    if ( m_evtContext )
+    if ( m_evtSelCtxt )
     {   // Deal with the case when an EventSelector is provided
 
       IOpaqueAddress* addr = nullptr;
 
-      sc = m_evtSelector->next(*m_evtContext);
+      sc = m_evtSelector->next(*m_evtSelCtxt);
 
       if ( !sc.isSuccess() )
       {
@@ -923,7 +923,7 @@ StatusCode AthenaEventLoopMgr::nextEvent(int maxevt)
         break;
       }
 
-      if (m_evtSelector->createAddress(*m_evtContext, addr).isFailure()) {
+      if (m_evtSelector->createAddress(*m_evtSelCtxt, addr).isFailure()) {
         error()
 	      << "Could not create an IOpaqueAddress" << endmsg;
         break;
@@ -992,15 +992,15 @@ StatusCode AthenaEventLoopMgr::seek (int evt)
     return StatusCode::FAILURE;
   }
 
-  if (!m_evtContext) {
-    if (m_evtSelector->createContext(m_evtContext).isFailure()) {
+  if (!m_evtSelCtxt) {
+    if (m_evtSelector->createContext(m_evtSelCtxt).isFailure()) {
       fatal() << "Can not create the event selector Context."
               << endmsg;
       return StatusCode::FAILURE;
     }
   }
 
-  StatusCode sc = is->seek (*m_evtContext, evt);
+  StatusCode sc = is->seek (*m_evtSelCtxt, evt);
   if (sc.isSuccess()) {
     m_nevt = evt;
   }
@@ -1031,15 +1031,15 @@ int AthenaEventLoopMgr::size()
     return -1;
   }
 
-  if (!m_evtContext) {
-    if (m_evtSelector->createContext(m_evtContext).isFailure()) {
+  if (!m_evtSelCtxt) {
+    if (m_evtSelector->createContext(m_evtSelCtxt).isFailure()) {
       fatal() << "Can not create the event selector Context."
               << endmsg;
       return -1;
     }
   }
 
-  return cs->size (*m_evtContext);
+  return cs->size (*m_evtSelCtxt);
 }
 
 void AthenaEventLoopMgr::handle(const Incident& inc)
@@ -1047,7 +1047,7 @@ void AthenaEventLoopMgr::handle(const Incident& inc)
   if(inc.type()!="BeforeFork")
     return;
 
-  if(!m_evtContext || !m_firstRun) {
+  if(!m_evtSelCtxt || !m_firstRun) {
     warning() << "Skipping BeforeFork handler. Either no event selector is provided or begin run has already passed" << endmsg;
   }
 
@@ -1061,12 +1061,12 @@ void AthenaEventLoopMgr::handle(const Incident& inc)
   // Construct EventInfo
   const EventInfo* pEvent(nullptr);
   IOpaqueAddress* addr = nullptr;
-  sc = m_evtSelector->next(*m_evtContext);
+  sc = m_evtSelector->next(*m_evtSelCtxt);
   if(!sc.isSuccess()) {
     info() << "No more events in event selection " << endmsg;
     return;
   }
-  sc = m_evtSelector->createAddress(*m_evtContext, addr);
+  sc = m_evtSelector->createAddress(*m_evtSelCtxt, addr);
   if (sc.isFailure()) {
     error() << "Could not create an IOpaqueAddress" << endmsg;
     return; 
diff --git a/Control/AthenaServices/src/AthenaEventLoopMgr.h b/Control/AthenaServices/src/AthenaEventLoopMgr.h
index 356b46b5ad4ece5095a013b152e7fbb9df508ee3..015be5173cacbddf523d2ff4f6575b4fa4caedb1 100644
--- a/Control/AthenaServices/src/AthenaEventLoopMgr.h
+++ b/Control/AthenaServices/src/AthenaEventLoopMgr.h
@@ -80,8 +80,8 @@ protected:
 
   /// Reference to the Event Selector
   IEvtSelector*     m_evtSelector;
-  /// Gaudi event selector Context (may be used as a cursor by the evt selector)
-  EvtContext*       m_evtContext;
+  /// Gaudi EventSelector Context (may be used as a cursor by the evt selector)
+  IEvtSelector::Context* m_evtSelCtxt;
   /// @property Event selector Name. If empty string (default) take value from ApplicationMgr
   StringProperty    m_evtsel;
 
diff --git a/Control/AthenaServices/src/AthenaOutputStream.cxx b/Control/AthenaServices/src/AthenaOutputStream.cxx
index 51d84cba12d00a0263c54a954e14efe2798d5e76..308bdf6b983f21d7d3d94e833810cdba4011b328 100644
--- a/Control/AthenaServices/src/AthenaOutputStream.cxx
+++ b/Control/AthenaServices/src/AthenaOutputStream.cxx
@@ -36,6 +36,7 @@
 
 #include <boost/tokenizer.hpp>
 #include <cassert>
+#include <mutex>
 #include <string>
 #include <vector>
 
@@ -461,6 +462,7 @@ StatusCode AthenaOutputStream::write() {
    // Connect the output file to the service
    // FIXME: this double looping sucks... got to query the
    // data store for object of a given type/key.
+   std::lock_guard<std::mutex> lock(m_itemSvc->streamMutex());
    if (m_streamer->connectOutput(m_outSeqSvc->buildSequenceFileName(m_outputName) + m_outputAttributes).isSuccess()) {
       // First check if there are any new items in the list
       collectAllObjects();
diff --git a/Control/AthenaServices/src/AthenaOutputStreamTool.cxx b/Control/AthenaServices/src/AthenaOutputStreamTool.cxx
index 3756dce7005b0461159b2a19edf14e69adc1669e..1857d435f01e5313f696c5bf06a453e45c4dd931 100644
--- a/Control/AthenaServices/src/AthenaOutputStreamTool.cxx
+++ b/Control/AthenaServices/src/AthenaOutputStreamTool.cxx
@@ -244,20 +244,12 @@ StatusCode AthenaOutputStreamTool::connectOutput(const std::string& outputName)
       }
    }
 
-   if (!m_attrListKey.key().empty()) {
-     auto attrListHandle = SG::makeHandle(m_attrListKey);
-
-     if (!attrListHandle.isValid()) {
-       if (m_store->storeID() == StoreID::SIMPLE_STORE ||
-           m_store->storeID() == StoreID::METADATA_STORE)
-       {
-         // Avoid spurious WARNING during stop().
-       }
-       else {
+   if (!m_attrListKey.key().empty() && m_store->storeID() == StoreID::EVENT_STORE) {
+      auto attrListHandle = SG::makeHandle(m_attrListKey);
+      if (!attrListHandle.isValid()) {
          ATH_MSG_WARNING("Unable to retrieve AttributeList with key " << m_attrListKey.key());
-       }
       } else {
-       m_dataHeader->setAttributeList(attrListHandle.cptr());
+         m_dataHeader->setAttributeList(attrListHandle.cptr());
       }
    }
 
diff --git a/Control/DataModelTest/DataModelTestDataCommon/src/CondWriterExtAlg.cxx b/Control/DataModelTest/DataModelTestDataCommon/src/CondWriterExtAlg.cxx
index 3b79e7f283d74d330770b84e7a3994679c617dcb..50ff261f7b2f90d13e6a2394020ad1351458cf41 100644
--- a/Control/DataModelTest/DataModelTestDataCommon/src/CondWriterExtAlg.cxx
+++ b/Control/DataModelTest/DataModelTestDataCommon/src/CondWriterExtAlg.cxx
@@ -4,8 +4,6 @@
 
 #include "CondWriterExtAlg.h"
 
-#include "EventInfo/EventID.h"
-#include "EventInfo/EventIncident.h"
 #include "StoreGate/ReadHandle.h"
 #include "AthenaKernel/IOVTime.h"
 #include "AthenaKernel/IOVRange.h"
@@ -17,30 +15,26 @@ namespace DMTest {
 CondWriterExtAlg::CondWriterExtAlg(const std::string& name, ISvcLocator* pSvcLocator) :
   AthAlgorithm(name, pSvcLocator),
   m_iovSvc("IOVSvc", name),
-  m_iovDbSvc("IOVDbSvc", name),
-  m_incidentSvc("IncidentSvc", name)
+  m_iovDbSvc("IOVDbSvc", name)
 {
 }
 
 StatusCode CondWriterExtAlg::initialize()
 {
-  ATH_CHECK( m_eventInfoKey.initialize() );    
   ATH_CHECK( m_iovSvc.retrieve() );
   ATH_CHECK( m_iovDbSvc.retrieve() );
-  ATH_CHECK( m_incidentSvc.retrieve() );
 
   return StatusCode::SUCCESS;
 }
 
 StatusCode CondWriterExtAlg::execute()
 {
-  SG::ReadHandle<EventInfo> eventInfo (m_eventInfoKey);
-
-  ATH_MSG_INFO ("Event " << eventInfo->event_ID()->event_number() <<
-                " LBN " << eventInfo->event_ID()->lumi_block());
+  const EventContext& context = getContext();
+  ATH_MSG_INFO ("Event " << context.eventID().event_number() <<
+                " LBN " << context.eventID().lumi_block());
 
   // Check if we need to execute a command
-  auto it = m_cmd.find(eventInfo->event_ID()->lumi_block());
+  auto it = m_cmd.find(context.eventID().lumi_block());
   if (it != m_cmd.end()) {
     ATH_MSG_INFO("Executing: " << it->second);
     if ( system(it->second.c_str()) != 0 ) {
diff --git a/Control/DataModelTest/DataModelTestDataCommon/src/CondWriterExtAlg.h b/Control/DataModelTest/DataModelTestDataCommon/src/CondWriterExtAlg.h
index f0049c83397d6bb3b61505b74f08ed909cda1dbb..2534c615e3131f071875341aa5557ef25997313c 100644
--- a/Control/DataModelTest/DataModelTestDataCommon/src/CondWriterExtAlg.h
+++ b/Control/DataModelTest/DataModelTestDataCommon/src/CondWriterExtAlg.h
@@ -7,8 +7,6 @@
 #include "AthenaBaseComps/AthAlgorithm.h"
 
 #include "GaudiKernel/ServiceHandle.h"
-#include "GaudiKernel/IIncidentSvc.h"
-#include "EventInfo/EventInfo.h"
 #include "StoreGate/ReadHandleKey.h"
 #include "AthenaKernel/IIOVDbSvc.h"
 #include "AthenaKernel/IIOVSvc.h"
@@ -30,13 +28,11 @@ public:
   virtual StatusCode execute() override;
 
 private:
-  SG::ReadHandleKey<EventInfo> m_eventInfoKey{this, "EventInfoKey", "McEventInfo"};
   Gaudi::Property<std::string> m_attrListKey{this, "AttrListKey", "/DMTest/TestAttrList"};
   Gaudi::Property<std::map<int,std::string>> m_cmd{this, "Commands", {}, "Commands to be executed on LB change"};
 
   ServiceHandle<IIOVSvc> m_iovSvc;
   ServiceHandle<IIOVDbSvc> m_iovDbSvc;
-  ServiceHandle<IIncidentSvc> m_incidentSvc;
 };
 
 } // namespace DMTest
diff --git a/Control/RngComps/CMakeLists.txt b/Control/RngComps/CMakeLists.txt
index 8100c2c4fc18bc529d0d915e729c019e979b3e33..44ec2be9e3cd98301cd3642beb90f0f76ad8bddd 100644
--- a/Control/RngComps/CMakeLists.txt
+++ b/Control/RngComps/CMakeLists.txt
@@ -70,8 +70,8 @@ atlas_add_test( RNGWrapper_test
    GaudiKernel AtlasCLHEP_RandomGenerators )
 
 atlas_add_test( RandomServices_test
-                SCRIPT python/RandomServices_test.py )
+                SCRIPT test/RandomServices_test.py )
 
 # Install files from the package:
 atlas_install_python_modules( python/*.py )
-atlas_install_joboptions( share/*.py )
+atlas_install_joboptions( share/*.py test/*.py )
diff --git a/Control/RngComps/python/RngCompsConfig.py b/Control/RngComps/python/RngCompsConfig.py
new file mode 100644
index 0000000000000000000000000000000000000000..55a6c35c1307a9f88c0bf9c80f983380c21adaf9
--- /dev/null
+++ b/Control/RngComps/python/RngCompsConfig.py
@@ -0,0 +1,10 @@
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+
+from AthenaCommon import CfgMgr
+
+def getAthRNGSvc(name='AthRNGSvc', **kwargs):
+    return CfgMgr.AthRNGSvc(name, **kwargs)
+
+def getAthMixMaxRNGSvc(name='AthMixMaxRNGSvc', **kwargs):
+    kwargs.setdefault('EngineType', 'MixMax')
+    return CfgMgr.AthRNGSvc(name, **kwargs)
diff --git a/Control/RngComps/python/RngCompsConfigDb.py b/Control/RngComps/python/RngCompsConfigDb.py
new file mode 100644
index 0000000000000000000000000000000000000000..4cc9c080c57ac477f0107e4f8e740ec1dff481f0
--- /dev/null
+++ b/Control/RngComps/python/RngCompsConfigDb.py
@@ -0,0 +1,5 @@
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+
+from AthenaCommon.CfgGetter import addService
+addService("RngComps.RngCompsConfig.getAthRNGSvc", "AthRNGSvc")
+addService("RngComps.RngCompsConfig.getAthMixMaxRNGSvc", "AthMixMaxRNGSvc")
diff --git a/Control/RngComps/src/AthRNGSvc.cxx b/Control/RngComps/src/AthRNGSvc.cxx
index b3cff31072998697de79a6f780121619bf0ef0d8..d49fe7979cc0a177a71cb625faca580b8adb7e41 100644
--- a/Control/RngComps/src/AthRNGSvc.cxx
+++ b/Control/RngComps/src/AthRNGSvc.cxx
@@ -7,6 +7,7 @@
 #include "AthenaKernel/SlotSpecificObj.h"
 
 #include "AtlasCLHEP_RandomGenerators/dSFMTEngine.h"
+#include "CLHEP/Random/MixMaxRng.h"
 #include "CLHEP/Random/Ranlux64Engine.h"
 #include "CLHEP/Random/RanecuEngine.h"
 
@@ -32,11 +33,17 @@ StatusCode AthRNGSvc::initialize()
     m_fact = [](void)->CLHEP::HepRandomEngine*{
       return new CLHEP::RanecuEngine();
     };
+  } else if(m_rngType == "MixMax") {
+    m_fact = [](void)->CLHEP::HepRandomEngine*{
+      return new CLHEP::MixMaxRng();
+    };
   } else {
-    ATH_MSG_WARNING("Supported Generator types are 'dSFMT', 'Ranlux64', 'Ranecu'");
+    ATH_MSG_WARNING("Supported Generator types are 'dSFMT', 'Ranlux64', 'Ranecu', 'MixMax'");
     ATH_MSG_FATAL("Generator type \"" << m_rngType << "\" is not known. Check Joboptions");
     return StatusCode::FAILURE;
   }
+  
+  ATH_MSG_INFO("Selected random engine: \"" << m_rngType << "\"");
 
   return StatusCode::SUCCESS;
 }
diff --git a/Control/RngComps/python/RandomServices_test.py b/Control/RngComps/test/RandomServices_test.py
similarity index 92%
rename from Control/RngComps/python/RandomServices_test.py
rename to Control/RngComps/test/RandomServices_test.py
index 71d8eb0d4206f8589e0a35b8e6a0bad484a4b202..085746ca40da16cc73585b8f4f399d49d77cac7c 100755
--- a/Control/RngComps/python/RandomServices_test.py
+++ b/Control/RngComps/test/RandomServices_test.py
@@ -6,7 +6,7 @@ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 from AthenaCommon.Logging import log
 from AthenaCommon.Constants import DEBUG
 from AthenaCommon.Configurable import Configurable
-from RandomServices import dSFMT, Ranlux64, Ranecu, RNG
+from RngComps.RandomServices import dSFMT, Ranlux64, Ranecu, RNG
 
 # Set up logging and new style config
 log.setLevel(DEBUG)
diff --git a/Control/StoreGate/StoreGate/HandleKeyArray.h b/Control/StoreGate/StoreGate/HandleKeyArray.h
index 2d8256f66ea6a36ff84050ed9ee3b1e0eeb6cd7f..79483f6f05985f829c7f583bc64f1565a98422ec 100644
--- a/Control/StoreGate/StoreGate/HandleKeyArray.h
+++ b/Control/StoreGate/StoreGate/HandleKeyArray.h
@@ -102,7 +102,7 @@ namespace SG {
       for (itr = this->begin(); itr != this->end(); ++itr) {
         hndl.push_back ( T_Handle( *itr) );
       }
-      return ( std::move( hndl ) );
+      return hndl;
     }
 
     /**
@@ -116,7 +116,7 @@ namespace SG {
       for (itr = this->begin(); itr != this->end(); ++itr) {
         hndl.push_back ( T_Handle( *itr, ctx) );
       }
-      return ( std::move( hndl ) );
+      return hndl;
     }
 
   };
diff --git a/Control/StoreGate/StoreGate/VarHandleKey.h b/Control/StoreGate/StoreGate/VarHandleKey.h
index cebaf602a17b0583719e5462edf974c29c0f1139..eaae6c24807a7f6b40f4c22a662d1e4732cbc541 100644
--- a/Control/StoreGate/StoreGate/VarHandleKey.h
+++ b/Control/StoreGate/StoreGate/VarHandleKey.h
@@ -1,7 +1,7 @@
 // This file's extension implies that it's C, but it's really -*- C++ -*-.
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id$
@@ -26,6 +26,11 @@
 namespace SG {
 
 
+enum AllowEmptyEnum {
+  AllowEmpty = 1
+};
+
+
 class VarHandleBase;
 
 
@@ -120,6 +125,18 @@ public:
   StatusCode initialize (bool used = true);
 
 
+  /**
+   * @brief If this object is used as a property, then this should be called
+   *        during the initialize phase.  This variant will allow the key
+   *        to be blank.
+   * @param Flag to select this variant.  Call like
+   *@code
+   *  ATH_CHECK( key.initialize (SG::AllowEmpty) );
+   @endcode
+   */
+  StatusCode initialize (AllowEmptyEnum);
+
+
   /**
    * @brief Return the class ID for the referenced object.
    */
@@ -131,6 +148,13 @@ public:
    */
   const std::string& key() const;
 
+
+  /**
+   * @brief Test if the key is blank.
+   */
+  bool empty() const;
+
+
   /**
    * @brief Return handle to the referenced store.
    */
diff --git a/Control/StoreGate/StoreGate/VarHandleKeyArray.h b/Control/StoreGate/StoreGate/VarHandleKeyArray.h
index 97c4f9e4c15ef74864e827ae3a100ec5138c1418..e11cc7204915b25893ec24c1db0294d852829bda 100644
--- a/Control/StoreGate/StoreGate/VarHandleKeyArray.h
+++ b/Control/StoreGate/StoreGate/VarHandleKeyArray.h
@@ -28,7 +28,7 @@ namespace SG {
   class VarHandleKeyArray {
   public:
     VarHandleKeyArray(){};
-    virtual ~VarHandleKeyArray(){};
+    virtual ~VarHandleKeyArray() = default;
     virtual StatusCode assign(const std::vector<std::string>& vs)=0;
     virtual std::string toString() const = 0;
     virtual Gaudi::DataHandle::Mode mode() const = 0;
diff --git a/Control/StoreGate/src/VarHandleKey.cxx b/Control/StoreGate/src/VarHandleKey.cxx
index cb725f3af91af21bc40be7f7ca7d271d372d9895..9eeae80388a5e30c66e6e13cc3e990107f0f5c54 100644
--- a/Control/StoreGate/src/VarHandleKey.cxx
+++ b/Control/StoreGate/src/VarHandleKey.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id$
@@ -134,6 +134,24 @@ StatusCode VarHandleKey::initialize (bool used /*= true*/)
 }
 
 
+/**
+ * @brief If this object is used as a property, then this should be called
+ *        during the initialize phase.  This variant will allow the key
+ *        to be blank.
+ * @param Flag to select this variant.  Call like
+ *@code
+ *  ATH_CHECK( key.initialize (SG::AllowEmpty) );
+ @endcode
+*/
+StatusCode VarHandleKey::initialize (AllowEmptyEnum)
+{
+  if (key().empty()) {
+    return StatusCode::SUCCESS;
+  }
+  return initialize (true);
+}
+
+
 /**
  * @brief Return the class ID for the referenced object.
  */
@@ -151,6 +169,16 @@ const std::string& VarHandleKey::key() const
   return m_sgKey;
 }
 
+
+/**
+ * @brief Test if the key is blank.
+ */
+bool VarHandleKey::empty() const
+{
+  return m_sgKey.empty();
+}
+
+
 /**
  * @brief Prevent this method from being called.
  */
diff --git a/Control/StoreGate/test/VarHandleKey_test.cxx b/Control/StoreGate/test/VarHandleKey_test.cxx
index aeeb3a42a3ef975684ef8da5896186bae2bb150f..ecdc129c79b52b3fc2849f5f281d6a68e9ab1135 100644
--- a/Control/StoreGate/test/VarHandleKey_test.cxx
+++ b/Control/StoreGate/test/VarHandleKey_test.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id$
@@ -44,6 +44,7 @@ void test1()
   assert (k1.storeHandle().isSet());
   assert (k1.start().isSuccess());
   assert (!k1.isCondition());
+  assert (!k1.empty());
 
   k1 = "aab";
   assert (k1.clid() == 1234);
@@ -95,6 +96,8 @@ void test1()
   assert (!k4.storeHandle().isSet());
   assert (k4.initialize().isFailure());
   assert (k4.initialize(false).isSuccess());
+  assert (k4.initialize(SG::AllowEmpty).isSuccess());
+  assert (k4.empty());
 
   EXPECT_EXCEPTION (SG::ExcBadHandleKey,
                     SG::VarHandleKey (1237, "a/b/c", Gaudi::DataHandle::Updater));
diff --git a/DataQuality/DCSCalculator2/CMakeLists.txt b/DataQuality/DCSCalculator2/CMakeLists.txt
index 2601ce281b7dc23c9e5b95f3979c565c62c2b3b3..6863638946d8af41542bd304eff24a44911a7cfe 100644
--- a/DataQuality/DCSCalculator2/CMakeLists.txt
+++ b/DataQuality/DCSCalculator2/CMakeLists.txt
@@ -5,6 +5,13 @@
 # Declare the package name:
 atlas_subdir( DCSCalculator2 )
 
+# Declare the package's dependencies:
+atlas_depends_on_subdirs( PRIVATE
+                          Database/CoolRunQuery
+                          TileCalorimeter/TileCalib/TileCalibBlobObjs
+                          DataQuality/DQDefects
+                          DataQuality/DQUtils )
+
 # Install files from the package:
 atlas_install_python_modules( python/*.py python/subdetectors )
 atlas_install_scripts( share/*.py )
diff --git a/DataQuality/DCSCalculator2/python/subdetectors/global_system.py b/DataQuality/DCSCalculator2/python/subdetectors/global_system.py
index 01f8f1948e6a2080298748310f62b34fa9314659..d63ec4023b960c16313adfb6a7bc1b9c028909d5 100644
--- a/DataQuality/DCSCalculator2/python/subdetectors/global_system.py
+++ b/DataQuality/DCSCalculator2/python/subdetectors/global_system.py
@@ -48,6 +48,7 @@ class TDAQ_Busy(DCSC_Defect_Global_Variable):
 	counter=0
 
         for since, until, (state,) in events:
+            if state.Run == 0: continue
 	    #print state
             if state is not None:
                 deadfrac = 1-state.LiveFraction
diff --git a/DataQuality/DCSCalculator2/python/subdetectors/idbs.py b/DataQuality/DCSCalculator2/python/subdetectors/idbs.py
index 19d5defbbe4f1c3233848254bfa662dd451e4678..40365666b2a06423f199091ba0ead85bc37f667b 100644
--- a/DataQuality/DCSCalculator2/python/subdetectors/idbs.py
+++ b/DataQuality/DCSCalculator2/python/subdetectors/idbs.py
@@ -10,7 +10,7 @@ class IDBS_Beampos(DCSC_Global_Variable):
     
     input_db = "COOLOFL_INDET/CONDBR2"
     timewise_folder = False
-    fetch_args = dict(tag="IndetBeampos-ES1-UPD2")
+    fetch_args = dict(tag="IndetBeampos_cosmic_loose-RUN2")
     
     STATUSMAP = {
         59 : GREEN,
diff --git a/DataQuality/DQUtils/python/grl.py b/DataQuality/DQUtils/python/grl.py
index d34718dc1d17b00fce4f6dea341e5ee623f11c5d..d770b632e6e2804a20288e1050b4ade5e4d1efec 100644
--- a/DataQuality/DQUtils/python/grl.py
+++ b/DataQuality/DQUtils/python/grl.py
@@ -8,7 +8,7 @@ import xml.etree.cElementTree as cElementTree
 
 from .db import fetch_iovs
 from .events import process_iovs
-from .sugar import define_iov_type, IOVSet, RunLumi
+from .sugar import define_iov_type, IOVSet, RunLumi, RunLumiType
 
 @define_iov_type
 def GRL_IOV():
@@ -82,6 +82,15 @@ def make_grl(iovset, name="unknown", version="unknown"):
     result.append("</LumiRangeCollection>")
     return "\n".join(result)
 
+def grl_contains_run_lb(grl, runlb):
+    # takes IOVSet of GRL_IOV, says whether runlb is in it
+    # runlb can be RunLumi type or tuple pair
+    if isinstance(runlb, RunLumiType):
+        runlb_ = runlb
+    else:
+        runlb_ = RunLumi(*runlb)
+    return any(_.contains_point(runlb_) for _ in grl)
+
 # Deprecated alias
 def grl_iovs_from_xml(*args, **kwargs):
     from warnings import warn
diff --git a/DataQuality/DataQualityConfigurations/config/HLT/HLTegamma/heavyions_run.config b/DataQuality/DataQualityConfigurations/config/HLT/HLTegamma/heavyions_run.config
index b8adc2e8d45f52678906cdda6424542db609a984..b5020b9104af2fe0fee5cca57038882b9ca00d17 100644
--- a/DataQuality/DataQualityConfigurations/config/HLT/HLTegamma/heavyions_run.config
+++ b/DataQuality/DataQualityConfigurations/config/HLT/HLTegamma/heavyions_run.config
@@ -1,9 +1,9 @@
 ######################################################################
-# $Id: collisions_run.config Fri Nov  4 11:59:15 2016 rwhite $
+# file  egamma_ATR-18760.config  Fri Oct  5 15:53:37 2018 mifeng
 ######################################################################
 
 #######################
-# HLTegamma
+# HLTidtrk
 #######################
 
 
@@ -20,25 +20,37 @@ output top_level {
 			output Expert {
 				output Event {
 				}
-				output HLT_g13_etcut {
-					output Efficiency {
+				output HLT_e15_etcut_ion {
+					output AbsResolutions {
+						output L1Calo {
+						}
+					}
+					output Distributions {
+						output EFCalo {
+						}
 						output HLT {
 						}
+						output L1Calo {
+						}
 						output L2Calo {
+							output discriminant_binned {
+							}
 						}
-						output L2 {
+						output L2Electron {
 						}
-						output EFCalo {
+						output Offline {
+						}
+						output RoI {
 						}
 					}
-					output Distributions {
-						output Offline {
+					output Efficiency {
+						output EFCalo {
 						}
 						output HLT {
 						}
-						output EFCalo {
+						output L1Calo {
 						}
-						output L2Photon {
+						output L2 {
 						}
 						output L2Calo {
 						}
@@ -46,29 +58,43 @@ output top_level {
 					output Resolutions {
 						output HLT {
 						}
+						output L1Calo {
+						}
 						output L2Calo_vs_HLT {
 						}
 					}
 				}
-				output HLT_g15_loose {
-					output Efficiency {
+				output HLT_e15_lhloose_ion_L1EM12 {
+					output AbsResolutions {
+						output L1Calo {
+						}
+					}
+					output Distributions {
+						output EFCalo {
+						}
 						output HLT {
 						}
+						output L1Calo {
+						}
 						output L2Calo {
+							output discriminant_binned {
+							}
 						}
-						output L2 {
+						output L2Electron {
 						}
-						output EFCalo {
+						output Offline {
+						}
+						output RoI {
 						}
 					}
-					output Distributions {
-						output Offline {
+					output Efficiency {
+						output EFCalo {
 						}
 						output HLT {
 						}
-						output EFCalo {
+						output L1Calo {
 						}
-						output L2Photon {
+						output L2 {
 						}
 						output L2Calo {
 						}
@@ -76,29 +102,43 @@ output top_level {
 					output Resolutions {
 						output HLT {
 						}
+						output L1Calo {
+						}
 						output L2Calo_vs_HLT {
 						}
 					}
 				}
-				output HLT_g18_etcut {
-					output Efficiency {
+				output HLT_e15_lhmedium_ion_L1EM12 {
+					output AbsResolutions {
+						output L1Calo {
+						}
+					}
+					output Distributions {
+						output EFCalo {
+						}
 						output HLT {
 						}
+						output L1Calo {
+						}
 						output L2Calo {
+							output discriminant_binned {
+							}
 						}
-						output L2 {
+						output L2Electron {
 						}
-						output EFCalo {
+						output Offline {
+						}
+						output RoI {
 						}
 					}
-					output Distributions {
-						output Offline {
+					output Efficiency {
+						output EFCalo {
 						}
 						output HLT {
 						}
-						output EFCalo {
+						output L1Calo {
 						}
-						output L2Photon {
+						output L2 {
 						}
 						output L2Calo {
 						}
@@ -106,29 +146,43 @@ output top_level {
 					output Resolutions {
 						output HLT {
 						}
+						output L1Calo {
+						}
 						output L2Calo_vs_HLT {
 						}
 					}
 				}
-				output HLT_g20_loose {
-					output Efficiency {
+				output HLT_e15_loose_ion {
+					output AbsResolutions {
+						output L1Calo {
+						}
+					}
+					output Distributions {
+						output EFCalo {
+						}
 						output HLT {
 						}
+						output L1Calo {
+						}
 						output L2Calo {
+							output discriminant_binned {
+							}
 						}
-						output L2 {
+						output L2Electron {
 						}
-						output EFCalo {
+						output Offline {
+						}
+						output RoI {
 						}
 					}
-					output Distributions {
-						output Offline {
+					output Efficiency {
+						output EFCalo {
 						}
 						output HLT {
 						}
-						output EFCalo {
+						output L1Calo {
 						}
-						output L2Photon {
+						output L2 {
 						}
 						output L2Calo {
 						}
@@ -136,29 +190,43 @@ output top_level {
 					output Resolutions {
 						output HLT {
 						}
+						output L1Calo {
+						}
 						output L2Calo_vs_HLT {
 						}
 					}
 				}
-				output HLT_g35_loose {
-					output Efficiency {
+				output HLT_e15_medium_ion {
+					output AbsResolutions {
+						output L1Calo {
+						}
+					}
+					output Distributions {
+						output EFCalo {
+						}
 						output HLT {
 						}
+						output L1Calo {
+						}
 						output L2Calo {
+							output discriminant_binned {
+							}
 						}
-						output L2 {
+						output L2Electron {
 						}
-						output EFCalo {
+						output Offline {
+						}
+						output RoI {
 						}
 					}
-					output Distributions {
-						output Offline {
+					output Efficiency {
+						output EFCalo {
 						}
 						output HLT {
 						}
-						output EFCalo {
+						output L1Calo {
 						}
-						output L2Photon {
+						output L2 {
 						}
 						output L2Calo {
 						}
@@ -166,29 +234,43 @@ output top_level {
 					output Resolutions {
 						output HLT {
 						}
+						output L1Calo {
+						}
 						output L2Calo_vs_HLT {
 						}
 					}
 				}
-				output HLT_e15_etcut {
-					output Efficiency {
+				output HLT_e18_etcut_ion {
+					output AbsResolutions {
+						output L1Calo {
+						}
+					}
+					output Distributions {
+						output EFCalo {
+						}
 						output HLT {
 						}
+						output L1Calo {
+						}
 						output L2Calo {
+							output discriminant_binned {
+							}
 						}
-						output L2 {
+						output L2Electron {
 						}
-						output EFCalo {
+						output Offline {
+						}
+						output RoI {
 						}
 					}
-					output Distributions {
-						output Offline {
+					output Efficiency {
+						output EFCalo {
 						}
 						output HLT {
 						}
-						output EFCalo {
+						output L1Calo {
 						}
-						output L2Electron {
+						output L2 {
 						}
 						output L2Calo {
 						}
@@ -196,29 +278,43 @@ output top_level {
 					output Resolutions {
 						output HLT {
 						}
+						output L1Calo {
+						}
 						output L2Calo_vs_HLT {
 						}
 					}
 				}
-				output HLT_e15_lhloose {
-					output Efficiency {
+				output HLT_e18_lhloose_ion {
+					output AbsResolutions {
+						output L1Calo {
+						}
+					}
+					output Distributions {
+						output EFCalo {
+						}
 						output HLT {
 						}
+						output L1Calo {
+						}
 						output L2Calo {
+							output discriminant_binned {
+							}
 						}
-						output L2 {
+						output L2Electron {
 						}
-						output EFCalo {
+						output Offline {
+						}
+						output RoI {
 						}
 					}
-					output Distributions {
-						output Offline {
+					output Efficiency {
+						output EFCalo {
 						}
 						output HLT {
 						}
-						output EFCalo {
+						output L1Calo {
 						}
-						output L2Electron {
+						output L2 {
 						}
 						output L2Calo {
 						}
@@ -226,29 +322,43 @@ output top_level {
 					output Resolutions {
 						output HLT {
 						}
+						output L1Calo {
+						}
 						output L2Calo_vs_HLT {
 						}
 					}
 				}
-				output HLT_e17_lhloose {
-					output Efficiency {
+				output HLT_e18_lhmedium_ion {
+					output AbsResolutions {
+						output L1Calo {
+						}
+					}
+					output Distributions {
+						output EFCalo {
+						}
 						output HLT {
 						}
+						output L1Calo {
+						}
 						output L2Calo {
+							output discriminant_binned {
+							}
 						}
-						output L2 {
+						output L2Electron {
 						}
-						output EFCalo {
+						output Offline {
+						}
+						output RoI {
 						}
 					}
-					output Distributions {
-						output Offline {
+					output Efficiency {
+						output EFCalo {
 						}
 						output HLT {
 						}
-						output EFCalo {
+						output L1Calo {
 						}
-						output L2Electron {
+						output L2 {
 						}
 						output L2Calo {
 						}
@@ -256,29 +366,43 @@ output top_level {
 					output Resolutions {
 						output HLT {
 						}
+						output L1Calo {
+						}
 						output L2Calo_vs_HLT {
 						}
 					}
 				}
-				output HLT_e15_lhloose_nod0 {
-					output Efficiency {
+				output HLT_e18_loose_ion {
+					output AbsResolutions {
+						output L1Calo {
+						}
+					}
+					output Distributions {
+						output EFCalo {
+						}
 						output HLT {
 						}
+						output L1Calo {
+						}
 						output L2Calo {
+							output discriminant_binned {
+							}
 						}
-						output L2 {
+						output L2Electron {
 						}
-						output EFCalo {
+						output Offline {
+						}
+						output RoI {
 						}
 					}
-					output Distributions {
-						output Offline {
+					output Efficiency {
+						output EFCalo {
 						}
 						output HLT {
 						}
-						output EFCalo {
+						output L1Calo {
 						}
-						output L2Electron {
+						output L2 {
 						}
 						output L2Calo {
 						}
@@ -286,29 +410,43 @@ output top_level {
 					output Resolutions {
 						output HLT {
 						}
+						output L1Calo {
+						}
 						output L2Calo_vs_HLT {
 						}
 					}
 				}
-				output HLT_e15_loose {
-					output Efficiency {
+				output HLT_e18_medium_ion {
+					output AbsResolutions {
+						output L1Calo {
+						}
+					}
+					output Distributions {
+						output EFCalo {
+						}
 						output HLT {
 						}
+						output L1Calo {
+						}
 						output L2Calo {
+							output discriminant_binned {
+							}
 						}
-						output L2 {
+						output L2Electron {
 						}
-						output EFCalo {
+						output Offline {
+						}
+						output RoI {
 						}
 					}
-					output Distributions {
-						output Offline {
+					output Efficiency {
+						output EFCalo {
 						}
 						output HLT {
 						}
-						output EFCalo {
+						output L1Calo {
 						}
-						output L2Electron {
+						output L2 {
 						}
 						output L2Calo {
 						}
@@ -316,29 +454,43 @@ output top_level {
 					output Resolutions {
 						output HLT {
 						}
+						output L1Calo {
+						}
 						output L2Calo_vs_HLT {
 						}
 					}
 				}
-				output HLT_e17_lhloose_nod0 {
-					output Efficiency {
+				output HLT_e20_loose_ion {
+					output AbsResolutions {
+						output L1Calo {
+						}
+					}
+					output Distributions {
+						output EFCalo {
+						}
 						output HLT {
 						}
+						output L1Calo {
+						}
 						output L2Calo {
+							output discriminant_binned {
+							}
 						}
-						output L2 {
+						output L2Electron {
 						}
-						output EFCalo {
+						output Offline {
+						}
+						output RoI {
 						}
 					}
-					output Distributions {
-						output Offline {
+					output Efficiency {
+						output EFCalo {
 						}
 						output HLT {
 						}
-						output EFCalo {
+						output L1Calo {
 						}
-						output L2Electron {
+						output L2 {
 						}
 						output L2Calo {
 						}
@@ -346,29 +498,43 @@ output top_level {
 					output Resolutions {
 						output HLT {
 						}
+						output L1Calo {
+						}
 						output L2Calo_vs_HLT {
 						}
 					}
 				}
-				output HLT_e22_lhloose_nod0 {
-					output Efficiency {
+				output HLT_g13_etcut_ion {
+					output AbsResolutions {
+						output L1Calo {
+						}
+					}
+					output Distributions {
+						output EFCalo {
+						}
 						output HLT {
 						}
+						output L1Calo {
+						}
 						output L2Calo {
+							output discriminant_binned {
+							}
 						}
-						output L2 {
+						output L2Photon {
 						}
-						output EFCalo {
+						output Offline {
+						}
+						output RoI {
 						}
 					}
-					output Distributions {
-						output Offline {
+					output Efficiency {
+						output EFCalo {
 						}
 						output HLT {
 						}
-						output EFCalo {
+						output L1Calo {
 						}
-						output L2Electron {
+						output L2 {
 						}
 						output L2Calo {
 						}
@@ -376,15334 +542,27828 @@ output top_level {
 					output Resolutions {
 						output HLT {
 						}
+						output L1Calo {
+						}
 						output L2Calo_vs_HLT {
 						}
 					}
 				}
-			}
-			output Shifter {
-				output primary_single_pho {
-				}
-				output primary_single_ele {
-				}
-				output primary_single_ele_cutbased {
-				}
-			}
-		}
-	}
-}
-
-
-#######################
-# Histogram Assessments
+				output HLT_g15_loose_ion {
+					output AbsResolutions {
+						output L1Calo {
+						}
+					}
+					output Distributions {
+						output EFCalo {
+						}
+						output HLT {
+						}
+						output L1Calo {
+						}
+						output L2Calo {
+							output discriminant_binned {
+							}
+						}
+						output L2Photon {
+						}
+						output Offline {
+						}
+						output RoI {
+						}
+					}
+					output Efficiency {
+						output EFCalo {
+						}
+						output HLT {
+						}
+						output L1Calo {
+						}
+						output L2 {
+						}
+						output L2Calo {
+						}
+					}
+					output Resolutions {
+						output HLT {
+						}
+						output L1Calo {
+						}
+						output L2Calo_vs_HLT {
+						}
+					}
+				}
+				output HLT_g18_etcut_ion {
+					output AbsResolutions {
+						output L1Calo {
+						}
+					}
+					output Distributions {
+						output EFCalo {
+						}
+						output HLT {
+						}
+						output L1Calo {
+						}
+						output L2Calo {
+							output discriminant_binned {
+							}
+						}
+						output L2Photon {
+						}
+						output Offline {
+						}
+						output RoI {
+						}
+					}
+					output Efficiency {
+						output EFCalo {
+						}
+						output HLT {
+						}
+						output L1Calo {
+						}
+						output L2 {
+						}
+						output L2Calo {
+						}
+					}
+					output Resolutions {
+						output HLT {
+						}
+						output L1Calo {
+						}
+						output L2Calo_vs_HLT {
+						}
+					}
+				}
+				output HLT_g20_loose_ion {
+					output AbsResolutions {
+						output L1Calo {
+						}
+					}
+					output Distributions {
+						output EFCalo {
+						}
+						output HLT {
+						}
+						output L1Calo {
+						}
+						output L2Calo {
+							output discriminant_binned {
+							}
+						}
+						output L2Photon {
+						}
+						output Offline {
+						}
+						output RoI {
+						}
+					}
+					output Efficiency {
+						output EFCalo {
+						}
+						output HLT {
+						}
+						output L1Calo {
+						}
+						output L2 {
+						}
+						output L2Calo {
+						}
+					}
+					output Resolutions {
+						output HLT {
+						}
+						output L1Calo {
+						}
+						output L2Calo_vs_HLT {
+						}
+					}
+				}
+			}
+			output Shifter {
+				output primary_single_ele {
+				}
+				output primary_single_ele_cutbased {
+				}
+				output primary_single_pho {
+				}
+			}
+		}
+	}
+}
+
+
+#######################
+# Histogram Assessments
 #######################
 
 dir HLT {
 	dir Egamma {
 		dir Expert {
 			dir Event {
-				hist Photons_electrons {
-					algorithm   	= HLT_Histogram_Not_Empty&GatherData
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-					output      	= HLT/TREG/Expert/Event
-					display     	= StatBox
-				}
-				hist Photons_trigger_counts {
-					algorithm   	= HLT_Histogram_Not_Empty&GatherData
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-					output      	= HLT/TREG/Expert/Event
-					display     	= StatBox
-				}
 				hist Electrons_electrons {
-					algorithm   	= HLT_Histogram_Not_Empty&GatherData
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
+					algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+					description 	= DQWebdisplay ATR-18760
 					output      	= HLT/TREG/Expert/Event
 					display     	= StatBox
 				}
 				hist Electrons_trigger_counts {
-					algorithm   	= HLT_Histogram_Not_Empty&GatherData
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-					output      	= HLT/TREG/Expert/Event
-					display     	= StatBox
-				}
-				hist Zee_ProbeCutCounter {
-					algorithm   	= HLT_Histogram_Not_Empty&GatherData
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-					output      	= HLT/TREG/Expert/Event
-					display     	= StatBox
-				}
-				hist Zee_TagCutCounter {
-					algorithm   	= HLT_Histogram_Not_Empty&GatherData
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-					output      	= HLT/TREG/Expert/Event
-					display     	= StatBox
-				}
-				hist Zee_Mee {
-					algorithm   	= HLT_Histogram_Not_Empty&GatherData
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-					output      	= HLT/TREG/Expert/Event
-					display     	= StatBox
-				}
-				hist Zee_CutCounter {
-					algorithm   	= HLT_Histogram_Not_Empty&GatherData
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-					output      	= HLT/TREG/Expert/Event
-					display     	= StatBox
-				}
-				hist Zee_trigger_counts {
-					algorithm   	= HLT_Histogram_Not_Empty&GatherData
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-					output      	= HLT/TREG/Expert/Event
-					display     	= StatBox
-				}
-				hist Zee_nProbes {
-					algorithm   	= HLT_Histogram_Not_Empty&GatherData
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-					output      	= HLT/TREG/Expert/Event
-					display     	= StatBox
-				}
-				hist Zee_nProbesL1 {
-					algorithm   	= HLT_Histogram_Not_Empty&GatherData
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-					output      	= HLT/TREG/Expert/Event
-					display     	= StatBox
-				}
-				hist Zee_nProbesL2 {
-					algorithm   	= HLT_Histogram_Not_Empty&GatherData
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-					output      	= HLT/TREG/Expert/Event
-					display     	= StatBox
-				}
-				hist Zee_nProbesL2Calo {
-					algorithm   	= HLT_Histogram_Not_Empty&GatherData
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-					output      	= HLT/TREG/Expert/Event
-					display     	= StatBox
-				}
-				hist Zee_nProbesEFCalo {
-					algorithm   	= HLT_Histogram_Not_Empty&GatherData
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-					output      	= HLT/TREG/Expert/Event
-					display     	= StatBox
-				}
-				hist Zee_nProbesHLT {
-					algorithm   	= HLT_Histogram_Not_Empty&GatherData
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-					output      	= HLT/TREG/Expert/Event
-					display     	= StatBox
-				}
-				hist Zee_EffL1 {
-					algorithm   	= HLT_Histogram_Not_Empty&GatherData
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-					output      	= HLT/TREG/Expert/Event
-					display     	= StatBox
-				}
-				hist Zee_EffL2 {
-					algorithm   	= HLT_Histogram_Not_Empty&GatherData
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
+					algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+					description 	= DQWebdisplay ATR-18760
 					output      	= HLT/TREG/Expert/Event
 					display     	= StatBox
 				}
-				hist Zee_EffL2Calo {
-					algorithm   	= HLT_Histogram_Not_Empty&GatherData
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-					output      	= HLT/TREG/Expert/Event
-					display     	= StatBox
-				}
-				hist Zee_EffEFCalo {
-					algorithm   	= HLT_Histogram_Not_Empty&GatherData
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
+				hist Photons_electrons {
+					algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+					description 	= DQWebdisplay ATR-18760
 					output      	= HLT/TREG/Expert/Event
 					display     	= StatBox
 				}
-				hist Zee_EffHLT {
-					algorithm   	= HLT_Histogram_Not_Empty&GatherData
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
+				hist Photons_trigger_counts {
+					algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+					description 	= DQWebdisplay ATR-18760
 					output      	= HLT/TREG/Expert/Event
 					display     	= StatBox
 				}
 			}
-			dir HLT_g13_etcut {
-				dir Efficiency {
+			dir HLT_e15_etcut_ion {
+				dir AbsResolutions {
+					dir L1Calo {
+						hist res_etVsEta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/AbsResolutions/L1Calo
+							display     	= StatBox
+						}
+					}
+				}
+				dir Distributions {
+					dir EFCalo {
+						hist energy {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/EFCalo
+							display     	= StatBox
+						}
+						hist energyBE0 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/EFCalo
+							display     	= StatBox
+						}
+						hist energyBE1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/EFCalo
+							display     	= StatBox
+						}
+						hist energyBE2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/EFCalo
+							display     	= StatBox
+						}
+						hist energyBE3 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/EFCalo
+							display     	= StatBox
+						}
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/EFCalo
+							display     	= StatBox
+						}
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/EFCalo
+							display     	= StatBox
+						}
+						hist eta_calo {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/EFCalo
+							display     	= StatBox
+						}
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/EFCalo
+							display     	= StatBox
+						}
+						hist phi_calo {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/EFCalo
+							display     	= StatBox
+						}
+					}
 					dir HLT {
-						hist eff_pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Efficiency/HLT
+						hist Reta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist Rhad {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist Rhad1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist Rphi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist charge {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist d0 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist d0sig {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist deta1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist deta1_EMEBA {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist deta1_EMEBC {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist deta1_EMECA {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist deta1_EMECC {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist deta2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist dphi2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist dphiresc {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist eprobht {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist eratio {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist ethad {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist ethad1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist f1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist f3 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist npixhits {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist nscthits {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist ptcone20 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist ptcone20_rel {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist ptvarcone20 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist ptvarcone20_rel {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist rejection {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist topoetcone20 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist topoetcone20_rel {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist topoetcone40_shift {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist topoetcone40_shift_rel {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist weta1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist weta2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/HLT
+							display     	= StatBox
+						}
+					}
+					dir L1Calo {
+						hist emClusVsEmIsol {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/L1Calo
+							display     	= StatBox
+						}
+						hist emClusVsEta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/L1Calo
+							display     	= StatBox
+						}
+						hist emClusVsHadCore {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/L1Calo
+							display     	= StatBox
+						}
+						hist emIso {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/L1Calo
+							display     	= StatBox
+						}
+						hist energy {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/L1Calo
+							display     	= StatBox
+						}
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/L1Calo
+							display     	= StatBox
+						}
+						hist hadCore {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/L1Calo
+							display     	= StatBox
+						}
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/L1Calo
+							display     	= StatBox
+						}
+						hist roi_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/L1Calo
+							display     	= StatBox
+						}
+					}
+					dir L2Calo {
+						hist discriminant {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/L2Calo
+							display     	= StatBox
+						}
+						hist discriminantVsMu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/L2Calo
+							display     	= StatBox
+						}
+						dir discriminant_binned {
+							hist discriminantVsMu_et_0_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_0_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_0_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_0_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_0_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_1_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_1_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_1_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_1_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_1_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_2_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_2_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_2_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_2_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_2_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_3_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_3_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_3_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_3_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_3_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_4_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_4_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_4_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_4_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_4_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_0_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_0_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_0_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_0_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_0_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_1_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_1_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_1_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_1_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_1_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_2_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_2_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_2_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_2_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_2_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_3_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_3_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_3_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_3_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_3_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_4_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_4_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_4_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_4_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_4_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+						}
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/L2Calo
+							display     	= StatBox
+						}
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/L2Calo
+							display     	= StatBox
+						}
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/L2Calo
+							display     	= StatBox
+						}
+					}
+					dir L2Electron {
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/L2Electron
+							display     	= StatBox
+						}
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/L2Electron
+							display     	= StatBox
+						}
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/L2Electron
+							display     	= StatBox
+						}
+						hist trkClusDeta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/L2Electron
+							display     	= StatBox
+						}
+						hist trkClusDphi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/L2Electron
+							display     	= StatBox
+						}
+					}
+					dir Offline {
+						hist Reta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist Rhad {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist Rhad1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist Rphi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist charge {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist d0 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist d0sig {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist deta1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist deta1_EMEBA {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist deta1_EMEBC {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist deta1_EMECA {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist deta1_EMECC {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist deta2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist dphi2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist dphiresc {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist eprobht {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist eratio {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist ethad {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist ethad1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist f1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist f3 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist npixhits {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist nscthits {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist ptcone20 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist ptcone20_rel {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist ptvarcone20 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist ptvarcone20_rel {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist rejection {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist topoetcone20 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist topoetcone20_rel {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist topoetcone40_shift {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist topoetcone40_shift_rel {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist weta1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist weta2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/Offline
+							display     	= StatBox
+						}
+					}
+					dir RoI {
+						hist roi_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/RoI
+							display     	= StatBox
+						}
+						hist roi_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Distributions/RoI
+							display     	= StatBox
+						}
+					}
+				}
+				dir Efficiency {
+					dir EFCalo {
+						hist eff_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Efficiency/EFCalo
+							display     	= StatBox
+						}
+						hist eff_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Efficiency/EFCalo
+							display     	= StatBox
+						}
+						hist eff_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Efficiency/EFCalo
+							display     	= StatBox
+						}
+						hist eff_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Efficiency/EFCalo
+							display     	= StatBox
+						}
+						hist eff_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Efficiency/EFCalo
+							display     	= StatBox
+						}
+						hist eff_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Efficiency/EFCalo
+							display     	= StatBox
+						}
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Efficiency/EFCalo
+							display     	= StatBox
+						}
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Efficiency/EFCalo
+							display     	= StatBox
+						}
+						hist highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Efficiency/EFCalo
+							display     	= StatBox
+						}
+						hist match_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Efficiency/EFCalo
+							display     	= StatBox
+						}
+						hist match_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Efficiency/EFCalo
+							display     	= StatBox
+						}
+						hist match_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Efficiency/EFCalo
+							display     	= StatBox
+						}
+						hist match_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Efficiency/EFCalo
+							display     	= StatBox
+						}
+						hist match_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Efficiency/EFCalo
+							display     	= StatBox
+						}
+						hist match_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Efficiency/EFCalo
+							display     	= StatBox
+						}
+						hist mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Efficiency/EFCalo
+							display     	= StatBox
+						}
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Efficiency/EFCalo
+							display     	= StatBox
+						}
+						hist pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Efficiency/EFCalo
+							display     	= StatBox
+						}
+					}
+					dir HLT {
+						hist FailisEMLHMedium {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist IneffisEMLHMedium {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist coarse_et_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist eff_coarse_et_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist eff_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist eff_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist eff_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist eff_hltreco {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist eff_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist eff_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist eff_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist eff_triggerstep {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist match_coarse_et_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist match_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist match_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist match_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist match_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist match_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist match_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Efficiency/HLT
+							display     	= StatBox
+						}
+					}
+					dir L1Calo {
+						hist coarse_et_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Efficiency/L1Calo
+							display     	= StatBox
+						}
+						hist eff_coarse_et_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Efficiency/L1Calo
+							display     	= StatBox
+						}
+						hist eff_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Efficiency/L1Calo
+							display     	= StatBox
+						}
+						hist eff_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Efficiency/L1Calo
+							display     	= StatBox
+						}
+						hist eff_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Efficiency/L1Calo
+							display     	= StatBox
+						}
+						hist eff_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Efficiency/L1Calo
+							display     	= StatBox
+						}
+						hist eff_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Efficiency/L1Calo
+							display     	= StatBox
+						}
+						hist eff_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Efficiency/L1Calo
+							display     	= StatBox
+						}
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Efficiency/L1Calo
+							display     	= StatBox
+						}
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Efficiency/L1Calo
+							display     	= StatBox
+						}
+						hist highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Efficiency/L1Calo
+							display     	= StatBox
+						}
+						hist match_coarse_et_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Efficiency/L1Calo
+							display     	= StatBox
+						}
+						hist match_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Efficiency/L1Calo
+							display     	= StatBox
+						}
+						hist match_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Efficiency/L1Calo
+							display     	= StatBox
+						}
+						hist match_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Efficiency/L1Calo
+							display     	= StatBox
+						}
+						hist match_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Efficiency/L1Calo
+							display     	= StatBox
+						}
+						hist match_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Efficiency/L1Calo
+							display     	= StatBox
+						}
+						hist match_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Efficiency/L1Calo
+							display     	= StatBox
+						}
+						hist mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Efficiency/L1Calo
+							display     	= StatBox
+						}
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Efficiency/L1Calo
+							display     	= StatBox
+						}
+						hist pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Efficiency/L1Calo
+							display     	= StatBox
+						}
+					}
+					dir L2 {
+						hist eff_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Efficiency/L2
+							display     	= StatBox
+						}
+						hist eff_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Efficiency/L2
+							display     	= StatBox
+						}
+						hist eff_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Efficiency/L2
+							display     	= StatBox
+						}
+						hist eff_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Efficiency/L2
+							display     	= StatBox
+						}
+						hist eff_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Efficiency/L2
+							display     	= StatBox
+						}
+						hist eff_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Efficiency/L2
+							display     	= StatBox
+						}
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Efficiency/L2
+							display     	= StatBox
+						}
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Efficiency/L2
+							display     	= StatBox
+						}
+						hist highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Efficiency/L2
+							display     	= StatBox
+						}
+						hist match_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Efficiency/L2
+							display     	= StatBox
+						}
+						hist match_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Efficiency/L2
+							display     	= StatBox
+						}
+						hist match_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Efficiency/L2
+							display     	= StatBox
+						}
+						hist match_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Efficiency/L2
+							display     	= StatBox
+						}
+						hist match_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Efficiency/L2
+							display     	= StatBox
+						}
+						hist match_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Efficiency/L2
+							display     	= StatBox
+						}
+						hist mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Efficiency/L2
+							display     	= StatBox
+						}
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Efficiency/L2
+							display     	= StatBox
+						}
+						hist pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Efficiency/L2
+							display     	= StatBox
+						}
+					}
+					dir L2Calo {
+						hist eff_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Efficiency/L2Calo
+							display     	= StatBox
+						}
+						hist eff_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Efficiency/L2Calo
+							display     	= StatBox
+						}
+						hist eff_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Efficiency/L2Calo
+							display     	= StatBox
+						}
+						hist eff_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Efficiency/L2Calo
+							display     	= StatBox
+						}
+						hist eff_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Efficiency/L2Calo
+							display     	= StatBox
+						}
+						hist eff_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Efficiency/L2Calo
+							display     	= StatBox
+						}
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Efficiency/L2Calo
+							display     	= StatBox
+						}
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Efficiency/L2Calo
+							display     	= StatBox
+						}
+						hist highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Efficiency/L2Calo
+							display     	= StatBox
+						}
+						hist match_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Efficiency/L2Calo
+							display     	= StatBox
+						}
+						hist match_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Efficiency/L2Calo
+							display     	= StatBox
+						}
+						hist match_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Efficiency/L2Calo
+							display     	= StatBox
+						}
+						hist match_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Efficiency/L2Calo
+							display     	= StatBox
+						}
+						hist match_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Efficiency/L2Calo
+							display     	= StatBox
+						}
+						hist match_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Efficiency/L2Calo
+							display     	= StatBox
+						}
+						hist mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Efficiency/L2Calo
+							display     	= StatBox
+						}
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Efficiency/L2Calo
+							display     	= StatBox
+						}
+						hist pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Efficiency/L2Calo
+							display     	= StatBox
+						}
+					}
+				}
+				dir Resolutions {
+					dir HLT {
+						hist res_Reta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_Rhad {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_Rhad1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_Rphi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_d0 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_d0sig {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_deta1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_deta2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_dphi2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_dphiresc {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_eprobht {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_eprobhtVsPt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_eprobht_onVsOff {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_eratio {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_etInEta0 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_etInEta1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_etInEta2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_etInEta3 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_etVsEt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_etVsEta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_ethad {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_ethad1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_f1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_f3 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_npixhits {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_nscthits {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_weta1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_weta2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_wtots1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Resolutions/HLT
+							display     	= StatBox
+						}
+					}
+					dir L1Calo {
+						hist res_etVsEta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Resolutions/L1Calo
+							display     	= StatBox
+						}
+					}
+					dir L2Calo_vs_HLT {
+						hist res_Reta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Resolutions/L2Calo_vs_HLT
+							display     	= StatBox
+						}
+						hist res_Rhad {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Resolutions/L2Calo_vs_HLT
+							display     	= StatBox
+						}
+						hist res_Rhad1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Resolutions/L2Calo_vs_HLT
+							display     	= StatBox
+						}
+						hist res_Rphi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Resolutions/L2Calo_vs_HLT
+							display     	= StatBox
+						}
+						hist res_eratio {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Resolutions/L2Calo_vs_HLT
+							display     	= StatBox
+						}
+						hist res_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Resolutions/L2Calo_vs_HLT
+							display     	= StatBox
+						}
+						hist res_etVsEt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Resolutions/L2Calo_vs_HLT
+							display     	= StatBox
+						}
+						hist res_etVsEta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Resolutions/L2Calo_vs_HLT
+							display     	= StatBox
+						}
+						hist res_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Resolutions/L2Calo_vs_HLT
+							display     	= StatBox
+						}
+						hist res_ethad {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Resolutions/L2Calo_vs_HLT
+							display     	= StatBox
+						}
+						hist res_ethad1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Resolutions/L2Calo_vs_HLT
+							display     	= StatBox
+						}
+						hist res_f1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Resolutions/L2Calo_vs_HLT
+							display     	= StatBox
+						}
+						hist res_f3 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Resolutions/L2Calo_vs_HLT
+							display     	= StatBox
+						}
+						hist res_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Resolutions/L2Calo_vs_HLT
+							display     	= StatBox
+						}
+						hist res_weta1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Resolutions/L2Calo_vs_HLT
+							display     	= StatBox
+						}
+						hist res_weta2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_etcut_ion/Resolutions/L2Calo_vs_HLT
+							display     	= StatBox
+						}
+					}
+				}
+			}
+			dir HLT_e15_lhloose_ion_L1EM12 {
+				dir AbsResolutions {
+					dir L1Calo {
+						hist res_etVsEta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/AbsResolutions/L1Calo
+							display     	= StatBox
+						}
+					}
+				}
+				dir Distributions {
+					dir EFCalo {
+						hist energy {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/EFCalo
+							display     	= StatBox
+						}
+						hist energyBE0 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/EFCalo
+							display     	= StatBox
+						}
+						hist energyBE1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/EFCalo
+							display     	= StatBox
+						}
+						hist energyBE2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/EFCalo
+							display     	= StatBox
+						}
+						hist energyBE3 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/EFCalo
+							display     	= StatBox
+						}
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/EFCalo
+							display     	= StatBox
+						}
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/EFCalo
+							display     	= StatBox
+						}
+						hist eta_calo {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/EFCalo
+							display     	= StatBox
+						}
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/EFCalo
+							display     	= StatBox
+						}
+						hist phi_calo {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/EFCalo
+							display     	= StatBox
+						}
+					}
+					dir HLT {
+						hist Reta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/HLT
+							display     	= StatBox
+						}
+						hist Rhad {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/HLT
+							display     	= StatBox
+						}
+						hist Rhad1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/HLT
+							display     	= StatBox
+						}
+						hist Rphi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/HLT
+							display     	= StatBox
+						}
+						hist charge {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/HLT
+							display     	= StatBox
+						}
+						hist d0 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/HLT
+							display     	= StatBox
+						}
+						hist d0sig {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/HLT
+							display     	= StatBox
+						}
+						hist deta1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/HLT
+							display     	= StatBox
+						}
+						hist deta1_EMEBA {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/HLT
+							display     	= StatBox
+						}
+						hist deta1_EMEBC {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/HLT
+							display     	= StatBox
+						}
+						hist deta1_EMECA {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/HLT
+							display     	= StatBox
+						}
+						hist deta1_EMECC {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/HLT
+							display     	= StatBox
+						}
+						hist deta2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/HLT
+							display     	= StatBox
+						}
+						hist dphi2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/HLT
+							display     	= StatBox
+						}
+						hist dphiresc {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/HLT
+							display     	= StatBox
+						}
+						hist eprobht {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/HLT
+							display     	= StatBox
+						}
+						hist eratio {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/HLT
+							display     	= StatBox
+						}
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/HLT
+							display     	= StatBox
+						}
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/HLT
+							display     	= StatBox
+						}
+						hist ethad {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/HLT
+							display     	= StatBox
+						}
+						hist ethad1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/HLT
+							display     	= StatBox
+						}
+						hist f1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/HLT
+							display     	= StatBox
+						}
+						hist f3 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/HLT
+							display     	= StatBox
+						}
+						hist highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/HLT
+							display     	= StatBox
+						}
+						hist npixhits {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/HLT
+							display     	= StatBox
+						}
+						hist nscthits {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/HLT
+							display     	= StatBox
+						}
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/HLT
+							display     	= StatBox
+						}
+						hist pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/HLT
+							display     	= StatBox
+						}
+						hist ptcone20 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/HLT
+							display     	= StatBox
+						}
+						hist ptcone20_rel {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/HLT
+							display     	= StatBox
+						}
+						hist ptvarcone20 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/HLT
+							display     	= StatBox
+						}
+						hist ptvarcone20_rel {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/HLT
+							display     	= StatBox
+						}
+						hist rejection {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/HLT
+							display     	= StatBox
+						}
+						hist topoetcone20 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/HLT
+							display     	= StatBox
+						}
+						hist topoetcone20_rel {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/HLT
+							display     	= StatBox
+						}
+						hist topoetcone40_shift {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/HLT
+							display     	= StatBox
+						}
+						hist topoetcone40_shift_rel {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/HLT
+							display     	= StatBox
+						}
+						hist weta1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/HLT
+							display     	= StatBox
+						}
+						hist weta2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/HLT
+							display     	= StatBox
+						}
+					}
+					dir L1Calo {
+						hist emClusVsEmIsol {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/L1Calo
+							display     	= StatBox
+						}
+						hist emClusVsEta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/L1Calo
+							display     	= StatBox
+						}
+						hist emClusVsHadCore {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/L1Calo
+							display     	= StatBox
+						}
+						hist emIso {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/L1Calo
+							display     	= StatBox
+						}
+						hist energy {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/L1Calo
+							display     	= StatBox
+						}
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/L1Calo
+							display     	= StatBox
+						}
+						hist hadCore {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/L1Calo
+							display     	= StatBox
+						}
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/L1Calo
+							display     	= StatBox
+						}
+						hist roi_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/L1Calo
+							display     	= StatBox
+						}
+					}
+					dir L2Calo {
+						hist discriminant {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/L2Calo
+							display     	= StatBox
+						}
+						hist discriminantVsMu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/L2Calo
+							display     	= StatBox
+						}
+						dir discriminant_binned {
+							hist discriminantVsMu_et_0_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_0_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_0_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_0_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_0_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_1_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_1_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_1_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_1_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_1_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_2_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_2_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_2_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_2_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_2_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_3_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_3_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_3_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_3_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_3_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_4_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_4_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_4_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_4_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_4_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_0_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_0_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_0_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_0_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_0_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_1_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_1_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_1_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_1_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_1_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_2_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_2_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_2_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_2_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_2_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_3_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_3_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_3_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_3_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_3_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_4_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_4_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_4_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_4_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_4_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+						}
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/L2Calo
+							display     	= StatBox
+						}
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/L2Calo
+							display     	= StatBox
+						}
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/L2Calo
+							display     	= StatBox
+						}
+					}
+					dir L2Electron {
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/L2Electron
+							display     	= StatBox
+						}
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/L2Electron
+							display     	= StatBox
+						}
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/L2Electron
+							display     	= StatBox
+						}
+						hist trkClusDeta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/L2Electron
+							display     	= StatBox
+						}
+						hist trkClusDphi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/L2Electron
+							display     	= StatBox
+						}
+					}
+					dir Offline {
+						hist Reta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/Offline
+							display     	= StatBox
+						}
+						hist Rhad {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/Offline
+							display     	= StatBox
+						}
+						hist Rhad1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/Offline
+							display     	= StatBox
+						}
+						hist Rphi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/Offline
+							display     	= StatBox
+						}
+						hist charge {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/Offline
+							display     	= StatBox
+						}
+						hist d0 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/Offline
+							display     	= StatBox
+						}
+						hist d0sig {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/Offline
+							display     	= StatBox
+						}
+						hist deta1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/Offline
+							display     	= StatBox
+						}
+						hist deta1_EMEBA {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/Offline
+							display     	= StatBox
+						}
+						hist deta1_EMEBC {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/Offline
+							display     	= StatBox
+						}
+						hist deta1_EMECA {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/Offline
+							display     	= StatBox
+						}
+						hist deta1_EMECC {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/Offline
+							display     	= StatBox
+						}
+						hist deta2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/Offline
+							display     	= StatBox
+						}
+						hist dphi2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/Offline
+							display     	= StatBox
+						}
+						hist dphiresc {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/Offline
+							display     	= StatBox
+						}
+						hist eprobht {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/Offline
+							display     	= StatBox
+						}
+						hist eratio {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/Offline
+							display     	= StatBox
+						}
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/Offline
+							display     	= StatBox
+						}
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/Offline
+							display     	= StatBox
+						}
+						hist ethad {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/Offline
+							display     	= StatBox
+						}
+						hist ethad1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/Offline
+							display     	= StatBox
+						}
+						hist f1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/Offline
+							display     	= StatBox
+						}
+						hist f3 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/Offline
+							display     	= StatBox
+						}
+						hist highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/Offline
+							display     	= StatBox
+						}
+						hist npixhits {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/Offline
+							display     	= StatBox
+						}
+						hist nscthits {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/Offline
+							display     	= StatBox
+						}
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/Offline
+							display     	= StatBox
+						}
+						hist pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/Offline
+							display     	= StatBox
+						}
+						hist ptcone20 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/Offline
+							display     	= StatBox
+						}
+						hist ptcone20_rel {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/Offline
+							display     	= StatBox
+						}
+						hist ptvarcone20 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/Offline
+							display     	= StatBox
+						}
+						hist ptvarcone20_rel {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/Offline
+							display     	= StatBox
+						}
+						hist rejection {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/Offline
+							display     	= StatBox
+						}
+						hist topoetcone20 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/Offline
+							display     	= StatBox
+						}
+						hist topoetcone20_rel {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/Offline
+							display     	= StatBox
+						}
+						hist topoetcone40_shift {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/Offline
+							display     	= StatBox
+						}
+						hist topoetcone40_shift_rel {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/Offline
+							display     	= StatBox
+						}
+						hist weta1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/Offline
+							display     	= StatBox
+						}
+						hist weta2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/Offline
+							display     	= StatBox
+						}
+					}
+					dir RoI {
+						hist roi_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/RoI
+							display     	= StatBox
+						}
+						hist roi_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Distributions/RoI
+							display     	= StatBox
+						}
+					}
+				}
+				dir Efficiency {
+					dir EFCalo {
+						hist eff_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Efficiency/EFCalo
+							display     	= StatBox
+						}
+						hist eff_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Efficiency/EFCalo
+							display     	= StatBox
+						}
+						hist eff_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Efficiency/EFCalo
+							display     	= StatBox
+						}
+						hist eff_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Efficiency/EFCalo
+							display     	= StatBox
+						}
+						hist eff_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Efficiency/EFCalo
+							display     	= StatBox
+						}
+						hist eff_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Efficiency/EFCalo
+							display     	= StatBox
+						}
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Efficiency/EFCalo
+							display     	= StatBox
+						}
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Efficiency/EFCalo
+							display     	= StatBox
+						}
+						hist highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Efficiency/EFCalo
+							display     	= StatBox
+						}
+						hist match_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Efficiency/EFCalo
+							display     	= StatBox
+						}
+						hist match_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Efficiency/EFCalo
+							display     	= StatBox
+						}
+						hist match_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Efficiency/EFCalo
+							display     	= StatBox
+						}
+						hist match_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Efficiency/EFCalo
+							display     	= StatBox
+						}
+						hist match_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Efficiency/EFCalo
+							display     	= StatBox
+						}
+						hist match_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Efficiency/EFCalo
+							display     	= StatBox
+						}
+						hist mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Efficiency/EFCalo
+							display     	= StatBox
+						}
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Efficiency/EFCalo
+							display     	= StatBox
+						}
+						hist pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Efficiency/EFCalo
+							display     	= StatBox
+						}
+					}
+					dir HLT {
+						hist FailisEMLHLoose {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist IneffisEMLHLoose {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist coarse_et_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist eff_coarse_et_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist eff_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist eff_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist eff_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist eff_hltreco {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist eff_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist eff_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist eff_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist eff_triggerstep {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist match_coarse_et_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist match_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist match_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist match_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist match_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist match_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist match_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Efficiency/HLT
+							display     	= StatBox
+						}
+					}
+					dir L1Calo {
+						hist coarse_et_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Efficiency/L1Calo
+							display     	= StatBox
+						}
+						hist eff_coarse_et_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Efficiency/L1Calo
+							display     	= StatBox
+						}
+						hist eff_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Efficiency/L1Calo
+							display     	= StatBox
+						}
+						hist eff_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Efficiency/L1Calo
+							display     	= StatBox
+						}
+						hist eff_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Efficiency/L1Calo
+							display     	= StatBox
+						}
+						hist eff_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Efficiency/L1Calo
+							display     	= StatBox
+						}
+						hist eff_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Efficiency/L1Calo
+							display     	= StatBox
+						}
+						hist eff_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Efficiency/L1Calo
+							display     	= StatBox
+						}
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Efficiency/L1Calo
+							display     	= StatBox
+						}
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Efficiency/L1Calo
+							display     	= StatBox
+						}
+						hist highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Efficiency/L1Calo
+							display     	= StatBox
+						}
+						hist match_coarse_et_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Efficiency/L1Calo
+							display     	= StatBox
+						}
+						hist match_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Efficiency/L1Calo
+							display     	= StatBox
+						}
+						hist match_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Efficiency/L1Calo
+							display     	= StatBox
+						}
+						hist match_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Efficiency/L1Calo
+							display     	= StatBox
+						}
+						hist match_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Efficiency/L1Calo
+							display     	= StatBox
+						}
+						hist match_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Efficiency/L1Calo
+							display     	= StatBox
+						}
+						hist match_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Efficiency/L1Calo
+							display     	= StatBox
+						}
+						hist mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Efficiency/L1Calo
+							display     	= StatBox
+						}
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Efficiency/L1Calo
+							display     	= StatBox
+						}
+						hist pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Efficiency/L1Calo
+							display     	= StatBox
+						}
+					}
+					dir L2 {
+						hist eff_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Efficiency/L2
+							display     	= StatBox
+						}
+						hist eff_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Efficiency/L2
+							display     	= StatBox
+						}
+						hist eff_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Efficiency/L2
+							display     	= StatBox
+						}
+						hist eff_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Efficiency/L2
+							display     	= StatBox
+						}
+						hist eff_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Efficiency/L2
+							display     	= StatBox
+						}
+						hist eff_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Efficiency/L2
+							display     	= StatBox
+						}
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Efficiency/L2
+							display     	= StatBox
+						}
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Efficiency/L2
+							display     	= StatBox
+						}
+						hist highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Efficiency/L2
+							display     	= StatBox
+						}
+						hist match_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Efficiency/L2
+							display     	= StatBox
+						}
+						hist match_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Efficiency/L2
+							display     	= StatBox
+						}
+						hist match_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Efficiency/L2
+							display     	= StatBox
+						}
+						hist match_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Efficiency/L2
+							display     	= StatBox
+						}
+						hist match_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Efficiency/L2
+							display     	= StatBox
+						}
+						hist match_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Efficiency/L2
+							display     	= StatBox
+						}
+						hist mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Efficiency/L2
+							display     	= StatBox
+						}
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Efficiency/L2
+							display     	= StatBox
+						}
+						hist pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Efficiency/L2
+							display     	= StatBox
+						}
+					}
+					dir L2Calo {
+						hist eff_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Efficiency/L2Calo
+							display     	= StatBox
+						}
+						hist eff_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Efficiency/L2Calo
+							display     	= StatBox
+						}
+						hist eff_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Efficiency/L2Calo
+							display     	= StatBox
+						}
+						hist eff_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Efficiency/L2Calo
+							display     	= StatBox
+						}
+						hist eff_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Efficiency/L2Calo
+							display     	= StatBox
+						}
+						hist eff_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Efficiency/L2Calo
+							display     	= StatBox
+						}
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Efficiency/L2Calo
+							display     	= StatBox
+						}
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Efficiency/L2Calo
+							display     	= StatBox
+						}
+						hist highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Efficiency/L2Calo
+							display     	= StatBox
+						}
+						hist match_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Efficiency/L2Calo
+							display     	= StatBox
+						}
+						hist match_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Efficiency/L2Calo
+							display     	= StatBox
+						}
+						hist match_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Efficiency/L2Calo
+							display     	= StatBox
+						}
+						hist match_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Efficiency/L2Calo
+							display     	= StatBox
+						}
+						hist match_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Efficiency/L2Calo
+							display     	= StatBox
+						}
+						hist match_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Efficiency/L2Calo
+							display     	= StatBox
+						}
+						hist mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Efficiency/L2Calo
+							display     	= StatBox
+						}
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Efficiency/L2Calo
+							display     	= StatBox
+						}
+						hist pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Efficiency/L2Calo
+							display     	= StatBox
+						}
+					}
+				}
+				dir Resolutions {
+					dir HLT {
+						hist res_Reta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_Rhad {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_Rhad1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_Rphi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_d0 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_d0sig {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_deta1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_deta2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_dphi2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_dphiresc {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_eprobht {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_eprobhtVsPt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_eprobht_onVsOff {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_eratio {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_etInEta0 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_etInEta1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_etInEta2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_etInEta3 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_etVsEt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_etVsEta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_ethad {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_ethad1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_f1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_f3 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_npixhits {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_nscthits {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_weta1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_weta2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_wtots1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Resolutions/HLT
+							display     	= StatBox
+						}
+					}
+					dir L1Calo {
+						hist res_etVsEta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Resolutions/L1Calo
+							display     	= StatBox
+						}
+					}
+					dir L2Calo_vs_HLT {
+						hist res_Reta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Resolutions/L2Calo_vs_HLT
+							display     	= StatBox
+						}
+						hist res_Rhad {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Resolutions/L2Calo_vs_HLT
+							display     	= StatBox
+						}
+						hist res_Rhad1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Resolutions/L2Calo_vs_HLT
+							display     	= StatBox
+						}
+						hist res_Rphi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Resolutions/L2Calo_vs_HLT
+							display     	= StatBox
+						}
+						hist res_eratio {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Resolutions/L2Calo_vs_HLT
+							display     	= StatBox
+						}
+						hist res_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Resolutions/L2Calo_vs_HLT
+							display     	= StatBox
+						}
+						hist res_etVsEt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Resolutions/L2Calo_vs_HLT
+							display     	= StatBox
+						}
+						hist res_etVsEta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Resolutions/L2Calo_vs_HLT
+							display     	= StatBox
+						}
+						hist res_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Resolutions/L2Calo_vs_HLT
+							display     	= StatBox
+						}
+						hist res_ethad {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Resolutions/L2Calo_vs_HLT
+							display     	= StatBox
+						}
+						hist res_ethad1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Resolutions/L2Calo_vs_HLT
+							display     	= StatBox
+						}
+						hist res_f1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Resolutions/L2Calo_vs_HLT
+							display     	= StatBox
+						}
+						hist res_f3 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Resolutions/L2Calo_vs_HLT
+							display     	= StatBox
+						}
+						hist res_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Resolutions/L2Calo_vs_HLT
+							display     	= StatBox
+						}
+						hist res_weta1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Resolutions/L2Calo_vs_HLT
+							display     	= StatBox
+						}
+						hist res_weta2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhloose_ion_L1EM12/Resolutions/L2Calo_vs_HLT
+							display     	= StatBox
+						}
+					}
+				}
+			}
+			dir HLT_e15_lhmedium_ion_L1EM12 {
+				dir AbsResolutions {
+					dir L1Calo {
+						hist res_etVsEta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/AbsResolutions/L1Calo
+							display     	= StatBox
+						}
+					}
+				}
+				dir Distributions {
+					dir EFCalo {
+						hist energy {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/EFCalo
+							display     	= StatBox
+						}
+						hist energyBE0 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/EFCalo
+							display     	= StatBox
+						}
+						hist energyBE1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/EFCalo
+							display     	= StatBox
+						}
+						hist energyBE2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/EFCalo
+							display     	= StatBox
+						}
+						hist energyBE3 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/EFCalo
+							display     	= StatBox
+						}
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/EFCalo
+							display     	= StatBox
+						}
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/EFCalo
+							display     	= StatBox
+						}
+						hist eta_calo {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/EFCalo
+							display     	= StatBox
+						}
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/EFCalo
+							display     	= StatBox
+						}
+						hist phi_calo {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/EFCalo
+							display     	= StatBox
+						}
+					}
+					dir HLT {
+						hist Reta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/HLT
+							display     	= StatBox
+						}
+						hist Rhad {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/HLT
+							display     	= StatBox
+						}
+						hist Rhad1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/HLT
+							display     	= StatBox
+						}
+						hist Rphi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/HLT
+							display     	= StatBox
+						}
+						hist charge {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/HLT
+							display     	= StatBox
+						}
+						hist d0 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/HLT
+							display     	= StatBox
+						}
+						hist d0sig {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/HLT
+							display     	= StatBox
+						}
+						hist deta1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/HLT
+							display     	= StatBox
+						}
+						hist deta1_EMEBA {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/HLT
+							display     	= StatBox
+						}
+						hist deta1_EMEBC {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/HLT
+							display     	= StatBox
+						}
+						hist deta1_EMECA {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/HLT
+							display     	= StatBox
+						}
+						hist deta1_EMECC {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/HLT
+							display     	= StatBox
+						}
+						hist deta2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/HLT
+							display     	= StatBox
+						}
+						hist dphi2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/HLT
+							display     	= StatBox
+						}
+						hist dphiresc {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/HLT
+							display     	= StatBox
+						}
+						hist eprobht {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/HLT
+							display     	= StatBox
+						}
+						hist eratio {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/HLT
+							display     	= StatBox
+						}
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/HLT
+							display     	= StatBox
+						}
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/HLT
+							display     	= StatBox
+						}
+						hist ethad {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/HLT
+							display     	= StatBox
+						}
+						hist ethad1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/HLT
+							display     	= StatBox
+						}
+						hist f1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/HLT
+							display     	= StatBox
+						}
+						hist f3 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/HLT
+							display     	= StatBox
+						}
+						hist highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/HLT
+							display     	= StatBox
+						}
+						hist npixhits {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/HLT
+							display     	= StatBox
+						}
+						hist nscthits {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/HLT
+							display     	= StatBox
+						}
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/HLT
+							display     	= StatBox
+						}
+						hist pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/HLT
+							display     	= StatBox
+						}
+						hist ptcone20 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/HLT
+							display     	= StatBox
+						}
+						hist ptcone20_rel {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/HLT
+							display     	= StatBox
+						}
+						hist ptvarcone20 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/HLT
+							display     	= StatBox
+						}
+						hist ptvarcone20_rel {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/HLT
+							display     	= StatBox
+						}
+						hist rejection {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/HLT
+							display     	= StatBox
+						}
+						hist topoetcone20 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/HLT
+							display     	= StatBox
+						}
+						hist topoetcone20_rel {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/HLT
+							display     	= StatBox
+						}
+						hist topoetcone40_shift {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/HLT
+							display     	= StatBox
+						}
+						hist topoetcone40_shift_rel {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/HLT
+							display     	= StatBox
+						}
+						hist weta1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/HLT
+							display     	= StatBox
+						}
+						hist weta2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/HLT
+							display     	= StatBox
+						}
+					}
+					dir L1Calo {
+						hist emClusVsEmIsol {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/L1Calo
+							display     	= StatBox
+						}
+						hist emClusVsEta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/L1Calo
+							display     	= StatBox
+						}
+						hist emClusVsHadCore {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/L1Calo
+							display     	= StatBox
+						}
+						hist emIso {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/L1Calo
+							display     	= StatBox
+						}
+						hist energy {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/L1Calo
+							display     	= StatBox
+						}
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/L1Calo
+							display     	= StatBox
+						}
+						hist hadCore {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/L1Calo
+							display     	= StatBox
+						}
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/L1Calo
+							display     	= StatBox
+						}
+						hist roi_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/L1Calo
+							display     	= StatBox
+						}
+					}
+					dir L2Calo {
+						hist discriminant {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/L2Calo
+							display     	= StatBox
+						}
+						hist discriminantVsMu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/L2Calo
+							display     	= StatBox
+						}
+						dir discriminant_binned {
+							hist discriminantVsMu_et_0_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_0_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_0_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_0_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_0_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_1_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_1_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_1_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_1_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_1_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_2_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_2_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_2_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_2_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_2_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_3_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_3_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_3_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_3_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_3_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_4_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_4_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_4_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_4_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_4_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_0_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_0_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_0_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_0_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_0_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_1_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_1_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_1_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_1_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_1_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_2_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_2_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_2_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_2_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_2_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_3_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_3_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_3_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_3_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_3_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_4_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_4_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_4_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_4_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_4_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+						}
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/L2Calo
+							display     	= StatBox
+						}
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/L2Calo
+							display     	= StatBox
+						}
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/L2Calo
+							display     	= StatBox
+						}
+					}
+					dir L2Electron {
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/L2Electron
+							display     	= StatBox
+						}
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/L2Electron
+							display     	= StatBox
+						}
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/L2Electron
+							display     	= StatBox
+						}
+						hist trkClusDeta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/L2Electron
+							display     	= StatBox
+						}
+						hist trkClusDphi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/L2Electron
+							display     	= StatBox
+						}
+					}
+					dir Offline {
+						hist Reta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/Offline
+							display     	= StatBox
+						}
+						hist Rhad {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/Offline
+							display     	= StatBox
+						}
+						hist Rhad1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/Offline
+							display     	= StatBox
+						}
+						hist Rphi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/Offline
+							display     	= StatBox
+						}
+						hist charge {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/Offline
+							display     	= StatBox
+						}
+						hist d0 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/Offline
+							display     	= StatBox
+						}
+						hist d0sig {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/Offline
+							display     	= StatBox
+						}
+						hist deta1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/Offline
+							display     	= StatBox
+						}
+						hist deta1_EMEBA {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/Offline
+							display     	= StatBox
+						}
+						hist deta1_EMEBC {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/Offline
+							display     	= StatBox
+						}
+						hist deta1_EMECA {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/Offline
+							display     	= StatBox
+						}
+						hist deta1_EMECC {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/Offline
+							display     	= StatBox
+						}
+						hist deta2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/Offline
+							display     	= StatBox
+						}
+						hist dphi2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/Offline
+							display     	= StatBox
+						}
+						hist dphiresc {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/Offline
+							display     	= StatBox
+						}
+						hist eprobht {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/Offline
+							display     	= StatBox
+						}
+						hist eratio {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/Offline
+							display     	= StatBox
+						}
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/Offline
+							display     	= StatBox
+						}
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/Offline
+							display     	= StatBox
+						}
+						hist ethad {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/Offline
+							display     	= StatBox
+						}
+						hist ethad1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/Offline
+							display     	= StatBox
+						}
+						hist f1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/Offline
+							display     	= StatBox
+						}
+						hist f3 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/Offline
+							display     	= StatBox
+						}
+						hist highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/Offline
+							display     	= StatBox
+						}
+						hist npixhits {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/Offline
+							display     	= StatBox
+						}
+						hist nscthits {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/Offline
+							display     	= StatBox
+						}
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/Offline
+							display     	= StatBox
+						}
+						hist pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/Offline
+							display     	= StatBox
+						}
+						hist ptcone20 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/Offline
+							display     	= StatBox
+						}
+						hist ptcone20_rel {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/Offline
+							display     	= StatBox
+						}
+						hist ptvarcone20 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/Offline
+							display     	= StatBox
+						}
+						hist ptvarcone20_rel {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/Offline
+							display     	= StatBox
+						}
+						hist rejection {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/Offline
+							display     	= StatBox
+						}
+						hist topoetcone20 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/Offline
+							display     	= StatBox
+						}
+						hist topoetcone20_rel {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/Offline
+							display     	= StatBox
+						}
+						hist topoetcone40_shift {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/Offline
+							display     	= StatBox
+						}
+						hist topoetcone40_shift_rel {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/Offline
+							display     	= StatBox
+						}
+						hist weta1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/Offline
+							display     	= StatBox
+						}
+						hist weta2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/Offline
+							display     	= StatBox
+						}
+					}
+					dir RoI {
+						hist roi_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/RoI
+							display     	= StatBox
+						}
+						hist roi_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Distributions/RoI
+							display     	= StatBox
+						}
+					}
+				}
+				dir Efficiency {
+					dir EFCalo {
+						hist eff_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Efficiency/EFCalo
+							display     	= StatBox
+						}
+						hist eff_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Efficiency/EFCalo
+							display     	= StatBox
+						}
+						hist eff_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Efficiency/EFCalo
+							display     	= StatBox
+						}
+						hist eff_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Efficiency/EFCalo
+							display     	= StatBox
+						}
+						hist eff_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Efficiency/EFCalo
+							display     	= StatBox
+						}
+						hist eff_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Efficiency/EFCalo
+							display     	= StatBox
+						}
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Efficiency/EFCalo
+							display     	= StatBox
+						}
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Efficiency/EFCalo
+							display     	= StatBox
+						}
+						hist highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Efficiency/EFCalo
+							display     	= StatBox
+						}
+						hist match_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Efficiency/EFCalo
+							display     	= StatBox
+						}
+						hist match_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Efficiency/EFCalo
+							display     	= StatBox
+						}
+						hist match_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Efficiency/EFCalo
+							display     	= StatBox
+						}
+						hist match_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Efficiency/EFCalo
+							display     	= StatBox
+						}
+						hist match_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Efficiency/EFCalo
+							display     	= StatBox
+						}
+						hist match_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Efficiency/EFCalo
+							display     	= StatBox
+						}
+						hist mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Efficiency/EFCalo
+							display     	= StatBox
+						}
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Efficiency/EFCalo
+							display     	= StatBox
+						}
+						hist pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Efficiency/EFCalo
+							display     	= StatBox
+						}
+					}
+					dir HLT {
+						hist FailisEMLHMedium {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist IneffisEMLHMedium {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist coarse_et_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist eff_coarse_et_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist eff_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist eff_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist eff_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist eff_hltreco {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist eff_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist eff_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist eff_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist eff_triggerstep {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist match_coarse_et_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist match_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist match_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist match_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist match_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist match_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist match_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Efficiency/HLT
+							display     	= StatBox
+						}
+					}
+					dir L1Calo {
+						hist coarse_et_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Efficiency/L1Calo
+							display     	= StatBox
+						}
+						hist eff_coarse_et_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Efficiency/L1Calo
+							display     	= StatBox
+						}
+						hist eff_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Efficiency/L1Calo
+							display     	= StatBox
+						}
+						hist eff_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Efficiency/L1Calo
+							display     	= StatBox
+						}
+						hist eff_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Efficiency/L1Calo
+							display     	= StatBox
+						}
+						hist eff_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Efficiency/L1Calo
+							display     	= StatBox
+						}
+						hist eff_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Efficiency/L1Calo
+							display     	= StatBox
+						}
+						hist eff_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Efficiency/L1Calo
+							display     	= StatBox
+						}
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Efficiency/L1Calo
+							display     	= StatBox
+						}
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Efficiency/L1Calo
+							display     	= StatBox
+						}
+						hist highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Efficiency/L1Calo
+							display     	= StatBox
+						}
+						hist match_coarse_et_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Efficiency/L1Calo
+							display     	= StatBox
+						}
+						hist match_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Efficiency/L1Calo
+							display     	= StatBox
+						}
+						hist match_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Efficiency/L1Calo
+							display     	= StatBox
+						}
+						hist match_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Efficiency/L1Calo
+							display     	= StatBox
+						}
+						hist match_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Efficiency/L1Calo
+							display     	= StatBox
+						}
+						hist match_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Efficiency/L1Calo
+							display     	= StatBox
+						}
+						hist match_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Efficiency/L1Calo
+							display     	= StatBox
+						}
+						hist mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Efficiency/L1Calo
+							display     	= StatBox
+						}
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Efficiency/L1Calo
+							display     	= StatBox
+						}
+						hist pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Efficiency/L1Calo
+							display     	= StatBox
+						}
+					}
+					dir L2 {
+						hist eff_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Efficiency/L2
+							display     	= StatBox
+						}
+						hist eff_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Efficiency/L2
+							display     	= StatBox
+						}
+						hist eff_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Efficiency/L2
+							display     	= StatBox
+						}
+						hist eff_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Efficiency/L2
+							display     	= StatBox
+						}
+						hist eff_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Efficiency/L2
+							display     	= StatBox
+						}
+						hist eff_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Efficiency/L2
+							display     	= StatBox
+						}
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Efficiency/L2
+							display     	= StatBox
+						}
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Efficiency/L2
+							display     	= StatBox
+						}
+						hist highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Efficiency/L2
+							display     	= StatBox
+						}
+						hist match_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Efficiency/L2
+							display     	= StatBox
+						}
+						hist match_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Efficiency/L2
+							display     	= StatBox
+						}
+						hist match_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Efficiency/L2
+							display     	= StatBox
+						}
+						hist match_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Efficiency/L2
+							display     	= StatBox
+						}
+						hist match_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Efficiency/L2
+							display     	= StatBox
+						}
+						hist match_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Efficiency/L2
+							display     	= StatBox
+						}
+						hist mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Efficiency/L2
+							display     	= StatBox
+						}
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Efficiency/L2
+							display     	= StatBox
+						}
+						hist pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Efficiency/L2
+							display     	= StatBox
+						}
+					}
+					dir L2Calo {
+						hist eff_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Efficiency/L2Calo
+							display     	= StatBox
+						}
+						hist eff_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Efficiency/L2Calo
+							display     	= StatBox
+						}
+						hist eff_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Efficiency/L2Calo
+							display     	= StatBox
+						}
+						hist eff_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Efficiency/L2Calo
+							display     	= StatBox
+						}
+						hist eff_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Efficiency/L2Calo
+							display     	= StatBox
+						}
+						hist eff_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Efficiency/L2Calo
+							display     	= StatBox
+						}
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Efficiency/L2Calo
+							display     	= StatBox
+						}
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Efficiency/L2Calo
+							display     	= StatBox
+						}
+						hist highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Efficiency/L2Calo
+							display     	= StatBox
+						}
+						hist match_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Efficiency/L2Calo
+							display     	= StatBox
+						}
+						hist match_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Efficiency/L2Calo
+							display     	= StatBox
+						}
+						hist match_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Efficiency/L2Calo
+							display     	= StatBox
+						}
+						hist match_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Efficiency/L2Calo
+							display     	= StatBox
+						}
+						hist match_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Efficiency/L2Calo
+							display     	= StatBox
+						}
+						hist match_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Efficiency/L2Calo
+							display     	= StatBox
+						}
+						hist mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Efficiency/L2Calo
+							display     	= StatBox
+						}
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Efficiency/L2Calo
+							display     	= StatBox
+						}
+						hist pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Efficiency/L2Calo
+							display     	= StatBox
+						}
+					}
+				}
+				dir Resolutions {
+					dir HLT {
+						hist res_Reta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_Rhad {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_Rhad1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_Rphi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_d0 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_d0sig {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_deta1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_deta2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_dphi2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_dphiresc {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_eprobht {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_eprobhtVsPt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_eprobht_onVsOff {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_eratio {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_etInEta0 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_etInEta1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_etInEta2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_etInEta3 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_etVsEt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_etVsEta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_ethad {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_ethad1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_f1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_f3 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_npixhits {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_nscthits {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_weta1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_weta2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_wtots1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Resolutions/HLT
+							display     	= StatBox
+						}
+					}
+					dir L1Calo {
+						hist res_etVsEta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Resolutions/L1Calo
+							display     	= StatBox
+						}
+					}
+					dir L2Calo_vs_HLT {
+						hist res_Reta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Resolutions/L2Calo_vs_HLT
+							display     	= StatBox
+						}
+						hist res_Rhad {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Resolutions/L2Calo_vs_HLT
+							display     	= StatBox
+						}
+						hist res_Rhad1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Resolutions/L2Calo_vs_HLT
+							display     	= StatBox
+						}
+						hist res_Rphi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Resolutions/L2Calo_vs_HLT
+							display     	= StatBox
+						}
+						hist res_eratio {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Resolutions/L2Calo_vs_HLT
+							display     	= StatBox
+						}
+						hist res_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Resolutions/L2Calo_vs_HLT
+							display     	= StatBox
+						}
+						hist res_etVsEt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Resolutions/L2Calo_vs_HLT
+							display     	= StatBox
+						}
+						hist res_etVsEta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Resolutions/L2Calo_vs_HLT
+							display     	= StatBox
+						}
+						hist res_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Resolutions/L2Calo_vs_HLT
+							display     	= StatBox
+						}
+						hist res_ethad {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Resolutions/L2Calo_vs_HLT
+							display     	= StatBox
+						}
+						hist res_ethad1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Resolutions/L2Calo_vs_HLT
+							display     	= StatBox
+						}
+						hist res_f1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Resolutions/L2Calo_vs_HLT
+							display     	= StatBox
+						}
+						hist res_f3 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Resolutions/L2Calo_vs_HLT
+							display     	= StatBox
+						}
+						hist res_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Resolutions/L2Calo_vs_HLT
+							display     	= StatBox
+						}
+						hist res_weta1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Resolutions/L2Calo_vs_HLT
+							display     	= StatBox
+						}
+						hist res_weta2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_lhmedium_ion_L1EM12/Resolutions/L2Calo_vs_HLT
+							display     	= StatBox
+						}
+					}
+				}
+			}
+			dir HLT_e15_loose_ion {
+				dir AbsResolutions {
+					dir L1Calo {
+						hist res_etVsEta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/AbsResolutions/L1Calo
+							display     	= StatBox
+						}
+					}
+				}
+				dir Distributions {
+					dir EFCalo {
+						hist energy {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/EFCalo
+							display     	= StatBox
+						}
+						hist energyBE0 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/EFCalo
+							display     	= StatBox
+						}
+						hist energyBE1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/EFCalo
+							display     	= StatBox
+						}
+						hist energyBE2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/EFCalo
+							display     	= StatBox
+						}
+						hist energyBE3 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/EFCalo
+							display     	= StatBox
+						}
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/EFCalo
+							display     	= StatBox
+						}
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/EFCalo
+							display     	= StatBox
+						}
+						hist eta_calo {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/EFCalo
+							display     	= StatBox
+						}
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/EFCalo
+							display     	= StatBox
+						}
+						hist phi_calo {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/EFCalo
+							display     	= StatBox
+						}
+					}
+					dir HLT {
+						hist Reta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist Rhad {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist Rhad1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist Rphi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist charge {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist d0 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist d0sig {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist deta1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist deta1_EMEBA {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist deta1_EMEBC {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist deta1_EMECA {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist deta1_EMECC {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist deta2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist dphi2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist dphiresc {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist eprobht {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist eratio {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist ethad {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist ethad1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist f1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist f3 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist npixhits {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist nscthits {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist ptcone20 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist ptcone20_rel {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist ptvarcone20 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist ptvarcone20_rel {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist rejection {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist topoetcone20 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist topoetcone20_rel {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist topoetcone40_shift {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist topoetcone40_shift_rel {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist weta1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist weta2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/HLT
+							display     	= StatBox
+						}
+					}
+					dir L1Calo {
+						hist emClusVsEmIsol {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/L1Calo
+							display     	= StatBox
+						}
+						hist emClusVsEta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/L1Calo
+							display     	= StatBox
+						}
+						hist emClusVsHadCore {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/L1Calo
+							display     	= StatBox
+						}
+						hist emIso {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/L1Calo
+							display     	= StatBox
+						}
+						hist energy {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/L1Calo
+							display     	= StatBox
+						}
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/L1Calo
+							display     	= StatBox
+						}
+						hist hadCore {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/L1Calo
+							display     	= StatBox
+						}
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/L1Calo
+							display     	= StatBox
+						}
+						hist roi_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/L1Calo
+							display     	= StatBox
+						}
+					}
+					dir L2Calo {
+						hist discriminant {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/L2Calo
+							display     	= StatBox
+						}
+						hist discriminantVsMu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/L2Calo
+							display     	= StatBox
+						}
+						dir discriminant_binned {
+							hist discriminantVsMu_et_0_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_0_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_0_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_0_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_0_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_1_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_1_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_1_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_1_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_1_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_2_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_2_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_2_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_2_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_2_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_3_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_3_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_3_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_3_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_3_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_4_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_4_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_4_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_4_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_4_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_0_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_0_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_0_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_0_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_0_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_1_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_1_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_1_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_1_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_1_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_2_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_2_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_2_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_2_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_2_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_3_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_3_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_3_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_3_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_3_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_4_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_4_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_4_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_4_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_4_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+						}
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/L2Calo
+							display     	= StatBox
+						}
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/L2Calo
+							display     	= StatBox
+						}
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/L2Calo
+							display     	= StatBox
+						}
+					}
+					dir L2Electron {
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/L2Electron
+							display     	= StatBox
+						}
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/L2Electron
+							display     	= StatBox
+						}
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/L2Electron
+							display     	= StatBox
+						}
+						hist trkClusDeta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/L2Electron
+							display     	= StatBox
+						}
+						hist trkClusDphi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/L2Electron
+							display     	= StatBox
+						}
+					}
+					dir Offline {
+						hist Reta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist Rhad {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist Rhad1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist Rphi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist charge {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist d0 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist d0sig {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist deta1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist deta1_EMEBA {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist deta1_EMEBC {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist deta1_EMECA {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist deta1_EMECC {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist deta2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist dphi2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist dphiresc {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist eprobht {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist eratio {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist ethad {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist ethad1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist f1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist f3 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist npixhits {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist nscthits {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist ptcone20 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist ptcone20_rel {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist ptvarcone20 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist ptvarcone20_rel {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist rejection {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist topoetcone20 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist topoetcone20_rel {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist topoetcone40_shift {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist topoetcone40_shift_rel {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist weta1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist weta2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/Offline
+							display     	= StatBox
+						}
+					}
+					dir RoI {
+						hist roi_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/RoI
+							display     	= StatBox
+						}
+						hist roi_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Distributions/RoI
+							display     	= StatBox
+						}
+					}
+				}
+				dir Efficiency {
+					dir EFCalo {
+						hist eff_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Efficiency/EFCalo
+							display     	= StatBox
+						}
+						hist eff_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Efficiency/EFCalo
+							display     	= StatBox
+						}
+						hist eff_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Efficiency/EFCalo
+							display     	= StatBox
+						}
+						hist eff_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Efficiency/EFCalo
+							display     	= StatBox
+						}
+						hist eff_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Efficiency/EFCalo
+							display     	= StatBox
+						}
+						hist eff_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Efficiency/EFCalo
+							display     	= StatBox
+						}
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Efficiency/EFCalo
+							display     	= StatBox
+						}
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Efficiency/EFCalo
+							display     	= StatBox
+						}
+						hist highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Efficiency/EFCalo
+							display     	= StatBox
+						}
+						hist match_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Efficiency/EFCalo
+							display     	= StatBox
+						}
+						hist match_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Efficiency/EFCalo
+							display     	= StatBox
+						}
+						hist match_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Efficiency/EFCalo
+							display     	= StatBox
+						}
+						hist match_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Efficiency/EFCalo
+							display     	= StatBox
+						}
+						hist match_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Efficiency/EFCalo
+							display     	= StatBox
+						}
+						hist match_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Efficiency/EFCalo
+							display     	= StatBox
+						}
+						hist mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Efficiency/EFCalo
+							display     	= StatBox
+						}
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Efficiency/EFCalo
+							display     	= StatBox
+						}
+						hist pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Efficiency/EFCalo
+							display     	= StatBox
+						}
+					}
+					dir HLT {
+						hist FailisEMLoose {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist IneffisEMLoose {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist IneffisEMLooseTRT {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist IneffisEMLooseTrk {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist IneffisEMLooseTrkClus {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist coarse_et_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist eff_coarse_et_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist eff_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist eff_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist eff_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist eff_hltreco {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist eff_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist eff_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist eff_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist eff_triggerstep {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist match_coarse_et_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist match_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist match_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist match_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist match_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist match_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist match_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Efficiency/HLT
+							display     	= StatBox
+						}
+					}
+					dir L1Calo {
+						hist coarse_et_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Efficiency/L1Calo
+							display     	= StatBox
+						}
+						hist eff_coarse_et_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Efficiency/L1Calo
+							display     	= StatBox
+						}
+						hist eff_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Efficiency/L1Calo
+							display     	= StatBox
+						}
+						hist eff_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Efficiency/L1Calo
+							display     	= StatBox
+						}
+						hist eff_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Efficiency/L1Calo
+							display     	= StatBox
+						}
+						hist eff_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Efficiency/L1Calo
+							display     	= StatBox
+						}
+						hist eff_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Efficiency/L1Calo
+							display     	= StatBox
+						}
+						hist eff_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Efficiency/L1Calo
+							display     	= StatBox
+						}
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Efficiency/L1Calo
+							display     	= StatBox
+						}
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Efficiency/L1Calo
+							display     	= StatBox
+						}
+						hist highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Efficiency/L1Calo
+							display     	= StatBox
+						}
+						hist match_coarse_et_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Efficiency/L1Calo
+							display     	= StatBox
+						}
+						hist match_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Efficiency/L1Calo
+							display     	= StatBox
+						}
+						hist match_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Efficiency/L1Calo
+							display     	= StatBox
+						}
+						hist match_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Efficiency/L1Calo
+							display     	= StatBox
+						}
+						hist match_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Efficiency/L1Calo
+							display     	= StatBox
+						}
+						hist match_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Efficiency/L1Calo
+							display     	= StatBox
+						}
+						hist match_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Efficiency/L1Calo
+							display     	= StatBox
+						}
+						hist mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Efficiency/L1Calo
+							display     	= StatBox
+						}
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Efficiency/L1Calo
+							display     	= StatBox
+						}
+						hist pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Efficiency/L1Calo
+							display     	= StatBox
+						}
+					}
+					dir L2 {
+						hist eff_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Efficiency/L2
+							display     	= StatBox
+						}
+						hist eff_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Efficiency/L2
+							display     	= StatBox
+						}
+						hist eff_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Efficiency/L2
+							display     	= StatBox
+						}
+						hist eff_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Efficiency/L2
+							display     	= StatBox
+						}
+						hist eff_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Efficiency/L2
+							display     	= StatBox
+						}
+						hist eff_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Efficiency/L2
+							display     	= StatBox
+						}
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Efficiency/L2
+							display     	= StatBox
+						}
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Efficiency/L2
+							display     	= StatBox
+						}
+						hist highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Efficiency/L2
+							display     	= StatBox
+						}
+						hist match_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Efficiency/L2
+							display     	= StatBox
+						}
+						hist match_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Efficiency/L2
+							display     	= StatBox
+						}
+						hist match_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Efficiency/L2
+							display     	= StatBox
+						}
+						hist match_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Efficiency/L2
+							display     	= StatBox
+						}
+						hist match_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Efficiency/L2
+							display     	= StatBox
+						}
+						hist match_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Efficiency/L2
+							display     	= StatBox
+						}
+						hist mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Efficiency/L2
+							display     	= StatBox
+						}
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Efficiency/L2
+							display     	= StatBox
+						}
+						hist pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Efficiency/L2
+							display     	= StatBox
+						}
+					}
+					dir L2Calo {
+						hist eff_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Efficiency/L2Calo
+							display     	= StatBox
+						}
+						hist eff_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Efficiency/L2Calo
+							display     	= StatBox
+						}
+						hist eff_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Efficiency/L2Calo
+							display     	= StatBox
+						}
+						hist eff_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Efficiency/L2Calo
+							display     	= StatBox
+						}
+						hist eff_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Efficiency/L2Calo
+							display     	= StatBox
+						}
+						hist eff_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Efficiency/L2Calo
+							display     	= StatBox
+						}
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Efficiency/L2Calo
+							display     	= StatBox
+						}
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Efficiency/L2Calo
+							display     	= StatBox
+						}
+						hist highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Efficiency/L2Calo
+							display     	= StatBox
+						}
+						hist match_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Efficiency/L2Calo
+							display     	= StatBox
+						}
+						hist match_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Efficiency/L2Calo
+							display     	= StatBox
+						}
+						hist match_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Efficiency/L2Calo
+							display     	= StatBox
+						}
+						hist match_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Efficiency/L2Calo
+							display     	= StatBox
+						}
+						hist match_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Efficiency/L2Calo
+							display     	= StatBox
+						}
+						hist match_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Efficiency/L2Calo
+							display     	= StatBox
+						}
+						hist mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Efficiency/L2Calo
+							display     	= StatBox
+						}
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Efficiency/L2Calo
+							display     	= StatBox
+						}
+						hist pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Efficiency/L2Calo
+							display     	= StatBox
+						}
+					}
+				}
+				dir Resolutions {
+					dir HLT {
+						hist res_Reta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_Rhad {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_Rhad1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_Rphi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_d0 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_d0sig {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_deta1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_deta2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_dphi2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_dphiresc {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_eprobht {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_eprobhtVsPt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_eprobht_onVsOff {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_eratio {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_etInEta0 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_etInEta1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_etInEta2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_etInEta3 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_etVsEt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_etVsEta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_ethad {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_ethad1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_f1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_f3 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_npixhits {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_nscthits {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_weta1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_weta2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_wtots1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Resolutions/HLT
+							display     	= StatBox
+						}
+					}
+					dir L1Calo {
+						hist res_etVsEta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Resolutions/L1Calo
+							display     	= StatBox
+						}
+					}
+					dir L2Calo_vs_HLT {
+						hist res_Reta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Resolutions/L2Calo_vs_HLT
+							display     	= StatBox
+						}
+						hist res_Rhad {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Resolutions/L2Calo_vs_HLT
+							display     	= StatBox
+						}
+						hist res_Rhad1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Resolutions/L2Calo_vs_HLT
+							display     	= StatBox
+						}
+						hist res_Rphi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Resolutions/L2Calo_vs_HLT
+							display     	= StatBox
+						}
+						hist res_eratio {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Resolutions/L2Calo_vs_HLT
+							display     	= StatBox
+						}
+						hist res_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Resolutions/L2Calo_vs_HLT
+							display     	= StatBox
+						}
+						hist res_etVsEt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Resolutions/L2Calo_vs_HLT
+							display     	= StatBox
+						}
+						hist res_etVsEta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Resolutions/L2Calo_vs_HLT
+							display     	= StatBox
+						}
+						hist res_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Resolutions/L2Calo_vs_HLT
+							display     	= StatBox
+						}
+						hist res_ethad {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Resolutions/L2Calo_vs_HLT
+							display     	= StatBox
+						}
+						hist res_ethad1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Resolutions/L2Calo_vs_HLT
+							display     	= StatBox
+						}
+						hist res_f1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Resolutions/L2Calo_vs_HLT
+							display     	= StatBox
+						}
+						hist res_f3 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Resolutions/L2Calo_vs_HLT
+							display     	= StatBox
+						}
+						hist res_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Resolutions/L2Calo_vs_HLT
+							display     	= StatBox
+						}
+						hist res_weta1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Resolutions/L2Calo_vs_HLT
+							display     	= StatBox
+						}
+						hist res_weta2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_loose_ion/Resolutions/L2Calo_vs_HLT
+							display     	= StatBox
+						}
+					}
+				}
+			}
+			dir HLT_e15_medium_ion {
+				dir AbsResolutions {
+					dir L1Calo {
+						hist res_etVsEta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/AbsResolutions/L1Calo
+							display     	= StatBox
+						}
+					}
+				}
+				dir Distributions {
+					dir EFCalo {
+						hist energy {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/EFCalo
+							display     	= StatBox
+						}
+						hist energyBE0 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/EFCalo
+							display     	= StatBox
+						}
+						hist energyBE1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/EFCalo
+							display     	= StatBox
+						}
+						hist energyBE2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/EFCalo
+							display     	= StatBox
+						}
+						hist energyBE3 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/EFCalo
+							display     	= StatBox
+						}
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/EFCalo
+							display     	= StatBox
+						}
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/EFCalo
+							display     	= StatBox
+						}
+						hist eta_calo {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/EFCalo
+							display     	= StatBox
+						}
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/EFCalo
+							display     	= StatBox
+						}
+						hist phi_calo {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/EFCalo
+							display     	= StatBox
+						}
+					}
+					dir HLT {
+						hist Reta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist Rhad {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist Rhad1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist Rphi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist charge {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist d0 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist d0sig {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist deta1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist deta1_EMEBA {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist deta1_EMEBC {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist deta1_EMECA {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist deta1_EMECC {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist deta2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist dphi2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist dphiresc {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist eprobht {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist eratio {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist ethad {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist ethad1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist f1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist f3 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist npixhits {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist nscthits {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist ptcone20 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist ptcone20_rel {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist ptvarcone20 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist ptvarcone20_rel {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist rejection {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist topoetcone20 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist topoetcone20_rel {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist topoetcone40_shift {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist topoetcone40_shift_rel {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist weta1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist weta2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/HLT
+							display     	= StatBox
+						}
+					}
+					dir L1Calo {
+						hist emClusVsEmIsol {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/L1Calo
+							display     	= StatBox
+						}
+						hist emClusVsEta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/L1Calo
+							display     	= StatBox
+						}
+						hist emClusVsHadCore {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/L1Calo
+							display     	= StatBox
+						}
+						hist emIso {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/L1Calo
+							display     	= StatBox
+						}
+						hist energy {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/L1Calo
+							display     	= StatBox
+						}
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/L1Calo
+							display     	= StatBox
+						}
+						hist hadCore {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/L1Calo
+							display     	= StatBox
+						}
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/L1Calo
+							display     	= StatBox
+						}
+						hist roi_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/L1Calo
+							display     	= StatBox
+						}
+					}
+					dir L2Calo {
+						hist discriminant {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/L2Calo
+							display     	= StatBox
+						}
+						hist discriminantVsMu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/L2Calo
+							display     	= StatBox
+						}
+						dir discriminant_binned {
+							hist discriminantVsMu_et_0_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_0_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_0_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_0_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_0_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_1_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_1_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_1_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_1_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_1_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_2_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_2_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_2_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_2_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_2_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_3_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_3_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_3_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_3_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_3_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_4_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_4_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_4_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_4_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_4_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_0_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_0_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_0_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_0_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_0_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_1_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_1_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_1_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_1_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_1_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_2_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_2_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_2_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_2_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_2_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_3_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_3_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_3_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_3_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_3_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_4_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_4_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_4_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_4_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_4_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+						}
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/L2Calo
+							display     	= StatBox
+						}
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/L2Calo
+							display     	= StatBox
+						}
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/L2Calo
+							display     	= StatBox
+						}
+					}
+					dir L2Electron {
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/L2Electron
+							display     	= StatBox
+						}
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/L2Electron
+							display     	= StatBox
+						}
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/L2Electron
+							display     	= StatBox
+						}
+						hist trkClusDeta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/L2Electron
+							display     	= StatBox
+						}
+						hist trkClusDphi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/L2Electron
+							display     	= StatBox
+						}
+					}
+					dir Offline {
+						hist Reta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist Rhad {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist Rhad1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist Rphi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist charge {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist d0 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist d0sig {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist deta1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist deta1_EMEBA {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist deta1_EMEBC {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist deta1_EMECA {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist deta1_EMECC {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist deta2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist dphi2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist dphiresc {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist eprobht {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist eratio {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist ethad {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist ethad1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist f1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist f3 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist npixhits {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist nscthits {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist ptcone20 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist ptcone20_rel {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist ptvarcone20 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist ptvarcone20_rel {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist rejection {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist topoetcone20 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist topoetcone20_rel {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist topoetcone40_shift {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist topoetcone40_shift_rel {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist weta1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist weta2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/Offline
+							display     	= StatBox
+						}
+					}
+					dir RoI {
+						hist roi_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/RoI
+							display     	= StatBox
+						}
+						hist roi_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Distributions/RoI
+							display     	= StatBox
+						}
+					}
+				}
+				dir Efficiency {
+					dir EFCalo {
+						hist eff_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Efficiency/EFCalo
+							display     	= StatBox
+						}
+						hist eff_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Efficiency/EFCalo
+							display     	= StatBox
+						}
+						hist eff_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Efficiency/EFCalo
+							display     	= StatBox
+						}
+						hist eff_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Efficiency/EFCalo
+							display     	= StatBox
+						}
+						hist eff_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Efficiency/EFCalo
+							display     	= StatBox
+						}
+						hist eff_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Efficiency/EFCalo
+							display     	= StatBox
+						}
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Efficiency/EFCalo
+							display     	= StatBox
+						}
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Efficiency/EFCalo
+							display     	= StatBox
+						}
+						hist highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Efficiency/EFCalo
+							display     	= StatBox
+						}
+						hist match_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Efficiency/EFCalo
+							display     	= StatBox
+						}
+						hist match_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Efficiency/EFCalo
+							display     	= StatBox
+						}
+						hist match_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Efficiency/EFCalo
+							display     	= StatBox
+						}
+						hist match_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Efficiency/EFCalo
+							display     	= StatBox
+						}
+						hist match_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Efficiency/EFCalo
+							display     	= StatBox
+						}
+						hist match_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Efficiency/EFCalo
+							display     	= StatBox
+						}
+						hist mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Efficiency/EFCalo
+							display     	= StatBox
+						}
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Efficiency/EFCalo
+							display     	= StatBox
+						}
+						hist pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Efficiency/EFCalo
+							display     	= StatBox
+						}
+					}
+					dir HLT {
+						hist FailisEMMedium {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist IneffisEMMedium {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist IneffisEMMediumTRT {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist IneffisEMMediumTrk {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist IneffisEMMediumTrkClus {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist coarse_et_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist eff_coarse_et_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist eff_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist eff_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist eff_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist eff_hltreco {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist eff_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist eff_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist eff_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist eff_triggerstep {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist match_coarse_et_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist match_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist match_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist match_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist match_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist match_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist match_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Efficiency/HLT
+							display     	= StatBox
+						}
+					}
+					dir L1Calo {
+						hist coarse_et_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Efficiency/L1Calo
+							display     	= StatBox
+						}
+						hist eff_coarse_et_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Efficiency/L1Calo
+							display     	= StatBox
+						}
+						hist eff_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Efficiency/L1Calo
+							display     	= StatBox
+						}
+						hist eff_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Efficiency/L1Calo
+							display     	= StatBox
+						}
+						hist eff_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Efficiency/L1Calo
+							display     	= StatBox
+						}
+						hist eff_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Efficiency/L1Calo
+							display     	= StatBox
+						}
+						hist eff_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Efficiency/L1Calo
+							display     	= StatBox
+						}
+						hist eff_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Efficiency/L1Calo
+							display     	= StatBox
+						}
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Efficiency/L1Calo
+							display     	= StatBox
+						}
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Efficiency/L1Calo
+							display     	= StatBox
+						}
+						hist highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Efficiency/L1Calo
+							display     	= StatBox
+						}
+						hist match_coarse_et_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Efficiency/L1Calo
+							display     	= StatBox
+						}
+						hist match_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Efficiency/L1Calo
+							display     	= StatBox
+						}
+						hist match_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Efficiency/L1Calo
+							display     	= StatBox
+						}
+						hist match_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Efficiency/L1Calo
+							display     	= StatBox
+						}
+						hist match_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Efficiency/L1Calo
+							display     	= StatBox
+						}
+						hist match_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Efficiency/L1Calo
+							display     	= StatBox
+						}
+						hist match_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Efficiency/L1Calo
+							display     	= StatBox
+						}
+						hist mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Efficiency/L1Calo
+							display     	= StatBox
+						}
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Efficiency/L1Calo
+							display     	= StatBox
+						}
+						hist pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Efficiency/L1Calo
+							display     	= StatBox
+						}
+					}
+					dir L2 {
+						hist eff_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Efficiency/L2
+							display     	= StatBox
+						}
+						hist eff_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Efficiency/L2
+							display     	= StatBox
+						}
+						hist eff_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Efficiency/L2
+							display     	= StatBox
+						}
+						hist eff_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Efficiency/L2
+							display     	= StatBox
+						}
+						hist eff_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Efficiency/L2
+							display     	= StatBox
+						}
+						hist eff_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Efficiency/L2
+							display     	= StatBox
+						}
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Efficiency/L2
+							display     	= StatBox
+						}
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Efficiency/L2
+							display     	= StatBox
+						}
+						hist highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Efficiency/L2
+							display     	= StatBox
+						}
+						hist match_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Efficiency/L2
+							display     	= StatBox
+						}
+						hist match_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Efficiency/L2
+							display     	= StatBox
+						}
+						hist match_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Efficiency/L2
+							display     	= StatBox
+						}
+						hist match_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Efficiency/L2
+							display     	= StatBox
+						}
+						hist match_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Efficiency/L2
+							display     	= StatBox
+						}
+						hist match_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Efficiency/L2
+							display     	= StatBox
+						}
+						hist mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Efficiency/L2
+							display     	= StatBox
+						}
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Efficiency/L2
+							display     	= StatBox
+						}
+						hist pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Efficiency/L2
+							display     	= StatBox
+						}
+					}
+					dir L2Calo {
+						hist eff_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Efficiency/L2Calo
+							display     	= StatBox
+						}
+						hist eff_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Efficiency/L2Calo
+							display     	= StatBox
+						}
+						hist eff_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Efficiency/L2Calo
+							display     	= StatBox
+						}
+						hist eff_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Efficiency/L2Calo
+							display     	= StatBox
+						}
+						hist eff_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Efficiency/L2Calo
+							display     	= StatBox
+						}
+						hist eff_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Efficiency/L2Calo
+							display     	= StatBox
+						}
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Efficiency/L2Calo
+							display     	= StatBox
+						}
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Efficiency/L2Calo
+							display     	= StatBox
+						}
+						hist highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Efficiency/L2Calo
+							display     	= StatBox
+						}
+						hist match_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Efficiency/L2Calo
+							display     	= StatBox
+						}
+						hist match_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Efficiency/L2Calo
+							display     	= StatBox
+						}
+						hist match_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Efficiency/L2Calo
+							display     	= StatBox
+						}
+						hist match_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Efficiency/L2Calo
+							display     	= StatBox
+						}
+						hist match_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Efficiency/L2Calo
+							display     	= StatBox
+						}
+						hist match_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Efficiency/L2Calo
+							display     	= StatBox
+						}
+						hist mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Efficiency/L2Calo
+							display     	= StatBox
+						}
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Efficiency/L2Calo
+							display     	= StatBox
+						}
+						hist pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Efficiency/L2Calo
+							display     	= StatBox
+						}
+					}
+				}
+				dir Resolutions {
+					dir HLT {
+						hist res_Reta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_Rhad {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_Rhad1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_Rphi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_d0 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_d0sig {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_deta1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_deta2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_dphi2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_dphiresc {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_eprobht {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_eprobhtVsPt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_eprobht_onVsOff {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_eratio {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_etInEta0 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_etInEta1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist eff_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Efficiency/HLT
+						hist res_etInEta2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist eff_highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Efficiency/HLT
+						hist res_etInEta3 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist eff_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Efficiency/HLT
+						hist res_etVsEt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist eff_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Efficiency/HLT
+						hist res_etVsEta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist eff_mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Efficiency/HLT
+						hist res_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist match_pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Efficiency/HLT
+						hist res_ethad {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist match_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Efficiency/HLT
+						hist res_ethad1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist match_highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Efficiency/HLT
+						hist res_f1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist match_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Efficiency/HLT
+						hist res_f3 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist match_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Efficiency/HLT
+						hist res_npixhits {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist match_mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Efficiency/HLT
+						hist res_nscthits {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Efficiency/HLT
+						hist res_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Efficiency/HLT
+						hist res_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Efficiency/HLT
+						hist res_weta1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Efficiency/HLT
+						hist res_weta2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Efficiency/HLT
+						hist res_wtots1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Efficiency/HLT
+					}
+					dir L1Calo {
+						hist res_etVsEta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Resolutions/L1Calo
 							display     	= StatBox
 						}
-						hist match_coarse_et_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Efficiency/HLT
+					}
+					dir L2Calo_vs_HLT {
+						hist res_Reta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist coarse_et_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Efficiency/HLT
+						hist res_Rhad {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist eff_coarse_et_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Efficiency/HLT
+						hist res_Rhad1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-					}
-					dir L2Calo {
-						hist eff_pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Efficiency/L2Calo
+						hist res_Rphi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist eff_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Efficiency/L2Calo
+						hist res_eratio {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist eff_highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Efficiency/L2Calo
+						hist res_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist eff_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Efficiency/L2Calo
+						hist res_etVsEt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist eff_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Efficiency/L2Calo
+						hist res_etVsEta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist eff_mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Efficiency/L2Calo
+						hist res_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist match_pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Efficiency/L2Calo
+						hist res_ethad {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist match_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Efficiency/L2Calo
+						hist res_ethad1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist match_highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Efficiency/L2Calo
+						hist res_f1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist match_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Efficiency/L2Calo
+						hist res_f3 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist match_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Efficiency/L2Calo
+						hist res_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist match_mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Efficiency/L2Calo
+						hist res_weta1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Efficiency/L2Calo
+						hist res_weta2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e15_medium_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Efficiency/L2Calo
+					}
+				}
+			}
+			dir HLT_e18_etcut_ion {
+				dir AbsResolutions {
+					dir L1Calo {
+						hist res_etVsEta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/AbsResolutions/L1Calo
 							display     	= StatBox
 						}
-						hist highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Efficiency/L2Calo
+					}
+				}
+				dir Distributions {
+					dir EFCalo {
+						hist energy {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/EFCalo
 							display     	= StatBox
 						}
-						hist eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Efficiency/L2Calo
+						hist energyBE0 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/EFCalo
 							display     	= StatBox
 						}
-						hist phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Efficiency/L2Calo
+						hist energyBE1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/EFCalo
 							display     	= StatBox
 						}
-						hist mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Efficiency/L2Calo
+						hist energyBE2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/EFCalo
 							display     	= StatBox
 						}
-					}
-					dir L2 {
-						hist eff_pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Efficiency/L2
+						hist energyBE3 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/EFCalo
 							display     	= StatBox
 						}
-						hist eff_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Efficiency/L2
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/EFCalo
 							display     	= StatBox
 						}
-						hist eff_highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Efficiency/L2
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/EFCalo
 							display     	= StatBox
 						}
-						hist eff_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Efficiency/L2
+						hist eta_calo {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/EFCalo
 							display     	= StatBox
 						}
-						hist eff_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Efficiency/L2
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/EFCalo
 							display     	= StatBox
 						}
-						hist eff_mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Efficiency/L2
+						hist phi_calo {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/EFCalo
 							display     	= StatBox
 						}
-						hist match_pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Efficiency/L2
+					}
+					dir HLT {
+						hist Reta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist match_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Efficiency/L2
+						hist Rhad {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist match_highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Efficiency/L2
+						hist Rhad1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist match_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Efficiency/L2
+						hist Rphi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist match_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Efficiency/L2
+						hist charge {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist match_mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Efficiency/L2
+						hist d0 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Efficiency/L2
+						hist d0sig {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Efficiency/L2
+						hist deta1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Efficiency/L2
+						hist deta1_EMEBA {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Efficiency/L2
+						hist deta1_EMEBC {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Efficiency/L2
+						hist deta1_EMECA {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Efficiency/L2
+						hist deta1_EMECC {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/HLT
 							display     	= StatBox
 						}
-					}
-					dir EFCalo {
-						hist eff_pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Efficiency/EFCalo
+						hist deta2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist eff_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Efficiency/EFCalo
+						hist dphi2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist eff_highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Efficiency/EFCalo
+						hist dphiresc {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist eff_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Efficiency/EFCalo
+						hist eprobht {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist eff_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Efficiency/EFCalo
+						hist eratio {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist eff_mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Efficiency/EFCalo
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist match_pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Efficiency/EFCalo
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist match_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Efficiency/EFCalo
+						hist ethad {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist match_highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Efficiency/EFCalo
+						hist ethad1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist match_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Efficiency/EFCalo
+						hist f1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist match_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Efficiency/EFCalo
+						hist f3 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist match_mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Efficiency/EFCalo
+						hist highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist npixhits {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist nscthits {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/HLT
 							display     	= StatBox
 						}
 						hist pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Efficiency/EFCalo
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Efficiency/EFCalo
+						hist ptcone20 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Efficiency/EFCalo
+						hist ptcone20_rel {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Efficiency/EFCalo
+						hist ptvarcone20 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Efficiency/EFCalo
+						hist ptvarcone20_rel {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Efficiency/EFCalo
+						hist rejection {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/HLT
 							display     	= StatBox
 						}
-					}
-				}
-				dir Distributions {
-					dir Offline {
-						hist highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Distributions/Offline
+						hist topoetcone20 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist ethad {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Distributions/Offline
+						hist topoetcone20_rel {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist ethad1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Distributions/Offline
+						hist topoetcone40_shift {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist topoetcone40_shift_rel {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/HLT
 							display     	= StatBox
 						}
 						hist weta1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Distributions/Offline
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/HLT
 							display     	= StatBox
 						}
 						hist weta2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Distributions/Offline
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist f1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Distributions/Offline
+					}
+					dir L1Calo {
+						hist emClusVsEmIsol {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/L1Calo
 							display     	= StatBox
 						}
-						hist f3 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Distributions/Offline
+						hist emClusVsEta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/L1Calo
 							display     	= StatBox
 						}
-						hist Reta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Distributions/Offline
+						hist emClusVsHadCore {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/L1Calo
 							display     	= StatBox
 						}
-						hist Rphi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Distributions/Offline
+						hist emIso {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/L1Calo
 							display     	= StatBox
 						}
-						hist Rhad {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Distributions/Offline
+						hist energy {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/L1Calo
 							display     	= StatBox
 						}
-						hist Rhad1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Distributions/Offline
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/L1Calo
 							display     	= StatBox
 						}
-						hist eratio {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Distributions/Offline
+						hist hadCore {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/L1Calo
 							display     	= StatBox
 						}
-						hist topoetcone20 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Distributions/Offline
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/L1Calo
 							display     	= StatBox
 						}
-						hist topoetcone20_rel {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Distributions/Offline
+						hist roi_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/L1Calo
 							display     	= StatBox
 						}
-						hist rejection {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Distributions/Offline
-							display     	= StatBox
+					}
+					dir L2Calo {
+						hist discriminant {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/L2Calo
+							display     	= StatBox
+						}
+						hist discriminantVsMu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/L2Calo
+							display     	= StatBox
+						}
+						dir discriminant_binned {
+							hist discriminantVsMu_et_0_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_0_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_0_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_0_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_0_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_1_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_1_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_1_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_1_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_1_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_2_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_2_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_2_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_2_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_2_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_3_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_3_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_3_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_3_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_3_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_4_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_4_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_4_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_4_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_4_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_0_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_0_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_0_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_0_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_0_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_1_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_1_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_1_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_1_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_1_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_2_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_2_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_2_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_2_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_2_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_3_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_3_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_3_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_3_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_3_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_4_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_4_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_4_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_4_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_4_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
 						}
 						hist et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Distributions/Offline
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/L2Calo
 							display     	= StatBox
 						}
 						hist eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Distributions/Offline
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/L2Calo
 							display     	= StatBox
 						}
 						hist phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Distributions/Offline
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/L2Calo
 							display     	= StatBox
 						}
 					}
-					dir HLT {
-						hist highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Distributions/HLT
+					dir L2Electron {
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/L2Electron
 							display     	= StatBox
 						}
-						hist ethad {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Distributions/HLT
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/L2Electron
 							display     	= StatBox
 						}
-						hist ethad1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Distributions/HLT
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/L2Electron
 							display     	= StatBox
 						}
-						hist weta1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Distributions/HLT
+						hist trkClusDeta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/L2Electron
 							display     	= StatBox
 						}
-						hist weta2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Distributions/HLT
+						hist trkClusDphi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/L2Electron
 							display     	= StatBox
 						}
-						hist f1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Distributions/HLT
+					}
+					dir Offline {
+						hist Reta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist f3 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Distributions/HLT
+						hist Rhad {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist Reta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Distributions/HLT
+						hist Rhad1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/Offline
 							display     	= StatBox
 						}
 						hist Rphi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Distributions/HLT
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist Rhad {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Distributions/HLT
+						hist charge {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist Rhad1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Distributions/HLT
+						hist d0 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist eratio {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Distributions/HLT
+						hist d0sig {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist topoetcone20 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Distributions/HLT
+						hist deta1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist topoetcone20_rel {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Distributions/HLT
+						hist deta1_EMEBA {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist rejection {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Distributions/HLT
+						hist deta1_EMEBC {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Distributions/HLT
+						hist deta1_EMECA {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Distributions/HLT
+						hist deta1_EMECC {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Distributions/HLT
+						hist deta2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/Offline
 							display     	= StatBox
 						}
-					}
-					dir EFCalo {
-						hist energyBE0 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Distributions/EFCalo
+						hist dphi2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist energyBE1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Distributions/EFCalo
+						hist dphiresc {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist energyBE2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Distributions/EFCalo
+						hist eprobht {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist energyBE3 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Distributions/EFCalo
+						hist eratio {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist energy {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Distributions/EFCalo
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist eta_calo {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Distributions/EFCalo
+						hist ethad {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist phi_calo {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Distributions/EFCalo
+						hist ethad1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Distributions/EFCalo
+						hist f1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Distributions/EFCalo
+						hist f3 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Distributions/EFCalo
+						hist highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/Offline
 							display     	= StatBox
 						}
-					}
-					dir L2Photon {
-						hist et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Distributions/L2Photon
+						hist npixhits {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Distributions/L2Photon
+						hist nscthits {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/Offline
 							display     	= StatBox
 						}
 						hist phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Distributions/L2Photon
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/Offline
 							display     	= StatBox
 						}
-					}
-					dir L2Calo {
-						hist ringer_nnOutput {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Distributions/L2Calo
+						hist pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist ringer_etVsEta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Distributions/L2Calo
+						hist ptcone20 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Distributions/L2Calo
+						hist ptcone20_rel {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Distributions/L2Calo
+						hist ptvarcone20 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Distributions/L2Calo
+						hist ptvarcone20_rel {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/Offline
 							display     	= StatBox
 						}
-					}
-				}
-				dir Resolutions {
-					dir HLT {
-						hist res_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Resolutions/HLT
+						hist rejection {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist res_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Resolutions/HLT
+						hist topoetcone20 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist res_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Resolutions/HLT
+						hist topoetcone20_rel {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist res_etVsEta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Resolutions/HLT
+						hist topoetcone40_shift {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist res_etVsEt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Resolutions/HLT
+						hist topoetcone40_shift_rel {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist res_ethad {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Resolutions/HLT
+						hist weta1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist res_ethad1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Resolutions/HLT
+						hist weta2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist res_Rhad {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Resolutions/HLT
+					}
+					dir RoI {
+						hist roi_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/RoI
 							display     	= StatBox
 						}
-						hist res_Rhad1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Resolutions/HLT
+						hist roi_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Distributions/RoI
 							display     	= StatBox
 						}
-						hist res_Reta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Resolutions/HLT
+					}
+				}
+				dir Efficiency {
+					dir EFCalo {
+						hist eff_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist res_Rphi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Resolutions/HLT
+						hist eff_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist res_weta1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Resolutions/HLT
+						hist eff_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist res_weta2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Resolutions/HLT
+						hist eff_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist res_f1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Resolutions/HLT
+						hist eff_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist res_f3 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Resolutions/HLT
+						hist eff_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist res_eratio {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Resolutions/HLT
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist res_et_cnv {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Resolutions/HLT
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist res_et_uncnv {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Resolutions/HLT
+						hist highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist res_cnv_etVsEta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Resolutions/HLT
+						hist match_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist res_cnv_etVsEt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Resolutions/HLT
+						hist match_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist res_uncnv_etVsEta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Resolutions/HLT
+						hist match_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist res_uncnv_etVsEt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Resolutions/HLT
+						hist match_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist res_cnv_etInEta0 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Resolutions/HLT
+						hist match_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist res_cnv_etInEta1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Resolutions/HLT
+						hist match_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist res_cnv_etInEta2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Resolutions/HLT
+						hist mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist res_cnv_etInEta3 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Resolutions/HLT
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist res_uncnv_etInEta0 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Resolutions/HLT
+						hist pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist res_uncnv_etInEta1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Resolutions/HLT
+					}
+					dir HLT {
+						hist FailisEMLHMedium {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist res_uncnv_etInEta2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Resolutions/HLT
+						hist IneffisEMLHMedium {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist res_uncnv_etInEta3 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Resolutions/HLT
+						hist coarse_et_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist res_etInEta0 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Resolutions/HLT
+						hist eff_coarse_et_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist res_etInEta1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Resolutions/HLT
+						hist eff_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist res_etInEta2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Resolutions/HLT
+						hist eff_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist res_etInEta3 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Resolutions/HLT
+						hist eff_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist res_wtots1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Resolutions/HLT
+						hist eff_hltreco {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-					}
-					dir L2Calo_vs_HLT {
-						hist res_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Resolutions/L2Calo_vs_HLT
+						hist eff_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist res_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Resolutions/L2Calo_vs_HLT
+						hist eff_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist res_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Resolutions/L2Calo_vs_HLT
+						hist eff_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist res_etVsEta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Resolutions/L2Calo_vs_HLT
+						hist eff_triggerstep {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist res_etVsEt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Resolutions/L2Calo_vs_HLT
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist res_ethad {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Resolutions/L2Calo_vs_HLT
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist res_ethad1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Resolutions/L2Calo_vs_HLT
+						hist highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist res_Rhad {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Resolutions/L2Calo_vs_HLT
+						hist match_coarse_et_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist res_Rhad1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Resolutions/L2Calo_vs_HLT
+						hist match_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist res_Reta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Resolutions/L2Calo_vs_HLT
+						hist match_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist res_Rphi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Resolutions/L2Calo_vs_HLT
+						hist match_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist res_weta1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Resolutions/L2Calo_vs_HLT
+						hist match_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist res_weta2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Resolutions/L2Calo_vs_HLT
+						hist match_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist res_f1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Resolutions/L2Calo_vs_HLT
+						hist match_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist res_f3 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Resolutions/L2Calo_vs_HLT
+						hist mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist res_eratio {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g13_etcut/Resolutions/L2Calo_vs_HLT
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Efficiency/HLT
 							display     	= StatBox
 						}
 					}
-				}
-			}
-			dir HLT_g15_loose {
-				dir Efficiency {
-					dir HLT {
-						hist eff_pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Efficiency/HLT
+					dir L1Calo {
+						hist coarse_et_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist eff_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Efficiency/HLT
+						hist eff_coarse_et_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist eff_highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Efficiency/HLT
+						hist eff_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
 						hist eff_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Efficiency/HLT
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist eff_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Efficiency/HLT
+						hist eff_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
 						hist eff_mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Efficiency/HLT
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist match_pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Efficiency/HLT
+						hist eff_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist match_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Efficiency/HLT
+						hist eff_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist match_highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Efficiency/HLT
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist match_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Efficiency/HLT
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist match_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Efficiency/HLT
+						hist highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist match_mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Efficiency/HLT
+						hist match_coarse_et_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Efficiency/HLT
+						hist match_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Efficiency/HLT
+						hist match_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Efficiency/HLT
+						hist match_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Efficiency/HLT
+						hist match_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Efficiency/HLT
+						hist match_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Efficiency/HLT
+						hist match_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist match_coarse_et_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Efficiency/HLT
+						hist mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist coarse_et_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Efficiency/HLT
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist eff_coarse_et_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Efficiency/HLT
+						hist pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
 					}
-					dir L2Calo {
-						hist eff_pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Efficiency/L2Calo
+					dir L2 {
+						hist eff_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist eff_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Efficiency/L2Calo
+						hist eff_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Efficiency/L2
 							display     	= StatBox
 						}
 						hist eff_highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Efficiency/L2Calo
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist eff_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Efficiency/L2Calo
+						hist eff_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Efficiency/L2
 							display     	= StatBox
 						}
 						hist eff_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Efficiency/L2Calo
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist eff_mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Efficiency/L2Calo
+						hist eff_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist match_pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Efficiency/L2Calo
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist match_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Efficiency/L2Calo
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist match_highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Efficiency/L2Calo
+						hist highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist match_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Efficiency/L2Calo
+						hist match_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist match_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Efficiency/L2Calo
+						hist match_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist match_mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Efficiency/L2Calo
+						hist match_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Efficiency/L2Calo
+						hist match_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Efficiency/L2Calo
+						hist match_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Efficiency/L2Calo
+						hist match_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Efficiency/L2Calo
+						hist mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Efficiency/L2
 							display     	= StatBox
 						}
 						hist phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Efficiency/L2Calo
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Efficiency/L2Calo
+						hist pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Efficiency/L2
 							display     	= StatBox
 						}
 					}
-					dir L2 {
-						hist eff_pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Efficiency/L2
-							display     	= StatBox
-						}
+					dir L2Calo {
 						hist eff_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Efficiency/L2
-							display     	= StatBox
-						}
-						hist eff_highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Efficiency/L2
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
 						hist eff_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Efficiency/L2
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist eff_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Efficiency/L2
+						hist eff_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
 						hist eff_mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Efficiency/L2
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist match_pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Efficiency/L2
+						hist eff_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist match_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Efficiency/L2
+						hist eff_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist match_highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Efficiency/L2
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist match_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Efficiency/L2
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist match_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Efficiency/L2
+						hist highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist match_mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Efficiency/L2
+						hist match_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Efficiency/L2
+						hist match_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Efficiency/L2
+						hist match_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Efficiency/L2
+						hist match_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Efficiency/L2
+						hist match_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Efficiency/L2
+						hist match_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
 						hist mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Efficiency/L2
-							display     	= StatBox
-						}
-					}
-					dir EFCalo {
-						hist eff_pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Efficiency/EFCalo
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist eff_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Efficiency/EFCalo
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist eff_highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Efficiency/EFCalo
+						hist pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist eff_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Efficiency/EFCalo
+					}
+				}
+				dir Resolutions {
+					dir HLT {
+						hist res_Reta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist eff_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Efficiency/EFCalo
+						hist res_Rhad {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist eff_mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Efficiency/EFCalo
+						hist res_Rhad1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist match_pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Efficiency/EFCalo
+						hist res_Rphi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist match_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Efficiency/EFCalo
+						hist res_d0 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist match_highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Efficiency/EFCalo
+						hist res_d0sig {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist match_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Efficiency/EFCalo
+						hist res_deta1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist match_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Efficiency/EFCalo
+						hist res_deta2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist match_mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Efficiency/EFCalo
+						hist res_dphi2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Efficiency/EFCalo
+						hist res_dphiresc {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Efficiency/EFCalo
+						hist res_eprobht {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Efficiency/EFCalo
+						hist res_eprobhtVsPt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Efficiency/EFCalo
+						hist res_eprobht_onVsOff {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Efficiency/EFCalo
+						hist res_eratio {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Efficiency/EFCalo
+						hist res_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-					}
-				}
-				dir Distributions {
-					dir Offline {
-						hist highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Distributions/Offline
+						hist res_etInEta0 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist ethad {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Distributions/Offline
+						hist res_etInEta1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist ethad1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Distributions/Offline
+						hist res_etInEta2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist weta1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Distributions/Offline
+						hist res_etInEta3 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist weta2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Distributions/Offline
+						hist res_etVsEt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist f1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Distributions/Offline
+						hist res_etVsEta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist f3 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Distributions/Offline
+						hist res_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist Reta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Distributions/Offline
+						hist res_ethad {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist Rphi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Distributions/Offline
+						hist res_ethad1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist Rhad {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Distributions/Offline
+						hist res_f1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist Rhad1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Distributions/Offline
+						hist res_f3 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist eratio {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Distributions/Offline
+						hist res_npixhits {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist topoetcone20 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Distributions/Offline
+						hist res_nscthits {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist topoetcone20_rel {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Distributions/Offline
+						hist res_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist rejection {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Distributions/Offline
+						hist res_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Distributions/Offline
+						hist res_weta1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Distributions/Offline
+						hist res_weta2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Distributions/Offline
+						hist res_wtots1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Resolutions/HLT
 							display     	= StatBox
 						}
 					}
-					dir HLT {
-						hist highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Distributions/HLT
+					dir L1Calo {
+						hist res_etVsEta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Resolutions/L1Calo
 							display     	= StatBox
 						}
-						hist ethad {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Distributions/HLT
+					}
+					dir L2Calo_vs_HLT {
+						hist res_Reta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist ethad1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Distributions/HLT
+						hist res_Rhad {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist weta1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Distributions/HLT
+						hist res_Rhad1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist weta2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Distributions/HLT
+						hist res_Rphi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist f1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Distributions/HLT
+						hist res_eratio {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist f3 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Distributions/HLT
+						hist res_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist Reta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Distributions/HLT
+						hist res_etVsEt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist Rphi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Distributions/HLT
+						hist res_etVsEta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist Rhad {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Distributions/HLT
+						hist res_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist Rhad1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Distributions/HLT
+						hist res_ethad {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist eratio {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Distributions/HLT
+						hist res_ethad1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist topoetcone20 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Distributions/HLT
+						hist res_f1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist topoetcone20_rel {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Distributions/HLT
+						hist res_f3 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist rejection {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Distributions/HLT
+						hist res_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Distributions/HLT
+						hist res_weta1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Distributions/HLT
+						hist res_weta2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_etcut_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Distributions/HLT
+					}
+				}
+			}
+			dir HLT_e18_lhloose_ion {
+				dir AbsResolutions {
+					dir L1Calo {
+						hist res_etVsEta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/AbsResolutions/L1Calo
 							display     	= StatBox
 						}
 					}
+				}
+				dir Distributions {
 					dir EFCalo {
+						hist energy {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/EFCalo
+							display     	= StatBox
+						}
 						hist energyBE0 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Distributions/EFCalo
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/EFCalo
 							display     	= StatBox
 						}
 						hist energyBE1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Distributions/EFCalo
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/EFCalo
 							display     	= StatBox
 						}
 						hist energyBE2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Distributions/EFCalo
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/EFCalo
 							display     	= StatBox
 						}
 						hist energyBE3 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Distributions/EFCalo
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/EFCalo
 							display     	= StatBox
 						}
-						hist energy {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Distributions/EFCalo
-							display     	= StatBox
-						}
-						hist eta_calo {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Distributions/EFCalo
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/EFCalo
 							display     	= StatBox
 						}
-						hist phi_calo {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Distributions/EFCalo
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/EFCalo
 							display     	= StatBox
 						}
-						hist et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Distributions/EFCalo
+						hist eta_calo {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/EFCalo
 							display     	= StatBox
 						}
-						hist eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Distributions/EFCalo
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/EFCalo
 							display     	= StatBox
 						}
-						hist phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Distributions/EFCalo
+						hist phi_calo {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/EFCalo
 							display     	= StatBox
 						}
 					}
-					dir L2Photon {
-						hist et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Distributions/L2Photon
+					dir HLT {
+						hist Reta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Distributions/L2Photon
+						hist Rhad {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Distributions/L2Photon
+						hist Rhad1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-					}
-					dir L2Calo {
-						hist et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Distributions/L2Calo
+						hist Rphi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Distributions/L2Calo
+						hist charge {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Distributions/L2Calo
+						hist d0 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-					}
-				}
-				dir Resolutions {
-					dir HLT {
-						hist res_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Resolutions/HLT
+						hist d0sig {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist res_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Resolutions/HLT
+						hist deta1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist res_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Resolutions/HLT
+						hist deta1_EMEBA {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist res_etVsEta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Resolutions/HLT
+						hist deta1_EMEBC {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist res_etVsEt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Resolutions/HLT
+						hist deta1_EMECA {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist res_ethad {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Resolutions/HLT
+						hist deta1_EMECC {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist res_ethad1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Resolutions/HLT
+						hist deta2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist res_Rhad {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Resolutions/HLT
+						hist dphi2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist res_Rhad1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Resolutions/HLT
+						hist dphiresc {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist res_Reta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Resolutions/HLT
+						hist eprobht {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist res_Rphi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Resolutions/HLT
+						hist eratio {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist res_weta1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Resolutions/HLT
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist res_weta2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Resolutions/HLT
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist res_f1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Resolutions/HLT
+						hist ethad {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist res_f3 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Resolutions/HLT
+						hist ethad1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist res_eratio {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Resolutions/HLT
+						hist f1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist res_et_cnv {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Resolutions/HLT
+						hist f3 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist res_et_uncnv {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Resolutions/HLT
+						hist highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist res_cnv_etVsEta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Resolutions/HLT
+						hist npixhits {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist res_cnv_etVsEt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Resolutions/HLT
+						hist nscthits {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist res_uncnv_etVsEta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Resolutions/HLT
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist res_uncnv_etVsEt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Resolutions/HLT
+						hist pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist res_cnv_etInEta0 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Resolutions/HLT
+						hist ptcone20 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist res_cnv_etInEta1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Resolutions/HLT
+						hist ptcone20_rel {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist res_cnv_etInEta2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Resolutions/HLT
+						hist ptvarcone20 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist res_cnv_etInEta3 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Resolutions/HLT
+						hist ptvarcone20_rel {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist res_uncnv_etInEta0 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Resolutions/HLT
+						hist rejection {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist res_uncnv_etInEta1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Resolutions/HLT
+						hist topoetcone20 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist res_uncnv_etInEta2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Resolutions/HLT
+						hist topoetcone20_rel {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist res_uncnv_etInEta3 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Resolutions/HLT
+						hist topoetcone40_shift {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist res_etInEta0 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Resolutions/HLT
+						hist topoetcone40_shift_rel {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist res_etInEta1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Resolutions/HLT
+						hist weta1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist res_etInEta2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Resolutions/HLT
+						hist weta2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist res_etInEta3 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Resolutions/HLT
+					}
+					dir L1Calo {
+						hist emClusVsEmIsol {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/L1Calo
 							display     	= StatBox
 						}
-						hist res_wtots1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Resolutions/HLT
+						hist emClusVsEta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/L1Calo
 							display     	= StatBox
 						}
-					}
-					dir L2Calo_vs_HLT {
-						hist res_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Resolutions/L2Calo_vs_HLT
+						hist emClusVsHadCore {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/L1Calo
 							display     	= StatBox
 						}
-						hist res_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Resolutions/L2Calo_vs_HLT
+						hist emIso {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/L1Calo
 							display     	= StatBox
 						}
-						hist res_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Resolutions/L2Calo_vs_HLT
+						hist energy {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/L1Calo
 							display     	= StatBox
 						}
-						hist res_etVsEta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Resolutions/L2Calo_vs_HLT
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/L1Calo
 							display     	= StatBox
 						}
-						hist res_etVsEt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Resolutions/L2Calo_vs_HLT
+						hist hadCore {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/L1Calo
 							display     	= StatBox
 						}
-						hist res_ethad {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Resolutions/L2Calo_vs_HLT
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/L1Calo
 							display     	= StatBox
 						}
-						hist res_ethad1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Resolutions/L2Calo_vs_HLT
+						hist roi_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/L1Calo
 							display     	= StatBox
 						}
-						hist res_Rhad {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Resolutions/L2Calo_vs_HLT
-							display     	= StatBox
+					}
+					dir L2Calo {
+						hist discriminant {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/L2Calo
+							display     	= StatBox
+						}
+						hist discriminantVsMu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/L2Calo
+							display     	= StatBox
+						}
+						dir discriminant_binned {
+							hist discriminantVsMu_et_0_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_0_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_0_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_0_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_0_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_1_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_1_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_1_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_1_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_1_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_2_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_2_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_2_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_2_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_2_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_3_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_3_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_3_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_3_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_3_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_4_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_4_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_4_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_4_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_4_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_0_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_0_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_0_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_0_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_0_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_1_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_1_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_1_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_1_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_1_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_2_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_2_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_2_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_2_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_2_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_3_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_3_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_3_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_3_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_3_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_4_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_4_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_4_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_4_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_4_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
 						}
-						hist res_Rhad1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Resolutions/L2Calo_vs_HLT
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/L2Calo
 							display     	= StatBox
 						}
-						hist res_Reta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Resolutions/L2Calo_vs_HLT
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/L2Calo
 							display     	= StatBox
 						}
-						hist res_Rphi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Resolutions/L2Calo_vs_HLT
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/L2Calo
 							display     	= StatBox
 						}
-						hist res_weta1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Resolutions/L2Calo_vs_HLT
+					}
+					dir L2Electron {
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/L2Electron
 							display     	= StatBox
 						}
-						hist res_weta2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Resolutions/L2Calo_vs_HLT
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/L2Electron
 							display     	= StatBox
 						}
-						hist res_f1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Resolutions/L2Calo_vs_HLT
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/L2Electron
 							display     	= StatBox
 						}
-						hist res_f3 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Resolutions/L2Calo_vs_HLT
+						hist trkClusDeta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/L2Electron
 							display     	= StatBox
 						}
-						hist res_eratio {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g15_loose/Resolutions/L2Calo_vs_HLT
+						hist trkClusDphi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/L2Electron
 							display     	= StatBox
 						}
 					}
-				}
-			}
-			dir HLT_g18_etcut {
-				dir Efficiency {
-					dir HLT {
-						hist eff_pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Efficiency/HLT
+					dir Offline {
+						hist Reta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist eff_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Efficiency/HLT
+						hist Rhad {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist eff_highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Efficiency/HLT
+						hist Rhad1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist eff_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Efficiency/HLT
+						hist Rphi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist eff_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Efficiency/HLT
+						hist charge {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist eff_mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Efficiency/HLT
+						hist d0 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist match_pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Efficiency/HLT
+						hist d0sig {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist match_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Efficiency/HLT
+						hist deta1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist match_highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Efficiency/HLT
+						hist deta1_EMEBA {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist match_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Efficiency/HLT
+						hist deta1_EMEBC {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist match_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Efficiency/HLT
+						hist deta1_EMECA {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist match_mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Efficiency/HLT
+						hist deta1_EMECC {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Efficiency/HLT
+						hist deta2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Efficiency/HLT
+						hist dphi2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Efficiency/HLT
+						hist dphiresc {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Efficiency/HLT
+						hist eprobht {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Efficiency/HLT
+						hist eratio {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Efficiency/HLT
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist match_coarse_et_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Efficiency/HLT
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist coarse_et_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Efficiency/HLT
+						hist ethad {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist eff_coarse_et_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Efficiency/HLT
+						hist ethad1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-					}
-					dir L2Calo {
-						hist eff_pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Efficiency/L2Calo
+						hist f1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist eff_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Efficiency/L2Calo
+						hist f3 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist eff_highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Efficiency/L2Calo
+						hist highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist eff_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Efficiency/L2Calo
+						hist npixhits {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist eff_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Efficiency/L2Calo
+						hist nscthits {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist eff_mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Efficiency/L2Calo
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist match_pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Efficiency/L2Calo
+						hist pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist match_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Efficiency/L2Calo
+						hist ptcone20 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist match_highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Efficiency/L2Calo
+						hist ptcone20_rel {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist match_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Efficiency/L2Calo
+						hist ptvarcone20 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist match_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Efficiency/L2Calo
+						hist ptvarcone20_rel {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist match_mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Efficiency/L2Calo
+						hist rejection {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Efficiency/L2Calo
+						hist topoetcone20 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Efficiency/L2Calo
+						hist topoetcone20_rel {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Efficiency/L2Calo
+						hist topoetcone40_shift {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Efficiency/L2Calo
+						hist topoetcone40_shift_rel {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Efficiency/L2Calo
+						hist weta1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Efficiency/L2Calo
+						hist weta2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/Offline
 							display     	= StatBox
 						}
 					}
-					dir L2 {
-						hist eff_pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Efficiency/L2
+					dir RoI {
+						hist roi_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/RoI
+							display     	= StatBox
+						}
+						hist roi_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Distributions/RoI
 							display     	= StatBox
 						}
+					}
+				}
+				dir Efficiency {
+					dir EFCalo {
 						hist eff_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Efficiency/L2
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Efficiency/EFCalo
+							display     	= StatBox
+						}
+						hist eff_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
 						hist eff_highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Efficiency/L2
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist eff_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Efficiency/L2
+						hist eff_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
 						hist eff_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Efficiency/L2
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist eff_mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Efficiency/L2
+						hist eff_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist match_pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Efficiency/L2
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist match_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Efficiency/L2
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist match_highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Efficiency/L2
+						hist highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist match_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Efficiency/L2
+						hist match_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist match_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Efficiency/L2
+						hist match_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist match_mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Efficiency/L2
+						hist match_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Efficiency/L2
+						hist match_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Efficiency/L2
+						hist match_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Efficiency/L2
+						hist match_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Efficiency/L2
+						hist mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
 						hist phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Efficiency/L2
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Efficiency/L2
+						hist pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
 					}
-					dir EFCalo {
-						hist eff_pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Efficiency/EFCalo
+					dir HLT {
+						hist FailisEMLHLoose {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist eff_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Efficiency/EFCalo
+						hist IneffisEMLHLoose {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist eff_highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Efficiency/EFCalo
+						hist coarse_et_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist eff_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Efficiency/EFCalo
+						hist eff_coarse_et_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist eff_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Efficiency/EFCalo
+						hist eff_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist eff_mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Efficiency/EFCalo
+						hist eff_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist match_pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Efficiency/EFCalo
+						hist eff_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist match_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Efficiency/EFCalo
+						hist eff_hltreco {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist match_highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Efficiency/EFCalo
+						hist eff_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist match_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Efficiency/EFCalo
+						hist eff_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist match_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Efficiency/EFCalo
+						hist eff_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist match_mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Efficiency/EFCalo
+						hist eff_triggerstep {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Efficiency/EFCalo
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Efficiency/EFCalo
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
 						hist highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Efficiency/EFCalo
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Efficiency/EFCalo
+						hist match_coarse_et_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Efficiency/EFCalo
+						hist match_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Efficiency/EFCalo
+						hist match_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-					}
-				}
-				dir Distributions {
-					dir Offline {
-						hist highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Distributions/Offline
+						hist match_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist ethad {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Distributions/Offline
+						hist match_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist ethad1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Distributions/Offline
+						hist match_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist weta1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Distributions/Offline
+						hist match_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist weta2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Distributions/Offline
+						hist mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist f1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Distributions/Offline
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist f3 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Distributions/Offline
+						hist pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist Reta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Distributions/Offline
+					}
+					dir L1Calo {
+						hist coarse_et_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist Rphi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Distributions/Offline
+						hist eff_coarse_et_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist Rhad {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Distributions/Offline
+						hist eff_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist Rhad1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Distributions/Offline
+						hist eff_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist eratio {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Distributions/Offline
+						hist eff_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist topoetcone20 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Distributions/Offline
+						hist eff_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist topoetcone20_rel {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Distributions/Offline
+						hist eff_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist rejection {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Distributions/Offline
+						hist eff_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
 						hist et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Distributions/Offline
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
 						hist eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Distributions/Offline
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Distributions/Offline
+						hist highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-					}
-					dir HLT {
-						hist highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Distributions/HLT
+						hist match_coarse_et_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist ethad {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Distributions/HLT
+						hist match_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist ethad1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Distributions/HLT
+						hist match_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist weta1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Distributions/HLT
+						hist match_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist weta2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Distributions/HLT
+						hist match_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist f1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Distributions/HLT
+						hist match_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist f3 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Distributions/HLT
+						hist match_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist Reta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Distributions/HLT
+						hist mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist Rphi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Distributions/HLT
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist Rhad {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Distributions/HLT
+						hist pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist Rhad1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Distributions/HLT
+					}
+					dir L2 {
+						hist eff_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist eratio {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Distributions/HLT
+						hist eff_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist topoetcone20 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Distributions/HLT
+						hist eff_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist topoetcone20_rel {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Distributions/HLT
+						hist eff_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist rejection {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Distributions/HLT
+						hist eff_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Efficiency/L2
+							display     	= StatBox
+						}
+						hist eff_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Efficiency/L2
 							display     	= StatBox
 						}
 						hist et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Distributions/HLT
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Efficiency/L2
 							display     	= StatBox
 						}
 						hist eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Distributions/HLT
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Distributions/HLT
+						hist highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Efficiency/L2
 							display     	= StatBox
 						}
-					}
-					dir EFCalo {
-						hist energyBE0 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Distributions/EFCalo
+						hist match_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist energyBE1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Distributions/EFCalo
+						hist match_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist energyBE2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Distributions/EFCalo
+						hist match_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist energyBE3 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Distributions/EFCalo
+						hist match_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist energy {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Distributions/EFCalo
+						hist match_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist eta_calo {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Distributions/EFCalo
+						hist match_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist phi_calo {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Distributions/EFCalo
+						hist mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Distributions/EFCalo
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Distributions/EFCalo
+						hist pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Distributions/EFCalo
+					}
+					dir L2Calo {
+						hist eff_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-					}
-					dir L2Photon {
-						hist et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Distributions/L2Photon
+						hist eff_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Distributions/L2Photon
+						hist eff_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Distributions/L2Photon
+						hist eff_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-					}
-					dir L2Calo {
-						hist ringer_nnOutput {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Distributions/L2Calo
+						hist eff_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist ringer_etVsEta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Distributions/L2Calo
+						hist eff_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
 						hist et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Distributions/L2Calo
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
 						hist eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Distributions/L2Calo
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Distributions/L2Calo
+						hist highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-					}
-				}
-				dir Resolutions {
-					dir HLT {
-						hist res_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Resolutions/HLT
+						hist match_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist res_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Resolutions/HLT
+						hist match_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist res_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Resolutions/HLT
+						hist match_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist res_etVsEta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Resolutions/HLT
+						hist match_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist res_etVsEt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Resolutions/HLT
+						hist match_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist res_ethad {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Resolutions/HLT
+						hist match_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist res_ethad1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Resolutions/HLT
+						hist mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist res_Rhad {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Resolutions/HLT
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist res_Rhad1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Resolutions/HLT
+						hist pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
+					}
+				}
+				dir Resolutions {
+					dir HLT {
 						hist res_Reta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Resolutions/HLT
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_Rphi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Resolutions/HLT
+						hist res_Rhad {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_weta1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Resolutions/HLT
+						hist res_Rhad1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_weta2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Resolutions/HLT
+						hist res_Rphi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_f1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Resolutions/HLT
+						hist res_d0 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_f3 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Resolutions/HLT
+						hist res_d0sig {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_eratio {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Resolutions/HLT
+						hist res_deta1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_et_cnv {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Resolutions/HLT
+						hist res_deta2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_et_uncnv {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Resolutions/HLT
+						hist res_dphi2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_cnv_etVsEta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Resolutions/HLT
+						hist res_dphiresc {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_cnv_etVsEt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Resolutions/HLT
+						hist res_eprobht {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_uncnv_etVsEta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Resolutions/HLT
+						hist res_eprobhtVsPt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_uncnv_etVsEt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Resolutions/HLT
+						hist res_eprobht_onVsOff {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_cnv_etInEta0 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Resolutions/HLT
+						hist res_eratio {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_cnv_etInEta1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Resolutions/HLT
+						hist res_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_cnv_etInEta2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Resolutions/HLT
+						hist res_etInEta0 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_cnv_etInEta3 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Resolutions/HLT
+						hist res_etInEta1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_uncnv_etInEta0 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Resolutions/HLT
+						hist res_etInEta2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_uncnv_etInEta1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Resolutions/HLT
+						hist res_etInEta3 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_uncnv_etInEta2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Resolutions/HLT
+						hist res_etVsEt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_uncnv_etInEta3 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Resolutions/HLT
+						hist res_etVsEta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_etInEta0 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Resolutions/HLT
+						hist res_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_etInEta1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Resolutions/HLT
+						hist res_ethad {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_etInEta2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Resolutions/HLT
+						hist res_ethad1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_etInEta3 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Resolutions/HLT
+						hist res_f1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_wtots1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Resolutions/HLT
+						hist res_f3 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-					}
-					dir L2Calo_vs_HLT {
-						hist res_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Resolutions/L2Calo_vs_HLT
+						hist res_npixhits {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Resolutions/L2Calo_vs_HLT
+						hist res_nscthits {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
 						hist res_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Resolutions/L2Calo_vs_HLT
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_etVsEta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Resolutions/L2Calo_vs_HLT
+						hist res_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_etVsEt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Resolutions/L2Calo_vs_HLT
+						hist res_weta1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_ethad {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Resolutions/L2Calo_vs_HLT
+						hist res_weta2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_ethad1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Resolutions/L2Calo_vs_HLT
+						hist res_wtots1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_Rhad {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Resolutions/L2Calo_vs_HLT
+					}
+					dir L1Calo {
+						hist res_etVsEta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Resolutions/L1Calo
 							display     	= StatBox
 						}
-						hist res_Rhad1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Resolutions/L2Calo_vs_HLT
+					}
+					dir L2Calo_vs_HLT {
+						hist res_Reta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist res_Reta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Resolutions/L2Calo_vs_HLT
+						hist res_Rhad {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Resolutions/L2Calo_vs_HLT
+							display     	= StatBox
+						}
+						hist res_Rhad1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
 						hist res_Rphi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Resolutions/L2Calo_vs_HLT
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist res_weta1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Resolutions/L2Calo_vs_HLT
+						hist res_eratio {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist res_weta2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Resolutions/L2Calo_vs_HLT
+						hist res_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist res_f1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Resolutions/L2Calo_vs_HLT
+						hist res_etVsEt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist res_f3 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Resolutions/L2Calo_vs_HLT
+						hist res_etVsEta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist res_eratio {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g18_etcut/Resolutions/L2Calo_vs_HLT
+						hist res_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-					}
-				}
-			}
-			dir HLT_g20_loose {
-				dir Efficiency {
-					dir HLT {
-						hist eff_pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Efficiency/HLT
+						hist res_ethad {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist eff_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Efficiency/HLT
+						hist res_ethad1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist eff_highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Efficiency/HLT
+						hist res_f1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist eff_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Efficiency/HLT
+						hist res_f3 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist eff_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Efficiency/HLT
+						hist res_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist eff_mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Efficiency/HLT
+						hist res_weta1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist match_pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Efficiency/HLT
+						hist res_weta2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhloose_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist match_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Efficiency/HLT
+					}
+				}
+			}
+			dir HLT_e18_lhmedium_ion {
+				dir AbsResolutions {
+					dir L1Calo {
+						hist res_etVsEta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/AbsResolutions/L1Calo
 							display     	= StatBox
 						}
-						hist match_highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Efficiency/HLT
+					}
+				}
+				dir Distributions {
+					dir EFCalo {
+						hist energy {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/EFCalo
 							display     	= StatBox
 						}
-						hist match_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Efficiency/HLT
+						hist energyBE0 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/EFCalo
 							display     	= StatBox
 						}
-						hist match_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Efficiency/HLT
+						hist energyBE1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/EFCalo
 							display     	= StatBox
 						}
-						hist match_mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Efficiency/HLT
+						hist energyBE2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/EFCalo
 							display     	= StatBox
 						}
-						hist pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Efficiency/HLT
+						hist energyBE3 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/EFCalo
 							display     	= StatBox
 						}
 						hist et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Efficiency/HLT
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/EFCalo
 							display     	= StatBox
 						}
-						hist highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Efficiency/HLT
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/EFCalo
 							display     	= StatBox
 						}
-						hist eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Efficiency/HLT
+						hist eta_calo {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/EFCalo
 							display     	= StatBox
 						}
 						hist phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Efficiency/HLT
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/EFCalo
 							display     	= StatBox
 						}
-						hist mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Efficiency/HLT
+						hist phi_calo {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/EFCalo
 							display     	= StatBox
 						}
-						hist match_coarse_et_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Efficiency/HLT
+					}
+					dir HLT {
+						hist Reta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist coarse_et_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Efficiency/HLT
+						hist Rhad {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist eff_coarse_et_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Efficiency/HLT
+						hist Rhad1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/HLT
 							display     	= StatBox
 						}
-					}
-					dir L2Calo {
-						hist eff_pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Efficiency/L2Calo
+						hist Rphi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist eff_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Efficiency/L2Calo
+						hist charge {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist eff_highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Efficiency/L2Calo
+						hist d0 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist eff_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Efficiency/L2Calo
+						hist d0sig {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist eff_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Efficiency/L2Calo
+						hist deta1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist eff_mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Efficiency/L2Calo
+						hist deta1_EMEBA {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist match_pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Efficiency/L2Calo
+						hist deta1_EMEBC {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist match_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Efficiency/L2Calo
+						hist deta1_EMECA {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist match_highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Efficiency/L2Calo
+						hist deta1_EMECC {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist match_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Efficiency/L2Calo
+						hist deta2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist match_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Efficiency/L2Calo
+						hist dphi2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist match_mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Efficiency/L2Calo
+						hist dphiresc {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Efficiency/L2Calo
+						hist eprobht {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Efficiency/L2Calo
+						hist eratio {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Efficiency/L2Calo
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/HLT
 							display     	= StatBox
 						}
 						hist eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Efficiency/L2Calo
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Efficiency/L2Calo
+						hist ethad {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Efficiency/L2Calo
+						hist ethad1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/HLT
 							display     	= StatBox
 						}
-					}
-					dir L2 {
-						hist eff_pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Efficiency/L2
+						hist f1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist eff_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Efficiency/L2
+						hist f3 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist eff_highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Efficiency/L2
+						hist highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist eff_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Efficiency/L2
+						hist npixhits {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist eff_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Efficiency/L2
+						hist nscthits {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist eff_mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Efficiency/L2
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist match_pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Efficiency/L2
+						hist pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist match_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Efficiency/L2
+						hist ptcone20 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist match_highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Efficiency/L2
+						hist ptcone20_rel {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist match_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Efficiency/L2
+						hist ptvarcone20 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist match_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Efficiency/L2
+						hist ptvarcone20_rel {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist match_mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Efficiency/L2
+						hist rejection {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Efficiency/L2
+						hist topoetcone20 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Efficiency/L2
+						hist topoetcone20_rel {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Efficiency/L2
+						hist topoetcone40_shift {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Efficiency/L2
+						hist topoetcone40_shift_rel {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Efficiency/L2
+						hist weta1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Efficiency/L2
+						hist weta2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/HLT
 							display     	= StatBox
 						}
 					}
-					dir EFCalo {
-						hist eff_pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Efficiency/EFCalo
-							display     	= StatBox
-						}
-						hist eff_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Efficiency/EFCalo
-							display     	= StatBox
-						}
-						hist eff_highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Efficiency/EFCalo
+					dir L1Calo {
+						hist emClusVsEmIsol {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/L1Calo
 							display     	= StatBox
 						}
-						hist eff_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Efficiency/EFCalo
+						hist emClusVsEta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/L1Calo
 							display     	= StatBox
 						}
-						hist eff_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Efficiency/EFCalo
+						hist emClusVsHadCore {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/L1Calo
 							display     	= StatBox
 						}
-						hist eff_mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Efficiency/EFCalo
+						hist emIso {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/L1Calo
 							display     	= StatBox
 						}
-						hist match_pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Efficiency/EFCalo
+						hist energy {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/L1Calo
 							display     	= StatBox
 						}
-						hist match_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Efficiency/EFCalo
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/L1Calo
 							display     	= StatBox
 						}
-						hist match_highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Efficiency/EFCalo
+						hist hadCore {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/L1Calo
 							display     	= StatBox
 						}
-						hist match_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Efficiency/EFCalo
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/L1Calo
 							display     	= StatBox
 						}
-						hist match_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Efficiency/EFCalo
+						hist roi_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/L1Calo
 							display     	= StatBox
 						}
-						hist match_mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Efficiency/EFCalo
+					}
+					dir L2Calo {
+						hist discriminant {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/L2Calo
+							display     	= StatBox
+						}
+						hist discriminantVsMu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/L2Calo
+							display     	= StatBox
+						}
+						dir discriminant_binned {
+							hist discriminantVsMu_et_0_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_0_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_0_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_0_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_0_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_1_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_1_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_1_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_1_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_1_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_2_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_2_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_2_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_2_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_2_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_3_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_3_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_3_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_3_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_3_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_4_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_4_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_4_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_4_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_4_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_0_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_0_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_0_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_0_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_0_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_1_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_1_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_1_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_1_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_1_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_2_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_2_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_2_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_2_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_2_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_3_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_3_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_3_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_3_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_3_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_4_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_4_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_4_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_4_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_4_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+						}
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/L2Calo
 							display     	= StatBox
 						}
-						hist pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Efficiency/EFCalo
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/L2Calo
 							display     	= StatBox
 						}
-						hist et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Efficiency/EFCalo
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/L2Calo
 							display     	= StatBox
 						}
-						hist highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Efficiency/EFCalo
+					}
+					dir L2Electron {
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/L2Electron
 							display     	= StatBox
 						}
 						hist eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Efficiency/EFCalo
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/L2Electron
 							display     	= StatBox
 						}
 						hist phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Efficiency/EFCalo
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/L2Electron
 							display     	= StatBox
 						}
-						hist mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Efficiency/EFCalo
+						hist trkClusDeta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/L2Electron
+							display     	= StatBox
+						}
+						hist trkClusDphi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/L2Electron
 							display     	= StatBox
 						}
 					}
-				}
-				dir Distributions {
 					dir Offline {
-						hist highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Distributions/Offline
+						hist Reta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist ethad {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Distributions/Offline
+						hist Rhad {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist ethad1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Distributions/Offline
+						hist Rhad1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist weta1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Distributions/Offline
+						hist Rphi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist weta2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Distributions/Offline
+						hist charge {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist f1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Distributions/Offline
+						hist d0 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist f3 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Distributions/Offline
+						hist d0sig {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist Reta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Distributions/Offline
+						hist deta1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist Rphi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Distributions/Offline
+						hist deta1_EMEBA {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist Rhad {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Distributions/Offline
+						hist deta1_EMEBC {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist Rhad1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Distributions/Offline
+						hist deta1_EMECA {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist eratio {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Distributions/Offline
+						hist deta1_EMECC {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist topoetcone20 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Distributions/Offline
+						hist deta2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist topoetcone20_rel {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Distributions/Offline
+						hist dphi2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist rejection {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Distributions/Offline
+						hist dphiresc {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Distributions/Offline
+						hist eprobht {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Distributions/Offline
+						hist eratio {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Distributions/Offline
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/Offline
 							display     	= StatBox
 						}
-					}
-					dir HLT {
-						hist highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Distributions/HLT
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/Offline
 							display     	= StatBox
 						}
 						hist ethad {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Distributions/HLT
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/Offline
 							display     	= StatBox
 						}
 						hist ethad1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Distributions/HLT
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist weta1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Distributions/HLT
+						hist f1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist weta2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Distributions/HLT
+						hist f3 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist f1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Distributions/HLT
+						hist highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist f3 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Distributions/HLT
+						hist npixhits {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist Reta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Distributions/HLT
+						hist nscthits {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist Rphi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Distributions/HLT
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist Rhad {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Distributions/HLT
+						hist pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist Rhad1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Distributions/HLT
+						hist ptcone20 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist eratio {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Distributions/HLT
+						hist ptcone20_rel {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist topoetcone20 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Distributions/HLT
+						hist ptvarcone20 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist topoetcone20_rel {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Distributions/HLT
+						hist ptvarcone20_rel {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/Offline
 							display     	= StatBox
 						}
 						hist rejection {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Distributions/HLT
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Distributions/HLT
+						hist topoetcone20 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Distributions/HLT
+						hist topoetcone20_rel {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Distributions/HLT
+						hist topoetcone40_shift {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/Offline
 							display     	= StatBox
 						}
-					}
-					dir EFCalo {
-						hist energyBE0 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Distributions/EFCalo
+						hist topoetcone40_shift_rel {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist energyBE1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Distributions/EFCalo
+						hist weta1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist energyBE2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Distributions/EFCalo
+						hist weta2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist energyBE3 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Distributions/EFCalo
+					}
+					dir RoI {
+						hist roi_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/RoI
 							display     	= StatBox
 						}
-						hist energy {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Distributions/EFCalo
+						hist roi_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Distributions/RoI
 							display     	= StatBox
 						}
-						hist eta_calo {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Distributions/EFCalo
+					}
+				}
+				dir Efficiency {
+					dir EFCalo {
+						hist eff_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist phi_calo {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Distributions/EFCalo
+						hist eff_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Distributions/EFCalo
+						hist eff_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Distributions/EFCalo
+						hist eff_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Distributions/EFCalo
+						hist eff_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Efficiency/EFCalo
+							display     	= StatBox
+						}
+						hist eff_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-					}
-					dir L2Photon {
 						hist et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Distributions/L2Photon
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
 						hist eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Distributions/L2Photon
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Distributions/L2Photon
+						hist highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-					}
-					dir L2Calo {
-						hist et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Distributions/L2Calo
+						hist match_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Distributions/L2Calo
+						hist match_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Distributions/L2Calo
+						hist match_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-					}
-				}
-				dir Resolutions {
-					dir HLT {
-						hist res_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Resolutions/HLT
+						hist match_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist res_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Resolutions/HLT
+						hist match_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist res_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Resolutions/HLT
+						hist match_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist res_etVsEta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Resolutions/HLT
+						hist mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist res_etVsEt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Resolutions/HLT
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist res_ethad {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Resolutions/HLT
+						hist pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist res_ethad1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Resolutions/HLT
+					}
+					dir HLT {
+						hist FailisEMLHMedium {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist res_Rhad {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Resolutions/HLT
+						hist IneffisEMLHMedium {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist res_Rhad1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Resolutions/HLT
+						hist coarse_et_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist res_Reta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Resolutions/HLT
+						hist eff_coarse_et_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist res_Rphi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Resolutions/HLT
+						hist eff_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist res_weta1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Resolutions/HLT
+						hist eff_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist res_weta2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Resolutions/HLT
+						hist eff_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist res_f1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Resolutions/HLT
+						hist eff_hltreco {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist res_f3 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Resolutions/HLT
+						hist eff_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist res_eratio {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Resolutions/HLT
+						hist eff_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist res_et_cnv {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Resolutions/HLT
+						hist eff_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist res_et_uncnv {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Resolutions/HLT
+						hist eff_triggerstep {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist res_cnv_etVsEta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Resolutions/HLT
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist res_cnv_etVsEt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Resolutions/HLT
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist res_uncnv_etVsEta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Resolutions/HLT
+						hist highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist res_uncnv_etVsEt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Resolutions/HLT
+						hist match_coarse_et_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist res_cnv_etInEta0 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Resolutions/HLT
+						hist match_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist res_cnv_etInEta1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Resolutions/HLT
+						hist match_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist res_cnv_etInEta2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Resolutions/HLT
+						hist match_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist res_cnv_etInEta3 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Resolutions/HLT
+						hist match_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist res_uncnv_etInEta0 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Resolutions/HLT
+						hist match_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist res_uncnv_etInEta1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Resolutions/HLT
+						hist match_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist res_uncnv_etInEta2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Resolutions/HLT
+						hist mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist res_uncnv_etInEta3 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Resolutions/HLT
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist res_etInEta0 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Resolutions/HLT
+						hist pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist res_etInEta1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Resolutions/HLT
+					}
+					dir L1Calo {
+						hist coarse_et_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist res_etInEta2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Resolutions/HLT
+						hist eff_coarse_et_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist res_etInEta3 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Resolutions/HLT
+						hist eff_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist res_wtots1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Resolutions/HLT
+						hist eff_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-					}
-					dir L2Calo_vs_HLT {
-						hist res_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Resolutions/L2Calo_vs_HLT
+						hist eff_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist res_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Resolutions/L2Calo_vs_HLT
+						hist eff_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist res_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Resolutions/L2Calo_vs_HLT
+						hist eff_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist res_etVsEta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Resolutions/L2Calo_vs_HLT
+						hist eff_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist res_etVsEt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Resolutions/L2Calo_vs_HLT
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist res_ethad {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Resolutions/L2Calo_vs_HLT
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist res_ethad1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Resolutions/L2Calo_vs_HLT
+						hist highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist res_Rhad {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Resolutions/L2Calo_vs_HLT
+						hist match_coarse_et_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist res_Rhad1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Resolutions/L2Calo_vs_HLT
+						hist match_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist res_Reta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Resolutions/L2Calo_vs_HLT
+						hist match_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist res_Rphi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Resolutions/L2Calo_vs_HLT
+						hist match_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist res_weta1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Resolutions/L2Calo_vs_HLT
+						hist match_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist res_weta2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Resolutions/L2Calo_vs_HLT
+						hist match_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist res_f1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Resolutions/L2Calo_vs_HLT
+						hist match_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist res_f3 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Resolutions/L2Calo_vs_HLT
+						hist mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist res_eratio {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g20_loose/Resolutions/L2Calo_vs_HLT
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-					}
-				}
-			}
-			dir HLT_g35_loose {
-				dir Efficiency {
-					dir HLT {
-						hist eff_pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Efficiency/HLT
+						hist pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
+					}
+					dir L2 {
 						hist eff_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Efficiency/HLT
-							display     	= StatBox
-						}
-						hist eff_highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Efficiency/HLT
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Efficiency/L2
 							display     	= StatBox
 						}
 						hist eff_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Efficiency/HLT
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist eff_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Efficiency/HLT
+						hist eff_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Efficiency/L2
 							display     	= StatBox
 						}
 						hist eff_mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Efficiency/HLT
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist match_pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Efficiency/HLT
+						hist eff_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist match_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Efficiency/HLT
+						hist eff_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist match_highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Efficiency/HLT
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist match_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Efficiency/HLT
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist match_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Efficiency/HLT
+						hist highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist match_mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Efficiency/HLT
+						hist match_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Efficiency/HLT
+						hist match_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Efficiency/HLT
+						hist match_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Efficiency/HLT
+						hist match_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Efficiency/HLT
+						hist match_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Efficiency/HLT
+						hist match_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Efficiency/L2
 							display     	= StatBox
 						}
 						hist mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Efficiency/HLT
-							display     	= StatBox
-						}
-						hist match_coarse_et_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Efficiency/HLT
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist coarse_et_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Efficiency/HLT
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist eff_coarse_et_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Efficiency/HLT
+						hist pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Efficiency/L2
 							display     	= StatBox
 						}
 					}
 					dir L2Calo {
-						hist eff_pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Efficiency/L2Calo
+						hist eff_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist eff_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Efficiency/L2Calo
+						hist eff_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
 						hist eff_highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Efficiency/L2Calo
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist eff_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Efficiency/L2Calo
+						hist eff_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
 						hist eff_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Efficiency/L2Calo
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist eff_mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Efficiency/L2Calo
+						hist eff_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist match_pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Efficiency/L2Calo
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist match_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Efficiency/L2Calo
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist match_highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Efficiency/L2Calo
+						hist highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist match_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Efficiency/L2Calo
+						hist match_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist match_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Efficiency/L2Calo
+						hist match_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist match_mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Efficiency/L2Calo
+						hist match_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Efficiency/L2Calo
+						hist match_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Efficiency/L2Calo
+						hist match_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Efficiency/L2Calo
+						hist match_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Efficiency/L2Calo
+						hist mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
 						hist phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Efficiency/L2Calo
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Efficiency/L2Calo
+						hist pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
 					}
-					dir L2 {
-						hist eff_pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Efficiency/L2
+				}
+				dir Resolutions {
+					dir HLT {
+						hist res_Reta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist eff_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Efficiency/L2
+						hist res_Rhad {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist eff_highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Efficiency/L2
+						hist res_Rhad1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist eff_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Efficiency/L2
+						hist res_Rphi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist eff_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Efficiency/L2
+						hist res_d0 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist eff_mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Efficiency/L2
+						hist res_d0sig {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist match_pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Efficiency/L2
+						hist res_deta1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist match_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Efficiency/L2
+						hist res_deta2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist match_highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Efficiency/L2
+						hist res_dphi2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist match_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Efficiency/L2
+						hist res_dphiresc {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist match_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Efficiency/L2
+						hist res_eprobht {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist match_mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Efficiency/L2
+						hist res_eprobhtVsPt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Efficiency/L2
+						hist res_eprobht_onVsOff {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Efficiency/L2
+						hist res_eratio {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Efficiency/L2
+						hist res_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Efficiency/L2
+						hist res_etInEta0 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Efficiency/L2
+						hist res_etInEta1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Efficiency/L2
+						hist res_etInEta2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-					}
-					dir EFCalo {
-						hist eff_pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Efficiency/EFCalo
+						hist res_etInEta3 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist eff_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Efficiency/EFCalo
+						hist res_etVsEt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist eff_highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Efficiency/EFCalo
+						hist res_etVsEta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist eff_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Efficiency/EFCalo
+						hist res_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist eff_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Efficiency/EFCalo
+						hist res_ethad {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist eff_mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Efficiency/EFCalo
+						hist res_ethad1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist match_pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Efficiency/EFCalo
+						hist res_f1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist match_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Efficiency/EFCalo
+						hist res_f3 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist match_highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Efficiency/EFCalo
+						hist res_npixhits {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist match_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Efficiency/EFCalo
+						hist res_nscthits {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist match_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Efficiency/EFCalo
+						hist res_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist match_mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Efficiency/EFCalo
+						hist res_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Efficiency/EFCalo
+						hist res_weta1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Efficiency/EFCalo
+						hist res_weta2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Efficiency/EFCalo
+						hist res_wtots1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Efficiency/EFCalo
+					}
+					dir L1Calo {
+						hist res_etVsEta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Resolutions/L1Calo
 							display     	= StatBox
 						}
-						hist phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Efficiency/EFCalo
+					}
+					dir L2Calo_vs_HLT {
+						hist res_Reta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Efficiency/EFCalo
+						hist res_Rhad {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-					}
-				}
-				dir Distributions {
-					dir Offline {
-						hist highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Distributions/Offline
+						hist res_Rhad1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist ethad {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Distributions/Offline
+						hist res_Rphi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist ethad1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Distributions/Offline
+						hist res_eratio {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist weta1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Distributions/Offline
+						hist res_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist weta2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Distributions/Offline
+						hist res_etVsEt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist f1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Distributions/Offline
+						hist res_etVsEta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist f3 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Distributions/Offline
+						hist res_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist Reta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Distributions/Offline
+						hist res_ethad {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist Rphi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Distributions/Offline
+						hist res_ethad1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist Rhad {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Distributions/Offline
+						hist res_f1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist Rhad1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Distributions/Offline
+						hist res_f3 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist eratio {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Distributions/Offline
+						hist res_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist topoetcone20 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Distributions/Offline
+						hist res_weta1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist topoetcone20_rel {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Distributions/Offline
+						hist res_weta2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_lhmedium_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist rejection {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Distributions/Offline
+					}
+				}
+			}
+			dir HLT_e18_loose_ion {
+				dir AbsResolutions {
+					dir L1Calo {
+						hist res_etVsEta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/AbsResolutions/L1Calo
 							display     	= StatBox
 						}
-						hist et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Distributions/Offline
+					}
+				}
+				dir Distributions {
+					dir EFCalo {
+						hist energy {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/EFCalo
 							display     	= StatBox
 						}
-						hist eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Distributions/Offline
+						hist energyBE0 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/EFCalo
 							display     	= StatBox
 						}
-						hist phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Distributions/Offline
+						hist energyBE1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/EFCalo
 							display     	= StatBox
 						}
-					}
-					dir HLT {
-						hist highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Distributions/HLT
+						hist energyBE2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/EFCalo
 							display     	= StatBox
 						}
-						hist ethad {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Distributions/HLT
+						hist energyBE3 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/EFCalo
 							display     	= StatBox
 						}
-						hist ethad1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Distributions/HLT
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/EFCalo
 							display     	= StatBox
 						}
-						hist weta1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Distributions/HLT
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/EFCalo
 							display     	= StatBox
 						}
-						hist weta2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Distributions/HLT
+						hist eta_calo {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/EFCalo
 							display     	= StatBox
 						}
-						hist f1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Distributions/HLT
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/EFCalo
 							display     	= StatBox
 						}
-						hist f3 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Distributions/HLT
+						hist phi_calo {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/EFCalo
 							display     	= StatBox
 						}
+					}
+					dir HLT {
 						hist Reta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Distributions/HLT
-							display     	= StatBox
-						}
-						hist Rphi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Distributions/HLT
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
 						hist Rhad {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Distributions/HLT
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
 						hist Rhad1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Distributions/HLT
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist eratio {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Distributions/HLT
+						hist Rphi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist topoetcone20 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Distributions/HLT
+						hist charge {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist topoetcone20_rel {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Distributions/HLT
+						hist d0 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist rejection {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Distributions/HLT
+						hist d0sig {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Distributions/HLT
+						hist deta1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Distributions/HLT
+						hist deta1_EMEBA {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Distributions/HLT
+						hist deta1_EMEBC {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-					}
-					dir EFCalo {
-						hist energyBE0 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Distributions/EFCalo
+						hist deta1_EMECA {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist energyBE1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Distributions/EFCalo
+						hist deta1_EMECC {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist energyBE2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Distributions/EFCalo
+						hist deta2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist energyBE3 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Distributions/EFCalo
+						hist dphi2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist energy {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Distributions/EFCalo
+						hist dphiresc {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist eta_calo {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Distributions/EFCalo
+						hist eprobht {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist phi_calo {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Distributions/EFCalo
+						hist eratio {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
 						hist et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Distributions/EFCalo
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
 						hist eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Distributions/EFCalo
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Distributions/EFCalo
+						hist ethad {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-					}
-					dir L2Photon {
-						hist et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Distributions/L2Photon
+						hist ethad1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Distributions/L2Photon
+						hist f1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Distributions/L2Photon
+						hist f3 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-					}
-					dir L2Calo {
-						hist et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Distributions/L2Calo
+						hist highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Distributions/L2Calo
+						hist npixhits {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist nscthits {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
 						hist phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Distributions/L2Calo
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-					}
-				}
-				dir Resolutions {
-					dir HLT {
-						hist res_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Resolutions/HLT
+						hist pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist res_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Resolutions/HLT
+						hist ptcone20 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist res_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Resolutions/HLT
+						hist ptcone20_rel {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist res_etVsEta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Resolutions/HLT
+						hist ptvarcone20 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist res_etVsEt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Resolutions/HLT
+						hist ptvarcone20_rel {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist res_ethad {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Resolutions/HLT
+						hist rejection {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist res_ethad1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Resolutions/HLT
+						hist topoetcone20 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist res_Rhad {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Resolutions/HLT
+						hist topoetcone20_rel {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist res_Rhad1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Resolutions/HLT
+						hist topoetcone40_shift {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist res_Reta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Resolutions/HLT
+						hist topoetcone40_shift_rel {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist res_Rphi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Resolutions/HLT
+						hist weta1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist res_weta1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Resolutions/HLT
+						hist weta2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist res_weta2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Resolutions/HLT
+					}
+					dir L1Calo {
+						hist emClusVsEmIsol {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/L1Calo
 							display     	= StatBox
 						}
-						hist res_f1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Resolutions/HLT
+						hist emClusVsEta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/L1Calo
 							display     	= StatBox
 						}
-						hist res_f3 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Resolutions/HLT
+						hist emClusVsHadCore {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/L1Calo
 							display     	= StatBox
 						}
-						hist res_eratio {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Resolutions/HLT
+						hist emIso {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/L1Calo
 							display     	= StatBox
 						}
-						hist res_et_cnv {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Resolutions/HLT
+						hist energy {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/L1Calo
 							display     	= StatBox
 						}
-						hist res_et_uncnv {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Resolutions/HLT
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/L1Calo
 							display     	= StatBox
 						}
-						hist res_cnv_etVsEta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Resolutions/HLT
+						hist hadCore {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/L1Calo
 							display     	= StatBox
 						}
-						hist res_cnv_etVsEt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Resolutions/HLT
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/L1Calo
 							display     	= StatBox
 						}
-						hist res_uncnv_etVsEta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Resolutions/HLT
+						hist roi_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/L1Calo
 							display     	= StatBox
 						}
-						hist res_uncnv_etVsEt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Resolutions/HLT
+					}
+					dir L2Calo {
+						hist discriminant {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/L2Calo
+							display     	= StatBox
+						}
+						hist discriminantVsMu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/L2Calo
+							display     	= StatBox
+						}
+						dir discriminant_binned {
+							hist discriminantVsMu_et_0_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_0_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_0_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_0_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_0_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_1_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_1_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_1_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_1_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_1_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_2_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_2_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_2_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_2_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_2_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_3_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_3_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_3_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_3_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_3_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_4_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_4_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_4_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_4_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_4_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_0_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_0_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_0_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_0_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_0_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_1_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_1_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_1_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_1_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_1_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_2_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_2_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_2_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_2_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_2_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_3_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_3_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_3_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_3_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_3_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_4_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_4_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_4_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_4_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_4_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+						}
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/L2Calo
 							display     	= StatBox
 						}
-						hist res_cnv_etInEta0 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Resolutions/HLT
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/L2Calo
 							display     	= StatBox
 						}
-						hist res_cnv_etInEta1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Resolutions/HLT
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/L2Calo
 							display     	= StatBox
 						}
-						hist res_cnv_etInEta2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Resolutions/HLT
+					}
+					dir L2Electron {
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/L2Electron
 							display     	= StatBox
 						}
-						hist res_cnv_etInEta3 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Resolutions/HLT
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/L2Electron
 							display     	= StatBox
 						}
-						hist res_uncnv_etInEta0 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Resolutions/HLT
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/L2Electron
 							display     	= StatBox
 						}
-						hist res_uncnv_etInEta1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Resolutions/HLT
+						hist trkClusDeta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/L2Electron
 							display     	= StatBox
 						}
-						hist res_uncnv_etInEta2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Resolutions/HLT
+						hist trkClusDphi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/L2Electron
 							display     	= StatBox
 						}
-						hist res_uncnv_etInEta3 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Resolutions/HLT
+					}
+					dir Offline {
+						hist Reta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist res_etInEta0 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Resolutions/HLT
+						hist Rhad {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist res_etInEta1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Resolutions/HLT
+						hist Rhad1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist res_etInEta2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Resolutions/HLT
+						hist Rphi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist res_etInEta3 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Resolutions/HLT
+						hist charge {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist res_wtots1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Resolutions/HLT
+						hist d0 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-					}
-					dir L2Calo_vs_HLT {
-						hist res_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Resolutions/L2Calo_vs_HLT
+						hist d0sig {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist res_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Resolutions/L2Calo_vs_HLT
+						hist deta1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist res_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Resolutions/L2Calo_vs_HLT
+						hist deta1_EMEBA {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist res_etVsEta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Resolutions/L2Calo_vs_HLT
+						hist deta1_EMEBC {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist res_etVsEt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Resolutions/L2Calo_vs_HLT
+						hist deta1_EMECA {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist res_ethad {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Resolutions/L2Calo_vs_HLT
+						hist deta1_EMECC {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist res_ethad1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Resolutions/L2Calo_vs_HLT
+						hist deta2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist res_Rhad {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Resolutions/L2Calo_vs_HLT
+						hist dphi2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist res_Rhad1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Resolutions/L2Calo_vs_HLT
+						hist dphiresc {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist res_Reta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Resolutions/L2Calo_vs_HLT
+						hist eprobht {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist res_Rphi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Resolutions/L2Calo_vs_HLT
+						hist eratio {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist res_weta1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Resolutions/L2Calo_vs_HLT
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist res_weta2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Resolutions/L2Calo_vs_HLT
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist res_f1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Resolutions/L2Calo_vs_HLT
+						hist ethad {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist res_f3 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Resolutions/L2Calo_vs_HLT
+						hist ethad1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist res_eratio {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_g35_loose/Resolutions/L2Calo_vs_HLT
+						hist f1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-					}
-				}
-			}
-			dir HLT_e15_etcut {
-				dir Efficiency {
-					dir HLT {
-						hist eff_pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Efficiency/HLT
+						hist f3 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist eff_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Efficiency/HLT
+						hist highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist eff_highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Efficiency/HLT
+						hist npixhits {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist eff_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Efficiency/HLT
+						hist nscthits {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist eff_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Efficiency/HLT
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist eff_mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Efficiency/HLT
+						hist pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist match_pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Efficiency/HLT
+						hist ptcone20 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist match_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Efficiency/HLT
+						hist ptcone20_rel {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist match_highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Efficiency/HLT
+						hist ptvarcone20 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist match_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Efficiency/HLT
+						hist ptvarcone20_rel {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist match_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Efficiency/HLT
+						hist rejection {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist match_mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Efficiency/HLT
+						hist topoetcone20 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Efficiency/HLT
+						hist topoetcone20_rel {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Efficiency/HLT
+						hist topoetcone40_shift {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Efficiency/HLT
+						hist topoetcone40_shift_rel {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Efficiency/HLT
+						hist weta1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Efficiency/HLT
+						hist weta2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Efficiency/HLT
+					}
+					dir RoI {
+						hist roi_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/RoI
 							display     	= StatBox
 						}
-						hist match_coarse_et_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Efficiency/HLT
+						hist roi_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Distributions/RoI
 							display     	= StatBox
 						}
-						hist coarse_et_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Efficiency/HLT
+					}
+				}
+				dir Efficiency {
+					dir EFCalo {
+						hist eff_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist eff_coarse_et_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Efficiency/HLT
+						hist eff_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist eff_triggerstep {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Efficiency/HLT
+						hist eff_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist eff_hltreco {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Efficiency/HLT
+						hist eff_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist IsEmFailLoose {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Efficiency/HLT
+						hist eff_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist IsEmFailMedium {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Efficiency/HLT
+						hist eff_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist IsEmFailTight {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Efficiency/HLT
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist IneffIsEmLoose {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Efficiency/HLT
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist IneffIsEmMedium {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Efficiency/HLT
+						hist highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist IneffIsEmTight {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Efficiency/HLT
+						hist match_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist IsEmLHFailLoose {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Efficiency/HLT
+						hist match_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist IsEmLHFailMedium {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Efficiency/HLT
+						hist match_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist IsEmLHFailTight {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Efficiency/HLT
+						hist match_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-					}
-					dir L2Calo {
-						hist eff_pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Efficiency/L2Calo
+						hist match_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist eff_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Efficiency/L2Calo
+						hist match_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist eff_highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Efficiency/L2Calo
+						hist mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist eff_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Efficiency/L2Calo
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist eff_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Efficiency/L2Calo
+						hist pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist eff_mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Efficiency/L2Calo
+					}
+					dir HLT {
+						hist FailisEMLoose {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist match_pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Efficiency/L2Calo
+						hist IneffisEMLoose {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist match_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Efficiency/L2Calo
+						hist IneffisEMLooseTRT {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist match_highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Efficiency/L2Calo
+						hist IneffisEMLooseTrk {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist match_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Efficiency/L2Calo
+						hist IneffisEMLooseTrkClus {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist match_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Efficiency/L2Calo
+						hist coarse_et_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist match_mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Efficiency/L2Calo
+						hist eff_coarse_et_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Efficiency/L2Calo
+						hist eff_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Efficiency/L2Calo
+						hist eff_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Efficiency/L2Calo
+						hist eff_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Efficiency/L2Calo
+						hist eff_hltreco {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Efficiency/L2Calo
+						hist eff_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Efficiency/L2Calo
+						hist eff_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-					}
-					dir L2 {
 						hist eff_pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Efficiency/L2
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist eff_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Efficiency/L2
+						hist eff_triggerstep {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist eff_highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Efficiency/L2
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist eff_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Efficiency/L2
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist eff_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Efficiency/L2
+						hist highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist eff_mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Efficiency/L2
+						hist match_coarse_et_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist match_pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Efficiency/L2
+						hist match_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist match_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Efficiency/L2
+						hist match_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
 						hist match_highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Efficiency/L2
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist match_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Efficiency/L2
+						hist match_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
 						hist match_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Efficiency/L2
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist match_mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Efficiency/L2
+						hist match_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
 						hist pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Efficiency/L2
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Efficiency/L2
+					}
+					dir L1Calo {
+						hist coarse_et_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Efficiency/L2
+						hist eff_coarse_et_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Efficiency/L2
+						hist eff_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Efficiency/L2
+						hist eff_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Efficiency/L2
+						hist eff_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-					}
-					dir EFCalo {
-						hist eff_pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Efficiency/EFCalo
+						hist eff_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist eff_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Efficiency/EFCalo
+						hist eff_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist eff_highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Efficiency/EFCalo
+						hist eff_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist eff_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Efficiency/EFCalo
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist eff_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Efficiency/EFCalo
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist eff_mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Efficiency/EFCalo
+						hist highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist match_pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Efficiency/EFCalo
+						hist match_coarse_et_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
 						hist match_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Efficiency/EFCalo
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Efficiency/L1Calo
+							display     	= StatBox
+						}
+						hist match_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
 						hist match_highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Efficiency/EFCalo
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist match_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Efficiency/EFCalo
+						hist match_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
 						hist match_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Efficiency/EFCalo
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist match_mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Efficiency/EFCalo
+						hist match_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Efficiency/EFCalo
+						hist mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Efficiency/EFCalo
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Efficiency/EFCalo
+						hist pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Efficiency/EFCalo
+					}
+					dir L2 {
+						hist eff_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Efficiency/EFCalo
+						hist eff_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Efficiency/EFCalo
+						hist eff_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Efficiency/L2
 							display     	= StatBox
 						}
-					}
-				}
-				dir Distributions {
-					dir Offline {
-						hist highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Distributions/Offline
+						hist eff_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist ethad {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Distributions/Offline
+						hist eff_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist ethad1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Distributions/Offline
+						hist eff_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist weta1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Distributions/Offline
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist weta2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Distributions/Offline
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist f1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Distributions/Offline
+						hist highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist f3 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Distributions/Offline
+						hist match_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist Reta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Distributions/Offline
+						hist match_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist Rphi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Distributions/Offline
+						hist match_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist Rhad {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Distributions/Offline
+						hist match_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist Rhad1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Distributions/Offline
+						hist match_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist eratio {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Distributions/Offline
+						hist match_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist topoetcone20 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Distributions/Offline
+						hist mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist topoetcone20_rel {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Distributions/Offline
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Efficiency/L2
 							display     	= StatBox
 						}
 						hist pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Distributions/Offline
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist deta1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Distributions/Offline
+					}
+					dir L2Calo {
+						hist eff_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist deta1_EMECA {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Distributions/Offline
+						hist eff_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist deta1_EMECC {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Distributions/Offline
+						hist eff_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist deta1_EMEBA {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Distributions/Offline
+						hist eff_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist deta1_EMEBC {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Distributions/Offline
+						hist eff_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist deta2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Distributions/Offline
+						hist eff_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist dphi2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Distributions/Offline
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist dphiresc {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Distributions/Offline
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist d0 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Distributions/Offline
+						hist highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist d0sig {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Distributions/Offline
+						hist match_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist eprobht {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Distributions/Offline
+						hist match_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist nscthits {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Distributions/Offline
+						hist match_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist npixhits {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Distributions/Offline
+						hist match_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist charge {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Distributions/Offline
+						hist match_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist ptcone20 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Distributions/Offline
+						hist match_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist ptcone20_rel {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Distributions/Offline
+						hist mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist ptvarcone20 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Distributions/Offline
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist ptvarcone20_rel {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Distributions/Offline
+						hist pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist rejection {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Distributions/Offline
+					}
+				}
+				dir Resolutions {
+					dir HLT {
+						hist res_Reta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Distributions/Offline
+						hist res_Rhad {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Distributions/Offline
+						hist res_Rhad1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Distributions/Offline
+						hist res_Rphi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-					}
-					dir HLT {
-						hist highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Distributions/HLT
+						hist res_d0 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist ethad {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Distributions/HLT
+						hist res_d0sig {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist ethad1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Distributions/HLT
+						hist res_deta1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist weta1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Distributions/HLT
+						hist res_deta2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist weta2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Distributions/HLT
+						hist res_dphi2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist f1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Distributions/HLT
+						hist res_dphiresc {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist f3 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Distributions/HLT
+						hist res_eprobht {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist Reta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Distributions/HLT
+						hist res_eprobhtVsPt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist Rphi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Distributions/HLT
+						hist res_eprobht_onVsOff {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist Rhad {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Distributions/HLT
+						hist res_eratio {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist Rhad1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Distributions/HLT
+						hist res_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist eratio {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Distributions/HLT
+						hist res_etInEta0 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist topoetcone20 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Distributions/HLT
+						hist res_etInEta1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist topoetcone20_rel {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Distributions/HLT
+						hist res_etInEta2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Distributions/HLT
+						hist res_etInEta3 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist deta1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Distributions/HLT
+						hist res_etVsEt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist deta1_EMECA {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Distributions/HLT
+						hist res_etVsEta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist deta1_EMECC {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Distributions/HLT
+						hist res_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist deta1_EMEBA {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Distributions/HLT
+						hist res_ethad {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist deta1_EMEBC {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Distributions/HLT
+						hist res_ethad1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist deta2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Distributions/HLT
+						hist res_f1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist dphi2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Distributions/HLT
+						hist res_f3 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist dphiresc {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Distributions/HLT
+						hist res_npixhits {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist d0 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Distributions/HLT
+						hist res_nscthits {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist d0sig {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Distributions/HLT
+						hist res_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist eprobht {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Distributions/HLT
+						hist res_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist nscthits {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Distributions/HLT
+						hist res_weta1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist npixhits {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Distributions/HLT
+						hist res_weta2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist charge {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Distributions/HLT
+						hist res_wtots1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist ptcone20 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Distributions/HLT
+					}
+					dir L1Calo {
+						hist res_etVsEta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Resolutions/L1Calo
 							display     	= StatBox
 						}
-						hist ptcone20_rel {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Distributions/HLT
+					}
+					dir L2Calo_vs_HLT {
+						hist res_Reta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist ptvarcone20 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Distributions/HLT
+						hist res_Rhad {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist ptvarcone20_rel {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Distributions/HLT
+						hist res_Rhad1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist rejection {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Distributions/HLT
+						hist res_Rphi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Distributions/HLT
+						hist res_eratio {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Distributions/HLT
+						hist res_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Distributions/HLT
+						hist res_etVsEt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-					}
-					dir EFCalo {
-						hist energyBE0 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Distributions/EFCalo
+						hist res_etVsEta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist energyBE1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Distributions/EFCalo
+						hist res_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist energyBE2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Distributions/EFCalo
+						hist res_ethad {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist energyBE3 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Distributions/EFCalo
+						hist res_ethad1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist energy {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Distributions/EFCalo
+						hist res_f1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist eta_calo {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Distributions/EFCalo
+						hist res_f3 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist phi_calo {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Distributions/EFCalo
+						hist res_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Distributions/EFCalo
+						hist res_weta1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Distributions/EFCalo
+						hist res_weta2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_loose_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Distributions/EFCalo
+					}
+				}
+			}
+			dir HLT_e18_medium_ion {
+				dir AbsResolutions {
+					dir L1Calo {
+						hist res_etVsEta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/AbsResolutions/L1Calo
 							display     	= StatBox
 						}
 					}
-					dir L2Electron {
-						hist et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Distributions/L2Electron
+				}
+				dir Distributions {
+					dir EFCalo {
+						hist energy {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/EFCalo
 							display     	= StatBox
 						}
-						hist eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Distributions/L2Electron
+						hist energyBE0 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/EFCalo
 							display     	= StatBox
 						}
-						hist phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Distributions/L2Electron
+						hist energyBE1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/EFCalo
 							display     	= StatBox
 						}
-						hist trkClusDeta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Distributions/L2Electron
+						hist energyBE2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/EFCalo
 							display     	= StatBox
 						}
-						hist trkClusDphi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Distributions/L2Electron
+						hist energyBE3 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/EFCalo
 							display     	= StatBox
 						}
-					}
-					dir L2Calo {
-						hist ringer_nnOutput {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Distributions/L2Calo
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/EFCalo
 							display     	= StatBox
 						}
-						hist ringer_etVsEta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Distributions/L2Calo
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/EFCalo
 							display     	= StatBox
 						}
-						hist et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Distributions/L2Calo
+						hist eta_calo {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/EFCalo
 							display     	= StatBox
 						}
-						hist eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Distributions/L2Calo
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/EFCalo
 							display     	= StatBox
 						}
-						hist phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Distributions/L2Calo
+						hist phi_calo {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/EFCalo
 							display     	= StatBox
 						}
 					}
-				}
-				dir Resolutions {
 					dir HLT {
-						hist res_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Resolutions/HLT
+						hist Reta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist res_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Resolutions/HLT
+						hist Rhad {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist res_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Resolutions/HLT
+						hist Rhad1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist res_etVsEta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Resolutions/HLT
+						hist Rphi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist res_etVsEt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Resolutions/HLT
+						hist charge {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist res_ethad {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Resolutions/HLT
+						hist d0 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist res_ethad1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Resolutions/HLT
+						hist d0sig {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist res_Rhad {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Resolutions/HLT
+						hist deta1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist res_Rhad1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Resolutions/HLT
+						hist deta1_EMEBA {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist res_Reta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Resolutions/HLT
+						hist deta1_EMEBC {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist res_Rphi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Resolutions/HLT
+						hist deta1_EMECA {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist res_weta1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Resolutions/HLT
+						hist deta1_EMECC {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist res_weta2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Resolutions/HLT
+						hist deta2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist dphi2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist res_f1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Resolutions/HLT
+						hist dphiresc {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist res_f3 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Resolutions/HLT
+						hist eprobht {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist res_eratio {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Resolutions/HLT
+						hist eratio {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist res_pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Resolutions/HLT
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist res_deta1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Resolutions/HLT
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist res_deta2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Resolutions/HLT
+						hist ethad {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist res_dphi2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Resolutions/HLT
+						hist ethad1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist res_dphiresc {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Resolutions/HLT
+						hist f1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist res_d0 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Resolutions/HLT
+						hist f3 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist res_d0sig {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Resolutions/HLT
+						hist highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist res_eprobht {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Resolutions/HLT
+						hist npixhits {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist res_nscthits {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Resolutions/HLT
+						hist nscthits {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist res_npixhits {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Resolutions/HLT
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist res_etInEta0 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Resolutions/HLT
+						hist pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist res_etInEta1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Resolutions/HLT
+						hist ptcone20 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist res_etInEta2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Resolutions/HLT
+						hist ptcone20_rel {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist res_etInEta3 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Resolutions/HLT
+						hist ptvarcone20 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist res_wtots1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Resolutions/HLT
+						hist ptvarcone20_rel {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/HLT
 							display     	= StatBox
 						}
-					}
-					dir L2Calo_vs_HLT {
-						hist res_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Resolutions/L2Calo_vs_HLT
+						hist rejection {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist res_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Resolutions/L2Calo_vs_HLT
+						hist topoetcone20 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist res_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Resolutions/L2Calo_vs_HLT
+						hist topoetcone20_rel {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist res_etVsEta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Resolutions/L2Calo_vs_HLT
+						hist topoetcone40_shift {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist res_etVsEt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Resolutions/L2Calo_vs_HLT
+						hist topoetcone40_shift_rel {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist res_ethad {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Resolutions/L2Calo_vs_HLT
+						hist weta1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist res_ethad1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Resolutions/L2Calo_vs_HLT
+						hist weta2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist res_Rhad {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Resolutions/L2Calo_vs_HLT
+					}
+					dir L1Calo {
+						hist emClusVsEmIsol {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/L1Calo
 							display     	= StatBox
 						}
-						hist res_Rhad1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Resolutions/L2Calo_vs_HLT
+						hist emClusVsEta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/L1Calo
 							display     	= StatBox
 						}
-						hist res_Reta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Resolutions/L2Calo_vs_HLT
+						hist emClusVsHadCore {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/L1Calo
 							display     	= StatBox
 						}
-						hist res_Rphi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Resolutions/L2Calo_vs_HLT
+						hist emIso {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/L1Calo
 							display     	= StatBox
 						}
-						hist res_weta1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Resolutions/L2Calo_vs_HLT
+						hist energy {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/L1Calo
 							display     	= StatBox
 						}
-						hist res_weta2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Resolutions/L2Calo_vs_HLT
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/L1Calo
 							display     	= StatBox
 						}
-						hist res_f1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Resolutions/L2Calo_vs_HLT
+						hist hadCore {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/L1Calo
 							display     	= StatBox
 						}
-						hist res_f3 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Resolutions/L2Calo_vs_HLT
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/L1Calo
 							display     	= StatBox
 						}
-						hist res_eratio {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_etcut/Resolutions/L2Calo_vs_HLT
+						hist roi_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/L1Calo
 							display     	= StatBox
 						}
 					}
-				}
-			}
-			dir HLT_e15_lhloose {
-				dir Efficiency {
-					dir HLT {
-						hist eff_pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Efficiency/HLT
-							display     	= StatBox
+					dir L2Calo {
+						hist discriminant {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/L2Calo
+							display     	= StatBox
+						}
+						hist discriminantVsMu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/L2Calo
+							display     	= StatBox
+						}
+						dir discriminant_binned {
+							hist discriminantVsMu_et_0_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_0_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_0_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_0_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_0_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_1_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_1_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_1_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_1_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_1_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_2_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_2_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_2_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_2_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_2_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_3_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_3_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_3_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_3_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_3_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_4_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_4_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_4_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_4_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_4_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_0_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_0_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_0_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_0_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_0_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_1_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_1_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_1_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_1_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_1_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_2_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_2_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_2_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_2_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_2_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_3_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_3_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_3_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_3_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_3_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_4_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_4_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_4_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_4_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_4_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
 						}
-						hist eff_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Efficiency/HLT
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/L2Calo
 							display     	= StatBox
 						}
-						hist eff_highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Efficiency/HLT
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/L2Calo
 							display     	= StatBox
 						}
-						hist eff_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Efficiency/HLT
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/L2Calo
 							display     	= StatBox
 						}
-						hist eff_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Efficiency/HLT
+					}
+					dir L2Electron {
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/L2Electron
 							display     	= StatBox
 						}
-						hist eff_mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Efficiency/HLT
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/L2Electron
 							display     	= StatBox
 						}
-						hist match_pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Efficiency/HLT
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/L2Electron
 							display     	= StatBox
 						}
-						hist match_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Efficiency/HLT
+						hist trkClusDeta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/L2Electron
 							display     	= StatBox
 						}
-						hist match_highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Efficiency/HLT
+						hist trkClusDphi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/L2Electron
 							display     	= StatBox
 						}
-						hist match_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Efficiency/HLT
+					}
+					dir Offline {
+						hist Reta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist match_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Efficiency/HLT
+						hist Rhad {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist match_mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Efficiency/HLT
+						hist Rhad1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Efficiency/HLT
+						hist Rphi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Efficiency/HLT
+						hist charge {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Efficiency/HLT
+						hist d0 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Efficiency/HLT
+						hist d0sig {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Efficiency/HLT
+						hist deta1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Efficiency/HLT
+						hist deta1_EMEBA {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist match_coarse_et_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Efficiency/HLT
+						hist deta1_EMEBC {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist coarse_et_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Efficiency/HLT
+						hist deta1_EMECA {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist eff_coarse_et_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Efficiency/HLT
+						hist deta1_EMECC {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist eff_triggerstep {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Efficiency/HLT
+						hist deta2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist eff_hltreco {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Efficiency/HLT
+						hist dphi2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist IsEmFailLoose {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Efficiency/HLT
+						hist dphiresc {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist IsEmFailMedium {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Efficiency/HLT
+						hist eprobht {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist IsEmFailTight {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Efficiency/HLT
+						hist eratio {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist IneffIsEmLoose {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Efficiency/HLT
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist IneffIsEmMedium {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Efficiency/HLT
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist IneffIsEmTight {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Efficiency/HLT
+						hist ethad {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist IsEmLHFailLoose {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Efficiency/HLT
+						hist ethad1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist IsEmLHFailMedium {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Efficiency/HLT
+						hist f1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist IsEmLHFailTight {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Efficiency/HLT
+						hist f3 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/Offline
 							display     	= StatBox
 						}
-					}
-					dir L2Calo {
-						hist eff_pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Efficiency/L2Calo
+						hist highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist eff_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Efficiency/L2Calo
+						hist npixhits {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist eff_highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Efficiency/L2Calo
+						hist nscthits {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist eff_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Efficiency/L2Calo
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist eff_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Efficiency/L2Calo
+						hist pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist eff_mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Efficiency/L2Calo
+						hist ptcone20 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist match_pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Efficiency/L2Calo
+						hist ptcone20_rel {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist match_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Efficiency/L2Calo
+						hist ptvarcone20 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist match_highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Efficiency/L2Calo
+						hist ptvarcone20_rel {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist match_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Efficiency/L2Calo
+						hist rejection {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist match_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Efficiency/L2Calo
+						hist topoetcone20 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist match_mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Efficiency/L2Calo
+						hist topoetcone20_rel {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Efficiency/L2Calo
+						hist topoetcone40_shift {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Efficiency/L2Calo
+						hist topoetcone40_shift_rel {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Efficiency/L2Calo
+						hist weta1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Efficiency/L2Calo
+						hist weta2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Efficiency/L2Calo
+					}
+					dir RoI {
+						hist roi_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/RoI
 							display     	= StatBox
 						}
-						hist mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Efficiency/L2Calo
+						hist roi_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Distributions/RoI
 							display     	= StatBox
 						}
 					}
-					dir L2 {
-						hist eff_pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Efficiency/L2
+				}
+				dir Efficiency {
+					dir EFCalo {
+						hist eff_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist eff_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Efficiency/L2
+						hist eff_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
 						hist eff_highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Efficiency/L2
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist eff_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Efficiency/L2
+						hist eff_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
 						hist eff_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Efficiency/L2
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist eff_mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Efficiency/L2
+						hist eff_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist match_pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Efficiency/L2
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist match_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Efficiency/L2
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist match_highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Efficiency/L2
+						hist highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist match_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Efficiency/L2
+						hist match_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist match_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Efficiency/L2
+						hist match_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist match_mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Efficiency/L2
+						hist match_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Efficiency/L2
+						hist match_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Efficiency/L2
+						hist match_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Efficiency/L2
+						hist match_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Efficiency/L2
+						hist mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
 						hist phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Efficiency/L2
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Efficiency/L2
+						hist pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
 					}
-					dir EFCalo {
-						hist eff_pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Efficiency/EFCalo
+					dir HLT {
+						hist FailisEMMedium {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist eff_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Efficiency/EFCalo
+						hist IneffisEMMedium {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist eff_highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Efficiency/EFCalo
+						hist IneffisEMMediumTRT {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist eff_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Efficiency/EFCalo
+						hist IneffisEMMediumTrk {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist eff_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Efficiency/EFCalo
+						hist IneffisEMMediumTrkClus {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist eff_mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Efficiency/EFCalo
+						hist coarse_et_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist match_pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Efficiency/EFCalo
+						hist eff_coarse_et_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist match_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Efficiency/EFCalo
+						hist eff_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist match_highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Efficiency/EFCalo
+						hist eff_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist match_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Efficiency/EFCalo
+						hist eff_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist match_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Efficiency/EFCalo
+						hist eff_hltreco {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist match_mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Efficiency/EFCalo
+						hist eff_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Efficiency/EFCalo
+						hist eff_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist eff_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist eff_triggerstep {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Efficiency/HLT
 							display     	= StatBox
 						}
 						hist et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Efficiency/EFCalo
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Efficiency/HLT
 							display     	= StatBox
 						}
 						hist highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Efficiency/EFCalo
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Efficiency/EFCalo
+						hist match_coarse_et_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Efficiency/EFCalo
+						hist match_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Efficiency/EFCalo
+						hist match_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-					}
-				}
-				dir Distributions {
-					dir Offline {
-						hist highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Distributions/Offline
+						hist match_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist ethad {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Distributions/Offline
+						hist match_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist ethad1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Distributions/Offline
+						hist match_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist weta1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Distributions/Offline
+						hist match_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist weta2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Distributions/Offline
+						hist mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist f1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Distributions/Offline
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist f3 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Distributions/Offline
+						hist pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist Reta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Distributions/Offline
+					}
+					dir L1Calo {
+						hist coarse_et_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist Rphi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Distributions/Offline
+						hist eff_coarse_et_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist Rhad {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Distributions/Offline
+						hist eff_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist Rhad1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Distributions/Offline
+						hist eff_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist eratio {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Distributions/Offline
+						hist eff_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist topoetcone20 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Distributions/Offline
+						hist eff_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist topoetcone20_rel {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Distributions/Offline
+						hist eff_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Distributions/Offline
+						hist eff_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist deta1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Distributions/Offline
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist deta1_EMECA {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Distributions/Offline
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist deta1_EMECC {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Distributions/Offline
+						hist highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist deta1_EMEBA {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Distributions/Offline
+						hist match_coarse_et_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist deta1_EMEBC {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Distributions/Offline
+						hist match_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist deta2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Distributions/Offline
+						hist match_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist dphi2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Distributions/Offline
+						hist match_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist dphiresc {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Distributions/Offline
+						hist match_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist d0 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Distributions/Offline
+						hist match_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist d0sig {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Distributions/Offline
+						hist match_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist eprobht {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Distributions/Offline
+						hist mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist nscthits {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Distributions/Offline
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist npixhits {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Distributions/Offline
+						hist pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist charge {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Distributions/Offline
+					}
+					dir L2 {
+						hist eff_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist ptcone20 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Distributions/Offline
+						hist eff_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist ptcone20_rel {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Distributions/Offline
+						hist eff_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist ptvarcone20 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Distributions/Offline
+						hist eff_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist ptvarcone20_rel {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Distributions/Offline
+						hist eff_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist rejection {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Distributions/Offline
+						hist eff_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Efficiency/L2
 							display     	= StatBox
 						}
 						hist et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Distributions/Offline
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Efficiency/L2
 							display     	= StatBox
 						}
 						hist eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Distributions/Offline
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Distributions/Offline
+						hist highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Efficiency/L2
 							display     	= StatBox
 						}
-					}
-					dir HLT {
-						hist highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Distributions/HLT
+						hist match_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist ethad {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Distributions/HLT
+						hist match_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist ethad1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Distributions/HLT
+						hist match_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist weta1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Distributions/HLT
+						hist match_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist weta2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Distributions/HLT
+						hist match_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist f1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Distributions/HLT
+						hist match_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist f3 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Distributions/HLT
+						hist mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist Reta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Distributions/HLT
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist Rphi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Distributions/HLT
+						hist pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist Rhad {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Distributions/HLT
+					}
+					dir L2Calo {
+						hist eff_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist Rhad1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Distributions/HLT
+						hist eff_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist eratio {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Distributions/HLT
+						hist eff_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist topoetcone20 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Distributions/HLT
+						hist eff_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist topoetcone20_rel {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Distributions/HLT
+						hist eff_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Distributions/HLT
+						hist eff_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist deta1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Distributions/HLT
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist deta1_EMECA {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Distributions/HLT
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist deta1_EMECC {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Distributions/HLT
+						hist highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist deta1_EMEBA {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Distributions/HLT
+						hist match_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist deta1_EMEBC {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Distributions/HLT
+						hist match_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist deta2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Distributions/HLT
+						hist match_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist dphi2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Distributions/HLT
+						hist match_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist dphiresc {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Distributions/HLT
+						hist match_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist d0 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Distributions/HLT
+						hist match_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist d0sig {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Distributions/HLT
+						hist mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist eprobht {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Distributions/HLT
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist nscthits {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Distributions/HLT
+						hist pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist npixhits {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Distributions/HLT
+					}
+				}
+				dir Resolutions {
+					dir HLT {
+						hist res_Reta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist charge {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Distributions/HLT
+						hist res_Rhad {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist ptcone20 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Distributions/HLT
+						hist res_Rhad1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist ptcone20_rel {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Distributions/HLT
+						hist res_Rphi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist ptvarcone20 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Distributions/HLT
+						hist res_d0 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist ptvarcone20_rel {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Distributions/HLT
+						hist res_d0sig {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist rejection {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Distributions/HLT
+						hist res_deta1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Distributions/HLT
+						hist res_deta2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Distributions/HLT
+						hist res_dphi2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Distributions/HLT
+						hist res_dphiresc {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-					}
-					dir EFCalo {
-						hist energyBE0 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Distributions/EFCalo
+						hist res_eprobht {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist energyBE1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Distributions/EFCalo
+						hist res_eprobhtVsPt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist energyBE2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Distributions/EFCalo
+						hist res_eprobht_onVsOff {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist energyBE3 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Distributions/EFCalo
+						hist res_eratio {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist energy {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Distributions/EFCalo
+						hist res_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist eta_calo {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Distributions/EFCalo
+						hist res_etInEta0 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist phi_calo {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Distributions/EFCalo
+						hist res_etInEta1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Distributions/EFCalo
+						hist res_etInEta2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Distributions/EFCalo
+						hist res_etInEta3 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Distributions/EFCalo
+						hist res_etVsEt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-					}
-					dir L2Electron {
-						hist et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Distributions/L2Electron
+						hist res_etVsEta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Distributions/L2Electron
+						hist res_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Distributions/L2Electron
+						hist res_ethad {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist trkClusDeta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Distributions/L2Electron
+						hist res_ethad1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist trkClusDphi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Distributions/L2Electron
+						hist res_f1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-					}
-					dir L2Calo {
-						hist et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Distributions/L2Calo
+						hist res_f3 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Distributions/L2Calo
+						hist res_npixhits {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Distributions/L2Calo
+						hist res_nscthits {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-					}
-				}
-				dir Resolutions {
-					dir HLT {
-						hist res_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Resolutions/HLT
+						hist res_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Resolutions/HLT
+						hist res_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Resolutions/HLT
+						hist res_weta1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_etVsEta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Resolutions/HLT
+						hist res_weta2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_etVsEt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Resolutions/HLT
+						hist res_wtots1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_ethad {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Resolutions/HLT
+					}
+					dir L1Calo {
+						hist res_etVsEta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Resolutions/L1Calo
 							display     	= StatBox
 						}
-						hist res_ethad1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Resolutions/HLT
+					}
+					dir L2Calo_vs_HLT {
+						hist res_Reta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
 						hist res_Rhad {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Resolutions/HLT
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
 						hist res_Rhad1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Resolutions/HLT
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist res_Reta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Resolutions/HLT
+						hist res_Rphi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist res_Rphi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Resolutions/HLT
+						hist res_eratio {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist res_weta1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Resolutions/HLT
+						hist res_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist res_weta2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Resolutions/HLT
+						hist res_etVsEt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist res_f1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Resolutions/HLT
+						hist res_etVsEta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist res_f3 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Resolutions/HLT
+						hist res_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist res_eratio {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Resolutions/HLT
+						hist res_ethad {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist res_pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Resolutions/HLT
+						hist res_ethad1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist res_deta1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Resolutions/HLT
+						hist res_f1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist res_deta2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Resolutions/HLT
+						hist res_f3 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist res_dphi2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Resolutions/HLT
+						hist res_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist res_dphiresc {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Resolutions/HLT
+						hist res_weta1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist res_d0 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Resolutions/HLT
+						hist res_weta2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e18_medium_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist res_d0sig {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Resolutions/HLT
+					}
+				}
+			}
+			dir HLT_e20_loose_ion {
+				dir AbsResolutions {
+					dir L1Calo {
+						hist res_etVsEta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/AbsResolutions/L1Calo
 							display     	= StatBox
 						}
-						hist res_eprobht {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Resolutions/HLT
+					}
+				}
+				dir Distributions {
+					dir EFCalo {
+						hist energy {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/EFCalo
 							display     	= StatBox
 						}
-						hist res_nscthits {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Resolutions/HLT
+						hist energyBE0 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/EFCalo
 							display     	= StatBox
 						}
-						hist res_npixhits {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Resolutions/HLT
+						hist energyBE1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/EFCalo
 							display     	= StatBox
 						}
-						hist res_etInEta0 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Resolutions/HLT
+						hist energyBE2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/EFCalo
 							display     	= StatBox
 						}
-						hist res_etInEta1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Resolutions/HLT
+						hist energyBE3 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/EFCalo
 							display     	= StatBox
 						}
-						hist res_etInEta2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Resolutions/HLT
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/EFCalo
 							display     	= StatBox
 						}
-						hist res_etInEta3 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Resolutions/HLT
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/EFCalo
 							display     	= StatBox
 						}
-						hist res_wtots1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Resolutions/HLT
+						hist eta_calo {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/EFCalo
 							display     	= StatBox
 						}
-					}
-					dir L2Calo_vs_HLT {
-						hist res_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Resolutions/L2Calo_vs_HLT
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/EFCalo
+							display     	= StatBox
+						}
+						hist phi_calo {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/EFCalo
 							display     	= StatBox
 						}
-						hist res_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Resolutions/L2Calo_vs_HLT
+					}
+					dir HLT {
+						hist Reta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist res_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Resolutions/L2Calo_vs_HLT
+						hist Rhad {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist res_etVsEta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Resolutions/L2Calo_vs_HLT
+						hist Rhad1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist res_etVsEt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Resolutions/L2Calo_vs_HLT
+						hist Rphi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist res_ethad {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Resolutions/L2Calo_vs_HLT
+						hist charge {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist res_ethad1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Resolutions/L2Calo_vs_HLT
+						hist d0 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist res_Rhad {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Resolutions/L2Calo_vs_HLT
+						hist d0sig {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist res_Rhad1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Resolutions/L2Calo_vs_HLT
+						hist deta1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist res_Reta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Resolutions/L2Calo_vs_HLT
+						hist deta1_EMEBA {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist res_Rphi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Resolutions/L2Calo_vs_HLT
+						hist deta1_EMEBC {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist res_weta1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Resolutions/L2Calo_vs_HLT
+						hist deta1_EMECA {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist res_weta2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Resolutions/L2Calo_vs_HLT
+						hist deta1_EMECC {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist res_f1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Resolutions/L2Calo_vs_HLT
+						hist deta2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist res_f3 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Resolutions/L2Calo_vs_HLT
+						hist dphi2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist res_eratio {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose/Resolutions/L2Calo_vs_HLT
+						hist dphiresc {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-					}
-				}
-			}
-			dir HLT_e17_lhloose {
-				dir Efficiency {
-					dir HLT {
-						hist eff_pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Efficiency/HLT
+						hist eprobht {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist eff_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Efficiency/HLT
+						hist eratio {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist eff_highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Efficiency/HLT
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist eff_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Efficiency/HLT
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist eff_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Efficiency/HLT
+						hist ethad {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist eff_mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Efficiency/HLT
+						hist ethad1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist match_pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Efficiency/HLT
+						hist f1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist match_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Efficiency/HLT
+						hist f3 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist match_highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Efficiency/HLT
+						hist highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist match_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Efficiency/HLT
+						hist npixhits {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist match_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Efficiency/HLT
+						hist nscthits {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist match_mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Efficiency/HLT
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
 						hist pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Efficiency/HLT
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Efficiency/HLT
+						hist ptcone20 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Efficiency/HLT
+						hist ptcone20_rel {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Efficiency/HLT
+						hist ptvarcone20 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Efficiency/HLT
+						hist ptvarcone20_rel {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Efficiency/HLT
+						hist rejection {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist match_coarse_et_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Efficiency/HLT
+						hist topoetcone20 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist coarse_et_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Efficiency/HLT
+						hist topoetcone20_rel {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist eff_coarse_et_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Efficiency/HLT
+						hist topoetcone40_shift {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist eff_triggerstep {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Efficiency/HLT
+						hist topoetcone40_shift_rel {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist eff_hltreco {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Efficiency/HLT
+						hist weta1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/HLT
+							display     	= StatBox
+						}
+						hist weta2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist IsEmFailLoose {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Efficiency/HLT
+					}
+					dir L1Calo {
+						hist emClusVsEmIsol {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/L1Calo
 							display     	= StatBox
 						}
-						hist IsEmFailMedium {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Efficiency/HLT
+						hist emClusVsEta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/L1Calo
 							display     	= StatBox
 						}
-						hist IsEmFailTight {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Efficiency/HLT
+						hist emClusVsHadCore {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/L1Calo
 							display     	= StatBox
 						}
-						hist IneffIsEmLoose {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Efficiency/HLT
+						hist emIso {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/L1Calo
 							display     	= StatBox
 						}
-						hist IneffIsEmMedium {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Efficiency/HLT
+						hist energy {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/L1Calo
 							display     	= StatBox
 						}
-						hist IneffIsEmTight {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Efficiency/HLT
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/L1Calo
 							display     	= StatBox
 						}
-						hist IsEmLHFailLoose {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Efficiency/HLT
+						hist hadCore {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/L1Calo
 							display     	= StatBox
 						}
-						hist IsEmLHFailMedium {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Efficiency/HLT
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/L1Calo
 							display     	= StatBox
 						}
-						hist IsEmLHFailTight {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Efficiency/HLT
+						hist roi_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/L1Calo
 							display     	= StatBox
 						}
 					}
 					dir L2Calo {
-						hist eff_pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Efficiency/L2Calo
-							display     	= StatBox
+						hist discriminant {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/L2Calo
+							display     	= StatBox
+						}
+						hist discriminantVsMu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/L2Calo
+							display     	= StatBox
+						}
+						dir discriminant_binned {
+							hist discriminantVsMu_et_0_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_0_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_0_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_0_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_0_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_1_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_1_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_1_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_1_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_1_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_2_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_2_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_2_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_2_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_2_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_3_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_3_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_3_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_3_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_3_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_4_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_4_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_4_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_4_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_4_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_0_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_0_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_0_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_0_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_0_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_1_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_1_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_1_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_1_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_1_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_2_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_2_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_2_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_2_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_2_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_3_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_3_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_3_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_3_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_3_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_4_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_4_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_4_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_4_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_4_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
 						}
-						hist eff_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Efficiency/L2Calo
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/L2Calo
 							display     	= StatBox
 						}
-						hist eff_highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Efficiency/L2Calo
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/L2Calo
 							display     	= StatBox
 						}
-						hist eff_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Efficiency/L2Calo
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/L2Calo
 							display     	= StatBox
 						}
-						hist eff_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Efficiency/L2Calo
+					}
+					dir L2Electron {
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/L2Electron
 							display     	= StatBox
 						}
-						hist eff_mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Efficiency/L2Calo
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/L2Electron
 							display     	= StatBox
 						}
-						hist match_pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Efficiency/L2Calo
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/L2Electron
 							display     	= StatBox
 						}
-						hist match_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Efficiency/L2Calo
+						hist trkClusDeta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/L2Electron
 							display     	= StatBox
 						}
-						hist match_highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Efficiency/L2Calo
+						hist trkClusDphi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/L2Electron
 							display     	= StatBox
 						}
-						hist match_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Efficiency/L2Calo
+					}
+					dir Offline {
+						hist Reta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist match_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Efficiency/L2Calo
+						hist Rhad {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist match_mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Efficiency/L2Calo
+						hist Rhad1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Efficiency/L2Calo
+						hist Rphi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Efficiency/L2Calo
+						hist charge {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Efficiency/L2Calo
+						hist d0 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Efficiency/L2Calo
+						hist d0sig {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Efficiency/L2Calo
+						hist deta1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Efficiency/L2Calo
+						hist deta1_EMEBA {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-					}
-					dir L2 {
-						hist eff_pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Efficiency/L2
+						hist deta1_EMEBC {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist eff_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Efficiency/L2
+						hist deta1_EMECA {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist eff_highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Efficiency/L2
+						hist deta1_EMECC {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist eff_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Efficiency/L2
+						hist deta2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist eff_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Efficiency/L2
+						hist dphi2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist eff_mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Efficiency/L2
+						hist dphiresc {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist match_pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Efficiency/L2
+						hist eprobht {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist match_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Efficiency/L2
+						hist eratio {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist match_highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Efficiency/L2
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist match_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Efficiency/L2
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist match_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Efficiency/L2
+						hist ethad {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist match_mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Efficiency/L2
+						hist ethad1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Efficiency/L2
+						hist f1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Efficiency/L2
+						hist f3 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
 						hist highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Efficiency/L2
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Efficiency/L2
-							display     	= StatBox
-						}
-						hist phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Efficiency/L2
+						hist npixhits {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Efficiency/L2
+						hist nscthits {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-					}
-					dir EFCalo {
-						hist eff_pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Efficiency/EFCalo
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist eff_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Efficiency/EFCalo
+						hist pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist eff_highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Efficiency/EFCalo
+						hist ptcone20 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist eff_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Efficiency/EFCalo
+						hist ptcone20_rel {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist eff_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Efficiency/EFCalo
+						hist ptvarcone20 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist eff_mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Efficiency/EFCalo
+						hist ptvarcone20_rel {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist match_pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Efficiency/EFCalo
+						hist rejection {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist match_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Efficiency/EFCalo
+						hist topoetcone20 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist match_highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Efficiency/EFCalo
+						hist topoetcone20_rel {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist match_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Efficiency/EFCalo
+						hist topoetcone40_shift {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist match_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Efficiency/EFCalo
+						hist topoetcone40_shift_rel {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist match_mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Efficiency/EFCalo
+						hist weta1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Efficiency/EFCalo
+						hist weta2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Efficiency/EFCalo
+					}
+					dir RoI {
+						hist roi_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/RoI
 							display     	= StatBox
 						}
-						hist highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Efficiency/EFCalo
+						hist roi_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Distributions/RoI
 							display     	= StatBox
 						}
-						hist eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Efficiency/EFCalo
+					}
+				}
+				dir Efficiency {
+					dir EFCalo {
+						hist eff_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Efficiency/EFCalo
+						hist eff_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Efficiency/EFCalo
+						hist eff_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-					}
-				}
-				dir Distributions {
-					dir Offline {
-						hist highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Distributions/Offline
+						hist eff_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist ethad {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Distributions/Offline
+						hist eff_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist ethad1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Distributions/Offline
+						hist eff_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist weta1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Distributions/Offline
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist weta2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Distributions/Offline
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist f1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Distributions/Offline
+						hist highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist f3 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Distributions/Offline
+						hist match_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist Reta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Distributions/Offline
+						hist match_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist Rphi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Distributions/Offline
+						hist match_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist Rhad {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Distributions/Offline
+						hist match_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist Rhad1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Distributions/Offline
+						hist match_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist eratio {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Distributions/Offline
+						hist match_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist topoetcone20 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Distributions/Offline
+						hist mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist topoetcone20_rel {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Distributions/Offline
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
 						hist pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Distributions/Offline
-							display     	= StatBox
-						}
-						hist deta1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Distributions/Offline
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist deta1_EMECA {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Distributions/Offline
+					}
+					dir HLT {
+						hist FailisEMLoose {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist deta1_EMECC {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Distributions/Offline
+						hist IneffisEMLoose {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist deta1_EMEBA {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Distributions/Offline
+						hist IneffisEMLooseTRT {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist deta1_EMEBC {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Distributions/Offline
+						hist IneffisEMLooseTrk {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist deta2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Distributions/Offline
+						hist IneffisEMLooseTrkClus {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist dphi2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Distributions/Offline
+						hist coarse_et_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist dphiresc {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Distributions/Offline
+						hist eff_coarse_et_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist d0 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Distributions/Offline
+						hist eff_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist d0sig {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Distributions/Offline
+						hist eff_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist eprobht {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Distributions/Offline
+						hist eff_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist nscthits {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Distributions/Offline
+						hist eff_hltreco {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist npixhits {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Distributions/Offline
+						hist eff_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist charge {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Distributions/Offline
+						hist eff_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist ptcone20 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Distributions/Offline
+						hist eff_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist ptcone20_rel {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Distributions/Offline
+						hist eff_triggerstep {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist ptvarcone20 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Distributions/Offline
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist ptvarcone20_rel {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Distributions/Offline
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist rejection {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Distributions/Offline
+						hist highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Distributions/Offline
+						hist match_coarse_et_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Distributions/Offline
+						hist match_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Distributions/Offline
+						hist match_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-					}
-					dir HLT {
-						hist highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Distributions/HLT
+						hist match_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist ethad {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Distributions/HLT
+						hist match_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist ethad1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Distributions/HLT
+						hist match_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist weta1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Distributions/HLT
+						hist match_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist weta2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Distributions/HLT
+						hist mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist f1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Distributions/HLT
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist f3 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Distributions/HLT
+						hist pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist Reta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Distributions/HLT
+					}
+					dir L1Calo {
+						hist coarse_et_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist Rphi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Distributions/HLT
+						hist eff_coarse_et_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist Rhad {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Distributions/HLT
+						hist eff_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist Rhad1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Distributions/HLT
+						hist eff_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist eratio {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Distributions/HLT
+						hist eff_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist topoetcone20 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Distributions/HLT
+						hist eff_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist topoetcone20_rel {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Distributions/HLT
+						hist eff_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Distributions/HLT
+						hist eff_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist deta1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Distributions/HLT
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist deta1_EMECA {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Distributions/HLT
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist deta1_EMECC {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Distributions/HLT
+						hist highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist deta1_EMEBA {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Distributions/HLT
+						hist match_coarse_et_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist deta1_EMEBC {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Distributions/HLT
+						hist match_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist deta2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Distributions/HLT
+						hist match_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist dphi2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Distributions/HLT
+						hist match_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist dphiresc {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Distributions/HLT
+						hist match_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist d0 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Distributions/HLT
+						hist match_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist d0sig {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Distributions/HLT
+						hist match_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist eprobht {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Distributions/HLT
+						hist mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist nscthits {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Distributions/HLT
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist npixhits {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Distributions/HLT
+						hist pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist charge {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Distributions/HLT
+					}
+					dir L2 {
+						hist eff_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist ptcone20 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Distributions/HLT
+						hist eff_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist ptcone20_rel {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Distributions/HLT
+						hist eff_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist ptvarcone20 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Distributions/HLT
+						hist eff_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist ptvarcone20_rel {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Distributions/HLT
+						hist eff_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist rejection {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Distributions/HLT
+						hist eff_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Efficiency/L2
 							display     	= StatBox
 						}
 						hist et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Distributions/HLT
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Efficiency/L2
 							display     	= StatBox
 						}
 						hist eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Distributions/HLT
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Distributions/HLT
+						hist highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Efficiency/L2
 							display     	= StatBox
 						}
-					}
-					dir EFCalo {
-						hist energyBE0 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Distributions/EFCalo
+						hist match_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist energyBE1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Distributions/EFCalo
+						hist match_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist energyBE2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Distributions/EFCalo
+						hist match_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist energyBE3 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Distributions/EFCalo
+						hist match_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist energy {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Distributions/EFCalo
+						hist match_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist eta_calo {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Distributions/EFCalo
+						hist match_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist phi_calo {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Distributions/EFCalo
+						hist mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Distributions/EFCalo
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Distributions/EFCalo
+						hist pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Distributions/EFCalo
+					}
+					dir L2Calo {
+						hist eff_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-					}
-					dir L2Electron {
-						hist et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Distributions/L2Electron
+						hist eff_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Distributions/L2Electron
+						hist eff_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Distributions/L2Electron
+						hist eff_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist trkClusDeta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Distributions/L2Electron
+						hist eff_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist trkClusDphi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Distributions/L2Electron
+						hist eff_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-					}
-					dir L2Calo {
 						hist et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Distributions/L2Calo
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
 						hist eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Distributions/L2Calo
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Distributions/L2Calo
+						hist highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-					}
-				}
-				dir Resolutions {
-					dir HLT {
-						hist res_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Resolutions/HLT
+						hist match_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist res_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Resolutions/HLT
+						hist match_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist res_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Resolutions/HLT
+						hist match_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist res_etVsEta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Resolutions/HLT
+						hist match_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist res_etVsEt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Resolutions/HLT
+						hist match_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist res_ethad {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Resolutions/HLT
+						hist match_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist res_ethad1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Resolutions/HLT
+						hist mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist res_Rhad {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Resolutions/HLT
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist res_Rhad1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Resolutions/HLT
+						hist pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
+					}
+				}
+				dir Resolutions {
+					dir HLT {
 						hist res_Reta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Resolutions/HLT
-							display     	= StatBox
-						}
-						hist res_Rphi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Resolutions/HLT
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_weta1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Resolutions/HLT
-							display     	= StatBox
-						}
-						hist res_weta2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Resolutions/HLT
+						hist res_Rhad {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_f1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Resolutions/HLT
+						hist res_Rhad1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_f3 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Resolutions/HLT
+						hist res_Rphi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_eratio {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Resolutions/HLT
+						hist res_d0 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Resolutions/HLT
+						hist res_d0sig {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
 						hist res_deta1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Resolutions/HLT
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
 						hist res_deta2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Resolutions/HLT
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
 						hist res_dphi2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Resolutions/HLT
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
 						hist res_dphiresc {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Resolutions/HLT
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_d0 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Resolutions/HLT
+						hist res_eprobht {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_d0sig {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Resolutions/HLT
+						hist res_eprobhtVsPt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_eprobht {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Resolutions/HLT
+						hist res_eprobht_onVsOff {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_nscthits {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Resolutions/HLT
+						hist res_eratio {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_npixhits {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Resolutions/HLT
+						hist res_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
 						hist res_etInEta0 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Resolutions/HLT
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
 						hist res_etInEta1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Resolutions/HLT
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
 						hist res_etInEta2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Resolutions/HLT
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
 						hist res_etInEta3 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Resolutions/HLT
-							display     	= StatBox
-						}
-						hist res_wtots1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Resolutions/HLT
-							display     	= StatBox
-						}
-					}
-					dir L2Calo_vs_HLT {
-						hist res_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Resolutions/L2Calo_vs_HLT
-							display     	= StatBox
-						}
-						hist res_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Resolutions/L2Calo_vs_HLT
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Resolutions/L2Calo_vs_HLT
+						hist res_etVsEt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
 						hist res_etVsEta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Resolutions/L2Calo_vs_HLT
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_etVsEt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Resolutions/L2Calo_vs_HLT
+						hist res_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
 						hist res_ethad {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Resolutions/L2Calo_vs_HLT
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
 						hist res_ethad1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Resolutions/L2Calo_vs_HLT
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_Rhad {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Resolutions/L2Calo_vs_HLT
+						hist res_f1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_Rhad1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Resolutions/L2Calo_vs_HLT
+						hist res_f3 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_Reta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Resolutions/L2Calo_vs_HLT
+						hist res_npixhits {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_Rphi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Resolutions/L2Calo_vs_HLT
+						hist res_nscthits {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_weta1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Resolutions/L2Calo_vs_HLT
+						hist res_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_weta2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Resolutions/L2Calo_vs_HLT
+						hist res_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_f1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Resolutions/L2Calo_vs_HLT
+						hist res_weta1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_f3 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Resolutions/L2Calo_vs_HLT
+						hist res_weta2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_eratio {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose/Resolutions/L2Calo_vs_HLT
+						hist res_wtots1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
 					}
-				}
-			}
-			dir HLT_e15_lhloose_nod0 {
-				dir Efficiency {
-					dir HLT {
-						hist eff_pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Efficiency/HLT
-							display     	= StatBox
-						}
-						hist eff_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Efficiency/HLT
-							display     	= StatBox
-						}
-						hist eff_highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Efficiency/HLT
-							display     	= StatBox
-						}
-						hist eff_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Efficiency/HLT
-							display     	= StatBox
-						}
-						hist eff_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Efficiency/HLT
+					dir L1Calo {
+						hist res_etVsEta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Resolutions/L1Calo
 							display     	= StatBox
 						}
-						hist eff_mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Efficiency/HLT
+					}
+					dir L2Calo_vs_HLT {
+						hist res_Reta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist match_pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Efficiency/HLT
+						hist res_Rhad {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist match_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Efficiency/HLT
+						hist res_Rhad1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist match_highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Efficiency/HLT
+						hist res_Rphi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist match_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Efficiency/HLT
+						hist res_eratio {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist match_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Efficiency/HLT
+						hist res_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist match_mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Efficiency/HLT
+						hist res_etVsEt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Efficiency/HLT
+						hist res_etVsEta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Efficiency/HLT
+						hist res_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Efficiency/HLT
+						hist res_ethad {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Efficiency/HLT
+						hist res_ethad1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Efficiency/HLT
+						hist res_f1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Efficiency/HLT
+						hist res_f3 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist match_coarse_et_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Efficiency/HLT
+						hist res_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist coarse_et_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Efficiency/HLT
+						hist res_weta1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist eff_coarse_et_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Efficiency/HLT
+						hist res_weta2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_e20_loose_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist eff_triggerstep {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Efficiency/HLT
+					}
+				}
+			}
+			dir HLT_g13_etcut_ion {
+				dir AbsResolutions {
+					dir L1Calo {
+						hist res_etVsEta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/AbsResolutions/L1Calo
 							display     	= StatBox
 						}
-						hist eff_hltreco {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Efficiency/HLT
+					}
+				}
+				dir Distributions {
+					dir EFCalo {
+						hist energy {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/EFCalo
 							display     	= StatBox
 						}
-						hist IsEmFailLoose {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Efficiency/HLT
+						hist energyBE0 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/EFCalo
 							display     	= StatBox
 						}
-						hist IsEmFailMedium {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Efficiency/HLT
+						hist energyBE1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/EFCalo
 							display     	= StatBox
 						}
-						hist IsEmFailTight {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Efficiency/HLT
+						hist energyBE2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/EFCalo
 							display     	= StatBox
 						}
-						hist IneffIsEmLoose {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Efficiency/HLT
+						hist energyBE3 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/EFCalo
 							display     	= StatBox
 						}
-						hist IneffIsEmMedium {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Efficiency/HLT
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/EFCalo
 							display     	= StatBox
 						}
-						hist IneffIsEmTight {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Efficiency/HLT
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/EFCalo
 							display     	= StatBox
 						}
-						hist IsEmLHFailLoose {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Efficiency/HLT
+						hist eta_calo {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/EFCalo
 							display     	= StatBox
 						}
-						hist IsEmLHFailMedium {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Efficiency/HLT
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/EFCalo
 							display     	= StatBox
 						}
-						hist IsEmLHFailTight {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Efficiency/HLT
+						hist phi_calo {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/EFCalo
 							display     	= StatBox
 						}
 					}
-					dir L2Calo {
-						hist eff_pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Efficiency/L2Calo
+					dir HLT {
+						hist Reta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist eff_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Efficiency/L2Calo
+						hist Rhad {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist eff_highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Efficiency/L2Calo
+						hist Rhad1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist eff_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Efficiency/L2Calo
+						hist Rphi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist eff_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Efficiency/L2Calo
+						hist eratio {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist eff_mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Efficiency/L2Calo
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist match_pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Efficiency/L2Calo
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist match_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Efficiency/L2Calo
+						hist ethad {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist match_highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Efficiency/L2Calo
+						hist ethad1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist match_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Efficiency/L2Calo
+						hist f1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist match_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Efficiency/L2Calo
+						hist f3 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist match_mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Efficiency/L2Calo
+						hist highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Efficiency/L2Calo
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Efficiency/L2Calo
+						hist rejection {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Efficiency/L2Calo
+						hist topoetcone20 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Efficiency/L2Calo
+						hist topoetcone20_rel {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Efficiency/L2Calo
+						hist topoetcone40_shift {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Efficiency/L2Calo
+						hist topoetcone40_shift_rel {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/HLT
 							display     	= StatBox
 						}
-					}
-					dir L2 {
-						hist eff_pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Efficiency/L2
+						hist weta1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist eff_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Efficiency/L2
+						hist weta2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist eff_highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Efficiency/L2
+					}
+					dir L1Calo {
+						hist emClusVsEmIsol {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/L1Calo
 							display     	= StatBox
 						}
-						hist eff_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Efficiency/L2
+						hist emClusVsEta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/L1Calo
 							display     	= StatBox
 						}
-						hist eff_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Efficiency/L2
+						hist emClusVsHadCore {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/L1Calo
 							display     	= StatBox
 						}
-						hist eff_mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Efficiency/L2
+						hist emIso {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/L1Calo
 							display     	= StatBox
 						}
-						hist match_pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Efficiency/L2
+						hist energy {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/L1Calo
 							display     	= StatBox
 						}
-						hist match_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Efficiency/L2
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/L1Calo
 							display     	= StatBox
 						}
-						hist match_highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Efficiency/L2
+						hist hadCore {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/L1Calo
 							display     	= StatBox
 						}
-						hist match_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Efficiency/L2
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/L1Calo
 							display     	= StatBox
 						}
-						hist match_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Efficiency/L2
+						hist roi_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/L1Calo
 							display     	= StatBox
 						}
-						hist match_mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Efficiency/L2
+					}
+					dir L2Calo {
+						hist discriminant {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/L2Calo
+							display     	= StatBox
+						}
+						hist discriminantVsMu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/L2Calo
+							display     	= StatBox
+						}
+						dir discriminant_binned {
+							hist discriminantVsMu_et_0_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_0_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_0_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_0_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_0_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_1_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_1_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_1_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_1_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_1_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_2_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_2_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_2_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_2_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_2_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_3_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_3_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_3_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_3_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_3_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_4_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_4_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_4_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_4_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_4_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_0_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_0_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_0_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_0_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_0_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_1_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_1_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_1_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_1_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_1_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_2_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_2_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_2_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_2_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_2_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_3_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_3_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_3_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_3_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_3_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_4_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_4_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_4_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_4_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_4_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+						}
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/L2Calo
 							display     	= StatBox
 						}
-						hist pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Efficiency/L2
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/L2Calo
 							display     	= StatBox
 						}
-						hist et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Efficiency/L2
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/L2Calo
 							display     	= StatBox
 						}
-						hist highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Efficiency/L2
+					}
+					dir L2Photon {
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/L2Photon
 							display     	= StatBox
 						}
 						hist eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Efficiency/L2
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/L2Photon
 							display     	= StatBox
 						}
 						hist phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Efficiency/L2
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/L2Photon
 							display     	= StatBox
 						}
-						hist mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Efficiency/L2
+					}
+					dir Offline {
+						hist Reta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/Offline
 							display     	= StatBox
 						}
-					}
-					dir EFCalo {
-						hist eff_pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Efficiency/EFCalo
+						hist Rhad {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist eff_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Efficiency/EFCalo
+						hist Rhad1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist eff_highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Efficiency/EFCalo
+						hist Rphi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist eff_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Efficiency/EFCalo
+						hist eratio {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist eff_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Efficiency/EFCalo
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist eff_mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Efficiency/EFCalo
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist match_pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Efficiency/EFCalo
+						hist ethad {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist match_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Efficiency/EFCalo
+						hist ethad1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist match_highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Efficiency/EFCalo
+						hist f1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist match_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Efficiency/EFCalo
+						hist f3 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist match_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Efficiency/EFCalo
+						hist highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist match_mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Efficiency/EFCalo
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Efficiency/EFCalo
+						hist rejection {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Efficiency/EFCalo
+						hist topoetcone20 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Efficiency/EFCalo
+						hist topoetcone20_rel {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Efficiency/EFCalo
+						hist topoetcone40_shift {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Efficiency/EFCalo
+						hist topoetcone40_shift_rel {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Efficiency/EFCalo
+						hist weta1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/Offline
+							display     	= StatBox
+						}
+						hist weta2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/Offline
+							display     	= StatBox
+						}
+					}
+					dir RoI {
+						hist roi_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/RoI
+							display     	= StatBox
+						}
+						hist roi_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Distributions/RoI
 							display     	= StatBox
 						}
 					}
 				}
-				dir Distributions {
-					dir Offline {
-						hist highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Distributions/Offline
+				dir Efficiency {
+					dir EFCalo {
+						hist eff_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist ethad {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Distributions/Offline
+						hist eff_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist ethad1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Distributions/Offline
+						hist eff_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist weta1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Distributions/Offline
+						hist eff_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist weta2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Distributions/Offline
+						hist eff_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist f1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Distributions/Offline
+						hist eff_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist f3 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Distributions/Offline
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist Reta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Distributions/Offline
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist Rphi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Distributions/Offline
+						hist highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist Rhad {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Distributions/Offline
+						hist match_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist Rhad1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Distributions/Offline
+						hist match_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist eratio {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Distributions/Offline
+						hist match_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist topoetcone20 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Distributions/Offline
+						hist match_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist topoetcone20_rel {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Distributions/Offline
+						hist match_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Distributions/Offline
+						hist match_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist deta1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Distributions/Offline
+						hist mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist deta1_EMECA {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Distributions/Offline
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist deta1_EMECC {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Distributions/Offline
+						hist pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist deta1_EMEBA {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Distributions/Offline
+					}
+					dir HLT {
+						hist coarse_et_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist deta1_EMEBC {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Distributions/Offline
+						hist eff_coarse_et_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist deta2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Distributions/Offline
+						hist eff_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist dphi2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Distributions/Offline
+						hist eff_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist dphiresc {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Distributions/Offline
+						hist eff_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist d0 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Distributions/Offline
+						hist eff_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist d0sig {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Distributions/Offline
+						hist eff_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist eprobht {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Distributions/Offline
+						hist eff_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist nscthits {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Distributions/Offline
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist npixhits {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Distributions/Offline
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist charge {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Distributions/Offline
+						hist highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist ptcone20 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Distributions/Offline
+						hist match_coarse_et_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist ptcone20_rel {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Distributions/Offline
+						hist match_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist ptvarcone20 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Distributions/Offline
+						hist match_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist ptvarcone20_rel {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Distributions/Offline
+						hist match_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist rejection {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Distributions/Offline
+						hist match_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Distributions/Offline
+						hist match_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Distributions/Offline
+						hist match_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Efficiency/HLT
 							display     	= StatBox
 						}
 						hist phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Distributions/Offline
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Efficiency/HLT
+							display     	= StatBox
+						}
+						hist pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Efficiency/HLT
 							display     	= StatBox
 						}
 					}
-					dir HLT {
-						hist highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Distributions/HLT
+					dir L1Calo {
+						hist coarse_et_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist ethad {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Distributions/HLT
+						hist eff_coarse_et_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist ethad1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Distributions/HLT
+						hist eff_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist weta1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Distributions/HLT
+						hist eff_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist weta2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Distributions/HLT
+						hist eff_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist f1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Distributions/HLT
+						hist eff_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist f3 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Distributions/HLT
+						hist eff_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist Reta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Distributions/HLT
+						hist eff_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist Rphi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Distributions/HLT
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Efficiency/L1Calo
+							display     	= StatBox
+						}
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist Rhad {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Distributions/HLT
+						hist highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist Rhad1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Distributions/HLT
+						hist match_coarse_et_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist eratio {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Distributions/HLT
+						hist match_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist topoetcone20 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Distributions/HLT
+						hist match_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist topoetcone20_rel {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Distributions/HLT
+						hist match_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Distributions/HLT
+						hist match_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist deta1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Distributions/HLT
+						hist match_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist deta1_EMECA {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Distributions/HLT
+						hist match_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist deta1_EMECC {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Distributions/HLT
+						hist mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist deta1_EMEBA {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Distributions/HLT
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist deta1_EMEBC {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Distributions/HLT
+						hist pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist deta2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Distributions/HLT
+					}
+					dir L2 {
+						hist eff_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist dphi2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Distributions/HLT
+						hist eff_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist dphiresc {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Distributions/HLT
+						hist eff_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist d0 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Distributions/HLT
+						hist eff_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist d0sig {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Distributions/HLT
+						hist eff_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist eprobht {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Distributions/HLT
+						hist eff_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist nscthits {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Distributions/HLT
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist npixhits {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Distributions/HLT
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist charge {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Distributions/HLT
+						hist highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist ptcone20 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Distributions/HLT
+						hist match_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist ptcone20_rel {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Distributions/HLT
+						hist match_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist ptvarcone20 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Distributions/HLT
+						hist match_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist ptvarcone20_rel {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Distributions/HLT
+						hist match_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist rejection {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Distributions/HLT
+						hist match_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Distributions/HLT
+						hist match_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Distributions/HLT
+						hist mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Efficiency/L2
 							display     	= StatBox
 						}
 						hist phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Distributions/HLT
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Efficiency/L2
 							display     	= StatBox
 						}
-					}
-					dir EFCalo {
-						hist energyBE0 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Distributions/EFCalo
+						hist pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist energyBE1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Distributions/EFCalo
+					}
+					dir L2Calo {
+						hist eff_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist energyBE2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Distributions/EFCalo
+						hist eff_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist energyBE3 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Distributions/EFCalo
+						hist eff_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist energy {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Distributions/EFCalo
+						hist eff_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist eta_calo {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Distributions/EFCalo
+						hist eff_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist phi_calo {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Distributions/EFCalo
+						hist eff_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
 						hist et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Distributions/EFCalo
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
 						hist eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Distributions/EFCalo
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Distributions/EFCalo
+						hist highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-					}
-					dir L2Electron {
-						hist et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Distributions/L2Electron
+						hist match_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Distributions/L2Electron
+						hist match_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Distributions/L2Electron
+						hist match_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist trkClusDeta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Distributions/L2Electron
+						hist match_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist trkClusDphi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Distributions/L2Electron
+						hist match_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-					}
-					dir L2Calo {
-						hist et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Distributions/L2Calo
+						hist match_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Distributions/L2Calo
+						hist mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
 						hist phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Distributions/L2Calo
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Efficiency/L2Calo
+							display     	= StatBox
+						}
+						hist pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
 					}
 				}
 				dir Resolutions {
 					dir HLT {
-						hist res_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Resolutions/HLT
-							display     	= StatBox
-						}
-						hist res_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Resolutions/HLT
+						hist res_Reta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Resolutions/HLT
+						hist res_Rhad {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_etVsEta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Resolutions/HLT
+						hist res_Rhad1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_etVsEt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Resolutions/HLT
+						hist res_Rphi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_ethad {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Resolutions/HLT
+						hist res_cnv_etInEta0 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_ethad1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Resolutions/HLT
+						hist res_cnv_etInEta1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_Rhad {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Resolutions/HLT
+						hist res_cnv_etInEta2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_Rhad1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Resolutions/HLT
+						hist res_cnv_etInEta3 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_Reta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Resolutions/HLT
+						hist res_cnv_etVsEt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_Rphi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Resolutions/HLT
+						hist res_cnv_etVsEta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_weta1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Resolutions/HLT
+						hist res_eratio {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_weta2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Resolutions/HLT
+						hist res_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_f1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Resolutions/HLT
+						hist res_etInEta0 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_f3 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Resolutions/HLT
+						hist res_etInEta1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_eratio {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Resolutions/HLT
+						hist res_etInEta2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Resolutions/HLT
+						hist res_etInEta3 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_deta1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Resolutions/HLT
+						hist res_etVsEt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_deta2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Resolutions/HLT
+						hist res_etVsEta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_dphi2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Resolutions/HLT
+						hist res_et_cnv {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_dphiresc {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Resolutions/HLT
+						hist res_et_uncnv {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_d0 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Resolutions/HLT
+						hist res_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_d0sig {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Resolutions/HLT
+						hist res_ethad {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_eprobht {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Resolutions/HLT
+						hist res_ethad1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_nscthits {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Resolutions/HLT
+						hist res_f1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_npixhits {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Resolutions/HLT
+						hist res_f3 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_etInEta0 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Resolutions/HLT
+						hist res_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_etInEta1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Resolutions/HLT
+						hist res_uncnv_etInEta0 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_etInEta2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Resolutions/HLT
+						hist res_uncnv_etInEta1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_etInEta3 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Resolutions/HLT
+						hist res_uncnv_etInEta2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_wtots1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Resolutions/HLT
+						hist res_uncnv_etInEta3 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-					}
-					dir L2Calo_vs_HLT {
-						hist res_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Resolutions/L2Calo_vs_HLT
+						hist res_uncnv_etVsEt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Resolutions/L2Calo_vs_HLT
+						hist res_uncnv_etVsEta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Resolutions/L2Calo_vs_HLT
+						hist res_weta1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_etVsEta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Resolutions/L2Calo_vs_HLT
+						hist res_weta2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_etVsEt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Resolutions/L2Calo_vs_HLT
+						hist res_wtots1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_ethad {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Resolutions/L2Calo_vs_HLT
+					}
+					dir L1Calo {
+						hist res_etVsEta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Resolutions/L1Calo
 							display     	= StatBox
 						}
-						hist res_ethad1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Resolutions/L2Calo_vs_HLT
+					}
+					dir L2Calo_vs_HLT {
+						hist res_Reta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
 						hist res_Rhad {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Resolutions/L2Calo_vs_HLT
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
 						hist res_Rhad1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Resolutions/L2Calo_vs_HLT
-							display     	= StatBox
-						}
-						hist res_Reta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Resolutions/L2Calo_vs_HLT
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
 						hist res_Rphi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Resolutions/L2Calo_vs_HLT
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist res_weta1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Resolutions/L2Calo_vs_HLT
+						hist res_eratio {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist res_weta2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Resolutions/L2Calo_vs_HLT
+						hist res_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist res_f1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Resolutions/L2Calo_vs_HLT
+						hist res_etVsEt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist res_f3 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Resolutions/L2Calo_vs_HLT
+						hist res_etVsEta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist res_eratio {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_lhloose_nod0/Resolutions/L2Calo_vs_HLT
+						hist res_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-					}
-				}
-			}
-			dir HLT_e15_loose {
-				dir Efficiency {
-					dir HLT {
-						hist eff_pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Efficiency/HLT
+						hist res_ethad {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist eff_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Efficiency/HLT
+						hist res_ethad1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist eff_highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Efficiency/HLT
+						hist res_f1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist eff_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Efficiency/HLT
+						hist res_f3 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist eff_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Efficiency/HLT
+						hist res_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist eff_mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Efficiency/HLT
+						hist res_weta1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist match_pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Efficiency/HLT
+						hist res_weta2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g13_etcut_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist match_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Efficiency/HLT
+					}
+				}
+			}
+			dir HLT_g15_loose_ion {
+				dir AbsResolutions {
+					dir L1Calo {
+						hist res_etVsEta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/AbsResolutions/L1Calo
 							display     	= StatBox
 						}
-						hist match_highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Efficiency/HLT
+					}
+				}
+				dir Distributions {
+					dir EFCalo {
+						hist energy {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/EFCalo
 							display     	= StatBox
 						}
-						hist match_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Efficiency/HLT
+						hist energyBE0 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/EFCalo
 							display     	= StatBox
 						}
-						hist match_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Efficiency/HLT
+						hist energyBE1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/EFCalo
 							display     	= StatBox
 						}
-						hist match_mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Efficiency/HLT
+						hist energyBE2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/EFCalo
 							display     	= StatBox
 						}
-						hist pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Efficiency/HLT
+						hist energyBE3 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/EFCalo
 							display     	= StatBox
 						}
 						hist et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Efficiency/HLT
-							display     	= StatBox
-						}
-						hist highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Efficiency/HLT
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/EFCalo
 							display     	= StatBox
 						}
 						hist eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Efficiency/HLT
-							display     	= StatBox
-						}
-						hist phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Efficiency/HLT
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/EFCalo
 							display     	= StatBox
 						}
-						hist mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Efficiency/HLT
-							display     	= StatBox
-						}
-						hist match_coarse_et_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Efficiency/HLT
+						hist eta_calo {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/EFCalo
 							display     	= StatBox
 						}
-						hist coarse_et_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Efficiency/HLT
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/EFCalo
 							display     	= StatBox
 						}
-						hist eff_coarse_et_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Efficiency/HLT
+						hist phi_calo {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/EFCalo
 							display     	= StatBox
 						}
-						hist eff_triggerstep {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Efficiency/HLT
+					}
+					dir HLT {
+						hist Reta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist eff_hltreco {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Efficiency/HLT
+						hist Rhad {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist IsEmFailLoose {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Efficiency/HLT
+						hist Rhad1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist IsEmFailMedium {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Efficiency/HLT
+						hist Rphi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist IsEmFailTight {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Efficiency/HLT
+						hist eratio {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist IneffIsEmLoose {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Efficiency/HLT
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist IneffIsEmMedium {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Efficiency/HLT
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist IneffIsEmTight {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Efficiency/HLT
+						hist ethad {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist IsEmLHFailLoose {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Efficiency/HLT
+						hist ethad1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist IsEmLHFailMedium {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Efficiency/HLT
+						hist f1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist IsEmLHFailTight {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Efficiency/HLT
+						hist f3 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-					}
-					dir L2Calo {
-						hist eff_pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Efficiency/L2Calo
+						hist highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist eff_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Efficiency/L2Calo
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist eff_highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Efficiency/L2Calo
+						hist rejection {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist eff_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Efficiency/L2Calo
+						hist topoetcone20 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist eff_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Efficiency/L2Calo
+						hist topoetcone20_rel {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist eff_mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Efficiency/L2Calo
+						hist topoetcone40_shift {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist match_pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Efficiency/L2Calo
+						hist topoetcone40_shift_rel {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist match_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Efficiency/L2Calo
+						hist weta1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist match_highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Efficiency/L2Calo
+						hist weta2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist match_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Efficiency/L2Calo
+					}
+					dir L1Calo {
+						hist emClusVsEmIsol {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/L1Calo
 							display     	= StatBox
 						}
-						hist match_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Efficiency/L2Calo
+						hist emClusVsEta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/L1Calo
 							display     	= StatBox
 						}
-						hist match_mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Efficiency/L2Calo
+						hist emClusVsHadCore {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/L1Calo
 							display     	= StatBox
 						}
-						hist pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Efficiency/L2Calo
+						hist emIso {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/L1Calo
 							display     	= StatBox
 						}
-						hist et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Efficiency/L2Calo
+						hist energy {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/L1Calo
 							display     	= StatBox
 						}
-						hist highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Efficiency/L2Calo
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/L1Calo
 							display     	= StatBox
 						}
-						hist eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Efficiency/L2Calo
+						hist hadCore {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/L1Calo
 							display     	= StatBox
 						}
 						hist phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Efficiency/L2Calo
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/L1Calo
 							display     	= StatBox
 						}
-						hist mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Efficiency/L2Calo
+						hist roi_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/L1Calo
 							display     	= StatBox
 						}
 					}
-					dir L2 {
-						hist eff_pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Efficiency/L2
-							display     	= StatBox
-						}
-						hist eff_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Efficiency/L2
-							display     	= StatBox
+					dir L2Calo {
+						hist discriminant {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/L2Calo
+							display     	= StatBox
+						}
+						hist discriminantVsMu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/L2Calo
+							display     	= StatBox
+						}
+						dir discriminant_binned {
+							hist discriminantVsMu_et_0_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_0_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_0_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_0_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_0_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_1_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_1_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_1_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_1_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_1_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_2_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_2_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_2_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_2_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_2_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_3_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_3_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_3_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_3_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_3_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_4_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_4_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_4_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_4_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_4_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_0_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_0_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_0_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_0_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_0_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_1_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_1_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_1_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_1_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_1_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_2_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_2_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_2_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_2_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_2_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_3_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_3_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_3_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_3_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_3_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_4_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_4_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_4_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_4_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_4_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
 						}
-						hist eff_highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Efficiency/L2
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/L2Calo
 							display     	= StatBox
 						}
-						hist eff_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Efficiency/L2
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/L2Calo
 							display     	= StatBox
 						}
-						hist eff_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Efficiency/L2
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/L2Calo
 							display     	= StatBox
 						}
-						hist eff_mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Efficiency/L2
+					}
+					dir L2Photon {
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/L2Photon
 							display     	= StatBox
 						}
-						hist match_pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Efficiency/L2
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/L2Photon
 							display     	= StatBox
 						}
-						hist match_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Efficiency/L2
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/L2Photon
 							display     	= StatBox
 						}
-						hist match_highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Efficiency/L2
+					}
+					dir Offline {
+						hist Reta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist match_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Efficiency/L2
+						hist Rhad {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist match_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Efficiency/L2
+						hist Rhad1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist match_mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Efficiency/L2
+						hist Rphi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Efficiency/L2
+						hist eratio {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
 						hist et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Efficiency/L2
-							display     	= StatBox
-						}
-						hist highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Efficiency/L2
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
 						hist eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Efficiency/L2
-							display     	= StatBox
-						}
-						hist phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Efficiency/L2
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Efficiency/L2
-							display     	= StatBox
-						}
-					}
-					dir EFCalo {
-						hist eff_pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Efficiency/EFCalo
+						hist ethad {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist eff_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Efficiency/EFCalo
+						hist ethad1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist eff_highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Efficiency/EFCalo
+						hist f1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist eff_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Efficiency/EFCalo
+						hist f3 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist eff_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Efficiency/EFCalo
+						hist highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist eff_mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Efficiency/EFCalo
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist match_pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Efficiency/EFCalo
+						hist rejection {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist match_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Efficiency/EFCalo
+						hist topoetcone20 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist match_highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Efficiency/EFCalo
+						hist topoetcone20_rel {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist match_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Efficiency/EFCalo
+						hist topoetcone40_shift {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist match_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Efficiency/EFCalo
+						hist topoetcone40_shift_rel {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist match_mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Efficiency/EFCalo
+						hist weta1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Efficiency/EFCalo
+						hist weta2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Efficiency/EFCalo
+					}
+					dir RoI {
+						hist roi_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/RoI
 							display     	= StatBox
 						}
-						hist highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Efficiency/EFCalo
+						hist roi_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Distributions/RoI
 							display     	= StatBox
 						}
-						hist eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Efficiency/EFCalo
+					}
+				}
+				dir Efficiency {
+					dir EFCalo {
+						hist eff_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Efficiency/EFCalo
+						hist eff_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Efficiency/EFCalo
+						hist eff_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-					}
-				}
-				dir Distributions {
-					dir Offline {
-						hist highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Distributions/Offline
+						hist eff_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist ethad {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Distributions/Offline
+						hist eff_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist ethad1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Distributions/Offline
+						hist eff_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist weta1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Distributions/Offline
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist weta2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Distributions/Offline
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist f1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Distributions/Offline
+						hist highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist f3 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Distributions/Offline
+						hist match_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist Reta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Distributions/Offline
+						hist match_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist Rphi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Distributions/Offline
+						hist match_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist Rhad {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Distributions/Offline
+						hist match_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist Rhad1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Distributions/Offline
+						hist match_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist eratio {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Distributions/Offline
+						hist match_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist topoetcone20 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Distributions/Offline
+						hist mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist topoetcone20_rel {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Distributions/Offline
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
 						hist pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Distributions/Offline
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist deta1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Distributions/Offline
+					}
+					dir HLT {
+						hist coarse_et_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist deta1_EMECA {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Distributions/Offline
+						hist eff_coarse_et_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist deta1_EMECC {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Distributions/Offline
+						hist eff_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist deta1_EMEBA {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Distributions/Offline
+						hist eff_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist deta1_EMEBC {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Distributions/Offline
+						hist eff_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist deta2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Distributions/Offline
+						hist eff_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist dphi2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Distributions/Offline
+						hist eff_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist dphiresc {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Distributions/Offline
+						hist eff_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist d0 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Distributions/Offline
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist d0sig {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Distributions/Offline
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist eprobht {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Distributions/Offline
+						hist highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist nscthits {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Distributions/Offline
+						hist match_coarse_et_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist npixhits {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Distributions/Offline
+						hist match_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist charge {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Distributions/Offline
+						hist match_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist ptcone20 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Distributions/Offline
+						hist match_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist ptcone20_rel {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Distributions/Offline
+						hist match_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist ptvarcone20 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Distributions/Offline
+						hist match_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist ptvarcone20_rel {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Distributions/Offline
+						hist match_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist rejection {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Distributions/Offline
+						hist mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Distributions/Offline
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Distributions/Offline
+						hist pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Distributions/Offline
+					}
+					dir L1Calo {
+						hist coarse_et_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-					}
-					dir HLT {
-						hist highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Distributions/HLT
+						hist eff_coarse_et_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist ethad {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Distributions/HLT
+						hist eff_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist ethad1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Distributions/HLT
+						hist eff_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist weta1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Distributions/HLT
+						hist eff_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist weta2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Distributions/HLT
+						hist eff_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist f1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Distributions/HLT
+						hist eff_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist f3 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Distributions/HLT
+						hist eff_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist Reta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Distributions/HLT
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist Rphi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Distributions/HLT
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist Rhad {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Distributions/HLT
+						hist highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist Rhad1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Distributions/HLT
+						hist match_coarse_et_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist eratio {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Distributions/HLT
+						hist match_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist topoetcone20 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Distributions/HLT
+						hist match_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist topoetcone20_rel {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Distributions/HLT
+						hist match_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Distributions/HLT
+						hist match_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist deta1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Distributions/HLT
+						hist match_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist deta1_EMECA {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Distributions/HLT
+						hist match_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist deta1_EMECC {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Distributions/HLT
+						hist mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist deta1_EMEBA {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Distributions/HLT
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist deta1_EMEBC {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Distributions/HLT
+						hist pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist deta2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Distributions/HLT
+					}
+					dir L2 {
+						hist eff_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist dphi2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Distributions/HLT
+						hist eff_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist dphiresc {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Distributions/HLT
+						hist eff_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist d0 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Distributions/HLT
+						hist eff_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist d0sig {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Distributions/HLT
+						hist eff_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist eprobht {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Distributions/HLT
+						hist eff_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist nscthits {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Distributions/HLT
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist npixhits {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Distributions/HLT
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist charge {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Distributions/HLT
+						hist highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist ptcone20 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Distributions/HLT
+						hist match_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist ptcone20_rel {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Distributions/HLT
+						hist match_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist ptvarcone20 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Distributions/HLT
+						hist match_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist ptvarcone20_rel {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Distributions/HLT
+						hist match_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist rejection {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Distributions/HLT
+						hist match_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Distributions/HLT
+						hist match_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Distributions/HLT
+						hist mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Efficiency/L2
 							display     	= StatBox
 						}
 						hist phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Distributions/HLT
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Efficiency/L2
 							display     	= StatBox
 						}
-					}
-					dir EFCalo {
-						hist energyBE0 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Distributions/EFCalo
+						hist pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist energyBE1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Distributions/EFCalo
+					}
+					dir L2Calo {
+						hist eff_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist energyBE2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Distributions/EFCalo
+						hist eff_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist energyBE3 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Distributions/EFCalo
+						hist eff_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist energy {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Distributions/EFCalo
+						hist eff_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist eta_calo {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Distributions/EFCalo
+						hist eff_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist phi_calo {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Distributions/EFCalo
+						hist eff_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
 						hist et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Distributions/EFCalo
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
 						hist eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Distributions/EFCalo
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Distributions/EFCalo
+						hist highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-					}
-					dir L2Electron {
-						hist et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Distributions/L2Electron
+						hist match_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Distributions/L2Electron
+						hist match_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Distributions/L2Electron
+						hist match_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist trkClusDeta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Distributions/L2Electron
+						hist match_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist trkClusDphi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Distributions/L2Electron
+						hist match_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-					}
-					dir L2Calo {
-						hist et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Distributions/L2Calo
+						hist match_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Distributions/L2Calo
+						hist mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
 						hist phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Distributions/L2Calo
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Efficiency/L2Calo
+							display     	= StatBox
+						}
+						hist pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
 					}
 				}
 				dir Resolutions {
 					dir HLT {
-						hist res_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Resolutions/HLT
-							display     	= StatBox
-						}
-						hist res_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Resolutions/HLT
+						hist res_Reta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Resolutions/HLT
+						hist res_Rhad {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_etVsEta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Resolutions/HLT
+						hist res_Rhad1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_etVsEt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Resolutions/HLT
+						hist res_Rphi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_ethad {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Resolutions/HLT
+						hist res_cnv_etInEta0 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_ethad1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Resolutions/HLT
+						hist res_cnv_etInEta1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_Rhad {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Resolutions/HLT
+						hist res_cnv_etInEta2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_Rhad1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Resolutions/HLT
+						hist res_cnv_etInEta3 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_Reta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Resolutions/HLT
+						hist res_cnv_etVsEt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_Rphi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Resolutions/HLT
+						hist res_cnv_etVsEta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_weta1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Resolutions/HLT
+						hist res_eratio {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_weta2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Resolutions/HLT
+						hist res_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_f1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Resolutions/HLT
+						hist res_etInEta0 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_f3 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Resolutions/HLT
+						hist res_etInEta1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_eratio {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Resolutions/HLT
+						hist res_etInEta2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Resolutions/HLT
+						hist res_etInEta3 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_deta1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Resolutions/HLT
+						hist res_etVsEt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_deta2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Resolutions/HLT
+						hist res_etVsEta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_dphi2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Resolutions/HLT
+						hist res_et_cnv {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_dphiresc {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Resolutions/HLT
+						hist res_et_uncnv {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_d0 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Resolutions/HLT
+						hist res_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_d0sig {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Resolutions/HLT
+						hist res_ethad {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_eprobht {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Resolutions/HLT
+						hist res_ethad1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_nscthits {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Resolutions/HLT
+						hist res_f1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_npixhits {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Resolutions/HLT
+						hist res_f3 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_etInEta0 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Resolutions/HLT
+						hist res_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_etInEta1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Resolutions/HLT
+						hist res_uncnv_etInEta0 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_etInEta2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Resolutions/HLT
+						hist res_uncnv_etInEta1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_etInEta3 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Resolutions/HLT
+						hist res_uncnv_etInEta2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_wtots1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Resolutions/HLT
+						hist res_uncnv_etInEta3 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-					}
-					dir L2Calo_vs_HLT {
-						hist res_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Resolutions/L2Calo_vs_HLT
+						hist res_uncnv_etVsEt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Resolutions/L2Calo_vs_HLT
+						hist res_uncnv_etVsEta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Resolutions/L2Calo_vs_HLT
+						hist res_weta1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_etVsEta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Resolutions/L2Calo_vs_HLT
+						hist res_weta2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_etVsEt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Resolutions/L2Calo_vs_HLT
+						hist res_wtots1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_ethad {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Resolutions/L2Calo_vs_HLT
+					}
+					dir L1Calo {
+						hist res_etVsEta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Resolutions/L1Calo
 							display     	= StatBox
 						}
-						hist res_ethad1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Resolutions/L2Calo_vs_HLT
+					}
+					dir L2Calo_vs_HLT {
+						hist res_Reta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
 						hist res_Rhad {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Resolutions/L2Calo_vs_HLT
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
 						hist res_Rhad1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Resolutions/L2Calo_vs_HLT
-							display     	= StatBox
-						}
-						hist res_Reta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Resolutions/L2Calo_vs_HLT
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
 						hist res_Rphi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Resolutions/L2Calo_vs_HLT
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist res_weta1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Resolutions/L2Calo_vs_HLT
+						hist res_eratio {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist res_weta2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Resolutions/L2Calo_vs_HLT
+						hist res_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist res_f1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Resolutions/L2Calo_vs_HLT
+						hist res_etVsEt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist res_f3 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Resolutions/L2Calo_vs_HLT
+						hist res_etVsEta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist res_eratio {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e15_loose/Resolutions/L2Calo_vs_HLT
+						hist res_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-					}
-				}
-			}
-			dir HLT_e17_lhloose_nod0 {
-				dir Efficiency {
-					dir HLT {
-						hist eff_pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Efficiency/HLT
+						hist res_ethad {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist eff_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Efficiency/HLT
+						hist res_ethad1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist eff_highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Efficiency/HLT
+						hist res_f1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist eff_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Efficiency/HLT
+						hist res_f3 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist eff_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Efficiency/HLT
+						hist res_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist eff_mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Efficiency/HLT
+						hist res_weta1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist match_pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Efficiency/HLT
+						hist res_weta2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g15_loose_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist match_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Efficiency/HLT
+					}
+				}
+			}
+			dir HLT_g18_etcut_ion {
+				dir AbsResolutions {
+					dir L1Calo {
+						hist res_etVsEta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/AbsResolutions/L1Calo
 							display     	= StatBox
 						}
-						hist match_highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Efficiency/HLT
+					}
+				}
+				dir Distributions {
+					dir EFCalo {
+						hist energy {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/EFCalo
 							display     	= StatBox
 						}
-						hist match_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Efficiency/HLT
+						hist energyBE0 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/EFCalo
 							display     	= StatBox
 						}
-						hist match_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Efficiency/HLT
+						hist energyBE1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/EFCalo
 							display     	= StatBox
 						}
-						hist match_mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Efficiency/HLT
+						hist energyBE2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/EFCalo
 							display     	= StatBox
 						}
-						hist pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Efficiency/HLT
+						hist energyBE3 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/EFCalo
 							display     	= StatBox
 						}
 						hist et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Efficiency/HLT
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/EFCalo
 							display     	= StatBox
 						}
-						hist highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Efficiency/HLT
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/EFCalo
 							display     	= StatBox
 						}
-						hist eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Efficiency/HLT
+						hist eta_calo {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/EFCalo
 							display     	= StatBox
 						}
 						hist phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Efficiency/HLT
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/EFCalo
 							display     	= StatBox
 						}
-						hist mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Efficiency/HLT
+						hist phi_calo {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/EFCalo
 							display     	= StatBox
 						}
-						hist match_coarse_et_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Efficiency/HLT
+					}
+					dir HLT {
+						hist Reta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist coarse_et_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Efficiency/HLT
+						hist Rhad {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist eff_coarse_et_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Efficiency/HLT
+						hist Rhad1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist eff_triggerstep {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Efficiency/HLT
+						hist Rphi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist eff_hltreco {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Efficiency/HLT
+						hist eratio {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist IsEmFailLoose {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Efficiency/HLT
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist IsEmFailMedium {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Efficiency/HLT
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist IsEmFailTight {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Efficiency/HLT
+						hist ethad {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist IneffIsEmLoose {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Efficiency/HLT
+						hist ethad1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist IneffIsEmMedium {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Efficiency/HLT
+						hist f1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist IneffIsEmTight {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Efficiency/HLT
+						hist f3 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist IsEmLHFailLoose {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Efficiency/HLT
+						hist highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist IsEmLHFailMedium {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Efficiency/HLT
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist IsEmLHFailTight {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Efficiency/HLT
+						hist rejection {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/HLT
 							display     	= StatBox
 						}
-					}
-					dir L2Calo {
-						hist eff_pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Efficiency/L2Calo
+						hist topoetcone20 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist eff_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Efficiency/L2Calo
+						hist topoetcone20_rel {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist eff_highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Efficiency/L2Calo
+						hist topoetcone40_shift {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist eff_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Efficiency/L2Calo
+						hist topoetcone40_shift_rel {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist eff_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Efficiency/L2Calo
+						hist weta1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist eff_mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Efficiency/L2Calo
+						hist weta2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist match_pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Efficiency/L2Calo
+					}
+					dir L1Calo {
+						hist emClusVsEmIsol {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/L1Calo
 							display     	= StatBox
 						}
-						hist match_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Efficiency/L2Calo
+						hist emClusVsEta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/L1Calo
 							display     	= StatBox
 						}
-						hist match_highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Efficiency/L2Calo
+						hist emClusVsHadCore {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/L1Calo
 							display     	= StatBox
 						}
-						hist match_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Efficiency/L2Calo
+						hist emIso {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/L1Calo
 							display     	= StatBox
 						}
-						hist match_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Efficiency/L2Calo
+						hist energy {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/L1Calo
 							display     	= StatBox
 						}
-						hist match_mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Efficiency/L2Calo
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/L1Calo
 							display     	= StatBox
 						}
-						hist pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Efficiency/L2Calo
+						hist hadCore {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/L1Calo
 							display     	= StatBox
 						}
-						hist et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Efficiency/L2Calo
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/L1Calo
 							display     	= StatBox
 						}
-						hist highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Efficiency/L2Calo
+						hist roi_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/L1Calo
 							display     	= StatBox
 						}
-						hist eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Efficiency/L2Calo
+					}
+					dir L2Calo {
+						hist discriminant {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/L2Calo
+							display     	= StatBox
+						}
+						hist discriminantVsMu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/L2Calo
+							display     	= StatBox
+						}
+						dir discriminant_binned {
+							hist discriminantVsMu_et_0_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_0_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_0_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_0_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_0_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_1_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_1_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_1_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_1_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_1_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_2_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_2_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_2_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_2_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_2_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_3_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_3_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_3_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_3_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_3_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_4_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_4_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_4_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_4_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_4_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_0_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_0_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_0_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_0_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_0_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_1_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_1_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_1_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_1_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_1_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_2_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_2_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_2_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_2_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_2_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_3_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_3_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_3_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_3_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_3_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_4_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_4_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_4_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_4_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_4_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+						}
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/L2Calo
 							display     	= StatBox
 						}
-						hist phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Efficiency/L2Calo
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/L2Calo
 							display     	= StatBox
 						}
-						hist mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Efficiency/L2Calo
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/L2Calo
 							display     	= StatBox
 						}
 					}
-					dir L2 {
-						hist eff_pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Efficiency/L2
+					dir L2Photon {
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/L2Photon
 							display     	= StatBox
 						}
-						hist eff_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Efficiency/L2
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/L2Photon
 							display     	= StatBox
 						}
-						hist eff_highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Efficiency/L2
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/L2Photon
 							display     	= StatBox
 						}
-						hist eff_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Efficiency/L2
+					}
+					dir Offline {
+						hist Reta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist eff_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Efficiency/L2
+						hist Rhad {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist eff_mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Efficiency/L2
+						hist Rhad1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist match_pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Efficiency/L2
+						hist Rphi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist match_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Efficiency/L2
+						hist eratio {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist match_highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Efficiency/L2
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist match_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Efficiency/L2
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist match_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Efficiency/L2
+						hist ethad {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist match_mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Efficiency/L2
+						hist ethad1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Efficiency/L2
+						hist f1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Efficiency/L2
+						hist f3 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/Offline
 							display     	= StatBox
 						}
 						hist highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Efficiency/L2
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Efficiency/L2
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Efficiency/L2
+						hist rejection {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Efficiency/L2
+						hist topoetcone20 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/Offline
 							display     	= StatBox
 						}
-					}
-					dir EFCalo {
-						hist eff_pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Efficiency/EFCalo
+						hist topoetcone20_rel {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist eff_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Efficiency/EFCalo
+						hist topoetcone40_shift {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist eff_highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Efficiency/EFCalo
+						hist topoetcone40_shift_rel {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist eff_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Efficiency/EFCalo
+						hist weta1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist eff_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Efficiency/EFCalo
+						hist weta2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist eff_mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Efficiency/EFCalo
+					}
+					dir RoI {
+						hist roi_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/RoI
 							display     	= StatBox
 						}
-						hist match_pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Efficiency/EFCalo
+						hist roi_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Distributions/RoI
 							display     	= StatBox
 						}
-						hist match_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Efficiency/EFCalo
+					}
+				}
+				dir Efficiency {
+					dir EFCalo {
+						hist eff_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist match_highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Efficiency/EFCalo
+						hist eff_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist match_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Efficiency/EFCalo
+						hist eff_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist match_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Efficiency/EFCalo
+						hist eff_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist match_mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Efficiency/EFCalo
+						hist eff_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Efficiency/EFCalo
+						hist eff_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
 						hist et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Efficiency/EFCalo
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Efficiency/EFCalo
+							display     	= StatBox
+						}
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
 						hist highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Efficiency/EFCalo
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Efficiency/EFCalo
+						hist match_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Efficiency/EFCalo
+						hist match_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Efficiency/EFCalo
+						hist match_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-					}
-				}
-				dir Distributions {
-					dir Offline {
-						hist highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Distributions/Offline
+						hist match_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist ethad {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Distributions/Offline
+						hist match_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist ethad1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Distributions/Offline
+						hist match_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist weta1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Distributions/Offline
+						hist mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist weta2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Distributions/Offline
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist f1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Distributions/Offline
+						hist pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist f3 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Distributions/Offline
+					}
+					dir HLT {
+						hist coarse_et_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist Reta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Distributions/Offline
+						hist eff_coarse_et_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist Rphi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Distributions/Offline
+						hist eff_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist Rhad {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Distributions/Offline
+						hist eff_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist Rhad1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Distributions/Offline
+						hist eff_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist eratio {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Distributions/Offline
+						hist eff_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist topoetcone20 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Distributions/Offline
+						hist eff_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist topoetcone20_rel {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Distributions/Offline
+						hist eff_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Distributions/Offline
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist deta1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Distributions/Offline
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist deta1_EMECA {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Distributions/Offline
+						hist highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist deta1_EMECC {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Distributions/Offline
+						hist match_coarse_et_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist deta1_EMEBA {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Distributions/Offline
+						hist match_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist deta1_EMEBC {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Distributions/Offline
+						hist match_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist deta2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Distributions/Offline
+						hist match_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist dphi2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Distributions/Offline
+						hist match_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist dphiresc {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Distributions/Offline
+						hist match_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist d0 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Distributions/Offline
+						hist match_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist d0sig {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Distributions/Offline
+						hist mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist eprobht {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Distributions/Offline
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist nscthits {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Distributions/Offline
+						hist pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist npixhits {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Distributions/Offline
+					}
+					dir L1Calo {
+						hist coarse_et_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist charge {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Distributions/Offline
+						hist eff_coarse_et_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist ptcone20 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Distributions/Offline
+						hist eff_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist ptcone20_rel {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Distributions/Offline
+						hist eff_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist ptvarcone20 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Distributions/Offline
+						hist eff_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist ptvarcone20_rel {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Distributions/Offline
+						hist eff_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist rejection {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Distributions/Offline
+						hist eff_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Efficiency/L1Calo
+							display     	= StatBox
+						}
+						hist eff_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
 						hist et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Distributions/Offline
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
 						hist eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Distributions/Offline
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Distributions/Offline
+						hist highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-					}
-					dir HLT {
-						hist highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Distributions/HLT
+						hist match_coarse_et_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist ethad {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Distributions/HLT
+						hist match_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist ethad1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Distributions/HLT
+						hist match_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist weta1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Distributions/HLT
+						hist match_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist weta2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Distributions/HLT
+						hist match_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist f1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Distributions/HLT
+						hist match_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist f3 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Distributions/HLT
+						hist match_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist Reta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Distributions/HLT
+						hist mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist Rphi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Distributions/HLT
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist Rhad {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Distributions/HLT
+						hist pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist Rhad1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Distributions/HLT
+					}
+					dir L2 {
+						hist eff_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist eratio {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Distributions/HLT
+						hist eff_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist topoetcone20 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Distributions/HLT
+						hist eff_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist topoetcone20_rel {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Distributions/HLT
+						hist eff_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Distributions/HLT
+						hist eff_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist deta1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Distributions/HLT
+						hist eff_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist deta1_EMECA {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Distributions/HLT
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist deta1_EMECC {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Distributions/HLT
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist deta1_EMEBA {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Distributions/HLT
+						hist highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist deta1_EMEBC {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Distributions/HLT
+						hist match_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist deta2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Distributions/HLT
+						hist match_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist dphi2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Distributions/HLT
+						hist match_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist dphiresc {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Distributions/HLT
+						hist match_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist d0 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Distributions/HLT
+						hist match_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist d0sig {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Distributions/HLT
+						hist match_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist eprobht {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Distributions/HLT
+						hist mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist nscthits {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Distributions/HLT
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist npixhits {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Distributions/HLT
+						hist pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist charge {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Distributions/HLT
+					}
+					dir L2Calo {
+						hist eff_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist ptcone20 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Distributions/HLT
+						hist eff_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist ptcone20_rel {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Distributions/HLT
+						hist eff_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist ptvarcone20 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Distributions/HLT
+						hist eff_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist ptvarcone20_rel {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Distributions/HLT
+						hist eff_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist rejection {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Distributions/HLT
+						hist eff_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
 						hist et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Distributions/HLT
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
 						hist eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Distributions/HLT
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Distributions/HLT
+						hist highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-					}
-					dir EFCalo {
-						hist energyBE0 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Distributions/EFCalo
+						hist match_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist energyBE1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Distributions/EFCalo
+						hist match_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist energyBE2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Distributions/EFCalo
+						hist match_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist energyBE3 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Distributions/EFCalo
+						hist match_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist energy {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Distributions/EFCalo
+						hist match_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist eta_calo {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Distributions/EFCalo
+						hist match_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist phi_calo {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Distributions/EFCalo
+						hist mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Distributions/EFCalo
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Distributions/EFCalo
+						hist pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Distributions/EFCalo
+					}
+				}
+				dir Resolutions {
+					dir HLT {
+						hist res_Reta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-					}
-					dir L2Electron {
-						hist et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Distributions/L2Electron
+						hist res_Rhad {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_Rhad1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Distributions/L2Electron
+						hist res_Rphi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Distributions/L2Electron
+						hist res_cnv_etInEta0 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist trkClusDeta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Distributions/L2Electron
+						hist res_cnv_etInEta1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist trkClusDphi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Distributions/L2Electron
+						hist res_cnv_etInEta2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-					}
-					dir L2Calo {
-						hist et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Distributions/L2Calo
+						hist res_cnv_etInEta3 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Distributions/L2Calo
+						hist res_cnv_etVsEt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Distributions/L2Calo
+						hist res_cnv_etVsEta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-					}
-				}
-				dir Resolutions {
-					dir HLT {
-						hist res_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Resolutions/HLT
+						hist res_eratio {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Resolutions/HLT
+						hist res_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Resolutions/HLT
+						hist res_etInEta0 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_etVsEta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Resolutions/HLT
+						hist res_etInEta1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_etVsEt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Resolutions/HLT
+						hist res_etInEta2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_ethad {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Resolutions/HLT
+						hist res_etInEta3 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_ethad1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Resolutions/HLT
+						hist res_etVsEt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_Rhad {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Resolutions/HLT
+						hist res_etVsEta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_Rhad1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Resolutions/HLT
+						hist res_et_cnv {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_Reta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Resolutions/HLT
+						hist res_et_uncnv {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_Rphi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Resolutions/HLT
+						hist res_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_weta1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Resolutions/HLT
+						hist res_ethad {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_weta2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Resolutions/HLT
+						hist res_ethad1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Resolutions/HLT
 							display     	= StatBox
 						}
 						hist res_f1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Resolutions/HLT
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Resolutions/HLT
 							display     	= StatBox
 						}
 						hist res_f3 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Resolutions/HLT
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_eratio {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Resolutions/HLT
+						hist res_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Resolutions/HLT
+						hist res_uncnv_etInEta0 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_deta1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Resolutions/HLT
+						hist res_uncnv_etInEta1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_deta2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Resolutions/HLT
+						hist res_uncnv_etInEta2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_dphi2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Resolutions/HLT
+						hist res_uncnv_etInEta3 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_dphiresc {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Resolutions/HLT
+						hist res_uncnv_etVsEt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_d0 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Resolutions/HLT
+						hist res_uncnv_etVsEta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_d0sig {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Resolutions/HLT
+						hist res_weta1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_eprobht {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Resolutions/HLT
+						hist res_weta2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_nscthits {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Resolutions/HLT
+						hist res_wtots1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_npixhits {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Resolutions/HLT
+					}
+					dir L1Calo {
+						hist res_etVsEta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Resolutions/L1Calo
 							display     	= StatBox
 						}
-						hist res_etInEta0 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Resolutions/HLT
+					}
+					dir L2Calo_vs_HLT {
+						hist res_Reta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist res_etInEta1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Resolutions/HLT
+						hist res_Rhad {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist res_etInEta2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Resolutions/HLT
+						hist res_Rhad1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist res_etInEta3 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Resolutions/HLT
+						hist res_Rphi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist res_wtots1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Resolutions/HLT
+						hist res_eratio {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-					}
-					dir L2Calo_vs_HLT {
 						hist res_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Resolutions/L2Calo_vs_HLT
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist res_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Resolutions/L2Calo_vs_HLT
-							display     	= StatBox
-						}
-						hist res_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Resolutions/L2Calo_vs_HLT
+						hist res_etVsEt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
 						hist res_etVsEta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Resolutions/L2Calo_vs_HLT
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist res_etVsEt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Resolutions/L2Calo_vs_HLT
+						hist res_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
 						hist res_ethad {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Resolutions/L2Calo_vs_HLT
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
 						hist res_ethad1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Resolutions/L2Calo_vs_HLT
-							display     	= StatBox
-						}
-						hist res_Rhad {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Resolutions/L2Calo_vs_HLT
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist res_Rhad1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Resolutions/L2Calo_vs_HLT
+						hist res_f1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist res_Reta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Resolutions/L2Calo_vs_HLT
+						hist res_f3 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist res_Rphi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Resolutions/L2Calo_vs_HLT
+						hist res_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
 						hist res_weta1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Resolutions/L2Calo_vs_HLT
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
 						hist res_weta2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Resolutions/L2Calo_vs_HLT
-							display     	= StatBox
-						}
-						hist res_f1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Resolutions/L2Calo_vs_HLT
-							display     	= StatBox
-						}
-						hist res_f3 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Resolutions/L2Calo_vs_HLT
-							display     	= StatBox
-						}
-						hist res_eratio {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e17_lhloose_nod0/Resolutions/L2Calo_vs_HLT
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g18_etcut_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
 					}
 				}
 			}
-			dir HLT_e22_lhloose_nod0 {
-				dir Efficiency {
-					dir HLT {
-						hist eff_pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Efficiency/HLT
-							display     	= StatBox
-						}
-						hist eff_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Efficiency/HLT
+			dir HLT_g20_loose_ion {
+				dir AbsResolutions {
+					dir L1Calo {
+						hist res_etVsEta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/AbsResolutions/L1Calo
 							display     	= StatBox
 						}
-						hist eff_highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Efficiency/HLT
+					}
+				}
+				dir Distributions {
+					dir EFCalo {
+						hist energy {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/EFCalo
 							display     	= StatBox
 						}
-						hist eff_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Efficiency/HLT
+						hist energyBE0 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/EFCalo
 							display     	= StatBox
 						}
-						hist eff_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Efficiency/HLT
+						hist energyBE1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/EFCalo
 							display     	= StatBox
 						}
-						hist eff_mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Efficiency/HLT
+						hist energyBE2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/EFCalo
 							display     	= StatBox
 						}
-						hist match_pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Efficiency/HLT
+						hist energyBE3 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/EFCalo
 							display     	= StatBox
 						}
-						hist match_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Efficiency/HLT
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/EFCalo
 							display     	= StatBox
 						}
-						hist match_highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Efficiency/HLT
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/EFCalo
 							display     	= StatBox
 						}
-						hist match_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Efficiency/HLT
+						hist eta_calo {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/EFCalo
 							display     	= StatBox
 						}
-						hist match_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Efficiency/HLT
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/EFCalo
 							display     	= StatBox
 						}
-						hist match_mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Efficiency/HLT
+						hist phi_calo {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/EFCalo
 							display     	= StatBox
 						}
-						hist pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Efficiency/HLT
+					}
+					dir HLT {
+						hist Reta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Efficiency/HLT
+						hist Rhad {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Efficiency/HLT
+						hist Rhad1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Efficiency/HLT
+						hist Rphi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Efficiency/HLT
+						hist eratio {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Efficiency/HLT
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist match_coarse_et_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Efficiency/HLT
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist coarse_et_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Efficiency/HLT
+						hist ethad {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist eff_coarse_et_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Efficiency/HLT
+						hist ethad1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist eff_triggerstep {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Efficiency/HLT
+						hist f1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist eff_hltreco {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Efficiency/HLT
+						hist f3 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist IsEmFailLoose {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Efficiency/HLT
+						hist highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist IsEmFailMedium {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Efficiency/HLT
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist IsEmFailTight {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Efficiency/HLT
+						hist rejection {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist IneffIsEmLoose {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Efficiency/HLT
+						hist topoetcone20 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist IneffIsEmMedium {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Efficiency/HLT
+						hist topoetcone20_rel {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist IneffIsEmTight {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Efficiency/HLT
+						hist topoetcone40_shift {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist IsEmLHFailLoose {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Efficiency/HLT
+						hist topoetcone40_shift_rel {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist IsEmLHFailMedium {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Efficiency/HLT
+						hist weta1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
-						hist IsEmLHFailTight {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Efficiency/HLT
+						hist weta2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/HLT
 							display     	= StatBox
 						}
 					}
-					dir L2Calo {
-						hist eff_pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Efficiency/L2Calo
+					dir L1Calo {
+						hist emClusVsEmIsol {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/L1Calo
 							display     	= StatBox
 						}
-						hist eff_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Efficiency/L2Calo
+						hist emClusVsEta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/L1Calo
 							display     	= StatBox
 						}
-						hist eff_highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Efficiency/L2Calo
+						hist emClusVsHadCore {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/L1Calo
 							display     	= StatBox
 						}
-						hist eff_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Efficiency/L2Calo
+						hist emIso {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/L1Calo
 							display     	= StatBox
 						}
-						hist eff_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Efficiency/L2Calo
+						hist energy {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/L1Calo
 							display     	= StatBox
 						}
-						hist eff_mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Efficiency/L2Calo
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/L1Calo
 							display     	= StatBox
 						}
-						hist match_pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Efficiency/L2Calo
+						hist hadCore {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/L1Calo
 							display     	= StatBox
 						}
-						hist match_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Efficiency/L2Calo
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/L1Calo
 							display     	= StatBox
 						}
-						hist match_highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Efficiency/L2Calo
+						hist roi_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/L1Calo
 							display     	= StatBox
 						}
-						hist match_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Efficiency/L2Calo
-							display     	= StatBox
+					}
+					dir L2Calo {
+						hist discriminant {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/L2Calo
+							display     	= StatBox
+						}
+						hist discriminantVsMu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/L2Calo
+							display     	= StatBox
+						}
+						dir discriminant_binned {
+							hist discriminantVsMu_et_0_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_0_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_0_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_0_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_0_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_1_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_1_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_1_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_1_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_1_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_2_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_2_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_2_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_2_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_2_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_3_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_3_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_3_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_3_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_3_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_4_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_4_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_4_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_4_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminantVsMu_et_4_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_0_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_0_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_0_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_0_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_0_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_1_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_1_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_1_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_1_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_1_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_2_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_2_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_2_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_2_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_2_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_3_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_3_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_3_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_3_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_3_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_4_eta_0 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_4_eta_1 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_4_eta_2 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_4_eta_3 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
+							hist discriminant_et_4_eta_4 {
+								algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+								description 	= DQWebdisplay ATR-18760
+								output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/L2Calo/discriminant_binned
+								display     	= StatBox
+							}
 						}
-						hist match_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Efficiency/L2Calo
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/L2Calo
 							display     	= StatBox
 						}
-						hist match_mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Efficiency/L2Calo
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/L2Calo
 							display     	= StatBox
 						}
-						hist pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Efficiency/L2Calo
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/L2Calo
 							display     	= StatBox
 						}
+					}
+					dir L2Photon {
 						hist et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Efficiency/L2Calo
-							display     	= StatBox
-						}
-						hist highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Efficiency/L2Calo
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/L2Photon
 							display     	= StatBox
 						}
 						hist eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Efficiency/L2Calo
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/L2Photon
 							display     	= StatBox
 						}
 						hist phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Efficiency/L2Calo
-							display     	= StatBox
-						}
-						hist mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Efficiency/L2Calo
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/L2Photon
 							display     	= StatBox
 						}
 					}
-					dir L2 {
-						hist eff_pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Efficiency/L2
-							display     	= StatBox
-						}
-						hist eff_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Efficiency/L2
+					dir Offline {
+						hist Reta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist eff_highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Efficiency/L2
+						hist Rhad {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist eff_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Efficiency/L2
+						hist Rhad1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist eff_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Efficiency/L2
+						hist Rphi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist eff_mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Efficiency/L2
+						hist eratio {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist match_pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Efficiency/L2
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist match_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Efficiency/L2
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist match_highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Efficiency/L2
+						hist ethad {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist match_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Efficiency/L2
+						hist ethad1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist match_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Efficiency/L2
+						hist f1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist match_mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Efficiency/L2
+						hist f3 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Efficiency/L2
+						hist highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Efficiency/L2
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Efficiency/L2
+						hist rejection {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Efficiency/L2
+						hist topoetcone20 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Efficiency/L2
+						hist topoetcone20_rel {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Efficiency/L2
+						hist topoetcone40_shift {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-					}
-					dir EFCalo {
-						hist eff_pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Efficiency/EFCalo
+						hist topoetcone40_shift_rel {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist eff_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Efficiency/EFCalo
+						hist weta1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist eff_highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Efficiency/EFCalo
+						hist weta2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/Offline
 							display     	= StatBox
 						}
-						hist eff_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Efficiency/EFCalo
+					}
+					dir RoI {
+						hist roi_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/RoI
 							display     	= StatBox
 						}
-						hist eff_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Efficiency/EFCalo
+						hist roi_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Distributions/RoI
 							display     	= StatBox
 						}
-						hist eff_mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Efficiency/EFCalo
+					}
+				}
+				dir Efficiency {
+					dir EFCalo {
+						hist eff_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist match_pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Efficiency/EFCalo
+						hist eff_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist match_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Efficiency/EFCalo
+						hist eff_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist match_highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Efficiency/EFCalo
+						hist eff_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist match_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Efficiency/EFCalo
+						hist eff_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist match_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Efficiency/EFCalo
+						hist eff_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist match_mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Efficiency/EFCalo
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Efficiency/EFCalo
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Efficiency/EFCalo
+						hist highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Efficiency/EFCalo
+						hist match_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Efficiency/EFCalo
+						hist match_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Efficiency/EFCalo
+						hist match_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist mu {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Efficiency/EFCalo
+						hist match_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-					}
-				}
-				dir Distributions {
-					dir Offline {
-						hist highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Distributions/Offline
+						hist match_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist ethad {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Distributions/Offline
+						hist match_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist ethad1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Distributions/Offline
+						hist mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist weta1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Distributions/Offline
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist weta2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Distributions/Offline
+						hist pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Efficiency/EFCalo
 							display     	= StatBox
 						}
-						hist f1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Distributions/Offline
+					}
+					dir HLT {
+						hist coarse_et_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist f3 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Distributions/Offline
+						hist eff_coarse_et_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist Reta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Distributions/Offline
+						hist eff_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist Rphi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Distributions/Offline
+						hist eff_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist Rhad {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Distributions/Offline
+						hist eff_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist Rhad1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Distributions/Offline
+						hist eff_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist eratio {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Distributions/Offline
+						hist eff_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist topoetcone20 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Distributions/Offline
+						hist eff_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist topoetcone20_rel {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Distributions/Offline
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Distributions/Offline
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist deta1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Distributions/Offline
+						hist highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist deta1_EMECA {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Distributions/Offline
+						hist match_coarse_et_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist deta1_EMECC {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Distributions/Offline
+						hist match_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist deta1_EMEBA {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Distributions/Offline
+						hist match_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist deta1_EMEBC {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Distributions/Offline
+						hist match_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist deta2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Distributions/Offline
+						hist match_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist dphi2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Distributions/Offline
+						hist match_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist dphiresc {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Distributions/Offline
+						hist match_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist d0 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Distributions/Offline
+						hist mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist d0sig {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Distributions/Offline
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist eprobht {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Distributions/Offline
+						hist pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Efficiency/HLT
 							display     	= StatBox
 						}
-						hist nscthits {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Distributions/Offline
+					}
+					dir L1Calo {
+						hist coarse_et_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist npixhits {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Distributions/Offline
+						hist eff_coarse_et_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist charge {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Distributions/Offline
+						hist eff_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist ptcone20 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Distributions/Offline
+						hist eff_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist ptcone20_rel {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Distributions/Offline
+						hist eff_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist ptvarcone20 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Distributions/Offline
+						hist eff_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist ptvarcone20_rel {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Distributions/Offline
+						hist eff_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist rejection {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Distributions/Offline
+						hist eff_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
 						hist et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Distributions/Offline
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
 						hist eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Distributions/Offline
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Distributions/Offline
+						hist highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-					}
-					dir HLT {
-						hist highet {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Distributions/HLT
+						hist match_coarse_et_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist ethad {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Distributions/HLT
+						hist match_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist ethad1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Distributions/HLT
+						hist match_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist weta1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Distributions/HLT
+						hist match_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist weta2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Distributions/HLT
+						hist match_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist f1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Distributions/HLT
+						hist match_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist f3 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Distributions/HLT
+						hist match_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist Reta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Distributions/HLT
+						hist mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist Rphi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Distributions/HLT
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist Rhad {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Distributions/HLT
+						hist pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Efficiency/L1Calo
 							display     	= StatBox
 						}
-						hist Rhad1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Distributions/HLT
+					}
+					dir L2 {
+						hist eff_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist eratio {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Distributions/HLT
+						hist eff_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist topoetcone20 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Distributions/HLT
+						hist eff_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist topoetcone20_rel {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Distributions/HLT
+						hist eff_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Distributions/HLT
+						hist eff_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist deta1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Distributions/HLT
+						hist eff_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist deta1_EMECA {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Distributions/HLT
+						hist et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist deta1_EMECC {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Distributions/HLT
+						hist eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist deta1_EMEBA {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Distributions/HLT
+						hist highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist deta1_EMEBC {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Distributions/HLT
+						hist match_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist deta2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Distributions/HLT
+						hist match_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist dphi2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Distributions/HLT
+						hist match_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist dphiresc {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Distributions/HLT
+						hist match_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist d0 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Distributions/HLT
+						hist match_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist d0sig {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Distributions/HLT
+						hist match_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist eprobht {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Distributions/HLT
+						hist mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist nscthits {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Distributions/HLT
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist npixhits {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Distributions/HLT
+						hist pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Efficiency/L2
 							display     	= StatBox
 						}
-						hist charge {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Distributions/HLT
+					}
+					dir L2Calo {
+						hist eff_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist ptcone20 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Distributions/HLT
+						hist eff_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist ptcone20_rel {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Distributions/HLT
+						hist eff_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist ptvarcone20 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Distributions/HLT
+						hist eff_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist ptvarcone20_rel {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Distributions/HLT
+						hist eff_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist rejection {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Distributions/HLT
+						hist eff_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
 						hist et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Distributions/HLT
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
 						hist eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Distributions/HLT
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Distributions/HLT
+						hist highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-					}
-					dir EFCalo {
-						hist energyBE0 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Distributions/EFCalo
+						hist match_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist energyBE1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Distributions/EFCalo
+						hist match_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist energyBE2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Distributions/EFCalo
+						hist match_highet {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist energyBE3 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Distributions/EFCalo
+						hist match_mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist energy {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Distributions/EFCalo
+						hist match_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist eta_calo {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Distributions/EFCalo
+						hist match_pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist phi_calo {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Distributions/EFCalo
+						hist mu {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Distributions/EFCalo
+						hist phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Distributions/EFCalo
+						hist pt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Efficiency/L2Calo
 							display     	= StatBox
 						}
-						hist phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Distributions/EFCalo
+					}
+				}
+				dir Resolutions {
+					dir HLT {
+						hist res_Reta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-					}
-					dir L2Electron {
-						hist et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Distributions/L2Electron
+						hist res_Rhad {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Distributions/L2Electron
+						hist res_Rhad1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Distributions/L2Electron
+						hist res_Rphi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist trkClusDeta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Distributions/L2Electron
+						hist res_cnv_etInEta0 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist trkClusDphi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Distributions/L2Electron
+						hist res_cnv_etInEta1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-					}
-					dir L2Calo {
-						hist et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Distributions/L2Calo
+						hist res_cnv_etInEta2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Distributions/L2Calo
+						hist res_cnv_etInEta3 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Distributions/L2Calo
+						hist res_cnv_etVsEt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-					}
-				}
-				dir Resolutions {
-					dir HLT {
-						hist res_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Resolutions/HLT
+						hist res_cnv_etVsEta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Resolutions/HLT
+						hist res_eratio {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Resolutions/HLT
+						hist res_et {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_etVsEta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Resolutions/HLT
+						hist res_etInEta0 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_etVsEt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Resolutions/HLT
+						hist res_etInEta1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_ethad {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Resolutions/HLT
+						hist res_etInEta2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_ethad1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Resolutions/HLT
+						hist res_etInEta3 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_Rhad {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Resolutions/HLT
+						hist res_etVsEt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_Rhad1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Resolutions/HLT
+						hist res_etVsEta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_Reta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Resolutions/HLT
+						hist res_et_cnv {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_Rphi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Resolutions/HLT
+						hist res_et_uncnv {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_weta1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Resolutions/HLT
+						hist res_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_weta2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Resolutions/HLT
+						hist res_ethad {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Resolutions/HLT
+							display     	= StatBox
+						}
+						hist res_ethad1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
 						hist res_f1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Resolutions/HLT
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
 						hist res_f3 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Resolutions/HLT
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_eratio {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Resolutions/HLT
+						hist res_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_pt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Resolutions/HLT
+						hist res_uncnv_etInEta0 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_deta1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Resolutions/HLT
+						hist res_uncnv_etInEta1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_deta2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Resolutions/HLT
+						hist res_uncnv_etInEta2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_dphi2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Resolutions/HLT
+						hist res_uncnv_etInEta3 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_dphiresc {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Resolutions/HLT
+						hist res_uncnv_etVsEt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_d0 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Resolutions/HLT
+						hist res_uncnv_etVsEta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_d0sig {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Resolutions/HLT
+						hist res_weta1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_eprobht {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Resolutions/HLT
+						hist res_weta2 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_nscthits {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Resolutions/HLT
+						hist res_wtots1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Resolutions/HLT
 							display     	= StatBox
 						}
-						hist res_npixhits {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Resolutions/HLT
+					}
+					dir L1Calo {
+						hist res_etVsEta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Resolutions/L1Calo
 							display     	= StatBox
 						}
-						hist res_etInEta0 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Resolutions/HLT
+					}
+					dir L2Calo_vs_HLT {
+						hist res_Reta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist res_etInEta1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Resolutions/HLT
+						hist res_Rhad {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist res_etInEta2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Resolutions/HLT
+						hist res_Rhad1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist res_etInEta3 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Resolutions/HLT
+						hist res_Rphi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist res_wtots1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Resolutions/HLT
+						hist res_eratio {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-					}
-					dir L2Calo_vs_HLT {
 						hist res_et {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Resolutions/L2Calo_vs_HLT
-							display     	= StatBox
-						}
-						hist res_eta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Resolutions/L2Calo_vs_HLT
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist res_phi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Resolutions/L2Calo_vs_HLT
+						hist res_etVsEt {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
 						hist res_etVsEta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Resolutions/L2Calo_vs_HLT
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist res_etVsEt {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Resolutions/L2Calo_vs_HLT
+						hist res_eta {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
 						hist res_ethad {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Resolutions/L2Calo_vs_HLT
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
 						hist res_ethad1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Resolutions/L2Calo_vs_HLT
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist res_Rhad {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Resolutions/L2Calo_vs_HLT
-							display     	= StatBox
-						}
-						hist res_Rhad1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Resolutions/L2Calo_vs_HLT
+						hist res_f1 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist res_Reta {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Resolutions/L2Calo_vs_HLT
+						hist res_f3 {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
-						hist res_Rphi {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Resolutions/L2Calo_vs_HLT
+						hist res_phi {
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
 						hist res_weta1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Resolutions/L2Calo_vs_HLT
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
 						hist res_weta2 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Resolutions/L2Calo_vs_HLT
-							display     	= StatBox
-						}
-						hist res_f1 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Resolutions/L2Calo_vs_HLT
-							display     	= StatBox
-						}
-						hist res_f3 {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Resolutions/L2Calo_vs_HLT
-							display     	= StatBox
-						}
-						hist res_eratio {
-							algorithm   	= HLT_Histogram_Not_Empty&GatherData
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-							output      	= HLT/TREG/Expert/HLT_e22_lhloose_nod0/Resolutions/L2Calo_vs_HLT
+							algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+							description 	= DQWebdisplay ATR-18760
+							output      	= HLT/TREG/Expert/HLT_g20_loose_ion/Resolutions/L2Calo_vs_HLT
 							display     	= StatBox
 						}
 					}
@@ -15711,342 +28371,361 @@ dir HLT {
 			}
 		}
 		dir Shifter {
-			dir primary_single_pho {
-				hist eff_et {
-					algorithm   	= HLT_Histogram_Not_Empty&GatherData
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-					output      	= HLT/TREG/Shifter/primary_single_pho
-					display     	= StatBox
-				}
-				hist eff_eta {
-					algorithm   	= HLT_Histogram_Not_Empty&GatherData
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-					output      	= HLT/TREG/Shifter/primary_single_pho
-					display     	= StatBox
-				}
-				hist eff_mu {
-					algorithm   	= HLT_Histogram_Not_Empty&GatherData
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-					output      	= HLT/TREG/Shifter/primary_single_pho
-					display     	= StatBox
-				}
-				hist et {
-					algorithm   	= HLT_Histogram_Not_Empty&GatherData
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-					output      	= HLT/TREG/Shifter/primary_single_pho
-					display     	= StatBox
-				}
-				hist eta {
-					algorithm   	= HLT_Histogram_Not_Empty&GatherData
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-					output      	= HLT/TREG/Shifter/primary_single_pho
-					display     	= StatBox
-				}
+			dir primary_single_ele {
 				hist Reta {
-					algorithm   	= HLT_Histogram_Not_Empty&GatherData
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-					output      	= HLT/TREG/Shifter/primary_single_pho
-					display     	= StatBox
-				}
-				hist Rphi {
-					algorithm   	= HLT_Histogram_Not_Empty&GatherData
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-					output      	= HLT/TREG/Shifter/primary_single_pho
+					algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+					description 	= DQWebdisplay ATR-18760
+					output      	= HLT/TREG/Shifter/primary_single_ele
 					display     	= StatBox
 				}
 				hist Rhad {
-					algorithm   	= HLT_Histogram_Not_Empty&GatherData
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-					output      	= HLT/TREG/Shifter/primary_single_pho
-					display     	= StatBox
-				}
-				hist f1 {
-					algorithm   	= HLT_Histogram_Not_Empty&GatherData
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-					output      	= HLT/TREG/Shifter/primary_single_pho
-					display     	= StatBox
-				}
-				hist f3 {
-					algorithm   	= HLT_Histogram_Not_Empty&GatherData
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-					output      	= HLT/TREG/Shifter/primary_single_pho
-					display     	= StatBox
-				}
-				hist eratio {
-					algorithm   	= HLT_Histogram_Not_Empty&GatherData
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-					output      	= HLT/TREG/Shifter/primary_single_pho
-					display     	= StatBox
-				}
-				hist res_et {
-					algorithm   	= HLT_Histogram_Not_Empty&GatherData
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-					output      	= HLT/TREG/Shifter/primary_single_pho
-					display     	= StatBox
-				}
-				hist res_Rphi {
-					algorithm   	= HLT_Histogram_Not_Empty&GatherData
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-					output      	= HLT/TREG/Shifter/primary_single_pho
+					algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+					description 	= DQWebdisplay ATR-18760
+					output      	= HLT/TREG/Shifter/primary_single_ele
 					display     	= StatBox
 				}
-				hist res_Reta {
-					algorithm   	= HLT_Histogram_Not_Empty&GatherData
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-					output      	= HLT/TREG/Shifter/primary_single_pho
+				hist Rphi {
+					algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+					description 	= DQWebdisplay ATR-18760
+					output      	= HLT/TREG/Shifter/primary_single_ele
 					display     	= StatBox
 				}
-				hist res_Rhad {
-					algorithm   	= HLT_Histogram_Not_Empty&GatherData
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-					output      	= HLT/TREG/Shifter/primary_single_pho
+				hist deta2 {
+					algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+					description 	= DQWebdisplay ATR-18760
+					output      	= HLT/TREG/Shifter/primary_single_ele
 					display     	= StatBox
 				}
-			}
-			dir primary_single_ele {
 				hist eff_et {
-					algorithm   	= HLT_Histogram_Not_Empty&GatherData
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
+					algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+					description 	= DQWebdisplay ATR-18760
 					output      	= HLT/TREG/Shifter/primary_single_ele
 					display     	= StatBox
 				}
 				hist eff_eta {
-					algorithm   	= HLT_Histogram_Not_Empty&GatherData
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-					output      	= HLT/TREG/Shifter/primary_single_ele
-					display     	= StatBox
-				}
-				hist eff_mu {
-					algorithm   	= HLT_Histogram_Not_Empty&GatherData
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
+					algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+					description 	= DQWebdisplay ATR-18760
 					output      	= HLT/TREG/Shifter/primary_single_ele
 					display     	= StatBox
 				}
-				hist et {
-					algorithm   	= HLT_Histogram_Not_Empty&GatherData
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
+				hist eff_highet {
+					algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+					description 	= DQWebdisplay ATR-18760
 					output      	= HLT/TREG/Shifter/primary_single_ele
 					display     	= StatBox
 				}
-				hist eta {
-					algorithm   	= HLT_Histogram_Not_Empty&GatherData
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
+				hist eff_mu {
+					algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+					description 	= DQWebdisplay ATR-18760
 					output      	= HLT/TREG/Shifter/primary_single_ele
 					display     	= StatBox
 				}
-				hist Reta {
-					algorithm   	= HLT_Histogram_Not_Empty&GatherData
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
+				hist eratio {
+					algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+					description 	= DQWebdisplay ATR-18760
 					output      	= HLT/TREG/Shifter/primary_single_ele
 					display     	= StatBox
 				}
-				hist Rphi {
-					algorithm   	= HLT_Histogram_Not_Empty&GatherData
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
+				hist et {
+					algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+					description 	= DQWebdisplay ATR-18760
 					output      	= HLT/TREG/Shifter/primary_single_ele
 					display     	= StatBox
 				}
-				hist Rhad {
-					algorithm   	= HLT_Histogram_Not_Empty&GatherData
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
+				hist eta {
+					algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+					description 	= DQWebdisplay ATR-18760
 					output      	= HLT/TREG/Shifter/primary_single_ele
 					display     	= StatBox
 				}
 				hist f1 {
-					algorithm   	= HLT_Histogram_Not_Empty&GatherData
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
+					algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+					description 	= DQWebdisplay ATR-18760
 					output      	= HLT/TREG/Shifter/primary_single_ele
 					display     	= StatBox
 				}
 				hist f3 {
-					algorithm   	= HLT_Histogram_Not_Empty&GatherData
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-					output      	= HLT/TREG/Shifter/primary_single_ele
-					display     	= StatBox
-				}
-				hist eratio {
-					algorithm   	= HLT_Histogram_Not_Empty&GatherData
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
-					output      	= HLT/TREG/Shifter/primary_single_ele
-					display     	= StatBox
-				}
-				hist deta2 {
-					algorithm   	= HLT_Histogram_Not_Empty&GatherData
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
+					algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+					description 	= DQWebdisplay ATR-18760
 					output      	= HLT/TREG/Shifter/primary_single_ele
 					display     	= StatBox
 				}
 				hist npixhits {
-					algorithm   	= HLT_Histogram_Not_Empty&GatherData
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
+					algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+					description 	= DQWebdisplay ATR-18760
 					output      	= HLT/TREG/Shifter/primary_single_ele
 					display     	= StatBox
 				}
 				hist nscthits {
-					algorithm   	= HLT_Histogram_Not_Empty&GatherData
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
+					algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+					description 	= DQWebdisplay ATR-18760
 					output      	= HLT/TREG/Shifter/primary_single_ele
 					display     	= StatBox
 				}
 				hist ptvarcone20 {
-					algorithm   	= HLT_Histogram_Not_Empty&GatherData
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
+					algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+					description 	= DQWebdisplay ATR-18760
 					output      	= HLT/TREG/Shifter/primary_single_ele
 					display     	= StatBox
 				}
-				hist res_et {
-					algorithm   	= HLT_Histogram_Not_Empty&GatherData
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
+				hist res_Reta {
+					algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+					description 	= DQWebdisplay ATR-18760
 					output      	= HLT/TREG/Shifter/primary_single_ele
 					display     	= StatBox
 				}
-				hist res_Rphi {
-					algorithm   	= HLT_Histogram_Not_Empty&GatherData
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
+				hist res_Rhad {
+					algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+					description 	= DQWebdisplay ATR-18760
 					output      	= HLT/TREG/Shifter/primary_single_ele
 					display     	= StatBox
 				}
-				hist res_Reta {
-					algorithm   	= HLT_Histogram_Not_Empty&GatherData
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
+				hist res_Rphi {
+					algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+					description 	= DQWebdisplay ATR-18760
 					output      	= HLT/TREG/Shifter/primary_single_ele
 					display     	= StatBox
 				}
-				hist res_Rhad {
-					algorithm   	= HLT_Histogram_Not_Empty&GatherData
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
+				hist res_deta2 {
+					algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+					description 	= DQWebdisplay ATR-18760
 					output      	= HLT/TREG/Shifter/primary_single_ele
 					display     	= StatBox
 				}
-				hist res_deta2 {
-					algorithm   	= HLT_Histogram_Not_Empty&GatherData
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
+				hist res_et {
+					algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+					description 	= DQWebdisplay ATR-18760
 					output      	= HLT/TREG/Shifter/primary_single_ele
 					display     	= StatBox
 				}
 			}
 			dir primary_single_ele_cutbased {
-				hist eff_et {
-					algorithm   	= HLT_Histogram_Not_Empty&GatherData
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
+				hist Reta {
+					algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+					description 	= DQWebdisplay ATR-18760
 					output      	= HLT/TREG/Shifter/primary_single_ele_cutbased
 					display     	= StatBox
 				}
-				hist eff_eta {
-					algorithm   	= HLT_Histogram_Not_Empty&GatherData
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
+				hist Rhad {
+					algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+					description 	= DQWebdisplay ATR-18760
 					output      	= HLT/TREG/Shifter/primary_single_ele_cutbased
 					display     	= StatBox
 				}
-				hist eff_mu {
-					algorithm   	= HLT_Histogram_Not_Empty&GatherData
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
+				hist Rphi {
+					algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+					description 	= DQWebdisplay ATR-18760
 					output      	= HLT/TREG/Shifter/primary_single_ele_cutbased
 					display     	= StatBox
 				}
-				hist et {
-					algorithm   	= HLT_Histogram_Not_Empty&GatherData
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
+				hist deta2 {
+					algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+					description 	= DQWebdisplay ATR-18760
 					output      	= HLT/TREG/Shifter/primary_single_ele_cutbased
 					display     	= StatBox
 				}
-				hist eta {
-					algorithm   	= HLT_Histogram_Not_Empty&GatherData
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
+				hist eff_et {
+					algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+					description 	= DQWebdisplay ATR-18760
 					output      	= HLT/TREG/Shifter/primary_single_ele_cutbased
 					display     	= StatBox
 				}
-				hist Reta {
-					algorithm   	= HLT_Histogram_Not_Empty&GatherData
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
+				hist eff_eta {
+					algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+					description 	= DQWebdisplay ATR-18760
 					output      	= HLT/TREG/Shifter/primary_single_ele_cutbased
 					display     	= StatBox
 				}
-				hist Rphi {
-					algorithm   	= HLT_Histogram_Not_Empty&GatherData
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
+				hist eff_highet {
+					algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+					description 	= DQWebdisplay ATR-18760
 					output      	= HLT/TREG/Shifter/primary_single_ele_cutbased
 					display     	= StatBox
 				}
-				hist Rhad {
-					algorithm   	= HLT_Histogram_Not_Empty&GatherData
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
+				hist eff_mu {
+					algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+					description 	= DQWebdisplay ATR-18760
 					output      	= HLT/TREG/Shifter/primary_single_ele_cutbased
 					display     	= StatBox
 				}
-				hist f1 {
-					algorithm   	= HLT_Histogram_Not_Empty&GatherData
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
+				hist eratio {
+					algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+					description 	= DQWebdisplay ATR-18760
 					output      	= HLT/TREG/Shifter/primary_single_ele_cutbased
 					display     	= StatBox
 				}
-				hist f3 {
-					algorithm   	= HLT_Histogram_Not_Empty&GatherData
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
+				hist et {
+					algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+					description 	= DQWebdisplay ATR-18760
 					output      	= HLT/TREG/Shifter/primary_single_ele_cutbased
 					display     	= StatBox
 				}
-				hist eratio {
-					algorithm   	= HLT_Histogram_Not_Empty&GatherData
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
+				hist eta {
+					algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+					description 	= DQWebdisplay ATR-18760
 					output      	= HLT/TREG/Shifter/primary_single_ele_cutbased
 					display     	= StatBox
 				}
-				hist deta2 {
-					algorithm   	= HLT_Histogram_Not_Empty&GatherData
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
+				hist f1 {
+					algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+					description 	= DQWebdisplay ATR-18760
+					output      	= HLT/TREG/Shifter/primary_single_ele_cutbased
+					display     	= StatBox
+				}
+				hist f3 {
+					algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+					description 	= DQWebdisplay ATR-18760
 					output      	= HLT/TREG/Shifter/primary_single_ele_cutbased
 					display     	= StatBox
 				}
 				hist npixhits {
-					algorithm   	= HLT_Histogram_Not_Empty&GatherData
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
+					algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+					description 	= DQWebdisplay ATR-18760
 					output      	= HLT/TREG/Shifter/primary_single_ele_cutbased
 					display     	= StatBox
 				}
 				hist nscthits {
-					algorithm   	= HLT_Histogram_Not_Empty&GatherData
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
+					algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+					description 	= DQWebdisplay ATR-18760
 					output      	= HLT/TREG/Shifter/primary_single_ele_cutbased
 					display     	= StatBox
 				}
 				hist ptvarcone20 {
-					algorithm   	= HLT_Histogram_Not_Empty&GatherData
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
+					algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+					description 	= DQWebdisplay ATR-18760
 					output      	= HLT/TREG/Shifter/primary_single_ele_cutbased
 					display     	= StatBox
 				}
-				hist res_et {
-					algorithm   	= HLT_Histogram_Not_Empty&GatherData
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
+				hist res_Reta {
+					algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+					description 	= DQWebdisplay ATR-18760
 					output      	= HLT/TREG/Shifter/primary_single_ele_cutbased
 					display     	= StatBox
 				}
-				hist res_Rphi {
-					algorithm   	= HLT_Histogram_Not_Empty&GatherData
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
+				hist res_Rhad {
+					algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+					description 	= DQWebdisplay ATR-18760
 					output      	= HLT/TREG/Shifter/primary_single_ele_cutbased
 					display     	= StatBox
 				}
-				hist res_Reta {
-					algorithm   	= HLT_Histogram_Not_Empty&GatherData
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
+				hist res_Rphi {
+					algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+					description 	= DQWebdisplay ATR-18760
 					output      	= HLT/TREG/Shifter/primary_single_ele_cutbased
 					display     	= StatBox
 				}
-				hist res_Rhad {
-					algorithm   	= HLT_Histogram_Not_Empty&GatherData
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
+				hist res_deta2 {
+					algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+					description 	= DQWebdisplay ATR-18760
 					output      	= HLT/TREG/Shifter/primary_single_ele_cutbased
 					display     	= StatBox
 				}
-				hist res_deta2 {
-					algorithm   	= HLT_Histogram_Not_Empty&GatherData
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/TrigEgammaDataQualityAndMonitoring
+				hist res_et {
+					algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+					description 	= DQWebdisplay ATR-18760
 					output      	= HLT/TREG/Shifter/primary_single_ele_cutbased
 					display     	= StatBox
 				}
 			}
+			dir primary_single_pho {
+				hist Reta {
+					algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+					description 	= DQWebdisplay ATR-18760
+					output      	= HLT/TREG/Shifter/primary_single_pho
+					display     	= StatBox
+				}
+				hist Rhad {
+					algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+					description 	= DQWebdisplay ATR-18760
+					output      	= HLT/TREG/Shifter/primary_single_pho
+					display     	= StatBox
+				}
+				hist Rphi {
+					algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+					description 	= DQWebdisplay ATR-18760
+					output      	= HLT/TREG/Shifter/primary_single_pho
+					display     	= StatBox
+				}
+				hist eff_et {
+					algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+					description 	= DQWebdisplay ATR-18760
+					output      	= HLT/TREG/Shifter/primary_single_pho
+					display     	= StatBox
+				}
+				hist eff_eta {
+					algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+					description 	= DQWebdisplay ATR-18760
+					output      	= HLT/TREG/Shifter/primary_single_pho
+					display     	= StatBox
+				}
+				hist eff_highet {
+					algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+					description 	= DQWebdisplay ATR-18760
+					output      	= HLT/TREG/Shifter/primary_single_pho
+					display     	= StatBox
+				}
+				hist eff_mu {
+					algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+					description 	= DQWebdisplay ATR-18760
+					output      	= HLT/TREG/Shifter/primary_single_pho
+					display     	= StatBox
+				}
+				hist eratio {
+					algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+					description 	= DQWebdisplay ATR-18760
+					output      	= HLT/TREG/Shifter/primary_single_pho
+					display     	= StatBox
+				}
+				hist et {
+					algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+					description 	= DQWebdisplay ATR-18760
+					output      	= HLT/TREG/Shifter/primary_single_pho
+					display     	= StatBox
+				}
+				hist eta {
+					algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+					description 	= DQWebdisplay ATR-18760
+					output      	= HLT/TREG/Shifter/primary_single_pho
+					display     	= StatBox
+				}
+				hist f1 {
+					algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+					description 	= DQWebdisplay ATR-18760
+					output      	= HLT/TREG/Shifter/primary_single_pho
+					display     	= StatBox
+				}
+				hist f3 {
+					algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+					description 	= DQWebdisplay ATR-18760
+					output      	= HLT/TREG/Shifter/primary_single_pho
+					display     	= StatBox
+				}
+				hist res_Reta {
+					algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+					description 	= DQWebdisplay ATR-18760
+					output      	= HLT/TREG/Shifter/primary_single_pho
+					display     	= StatBox
+				}
+				hist res_Rhad {
+					algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+					description 	= DQWebdisplay ATR-18760
+					output      	= HLT/TREG/Shifter/primary_single_pho
+					display     	= StatBox
+				}
+				hist res_Rphi {
+					algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+					description 	= DQWebdisplay ATR-18760
+					output      	= HLT/TREG/Shifter/primary_single_pho
+					display     	= StatBox
+				}
+				hist res_et {
+					algorithm   	= HLT_Histogram_Not_Empty_with_Ref&GatherData
+					description 	= DQWebdisplay ATR-18760
+					output      	= HLT/TREG/Shifter/primary_single_pho
+					display     	= StatBox
+				}
+			}
 		}
 	}
 }
+
diff --git a/DataQuality/DataQualityConfigurations/config/HLT/HLTjet/heavyions_run.config b/DataQuality/DataQualityConfigurations/config/HLT/HLTjet/heavyions_run.config
index 480bfd91ce718004e1f8a607fe14709e5e84a8b3..94b6786151f3144c3e841b3c760a1e2def84fc2e 100644
--- a/DataQuality/DataQualityConfigurations/config/HLT/HLTjet/heavyions_run.config
+++ b/DataQuality/DataQualityConfigurations/config/HLT/HLTjet/heavyions_run.config
@@ -24,49 +24,52 @@ reference HLTJetRef {
 
 
 output top_level {
-#  algorithm = HLTjetWorstCaseSummary
-#  algorithm = HLTjetSimpleSummary
 
   output HLT {
 
     ## Begin TRJET
     output TRJET {
 
-      #algorithm = HLTjetWorstCaseSummary
-      #algorithm = HLTjetSimpleSummary
-
       output EXPERT {
       	output HLT {
-          output a4tcemsubjesFS {
+          output j85_ion_TE50 {
 	  }
-	  output j30_ion_L1TE20 {
+	  output j85_ion_L1J20 {
 	  }
-	  output j30_L1TE20 {
+	  output j100_ion_L1J30 {
 	  }
-  	  output j100_ion_L1J20 {
+  	  output j110_ion_L1J30 {
 	  }
-  	  output j150_ion_L1J30 {
+  	  output j120_ion_L1J30 {
 	  }
-  	  output j100_L1J20 {
+  	  output j50_320eta490_ion {
 	  }
-  	  output j150_L1J30 {
+  	  output j60_320eta490_ion {
 	  }
-  	  output j45_320eta490_ion {
+  	  output j70_320eta490_ion {
 	  }
-  	  output j45_320eta490 {
+  	  output mu4_j30_a2_ion_dr05 {
 	  }
-  	  output j50_ion_2j30_ion_0eta490_L1J10 {
+  	  output mu4_j40_a2_ion_dr05 {
 	  }
-  	  output j50_2j30_0eta490_L1J10 {
+  	  output mu4_j30_a2_ion {
 	  }	 
+	  output mu4_j40_a2_ion {
+	  }
 	} ## End HLT
 	output L1 {
 	  output L1_J20 {
+ 	  }
+	  output L1_J30 {
  	  }  
 	  output L1_TE50 {
- 	  }  
+ 	  }
+	  output L1_J15.31ETA49 {
+ 	  }
+	  output L1_J20.31ETA49 {
+ 	  }
 	} ## End L1
-	output OF {
+	output Collections {
 	  output AntiKt4HIJets {
           }
 	} ## End OF
@@ -75,17 +78,19 @@ output top_level {
       output SHIFTER {
 	output HLT {
 	  output a4ionemsubjesFS {
-	  }
-	  output j75_ion_L1J20 {
-	  }
-	  output j75_L1J20 {
+	  }	
+	  output j85_ion_L1TE50 {
 	  }
 	  output j85_ion_L1J20 {
 	  }
-	  output j85_L1J20 {
-	  }
 	} ## End HLT
 	output L1 {
+	  output L1_J20 {
+	  }
+	  output L1_J30 {
+	  }
+	  output L1_TE50 {
+ 	  }
 	} ## End L1
 
       } ## End SHIFTER
@@ -93,7 +98,6 @@ output top_level {
     } ## End TRJET
 
   } ## End HLT
-
 } ## End top_level
 
 
@@ -143,107 +147,833 @@ dir HLT {
         output = HLT/TRJET/EXPERT/L1
       }
       dir L1_J20 {
-        hist .* {
-          regex = 1
+        hist L1Jet_n@Expert {
+          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
+          output =  HLT/TRJET/EXPERT/L1/L1_J20
+        }
+        hist L1Jet_Et@Expert {
           algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
           output = HLT/TRJET/EXPERT/L1/L1_J20
-      	}
-      }
+          description = The distribution should not be broad. Check with reference when available.
+        }
+        hist L1Jet_eta@Expert {
+          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
+          output = HLT/TRJET/EXPERT/L1/L1_J20
+        }
+        hist L1Jet_phi@Expert {
+          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
+          output = HLT/TRJET/EXPERT/L1/L1_J20
+        }
+        hist L1Jet_phi_vs_eta@Expert {
+          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
+          output = HLT/TRJET/EXPERT/L1/L1_J20
+          description = Particular attention should be payed in checking hot regions. The distribution should not have peaks.
+        }
+        hist L1Jet_E_vs_eta@Expert {
+          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
+          output = HLT/TRJET/EXPERT/L1/L1_J20
+        }
+        hist L1Jet_E_vs_phi@Expert {
+          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
+          output = HLT/TRJET/EXPERT/L1/L1_J20
+        }
+        hist L1Sigma_vs_LB@Expert {
+          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
+          output = HLT/TRJET/EXPERT/L1/L1_J20
+        }
+      } ## End L1_J20
+      dir L1_J30 {
+        hist L1Jet_n@Expert {
+          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
+          output =  HLT/TRJET/EXPERT/L1/L1_J30
+        }
+        hist L1Jet_Et@Expert {
+          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
+          output = HLT/TRJET/EXPERT/L1/L1_J30
+          description = The distribution should not be broad. Check with reference when available.
+        }
+        hist L1Jet_eta@Expert {
+          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
+          output = HLT/TRJET/EXPERT/L1/L1_J30
+        }
+        hist L1Jet_phi@Expert {
+          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
+          output = HLT/TRJET/EXPERT/L1/L1_J30
+        }
+        hist L1Jet_phi_vs_eta@Expert {
+          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
+          output = HLT/TRJET/EXPERT/L1/L1_J30
+          description = Particular attention should be payed in checking hot regions. The distribution should not have peaks.
+        }
+        hist L1Jet_E_vs_eta@Expert {
+          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
+          output = HLT/TRJET/EXPERT/L1/L1_J30
+        }
+        hist L1Jet_E_vs_phi@Expert {
+          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
+          output = HLT/TRJET/EXPERT/L1/L1_J30
+        }
+        hist L1Sigma_vs_LB@Expert {
+          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
+          output = HLT/TRJET/EXPERT/L1/L1_J30
+        }
+      } ## End L1_J30
       dir L1_TE50 {
-        hist .* {
-          regex = 1
+        hist L1Jet_n@Expert {
+          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
+          output =  HLT/TRJET/EXPERT/L1/L1_TE50
+        }
+        hist L1Jet_Et@Expert {
           algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
           output = HLT/TRJET/EXPERT/L1/L1_TE50
-      	}
-      }
+          description = The distribution should not be broad. Check with reference when available.
+        }
+        hist L1Jet_eta@Expert {
+          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
+          output = HLT/TRJET/EXPERT/L1/L1_TE50
+        }
+        hist L1Jet_phi@Expert {
+          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
+          output = HLT/TRJET/EXPERT/L1/L1_TE50
+        }
+        hist L1Jet_phi_vs_eta@Expert {
+          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
+          output = HLT/TRJET/EXPERT/L1/L1_TE50
+          description = Particular attention should be payed in checking hot regions. The distribution should not have peaks.
+        }
+        hist L1Jet_E_vs_eta@Expert {
+          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
+          output = HLT/TRJET/EXPERT/L1/L1_TE50
+        }
+        hist L1Jet_E_vs_phi@Expert {
+          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
+          output = HLT/TRJET/EXPERT/L1/L1_TE50
+        }
+        hist L1Sigma_vs_LB@Expert {
+          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
+          output = HLT/TRJET/EXPERT/L1/L1_TE50
+        }
+      } ## End L1_TE50
+      dir L1_J15.31ETA49 {
+        hist L1Jet_n@Expert {
+          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
+          output =  HLT/TRJET/EXPERT/L1/L1_J15.31ETA49
+        }
+        hist L1Jet_Et@Expert {
+          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
+          output = HLT/TRJET/EXPERT/L1/L1_J15.31ETA49
+          description = The distribution should not be broad. Check with reference when available.
+        }
+        hist L1Jet_eta@Expert {
+          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
+          output = HLT/TRJET/EXPERT/L1/L1_J15.31ETA49
+        }
+        hist L1Jet_phi@Expert {
+          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
+          output = HLT/TRJET/EXPERT/L1/L1_J15.31ETA49
+        }
+        hist L1Jet_phi_vs_eta@Expert {
+          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
+          output = HLT/TRJET/EXPERT/L1/L1_J15.31ETA49
+          description = Particular attention should be payed in checking hot regions. The distribution should not have peaks.
+        }
+        hist L1Jet_E_vs_eta@Expert {
+          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
+          output = HLT/TRJET/EXPERT/L1/L1_J15.31ETA49
+        }
+        hist L1Jet_E_vs_phi@Expert {
+          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
+          output = HLT/TRJET/EXPERT/L1/L1_J15.31ETA49
+        }
+        hist L1Sigma_vs_LB@Expert {
+          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
+          output = HLT/TRJET/EXPERT/L1/L1_J15.31ETA49
+        }
+      } ## End L1_J15.31ETA49
+      dir L1_J20.31ETA49 {
+        hist L1Jet_n@Expert {
+          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
+          output =  HLT/TRJET/EXPERT/L1/L1_J20.31ETA49
+        }
+        hist L1Jet_Et@Expert {
+          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
+          output = HLT/TRJET/EXPERT/L1/L1_J20.31ETA49
+          description = The distribution should not be broad. Check with reference when available.
+        }
+        hist L1Jet_eta@Expert {
+          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
+          output = HLT/TRJET/EXPERT/L1/L1_J20.31ETA49
+        }
+        hist L1Jet_phi@Expert {
+          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
+          output = HLT/TRJET/EXPERT/L1/L1_J20.31ETA49
+        }
+        hist L1Jet_phi_vs_eta@Expert {
+          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
+          output = HLT/TRJET/EXPERT/L1/L1_J20.31ETA49
+          description = Particular attention should be payed in checking hot regions. The distribution should not have peaks.
+        }
+        hist L1Jet_E_vs_eta@Expert {
+          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
+          output = HLT/TRJET/EXPERT/L1/L1_J20.31ETA49
+        }
+        hist L1Jet_E_vs_phi@Expert {
+          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
+          output = HLT/TRJET/EXPERT/L1/L1_J20.31ETA49
+        }
+        hist L1Sigma_vs_LB@Expert {
+          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
+          output = HLT/TRJET/EXPERT/L1/L1_J20.31ETA49
+        }
+      } ## End L1_J20.31ETA49
     } ## End L1
   } ##End JetMon
 } ##End HLT
 
 
 ############################## HLT ###################################
+# Need to directly reference the histograms to avoid a loss of the reference histograms.
+######################################################################
+
 dir HLT {
   dir JetMon {
     dir HLT {
-      dir a4tcemsubjesFS {
-        hist .* {
-          regex = 1
+      dir j85_ion_TE50 {
+        hist HLTJet_n@Expert {
+          display = LogY
+          algorithm = HLTjet_KolmogorovTest_MaxDist
+          output = HLT/TRJET/EXPERT/HLT/j85_ion_TE50
+          description = Red means: mean of the histogram different from reference. NJet plot: this plot should be close to the reference. Red can be due to: 1) Low statistics wrt reference. 2) Current bunch spacing different from reference. 3) Strange shape. i.e. bumps at high multiplicity.
+      	}
+      	hist HLTJet_Et@Expert {
+          display = LogY
+          algorithm = HLTjet_KolmogorovTest_MaxDist
+          output = HLT/TRJET/EXPERT/HLT/j85_ion_TE50
+          description = Red means: mean of the histogram different from reference. Et plot: This plot should be close to the reference. Red can be due to: 1) The histogram threshold is not the same as HLT threshold. 2) Slope of the histogram significantly different from reference. 3) Strange shape, i.e. bumps at high Et.
+      	}
+      	hist HLTJet_eta@Expert {
+          algorithm = HLTjet_KolmogorovTest_MaxDist
+          output = HLT/TRJET/EXPERT/HLT/j85_ion_TE50
+          description = Red means: mean of the histogram different from reference. Eta plot: this plot should be symmetrical. Red can be due to: 1) Distribution not simmetric. 2) Histogram significantly different from reference.
+      	}
+      	hist HLTJet_phi@Expert {
+          algorithm = HLTjet_KolmogorovTest_MaxDist
+          output = HLT/TRJET/EXPERT/HLT/j85_ion_TE50
+          description = Red means: mean of the histogram different from reference. Phi plot: this plot should be symmetrical and flat. Red can be due to: 1) Distribution not simmetric. 2) Histogram significantly different from reference. 3) Hotspots. i.e bins higher than average.
+      	}
+      	hist HLTJet_phi_vs_eta@Expert {
+          algorithm = HLTjet_Bins_Diff_FromAvg
+          output = HLT/TRJET/EXPERT/HLT/j85_ion_TE50
+          description = Red means: A critical number (1) bins is greater than average. Eta vs Phi plot: this distribution should not show hotspots. Check that there is sufficient statistics to claim an hotspot.
+      	}
+       	hist HLTJet_E_vs_eta@Expert {
+          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
+          output = HLT/TRJET/EXPERT/HLT/j85_ion_TE50
+      	}
+       	hist HLTJet_E_vs_phi@Expert {
+          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
+          output = HLT/TRJET/EXPERT/HLT/j85_ion_TE50
+      	}
+      	hist HLTJet_phi_vs_eta_LAr@Expert {
+          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
+          output = HLT/TRJET/EXPERT/HLT/j85_ion_TE50
+      	}	  	
+	hist HLTJet_emfrac@Expert {
+          algorithm = HLTjet_KolmogorovTest_MaxDist
+          output = HLT/TRJET/EXPERT/HLT/j85_ion_TE50
+      	}
+	hist HLTJet_hecfrac@Expert {
+          algorithm = HLTjet_KolmogorovTest_MaxDist
+          output = HLT/TRJET/EXPERT/HLT/j85_ion_TE50
+      	}
+	hist HLTSigma_vs_LB@Expert {
+          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
+          output = HLT/TRJET/EXPERT/HLT/j85_ion_TE50
+      	}
+      } ## End j85_ion_TE50
+      dir j85_ion_L1J20 {
+        hist HLTJet_n@Expert {
+          display = LogY
+          algorithm = HLTjet_KolmogorovTest_MaxDist
+          output = HLT/TRJET/EXPERT/HLT/j85_ion_L1J20
+          description = Red means: mean of the histogram different from reference. NJet plot: this plot should be close to the reference. Red can be due to: 1) Low statistics wrt reference. 2) Current bunch spacing different from reference. 3) Strange shape. i.e. bumps at high multiplicity.
+      	}
+      	hist HLTJet_Et@Expert {
+          display = LogY
+          algorithm = HLTjet_KolmogorovTest_MaxDist
+          output = HLT/TRJET/EXPERT/HLT/j85_ion_L1J20
+          description = Red means: mean of the histogram different from reference. Et plot: This plot should be close to the reference. Red can be due to: 1) The histogram threshold is not the same as HLT threshold. 2) Slope of the histogram significantly different from reference. 3) Strange shape, i.e. bumps at high Et.
+      	}
+      	hist HLTJet_eta@Expert {
+          algorithm = HLTjet_KolmogorovTest_MaxDist
+          output = HLT/TRJET/EXPERT/HLT/j85_ion_L1J20
+          description = Red means: mean of the histogram different from reference. Eta plot: this plot should be symmetrical. Red can be due to: 1) Distribution not simmetric. 2) Histogram significantly different from reference.
+      	}
+      	hist HLTJet_phi@Expert {
+          algorithm = HLTjet_KolmogorovTest_MaxDist
+          output = HLT/TRJET/EXPERT/HLT/j85_ion_L1J20
+          description = Red means: mean of the histogram different from reference. Phi plot: this plot should be symmetrical and flat. Red can be due to: 1) Distribution not simmetric. 2) Histogram significantly different from reference. 3) Hotspots. i.e bins higher than average.
+      	}
+      	hist HLTJet_phi_vs_eta@Expert {
+          algorithm = HLTjet_Bins_Diff_FromAvg
+          output = HLT/TRJET/EXPERT/HLT/j85_ion_L1J20
+          description = Red means: A critical number (1) bins is greater than average. Eta vs Phi plot: this distribution should not show hotspots. Check that there is sufficient statistics to claim an hotspot.
+      	}
+       	hist HLTJet_E_vs_eta@Expert {
+          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
+          output = HLT/TRJET/EXPERT/HLT/j85_ion_L1J20
+      	}
+       	hist HLTJet_E_vs_phi@Expert {
+          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
+          output = HLT/TRJET/EXPERT/HLT/j85_ion_L1J20
+      	}
+      	hist HLTJet_phi_vs_eta_LAr@Expert {
+          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
+          output = HLT/TRJET/EXPERT/HLT/j85_ion_L1J20
+      	}	  	
+	hist HLTJet_emfrac@Expert {
+          algorithm = HLTjet_KolmogorovTest_MaxDist
+          output = HLT/TRJET/EXPERT/HLT/j85_ion_L1J20
+      	}
+	hist HLTJet_hecfrac@Expert {
+          algorithm = HLTjet_KolmogorovTest_MaxDist
+          output = HLT/TRJET/EXPERT/HLT/j85_ion_L1J20
+      	}
+	hist HLTSigma_vs_LB@Expert {
+          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
+          output = HLT/TRJET/EXPERT/HLT/j85_ion_L1J20
+      	}
+      } ## End j85_ion_L1J20
+      dir j100_ion_L1J30 {
+        hist HLTJet_n@Expert {
+          display = LogY
+          algorithm = HLTjet_KolmogorovTest_MaxDist
+          output = HLT/TRJET/EXPERT/HLT/j100_ion_L1J30
+          description = Red means: mean of the histogram different from reference. NJet plot: this plot should be close to the reference. Red can be due to: 1) Low statistics wrt reference. 2) Current bunch spacing different from reference. 3) Strange shape. i.e. bumps at high multiplicity.
+      	}
+      	hist HLTJet_Et@Expert {
+          display = LogY
+          algorithm = HLTjet_KolmogorovTest_MaxDist
+          output = HLT/TRJET/EXPERT/HLT/j100_ion_L1J30
+          description = Red means: mean of the histogram different from reference. Et plot: This plot should be close to the reference. Red can be due to: 1) The histogram threshold is not the same as HLT threshold. 2) Slope of the histogram significantly different from reference. 3) Strange shape, i.e. bumps at high Et.
+      	}
+      	hist HLTJet_eta@Expert {
+          algorithm = HLTjet_KolmogorovTest_MaxDist
+          output = HLT/TRJET/EXPERT/HLT/j100_ion_L1J30
+          description = Red means: mean of the histogram different from reference. Eta plot: this plot should be symmetrical. Red can be due to: 1) Distribution not simmetric. 2) Histogram significantly different from reference.
+      	}
+      	hist HLTJet_phi@Expert {
+          algorithm = HLTjet_KolmogorovTest_MaxDist
+          output = HLT/TRJET/EXPERT/HLT/j100_ion_L1J30
+          description = Red means: mean of the histogram different from reference. Phi plot: this plot should be symmetrical and flat. Red can be due to: 1) Distribution not simmetric. 2) Histogram significantly different from reference. 3) Hotspots. i.e bins higher than average.
+      	}
+      	hist HLTJet_phi_vs_eta@Expert {
+          algorithm = HLTjet_Bins_Diff_FromAvg
+          output = HLT/TRJET/EXPERT/HLT/j100_ion_L1J30
+          description = Red means: A critical number (1) bins is greater than average. Eta vs Phi plot: this distribution should not show hotspots. Check that there is sufficient statistics to claim an hotspot.
+      	}
+       	hist HLTJet_E_vs_eta@Expert {
+          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
+          output = HLT/TRJET/EXPERT/HLT/j100_ion_L1J30
+      	}
+       	hist HLTJet_E_vs_phi@Expert {
+          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
+          output = HLT/TRJET/EXPERT/HLT/j100_ion_L1J30
+      	}
+      	hist HLTJet_phi_vs_eta_LAr@Expert {
+          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
+          output = HLT/TRJET/EXPERT/HLT/j100_ion_L1J30
+      	}	  	
+	hist HLTJet_emfrac@Expert {
+          algorithm = HLTjet_KolmogorovTest_MaxDist
+          output = HLT/TRJET/EXPERT/HLT/j100_ion_L1J30
+      	}
+	hist HLTJet_hecfrac@Expert {
+          algorithm = HLTjet_KolmogorovTest_MaxDist
+          output = HLT/TRJET/EXPERT/HLT/j100_ion_L1J30
+      	}
+	hist HLTSigma_vs_LB@Expert {
+          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
+          output = HLT/TRJET/EXPERT/HLT/j100_ion_L1J30
+      	}
+      } ## End j100_ion_L1J30
+      dir j110_ion_L1J30 {
+        hist HLTJet_n@Expert {
+          display = LogY
+          algorithm = HLTjet_KolmogorovTest_MaxDist
+          output = HLT/TRJET/EXPERT/HLT/j110_ion_L1J30
+          description = Red means: mean of the histogram different from reference. NJet plot: this plot should be close to the reference. Red can be due to: 1) Low statistics wrt reference. 2) Current bunch spacing different from reference. 3) Strange shape. i.e. bumps at high multiplicity.
+      	}
+      	hist HLTJet_Et@Expert {
+          display = LogY
+          algorithm = HLTjet_KolmogorovTest_MaxDist
+          output = HLT/TRJET/EXPERT/HLT/j110_ion_L1J30
+          description = Red means: mean of the histogram different from reference. Et plot: This plot should be close to the reference. Red can be due to: 1) The histogram threshold is not the same as HLT threshold. 2) Slope of the histogram significantly different from reference. 3) Strange shape, i.e. bumps at high Et.
+      	}
+      	hist HLTJet_eta@Expert {
+          algorithm = HLTjet_KolmogorovTest_MaxDist
+          output = HLT/TRJET/EXPERT/HLT/j110_ion_L1J30
+          description = Red means: mean of the histogram different from reference. Eta plot: this plot should be symmetrical. Red can be due to: 1) Distribution not simmetric. 2) Histogram significantly different from reference.
+      	}
+      	hist HLTJet_phi@Expert {
+          algorithm = HLTjet_KolmogorovTest_MaxDist
+          output = HLT/TRJET/EXPERT/HLT/j110_ion_L1J30
+          description = Red means: mean of the histogram different from reference. Phi plot: this plot should be symmetrical and flat. Red can be due to: 1) Distribution not simmetric. 2) Histogram significantly different from reference. 3) Hotspots. i.e bins higher than average.
+      	}
+      	hist HLTJet_phi_vs_eta@Expert {
+          algorithm = HLTjet_Bins_Diff_FromAvg
+          output = HLT/TRJET/EXPERT/HLT/j110_ion_L1J30
+          description = Red means: A critical number (1) bins is greater than average. Eta vs Phi plot: this distribution should not show hotspots. Check that there is sufficient statistics to claim an hotspot.
+      	}
+       	hist HLTJet_E_vs_eta@Expert {
+          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
+          output = HLT/TRJET/EXPERT/HLT/j110_ion_L1J30
+      	}
+       	hist HLTJet_E_vs_phi@Expert {
+          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
+          output = HLT/TRJET/EXPERT/HLT/j110_ion_L1J30
+      	}
+      	hist HLTJet_phi_vs_eta_LAr@Expert {
+          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
+          output = HLT/TRJET/EXPERT/HLT/j110_ion_L1J30
+      	}	  	
+	hist HLTJet_emfrac@Expert {
+          algorithm = HLTjet_KolmogorovTest_MaxDist
+          output = HLT/TRJET/EXPERT/HLT/j110_ion_L1J30
+      	}
+	hist HLTJet_hecfrac@Expert {
+          algorithm = HLTjet_KolmogorovTest_MaxDist
+          output = HLT/TRJET/EXPERT/HLT/j110_ion_L1J30
+      	}
+	hist HLTSigma_vs_LB@Expert {
+          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
+          output = HLT/TRJET/EXPERT/HLT/j110_ion_L1J30
+      	}
+      } ## End j110_ion_L1J30
+      dir j120_ion_L1J30 {
+        hist HLTJet_n@Expert {
+          display = LogY
+          algorithm = HLTjet_KolmogorovTest_MaxDist
+          output = HLT/TRJET/EXPERT/HLT/j120_ion_L1J30
+          description = Red means: mean of the histogram different from reference. NJet plot: this plot should be close to the reference. Red can be due to: 1) Low statistics wrt reference. 2) Current bunch spacing different from reference. 3) Strange shape. i.e. bumps at high multiplicity.
+      	}
+      	hist HLTJet_Et@Expert {
+          display = LogY
+          algorithm = HLTjet_KolmogorovTest_MaxDist
+          output = HLT/TRJET/EXPERT/HLT/j120_ion_L1J30
+          description = Red means: mean of the histogram different from reference. Et plot: This plot should be close to the reference. Red can be due to: 1) The histogram threshold is not the same as HLT threshold. 2) Slope of the histogram significantly different from reference. 3) Strange shape, i.e. bumps at high Et.
+      	}
+      	hist HLTJet_eta@Expert {
+          algorithm = HLTjet_KolmogorovTest_MaxDist
+          output = HLT/TRJET/EXPERT/HLT/j120_ion_L1J30
+          description = Red means: mean of the histogram different from reference. Eta plot: this plot should be symmetrical. Red can be due to: 1) Distribution not simmetric. 2) Histogram significantly different from reference.
+      	}
+      	hist HLTJet_phi@Expert {
+          algorithm = HLTjet_KolmogorovTest_MaxDist
+          output = HLT/TRJET/EXPERT/HLT/j120_ion_L1J30
+          description = Red means: mean of the histogram different from reference. Phi plot: this plot should be symmetrical and flat. Red can be due to: 1) Distribution not simmetric. 2) Histogram significantly different from reference. 3) Hotspots. i.e bins higher than average.
+      	}
+      	hist HLTJet_phi_vs_eta@Expert {
+          algorithm = HLTjet_Bins_Diff_FromAvg
+          output = HLT/TRJET/EXPERT/HLT/j120_ion_L1J30
+          description = Red means: A critical number (1) bins is greater than average. Eta vs Phi plot: this distribution should not show hotspots. Check that there is sufficient statistics to claim an hotspot.
+      	}
+       	hist HLTJet_E_vs_eta@Expert {
           algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
-          output = HLT/TRJET/EXPERT/HLT/a4tcemsubjesFS
+          output = HLT/TRJET/EXPERT/HLT/j120_ion_L1J30
+      	}
+       	hist HLTJet_E_vs_phi@Expert {
+          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
+          output = HLT/TRJET/EXPERT/HLT/j120_ion_L1J30
+      	}
+      	hist HLTJet_phi_vs_eta_LAr@Expert {
+          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
+          output = HLT/TRJET/EXPERT/HLT/j120_ion_L1J30
+      	}	  	
+	hist HLTJet_emfrac@Expert {
+          algorithm = HLTjet_KolmogorovTest_MaxDist
+          output = HLT/TRJET/EXPERT/HLT/j120_ion_L1J30
+      	}
+	hist HLTJet_hecfrac@Expert {
+          algorithm = HLTjet_KolmogorovTest_MaxDist
+          output = HLT/TRJET/EXPERT/HLT/j120_ion_L1J30
+      	}
+	hist HLTSigma_vs_LB@Expert {
+          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
+          output = HLT/TRJET/EXPERT/HLT/j120_ion_L1J30
+      	}
+      } ## End j120_ion_L1J30
+      dir j50_320eta490_ion {
+        hist HLTJet_n@Expert {
+          display = LogY
+          algorithm = HLTjet_KolmogorovTest_MaxDist
+          output = HLT/TRJET/EXPERT/HLT/j50_320eta490_ion
+          description = Red means: mean of the histogram different from reference. NJet plot: this plot should be close to the reference. Red can be due to: 1) Low statistics wrt reference. 2) Current bunch spacing different from reference. 3) Strange shape. i.e. bumps at high multiplicity.
+      	}
+      	hist HLTJet_Et@Expert {
+          display = LogY
+          algorithm = HLTjet_KolmogorovTest_MaxDist
+          output = HLT/TRJET/EXPERT/HLT/j50_320eta490_ion
+          description = Red means: mean of the histogram different from reference. Et plot: This plot should be close to the reference. Red can be due to: 1) The histogram threshold is not the same as HLT threshold. 2) Slope of the histogram significantly different from reference. 3) Strange shape, i.e. bumps at high Et.
+      	}
+      	hist HLTJet_eta@Expert {
+          algorithm = HLTjet_KolmogorovTest_MaxDist
+          output = HLT/TRJET/EXPERT/HLT/j50_320eta490_ion
+          description = Red means: mean of the histogram different from reference. Eta plot: this plot should be symmetrical. Red can be due to: 1) Distribution not simmetric. 2) Histogram significantly different from reference.
+      	}
+      	hist HLTJet_phi@Expert {
+          algorithm = HLTjet_KolmogorovTest_MaxDist
+          output = HLT/TRJET/EXPERT/HLT/j50_320eta490_ion
+          description = Red means: mean of the histogram different from reference. Phi plot: this plot should be symmetrical and flat. Red can be due to: 1) Distribution not simmetric. 2) Histogram significantly different from reference. 3) Hotspots. i.e bins higher than average.
+      	}
+      	hist HLTJet_phi_vs_eta@Expert {
+          algorithm = HLTjet_Bins_Diff_FromAvg
+          output = HLT/TRJET/EXPERT/HLT/j50_320eta490_ion
+          description = Red means: A critical number (1) bins is greater than average. Eta vs Phi plot: this distribution should not show hotspots. Check that there is sufficient statistics to claim an hotspot.
+      	}
+       	hist HLTJet_E_vs_eta@Expert {
+          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
+          output = HLT/TRJET/EXPERT/HLT/j50_320eta490_ion
+      	}
+       	hist HLTJet_E_vs_phi@Expert {
+          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
+          output = HLT/TRJET/EXPERT/HLT/j50_320eta490_ion
+      	}
+      	hist HLTJet_phi_vs_eta_LAr@Expert {
+          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
+          output = HLT/TRJET/EXPERT/HLT/j50_320eta490_ion
+      	}	  	
+	hist HLTJet_emfrac@Expert {
+          algorithm = HLTjet_KolmogorovTest_MaxDist
+          output = HLT/TRJET/EXPERT/HLT/j50_320eta490_ion
+      	}
+	hist HLTJet_hecfrac@Expert {
+          algorithm = HLTjet_KolmogorovTest_MaxDist
+          output = HLT/TRJET/EXPERT/HLT/j50_320eta490_ion
+      	}
+	hist HLTSigma_vs_LB@Expert {
+          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
+          output = HLT/TRJET/EXPERT/HLT/j50_320eta490_ion
+      	}
+      } ## End j50_320eta490_ion
+      dir j60_320eta490_ion {
+        hist HLTJet_n@Expert {
+          display = LogY
+          algorithm = HLTjet_KolmogorovTest_MaxDist
+          output = HLT/TRJET/EXPERT/HLT/j60_320eta490_ion
+          description = Red means: mean of the histogram different from reference. NJet plot: this plot should be close to the reference. Red can be due to: 1) Low statistics wrt reference. 2) Current bunch spacing different from reference. 3) Strange shape. i.e. bumps at high multiplicity.
+      	}
+      	hist HLTJet_Et@Expert {
+          display = LogY
+          algorithm = HLTjet_KolmogorovTest_MaxDist
+          output = HLT/TRJET/EXPERT/HLT/j60_320eta490_ion
+          description = Red means: mean of the histogram different from reference. Et plot: This plot should be close to the reference. Red can be due to: 1) The histogram threshold is not the same as HLT threshold. 2) Slope of the histogram significantly different from reference. 3) Strange shape, i.e. bumps at high Et.
+      	}
+      	hist HLTJet_eta@Expert {
+          algorithm = HLTjet_KolmogorovTest_MaxDist
+          output = HLT/TRJET/EXPERT/HLT/j60_320eta490_ion
+          description = Red means: mean of the histogram different from reference. Eta plot: this plot should be symmetrical. Red can be due to: 1) Distribution not simmetric. 2) Histogram significantly different from reference.
+      	}
+      	hist HLTJet_phi@Expert {
+          algorithm = HLTjet_KolmogorovTest_MaxDist
+          output = HLT/TRJET/EXPERT/HLT/j60_320eta490_ion
+          description = Red means: mean of the histogram different from reference. Phi plot: this plot should be symmetrical and flat. Red can be due to: 1) Distribution not simmetric. 2) Histogram significantly different from reference. 3) Hotspots. i.e bins higher than average.
+      	}
+      	hist HLTJet_phi_vs_eta@Expert {
+          algorithm = HLTjet_Bins_Diff_FromAvg
+          output = HLT/TRJET/EXPERT/HLT/j60_320eta490_ion
+          description = Red means: A critical number (1) bins is greater than average. Eta vs Phi plot: this distribution should not show hotspots. Check that there is sufficient statistics to claim an hotspot.
+      	}
+       	hist HLTJet_E_vs_eta@Expert {
+          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
+          output = HLT/TRJET/EXPERT/HLT/j60_320eta490_ion
+      	}
+       	hist HLTJet_E_vs_phi@Expert {
+          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
+          output = HLT/TRJET/EXPERT/HLT/j60_320eta490_ion
+      	}
+      	hist HLTJet_phi_vs_eta_LAr@Expert {
+          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
+          output = HLT/TRJET/EXPERT/HLT/j60_320eta490_ion
+      	}	  	
+	hist HLTJet_emfrac@Expert {
+          algorithm = HLTjet_KolmogorovTest_MaxDist
+          output = HLT/TRJET/EXPERT/HLT/j60_320eta490_ion
+      	}
+	hist HLTJet_hecfrac@Expert {
+          algorithm = HLTjet_KolmogorovTest_MaxDist
+          output = HLT/TRJET/EXPERT/HLT/j60_320eta490_ion
+      	}
+	hist HLTSigma_vs_LB@Expert {
+          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
+          output = HLT/TRJET/EXPERT/HLT/j60_320eta490_ion
+      	}
+      } ## End j60_320eta490_ion
+      dir j70_320eta490_ion {
+        hist HLTJet_n@Expert {
+          display = LogY
+          algorithm = HLTjet_KolmogorovTest_MaxDist
+          output = HLT/TRJET/EXPERT/HLT/j70_320eta490_ion
+          description = Red means: mean of the histogram different from reference. NJet plot: this plot should be close to the reference. Red can be due to: 1) Low statistics wrt reference. 2) Current bunch spacing different from reference. 3) Strange shape. i.e. bumps at high multiplicity.
+      	}
+      	hist HLTJet_Et@Expert {
+          display = LogY
+          algorithm = HLTjet_KolmogorovTest_MaxDist
+          output = HLT/TRJET/EXPERT/HLT/j70_320eta490_ion
+          description = Red means: mean of the histogram different from reference. Et plot: This plot should be close to the reference. Red can be due to: 1) The histogram threshold is not the same as HLT threshold. 2) Slope of the histogram significantly different from reference. 3) Strange shape, i.e. bumps at high Et.
+      	}
+      	hist HLTJet_eta@Expert {
+          algorithm = HLTjet_KolmogorovTest_MaxDist
+          output = HLT/TRJET/EXPERT/HLT/j70_320eta490_ion
+          description = Red means: mean of the histogram different from reference. Eta plot: this plot should be symmetrical. Red can be due to: 1) Distribution not simmetric. 2) Histogram significantly different from reference.
+      	}
+      	hist HLTJet_phi@Expert {
+          algorithm = HLTjet_KolmogorovTest_MaxDist
+          output = HLT/TRJET/EXPERT/HLT/j70_320eta490_ion
+          description = Red means: mean of the histogram different from reference. Phi plot: this plot should be symmetrical and flat. Red can be due to: 1) Distribution not simmetric. 2) Histogram significantly different from reference. 3) Hotspots. i.e bins higher than average.
+      	}
+      	hist HLTJet_phi_vs_eta@Expert {
+          algorithm = HLTjet_Bins_Diff_FromAvg
+          output = HLT/TRJET/EXPERT/HLT/j70_320eta490_ion
+          description = Red means: A critical number (1) bins is greater than average. Eta vs Phi plot: this distribution should not show hotspots. Check that there is sufficient statistics to claim an hotspot.
+      	}
+       	hist HLTJet_E_vs_eta@Expert {
+          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
+          output = HLT/TRJET/EXPERT/HLT/j70_320eta490_ion
+      	}
+       	hist HLTJet_E_vs_phi@Expert {
+          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
+          output = HLT/TRJET/EXPERT/HLT/j70_320eta490_ion
+      	}
+      	hist HLTJet_phi_vs_eta_LAr@Expert {
+          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
+          output = HLT/TRJET/EXPERT/HLT/j70_320eta490_ion
+      	}	  	
+	hist HLTJet_emfrac@Expert {
+          algorithm = HLTjet_KolmogorovTest_MaxDist
+          output = HLT/TRJET/EXPERT/HLT/j70_320eta490_ion
+      	}
+	hist HLTJet_hecfrac@Expert {
+          algorithm = HLTjet_KolmogorovTest_MaxDist
+          output = HLT/TRJET/EXPERT/HLT/j70_320eta490_ion
+      	}
+	hist HLTSigma_vs_LB@Expert {
+          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
+          output = HLT/TRJET/EXPERT/HLT/j70_320eta490_ion
+      	}
+      } ## End j70_320eta490_ion
+      dir mu4_j30_a2_ion_dr05 {
+        hist HLTJet_n@Expert {
+          display = LogY
+          algorithm = HLTjet_KolmogorovTest_MaxDist
+          output = HLT/TRJET/EXPERT/HLT/mu4_j30_a2_ion_dr05
+          description = Red means: mean of the histogram different from reference. NJet plot: this plot should be close to the reference. Red can be due to: 1) Low statistics wrt reference. 2) Current bunch spacing different from reference. 3) Strange shape. i.e. bumps at high multiplicity.
+      	}
+      	hist HLTJet_Et@Expert {
+          display = LogY
+          algorithm = HLTjet_KolmogorovTest_MaxDist
+          output = HLT/TRJET/EXPERT/HLT/mu4_j30_a2_ion_dr05
+          description = Red means: mean of the histogram different from reference. Et plot: This plot should be close to the reference. Red can be due to: 1) The histogram threshold is not the same as HLT threshold. 2) Slope of the histogram significantly different from reference. 3) Strange shape, i.e. bumps at high Et.
+      	}
+      	hist HLTJet_eta@Expert {
+          algorithm = HLTjet_KolmogorovTest_MaxDist
+          output = HLT/TRJET/EXPERT/HLT/mu4_j30_a2_ion_dr05
+          description = Red means: mean of the histogram different from reference. Eta plot: this plot should be symmetrical. Red can be due to: 1) Distribution not simmetric. 2) Histogram significantly different from reference.
+      	}
+      	hist HLTJet_phi@Expert {
+          algorithm = HLTjet_KolmogorovTest_MaxDist
+          output = HLT/TRJET/EXPERT/HLT/mu4_j30_a2_ion_dr05
+          description = Red means: mean of the histogram different from reference. Phi plot: this plot should be symmetrical and flat. Red can be due to: 1) Distribution not simmetric. 2) Histogram significantly different from reference. 3) Hotspots. i.e bins higher than average.
+      	}
+      	hist HLTJet_phi_vs_eta@Expert {
+          algorithm = HLTjet_Bins_Diff_FromAvg
+          output = HLT/TRJET/EXPERT/HLT/mu4_j30_a2_ion_dr05
+          description = Red means: A critical number (1) bins is greater than average. Eta vs Phi plot: this distribution should not show hotspots. Check that there is sufficient statistics to claim an hotspot.
+      	}
+       	hist HLTJet_E_vs_eta@Expert {
+          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
+          output = HLT/TRJET/EXPERT/HLT/mu4_j30_a2_ion_dr05
+      	}
+       	hist HLTJet_E_vs_phi@Expert {
+          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
+          output = HLT/TRJET/EXPERT/HLT/mu4_j30_a2_ion_dr05
+      	}
+      	hist HLTJet_phi_vs_eta_LAr@Expert {
+          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
+          output = HLT/TRJET/EXPERT/HLT/mu4_j30_a2_ion_dr05
+      	}	  	
+	hist HLTJet_emfrac@Expert {
+          algorithm = HLTjet_KolmogorovTest_MaxDist
+          output = HLT/TRJET/EXPERT/HLT/mu4_j30_a2_ion_dr05
+      	}
+	hist HLTJet_hecfrac@Expert {
+          algorithm = HLTjet_KolmogorovTest_MaxDist
+          output = HLT/TRJET/EXPERT/HLT/mu4_j30_a2_ion_dr05
+      	}
+	hist HLTSigma_vs_LB@Expert {
+          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
+          output = HLT/TRJET/EXPERT/HLT/mu4_j30_a2_ion_dr05
+      	}
+      } ## End mu4_j30_a2_ion_dr05
+      dir mu4_j40_a2_ion_dr05 {
+        hist HLTJet_n@Expert {
+          display = LogY
+          algorithm = HLTjet_KolmogorovTest_MaxDist
+          output = HLT/TRJET/EXPERT/HLT/mu4_j40_a2_ion_dr05
+          description = Red means: mean of the histogram different from reference. NJet plot: this plot should be close to the reference. Red can be due to: 1) Low statistics wrt reference. 2) Current bunch spacing different from reference. 3) Strange shape. i.e. bumps at high multiplicity.
+      	}
+      	hist HLTJet_Et@Expert {
+          display = LogY
+          algorithm = HLTjet_KolmogorovTest_MaxDist
+          output = HLT/TRJET/EXPERT/HLT/mu4_j40_a2_ion_dr05
+          description = Red means: mean of the histogram different from reference. Et plot: This plot should be close to the reference. Red can be due to: 1) The histogram threshold is not the same as HLT threshold. 2) Slope of the histogram significantly different from reference. 3) Strange shape, i.e. bumps at high Et.
+      	}
+      	hist HLTJet_eta@Expert {
+          algorithm = HLTjet_KolmogorovTest_MaxDist
+          output = HLT/TRJET/EXPERT/HLT/mu4_j40_a2_ion_dr05
+          description = Red means: mean of the histogram different from reference. Eta plot: this plot should be symmetrical. Red can be due to: 1) Distribution not simmetric. 2) Histogram significantly different from reference.
+      	}
+      	hist HLTJet_phi@Expert {
+          algorithm = HLTjet_KolmogorovTest_MaxDist
+          output = HLT/TRJET/EXPERT/HLT/mu4_j40_a2_ion_dr05
+          description = Red means: mean of the histogram different from reference. Phi plot: this plot should be symmetrical and flat. Red can be due to: 1) Distribution not simmetric. 2) Histogram significantly different from reference. 3) Hotspots. i.e bins higher than average.
+      	}
+      	hist HLTJet_phi_vs_eta@Expert {
+          algorithm = HLTjet_Bins_Diff_FromAvg
+          output = HLT/TRJET/EXPERT/HLT/mu4_j40_a2_ion_dr05
+          description = Red means: A critical number (1) bins is greater than average. Eta vs Phi plot: this distribution should not show hotspots. Check that there is sufficient statistics to claim an hotspot.
+      	}
+       	hist HLTJet_E_vs_eta@Expert {
+          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
+          output = HLT/TRJET/EXPERT/HLT/mu4_j40_a2_ion_dr05
+      	}
+       	hist HLTJet_E_vs_phi@Expert {
+          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
+          output = HLT/TRJET/EXPERT/HLT/mu4_j40_a2_ion_dr05
+      	}
+      	hist HLTJet_phi_vs_eta_LAr@Expert {
+          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
+          output = HLT/TRJET/EXPERT/HLT/mu4_j40_a2_ion_dr05
+      	}	  	
+	hist HLTJet_emfrac@Expert {
+          algorithm = HLTjet_KolmogorovTest_MaxDist
+          output = HLT/TRJET/EXPERT/HLT/mu4_j40_a2_ion_dr05
+      	}
+	hist HLTJet_hecfrac@Expert {
+          algorithm = HLTjet_KolmogorovTest_MaxDist
+          output = HLT/TRJET/EXPERT/HLT/mu4_j40_a2_ion_dr05
+      	}
+	hist HLTSigma_vs_LB@Expert {
+          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
+          output = HLT/TRJET/EXPERT/HLT/mu4_j40_a2_ion_dr05
+      	}
+      } ## End mu4_j40_a2_ion_dr05
+      dir mu4_j30_a2_ion {
+        hist HLTJet_n@Expert {
+          display = LogY
+          algorithm = HLTjet_KolmogorovTest_MaxDist
+          output = HLT/TRJET/EXPERT/HLT/mu4_j30_a2_ion
+          description = Red means: mean of the histogram different from reference. NJet plot: this plot should be close to the reference. Red can be due to: 1) Low statistics wrt reference. 2) Current bunch spacing different from reference. 3) Strange shape. i.e. bumps at high multiplicity.
+      	}
+      	hist HLTJet_Et@Expert {
+          display = LogY
+          algorithm = HLTjet_KolmogorovTest_MaxDist
+          output = HLT/TRJET/EXPERT/HLT/mu4_j30_a2_ion
+          description = Red means: mean of the histogram different from reference. Et plot: This plot should be close to the reference. Red can be due to: 1) The histogram threshold is not the same as HLT threshold. 2) Slope of the histogram significantly different from reference. 3) Strange shape, i.e. bumps at high Et.
+      	}
+      	hist HLTJet_eta@Expert {
+          algorithm = HLTjet_KolmogorovTest_MaxDist
+          output = HLT/TRJET/EXPERT/HLT/mu4_j30_a2_ion
+          description = Red means: mean of the histogram different from reference. Eta plot: this plot should be symmetrical. Red can be due to: 1) Distribution not simmetric. 2) Histogram significantly different from reference.
+      	}
+      	hist HLTJet_phi@Expert {
+          algorithm = HLTjet_KolmogorovTest_MaxDist
+          output = HLT/TRJET/EXPERT/HLT/mu4_j30_a2_ion
+          description = Red means: mean of the histogram different from reference. Phi plot: this plot should be symmetrical and flat. Red can be due to: 1) Distribution not simmetric. 2) Histogram significantly different from reference. 3) Hotspots. i.e bins higher than average.
+      	}
+      	hist HLTJet_phi_vs_eta@Expert {
+          algorithm = HLTjet_Bins_Diff_FromAvg
+          output = HLT/TRJET/EXPERT/HLT/mu4_j30_a2_ion
+          description = Red means: A critical number (1) bins is greater than average. Eta vs Phi plot: this distribution should not show hotspots. Check that there is sufficient statistics to claim an hotspot.
+      	}
+       	hist HLTJet_E_vs_eta@Expert {
+          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
+          output = HLT/TRJET/EXPERT/HLT/mu4_j30_a2_ion
+      	}
+       	hist HLTJet_E_vs_phi@Expert {
+          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
+          output = HLT/TRJET/EXPERT/HLT/mu4_j30_a2_ion
+      	}
+      	hist HLTJet_phi_vs_eta_LAr@Expert {
+          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
+          output = HLT/TRJET/EXPERT/HLT/mu4_j30_a2_ion
+      	}	  	
+	hist HLTJet_emfrac@Expert {
+          algorithm = HLTjet_KolmogorovTest_MaxDist
+          output = HLT/TRJET/EXPERT/HLT/mu4_j30_a2_ion
+      	}
+	hist HLTJet_hecfrac@Expert {
+          algorithm = HLTjet_KolmogorovTest_MaxDist
+          output = HLT/TRJET/EXPERT/HLT/mu4_j30_a2_ion
+      	}
+	hist HLTSigma_vs_LB@Expert {
+          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
+          output = HLT/TRJET/EXPERT/HLT/mu4_j30_a2_ion
+      	}
+      } ## End mu4_j30_a2_ion
+      dir mu4_j40_a2_ion {
+        hist HLTJet_n@Expert {
+          display = LogY
+          algorithm = HLTjet_KolmogorovTest_MaxDist
+          output = HLT/TRJET/EXPERT/HLT/mu4_j40_a2_ion
+          description = Red means: mean of the histogram different from reference. NJet plot: this plot should be close to the reference. Red can be due to: 1) Low statistics wrt reference. 2) Current bunch spacing different from reference. 3) Strange shape. i.e. bumps at high multiplicity.
+      	}
+      	hist HLTJet_Et@Expert {
+          display = LogY
+          algorithm = HLTjet_KolmogorovTest_MaxDist
+          output = HLT/TRJET/EXPERT/HLT/mu4_j40_a2_ion
+          description = Red means: mean of the histogram different from reference. Et plot: This plot should be close to the reference. Red can be due to: 1) The histogram threshold is not the same as HLT threshold. 2) Slope of the histogram significantly different from reference. 3) Strange shape, i.e. bumps at high Et.
+      	}
+      	hist HLTJet_eta@Expert {
+          algorithm = HLTjet_KolmogorovTest_MaxDist
+          output = HLT/TRJET/EXPERT/HLT/mu4_j40_a2_ion
+          description = Red means: mean of the histogram different from reference. Eta plot: this plot should be symmetrical. Red can be due to: 1) Distribution not simmetric. 2) Histogram significantly different from reference.
+      	}
+      	hist HLTJet_phi@Expert {
+          algorithm = HLTjet_KolmogorovTest_MaxDist
+          output = HLT/TRJET/EXPERT/HLT/mu4_j40_a2_ion
+          description = Red means: mean of the histogram different from reference. Phi plot: this plot should be symmetrical and flat. Red can be due to: 1) Distribution not simmetric. 2) Histogram significantly different from reference. 3) Hotspots. i.e bins higher than average.
+      	}
+      	hist HLTJet_phi_vs_eta@Expert {
+          algorithm = HLTjet_Bins_Diff_FromAvg
+          output = HLT/TRJET/EXPERT/HLT/mu4_j40_a2_ion
+          description = Red means: A critical number (1) bins is greater than average. Eta vs Phi plot: this distribution should not show hotspots. Check that there is sufficient statistics to claim an hotspot.
       	}
-      } ## End a10tcemsubFS
-    } ## End HLT
-  } ##End JetMon
-} ##End HLT
-
-dir HLT {
-  dir JetMon {
-    dir HLT {
-      dir j30_ion_L1TE20 {
-      	hist .* {
-          regex = 1	
+       	hist HLTJet_E_vs_eta@Expert {
           algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
-          output = HLT/TRJET/EXPERT/HLT/j30_ion_L1TE20
+          output = HLT/TRJET/EXPERT/HLT/mu4_j40_a2_ion
       	}
-      } ## End j30_ion_L1TE20
-    } ## End HLT
-  } ##End JetMon
-} ##End HLT
-
-dir HLT {
-  dir JetMon {
-    dir HLT {
-      dir j30_L1TE20 {
-      	hist .* {
-          regex = 1	
+       	hist HLTJet_E_vs_phi@Expert {
           algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
-          output = HLT/TRJET/EXPERT/HLT/j30_L1TE20
+          output = HLT/TRJET/EXPERT/HLT/mu4_j40_a2_ion
       	}
-      } ## End j30_L1TE20
-    } ## End HLT
-  } ##End JetMon
-} ##End HLT
-
-
-dir HLT {
-  dir JetMon {
-    dir HLT {
-      dir j100_ion_L1J20 {
-      	hist .* {
-          regex = 1	
+      	hist HLTJet_phi_vs_eta_LAr@Expert {
           algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
-          output = HLT/TRJET/EXPERT/HLT/j100_ion_L1J20
+          output = HLT/TRJET/EXPERT/HLT/mu4_j40_a2_ion
+      	}	  	
+	hist HLTJet_emfrac@Expert {
+          algorithm = HLTjet_KolmogorovTest_MaxDist
+          output = HLT/TRJET/EXPERT/HLT/mu4_j40_a2_ion
       	}
-      } ## End j100_ion_L1J20
-    } ## End HLT
-  } ##End JetMon
-} ##End HLT
-
-dir HLT {
-  dir JetMon {
-    dir HLT {
-      dir j150_ion_L1J30 {
-      	hist .* {
-          regex = 1	
-          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
-          output = HLT/TRJET/EXPERT/HLT/j150_ion_L1J30
+	hist HLTJet_hecfrac@Expert {
+          algorithm = HLTjet_KolmogorovTest_MaxDist
+          output = HLT/TRJET/EXPERT/HLT/mu4_j40_a2_ion
       	}
-      } ## End j150_ion_L1J30
-    } ## End HLT
-  } ##End JetMon
-} ##End HLT
-
-
-dir HLT {
-  dir JetMon {
-    dir HLT {
-      dir j100_L1J20 {
-      	hist .* {
-          regex = 1	
+	hist HLTSigma_vs_LB@Expert {
           algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
-          output = HLT/TRJET/EXPERT/HLT/j100_L1J20
+          output = HLT/TRJET/EXPERT/HLT/mu4_j40_a2_ion
       	}
-      } ## End j75_L1J20
+      } ## End mu4_j40_a2_ion
     } ## End HLT
   } ##End JetMon
 } ##End HLT
@@ -251,90 +981,65 @@ dir HLT {
 dir HLT {
   dir JetMon {
     dir HLT {
-      dir j150_L1J30 {
-      	hist .* {
-          regex = 1	
-          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
-          output = HLT/TRJET/EXPERT/HLT/j150_L1J30
+      dir a4ionemsubjesISFS {
+        hist HLTJet_n@Expert {
+          display = LogY
+          algorithm = HLTjet_KolmogorovTest_MaxDist
+          output = HLT/TRJET/EXPERT/Collections/AntiKt4HIJets
+          description = Red means: mean of the histogram different from reference. NJet plot: this plot should be close to the reference. Red can be due to: 1) Low statistics wrt reference. 2) Current bunch spacing different from reference. 3) Strange shape. i.e. bumps at high multiplicity.
       	}
-      } ## End j75_L1J20
-    } ## End HLT
-  } ##End JetMon
-} ##End HLT
-
-dir HLT {
-  dir JetMon {
-    dir HLT {
-      dir j45_320eta490_ion {
-      	hist .* {
-          regex = 1	
-          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
-          output = HLT/TRJET/EXPERT/HLT/j45_320eta490_ion
+      	hist HLTJet_Et@Expert {
+          display = LogY
+          algorithm = HLTjet_KolmogorovTest_MaxDist
+          output = HLT/TRJET/EXPERT/Collections/AntiKt4HIJets
+          description = Red means: mean of the histogram different from reference. Et plot: This plot should be close to the reference. Red can be due to: 1) The histogram threshold is not the same as HLT threshold. 2) Slope of the histogram significantly different from reference. 3) Strange shape, i.e. bumps at high Et.
       	}
-      } ## End j75_L1J20
-    } ## End HLT
-  } ##End JetMon
-} ##End HLT
-
-dir HLT {
-  dir JetMon {
-    dir HLT {
-      dir j45_320eta490 {
-      	hist .* {
-          regex = 1	
+      	hist HLTJet_eta@Expert {
+          algorithm = HLTjet_KolmogorovTest_MaxDist
+          output = HLT/TRJET/EXPERT/Collections/AntiKt4HIJets
+          description = Red means: mean of the histogram different from reference. Eta plot: this plot should be symmetrical. Red can be due to: 1) Distribution not simmetric. 2) Histogram significantly different from reference.
+      	}
+      	hist HLTJet_phi@Expert {
+          algorithm = HLTjet_KolmogorovTest_MaxDist
+          output = HLT/TRJET/EXPERT/Collections/AntiKt4HIJets
+          description = Red means: mean of the histogram different from reference. Phi plot: this plot should be symmetrical and flat. Red can be due to: 1) Distribution not simmetric. 2) Histogram significantly different from reference. 3) Hotspots. i.e bins higher than average.
+      	}
+      	hist HLTJet_phi_vs_eta@Expert {
+          algorithm = HLTjet_Bins_Diff_FromAvg
+          output = HLT/TRJET/EXPERT/Collections/AntiKt4HIJets
+          description = Red means: A critical number (1) bins is greater than average. Eta vs Phi plot: this distribution should not show hotspots. Check that there is sufficient statistics to claim an hotspot.
+      	}
+       	hist HLTJet_E_vs_eta@Expert {
           algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
-          output = HLT/TRJET/EXPERT/HLT/j45_320eta490
+          output = HLT/TRJET/EXPERT/Collections/AntiKt4HIJets
       	}
-      } ## End j75_L1J20
-    } ## End HLT
-  } ##End JetMon
-} ##End HLT
-
-dir HLT {
-  dir JetMon {
-    dir HLT {
-      dir j50_ion_2j30_ion_0eta490_L1J10 {
-      	hist .* {
-          regex = 1	
+       	hist HLTJet_E_vs_phi@Expert {
           algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
-          output = HLT/TRJET/EXPERT/HLT/j50_ion_2j30_ion_0eta490_L1J10
+          output = HLT/TRJET/EXPERT/Collections/AntiKt4HIJets
       	}
-      } ## End j75_L1J20
-    } ## End HLT
-  } ##End JetMon
-} ##End HLT
-
-dir HLT {
-  dir JetMon {
-    dir HLT {
-      dir j50_2j30_0eta490_L1J10 {
-      	hist .* {
-          regex = 1	
+      	hist HLTJet_phi_vs_eta_LAr@Expert {
           algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
-          output = HLT/TRJET/EXPERT/HLT/j50_2j30_0eta490_L1J10
+          output = HLT/TRJET/EXPERT/Collections/AntiKt4HIJets
+      	}	  	
+	hist HLTJet_emfrac@Expert {
+          algorithm = HLTjet_KolmogorovTest_MaxDist
+          output = HLT/TRJET/EXPERT/Collections/AntiKt4HIJets
       	}
-      } ## End j75_L1J20
-    } ## End HLT
-  } ##End JetMon
-} ##End HLT
-
-############################### OF ################################
-
-dir HLT {
-  dir JetMon {
-    dir OF {
-      dir AntiKt4HIJets {
-      	hist OFJet.* {
-          regex = 1
+	hist HLTJet_hecfrac@Expert {
+          algorithm = HLTjet_KolmogorovTest_MaxDist
+          output = HLT/TRJET/EXPERT/Collections/AntiKt4HIJets
+      	}
+	hist HLTSigma_vs_LB@Expert {
           algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
-          output = HLT/TRJET/EXPERT/OF/AntiKt4HIJets
+          output = HLT/TRJET/EXPERT/Collections/AntiKt4HIJets
       	}
-      } ## End AntiKt4HIJets
-    } ## End OF
+      } ## End L1_J20
+    } ## End L1
   } ##End JetMon
 } ##End HLT
 
 
+
 ########################################################################
 
 
@@ -346,45 +1051,114 @@ dir HLT {
 dir HLT {
   dir JetMon {
     dir L1 {
-      hist L1Jet_n@Shifter {
-        display = LogY
-        algorithm = HLTjet_KolmogorovTest_MaxDist
-        output =  HLT/TRJET/SHIFTER/L1 
-        description = Red means: mean of the histogram different from reference. NJet plot: this plot should be close to the reference. Red can be due to: 1) Low statistics wrt reference. 2) Current bunch spacing different from reference. 3) Strange shape. i.e. bumps at high multiplicity.
-      }
-      hist L1Jet_Et@Shifter {
-        display = LogY
-        algorithm = HLTjet_KolmogorovTest_MaxDist
-        output = HLT/TRJET/SHIFTER/L1
-        description = Red means: mean of the histogram different from reference. Et plot: This plot should be close to the reference. Red can be due to: 1) The histogram threshold is not the same as HLT threshold. 2) Slope of the histogram significantly different from reference. 3) Strange shape, i.e. bumps at high Et.
-      }
-      hist L1Jet_eta@Shifter {
-        algorithm = HLTjet_KolmogorovTest_MaxDist
-        output = HLT/TRJET/SHIFTER/L1
-        description = Red means: mean of the histogram different from reference. Eta plot: this plot should be symmetrical. Red can be due to: 1) Distribution not simmetric. 2) Histogram significantly different from reference.
-      }
-      hist L1Jet_phi@Shifter {
-        algorithm = HLTjet_KolmogorovTest_MaxDist
-        output = HLT/TRJET/SHIFTER/L1
-        description = Red means: mean of the histogram different from reference. Phi plot: this plot should be symmetrical and flat. Red can be due to: 1) Distribution not simmetric. 2) Histogram significantly different from reference. 3) Hotspots. i.e bins higher than average.
-      }
-      hist L1Jet_phi_vs_eta@Shifter {
-        algorithm = HLTjet_Bins_Diff_FromAvg
-        output = HLT/TRJET/SHIFTER/L1
-        description = Red means: A critical number (1) bins is greater than average. Eta vs Phi plot: this distribution should not show hotspots. Check that there is sufficient statistics to claim an hotspot.
-      }
-      hist L1Jet_E_vs_eta@Shifter {
-        algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
-        output = HLT/TRJET/SHIFTER/L1
-      }
-      hist L1Jet_E_vs_phi@Shifter {
-        algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
-        output = HLT/TRJET/SHIFTER/L1
-      }
-      hist L1Sigma_vs_LB@Shifter {
-        algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
-        output = HLT/TRJET/SHIFTER/L1
-      }
+      dir L1_J20 {
+        hist L1Jet_n@Shifter {
+          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
+          output =  HLT/TRJET/SHIFTER/L1/L1_J20
+        }
+        hist L1Jet_Et@Shifter {
+          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
+          output = HLT/TRJET/SHIFTER/L1/L1_J20
+          description = The distribution should not be broad. Check with reference when available.
+        }
+        hist L1Jet_eta@Shifter {
+          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
+          output = HLT/TRJET/SHIFTER/L1/L1_J20
+        }
+        hist L1Jet_phi@Shifter {
+          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
+          output = HLT/TRJET/SHIFTER/L1/L1_J20
+        }
+        hist L1Jet_phi_vs_eta@Shifter {
+          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
+          output = HLT/TRJET/SHIFTER/L1/L1_J20
+          description = Particular attention should be payed in checking hot regions. The distribution should not have peaks.
+        }
+        hist L1Jet_E_vs_eta@Shifter {
+          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
+          output = HLT/TRJET/SHIFTER/L1/L1_J20
+        }
+        hist L1Jet_E_vs_phi@Shifter {
+          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
+          output = HLT/TRJET/SHIFTER/L1/L1_J20
+        }
+        hist L1Sigma_vs_LB@Shifter {
+          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
+          output = HLT/TRJET/SHIFTER/L1/L1_J20
+        }
+      } ## End L1_J20
+      dir L1_J30 {
+        hist L1Jet_n@Shifter {
+          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
+          output =  HLT/TRJET/SHIFTER/L1/L1_J30
+        }
+        hist L1Jet_Et@Shifter {
+          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
+          output = HLT/TRJET/SHIFTER/L1/L1_J30
+          description = The distribution should not be broad. Check with reference when available.
+        }
+        hist L1Jet_eta@Shifter {
+          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
+          output = HLT/TRJET/SHIFTER/L1/L1_J30
+        }
+        hist L1Jet_phi@Shifter {
+          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
+          output = HLT/TRJET/SHIFTER/L1/L1_J30
+        }
+        hist L1Jet_phi_vs_eta@Shifter {
+          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
+          output = HLT/TRJET/SHIFTER/L1/L1_J30
+          description = Particular attention should be payed in checking hot regions. The distribution should not have peaks.
+        }
+        hist L1Jet_E_vs_eta@Shifter {
+          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
+          output = HLT/TRJET/SHIFTER/L1/L1_J30
+        }
+        hist L1Jet_E_vs_phi@Shifter {
+          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
+          output = HLT/TRJET/SHIFTER/L1/L1_J30
+        }
+        hist L1Sigma_vs_LB@Shifter {
+          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
+          output = HLT/TRJET/SHIFTER/L1/L1_J30
+        }
+      } ## End L1_J30
+      dir L1_TE50 {
+        hist L1Jet_n@Shifter {
+          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
+          output =  HLT/TRJET/SHIFTER/L1/L1_TE50
+        }
+        hist L1Jet_Et@Shifter {
+          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
+          output = HLT/TRJET/SHIFTER/L1/L1_TE50
+          description = The distribution should not be broad. Check with reference when available.
+        }
+        hist L1Jet_eta@Shifter {
+          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
+          output = HLT/TRJET/SHIFTER/L1/L1_TE50
+        }
+        hist L1Jet_phi@Shifter {
+          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
+          output = HLT/TRJET/SHIFTER/L1/L1_TE50
+        }
+        hist L1Jet_phi_vs_eta@Shifter {
+          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
+          output = HLT/TRJET/SHIFTER/L1/L1_TE50
+          description = Particular attention should be payed in checking hot regions. The distribution should not have peaks.
+        }
+        hist L1Jet_E_vs_eta@Shifter {
+          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
+          output = HLT/TRJET/SHIFTER/L1/L1_TE50
+        }
+        hist L1Jet_E_vs_phi@Shifter {
+          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
+          output = HLT/TRJET/SHIFTER/L1/L1_TE50
+        }
+        hist L1Sigma_vs_LB@Shifter {
+          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
+          output = HLT/TRJET/SHIFTER/L1/L1_TE50
+        }
+      } ## End L1_TE50
     } ## End L1
   } ##End JetMon
 } ##End HLT
@@ -460,185 +1234,67 @@ dir HLT {
 dir HLT {
   dir JetMon {
     dir HLT {
-      dir j75_L1J20 {
-      	hist HLTJet_Et@Shifter {
-          display = LogY
-          algorithm = HLTjet_KolmogorovTest_MaxDist
-          output = HLT/TRJET/SHIFTER/HLT/j75_L1J20
-          description = Red means: mean of the histogram different from reference. Et plot: This plot should be close to the reference. Red can be due to: 1) The histogram threshold is not the same as HLT threshold. 2) Slope of the histogram significantly different from reference. 3) Strange shape, i.e. bumps at high Et.
-      	}
-      	hist HLTJet_Leading_Et@Shifter { 
+      dir j85_ion_TE50 {
+        hist HLTJet_n@Shifter {
           display = LogY
           algorithm = HLTjet_KolmogorovTest_MaxDist
-          output = HLT/TRJET/SHIFTER/HLT/j75_L1J20
-          description = Red means: mean of the histogram different from reference. Et plot: This plot should be close to the reference. Red can be due to: 1) The histogram threshold is not the same as HLT threshold. 2) Slope of the histogram significantly different from reference. 3) Strange shape, i.e. bumps at high Et.
-      	}
-      	hist HLTJet_eta@Shifter {
-          algorithm = HLTjet_KolmogorovTest_MaxDist
-          output = HLT/TRJET/SHIFTER/HLT/j75_L1J20
-          description = Red means: mean of the histogram different from reference. Eta plot: this plot should be symmetrical. Red can be due to: 1) Distribution not simmetric. 2) Histogram significantly different from reference.
-      	}
-      	hist HLTJet_phi@Shifter {
-          algorithm = HLTjet_KolmogorovTest_MaxDist
-          output = HLT/TRJET/SHIFTER/HLT/j75_L1J20
-          description = Red means: mean of the histogram different from reference. Phi plot: this plot should be symmetrical and flat. Red can be due to: 1) Distribution not simmetric. 2) Histogram significantly different from reference. 3) Hotspots. i.e bins higher than average.
-      	}
-      	hist HLTJet_phi_vs_eta@Shifter {
-          algorithm = HLTjet_Bins_Diff_FromAvg
-          output = HLT/TRJET/SHIFTER/HLT/j75_L1J20
-          description = Red means: A critical number (1) bins is greater than average. Eta vs Phi plot: this distribution should not show hotspots. Check that there is sufficient statistics to claim an hotspot.
-      	}
-	hist HLTJet_emfrac@Shifter {
-          algorithm = HLTjet_KolmogorovTest_MaxDist
-          output = HLT/TRJET/SHIFTER/HLT/j75_L1J20
-      	}
-	hist HLTJet_hecfrac@Shifter {
-          algorithm = HLTjet_KolmogorovTest_MaxDist
-          output = HLT/TRJET/SHIFTER/HLT/j75_L1J20
-      	}
-	hist HLTJet_E_vs_eta@Shifter {
-          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
-          output = HLT/TRJET/SHIFTER/HLT/j75_L1J20
-      	}
-	hist HLTJet_E_vs_phi@Shifter {
-          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
-          output = HLT/TRJET/SHIFTER/HLT/j75_L1J20
-      	}
-	hist HLTSigma_vs_LB@Shifter {
-          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
-          output = HLT/TRJET/SHIFTER/HLT/j75_L1J20
+          output = HLT/TRJET/SHIFTER/HLT/j85_ion_L1TE50
+          description = Red means: mean of the histogram different from reference. NJet plot: this plot should be close to the reference. Red can be due to: 1) Low statistics wrt reference. 2) Current bunch spacing different from reference. 3) Strange shape. i.e. bumps at high multiplicity.
       	}
-      } ## End j75_L1J20
-    } ## End HLT
-  } ##End JetMon
-} ##End HLT
-
-
-dir HLT {
-  dir JetMon {
-    dir HLT {
-      dir j75_ion_L1J20 {
       	hist HLTJet_Et@Shifter {
           display = LogY
           algorithm = HLTjet_KolmogorovTest_MaxDist
-          output = HLT/TRJET/SHIFTER/HLT/j75_ion_L1J20
-          description = Red means: mean of the histogram different from reference. Et plot: This plot should be close to the reference. Red can be due to: 1) The histogram threshold is not the same as HLT threshold. 2) Slope of the histogram significantly different from reference. 3) Strange shape, i.e. bumps at high Et.
-      	}
-      	hist HLTJet_Leading_Et@Shifter { 
-          display = LogY
-          algorithm = HLTjet_KolmogorovTest_MaxDist
-          output = HLT/TRJET/SHIFTER/HLT/j75_ion_L1J20
+          output = HLT/TRJET/SHIFTER/HLT/j85_ion_L1TE50
           description = Red means: mean of the histogram different from reference. Et plot: This plot should be close to the reference. Red can be due to: 1) The histogram threshold is not the same as HLT threshold. 2) Slope of the histogram significantly different from reference. 3) Strange shape, i.e. bumps at high Et.
       	}
       	hist HLTJet_eta@Shifter {
           algorithm = HLTjet_KolmogorovTest_MaxDist
-          output = HLT/TRJET/SHIFTER/HLT/j75_ion_L1J20
+          output = HLT/TRJET/SHIFTER/HLT/j85_ion_L1TE50
           description = Red means: mean of the histogram different from reference. Eta plot: this plot should be symmetrical. Red can be due to: 1) Distribution not simmetric. 2) Histogram significantly different from reference.
       	}
       	hist HLTJet_phi@Shifter {
           algorithm = HLTjet_KolmogorovTest_MaxDist
-          output = HLT/TRJET/SHIFTER/HLT/j75_ion_L1J20
+          output = HLT/TRJET/SHIFTER/HLT/j85_ion_L1TE50
           description = Red means: mean of the histogram different from reference. Phi plot: this plot should be symmetrical and flat. Red can be due to: 1) Distribution not simmetric. 2) Histogram significantly different from reference. 3) Hotspots. i.e bins higher than average.
       	}
       	hist HLTJet_phi_vs_eta@Shifter {
           algorithm = HLTjet_Bins_Diff_FromAvg
-          output = HLT/TRJET/SHIFTER/HLT/j75_ion_L1J20
+          output = HLT/TRJET/SHIFTER/HLT/j85_ion_L1TE50
           description = Red means: A critical number (1) bins is greater than average. Eta vs Phi plot: this distribution should not show hotspots. Check that there is sufficient statistics to claim an hotspot.
       	}
-	hist HLTJet_emfrac@Shifter {
-          algorithm = HLTjet_KolmogorovTest_MaxDist
-          output = HLT/TRJET/SHIFTER/HLT/j75_ion_L1J20
-      	}
-	hist HLTJet_hecfrac@Shifter {
-          algorithm = HLTjet_KolmogorovTest_MaxDist
-          output = HLT/TRJET/SHIFTER/HLT/j75_ion_L1J20
-      	}
-	hist HLTJet_E_vs_eta@Shifter {
+       	hist HLTJet_E_vs_eta@Shifter {
           algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
-          output = HLT/TRJET/SHIFTER/HLT/j75_ion_L1J20
+          output = HLT/TRJET/SHIFTER/HLT/j85_ion_L1TE50
       	}
-	hist HLTJet_E_vs_phi@Shifter {
+       	hist HLTJet_E_vs_phi@Shifter {
           algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
-          output = HLT/TRJET/SHIFTER/HLT/j75_ion_L1J20
+          output = HLT/TRJET/SHIFTER/HLT/j85_ion_L1TE50
       	}
-	hist HLTSigma_vs_LB@Shifter {
+      	hist HLTJet_phi_vs_eta_LAr@Shifter {
           algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
-          output = HLT/TRJET/SHIFTER/HLT/j75_ion_L1J20
-      	}
-      } ## End j75_ion_L1J20
-    } ## End HLT
-  } ##End JetMon
-} ##End HLT
-
-
-dir HLT {
-  dir JetMon {
-    dir HLT {
-      dir j85_L1J20 {
-      	hist HLTJet_Et@Shifter {
-          display = LogY
-          algorithm = HLTjet_KolmogorovTest_MaxDist
-          output = HLT/TRJET/SHIFTER/HLT/j85_L1J20
-          description = Red means: mean of the histogram different from reference. Et plot: This plot should be close to the reference. Red can be due to: 1) The histogram threshold is not the same as HLT threshold. 2) Slope of the histogram significantly different from reference. 3) Strange shape, i.e. bumps at high Et.
-      	}
-      	hist HLTJet_Leading_Et@Shifter { 
-          display = LogY
-          algorithm = HLTjet_KolmogorovTest_MaxDist
-          output = HLT/TRJET/SHIFTER/HLT/j85_L1J20
-          description = Red means: mean of the histogram different from reference. Et plot: This plot should be close to the reference. Red can be due to: 1) The histogram threshold is not the same as HLT threshold. 2) Slope of the histogram significantly different from reference. 3) Strange shape, i.e. bumps at high Et.
-      	}
-      	hist HLTJet_eta@Shifter {
-          algorithm = HLTjet_KolmogorovTest_MaxDist
-          output = HLT/TRJET/SHIFTER/HLT/j85_L1J20
-          description = Red means: mean of the histogram different from reference. Eta plot: this plot should be symmetrical. Red can be due to: 1) Distribution not simmetric. 2) Histogram significantly different from reference.
-      	}
-      	hist HLTJet_phi@Shifter {
-          algorithm = HLTjet_KolmogorovTest_MaxDist
-          output = HLT/TRJET/SHIFTER/HLT/j85_L1J20
-          description = Red means: mean of the histogram different from reference. Phi plot: this plot should be symmetrical and flat. Red can be due to: 1) Distribution not simmetric. 2) Histogram significantly different from reference. 3) Hotspots. i.e bins higher than average.
-      	}
-      	hist HLTJet_phi_vs_eta@Shifter {
-          algorithm = HLTjet_Bins_Diff_FromAvg
-          output = HLT/TRJET/SHIFTER/HLT/j85_L1J20
-          description = Red means: A critical number (1) bins is greater than average. Eta vs Phi plot: this distribution should not show hotspots. Check that there is sufficient statistics to claim an hotspot.
-      	}
+          output = HLT/TRJET/SHIFTER/HLT/j85_ion_L1TE50
+      	}	  	
 	hist HLTJet_emfrac@Shifter {
           algorithm = HLTjet_KolmogorovTest_MaxDist
-          output = HLT/TRJET/SHIFTER/HLT/j85_L1J20
+          output = HLT/TRJET/SHIFTER/HLT/j85_ion_L1TE50
       	}
 	hist HLTJet_hecfrac@Shifter {
           algorithm = HLTjet_KolmogorovTest_MaxDist
-          output = HLT/TRJET/SHIFTER/HLT/j85_L1J20
-      	}
-	hist HLTJet_E_vs_eta@Shifter {
-          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
-          output = HLT/TRJET/SHIFTER/HLT/j85_L1J20
-      	}
-	hist HLTJet_E_vs_phi@Shifter {
-          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
-          output = HLT/TRJET/SHIFTER/HLT/j85_L1J20
+          output = HLT/TRJET/SHIFTER/HLT/j85_ion_L1TE50
       	}
 	hist HLTSigma_vs_LB@Shifter {
           algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
-          output = HLT/TRJET/SHIFTER/HLT/j85_L1J20
+          output = HLT/TRJET/SHIFTER/HLT/j85_ion_L1TE50
       	}
-      } ## End j85_L1J20
-    } ## End HLT
-  } ##End JetMon
-} ##End HLT
-
-
-dir HLT {
-  dir JetMon {
-    dir HLT {
+      } ## End j85_ion_TE50
       dir j85_ion_L1J20 {
-      	hist HLTJet_Et@Shifter {
+        hist HLTJet_n@Shifter {
           display = LogY
           algorithm = HLTjet_KolmogorovTest_MaxDist
           output = HLT/TRJET/SHIFTER/HLT/j85_ion_L1J20
-          description = Red means: mean of the histogram different from reference. Et plot: This plot should be close to the reference. Red can be due to: 1) The histogram threshold is not the same as HLT threshold. 2) Slope of the histogram significantly different from reference. 3) Strange shape, i.e. bumps at high Et.
+          description = Red means: mean of the histogram different from reference. NJet plot: this plot should be close to the reference. Red can be due to: 1) Low statistics wrt reference. 2) Current bunch spacing different from reference. 3) Strange shape. i.e. bumps at high multiplicity.
       	}
-      	hist HLTJet_Leading_Et@Shifter { 
+      	hist HLTJet_Et@Shifter {
           display = LogY
           algorithm = HLTjet_KolmogorovTest_MaxDist
           output = HLT/TRJET/SHIFTER/HLT/j85_ion_L1J20
@@ -659,20 +1315,24 @@ dir HLT {
           output = HLT/TRJET/SHIFTER/HLT/j85_ion_L1J20
           description = Red means: A critical number (1) bins is greater than average. Eta vs Phi plot: this distribution should not show hotspots. Check that there is sufficient statistics to claim an hotspot.
       	}
-	hist HLTJet_emfrac@Shifter {
-          algorithm = HLTjet_KolmogorovTest_MaxDist
+       	hist HLTJet_E_vs_eta@Shifter {
+          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
           output = HLT/TRJET/SHIFTER/HLT/j85_ion_L1J20
       	}
-	hist HLTJet_hecfrac@Shifter {
-          algorithm = HLTjet_KolmogorovTest_MaxDist
+       	hist HLTJet_E_vs_phi@Shifter {
+          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
           output = HLT/TRJET/SHIFTER/HLT/j85_ion_L1J20
       	}
-	hist HLTJet_E_vs_eta@Shifter {
+      	hist HLTJet_phi_vs_eta_LAr@Shifter {
           algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
           output = HLT/TRJET/SHIFTER/HLT/j85_ion_L1J20
+      	}	  	
+	hist HLTJet_emfrac@Shifter {
+          algorithm = HLTjet_KolmogorovTest_MaxDist
+          output = HLT/TRJET/SHIFTER/HLT/j85_ion_L1J20
       	}
-	hist HLTJet_E_vs_phi@Shifter {
-          algorithm = HLTjet_Histogram_Not_Empty_with_Ref&GatherData
+	hist HLTJet_hecfrac@Shifter {
+          algorithm = HLTjet_KolmogorovTest_MaxDist
           output = HLT/TRJET/SHIFTER/HLT/j85_ion_L1J20
       	}
 	hist HLTSigma_vs_LB@Shifter {
@@ -684,7 +1344,6 @@ dir HLT {
   } ##End JetMon
 } ##End HLT
 
-
 #################################################################################################
 
 
diff --git a/DataQuality/DataQualityConfigurations/config/HLT/HLTmuon/collisions_run.config b/DataQuality/DataQualityConfigurations/config/HLT/HLTmuon/collisions_run.config
index 2c03c14b371ca33594b5a6e8db80994925406c39..d1883e4ead21e681d7f1063273581d4ebc262187 100644
--- a/DataQuality/DataQualityConfigurations/config/HLT/HLTmuon/collisions_run.config
+++ b/DataQuality/DataQualityConfigurations/config/HLT/HLTmuon/collisions_run.config
@@ -563,7 +563,9 @@ dir HLT {
       }
       hist muChainEFiso1_ESid_L2MuonSA_Turn_On_Curve_wrt_MuidCB_Fit {
         output = HLT/TRMUO/Expert/ES_muChainEFiso1/idtrk/wrtOffline
-        algorithm = TRMUO_fermi_fit_mu24i_L2MuonSA_Fit
+	#algorithm = TRMUO_fermi_fit_mu24i_L2MuonSA_Fit
+        algorithm = TRMUO_fermi_fit_L1MU20_Fit
+# we see almost L1 turn-on curves for L2MuonSA eff wrt offline muons
       }
       hist muChainEFiso1_ESid_MuComb_Turn_On_Curve_wrt_MuidCB_Fit {
         output = HLT/TRMUO/Expert/ES_muChainEFiso1/idtrk/wrtOffline
@@ -689,7 +691,9 @@ dir HLT {
 # wrtOffline
       hist muChainEFiso1_L2MuonSA_Turn_On_Curve_wrt_MuidCB_Fit {
         output = HLT/TRMUO/Expert/muChainEFiso1/wrtOffline
-        algorithm = TRMUO_fermi_fit_mu24i_L2MuonSA_Fit
+        #algorithm = TRMUO_fermi_fit_mu24i_L2MuonSA_Fit
+        algorithm = TRMUO_fermi_fit_L1MU20_Fit
+# we see almost L1 turn-on curves for L2MuonSA eff wrt offline muons
       }
       hist muChainEFiso1_MuComb_Turn_On_Curve_wrt_MuidCB_Fit {
         output = HLT/TRMUO/Expert/muChainEFiso1/wrtOffline
@@ -701,7 +705,9 @@ dir HLT {
       }
       hist muChainEFiso1_L2MuonSA_Barrel_Turn_On_Curve_wrt_MuidCB_Fit {
         output = HLT/TRMUO/Expert/muChainEFiso1/wrtOffline
-        algorithm = TRMUO_fermi_fit_mu24i_L2MuonSA_Fit
+        #algorithm = TRMUO_fermi_fit_mu24i_L2MuonSA_Fit
+        algorithm = TRMUO_fermi_fit_L1MU20_Fit
+# we see almost L1 turn-on curves for L2MuonSA eff wrt offline muons
       }
       hist muChainEFiso1_MuComb_Barrel_Turn_On_Curve_wrt_MuidCB_Fit {
         output = HLT/TRMUO/Expert/muChainEFiso1/wrtOffline
@@ -713,7 +719,9 @@ dir HLT {
       }
       hist muChainEFiso1_L2MuonSA_Endcap_Turn_On_Curve_wrt_MuidCB_Fit {
         output = HLT/TRMUO/Expert/muChainEFiso1/wrtOffline
-        algorithm = TRMUO_fermi_fit_mu24i_L2MuonSA_Fit
+        #algorithm = TRMUO_fermi_fit_mu24i_L2MuonSA_Fit
+        algorithm = TRMUO_fermi_fit_L1MU20_Fit
+# we see almost L1 turn-on curves for L2MuonSA eff wrt offline muons
       }
       hist muChainEFiso1_MuComb_Endcap_Turn_On_Curve_wrt_MuidCB_Fit {
         output = HLT/TRMUO/Expert/muChainEFiso1/wrtOffline
@@ -727,7 +735,9 @@ dir HLT {
 # wrtOffline/TakenByMSonly
       hist muChainEFiso1_MSb_L2MuonSA_Turn_On_Curve_wrt_MuidCB_Fit {
         output = HLT/TRMUO/Expert/muChainEFiso1/wrtOffline/TakenByMSonly
-        algorithm = TRMUO_fermi_fit_mu24i_L2MuonSA_Fit
+        #algorithm = TRMUO_fermi_fit_mu24i_L2MuonSA_Fit
+        algorithm = TRMUO_fermi_fit_L1MU20_Fit
+# we see almost L1 turn-on curves for L2MuonSA eff wrt offline muons
       }
       hist muChainEFiso1_MSb_MuComb_Turn_On_Curve_wrt_MuidCB_Fit {
         output = HLT/TRMUO/Expert/muChainEFiso1/wrtOffline/TakenByMSonly
@@ -825,7 +835,8 @@ dir HLT {
       }
       hist muChain1_ESid_L2MuonSA_Turn_On_Curve_wrt_MuidCB_Fit {
         output = HLT/TRMUO/Expert/ES_muChain1/idtrk/wrtOffline
-        algorithm = TRMUO_fermi_fit_mu50_L2MuonSA_Fit
+        algorithm = TRMUO_fermi_fit_L1MU20_Fit
+# we see almost L1 threshold for L2MuonSA eff wrt offline muons
       }
       hist muChain1_ESid_MuComb_Turn_On_Curve_wrt_MuidCB_Fit {
         output = HLT/TRMUO/Expert/ES_muChain1/idtrk/wrtOffline
@@ -946,7 +957,9 @@ dir HLT {
 # wrtOffline
       hist muChain1_L2MuonSA_Turn_On_Curve_wrt_MuidCB_Fit {
         output = HLT/TRMUO/Expert/muChain1/wrtOffline
-        algorithm = TRMUO_fermi_fit_mu50_L2MuonSA_Fit
+        #algorithm = TRMUO_fermi_fit_mu50_L2MuonSA_Fit
+        algorithm = TRMUO_fermi_fit_L1MU20_Fit
+# we see almost L1 threshold for L2MuonSA eff wrt offline muons
       }
       hist muChain1_MuComb_Turn_On_Curve_wrt_MuidCB_Fit {
         output = HLT/TRMUO/Expert/muChain1/wrtOffline
@@ -958,7 +971,9 @@ dir HLT {
       }
       hist muChain1_L2MuonSA_Barrel_Turn_On_Curve_wrt_MuidCB_Fit {
         output = HLT/TRMUO/Expert/muChain1/wrtOffline
-        algorithm = TRMUO_fermi_fit_mu50_L2MuonSA_Fit
+        #algorithm = TRMUO_fermi_fit_mu50_L2MuonSA_Fit
+        algorithm = TRMUO_fermi_fit_L1MU20_Fit
+# we see almost L1 threshold for L2MuonSA eff wrt offline muons
       }
       hist muChain1_MuComb_Barrel_Turn_On_Curve_wrt_MuidCB_Fit {
         output = HLT/TRMUO/Expert/muChain1/wrtOffline
@@ -970,7 +985,9 @@ dir HLT {
       }
       hist muChain1_L2MuonSA_Endcap_Turn_On_Curve_wrt_MuidCB_Fit {
         output = HLT/TRMUO/Expert/muChain1/wrtOffline
-        algorithm = TRMUO_fermi_fit_mu50_L2MuonSA_Fit
+        #algorithm = TRMUO_fermi_fit_mu50_L2MuonSA_Fit
+        algorithm = TRMUO_fermi_fit_L1MU20_Fit
+# we see almost L1 threshold for L2MuonSA eff wrt offline muons
       }
       hist muChain1_MuComb_Endcap_Turn_On_Curve_wrt_MuidCB_Fit {
         output = HLT/TRMUO/Expert/muChain1/wrtOffline
@@ -983,7 +1000,9 @@ dir HLT {
 # wrtOffline/TakenByMSonly
       hist muChain1_MSb_L2MuonSA_Turn_On_Curve_wrt_MuidCB_Fit {
         output = HLT/TRMUO/Expert/muChain1/wrtOffline/TakenByMSonly
-        algorithm = TRMUO_fermi_fit_mu50_L2MuonSA_Fit
+        #algorithm = TRMUO_fermi_fit_mu50_L2MuonSA_Fit
+        algorithm = TRMUO_fermi_fit_L1MU20_Fit
+# we see almost L1 turn-on curves for L2MuonSA eff wrt offline muons
       }
       hist muChain1_MSb_MuComb_Turn_On_Curve_wrt_MuidCB_Fit {
         output = HLT/TRMUO/Expert/muChain1/wrtOffline/TakenByMSonly
@@ -1070,7 +1089,9 @@ dir HLT {
       }
       hist muChainMSonly1_EStag_L2MuonSA_Turn_On_Curve_wrt_MuidSA_Fit {
         output = HLT/TRMUO/Expert/ES_muChainMSonly1/muCombTag/wrtOffline
-        algorithm = TRMUO_fermi_fit_mu60_MSonly_barrel_L2MuonSA_Fit
+	#algorithm = TRMUO_fermi_fit_mu60_MSonly_barrel_L2MuonSA_Fit
+        algorithm = TRMUO_fermi_fit_L1MU20_barrel_Fit
+# we see almost L1 turn-on curves for L2MuonSA wrt offline muons
       }
       hist muChainMSonly1_EStag_MuonEFSA_Turn_On_Curve_wrt_MuidSA_Fit {
         output = HLT/TRMUO/Expert/ES_muChainMSonly1/muCombTag/wrtOffline
@@ -1126,7 +1147,9 @@ dir HLT {
 # wrtOffline
       hist muChainMSonly1_L2MuonSA_Turn_On_Curve_wrt_MuidSA_Fit {
         output = HLT/TRMUO/Expert/muChainMSonly1/wrtOffline
-        algorithm = TRMUO_fermi_fit_mu60_MSonly_barrel_L2MuonSA_Fit
+        #algorithm = TRMUO_fermi_fit_mu60_MSonly_barrel_L2MuonSA_Fit
+        algorithm = TRMUO_fermi_fit_L1MU20_barrel_Fit
+# we see almost L1 turn-on curves for L2MuonSA wrt offline muons
       }
       hist muChainMSonly1_MuonEFSA_Turn_On_Curve_wrt_MuidSA_Fit {
         output = HLT/TRMUO/Expert/muChainMSonly1/wrtOffline
@@ -1134,7 +1157,9 @@ dir HLT {
       }
       hist muChainMSonly1_L2MuonSA_Barrel_Turn_On_Curve_wrt_MuidSA_Fit {
         output = HLT/TRMUO/Expert/muChainMSonly1/wrtOffline
-        algorithm = TRMUO_fermi_fit_mu60_MSonly_barrel_L2MuonSA_Fit
+        #algorithm = TRMUO_fermi_fit_mu60_MSonly_barrel_L2MuonSA_Fit
+        algorithm = TRMUO_fermi_fit_L1MU20_barrel_Fit
+# we see almost L1 turn-on curves for L2MuonSA wrt offline muons
       }
       hist muChainMSonly1_MuonEFSA_Barrel_Turn_On_Curve_wrt_MuidSA_Fit {
         output = HLT/TRMUO/Expert/muChainMSonly1/wrtOffline
@@ -2692,7 +2717,7 @@ algorithm TRMUO_fermi_fit_mu60_MSonly_barrel_EStag_L2MuonSA_upstream_Fit {
   libname = libdqm_algorithms.so
   name = Simple_fermi_Fit_Graph
   thresholds = th_TRMUO_fermi_fit_mu60_MSonly_barrel_EStag_L2MuonSA_upstream
-  MinPoint = 120
+  MinPoint = 50
   ImproveFit = 1.0
 #  MinSignificance = 2.0
 }
@@ -2710,7 +2735,7 @@ algorithm TRMUO_fermi_fit_mu60_MSonly_barrel_EStag_MuonEFSA_upstream_Fit {
   libname = libdqm_algorithms.so
   name = Simple_fermi_Fit_Graph
   thresholds = th_TRMUO_fermi_fit_mu60_MSonly_barrel_EStag_MuonEFSA_upstream
-  MinPoint = 120 
+  MinPoint = 50
   ImproveFit = 1.0
 #  MinSignificance = 2.0
 }
@@ -2740,7 +2765,7 @@ algorithm TRMUO_fermi_fit_mu50_ESid_MuonEFCB_upstream_Fit {
   libname = libdqm_algorithms.so
   name = Simple_fermi_Fit_Graph
   thresholds = th_TRMUO_fermi_fit_mu50_ESid_MuonEFCB_upstream
-  MinPoint = 120
+  MinPoint = 40
   ImproveFit = 1.0
 #  MinSignificance = 2.0
 }
@@ -3465,8 +3490,8 @@ thresholds th_TRMUO_fermi_fit_mu60_MSonly_barrel_EStag_L2MuonSA_upstream {
     error = 0.899
   }
   limits Threshold {
-    warning = 60.0
-    error   = 65.0
+    warning = 8.0
+    error   = 10.0
   }
   limits Resolution {
     warning = 3.0
@@ -3512,8 +3537,8 @@ thresholds th_TRMUO_fermi_fit_mu50_ESid_L2MuonSA_upstream {
     error = 0.979
   }
   limits Threshold {
-    warning = 50.0
-    error = 52.0
+    warning = 8.0
+    error = 10.0
   }
   limits Resolution {
     warning = 3.0
@@ -3529,8 +3554,8 @@ thresholds th_TRMUO_fermi_fit_mu50_ESid_muComb_upstream {
     error = 0.964
   }
   limits Threshold {
-    warning = 50.0
-    error = 52.0
+    warning = 22.0
+    error = 24.0
   }
   limits Resolution {
     warning = 3.0
@@ -3706,8 +3731,8 @@ thresholds th_TRMUO_fermi_fit_mu60_MSonly_barrel_L2MuonSA_upstream {
     error = 0.799
   }
   limits Threshold {
-    warning = 60.0
-    error   = 65.0
+    warning = 8.0
+    error   = 10.0
   }
   limits Resolution {
     warning = 3.0
@@ -3801,8 +3826,8 @@ thresholds th_TRMUO_fermi_fit_mu50_L2MuonSA_upstream {
     error = 0.98
   }
   limits Threshold {
-    warning = 50.0
-    error = 52.0
+    warning = 8.0
+    error = 10.0
   }
   limits Resolution {
     warning = 3.0
@@ -3817,8 +3842,8 @@ thresholds th_TRMUO_fermi_fit_mu50_muComb_upstream {
     error = 0.97
   }
   limits Threshold {
-    warning = 50.0
-    error = 52.0
+    warning = 22.0
+    error = 24.0
   }
   limits Resolution {
     warning = 2.0
@@ -3880,8 +3905,8 @@ thresholds th_TRMUO_fermi_fit_mu50_L2MuonSA {
     error = 0.599
   }
   limits Threshold {
-    warning = 50.0
-    error = 52.0
+    warning = 8.0
+    error = 10.0
   }
   limits Resolution {
     warning = 3.0
@@ -3896,8 +3921,8 @@ thresholds th_TRMUO_fermi_fit_mu50_muComb {
     error = 0.599
   }
   limits Threshold {
-    warning = 50.0
-    error = 52.0
+    warning = 22.0
+    error = 24.0
   }
   limits Resolution {
     warning = 2.0
@@ -3958,8 +3983,8 @@ thresholds th_TRMUO_fermi_fit_mu24i_L2MuonSA_upstream {
     error = 0.799
   }
   limits Threshold {
-    warning = 26.5
-    error   = 28.0
+    warning = 8.0
+    error   = 10.0
   }
   limits Resolution {
     warning = 2.0
@@ -3974,8 +3999,8 @@ thresholds th_TRMUO_fermi_fit_mu24i_muComb_upstream {
     error = 0.799
   }
   limits Threshold {
-    warning = 26.5
-    error   = 28.0
+    warning = 22.0
+    error   = 24.0
   }
   limits Resolution {
     warning = 1.0
@@ -4038,8 +4063,8 @@ thresholds th_TRMUO_fermi_fit_mu24i_ESid_L2MuonSA_upstream {
     error = 0.979
   }
   limits Threshold {
-    warning = 26.5
-    error   = 28.0
+    warning = 8.0
+    error   = 10.0
   }
   limits Resolution {
     warning = 2.0
@@ -4056,8 +4081,8 @@ thresholds th_TRMUO_fermi_fit_mu24i_ESid_muComb_upstream {
     error = 0.964
   }
   limits Threshold {
-    warning = 26.5
-    error   = 28.0
+    warning = 22.0
+    error   = 24.0
   }
   limits Resolution {
     warning = 2.0
@@ -4090,8 +4115,8 @@ thresholds th_TRMUO_fermi_fit_mu24i_L2MuonSA {
     error = 0.599
   }
   limits Threshold {
-    warning = 26.5
-    error   = 28.0
+    warning = 8.0
+    error   = 10.0
   }
   limits Resolution {
     warning = 2.0
@@ -4106,8 +4131,8 @@ thresholds th_TRMUO_fermi_fit_mu24i_muComb {
     error = 0.599
   }
   limits Threshold {
-    warning = 26.5
-    error   = 28.0
+    warning = 22.0
+    error   = 24.0
   }
   limits Resolution {
     warning = 1.0
diff --git a/DataQuality/DataQualityConfigurations/config/HLT/HLTmuon/heavyions_run.config b/DataQuality/DataQualityConfigurations/config/HLT/HLTmuon/heavyions_run.config
index 4c275cf3285d90dfcc8a4df00f933b57ad38135e..55fcd7f7dcd933afb1816d4e4d315a976ce74904 100644
--- a/DataQuality/DataQualityConfigurations/config/HLT/HLTmuon/heavyions_run.config
+++ b/DataQuality/DataQualityConfigurations/config/HLT/HLTmuon/heavyions_run.config
@@ -476,13 +476,14 @@ dir HLT {
       hist muChain1_highpt_effsummary_by_ESid {
         output = HLT/TRMUO/Expert/ES_muChain1
         algorithm = TRMUO_GatherDataNoRef
+        description = muChain1 corresponds to chain HLT_mu8.
 	##description = check history efficiencies <a href="https://atlasdqm.cern.ch/dqmfquery/query?histogram=HLT%2FTRMUO%2FShift%2FES_muChain1%2Fmu8_highpt_effsummary_by_ESid%40shifter&result=BinContentDump%7CEF+algorithm&error=&stream=express_express&period_type=run&source=tier0&proc_ver=1&low_run=201000&high_run=&low_y=0.85&high_y=1.05&outputtype=png">EF algorithm</a> <a href="https://atlasdqm.cern.ch/dqmfquery/query?histogram=HLT%2FTRMUO%2FShift%2FES_muChain1%2Fmu8_highpt_effsummary_by_ESid%40shifter&result=BinContentDump%7CMuComb&error=&stream=express_express&period_type=run&source=tier0&proc_ver=1&low_run=201000&high_run=&low_y=0.85&high_y=1.05&outputtype=png" >MuComb</a> <a href="https://atlasdqm.cern.ch/dqmfquery/query?histogram=HLT%2FTRMUO%2FShift%2FES_muChain1%2Fmu8_highpt_effsummary_by_ESid%40shifter&result=BinContentDump%7CL2MuonSA&error=&stream=express_express&period_type=run&source=tier0&proc_ver=1&low_run=201000&high_run=&low_y=0.85&high_y=1.05&outputtype=png">L2MuonSA</a>
         ## need to put reference and compare!
       }
       hist muChain1_highpt_effsummary_by_ESid@shifter {
         output = HLT/TRMUO/Shift/ES_muChain1
         algorithm = effalgmin_3bins
-        description = muChain1 corresponds to chain HLT_mu15_L1MU10. Shifters could click on the link (BinContentDump) on bottom right to see the history efficiencies for each bin.
+        description = muChain1 corresponds to chain HLT_mu8. Shifters could click on the link (BinContentDump) on bottom right to see the history efficiencies for each bin.
 	#description = check history efficiencies <a href="https://atlasdqm.cern.ch/dqmfquery/query?histogram=HLT%2FTRMUO%2FShift%2FES_muChain1%2Fmu8_highpt_effsummary_by_ESid%40shifter&result=BinContentDump%7CEF+algorithm&error=BinContentDump%7CEF+algorithmError&stream=express_express&period_type=run&source=tier0&proc_ver=1&low_run=201000&high_run=&low_y=0.85&high_y=1.05&outputtype=png">EF algorithm</a> <a href="https://atlasdqm.cern.ch/dqmfquery/query?histogram=HLT%2FTRMUO%2FShift%2FES_muChain1%2Fmu8_highpt_effsummary_by_ESid%40shifter&result=BinContentDump%7CMuComb&error=BinContentDump%7CMuCombError&stream=express_express&period_type=run&source=tier0&proc_ver=1&low_run=201000&high_run=&low_y=0.85&high_y=1.05&outputtype=png" >MuComb</a> <a href="https://atlasdqm.cern.ch/dqmfquery/query?histogram=HLT%2FTRMUO%2FShift%2FES_muChain1%2Fmu8_highpt_effsummary_by_ESid%40shifter&result=BinContentDump%7CL2MuonSA&error=BinContentDump%7CL2MuonSAError&stream=express_express&period_type=run&source=tier0&proc_ver=1&low_run=201000&high_run=&low_y=0.85&high_y=1.05&outputtype=png">L2MuonSA</a>
         ## need to put reference and compare!
       }
@@ -491,51 +492,63 @@ dir HLT {
       hist muChain1_ESid_L2MuonSA_Turn_On_Curve_wrt_L1_Fit {
         output = HLT/TRMUO/Expert/ES_muChain1/idtrk/wrtUpstream
         algorithm = TRMUO_fermi_fit_mu10_L2MuonSA_upstream_Fit
+        description = muChain1 corresponds to chain HLT_mu8.
       }
       hist muChain1_ESid_MuComb_Turn_On_Curve_wrt_L2MuonSA_Fit {
         output = HLT/TRMUO/Expert/ES_muChain1/idtrk/wrtUpstream
         algorithm = TRMUO_fermi_fit_mu10_muComb_upstream_Fit
+        description = muChain1 corresponds to chain HLT_mu8.
       }
       hist muChain1_ESid_EFmuon_Turn_On_Curve_wrt_MuComb_Fit {
         output = HLT/TRMUO/Expert/ES_muChain1/idtrk/wrtUpstream
         algorithm = TRMUO_fermi_fit_mu10_MuonEFCB_upstream_Fit
+        description = muChain1 corresponds to chain HLT_mu8.
       }
       hist muChain1_ESid_L2MuonSA_Turn_On_Curve_wrt_L1_Fit@shifter {
         output = HLT/TRMUO/Shift/ES_muChain1
         algorithm = TRMUO_fermi_fit_mu10_ESid_L2MuonSA_upstream_Fit
+        description = muChain1 corresponds to chain HLT_mu8.
       }
       hist muChain1_ESid_MuComb_Turn_On_Curve_wrt_L2MuonSA_Fit@shifter {
         output = HLT/TRMUO/Shift/ES_muChain1
         algorithm = TRMUO_fermi_fit_mu10_ESid_muComb_upstream_Fit
+        description = muChain1 corresponds to chain HLT_mu8.
       }
       hist muChain1_ESid_EFmuon_Turn_On_Curve_wrt_MuComb_Fit@shifter {
         output = HLT/TRMUO/Shift/ES_muChain1
         algorithm = TRMUO_fermi_fit_mu10_ESid_MuonEFCB_upstream_Fit
+        description = muChain1 corresponds to chain HLT_mu8.
       }
 # ESid/wrtOffline
       hist muChain1_ESid_L1_Turn_On_Curve_wrt_MuidCB_Fit {
         output = HLT/TRMUO/Expert/ES_muChain1/idtrk/wrtOffline
         algorithm = TRMUO_fermi_fit_L1MU0_Fit
+        description = muChain1 corresponds to chain HLT_mu8.
       }
       hist muChain1_ESid_L1_Barrel_Turn_On_Curve_wrt_MuidCB_Fit {
         output = HLT/TRMUO/Expert/ES_muChain1/idtrk/wrtOffline
         algorithm = TRMUO_fermi_fit_L1MU0_barrel_Fit
+        description = muChain1 corresponds to chain HLT_mu8.
       }
       hist muChain1_ESid_L1_Endcap_Turn_On_Curve_wrt_MuidCB_Fit {
         output = HLT/TRMUO/Expert/ES_muChain1/idtrk/wrtOffline
         algorithm = TRMUO_fermi_fit_L1MU0_endcap_Fit
+        description = muChain1 corresponds to chain HLT_mu8.
       }
       hist muChain1_ESid_L2MuonSA_Turn_On_Curve_wrt_MuidCB_Fit {
         output = HLT/TRMUO/Expert/ES_muChain1/idtrk/wrtOffline
         algorithm = TRMUO_fermi_fit_mu10_L2MuonSA_Fit
+        description = muChain1 corresponds to chain HLT_mu8.
       }
       hist muChain1_ESid_MuComb_Turn_On_Curve_wrt_MuidCB_Fit {
         output = HLT/TRMUO/Expert/ES_muChain1/idtrk/wrtOffline
         algorithm = TRMUO_fermi_fit_mu10_muComb_Fit
+        description = muChain1 corresponds to chain HLT_mu8.
       }
       hist muChain1_ESid_EFmuon_Turn_On_Curve_wrt_MuidCB_Fit {
         output = HLT/TRMUO/Expert/ES_muChain1/idtrk/wrtOffline
         algorithm = TRMUO_fermi_fit_mu10_MuonEFCB_Fit
+        description = muChain1 corresponds to chain HLT_mu8.
       }
 
 ### mu10 (all ES and bulk)
@@ -543,27 +556,28 @@ dir HLT {
       hist muChain1_highptL1plateau_wrtOffline {
         output = HLT/TRMUO/Expert/muChain1
         algorithm = TRMUO_GatherDataNoRef
-	description = the L1 item for muChain1 (HLT_mu15_L1MU10) is L1MU10. For express stream, efficiencies measured with Jpsi T&P method are biased due to stream prescales, thus significantly larger than reference. For physics stream, no such bias. Shifters should check the efficiencies carefully for physics stream.
+	description = the L1 item for muChain1 (HLT_mu8) is L1MU6. For express stream, efficiencies measured with Jpsi T&P method are biased due to stream prescales, thus significantly larger than reference. For physics stream, no such bias. Shifters should check the efficiencies carefully for physics stream.
 	#description = check history efficiencies: <br> express_express: <a href="https://atlasdqm.cern.ch/dqmfquery/query?histogram=HLT%2FTRMUO%2FShift%2FZTP%2Fmu8_highptL1plateau_wrtOffline%40shifter&result=BinContentDump%7CBarrel+30-100+GeV+Z+T%26P&error=&stream=express_express&period_type=run&source=tier0&proc_ver=1&low_run=201000&high_run=&low_y=-0.05&high_y=1.05&outputtype=png">Barrel 30-100 GeV Z T&P</a> <a href="https://atlasdqm.cern.ch/dqmfquery/query?histogram=HLT%2FTRMUO%2FShift%2FZTP%2Fmu8_highptL1plateau_wrtOffline%40shifter&result=BinContentDump%7CEndcap+30-100+GeV+Z+T%26P&error=&stream=express_express&period_type=run&source=tier0&proc_ver=1&low_run=201000&high_run=&low_y=-0.05&high_y=1.05&outputtype=png">Endcap 30-100 GeV Z T&P</a> <br> physics_Muons: <a href="https://atlasdqm.cern.ch/dqmfquery/query?histogram=HLT%2FTRMUO%2FShift%2FZTP%2Fmu8_highptL1plateau_wrtOffline%40shifter&result=BinContentDump%7CBarrel+30-100+GeV+Z+T%26P&error=&stream=physics_Muons&period_type=run&source=tier0&proc_ver=1&low_run=201000&high_run=&low_y=-0.05&high_y=1.05&outputtype=png">Barrel 30-100 GeV Z T&P</a> <a href="https://atlasdqm.cern.ch/dqmfquery/query?histogram=HLT%2FTRMUO%2FShift%2FZTP%2Fmu8_highptL1plateau_wrtOffline%40shifter&result=BinContentDump%7CEndcap+30-100+GeV+Z+T%26P&error=&stream=physics_Muons&period_type=run&source=tier0&proc_ver=1&low_run=201000&high_run=&low_y=-0.05&high_y=1.05&outputtype=png">Endcap 30-100 GeV Z T&P</a>
         ## need to put reference and compare!
       }
       hist muChain1_highptL1plateau_wrtOffline@shifter {
         output = HLT/TRMUO/Shift/JpsiTP
         algorithm = effalgmin_3bins
-	description = the L1 item for muChain1 (HLT_mu15_L1MU10) is L1MU10. For express stream, efficiencies measured with Jpsi T&P method are biased due to stream prescales, thus significantly larger than reference. For physics stream, no such bias. Shifters should check the efficiencies carefully for physics stream.
+	description = the L1 item for muChain1 (HLT_mu8) is L1MU6. For express stream, efficiencies measured with Jpsi T&P method are biased due to stream prescales, thus significantly larger than reference. For physics stream, no such bias. Shifters should check the efficiencies carefully for physics stream.
 	#description = check history efficiencies: <br> express_express: <a href="https://atlasdqm.cern.ch/dqmfquery/query?histogram=HLT%2FTRMUO%2FShift%2FZTP%2Fmu8_highptL1plateau_wrtOffline%40shifter&result=BinContentDump%7CBarrel+30-100+GeV+Z+T%26P&error=BinContentDump%7CBarrel+30-100+GeV+Z+T%26PError&stream=express_express&period_type=run&source=tier0&proc_ver=1&low_run=201000&high_run=&low_y=0.55&high_y=1.01&outputtype=png">Barrel 30-100 GeV Z T&P</a> <a href="https://atlasdqm.cern.ch/dqmfquery/query?histogram=HLT%2FTRMUO%2FShift%2FZTP%2Fmu8_highptL1plateau_wrtOffline%40shifter&result=BinContentDump%7CEndcap+30-100+GeV+Z+T%26P&error=BinContentDump%7CEndcap+30-100+GeV+Z+T%26PError&stream=express_express&period_type=run&source=tier0&proc_ver=1&low_run=201000&high_run=&low_y=0.75&high_y=1.01&outputtype=png">Endcap 30-100 GeV Z T&P</a> <br> physics_Muons: <a href="https://atlasdqm.cern.ch/dqmfquery/query?histogram=HLT%2FTRMUO%2FShift%2FZTP%2Fmu8_highptL1plateau_wrtOffline%40shifter&result=BinContentDump%7CBarrel+30-100+GeV+Z+T%26P&error=BinContentDump%7CBarrel+30-100+GeV+Z+T%26PError&stream=physics_Muons&period_type=run&source=tier0&proc_ver=1&low_run=201000&high_run=&low_y=0.55&high_y=0.80&outputtype=png">Barrel 30-100 GeV Z T&P</a> <a href="https://atlasdqm.cern.ch/dqmfquery/query?histogram=HLT%2FTRMUO%2FShift%2FZTP%2Fmu8_highptL1plateau_wrtOffline%40shifter&result=BinContentDump%7CEndcap+30-100+GeV+Z+T%26P&error=BinContentDump%7CEndcap+30-100+GeV+Z+T%26PError&stream=physics_Muons&period_type=run&source=tier0&proc_ver=1&low_run=201000&high_run=&low_y=0.75&high_y=0.95&outputtype=png">Endcap 30-100 GeV Z T&P</a>
         ## need to put reference and compare!
       }
       hist muChain1_highpt3bins_effwrtL1 {
         output = HLT/TRMUO/Expert/muChain1
         algorithm = TRMUO_GatherDataNoRef
-	description = muChain1 corresponds to chain HLT_mu15_L1MU10. For express stream, efficiencies measured with Z T&P method are biased due to stream prescales, thus expected to be larger than reference. For physics stream, no such bias. Shifters should check the efficiencies carefully for physics stream.
+	description = muChain1 corresponds to chain HLT_mu8. For express stream, efficiencies measured with Z T&P method are biased due to stream prescales, thus expected to be larger than reference. For physics stream, no such bias. Shifters should check the efficiencies carefully for physics stream.
 	#description = check history efficiencies: <br> express_express: <a href="https://atlasdqm.cern.ch/dqmfquery/query?histogram=HLT%2FTRMUO%2FShift%2FZTP%2Fmu8_highpt3bins_effwrtL1%40shifter&result=BinContentDump%7C30-50+GeV+Z+T%26P&error=&stream=express_express&period_type=run&source=tier0&proc_ver=1&low_run=201000&high_run=&low_y=0.90&high_y=1.05&outputtype=png">30-50 GeV Z T&P</a> <a href="https://atlasdqm.cern.ch/dqmfquery/query?histogram=HLT%2FTRMUO%2FShift%2FZTP%2Fmu8_highpt3bins_effwrtL1%40shifter&result=BinContentDump%7C50-100+GeV+Z+T%26P&error=&stream=express_express&period_type=run&source=tier0&proc_ver=1&low_run=201000&high_run=&low_y=0.90&high_y=1.05&outputtype=png">50-100 GeV Z T&P</a> <br> physics_Muons: <a href="https://atlasdqm.cern.ch/dqmfquery/query?histogram=HLT%2FTRMUO%2FShift%2FZTP%2Fmu8_highpt3bins_effwrtL1%40shifter&result=BinContentDump%7C30-50+GeV+Z+T%26P&error=&stream=physics_Muons&period_type=run&source=tier0&proc_ver=1&low_run=201000&high_run=&low_y=0.90&high_y=1.05&outputtype=png">30-50 GeV Z T&P</a> <a href="https://atlasdqm.cern.ch/dqmfquery/query?histogram=HLT%2FTRMUO%2FShift%2FZTP%2Fmu8_highpt3bins_effwrtL1%40shifter&result=BinContentDump%7C50-100+GeV+Z+T%26P&error=&stream=physics_Muons&period_type=run&source=tier0&proc_ver=1&low_run=201000&high_run=&low_y=0.90&high_y=1.05&outputtype=png">50-100 GeV Z T&P</a>
         ## need to put reference and compare!
       }
       hist muChain1_highpt3bins_effwrtL1@shifter {
         output = HLT/TRMUO/Shift/JpsiTP
         algorithm = effalgmin_2bins
+        description = muChain1 corresponds to chain HLT_mu8.
 	#description = check history efficiencies: <br> express_express: <a href="https://atlasdqm.cern.ch/dqmfquery/query?histogram=HLT%2FTRMUO%2FShift%2FZTP%2Fmu8_highpt3bins_effwrtL1%40shifter&result=BinContentDump%7C30-50+GeV+Z+T%26P&error=BinContentDump%7C30-50+GeV+Z+T%26PError&stream=express_express&period_type=run&source=tier0&proc_ver=1&low_run=201000&high_run=&low_y=0.90&high_y=1.05&outputtype=png">30-50 GeV Z T&P</a> <a href="https://atlasdqm.cern.ch/dqmfquery/query?histogram=HLT%2FTRMUO%2FShift%2FZTP%2Fmu8_highpt3bins_effwrtL1%40shifter&result=BinContentDump%7C50-100+GeV+Z+T%26P&error=BinContentDump%7C50-100+GeV+Z+T%26PError&stream=express_express&period_type=run&source=tier0&proc_ver=1&low_run=201000&high_run=&low_y=0.90&high_y=1.05&outputtype=png">50-100 GeV Z T&P</a> <br> physics_Muons: <a href="https://atlasdqm.cern.ch/dqmfquery/query?histogram=HLT%2FTRMUO%2FShift%2FZTP%2Fmu8_highpt3bins_effwrtL1%40shifter&result=BinContentDump%7C30-50+GeV+Z+T%26P&error=BinContentDump%7C30-50+GeV+Z+T%26PError&stream=physics_Muons&period_type=run&source=tier0&proc_ver=1&low_run=201000&high_run=&low_y=0.90&high_y=1.05&outputtype=png">30-50 GeV Z T&P</a> <a href="https://atlasdqm.cern.ch/dqmfquery/query?histogram=HLT%2FTRMUO%2FShift%2FZTP%2Fmu8_highpt3bins_effwrtL1%40shifter&result=BinContentDump%7C50-100+GeV+Z+T%26P&error=BinContentDump%7C50-100+GeV+Z+T%26PError&stream=physics_Muons&period_type=run&source=tier0&proc_ver=1&low_run=201000&high_run=&low_y=0.90&high_y=1.05&outputtype=png">50-100 GeV Z T&P</a>
         ## need to put reference and compare!
       }
@@ -576,38 +590,47 @@ dir HLT {
       hist muChain1_L2MuonSA_Turn_On_Curve_wrt_L1_Fit {
         output = HLT/TRMUO/Expert/muChain1/wrtUpstream
         algorithm = TRMUO_fermi_fit_mu10_L2MuonSA_upstream_Fit
+        description = muChain1 corresponds to chain HLT_mu8.
       }
       hist muChain1_MuComb_Turn_On_Curve_wrt_L2MuonSA_Fit {
         output = HLT/TRMUO/Expert/muChain1/wrtUpstream
         algorithm = TRMUO_fermi_fit_mu10_muComb_upstream_Fit
+        description = muChain1 corresponds to chain HLT_mu8.
       }
       hist muChain1_EFmuon_Turn_On_Curve_wrt_MuComb_Fit {
         output = HLT/TRMUO/Expert/muChain1/wrtUpstream
         algorithm = TRMUO_fermi_fit_mu10_MuonEFCB_upstream_Fit
+        description = muChain1 corresponds to chain HLT_mu8.
       }
       hist muChain1_L2MuonSA_Turn_On_Curve_wrt_L1_Barrel_Fit {
         output = HLT/TRMUO/Expert/muChain1/wrtUpstream
         algorithm = TRMUO_fermi_fit_mu10_L2MuonSA_upstream_Fit
+        description = muChain1 corresponds to chain HLT_mu8.
       }
       hist muChain1_MuComb_Turn_On_Curve_wrt_L2MuonSA_Barrel_Fit {
         output = HLT/TRMUO/Expert/muChain1/wrtUpstream
         algorithm = TRMUO_fermi_fit_mu10_muComb_upstream_Fit
+        description = muChain1 corresponds to chain HLT_mu8.
       }
       hist muChain1_EFmuon_Turn_On_Curve_wrt_MuComb_Barrel_Fit {
         output = HLT/TRMUO/Expert/muChain1/wrtUpstream
         algorithm = TRMUO_fermi_fit_mu10_MuonEFCB_upstream_Fit
+        description = muChain1 corresponds to chain HLT_mu8.
       }
       hist muChain1_L2MuonSA_Turn_On_Curve_wrt_L1_Endcap_Fit {
         output = HLT/TRMUO/Expert/muChain1/wrtUpstream
         algorithm = TRMUO_fermi_fit_mu10_L2MuonSA_upstream_Fit
+        description = muChain1 corresponds to chain HLT_mu8.
       }
       hist muChain1_MuComb_Turn_On_Curve_wrt_L2MuonSA_Endcap_Fit {
         output = HLT/TRMUO/Expert/muChain1/wrtUpstream
         algorithm = TRMUO_fermi_fit_mu10_muComb_upstream_Fit
+        description = muChain1 corresponds to chain HLT_mu8.
       }
       hist muChain1_EFmuon_Turn_On_Curve_wrt_MuComb_Endcap_Fit {
         output = HLT/TRMUO/Expert/muChain1/wrtUpstream
         algorithm = TRMUO_fermi_fit_mu10_MuonEFCB_upstream_Fit
+        description = muChain1 corresponds to chain HLT_mu8.
       }
 # wrtUpstream/TakenByMSonly
       hist muChain1_MSb_L2MuonSA_Turn_On_Curve_wrt_L1_Fit {
@@ -651,38 +674,47 @@ dir HLT {
       hist muChain1_L2MuonSA_Turn_On_Curve_wrt_MuidCB_Fit {
         output = HLT/TRMUO/Expert/muChain1/wrtOffline
         algorithm = TRMUO_fermi_fit_mu10_L2MuonSA_Fit
+        description = muChain1 corresponds to chain HLT_mu8.
       }
       hist muChain1_MuComb_Turn_On_Curve_wrt_MuidCB_Fit {
         output = HLT/TRMUO/Expert/muChain1/wrtOffline
         algorithm = TRMUO_fermi_fit_mu10_muComb_Fit
+        description = muChain1 corresponds to chain HLT_mu8.
       }
       hist muChain1_EFmuon_Turn_On_Curve_wrt_MuidCB_Fit {
         output = HLT/TRMUO/Expert/muChain1/wrtOffline
         algorithm = TRMUO_fermi_fit_mu10_MuonEFCB_Fit
+        description = muChain1 corresponds to chain HLT_mu8.
       }
       hist muChain1_L2MuonSA_Barrel_Turn_On_Curve_wrt_MuidCB_Fit {
         output = HLT/TRMUO/Expert/muChain1/wrtOffline
         algorithm = TRMUO_fermi_fit_mu10_L2MuonSA_Fit
+        description = muChain1 corresponds to chain HLT_mu8.
       }
       hist muChain1_MuComb_Barrel_Turn_On_Curve_wrt_MuidCB_Fit {
         output = HLT/TRMUO/Expert/muChain1/wrtOffline
         algorithm = TRMUO_fermi_fit_mu10_muComb_Fit
+        description = muChain1 corresponds to chain HLT_mu8.
       }
       hist muChain1_EFmuon_Barrel_Turn_On_Curve_wrt_MuidCB_Fit {
         output = HLT/TRMUO/Expert/muChain1/wrtOffline
         algorithm = TRMUO_fermi_fit_mu10_MuonEFCB_Fit
+        description = muChain1 corresponds to chain HLT_mu8.
       }
       hist muChain1_L2MuonSA_Endcap_Turn_On_Curve_wrt_MuidCB_Fit {
         output = HLT/TRMUO/Expert/muChain1/wrtOffline
         algorithm = TRMUO_fermi_fit_mu10_L2MuonSA_Fit
+        description = muChain1 corresponds to chain HLT_mu8.
       }
       hist muChain1_MuComb_Endcap_Turn_On_Curve_wrt_MuidCB_Fit {
         output = HLT/TRMUO/Expert/muChain1/wrtOffline
         algorithm = TRMUO_fermi_fit_mu10_muComb_Fit
+        description = muChain1 corresponds to chain HLT_mu8.
       }
       hist muChain1_EFmuon_Endcap_Turn_On_Curve_wrt_MuidCB_Fit {
         output = HLT/TRMUO/Expert/muChain1/wrtOffline
         algorithm = TRMUO_fermi_fit_mu10_MuonEFCB_Fit
+        description = muChain1 corresponds to chain HLT_mu8.
       }
 # wrtOffline/TakenByMSonly
       hist muChain1_MSb_L2MuonSA_Turn_On_Curve_wrt_MuidCB_Fit {
@@ -731,14 +763,14 @@ dir HLT {
       hist muChain2_highpt_effsummary_by_ESid {
         output = HLT/TRMUO/Expert/ES_muChain2
         algorithm = TRMUO_GatherDataNoRef
-        description = muChain2 corresponds to chain HLT_mu14. Shifters could click on the link (BinContentDump) on bottom right to see the history efficiencies for each bin. 
+        description = muChain2 corresponds to chain HLT_mu3. Shifters could click on the link (BinContentDump) on bottom right to see the history efficiencies for each bin. 
 	#description = check history efficiencies <a href="https://atlasdqm.cern.ch/dqmfquery/query?histogram=HLT%2FTRMUO%2FShift%2FES_muChain2%2Fmu6_highpt_effsummary_by_ESid%40shifter&result=BinContentDump%7CEF+algorithm&error=&stream=express_express&period_type=run&source=tier0&proc_ver=1&low_run=201000&high_run=&low_y=0.85&high_y=1.05&outputtype=png">EF algorithm</a> <a href="https://atlasdqm.cern.ch/dqmfquery/query?histogram=HLT%2FTRMUO%2FShift%2FES_muChain2%2Fmu6_highpt_effsummary_by_ESid%40shifter&result=BinContentDump%7CMuComb&error=&stream=express_express&period_type=run&source=tier0&proc_ver=1&low_run=201000&high_run=&low_y=0.85&high_y=1.05&outputtype=png" >MuComb</a> <a href="https://atlasdqm.cern.ch/dqmfquery/query?histogram=HLT%2FTRMUO%2FShift%2FES_muChain2%2Fmu6_highpt_effsummary_by_ESid%40shifter&result=BinContentDump%7CL2MuonSA&error=&stream=express_express&period_type=run&source=tier0&proc_ver=1&low_run=201000&high_run=&low_y=0.85&high_y=1.05&outputtype=png">L2MuonSA</a>
         ## need to put reference and compare!
       }
       hist muChain2_highpt_effsummary_by_ESid@shifter {
         output = HLT/TRMUO/Shift/ES_muChain2
         algorithm = effalgmin_3bins
-        description = muChain2 corresponds to chain HLT_mu14. Shifters could click on the link (BinContentDump) on bottom right to see the history efficiencies for each bin. 
+        description = muChain2 corresponds to chain HLT_mu3. Shifters could click on the link (BinContentDump) on bottom right to see the history efficiencies for each bin. 
 #	description = check history efficiencies <a href="https://atlasdqm.cern.ch/dqmfquery/query?histogram=HLT%2FTRMUO%2FShift%2FES_muChain2%2Fmu6_highpt_effsummary_by_ESid%40shifter&result=BinContentDump%7CEF+algorithm&error=BinContentDump%7CEF+algorithmError&stream=express_express&period_type=run&source=tier0&proc_ver=1&low_run=201000&high_run=&low_y=0.85&high_y=1.05&outputtype=png">EF algorithm</a> <a href="https://atlasdqm.cern.ch/dqmfquery/query?histogram=HLT%2FTRMUO%2FShift%2FES_muChain2%2Fmu6_highpt_effsummary_by_ESid%40shifter&result=BinContentDump%7CMuComb&error=BinContentDump%7CMuCombError&stream=express_express&period_type=run&source=tier0&proc_ver=1&low_run=201000&high_run=&low_y=0.85&high_y=1.05&outputtype=png" >MuComb</a> <a href="https://atlasdqm.cern.ch/dqmfquery/query?histogram=HLT%2FTRMUO%2FShift%2FES_muChain2%2Fmu6_highpt_effsummary_by_ESid%40shifter&result=BinContentDump%7CL2MuonSA&error=BinContentDump%7CL2MuonSAError&stream=express_express&period_type=run&source=tier0&proc_ver=1&low_run=201000&high_run=&low_y=0.85&high_y=1.05&outputtype=png">L2MuonSA</a>
         ## need to put reference and compare!
       }
@@ -747,51 +779,63 @@ dir HLT {
       hist muChain2_ESid_L2MuonSA_Turn_On_Curve_wrt_L1_Fit {
         output = HLT/TRMUO/Expert/ES_muChain2/idtrk/wrtUpstream
         algorithm = TRMUO_fermi_fit_mu14_L2MuonSA_upstream_Fit
+	description = muChain2 corresponds to chain HLT_mu3.
       }
       hist muChain2_ESid_MuComb_Turn_On_Curve_wrt_L2MuonSA_Fit {
         output = HLT/TRMUO/Expert/ES_muChain2/idtrk/wrtUpstream
         algorithm = TRMUO_fermi_fit_mu14_muComb_upstream_Fit
+	description = muChain2 corresponds to chain HLT_mu3.
       }
       hist muChain2_ESid_EFmuon_Turn_On_Curve_wrt_MuComb_Fit {
         output = HLT/TRMUO/Expert/ES_muChain2/idtrk/wrtUpstream
         algorithm = TRMUO_fermi_fit_mu14_MuonEFCB_upstream_Fit
+	description = muChain2 corresponds to chain HLT_mu3.
       }
       hist muChain2_ESid_L2MuonSA_Turn_On_Curve_wrt_L1_Fit@shifter {
         output = HLT/TRMUO/Shift/ES_muChain2
         algorithm = TRMUO_fermi_fit_mu14_ESid_L2MuonSA_upstream_Fit
+	description = muChain2 corresponds to chain HLT_mu3.
       }
       hist muChain2_ESid_MuComb_Turn_On_Curve_wrt_L2MuonSA_Fit@shifter {
         output = HLT/TRMUO/Shift/ES_muChain2
         algorithm = TRMUO_fermi_fit_mu14_ESid_muComb_upstream_Fit
+	description = muChain2 corresponds to chain HLT_mu3.
       }
       hist muChain2_ESid_EFmuon_Turn_On_Curve_wrt_MuComb_Fit@shifter {
         output = HLT/TRMUO/Shift/ES_muChain2
         algorithm = TRMUO_fermi_fit_mu14_ESid_MuonEFCB_upstream_Fit
+	description = muChain2 corresponds to chain HLT_mu3.
       }
 # ESid/wrtOffline
       hist muChain2_ESid_L1_Turn_On_Curve_wrt_MuidCB_Fit {
         output = HLT/TRMUO/Expert/ES_muChain2/idtrk/wrtOffline
         algorithm = TRMUO_fermi_fit_L1MU0_Fit
+	description = muChain2 corresponds to chain HLT_mu3.
       }
       hist muChain2_ESid_L1_Barrel_Turn_On_Curve_wrt_MuidCB_Fit {
         output = HLT/TRMUO/Expert/ES_muChain2/idtrk/wrtOffline
         algorithm = TRMUO_fermi_fit_L1MU0_barrel_Fit
+	description = muChain2 corresponds to chain HLT_mu3.
       }
       hist muChain2_ESid_L1_Endcap_Turn_On_Curve_wrt_MuidCB_Fit {
         output = HLT/TRMUO/Expert/ES_muChain2/idtrk/wrtOffline
         algorithm = TRMUO_fermi_fit_L1MU0_endcap_Fit
+	description = muChain2 corresponds to chain HLT_mu3.
       }
       hist muChain2_ESid_L2MuonSA_Turn_On_Curve_wrt_MuidCB_Fit {
         output = HLT/TRMUO/Expert/ES_muChain2/idtrk/wrtOffline
         algorithm = TRMUO_fermi_fit_mu14_L2MuonSA_Fit
+	description = muChain2 corresponds to chain HLT_mu3.
       }
       hist muChain2_ESid_MuComb_Turn_On_Curve_wrt_MuidCB_Fit {
         output = HLT/TRMUO/Expert/ES_muChain2/idtrk/wrtOffline
         algorithm = TRMUO_fermi_fit_mu14_muComb_Fit
+	description = muChain2 corresponds to chain HLT_mu3.
       }
       hist muChain2_ESid_EFmuon_Turn_On_Curve_wrt_MuidCB_Fit {
         output = HLT/TRMUO/Expert/ES_muChain2/idtrk/wrtOffline
         algorithm = TRMUO_fermi_fit_mu14_MuonEFCB_Fit
+	description = muChain2 corresponds to chain HLT_mu3.
       }
 
 ### mu14 (all ES and bulk)
@@ -799,19 +843,20 @@ dir HLT {
       hist muChain2_highptL1plateau_wrtOffline {
         output = HLT/TRMUO/Expert/muChain2
         algorithm = TRMUO_GatherDataNoRef
+	description = muChain2 corresponds to chain HLT_mu3.
         ## need to put reference and compare!
       }
       hist muChain2_highpt3bins_effwrtL1 {
         output = HLT/TRMUO/Expert/muChain2
         algorithm = TRMUO_GatherDataNoRef
-	description = muChain2 corresponds to chain HLT_mu14. For express stream, efficiencies measured with Jpsi T&P method are biased due to stream prescales, thus expected to be larger than reference. For physics stream, no such bias. Shifters should check the efficiencies carefully for physics stream.
+	description = muChain2 corresponds to chain HLT_mu3. For express stream, efficiencies measured with Jpsi T&P method are biased due to stream prescales, thus expected to be larger than reference. For physics stream, no such bias. Shifters should check the efficiencies carefully for physics stream.
 	#description = check history efficiencies: <br> express_express: <a href="https://atlasdqm.cern.ch/dqmfquery/query?histogram=HLT%2FTRMUO%2FShift%2FZTP%2Fmu6_highpt3bins_effwrtL1%40shifter&result=BinContentDump%7C30-50+GeV+Z+T%26P&error=&stream=express_express&period_type=run&source=tier0&proc_ver=1&low_run=201000&high_run=&low_y=-0.05&high_y=1.05&outputtype=png">30-50 GeV Z T&P</a> <a href="https://atlasdqm.cern.ch/dqmfquery/query?histogram=HLT%2FTRMUO%2FShift%2FZTP%2Fmu6_highpt3bins_effwrtL1%40shifter&result=BinContentDump%7C50-100+GeV+Z+T%26P&error=&stream=express_express&period_type=run&source=tier0&proc_ver=1&low_run=201000&high_run=&low_y=-0.05&high_y=1.05&outputtype=png">50-100 GeV Z T&P</a> <a href="https://atlasdqm.cern.ch/dqmfquery/query?histogram=HLT%2FTRMUO%2FShift%2FZTP%2Fmu6_highpt3bins_effwrtL1%40shifter&result=BinContentDump%7C100-300+GeV+MSonly_barrel-tagged&error=&stream=express_express&period_type=run&source=tier0&proc_ver=1&low_run=201000&high_run=&low_y=-0.05&high_y=1.05&outputtype=png">100-300 GeV MSonly_barrel-tagged</a> <br> physics_Muons: <a href="https://atlasdqm.cern.ch/dqmfquery/query?histogram=HLT%2FTRMUO%2FShift%2FZTP%2Fmu6_highpt3bins_effwrtL1%40shifter&result=BinContentDump%7C30-50+GeV+Z+T%26P&error=&stream=physics_Muons&period_type=run&source=tier0&proc_ver=1&low_run=201000&high_run=&low_y=-0.05&high_y=1.05&outputtype=png">30-50 GeV Z T&P</a> <a href="https://atlasdqm.cern.ch/dqmfquery/query?histogram=HLT%2FTRMUO%2FShift%2FZTP%2Fmu6_highpt3bins_effwrtL1%40shifter&result=BinContentDump%7C50-100+GeV+Z+T%26P&error=&stream=physics_Muons&period_type=run&source=tier0&proc_ver=1&low_run=201000&high_run=&low_y=-0.05&high_y=1.05&outputtype=png">50-100 GeV Z T&P</a> <a href="https://atlasdqm.cern.ch/dqmfquery/query?histogram=HLT%2FTRMUO%2FShift%2FZTP%2Fmu6_highpt3bins_effwrtL1%40shifter&result=BinContentDump%7C100-300+GeV+MSonly_barrel-tagged&error=&stream=physics_Muons&period_type=run&source=tier0&proc_ver=1&low_run=201000&high_run=&low_y=-0.05&high_y=1.05&outputtype=png">100-300 GeV MSonly_barrel-tagged</a>
         ## need to put reference and compare!
       }
       hist muChain2_highpt3bins_effwrtL1@shifter {
         output = HLT/TRMUO/Shift/JpsiTP
         algorithm = effalgmin_2bins
-	description = muChain2 corresponds to chain HLT_mu14. For express stream, efficiencies measured with Jpsi T&P method are biased due to stream prescales, thus expected to be larger than reference. For physics stream, no such bias. Shifters should check the efficiencies carefully for physics stream.
+	description = muChain2 corresponds to chain HLT_mu3. For express stream, efficiencies measured with Jpsi T&P method are biased due to stream prescales, thus expected to be larger than reference. For physics stream, no such bias. Shifters should check the efficiencies carefully for physics stream.
 	#description = check history efficiencies: <br> express_express: <a href="https://atlasdqm.cern.ch/dqmfquery/query?histogram=HLT%2FTRMUO%2FShift%2FZTP%2Fmu6_highpt3bins_effwrtL1%40shifter&result=BinContentDump%7C30-50+GeV+Z+T%26P&error=BinContentDump%7C30-50+GeV+Z+T%26PError&stream=express_express&period_type=run&source=tier0&proc_ver=1&low_run=201000&high_run=&low_y=0.75&high_y=0.90&outputtype=png">30-50 GeV Z T&P</a> <a href="https://atlasdqm.cern.ch/dqmfquery/query?histogram=HLT%2FTRMUO%2FShift%2FZTP%2Fmu6_highpt3bins_effwrtL1%40shifter&result=BinContentDump%7C50-100+GeV+Z+T%26P&error=BinContentDump%7C50-100+GeV+Z+T%26PError&stream=express_express&period_type=run&source=tier0&proc_ver=1&low_run=201000&high_run=&low_y=0.90&high_y=1.01&outputtype=png">50-100 GeV Z T&P</a> <a href="https://atlasdqm.cern.ch/dqmfquery/query?histogram=HLT%2FTRMUO%2FShift%2FZTP%2Fmu6_highpt3bins_effwrtL1%40shifter&result=BinContentDump%7C100-300+GeV+MSonly_barrel-tagged&error=BinContentDump%7C100-300+GeV+MSonly_barrel-taggedError&stream=express_express&period_type=run&source=tier0&proc_ver=1&low_run=201000&high_run=&low_y=0.90&high_y=1.01&outputtype=png">100-300 GeV MSonly_barrel-tagged</a> <br> physics_Muons: <a href="https://atlasdqm.cern.ch/dqmfquery/query?histogram=HLT%2FTRMUO%2FShift%2FZTP%2Fmu6_highpt3bins_effwrtL1%40shifter&result=BinContentDump%7C30-50+GeV+Z+T%26P&error=BinContentDump%7C30-50+GeV+Z+T%26PError&stream=physics_Muons&period_type=run&source=tier0&proc_ver=1&low_run=201000&high_run=&low_y=0.75&high_y=0.90&outputtype=png">30-50 GeV Z T&P</a> <a href="https://atlasdqm.cern.ch/dqmfquery/query?histogram=HLT%2FTRMUO%2FShift%2FZTP%2Fmu6_highpt3bins_effwrtL1%40shifter&result=BinContentDump%7C50-100+GeV+Z+T%26P&error=BinContentDump%7C50-100+GeV+Z+T%26PError&stream=physics_Muons&period_type=run&source=tier0&proc_ver=1&low_run=201000&high_run=&low_y=0.90&high_y=1.01&outputtype=png">50-100 GeV Z T&P</a> <a href="https://atlasdqm.cern.ch/dqmfquery/query?histogram=HLT%2FTRMUO%2FShift%2FZTP%2Fmu6_highpt3bins_effwrtL1%40shifter&result=BinContentDump%7C100-300+GeV+MSonly_barrel-tagged&error=BinContentDump%7C100-300+GeV+MSonly_barrel-taggedError&stream=physics_Muons&period_type=run&source=tier0&proc_ver=1&low_run=201000&high_run=&low_y=0.90&high_y=1.01&outputtype=png">100-300 GeV MSonly_barrel-tagged</a>
         ## need to put reference and compare!
       }
@@ -824,38 +869,47 @@ dir HLT {
       hist muChain2_L2MuonSA_Turn_On_Curve_wrt_L1_Fit {
         output = HLT/TRMUO/Expert/muChain2/wrtUpstream
         algorithm = TRMUO_fermi_fit_mu14_L2MuonSA_upstream_Fit
+	description = muChain2 corresponds to chain HLT_mu3.
       }
       hist muChain2_MuComb_Turn_On_Curve_wrt_L2MuonSA_Fit {
         output = HLT/TRMUO/Expert/muChain2/wrtUpstream
         algorithm = TRMUO_fermi_fit_mu14_muComb_upstream_Fit
+	description = muChain2 corresponds to chain HLT_mu3.
       }
       hist muChain2_EFmuon_Turn_On_Curve_wrt_MuComb_Fit {
         output = HLT/TRMUO/Expert/muChain2/wrtUpstream
         algorithm = TRMUO_fermi_fit_mu14_MuonEFCB_upstream_Fit
+	description = muChain2 corresponds to chain HLT_mu3.
       }
       hist muChain2_L2MuonSA_Turn_On_Curve_wrt_L1_Barrel_Fit {
         output = HLT/TRMUO/Expert/muChain2/wrtUpstream
         algorithm = TRMUO_fermi_fit_mu14_L2MuonSA_upstream_Fit
+	description = muChain2 corresponds to chain HLT_mu3.
       }
       hist muChain2_MuComb_Turn_On_Curve_wrt_L2MuonSA_Barrel_Fit {
         output = HLT/TRMUO/Expert/muChain2/wrtUpstream
         algorithm = TRMUO_fermi_fit_mu14_muComb_upstream_Fit
+	description = muChain2 corresponds to chain HLT_mu3.
       }
       hist muChain2_EFmuon_Turn_On_Curve_wrt_MuComb_Barrel_Fit {
         output = HLT/TRMUO/Expert/muChain2/wrtUpstream
         algorithm = TRMUO_fermi_fit_mu14_MuonEFCB_upstream_Fit
+	description = muChain2 corresponds to chain HLT_mu3.
       }
       hist muChain2_L2MuonSA_Turn_On_Curve_wrt_L1_Endcap_Fit {
         output = HLT/TRMUO/Expert/muChain2/wrtUpstream
         algorithm = TRMUO_fermi_fit_mu14_L2MuonSA_upstream_Fit
+	description = muChain2 corresponds to chain HLT_mu3.
       }
       hist muChain2_MuComb_Turn_On_Curve_wrt_L2MuonSA_Endcap_Fit {
         output = HLT/TRMUO/Expert/muChain2/wrtUpstream
         algorithm = TRMUO_fermi_fit_mu14_muComb_upstream_Fit
+	description = muChain2 corresponds to chain HLT_mu3.
       }
       hist muChain2_EFmuon_Turn_On_Curve_wrt_MuComb_Endcap_Fit {
         output = HLT/TRMUO/Expert/muChain2/wrtUpstream
         algorithm = TRMUO_fermi_fit_mu14_MuonEFCB_upstream_Fit
+	description = muChain2 corresponds to chain HLT_mu3.
       }
 # wrtUpstream/TakenByMSonly
       hist muChain2_MSb_L2MuonSA_Turn_On_Curve_wrt_L1_Fit {
@@ -899,38 +953,47 @@ dir HLT {
       hist muChain2_L2MuonSA_Turn_On_Curve_wrt_MuidCB_Fit {
         output = HLT/TRMUO/Expert/muChain2/wrtOffline
         algorithm = TRMUO_fermi_fit_mu14_L2MuonSA_Fit
+	description = muChain2 corresponds to chain HLT_mu3.
       }
       hist muChain2_MuComb_Turn_On_Curve_wrt_MuidCB_Fit {
         output = HLT/TRMUO/Expert/muChain2/wrtOffline
         algorithm = TRMUO_fermi_fit_mu14_muComb_Fit
+	description = muChain2 corresponds to chain HLT_mu3.
       }
       hist muChain2_EFmuon_Turn_On_Curve_wrt_MuidCB_Fit {
         output = HLT/TRMUO/Expert/muChain2/wrtOffline
         algorithm = TRMUO_fermi_fit_mu14_MuonEFCB_Fit
+	description = muChain2 corresponds to chain HLT_mu3.
       }
       hist muChain2_L2MuonSA_Barrel_Turn_On_Curve_wrt_MuidCB_Fit {
         output = HLT/TRMUO/Expert/muChain2/wrtOffline
         algorithm = TRMUO_fermi_fit_mu14_L2MuonSA_Fit
+	description = muChain2 corresponds to chain HLT_mu3.
       }
       hist muChain2_MuComb_Barrel_Turn_On_Curve_wrt_MuidCB_Fit {
         output = HLT/TRMUO/Expert/muChain2/wrtOffline
         algorithm = TRMUO_fermi_fit_mu14_muComb_Fit
+	description = muChain2 corresponds to chain HLT_mu3.
       }
       hist muChain2_EFmuon_Barrel_Turn_On_Curve_wrt_MuidCB_Fit {
         output = HLT/TRMUO/Expert/muChain2/wrtOffline
         algorithm = TRMUO_fermi_fit_mu14_MuonEFCB_Fit
+	description = muChain2 corresponds to chain HLT_mu3.
       }
       hist muChain2_L2MuonSA_Endcap_Turn_On_Curve_wrt_MuidCB_Fit {
         output = HLT/TRMUO/Expert/muChain2/wrtOffline
         algorithm = TRMUO_fermi_fit_mu14_L2MuonSA_Fit
+	description = muChain2 corresponds to chain HLT_mu3.
       }
       hist muChain2_MuComb_Endcap_Turn_On_Curve_wrt_MuidCB_Fit {
         output = HLT/TRMUO/Expert/muChain2/wrtOffline
         algorithm = TRMUO_fermi_fit_mu14_muComb_Fit
+	description = muChain2 corresponds to chain HLT_mu3.
       }
       hist muChain2_EFmuon_Endcap_Turn_On_Curve_wrt_MuidCB_Fit {
         output = HLT/TRMUO/Expert/muChain2/wrtOffline
         algorithm = TRMUO_fermi_fit_mu14_MuonEFCB_Fit
+	description = muChain2 corresponds to chain HLT_mu3.
       }
 # wrtOffline/TakenByMSonly
       hist muChain2_MSb_L2MuonSA_Turn_On_Curve_wrt_MuidCB_Fit {
@@ -3415,16 +3478,16 @@ thresholds th_TRMUO_fermi_fit_mu15_MSonly_EStag_MuonEFSA_upstream {
 
 thresholds th_TRMUO_fermi_fit_mu10_ESid_L2MuonSA_upstream {
   limits Plateau {
-    warning = 0.93
-    error = 0.929
+    warning = 0.95
+    error = 0.93
   }
   limits Threshold {
-    warning = 10.0
-    error   = 11.0
+    warning = 8.0
+    error   = 10.0
   }
   limits Resolution {
-    warning = 1.0
-    error   = 2.0
+    warning = 2.0
+    error   = 3.0
   }
 }
 
@@ -3463,16 +3526,16 @@ thresholds th_TRMUO_fermi_fit_mu10_ESid_MuonEFCB_upstream {
 #for Shift mu14
 thresholds th_TRMUO_fermi_fit_mu14_ESid_L2MuonSA_upstream {
   limits Plateau {
-    warning = 0.70
-    error = 0.699
+    warning = 0.95
+    error = 0.93
   }
   limits Threshold {
-    warning = 14.0
-    error = 15.0
+    warning = 5.0
+    error = 7.0
   }
   limits Resolution {
-    warning = 1.0
-    error   = 2.0
+    warning = 2.0
+    error   = 3.0
   }
 }
 
@@ -3481,11 +3544,11 @@ thresholds th_TRMUO_fermi_fit_mu14_ESid_muComb_upstream {
 #    warning = 0.98 # 120830
 #   warning = 0.97 # 110909
     warning = 0.95
-    error = 0.949
+    error = 0.93
   }
   limits Threshold {
-    warning = 14.0
-    error = 15.0
+    warning = 5.0
+    error = 7.0
   }
   limits Resolution {
     warning = 1.0
@@ -3496,16 +3559,16 @@ thresholds th_TRMUO_fermi_fit_mu14_ESid_muComb_upstream {
 
 thresholds th_TRMUO_fermi_fit_mu14_ESid_MuonEFCB_upstream {
   limits Plateau {
-    warning = 0.98
-    error = 0.979
+    warning = 0.95
+    error = 0.93
   }
   limits Threshold {
-    warning = 14.0
-    error = 15.0
+    warning = 5.0
+    error = 7.0
   }
   limits Resolution {
-    warning = 0.5
-    error   = 1.0
+    warning = 1.0
+    error   = 2.0
   }
 }
 
@@ -3683,8 +3746,8 @@ thresholds th_TRMUO_fermi_fit_mu10_L2MuonSA_upstream {
     error   = 11.0
   }
   limits Resolution {
-    warning = 1.0
-    error   = 2.0
+    warning = 2.0
+    error   = 3.0
   }
 }
 
diff --git a/DataQuality/DataQualityConfigurations/config/HLT/HLTtau/collisions_run.config b/DataQuality/DataQualityConfigurations/config/HLT/HLTtau/collisions_run.config
index 94fa0bd324d3c1a617e2f04005920890a272e557..70d314ca99740b3bae37b12e2b053682ba9d0666 100644
--- a/DataQuality/DataQualityConfigurations/config/HLT/HLTtau/collisions_run.config
+++ b/DataQuality/DataQualityConfigurations/config/HLT/HLTtau/collisions_run.config
@@ -15,988 +15,784 @@
 
 
 output top_level {
-	output HLT {
-		output TauMon {
-			output Expert {
-				output Emulation {
-				}
-				output HLTefficiency {
-					output EffRatios_FTKvsNonFTK {
-					}
-				}
-				output RealZtautauEff {
-					output tau25_medium1_tracktwo {
-					}
-				}
-				output TopoDiTau {
-					output tau35_medium1_tracktwoEF_tau25_medium1_tracktwoEF {
-					}
-					output tau35_medium1_tracktwoEF_tau25_medium1_tracktwoEF_03dR30_L1DR-TAU20ITAU12I-J25 {
-					}
-					output tau35_medium1_tracktwoEF_tau25_medium1_tracktwoEF_L1DR-TAU20ITAU12I-J25 {
-					}
-					output tau35_medium1_tracktwo_tau25_medium1_tracktwo {
-					}
-					output tau35_medium1_tracktwo_tau25_medium1_tracktwo_03dR30_L1DR-TAU20ITAU12I {
-					}
-					output tau35_medium1_tracktwo_tau25_medium1_tracktwo_03dR30_L1DR-TAU20ITAU12I-J25 {
-					}
-					output tau35_medium1_tracktwo_tau25_medium1_tracktwo_L1DR-TAU20ITAU12I {
-					}
-					output tau35_medium1_tracktwo_tau25_medium1_tracktwo_L1DR-TAU20ITAU12I-J25 {
-					}
-					output tau35_medium1_tracktwo_tau25_medium1_tracktwo_L1TAU20IM_2TAU12IM {
-					}
-					output tau80_medium1_tracktwoEF_L1TAU60_tau35_medium1_tracktwoEF_L1TAU12IM_L1TAU60_DR-TAU20ITAU12I {
-					}
-					output tau80_medium1_tracktwo_L1TAU60_tau35_medium1_tracktwo_L1TAU12IM_L1TAU60_DR-TAU20ITAU12I {
-					}
-				}
-				output TopoElTau {
-					output e17_lhmedium_nod0_ivarloose_tau25_medium1_tracktwo {
-					}
-					output e17_lhmedium_nod0_ivarloose_tau25_medium1_tracktwo_L1DR-EM15TAU12I-J25 {
-					}
-				}
-				output TopoMuTau {
-					output mu14_ivarloose_tau25_medium1_tracktwo {
-					}
-					output mu14_ivarloose_tau25_medium1_tracktwo_L1DR-MU10TAU12I_TAU12I-J25 {
-					}
-				}
-				output dijetFakeTausEff {
-					output tau160_idperf_tracktwo_L1TAU100 {
-					}
-					output tau160_medium1_tracktwo_L1TAU100 {
-					}
-					output tau80_medium1_tracktwo_L1TAU60 {
-					}
-				}
-				output tau0_perf_ptonly_L1TAU100 {
-					output EFTau {
-						output BDT {
-							output 1p_nonCorrected {
-							}
-							output mp_nonCorrected {
-							}
-						}
-					}
-					output EFVsOffline {
-						output BDT {
-							output 1p_nonCorrected {
-							}
-							output mp_nonCorrected {
-							}
-						}
-					}
-					output L1RoI {
-					}
-					output L1VsOffline {
-					}
-					output TurnOnCurves {
-						output RecoEfficiency {
-						}
-					}
-				}
-				output tau0_perf_ptonly_L1TAU12 {
-					output EFTau {
-						output BDT {
-							output 1p_nonCorrected {
-							}
-							output mp_nonCorrected {
-							}
-						}
-					}
-					output EFVsOffline {
-						output BDT {
-							output 1p_nonCorrected {
-							}
-							output mp_nonCorrected {
-							}
-						}
-					}
-					output L1RoI {
-					}
-					output L1VsOffline {
-					}
-					output TurnOnCurves {
-						output RecoEfficiency {
-						}
-					}
-				}
-				output tau160_idperf_tracktwo_L1TAU100 {
-					output EFTau {
-						output BDT {
-							output 1p_nonCorrected {
-							}
-							output mp_nonCorrected {
-							}
-						}
-					}
-					output EFVsOffline {
-						output BDT {
-							output 1p_nonCorrected {
-							}
-							output mp_nonCorrected {
-							}
-						}
-					}
-					output L1RoI {
-					}
-					output L1VsOffline {
-					}
-					output PreselectionTau {
-					}
-					output PreselectionVsOffline {
-					}
-					output TurnOnCurves {
-						output RecoEfficiency {
-						}
-					}
-				}
-				output tau160_medium1_tracktwo_L1TAU100 {
-					output EFTau {
-						output BDT {
-							output 1p_nonCorrected {
-							}
-							output mp_nonCorrected {
-							}
-						}
-					}
-					output EFVsOffline {
-						output BDT {
-							output 1p_nonCorrected {
-							}
-							output mp_nonCorrected {
-							}
-						}
-					}
-					output L1RoI {
-					}
-					output L1VsOffline {
-					}
-					output PreselectionTau {
-					}
-					output PreselectionVsOffline {
-					}
-					output TurnOnCurves {
-						output RecoEfficiency {
-						}
-					}
-				}
-				output tau160_perf_tracktwo_L1TAU100 {
-					output EFTau {
-						output BDT {
-							output 1p_nonCorrected {
-							}
-							output mp_nonCorrected {
-							}
-						}
-					}
-					output EFVsOffline {
-						output BDT {
-							output 1p_nonCorrected {
-							}
-							output mp_nonCorrected {
-							}
-						}
-					}
-					output L1RoI {
-					}
-					output L1VsOffline {
-					}
-					output PreselectionTau {
-					}
-					output PreselectionVsOffline {
-					}
-					output TurnOnCurves {
-						output RecoEfficiency {
-						}
-					}
-				}
-				output tau25_idperf_tracktwo {
-					output EFTau {
-						output BDT {
-							output 1p_nonCorrected {
-							}
-							output mp_nonCorrected {
-							}
-						}
-					}
-					output EFVsOffline {
-						output BDT {
-							output 1p_nonCorrected {
-							}
-							output mp_nonCorrected {
-							}
-						}
-					}
-					output L1RoI {
-					}
-					output L1VsOffline {
-					}
-					output PreselectionTau {
-					}
-					output PreselectionVsOffline {
-					}
-					output TurnOnCurves {
-						output RecoEfficiency {
-						}
-					}
-				}
-				output tau25_idperf_tracktwoEF {
-					output EFTau {
-						output BDT {
-							output 1p_nonCorrected {
-							}
-							output mp_nonCorrected {
-							}
-						}
-					}
-					output EFVsOffline {
-						output BDT {
-							output 1p_nonCorrected {
-							}
-							output mp_nonCorrected {
-							}
-						}
-					}
-					output L1RoI {
-					}
-					output L1VsOffline {
-					}
-					output TurnOnCurves {
-						output RecoEfficiency {
-						}
-					}
-				}
-				output tau25_idperf_tracktwoEFmvaTES {
-					output EFTau {
-						output BDT {
-							output 1p_nonCorrected {
-							}
-							output mp_nonCorrected {
-							}
-						}
-					}
-					output EFVsOffline {
-						output BDT {
-							output 1p_nonCorrected {
-							}
-							output mp_nonCorrected {
-							}
-						}
-					}
-					output L1RoI {
-					}
-					output L1VsOffline {
-					}
-					output TurnOnCurves {
-						output RecoEfficiency {
-						}
-					}
-				}
-				output tau25_idperf_tracktwoMVA {
-					output EFTau {
-						output BDT {
-							output 1p_nonCorrected {
-							}
-							output mp_nonCorrected {
-							}
-						}
-						output RNN {
-							output InputScalar1p {
-							}
-							output InputScalar3p {
-							}
-							output Output {
-							}
-						}
-					}
-					output EFVsOffline {
-						output BDT {
-							output 1p_nonCorrected {
-							}
-							output mp_nonCorrected {
-							}
-						}
-					}
-					output L1RoI {
-					}
-					output L1VsOffline {
-					}
-					output TurnOnCurves {
-						output RecoEfficiency {
-						}
-					}
-				}
-				output tau25_looseRNN_tracktwo {
-					output EFTau {
-						output RNN {
-							output InputScalar1p {
-							}
-							output InputScalar3p {
-							}
-							output Output {
-							}
-						}
-					}
-					output EFVsOffline {
-						output BDT {
-							output 1p_nonCorrected {
-							}
-							output mp_nonCorrected {
-							}
-						}
-					}
-					output L1RoI {
-					}
-					output L1VsOffline {
-					}
-					output PreselectionTau {
-					}
-					output PreselectionVsOffline {
-					}
-					output TurnOnCurves {
-						output RecoEfficiency {
-						}
-					}
-				}
-				output tau25_looseRNN_tracktwoMVA {
-					output EFTau {
-						output RNN {
-							output InputScalar1p {
-							}
-							output InputScalar3p {
-							}
-							output Output {
-							}
-						}
-					}
-					output EFVsOffline {
-						output BDT {
-							output 1p_nonCorrected {
-							}
-							output mp_nonCorrected {
-							}
-						}
-					}
-					output L1RoI {
-					}
-					output L1VsOffline {
-					}
-					output TurnOnCurves {
-						output RecoEfficiency {
-						}
-					}
-				}
-				output tau25_medium1NoPt_tracktwoEFmvaTES {
-					output EFTau {
-						output BDT {
-							output 1p_nonCorrected {
-							}
-							output mp_nonCorrected {
-							}
-						}
-					}
-					output EFVsOffline {
-						output BDT {
-							output 1p_nonCorrected {
-							}
-							output mp_nonCorrected {
-							}
-						}
-					}
-					output L1RoI {
-					}
-					output L1VsOffline {
-					}
-					output TurnOnCurves {
-						output RecoEfficiency {
-						}
-					}
-				}
-				output tau25_medium1_tracktwo {
-					output EFTau {
-						output BDT {
-							output 1p_nonCorrected {
-							}
-							output mp_nonCorrected {
-							}
-						}
-					}
-					output EFVsOffline {
-						output BDT {
-							output 1p_nonCorrected {
-							}
-							output mp_nonCorrected {
-							}
-						}
-					}
-					output L1RoI {
-					}
-					output L1VsOffline {
-					}
-					output PreselectionTau {
-					}
-					output PreselectionVsOffline {
-					}
-					output TurnOnCurves {
-						output RecoEfficiency {
-						}
-					}
-				}
-				output tau25_medium1_tracktwoEF {
-					output EFTau {
-						output BDT {
-							output 1p_nonCorrected {
-							}
-							output mp_nonCorrected {
-							}
-						}
-					}
-					output EFVsOffline {
-						output BDT {
-							output 1p_nonCorrected {
-							}
-							output mp_nonCorrected {
-							}
-						}
-					}
-					output L1RoI {
-					}
-					output L1VsOffline {
-					}
-					output TurnOnCurves {
-						output RecoEfficiency {
-						}
-					}
-				}
-				output tau25_medium1_tracktwoEFmvaTES {
-					output EFTau {
-						output BDT {
-							output 1p_nonCorrected {
-							}
-							output mp_nonCorrected {
-							}
-						}
-					}
-					output EFVsOffline {
-						output BDT {
-							output 1p_nonCorrected {
-							}
-							output mp_nonCorrected {
-							}
-						}
-					}
-					output L1RoI {
-					}
-					output L1VsOffline {
-					}
-					output TurnOnCurves {
-						output RecoEfficiency {
-						}
-					}
-				}
-				output tau25_medium1_tracktwoMVA {
-					output EFTau {
-						output BDT {
-							output 1p_nonCorrected {
-							}
-							output mp_nonCorrected {
-							}
-						}
-					}
-					output EFVsOffline {
-						output BDT {
-							output 1p_nonCorrected {
-							}
-							output mp_nonCorrected {
-							}
-						}
-					}
-					output L1RoI {
-					}
-					output L1VsOffline {
-					}
-					output TurnOnCurves {
-						output RecoEfficiency {
-						}
-					}
-				}
-				output tau25_mediumRNN_tracktwo {
-					output EFTau {
-						output RNN {
-							output InputScalar1p {
-							}
-							output InputScalar3p {
-							}
-							output Output {
-							}
-						}
-					}
-					output EFVsOffline {
-						output BDT {
-							output 1p_nonCorrected {
-							}
-							output mp_nonCorrected {
-							}
-						}
-					}
-					output L1RoI {
-					}
-					output L1VsOffline {
-					}
-					output PreselectionTau {
-					}
-					output PreselectionVsOffline {
-					}
-					output TurnOnCurves {
-						output RecoEfficiency {
-						}
-					}
-				}
-				output tau25_mediumRNN_tracktwoMVA {
-					output EFTau {
-						output RNN {
-							output InputScalar1p {
-							}
-							output InputScalar3p {
-							}
-							output Output {
-							}
-						}
-					}
-					output EFVsOffline {
-						output BDT {
-							output 1p_nonCorrected {
-							}
-							output mp_nonCorrected {
-							}
-						}
-					}
-					output L1RoI {
-					}
-					output L1VsOffline {
-					}
-					output TurnOnCurves {
-						output RecoEfficiency {
-						}
-					}
-				}
-				output tau25_perf_tracktwo {
-					output EFTau {
-						output BDT {
-							output 1p_nonCorrected {
-							}
-							output mp_nonCorrected {
-							}
-						}
-					}
-					output EFVsOffline {
-						output BDT {
-							output 1p_nonCorrected {
-							}
-							output mp_nonCorrected {
-							}
-						}
-					}
-					output L1RoI {
-					}
-					output L1VsOffline {
-					}
-					output PreselectionTau {
-					}
-					output PreselectionVsOffline {
-					}
-					output TurnOnCurves {
-						output RecoEfficiency {
-						}
-					}
-				}
-				output tau25_perf_tracktwoEF {
-					output EFTau {
-						output BDT {
-							output 1p_nonCorrected {
-							}
-							output mp_nonCorrected {
-							}
-						}
-					}
-					output EFVsOffline {
-						output BDT {
-							output 1p_nonCorrected {
-							}
-							output mp_nonCorrected {
-							}
-						}
-					}
-					output L1RoI {
-					}
-					output L1VsOffline {
-					}
-					output TurnOnCurves {
-						output RecoEfficiency {
-						}
-					}
-				}
-				output tau25_perf_tracktwoEFmvaTES {
-					output EFTau {
-						output BDT {
-							output 1p_nonCorrected {
-							}
-							output mp_nonCorrected {
-							}
-						}
-					}
-					output EFVsOffline {
-						output BDT {
-							output 1p_nonCorrected {
-							}
-							output mp_nonCorrected {
-							}
-						}
-					}
-					output L1RoI {
-					}
-					output L1VsOffline {
-					}
-					output TurnOnCurves {
-						output RecoEfficiency {
-						}
-					}
-				}
-				output tau25_perf_tracktwoMVA {
-					output EFTau {
-						output BDT {
-							output 1p_nonCorrected {
-							}
-							output mp_nonCorrected {
-							}
-						}
-						output RNN {
-							output InputScalar1p {
-							}
-							output InputScalar3p {
-							}
-							output Output {
-							}
-						}
-					}
-					output EFVsOffline {
-						output BDT {
-							output 1p_nonCorrected {
-							}
-							output mp_nonCorrected {
-							}
-						}
-					}
-					output L1RoI {
-					}
-					output L1VsOffline {
-					}
-					output TurnOnCurves {
-						output RecoEfficiency {
-						}
-					}
-				}
-				output tau25_tightRNN_tracktwo {
-					output EFTau {
-						output RNN {
-							output InputScalar1p {
-							}
-							output InputScalar3p {
-							}
-							output Output {
-							}
-						}
-					}
-					output EFVsOffline {
-						output BDT {
-							output 1p_nonCorrected {
-							}
-							output mp_nonCorrected {
-							}
-						}
-					}
-					output L1RoI {
-					}
-					output L1VsOffline {
-					}
-					output PreselectionTau {
-					}
-					output PreselectionVsOffline {
-					}
-					output TurnOnCurves {
-						output RecoEfficiency {
-						}
-					}
-				}
-				output tau25_tightRNN_tracktwoMVA {
-					output EFTau {
-						output RNN {
-							output InputScalar1p {
-							}
-							output InputScalar3p {
-							}
-							output Output {
-							}
-						}
-					}
-					output EFVsOffline {
-						output BDT {
-							output 1p_nonCorrected {
-							}
-							output mp_nonCorrected {
-							}
-						}
-					}
-					output L1RoI {
-					}
-					output L1VsOffline {
-					}
-					output TurnOnCurves {
-						output RecoEfficiency {
-						}
-					}
-				}
-				output tau25_verylooseRNN_tracktwo {
-					output EFTau {
-						output RNN {
-							output InputScalar1p {
-							}
-							output InputScalar3p {
-							}
-							output Output {
-							}
-						}
-					}
-					output EFVsOffline {
-						output BDT {
-							output 1p_nonCorrected {
-							}
-							output mp_nonCorrected {
-							}
-						}
-					}
-					output L1RoI {
-					}
-					output L1VsOffline {
-					}
-					output PreselectionTau {
-					}
-					output PreselectionVsOffline {
-					}
-					output TurnOnCurves {
-						output RecoEfficiency {
-						}
-					}
-				}
-				output tau25_verylooseRNN_tracktwoMVA {
-					output EFTau {
-						output RNN {
-							output InputScalar1p {
-							}
-							output InputScalar3p {
-							}
-							output Output {
-							}
-						}
-					}
-					output EFVsOffline {
-						output BDT {
-							output 1p_nonCorrected {
-							}
-							output mp_nonCorrected {
-							}
-						}
-					}
-					output L1RoI {
-					}
-					output L1VsOffline {
-					}
-					output TurnOnCurves {
-						output RecoEfficiency {
-						}
-					}
-				}
-				output tau35_medium1_tracktwo_tau25_medium1_tracktwo_L1TAU20IM_2TAU12IM {
-					output EFTau {
-						output BDT {
-							output 1p_nonCorrected {
-							}
-							output mp_nonCorrected {
-							}
-						}
-					}
-					output EFVsOffline {
-						output BDT {
-							output 1p_nonCorrected {
-							}
-							output mp_nonCorrected {
-							}
-						}
-					}
-					output L1RoI {
-					}
-					output L1VsOffline {
-					}
-					output PreselectionTau {
-					}
-					output PreselectionVsOffline {
-					}
-					output TurnOnCurves {
-						output RecoEfficiency {
-						}
-					}
-				}
-				output tau35_medium1_tracktwo_xe70_L1XE45 {
-					output EFTau {
-						output BDT {
-							output 1p_nonCorrected {
-							}
-							output mp_nonCorrected {
-							}
-						}
-					}
-					output EFVsOffline {
-						output BDT {
-							output 1p_nonCorrected {
-							}
-							output mp_nonCorrected {
-							}
-						}
-					}
-					output L1RoI {
-					}
-					output L1VsOffline {
-					}
-					output PreselectionTau {
-					}
-					output PreselectionVsOffline {
-					}
-					output TurnOnCurves {
-						output RecoEfficiency {
-						}
-					}
-				}
-				output tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12 {
-					output EFTau {
-						output BDT {
-							output 1p_nonCorrected {
-							}
-							output mp_nonCorrected {
-							}
-						}
-					}
-					output EFVsOffline {
-						output BDT {
-							output 1p_nonCorrected {
-							}
-							output mp_nonCorrected {
-							}
-						}
-					}
-					output L1RoI {
-					}
-					output L1VsOffline {
-					}
-					output PreselectionTau {
-					}
-					output PreselectionVsOffline {
-					}
-					output TurnOnCurves {
-						output RecoEfficiency {
-						}
-					}
-				}
-				output tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40 {
-					output EFTau {
-						output BDT {
-							output 1p_nonCorrected {
-							}
-							output mp_nonCorrected {
-							}
-						}
-					}
-					output EFVsOffline {
-						output BDT {
-							output 1p_nonCorrected {
-							}
-							output mp_nonCorrected {
-							}
-						}
-					}
-					output L1RoI {
-					}
-					output L1VsOffline {
-					}
-					output PreselectionTau {
-					}
-					output PreselectionVsOffline {
-					}
-					output TurnOnCurves {
-						output RecoEfficiency {
-						}
-					}
-				}
-			}
-			output Shifter {
-				output OtherPlots {
-					output tau35_medium1_tracktwoEF_tau25_medium1_tracktwoEF {
-					}
-					output tau35_medium1_tracktwoEF_tau25_medium1_tracktwoEF_03dR30_L1DR-TAU20ITAU12I-J25 {
-					}
-					output tau35_medium1_tracktwoEF_tau25_medium1_tracktwoEF_L1DR-TAU20ITAU12I-J25 {
-					}
-					output tau35_medium1_tracktwo_tau25_medium1_tracktwo {
-					}
-					output tau35_medium1_tracktwo_tau25_medium1_tracktwo_03dR30_L1DR-TAU20ITAU12I {
-					}
-					output tau35_medium1_tracktwo_tau25_medium1_tracktwo_03dR30_L1DR-TAU20ITAU12I-J25 {
-					}
-					output tau35_medium1_tracktwo_tau25_medium1_tracktwo_L1DR-TAU20ITAU12I {
-					}
-					output tau35_medium1_tracktwo_tau25_medium1_tracktwo_L1DR-TAU20ITAU12I-J25 {
-					}
-					output tau35_medium1_tracktwo_tau25_medium1_tracktwo_L1TAU20IM_2TAU12IM {
-					}
-					output tau80_medium1_tracktwoEF_L1TAU60_tau35_medium1_tracktwoEF_L1TAU12IM_L1TAU60_DR-TAU20ITAU12I {
-					}
-					output tau80_medium1_tracktwo_L1TAU60_tau35_medium1_tracktwo_L1TAU12IM_L1TAU60_DR-TAU20ITAU12I {
-					}
-				}
-				output tau25_medium1_tracktwo {
-					output EFTau {
-					}
-					output EFVsOffline {
-					}
-					output L1RoI {
-					}
-					output L1VsOffline {
-					}
-					output PreselectionTau {
-					}
-					output PreselectionVsOffline {
-					}
-					output TurnOnCurves {
-					}
-				}
-				output tau25_medium1_tracktwoEF {
-					output EFTau {
-					}
-					output EFVsOffline {
-					}
-					output L1RoI {
-					}
-					output L1VsOffline {
-					}
-					output TurnOnCurves {
-					}
-				}
-			}
-		}
-	}
+  output HLT {
+    output TauMon {
+      output Expert {
+        output Emulation {
+        }
+        output HLTefficiency {
+          output EffRatios_FTKvsNonFTK {
+          }
+        }
+        output RealZtautauEff {
+          output tau25_medium1_tracktwoEF {
+          }
+          output tau25_mediumRNN_tracktwoMVA {
+          }
+        }
+        output TopoDiTau {
+          output tau35_medium1_tracktwoEF_tau25_medium1_tracktwoEF {
+          }
+          output tau35_medium1_tracktwoEF_tau25_medium1_tracktwoEF_03dR30_L1DR-TAU20ITAU12I-J25 {
+          }
+          output tau35_medium1_tracktwoEF_tau25_medium1_tracktwoEF_L1DR-TAU20ITAU12I-J25 {
+          }
+          output tau35_medium1_tracktwo_tau25_medium1_tracktwo {
+          }
+          output tau35_medium1_tracktwo_tau25_medium1_tracktwo_03dR30_L1DR-TAU20ITAU12I-J25 {
+          }
+          output tau35_medium1_tracktwo_tau25_medium1_tracktwo_L1DR-TAU20ITAU12I-J25 {
+          }
+          output tau35_medium1_tracktwo_tau25_medium1_tracktwo_L1TAU20IM_2TAU12IM {
+          }
+          output tau80_medium1_tracktwoEF_L1TAU60_tau35_medium1_tracktwoEF_L1TAU12IM_L1TAU60_DR-TAU20ITAU12I {
+          }
+          output tau80_medium1_tracktwo_L1TAU60_tau35_medium1_tracktwo_L1TAU12IM_L1TAU60_DR-TAU20ITAU12I {
+          }
+        }
+        output TopoElTau {
+          output e17_lhmedium_nod0_ivarloose_tau25_medium1_tracktwo {
+          }
+          output e17_lhmedium_nod0_ivarloose_tau25_medium1_tracktwo_L1DR-EM15TAU12I-J25 {
+          }
+        }
+        output TopoMuTau {
+          output mu14_ivarloose_tau25_medium1_tracktwo {
+          }
+          output mu14_ivarloose_tau25_medium1_tracktwo_L1DR-MU10TAU12I_TAU12I-J25 {
+          }
+        }
+        output dijetFakeTausEff {
+          output tau160_idperf_tracktwo_L1TAU100 {
+          }
+          output tau160_medium1_tracktwo_L1TAU100 {
+          }
+          output tau80_medium1_tracktwo_L1TAU60 {
+          }
+        }
+        output tau0_perf_ptonly_L1TAU100 {
+          output EFTau {
+            output BDT {
+              output 1p_nonCorrected {
+              }
+              output mp_nonCorrected {
+              }
+            }
+          }
+          output EFVsOffline {
+            output BDT {
+              output 1p_nonCorrected {
+              }
+              output mp_nonCorrected {
+              }
+            }
+          }
+          output L1RoI {
+          }
+          output L1VsOffline {
+          }
+          output TurnOnCurves {
+            output RecoEfficiency {
+            }
+          }
+        }
+        output tau0_perf_ptonly_L1TAU12 {
+          output EFTau {
+            output BDT {
+              output 1p_nonCorrected {
+              }
+              output mp_nonCorrected {
+              }
+            }
+          }
+          output EFVsOffline {
+            output BDT {
+              output 1p_nonCorrected {
+              }
+              output mp_nonCorrected {
+              }
+            }
+          }
+          output L1RoI {
+          }
+          output L1VsOffline {
+          }
+          output TurnOnCurves {
+            output RecoEfficiency {
+            }
+          }
+        }
+        output tau160_idperf_tracktwo_L1TAU100 {
+          output EFTau {
+            output BDT {
+              output 1p_nonCorrected {
+              }
+              output mp_nonCorrected {
+              }
+            }
+          }
+          output EFVsOffline {
+            output BDT {
+              output 1p_nonCorrected {
+              }
+              output mp_nonCorrected {
+              }
+            }
+          }
+          output L1RoI {
+          }
+          output L1VsOffline {
+          }
+          output PreselectionTau {
+          }
+          output PreselectionVsOffline {
+          }
+          output TurnOnCurves {
+            output RecoEfficiency {
+            }
+          }
+        }
+        output tau160_medium1_tracktwo_L1TAU100 {
+          output EFTau {
+            output BDT {
+              output 1p_nonCorrected {
+              }
+              output mp_nonCorrected {
+              }
+            }
+          }
+          output EFVsOffline {
+            output BDT {
+              output 1p_nonCorrected {
+              }
+              output mp_nonCorrected {
+              }
+            }
+          }
+          output L1RoI {
+          }
+          output L1VsOffline {
+          }
+          output PreselectionTau {
+          }
+          output PreselectionVsOffline {
+          }
+          output TurnOnCurves {
+            output RecoEfficiency {
+            }
+          }
+        }
+        output tau160_perf_tracktwo_L1TAU100 {
+          output EFTau {
+            output BDT {
+              output 1p_nonCorrected {
+              }
+              output mp_nonCorrected {
+              }
+            }
+          }
+          output EFVsOffline {
+            output BDT {
+              output 1p_nonCorrected {
+              }
+              output mp_nonCorrected {
+              }
+            }
+          }
+          output L1RoI {
+          }
+          output L1VsOffline {
+          }
+          output PreselectionTau {
+          }
+          output PreselectionVsOffline {
+          }
+          output TurnOnCurves {
+            output RecoEfficiency {
+            }
+          }
+        }
+        output tau25_idperf_tracktwo {
+          output EFTau {
+            output BDT {
+              output 1p_nonCorrected {
+              }
+              output mp_nonCorrected {
+              }
+            }
+          }
+          output EFVsOffline {
+            output BDT {
+              output 1p_nonCorrected {
+              }
+              output mp_nonCorrected {
+              }
+            }
+          }
+          output L1RoI {
+          }
+          output L1VsOffline {
+          }
+          output PreselectionTau {
+          }
+          output PreselectionVsOffline {
+          }
+          output TurnOnCurves {
+            output RecoEfficiency {
+            }
+          }
+        }
+        output tau25_idperf_tracktwoEF {
+          output EFTau {
+            output BDT {
+              output 1p_nonCorrected {
+              }
+              output mp_nonCorrected {
+              }
+            }
+          }
+          output EFVsOffline {
+            output BDT {
+              output 1p_nonCorrected {
+              }
+              output mp_nonCorrected {
+              }
+            }
+          }
+          output L1RoI {
+          }
+          output L1VsOffline {
+          }
+          output TurnOnCurves {
+            output RecoEfficiency {
+            }
+          }
+        }
+        output tau25_idperf_tracktwoEFmvaTES {
+          output EFTau {
+            output BDT {
+              output 1p_nonCorrected {
+              }
+              output mp_nonCorrected {
+              }
+            }
+          }
+          output EFVsOffline {
+            output BDT {
+              output 1p_nonCorrected {
+              }
+              output mp_nonCorrected {
+              }
+            }
+          }
+          output L1RoI {
+          }
+          output L1VsOffline {
+          }
+          output TurnOnCurves {
+            output RecoEfficiency {
+            }
+          }
+        }
+        output tau25_idperf_tracktwoMVA {
+          output EFTau {
+            output BDT {
+              output 1p_nonCorrected {
+              }
+              output mp_nonCorrected {
+              }
+            }
+            output RNN {
+              output InputScalar1p {
+              }
+              output InputScalar3p {
+              }
+              output InputTrack {
+              }
+              output InputCluster {
+              }
+              output Output {
+              }
+            }
+          }
+          output EFVsOffline {
+            output BDT {
+              output 1p_nonCorrected {
+              }
+              output mp_nonCorrected {
+              }
+            }
+          }
+          output L1RoI {
+          }
+          output L1VsOffline {
+          }
+          output TurnOnCurves {
+            output RecoEfficiency {
+            }
+          }
+        }
+        output tau25_looseRNN_tracktwoMVA {
+          output EFTau {
+            output RNN {
+              output InputScalar1p {
+              }
+              output InputScalar3p {
+              }
+              output InputTrack {
+              }
+              output InputCluster {
+              }
+              output Output {
+              }
+            }
+          }
+          output EFVsOffline {
+            output BDT {
+              output 1p_nonCorrected {
+              }
+              output mp_nonCorrected {
+              }
+            }
+          }
+          output L1RoI {
+          }
+          output L1VsOffline {
+          }
+          output TurnOnCurves {
+            output RecoEfficiency {
+            }
+          }
+        }
+        output tau25_medium1NoPt_tracktwoEFmvaTES {
+          output EFTau {
+            output BDT {
+              output 1p_nonCorrected {
+              }
+              output mp_nonCorrected {
+              }
+            }
+          }
+          output EFVsOffline {
+            output BDT {
+              output 1p_nonCorrected {
+              }
+              output mp_nonCorrected {
+              }
+            }
+          }
+          output L1RoI {
+          }
+          output L1VsOffline {
+          }
+          output TurnOnCurves {
+            output RecoEfficiency {
+            }
+          }
+        }
+        output tau25_medium1_tracktwo {
+          output EFTau {
+            output BDT {
+              output 1p_nonCorrected {
+              }
+              output mp_nonCorrected {
+              }
+            }
+          }
+          output EFVsOffline {
+            output BDT {
+              output 1p_nonCorrected {
+              }
+              output mp_nonCorrected {
+              }
+            }
+          }
+          output L1RoI {
+          }
+          output L1VsOffline {
+          }
+          output PreselectionTau {
+          }
+          output PreselectionVsOffline {
+          }
+          output TurnOnCurves {
+            output RecoEfficiency {
+            }
+          }
+        }
+        output tau25_medium1_tracktwoEF {
+          output EFTau {
+            output BDT {
+              output 1p_nonCorrected {
+              }
+              output mp_nonCorrected {
+              }
+            }
+          }
+          output EFVsOffline {
+            output BDT {
+              output 1p_nonCorrected {
+              }
+              output mp_nonCorrected {
+              }
+            }
+          }
+          output L1RoI {
+          }
+          output L1VsOffline {
+          }
+          output TurnOnCurves {
+            output RecoEfficiency {
+            }
+          }
+        }
+        output tau25_medium1_tracktwoEFmvaTES {
+          output EFTau {
+            output BDT {
+              output 1p_nonCorrected {
+              }
+              output mp_nonCorrected {
+              }
+            }
+          }
+          output EFVsOffline {
+            output BDT {
+              output 1p_nonCorrected {
+              }
+              output mp_nonCorrected {
+              }
+            }
+          }
+          output L1RoI {
+          }
+          output L1VsOffline {
+          }
+          output TurnOnCurves {
+            output RecoEfficiency {
+            }
+          }
+        }
+        output tau25_mediumRNN_tracktwoMVA {
+          output EFTau {
+            output RNN {
+              output InputScalar1p {
+              }
+              output InputScalar3p {
+              }
+              output InputTrack {
+              }
+              output InputCluster {
+              }
+              output Output {
+              }
+            }
+          }
+          output EFVsOffline {
+            output BDT {
+              output 1p_nonCorrected {
+              }
+              output mp_nonCorrected {
+              }
+            }
+          }
+          output L1RoI {
+          }
+          output L1VsOffline {
+          }
+          output TurnOnCurves {
+            output RecoEfficiency {
+            }
+          }
+        }
+        output tau25_perf_tracktwo {
+          output EFTau {
+            output BDT {
+              output 1p_nonCorrected {
+              }
+              output mp_nonCorrected {
+              }
+            }
+          }
+          output EFVsOffline {
+            output BDT {
+              output 1p_nonCorrected {
+              }
+              output mp_nonCorrected {
+              }
+            }
+          }
+          output L1RoI {
+          }
+          output L1VsOffline {
+          }
+          output PreselectionTau {
+          }
+          output PreselectionVsOffline {
+          }
+          output TurnOnCurves {
+            output RecoEfficiency {
+            }
+          }
+        }
+        output tau25_perf_tracktwoEF {
+          output EFTau {
+            output BDT {
+              output 1p_nonCorrected {
+              }
+              output mp_nonCorrected {
+              }
+            }
+          }
+          output EFVsOffline {
+            output BDT {
+              output 1p_nonCorrected {
+              }
+              output mp_nonCorrected {
+              }
+            }
+          }
+          output L1RoI {
+          }
+          output L1VsOffline {
+          }
+          output TurnOnCurves {
+            output RecoEfficiency {
+            }
+          }
+        }
+        output tau25_perf_tracktwoEFmvaTES {
+          output EFTau {
+            output BDT {
+              output 1p_nonCorrected {
+              }
+              output mp_nonCorrected {
+              }
+            }
+          }
+          output EFVsOffline {
+            output BDT {
+              output 1p_nonCorrected {
+              }
+              output mp_nonCorrected {
+              }
+            }
+          }
+          output L1RoI {
+          }
+          output L1VsOffline {
+          }
+          output TurnOnCurves {
+            output RecoEfficiency {
+            }
+          }
+        }
+        output tau25_perf_tracktwoMVA {
+          output EFTau {
+            output BDT {
+              output 1p_nonCorrected {
+              }
+              output mp_nonCorrected {
+              }
+            }
+            output RNN {
+              output InputScalar1p {
+              }
+              output InputScalar3p {
+              }
+              output InputTrack {
+              }
+              output InputCluster {
+              }
+              output Output {
+              }
+            }
+          }
+          output EFVsOffline {
+            output BDT {
+              output 1p_nonCorrected {
+              }
+              output mp_nonCorrected {
+              }
+            }
+          }
+          output L1RoI {
+          }
+          output L1VsOffline {
+          }
+          output TurnOnCurves {
+            output RecoEfficiency {
+            }
+          }
+        }
+        output tau35_medium1_tracktwo_tau25_medium1_tracktwo_L1TAU20IM_2TAU12IM {
+          output EFTau {
+            output BDT {
+              output 1p_nonCorrected {
+              }
+              output mp_nonCorrected {
+              }
+            }
+          }
+          output EFVsOffline {
+            output BDT {
+              output 1p_nonCorrected {
+              }
+              output mp_nonCorrected {
+              }
+            }
+          }
+          output L1RoI {
+          }
+          output L1VsOffline {
+          }
+          output PreselectionTau {
+          }
+          output PreselectionVsOffline {
+          }
+          output TurnOnCurves {
+            output RecoEfficiency {
+            }
+          }
+        }
+        output tau35_medium1_tracktwo_xe70_L1XE45 {
+          output EFTau {
+            output BDT {
+              output 1p_nonCorrected {
+              }
+              output mp_nonCorrected {
+              }
+            }
+          }
+          output EFVsOffline {
+            output BDT {
+              output 1p_nonCorrected {
+              }
+              output mp_nonCorrected {
+              }
+            }
+          }
+          output L1RoI {
+          }
+          output L1VsOffline {
+          }
+          output PreselectionTau {
+          }
+          output PreselectionVsOffline {
+          }
+          output TurnOnCurves {
+            output RecoEfficiency {
+            }
+          }
+        }
+        output tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12 {
+          output EFTau {
+            output BDT {
+              output 1p_nonCorrected {
+              }
+              output mp_nonCorrected {
+              }
+            }
+          }
+          output EFVsOffline {
+            output BDT {
+              output 1p_nonCorrected {
+              }
+              output mp_nonCorrected {
+              }
+            }
+          }
+          output L1RoI {
+          }
+          output L1VsOffline {
+          }
+          output PreselectionTau {
+          }
+          output PreselectionVsOffline {
+          }
+          output TurnOnCurves {
+            output RecoEfficiency {
+            }
+          }
+        }
+        output tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40 {
+          output EFTau {
+            output BDT {
+              output 1p_nonCorrected {
+              }
+              output mp_nonCorrected {
+              }
+            }
+          }
+          output EFVsOffline {
+            output BDT {
+              output 1p_nonCorrected {
+              }
+              output mp_nonCorrected {
+              }
+            }
+          }
+          output L1RoI {
+          }
+          output L1VsOffline {
+          }
+          output PreselectionTau {
+          }
+          output PreselectionVsOffline {
+          }
+          output TurnOnCurves {
+            output RecoEfficiency {
+            }
+          }
+        }
+      }
+      output Shifter {
+        output OtherPlots {
+          output tau35_medium1_tracktwoEF_tau25_medium1_tracktwoEF {
+          }
+          output tau35_medium1_tracktwoEF_tau25_medium1_tracktwoEF_03dR30_L1DR-TAU20ITAU12I-J25 {
+          }
+          output tau35_medium1_tracktwoEF_tau25_medium1_tracktwoEF_L1DR-TAU20ITAU12I-J25 {
+          }
+          output tau35_medium1_tracktwo_tau25_medium1_tracktwo {
+          }
+          output tau35_medium1_tracktwo_tau25_medium1_tracktwo_03dR30_L1DR-TAU20ITAU12I-J25 {
+          }
+          output tau35_medium1_tracktwo_tau25_medium1_tracktwo_L1DR-TAU20ITAU12I-J25 {
+          }
+          output tau35_medium1_tracktwo_tau25_medium1_tracktwo_L1TAU20IM_2TAU12IM {
+          }
+          output tau80_medium1_tracktwoEF_L1TAU60_tau35_medium1_tracktwoEF_L1TAU12IM_L1TAU60_DR-TAU20ITAU12I {
+          }
+          output tau80_medium1_tracktwo_L1TAU60_tau35_medium1_tracktwo_L1TAU12IM_L1TAU60_DR-TAU20ITAU12I {
+          }
+        }
+        output tau25_mediumRNN_tracktwoMVA {
+          output EFTau {
+          }
+          output EFVsOffline {
+          }
+          output L1RoI {
+          }
+          output L1VsOffline {
+          }
+          output TurnOnCurves {
+          }
+        }
+        output tau25_medium1_tracktwoEF {
+          output EFTau {
+          }
+          output EFVsOffline {
+          }
+          output L1RoI {
+          }
+          output L1VsOffline {
+          }
+          output TurnOnCurves {
+          }
+        }
+      }
+    }
+  }
 }
 
 
@@ -1005,23708 +801,16174 @@ output top_level {
 #######################
 
 dir HLT {
-	dir TauMon {
-		dir Expert {
-			dir Emulation {
-				hist hL1Emulation {
-					algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-					output      	= HLT/TauMon/Expert/Emulation
-					display     	= StatBox
-					reference     = CentrallyManagedReferences_Trigger
-				}
-			}
-			dir HLTefficiency {
-				dir EffRatios_FTKvsNonFTK {
-					hist TProfRecoHLTLSTEta1PEfficiency_CompFTKNoPrecvsNonFTK_medium0 {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/HLTefficiency/EffRatios_FTKvsNonFTK
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist TProfRecoHLTLSTEta1PEfficiency_CompFTKNoPrecvsNonFTK_medium1 {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/HLTefficiency/EffRatios_FTKvsNonFTK
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist TProfRecoHLTLSTEta3PEfficiency_CompFTKNoPrecvsNonFTK_medium0 {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/HLTefficiency/EffRatios_FTKvsNonFTK
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist TProfRecoHLTLSTEta3PEfficiency_CompFTKNoPrecvsNonFTK_medium1 {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/HLTefficiency/EffRatios_FTKvsNonFTK
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist TProfRecoHLTLSTEtaEfficiency_CompFTKNoPrecvsNonFTK_medium0 {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/HLTefficiency/EffRatios_FTKvsNonFTK
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist TProfRecoHLTLSTEtaEfficiency_CompFTKNoPrecvsNonFTK_medium1 {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/HLTefficiency/EffRatios_FTKvsNonFTK
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist TProfRecoHLTLSTMu1PEfficiency_CompFTKNoPrecvsNonFTK_medium0 {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/HLTefficiency/EffRatios_FTKvsNonFTK
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist TProfRecoHLTLSTMu1PEfficiency_CompFTKNoPrecvsNonFTK_medium1 {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/HLTefficiency/EffRatios_FTKvsNonFTK
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist TProfRecoHLTLSTMu3PEfficiency_CompFTKNoPrecvsNonFTK_medium0 {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/HLTefficiency/EffRatios_FTKvsNonFTK
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist TProfRecoHLTLSTMu3PEfficiency_CompFTKNoPrecvsNonFTK_medium1 {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/HLTefficiency/EffRatios_FTKvsNonFTK
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist TProfRecoHLTLSTMuEfficiency_CompFTKNoPrecvsNonFTK_medium0 {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/HLTefficiency/EffRatios_FTKvsNonFTK
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist TProfRecoHLTLSTMuEfficiency_CompFTKNoPrecvsNonFTK_medium1 {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/HLTefficiency/EffRatios_FTKvsNonFTK
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist TProfRecoHLTLSTNTrackEfficiency_CompFTKNoPrecvsNonFTK_medium0 {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/HLTefficiency/EffRatios_FTKvsNonFTK
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist TProfRecoHLTLSTNTrackEfficiency_CompFTKNoPrecvsNonFTK_medium1 {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/HLTefficiency/EffRatios_FTKvsNonFTK
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist TProfRecoHLTLSTPt1PEfficiency_CompFTKNoPrecvsNonFTK_medium0 {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/HLTefficiency/EffRatios_FTKvsNonFTK
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist TProfRecoHLTLSTPt1PEfficiency_CompFTKNoPrecvsNonFTK_medium1 {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/HLTefficiency/EffRatios_FTKvsNonFTK
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist TProfRecoHLTLSTPt3PEfficiency_CompFTKNoPrecvsNonFTK_medium0 {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/HLTefficiency/EffRatios_FTKvsNonFTK
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist TProfRecoHLTLSTPt3PEfficiency_CompFTKNoPrecvsNonFTK_medium1 {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/HLTefficiency/EffRatios_FTKvsNonFTK
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist TProfRecoHLTLSTPtEfficiency_CompFTKNoPrecvsNonFTK_medium0 {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/HLTefficiency/EffRatios_FTKvsNonFTK
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist TProfRecoHLTLSTPtEfficiency_CompFTKNoPrecvsNonFTK_medium1 {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/HLTefficiency/EffRatios_FTKvsNonFTK
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				hist TProfRecoHLT160PtEfficiency {
-					algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-					output      	= HLT/TauMon/Expert/HLTefficiency
-					display     	= StatBox
-					reference     = CentrallyManagedReferences_Trigger
-				}
-				hist TProfRecoHLT160PtEfficiency_2 {
-					algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-					output      	= HLT/TauMon/Expert/HLTefficiency
-					display     	= StatBox
-					reference     = CentrallyManagedReferences_Trigger
-				}
-				hist TProfRecoHLT25Eta1PEfficiency {
-					algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-					output      	= HLT/TauMon/Expert/HLTefficiency
-					display     	= StatBox
-					reference     = CentrallyManagedReferences_Trigger
-				}
-				hist TProfRecoHLT25Eta1PEfficiency_2 {
-					algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-					output      	= HLT/TauMon/Expert/HLTefficiency
-					display     	= StatBox
-					reference     = CentrallyManagedReferences_Trigger
-				}
-				hist TProfRecoHLT25Eta3PEfficiency {
-					algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-					output      	= HLT/TauMon/Expert/HLTefficiency
-					display     	= StatBox
-					reference     = CentrallyManagedReferences_Trigger
-				}
-				hist TProfRecoHLT25Eta3PEfficiency_2 {
-					algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-					output      	= HLT/TauMon/Expert/HLTefficiency
-					display     	= StatBox
-					reference     = CentrallyManagedReferences_Trigger
-				}
-				hist TProfRecoHLT25EtaEfficiency {
-					algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-					output      	= HLT/TauMon/Expert/HLTefficiency
-					display     	= StatBox
-					reference     = CentrallyManagedReferences_Trigger
-				}
-				hist TProfRecoHLT25EtaEfficiency_2 {
-					algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-					output      	= HLT/TauMon/Expert/HLTefficiency
-					display     	= StatBox
-					reference     = CentrallyManagedReferences_Trigger
-				}
-				hist TProfRecoHLT25Mu1PEfficiency {
-					algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-					output      	= HLT/TauMon/Expert/HLTefficiency
-					display     	= StatBox
-					reference     = CentrallyManagedReferences_Trigger
-				}
-				hist TProfRecoHLT25Mu1PEfficiency_2 {
-					algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-					output      	= HLT/TauMon/Expert/HLTefficiency
-					display     	= StatBox
-					reference     = CentrallyManagedReferences_Trigger
-				}
-				hist TProfRecoHLT25Mu3PEfficiency {
-					algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-					output      	= HLT/TauMon/Expert/HLTefficiency
-					display     	= StatBox
-					reference     = CentrallyManagedReferences_Trigger
-				}
-				hist TProfRecoHLT25Mu3PEfficiency_2 {
-					algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-					output      	= HLT/TauMon/Expert/HLTefficiency
-					display     	= StatBox
-					reference     = CentrallyManagedReferences_Trigger
-				}
-				hist TProfRecoHLT25MuEfficiency {
-					algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-					output      	= HLT/TauMon/Expert/HLTefficiency
-					display     	= StatBox
-					reference     = CentrallyManagedReferences_Trigger
-				}
-				hist TProfRecoHLT25MuEfficiency_2 {
-					algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-					output      	= HLT/TauMon/Expert/HLTefficiency
-					display     	= StatBox
-					reference     = CentrallyManagedReferences_Trigger
-				}
-				hist TProfRecoHLT25NTrackEfficiency {
-					algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-					output      	= HLT/TauMon/Expert/HLTefficiency
-					display     	= StatBox
-					reference     = CentrallyManagedReferences_Trigger
-				}
-				hist TProfRecoHLT25NTrackEfficiency_2 {
-					algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-					output      	= HLT/TauMon/Expert/HLTefficiency
-					display     	= StatBox
-					reference     = CentrallyManagedReferences_Trigger
-				}
-				hist TProfRecoHLT25NVtxEfficiency {
-					algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-					output      	= HLT/TauMon/Expert/HLTefficiency
-					display     	= StatBox
-					reference     = CentrallyManagedReferences_Trigger
-				}
-				hist TProfRecoHLT25NVtxEfficiency_2 {
-					algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-					output      	= HLT/TauMon/Expert/HLTefficiency
-					display     	= StatBox
-					reference     = CentrallyManagedReferences_Trigger
-				}
-				hist TProfRecoHLT25PhiEfficiency {
-					algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-					output      	= HLT/TauMon/Expert/HLTefficiency
-					display     	= StatBox
-					reference     = CentrallyManagedReferences_Trigger
-				}
-				hist TProfRecoHLT25PhiEfficiency_2 {
-					algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-					output      	= HLT/TauMon/Expert/HLTefficiency
-					display     	= StatBox
-					reference     = CentrallyManagedReferences_Trigger
-				}
-				hist TProfRecoHLT25Pt1PEfficiency {
-					algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-					output      	= HLT/TauMon/Expert/HLTefficiency
-					display     	= StatBox
-					reference     = CentrallyManagedReferences_Trigger
-				}
-				hist TProfRecoHLT25Pt1PEfficiency_2 {
-					algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-					output      	= HLT/TauMon/Expert/HLTefficiency
-					display     	= StatBox
-					reference     = CentrallyManagedReferences_Trigger
-				}
-				hist TProfRecoHLT25Pt3PEfficiency {
-					algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-					output      	= HLT/TauMon/Expert/HLTefficiency
-					display     	= StatBox
-					reference     = CentrallyManagedReferences_Trigger
-				}
-				hist TProfRecoHLT25Pt3PEfficiency_2 {
-					algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-					output      	= HLT/TauMon/Expert/HLTefficiency
-					display     	= StatBox
-					reference     = CentrallyManagedReferences_Trigger
-				}
-				hist TProfRecoHLT25PtEfficiency {
-					algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-					output      	= HLT/TauMon/Expert/HLTefficiency
-					display     	= StatBox
-					reference     = CentrallyManagedReferences_Trigger
-				}
-				hist TProfRecoHLT25PtEfficiency_2 {
-					algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-					output      	= HLT/TauMon/Expert/HLTefficiency
-					display     	= StatBox
-					reference     = CentrallyManagedReferences_Trigger
-				}
-				hist TProfRecoHLTLSTEtaEfficiency_0prong_FTKNoPrec_2 {
-					algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-					output      	= HLT/TauMon/Expert/HLTefficiency
-					display     	= StatBox
-					reference     = CentrallyManagedReferences_Trigger
-				}
-				hist TProfRecoHLTLSTEtaEfficiency_0prong_FTK_1 {
-					algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-					output      	= HLT/TauMon/Expert/HLTefficiency
-					display     	= StatBox
-					reference     = CentrallyManagedReferences_Trigger
-				}
-				hist TProfRecoHLTLSTEtaEfficiency_0prong_FTK_2 {
-					algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-					output      	= HLT/TauMon/Expert/HLTefficiency
-					display     	= StatBox
-					reference     = CentrallyManagedReferences_Trigger
-				}
-				hist TProfRecoHLTLSTEtaEfficiency_FTKNoPrec_2 {
-					algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-					output      	= HLT/TauMon/Expert/HLTefficiency
-					display     	= StatBox
-					reference     = CentrallyManagedReferences_Trigger
-				}
-				hist TProfRecoHLTLSTEtaEfficiency_FTK_1 {
-					algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-					output      	= HLT/TauMon/Expert/HLTefficiency
-					display     	= StatBox
-					reference     = CentrallyManagedReferences_Trigger
-				}
-				hist TProfRecoHLTLSTEtaEfficiency_FTK_2 {
-					algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-					output      	= HLT/TauMon/Expert/HLTefficiency
-					display     	= StatBox
-					reference     = CentrallyManagedReferences_Trigger
-				}
-				hist TProfRecoHLTLSTMuEfficiency_0prong_FTKNoPrec_2 {
-					algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-					output      	= HLT/TauMon/Expert/HLTefficiency
-					display     	= StatBox
-					reference     = CentrallyManagedReferences_Trigger
-				}
-				hist TProfRecoHLTLSTMuEfficiency_0prong_FTK_1 {
-					algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-					output      	= HLT/TauMon/Expert/HLTefficiency
-					display     	= StatBox
-					reference     = CentrallyManagedReferences_Trigger
-				}
-				hist TProfRecoHLTLSTMuEfficiency_0prong_FTK_2 {
-					algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-					output      	= HLT/TauMon/Expert/HLTefficiency
-					display     	= StatBox
-					reference     = CentrallyManagedReferences_Trigger
-				}
-				hist TProfRecoHLTLSTMuEfficiency_FTKNoPrec_2 {
-					algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-					output      	= HLT/TauMon/Expert/HLTefficiency
-					display     	= StatBox
-					reference     = CentrallyManagedReferences_Trigger
-				}
-				hist TProfRecoHLTLSTMuEfficiency_FTK_1 {
-					algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-					output      	= HLT/TauMon/Expert/HLTefficiency
-					display     	= StatBox
-					reference     = CentrallyManagedReferences_Trigger
-				}
-				hist TProfRecoHLTLSTMuEfficiency_FTK_2 {
-					algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-					output      	= HLT/TauMon/Expert/HLTefficiency
-					display     	= StatBox
-					reference     = CentrallyManagedReferences_Trigger
-				}
-				hist TProfRecoHLTLSTNTrackEfficiency_0prong_FTKNoPrec_2 {
-					algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-					output      	= HLT/TauMon/Expert/HLTefficiency
-					display     	= StatBox
-					reference     = CentrallyManagedReferences_Trigger
-				}
-				hist TProfRecoHLTLSTNTrackEfficiency_0prong_FTK_1 {
-					algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-					output      	= HLT/TauMon/Expert/HLTefficiency
-					display     	= StatBox
-					reference     = CentrallyManagedReferences_Trigger
-				}
-				hist TProfRecoHLTLSTNTrackEfficiency_0prong_FTK_2 {
-					algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-					output      	= HLT/TauMon/Expert/HLTefficiency
-					display     	= StatBox
-					reference     = CentrallyManagedReferences_Trigger
-				}
-				hist TProfRecoHLTLSTNTrackEfficiency_FTKNoPrec_2 {
-					algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-					output      	= HLT/TauMon/Expert/HLTefficiency
-					display     	= StatBox
-					reference     = CentrallyManagedReferences_Trigger
-				}
-				hist TProfRecoHLTLSTNTrackEfficiency_FTK_1 {
-					algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-					output      	= HLT/TauMon/Expert/HLTefficiency
-					display     	= StatBox
-					reference     = CentrallyManagedReferences_Trigger
-				}
-				hist TProfRecoHLTLSTNTrackEfficiency_FTK_2 {
-					algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-					output      	= HLT/TauMon/Expert/HLTefficiency
-					display     	= StatBox
-					reference     = CentrallyManagedReferences_Trigger
-				}
-				hist TProfRecoHLTLSTPt1PEfficiency_0prong_FTKNoPrec_2 {
-					algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-					output      	= HLT/TauMon/Expert/HLTefficiency
-					display     	= StatBox
-					reference     = CentrallyManagedReferences_Trigger
-				}
-				hist TProfRecoHLTLSTPt1PEfficiency_0prong_FTK_1 {
-					algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-					output      	= HLT/TauMon/Expert/HLTefficiency
-					display     	= StatBox
-					reference     = CentrallyManagedReferences_Trigger
-				}
-				hist TProfRecoHLTLSTPt1PEfficiency_0prong_FTK_2 {
-					algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-					output      	= HLT/TauMon/Expert/HLTefficiency
-					display     	= StatBox
-					reference     = CentrallyManagedReferences_Trigger
-				}
-				hist TProfRecoHLTLSTPt1PEfficiency_FTKNoPrec_2 {
-					algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-					output      	= HLT/TauMon/Expert/HLTefficiency
-					display     	= StatBox
-					reference     = CentrallyManagedReferences_Trigger
-				}
-				hist TProfRecoHLTLSTPt1PEfficiency_FTK_1 {
-					algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-					output      	= HLT/TauMon/Expert/HLTefficiency
-					display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-				}
-				hist TProfRecoHLTLSTPt1PEfficiency_FTK_2 {
-					algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-					output      	= HLT/TauMon/Expert/HLTefficiency
-					display     	= StatBox
-					reference     = CentrallyManagedReferences_Trigger
-				}
-				hist TProfRecoHLTLSTPt3PEfficiency_0prong_FTKNoPrec_2 {
-					algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-					output      	= HLT/TauMon/Expert/HLTefficiency
-					display     	= StatBox
-					reference     = CentrallyManagedReferences_Trigger
-				}
-				hist TProfRecoHLTLSTPt3PEfficiency_0prong_FTK_1 {
-					algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-					output      	= HLT/TauMon/Expert/HLTefficiency
-					display     	= StatBox
-					reference     = CentrallyManagedReferences_Trigger
-				}
-				hist TProfRecoHLTLSTPt3PEfficiency_0prong_FTK_2 {
-					algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-					output      	= HLT/TauMon/Expert/HLTefficiency
-					display     	= StatBox
-					reference     = CentrallyManagedReferences_Trigger
-				}
-				hist TProfRecoHLTLSTPt3PEfficiency_FTKNoPrec_2 {
-					algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-					output      	= HLT/TauMon/Expert/HLTefficiency
-					display     	= StatBox
-					reference     = CentrallyManagedReferences_Trigger
-				}
-				hist TProfRecoHLTLSTPt3PEfficiency_FTK_1 {
-					algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-					output      	= HLT/TauMon/Expert/HLTefficiency
-					display     	= StatBox
-					reference     = CentrallyManagedReferences_Trigger
-				}
-				hist TProfRecoHLTLSTPt3PEfficiency_FTK_2 {
-					algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-					output      	= HLT/TauMon/Expert/HLTefficiency
-					display     	= StatBox
-					reference     = CentrallyManagedReferences_Trigger
-				}
-				hist TProfRecoHLTLSTPtEfficiency_0prong_FTKNoPrec_2 {
-					algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-					output      	= HLT/TauMon/Expert/HLTefficiency
-					display     	= StatBox
-					reference     = CentrallyManagedReferences_Trigger
-				}
-				hist TProfRecoHLTLSTPtEfficiency_0prong_FTK_1 {
-					algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-					output      	= HLT/TauMon/Expert/HLTefficiency
-					display     	= StatBox
-					reference     = CentrallyManagedReferences_Trigger
-				}
-				hist TProfRecoHLTLSTPtEfficiency_0prong_FTK_2 {
-					algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-					output      	= HLT/TauMon/Expert/HLTefficiency
-					display     	= StatBox
-					reference     = CentrallyManagedReferences_Trigger
-				}
-				hist TProfRecoHLTLSTPtEfficiency_FTKNoPrec_2 {
-					algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-					output      	= HLT/TauMon/Expert/HLTefficiency
-					display     	= StatBox
-					reference     = CentrallyManagedReferences_Trigger
-				}
-				hist TProfRecoHLTLSTPtEfficiency_FTK_1 {
-					algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-					output      	= HLT/TauMon/Expert/HLTefficiency
-					display     	= StatBox
-					reference     = CentrallyManagedReferences_Trigger
-				}
-				hist TProfRecoHLTLSTPtEfficiency_FTK_2 {
-					algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-					output      	= HLT/TauMon/Expert/HLTefficiency
-					display     	= StatBox
-					reference     = CentrallyManagedReferences_Trigger
-				}
-				hist TProfRecoL1_J25Pt1PEfficiency {
-					algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-					output      	= HLT/TauMon/Expert/HLTefficiency
-					display     	= StatBox
-					reference     = CentrallyManagedReferences_Trigger
-				}
-				hist TProfRecoL1_J25Pt3PEfficiency {
-					algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-					output      	= HLT/TauMon/Expert/HLTefficiency
-					display     	= StatBox
-					reference     = CentrallyManagedReferences_Trigger
-				}
-				hist TProfRecoL1_J25PtEfficiency {
-					algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-					output      	= HLT/TauMon/Expert/HLTefficiency
-					display     	= StatBox
-					reference     = CentrallyManagedReferences_Trigger
-				}
-				hist hRecoHLT25EtaVsPhiEfficiency {
-					algorithm   	= HLT_Histogram_Not_Empty&GatherData
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-					output      	= HLT/TauMon/Expert/HLTefficiency
-					display     	= StatBox
-					reference     = CentrallyManagedReferences_Trigger
-				}
-				hist hRecoHLT25EtaVsPhiEfficiency_2 {
-					algorithm   	= HLT_Histogram_Not_Empty&GatherData
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-					output      	= HLT/TauMon/Expert/HLTefficiency
-					display     	= StatBox
-					reference     = CentrallyManagedReferences_Trigger
-				}
-				hist hRecoHLT25EtaVsPhiNum {
-					algorithm   	= HLT_Histogram_Not_Empty&GatherData
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-					output      	= HLT/TauMon/Expert/HLTefficiency
-					display     	= StatBox
-					reference     = CentrallyManagedReferences_Trigger
-				}
-				hist hRecoHLT25EtaVsPhiNum_2 {
-					algorithm   	= HLT_Histogram_Not_Empty&GatherData
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-					output      	= HLT/TauMon/Expert/HLTefficiency
-					display     	= StatBox
-					reference     = CentrallyManagedReferences_Trigger
-				}
-				hist hRecoTau25EtaVsPhiDenom {
-					algorithm   	= HLT_Histogram_Not_Empty&GatherData
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-					output      	= HLT/TauMon/Expert/HLTefficiency
-					display     	= StatBox
-					reference     = CentrallyManagedReferences_Trigger
-				}
-				hist hRecoTau25EtaVsPhiDenom_2 {
-					algorithm   	= HLT_Histogram_Not_Empty&GatherData
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-					output      	= HLT/TauMon/Expert/HLTefficiency
-					display     	= StatBox
-					reference     = CentrallyManagedReferences_Trigger
-				}
-			}
-			dir RealZtautauEff {
-				dir tau25_medium1_tracktwo {
-					hist TProfRealZttHLTPtEfficiency {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/RealZtautauEff/tau25_medium1_tracktwo
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist TProfRealZttL1PtEfficiency {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/RealZtautauEff/tau25_medium1_tracktwo
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-			}
-			dir TopoDiTau {
-				dir tau35_medium1_tracktwoEF_tau25_medium1_tracktwoEF {
-					hist TProfRecoL1_dREfficiency {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/TopoDiTau/tau35_medium1_tracktwoEF_tau25_medium1_tracktwoEF
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hHLTdR {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/TopoDiTau/tau35_medium1_tracktwoEF_tau25_medium1_tracktwoEF
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir tau35_medium1_tracktwoEF_tau25_medium1_tracktwoEF_03dR30_L1DR-TAU20ITAU12I-J25 {
-					hist TProfRecoL1_dREfficiency {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/TopoDiTau/tau35_medium1_tracktwoEF_tau25_medium1_tracktwoEF_03dR30_L1DR-TAU20ITAU12I-J25
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hHLTdR {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/TopoDiTau/tau35_medium1_tracktwoEF_tau25_medium1_tracktwoEF_03dR30_L1DR-TAU20ITAU12I-J25
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir tau35_medium1_tracktwoEF_tau25_medium1_tracktwoEF_L1DR-TAU20ITAU12I-J25 {
-					hist TProfRecoL1_dREfficiency {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/TopoDiTau/tau35_medium1_tracktwoEF_tau25_medium1_tracktwoEF_L1DR-TAU20ITAU12I-J25
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hHLTdR {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/TopoDiTau/tau35_medium1_tracktwoEF_tau25_medium1_tracktwoEF_L1DR-TAU20ITAU12I-J25
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir tau35_medium1_tracktwo_tau25_medium1_tracktwo {
-					hist TProfRecoL1_dREfficiency {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/TopoDiTau/tau35_medium1_tracktwo_tau25_medium1_tracktwo
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hHLTdR {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/TopoDiTau/tau35_medium1_tracktwo_tau25_medium1_tracktwo
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir tau35_medium1_tracktwo_tau25_medium1_tracktwo_03dR30_L1DR-TAU20ITAU12I {
-					hist   all_in_dir {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/TopoDiTau/tau35_medium1_tracktwo_tau25_medium1_tracktwo_03dR30_L1DR-TAU20ITAU12I
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir tau35_medium1_tracktwo_tau25_medium1_tracktwo_03dR30_L1DR-TAU20ITAU12I-J25 {
-					hist   all_in_dir {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/TopoDiTau/tau35_medium1_tracktwo_tau25_medium1_tracktwo_03dR30_L1DR-TAU20ITAU12I-J25
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir tau35_medium1_tracktwo_tau25_medium1_tracktwo_L1DR-TAU20ITAU12I {
-					hist   all_in_dir {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/TopoDiTau/tau35_medium1_tracktwo_tau25_medium1_tracktwo_L1DR-TAU20ITAU12I
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir tau35_medium1_tracktwo_tau25_medium1_tracktwo_L1DR-TAU20ITAU12I-J25 {
-					hist   all_in_dir {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/TopoDiTau/tau35_medium1_tracktwo_tau25_medium1_tracktwo_L1DR-TAU20ITAU12I-J25
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir tau35_medium1_tracktwo_tau25_medium1_tracktwo_L1TAU20IM_2TAU12IM {
-					hist   all_in_dir {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/TopoDiTau/tau35_medium1_tracktwo_tau25_medium1_tracktwo_L1TAU20IM_2TAU12IM
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir tau80_medium1_tracktwoEF_L1TAU60_tau35_medium1_tracktwoEF_L1TAU12IM_L1TAU60_DR-TAU20ITAU12I {
-					hist TProfRecoL1_dREfficiency {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/TopoDiTau/tau80_medium1_tracktwoEF_L1TAU60_tau35_medium1_tracktwoEF_L1TAU12IM_L1TAU60_DR-TAU20ITAU12I
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hHLTdR {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/TopoDiTau/tau80_medium1_tracktwoEF_L1TAU60_tau35_medium1_tracktwoEF_L1TAU12IM_L1TAU60_DR-TAU20ITAU12I
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir tau80_medium1_tracktwo_L1TAU60_tau35_medium1_tracktwo_L1TAU12IM_L1TAU60_DR-TAU20ITAU12I {
-					hist TProfRecoL1_dREfficiency {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/TopoDiTau/tau80_medium1_tracktwo_L1TAU60_tau35_medium1_tracktwo_L1TAU12IM_L1TAU60_DR-TAU20ITAU12I
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hHLTdR {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/TopoDiTau/tau80_medium1_tracktwo_L1TAU60_tau35_medium1_tracktwo_L1TAU12IM_L1TAU60_DR-TAU20ITAU12I
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-			}
-			dir TopoElTau {
-				dir e17_lhmedium_nod0_ivarloose_tau25_medium1_tracktwo {
-					hist TProfRecoL1_dREfficiency {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/TopoElTau/e17_lhmedium_nod0_ivarloose_tau25_medium1_tracktwo
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hHLTdR {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/TopoElTau/e17_lhmedium_nod0_ivarloose_tau25_medium1_tracktwo
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir e17_lhmedium_nod0_ivarloose_tau25_medium1_tracktwo_L1DR-EM15TAU12I-J25 {
-					hist TProfRecoL1_dREfficiency {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/TopoElTau/e17_lhmedium_nod0_ivarloose_tau25_medium1_tracktwo_L1DR-EM15TAU12I-J25
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hHLTdR {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/TopoElTau/e17_lhmedium_nod0_ivarloose_tau25_medium1_tracktwo_L1DR-EM15TAU12I-J25
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-			}
-			dir TopoMuTau {
-				dir mu14_ivarloose_tau25_medium1_tracktwo {
-					hist TProfRecoL1_dREfficiency {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/TopoMuTau/mu14_ivarloose_tau25_medium1_tracktwo
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hHLTdR {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/TopoMuTau/mu14_ivarloose_tau25_medium1_tracktwo
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir mu14_ivarloose_tau25_medium1_tracktwo_L1DR-MU10TAU12I_TAU12I-J25 {
-					hist TProfRecoL1_dREfficiency {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/TopoMuTau/mu14_ivarloose_tau25_medium1_tracktwo_L1DR-MU10TAU12I_TAU12I-J25
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hHLTdR {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/TopoMuTau/mu14_ivarloose_tau25_medium1_tracktwo_L1DR-MU10TAU12I_TAU12I-J25
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-			}
-			dir dijetFakeTausEff {
-				dir tau160_idperf_tracktwo_L1TAU100 {
-					hist TProfDijetFakeTausHLTEtaEfficiency {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/dijetFakeTausEff/tau160_idperf_tracktwo_L1TAU100
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist TProfDijetFakeTausHLTMuEfficiency {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/dijetFakeTausEff/tau160_idperf_tracktwo_L1TAU100
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist TProfDijetFakeTausHLTNTracksEfficiency {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/dijetFakeTausEff/tau160_idperf_tracktwo_L1TAU100
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist TProfDijetFakeTausHLTPtEfficiency {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/dijetFakeTausEff/tau160_idperf_tracktwo_L1TAU100
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist TProfDijetFakeTausL1EtaEfficiency {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/dijetFakeTausEff/tau160_idperf_tracktwo_L1TAU100
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist TProfDijetFakeTausL1MuEfficiency {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/dijetFakeTausEff/tau160_idperf_tracktwo_L1TAU100
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist TProfDijetFakeTausL1NTracksEfficiency {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/dijetFakeTausEff/tau160_idperf_tracktwo_L1TAU100
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist TProfDijetFakeTausL1PtEfficiency {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/dijetFakeTausEff/tau160_idperf_tracktwo_L1TAU100
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir tau160_medium1_tracktwo_L1TAU100 {
-					hist TProfDijetFakeTausHLTEtaEfficiency {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/dijetFakeTausEff/tau160_medium1_tracktwo_L1TAU100
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist TProfDijetFakeTausHLTMuEfficiency {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/dijetFakeTausEff/tau160_medium1_tracktwo_L1TAU100
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist TProfDijetFakeTausHLTNTracksEfficiency {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/dijetFakeTausEff/tau160_medium1_tracktwo_L1TAU100
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist TProfDijetFakeTausHLTPtEfficiency {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/dijetFakeTausEff/tau160_medium1_tracktwo_L1TAU100
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist TProfDijetFakeTausL1EtaEfficiency {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/dijetFakeTausEff/tau160_medium1_tracktwo_L1TAU100
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist TProfDijetFakeTausL1MuEfficiency {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/dijetFakeTausEff/tau160_medium1_tracktwo_L1TAU100
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist TProfDijetFakeTausL1NTracksEfficiency {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/dijetFakeTausEff/tau160_medium1_tracktwo_L1TAU100
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist TProfDijetFakeTausL1PtEfficiency {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/dijetFakeTausEff/tau160_medium1_tracktwo_L1TAU100
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir tau80_medium1_tracktwo_L1TAU60 {
-					hist TProfDijetFakeTausHLTEtaEfficiency {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/dijetFakeTausEff/tau80_medium1_tracktwo_L1TAU60
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist TProfDijetFakeTausHLTMuEfficiency {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/dijetFakeTausEff/tau80_medium1_tracktwo_L1TAU60
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist TProfDijetFakeTausHLTNTracksEfficiency {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/dijetFakeTausEff/tau80_medium1_tracktwo_L1TAU60
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist TProfDijetFakeTausHLTPtEfficiency {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/dijetFakeTausEff/tau80_medium1_tracktwo_L1TAU60
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist TProfDijetFakeTausL1EtaEfficiency {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/dijetFakeTausEff/tau80_medium1_tracktwo_L1TAU60
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist TProfDijetFakeTausL1MuEfficiency {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/dijetFakeTausEff/tau80_medium1_tracktwo_L1TAU60
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist TProfDijetFakeTausL1NTracksEfficiency {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/dijetFakeTausEff/tau80_medium1_tracktwo_L1TAU60
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist TProfDijetFakeTausL1PtEfficiency {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/dijetFakeTausEff/tau80_medium1_tracktwo_L1TAU60
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-			}
-			dir tau0_perf_ptonly_L1TAU100 {
-				dir EFTau {
-					dir BDT {
-						dir 1p_nonCorrected {
-							hist hEFChPiEMEOverCaloEME1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-								reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFEMPOverTrkSysP1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-								reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFSumPtTrkFrac1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-								reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFcentFrac1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-								reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFetOverPtLeadTrk1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-								reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFinnerTrkAvgDist1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-								reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFipSigLeadTrk1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-								reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFptRatioEflowApprox1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-								reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-						dir mp_nonCorrected {
-							hist hEFChPiEMEOverCaloEMEMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-								reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFEMPOverTrkSysPMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-								reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFcentFracMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-								reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFdRmaxMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-								reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFetOverPtLeadTrkMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-								reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFinnerTrkAvgDistMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-								reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFmEflowApproxMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-								reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFmassTrkSysMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-								reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFptRatioEflowApproxMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-								reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFtrFlightPathSigMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-								reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-					}
-					hist hEFEMFraction {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFTau
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEt {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFTau
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtRaw {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFTau
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtVsEta {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFTau
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFTau
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEta {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFTau
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtaVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFTau
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFIsoFrac {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFTau
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFNUM {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFTau
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFNUMvsmu {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFTau
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFPhi {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFTau
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFnTrack {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFTau
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFnWideTrack {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFTau
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hScore1p {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFTau
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hScoreSigTrans1p {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFTau
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hScoreSigTransmp {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFTau
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hScoremp {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFTau
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir EFVsOffline {
-					dir BDT {
-						dir 1p_nonCorrected {
-							hist hCentFracRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-								reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hChPiEMEOverCaloEMERatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hDRmaxRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEMPOverTrkSysPRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEtOverPtLeadTrkRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hInnerTrkAvgDistRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hIpSigLeadTrkRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hPtRatioEflowApproxRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hSumPtTrkFracRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hTopoInvMassRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-						dir mp_nonCorrected {
-							hist hCentFracRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hChPiEMEOverCaloEMERatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hDRmaxRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEMPOverTrkSysPRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEtOverPtLeadTrkRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hInnerTrkAvgDistRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hMEflowApproxRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hMassTrkSysRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hPtRatioEflowApproxRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hTrFlightPathSigRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-					}
-					hist   all_in_dir {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFVsOffline
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFvsOffnTrks {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFVsOffline
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFvsOffnWideTrks {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFVsOffline
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir L1RoI {
-					hist hL1EtVsEta {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1EtVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1EtaVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIEMIso {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIEta {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIHadCore {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIHadIsol {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIPhi {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoITauClus {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoITauClusEMIso {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIeT {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIisol {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir L1VsOffline {
-					hist hL1EtRatio {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/L1VsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir TurnOnCurves {
-					dir RecoEfficiency {
-						hist TProfRecoHLTEtaEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTHighPt1pEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTHighPt3pEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTHighPtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTMuEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTNTrackEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTNVtxEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPhiEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPt1PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPt3PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1EtaEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1HighPt1PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1HighPt3PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1HighPtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1MuEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1NTrackEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1NVtxEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1PhiEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1Pt1PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1Pt3PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1PtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-					}
-				}
-			}
-			dir tau0_perf_ptonly_L1TAU12 {
-				dir EFTau {
-					dir BDT {
-						dir 1p_nonCorrected {
-							hist hEFChPiEMEOverCaloEME1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFEMPOverTrkSysP1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFSumPtTrkFrac1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFcentFrac1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFetOverPtLeadTrk1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFinnerTrkAvgDist1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFipSigLeadTrk1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFptRatioEflowApprox1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-						dir mp_nonCorrected {
-							hist hEFChPiEMEOverCaloEMEMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFEMPOverTrkSysPMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFcentFracMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFdRmaxMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFetOverPtLeadTrkMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFinnerTrkAvgDistMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFmEflowApproxMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFmassTrkSysMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFptRatioEflowApproxMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFtrFlightPathSigMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-					}
-					hist hEFEMFraction {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEt {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtRaw {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtVsEta {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEta {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtaVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFIsoFrac {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFNUM {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFNUMvsmu {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFPhi {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFnTrack {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFnWideTrack {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hScore1p {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hScoreSigTrans1p {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hScoreSigTransmp {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hScoremp {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir EFVsOffline {
-					dir BDT {
-						dir 1p_nonCorrected {
-							hist hCentFracRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hChPiEMEOverCaloEMERatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hDRmaxRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEMPOverTrkSysPRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEtOverPtLeadTrkRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hInnerTrkAvgDistRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hIpSigLeadTrkRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hPtRatioEflowApproxRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hSumPtTrkFracRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hTopoInvMassRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-						dir mp_nonCorrected {
-							hist hCentFracRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hChPiEMEOverCaloEMERatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hDRmaxRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEMPOverTrkSysPRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEtOverPtLeadTrkRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hInnerTrkAvgDistRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hMEflowApproxRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hMassTrkSysRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hPtRatioEflowApproxRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hTrFlightPathSigRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-					}
-					hist   all_in_dir {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFVsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFvsOffnTrks {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFVsOffline
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFvsOffnWideTrks {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFVsOffline
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir L1RoI {
-					hist hL1EtVsEta {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1EtVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1EtaVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIEMIso {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIEta {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIHadCore {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIHadIsol {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIPhi {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoITauClus {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoITauClusEMIso {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIeT {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIisol {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir L1VsOffline {
-					hist hL1EtRatio {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/L1VsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir TurnOnCurves {
-					dir RecoEfficiency {
-						hist TProfRecoHLTEtaEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTHighPt1pEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTHighPt3pEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTHighPtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTMuEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTNTrackEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTNVtxEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPhiEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPt1PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPt3PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1EtaEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1HighPt1PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1HighPt3PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1HighPtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1MuEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1NTrackEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1NVtxEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1PhiEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1Pt1PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1Pt3PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1PtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-					}
-				}
-			}
-			dir tau160_idperf_tracktwo_L1TAU100 {
-				dir EFTau {
-					dir BDT {
-						dir 1p_nonCorrected {
-							hist hEFChPiEMEOverCaloEME1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFEMPOverTrkSysP1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFSumPtTrkFrac1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFcentFrac1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFetOverPtLeadTrk1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFinnerTrkAvgDist1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFipSigLeadTrk1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFptRatioEflowApprox1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-						dir mp_nonCorrected {
-							hist hEFChPiEMEOverCaloEMEMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFEMPOverTrkSysPMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFcentFracMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFdRmaxMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFetOverPtLeadTrkMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFinnerTrkAvgDistMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFmEflowApproxMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFmassTrkSysMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFptRatioEflowApproxMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFtrFlightPathSigMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-					}
-					hist hEFEMFraction {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEt {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtRaw {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtVsEta {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEta {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtaVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFIsoFrac {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFNUM {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFNUMvsmu {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFPhi {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFnTrack {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFnWideTrack {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hScore1p {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hScoreSigTrans1p {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hScoreSigTransmp {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hScoremp {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir EFVsOffline {
-					dir BDT {
-						dir 1p_nonCorrected {
-							hist hCentFracRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hChPiEMEOverCaloEMERatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hDRmaxRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEMPOverTrkSysPRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEtOverPtLeadTrkRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hInnerTrkAvgDistRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hIpSigLeadTrkRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hPtRatioEflowApproxRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hSumPtTrkFracRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hTopoInvMassRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-						dir mp_nonCorrected {
-							hist hCentFracRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hChPiEMEOverCaloEMERatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hDRmaxRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEMPOverTrkSysPRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEtOverPtLeadTrkRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hInnerTrkAvgDistRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hMEflowApproxRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hMassTrkSysRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hPtRatioEflowApproxRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hTrFlightPathSigRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-					}
-					hist   all_in_dir {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFVsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFvsOffnTrks {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFVsOffline
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFvsOffnWideTrks {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFVsOffline
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir L1RoI {
-					hist hL1EtVsEta {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1EtVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1EtaVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIEMIso {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIEta {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIHadCore {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIHadIsol {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIPhi {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoITauClus {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoITauClusEMIso {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIeT {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIisol {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir L1VsOffline {
-					hist hL1EtRatio {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/L1VsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir PreselectionTau {
-					hist hEFEt {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEt2 {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtaVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEtVsEta {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEtVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEta {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hFTFnTrack {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hFTFnWideTrack {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hPhi {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir PreselectionVsOffline {
-					hist hEFEtRatio {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/PreselectionVsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEtaRatio {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/PreselectionVsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hPhiRatio {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/PreselectionVsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hPreselvsOffnTrks {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/PreselectionVsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hPreselvsOffnWideTrks {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/PreselectionVsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir TurnOnCurves {
-					dir RecoEfficiency {
-						hist TProfRecoHLTEtaEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTHighPt1pEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTHighPt3pEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTHighPtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTMuEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTNTrackEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTNVtxEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPhiEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPt1PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPt3PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1EtaEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1HighPt1PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1HighPt3PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1HighPtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1MuEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1NTrackEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1NVtxEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1PhiEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1Pt1PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1Pt3PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1PtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-					}
-				}
-			}
-			dir tau160_medium1_tracktwo_L1TAU100 {
-				dir EFTau {
-					dir BDT {
-						dir 1p_nonCorrected {
-							hist hEFChPiEMEOverCaloEME1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFEMPOverTrkSysP1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFSumPtTrkFrac1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFcentFrac1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFetOverPtLeadTrk1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFinnerTrkAvgDist1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFipSigLeadTrk1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFptRatioEflowApprox1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-						dir mp_nonCorrected {
-							hist hEFChPiEMEOverCaloEMEMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFEMPOverTrkSysPMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFcentFracMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFdRmaxMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFetOverPtLeadTrkMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFinnerTrkAvgDistMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFmEflowApproxMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFmassTrkSysMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFptRatioEflowApproxMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFtrFlightPathSigMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-					}
-					hist hEFEMFraction {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEt {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtRaw {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtVsEta {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEta {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtaVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFIsoFrac {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFNUM {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFNUMvsmu {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFPhi {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFnTrack {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFnWideTrack {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hScore1p {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hScoreSigTrans1p {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hScoreSigTransmp {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hScoremp {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir EFVsOffline {
-					dir BDT {
-						dir 1p_nonCorrected {
-							hist hCentFracRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hChPiEMEOverCaloEMERatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hDRmaxRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEMPOverTrkSysPRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEtOverPtLeadTrkRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hInnerTrkAvgDistRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hIpSigLeadTrkRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hPtRatioEflowApproxRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hSumPtTrkFracRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hTopoInvMassRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-						dir mp_nonCorrected {
-							hist hCentFracRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hChPiEMEOverCaloEMERatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hDRmaxRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEMPOverTrkSysPRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEtOverPtLeadTrkRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hInnerTrkAvgDistRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hMEflowApproxRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hMassTrkSysRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hPtRatioEflowApproxRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hTrFlightPathSigRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-					}
-					hist   all_in_dir {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFVsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFvsOffnTrks {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFVsOffline
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFvsOffnWideTrks {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFVsOffline
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir L1RoI {
-					hist hL1EtVsEta {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1EtVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1EtaVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIEMIso {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIEta {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIHadCore {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIHadIsol {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIPhi {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoITauClus {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoITauClusEMIso {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIeT {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIisol {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir L1VsOffline {
-					hist hL1EtRatio {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/L1VsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir PreselectionTau {
-					hist hEFEt {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEt2 {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtaVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEtVsEta {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEtVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEta {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hFTFnTrack {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hFTFnWideTrack {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hPhi {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir PreselectionVsOffline {
-					hist hEFEtRatio {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/PreselectionVsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEtaRatio {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/PreselectionVsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hPhiRatio {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/PreselectionVsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hPreselvsOffnTrks {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/PreselectionVsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hPreselvsOffnWideTrks {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/PreselectionVsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir TurnOnCurves {
-					dir RecoEfficiency {
-						hist TProfRecoHLTEtaEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTHighPt1pEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTHighPt3pEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTHighPtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTMuEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTNTrackEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTNVtxEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPhiEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPt1PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPt3PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1EtaEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1HighPt1PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1HighPt3PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1HighPtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1MuEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1NTrackEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1NVtxEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1PhiEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1Pt1PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1Pt3PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1PtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-					}
-				}
-			}
-			dir tau160_perf_tracktwo_L1TAU100 {
-				dir EFTau {
-					dir BDT {
-						dir 1p_nonCorrected {
-							hist hEFChPiEMEOverCaloEME1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFEMPOverTrkSysP1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFSumPtTrkFrac1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFcentFrac1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFetOverPtLeadTrk1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFinnerTrkAvgDist1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFipSigLeadTrk1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFptRatioEflowApprox1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-						dir mp_nonCorrected {
-							hist hEFChPiEMEOverCaloEMEMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFEMPOverTrkSysPMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFcentFracMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFdRmaxMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFetOverPtLeadTrkMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFinnerTrkAvgDistMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFmEflowApproxMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFmassTrkSysMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFptRatioEflowApproxMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFtrFlightPathSigMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-					}
-					hist hEFEMFraction {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEt {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtRaw {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtVsEta {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEta {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtaVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFIsoFrac {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFNUM {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFNUMvsmu {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFPhi {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFnTrack {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFnWideTrack {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hScore1p {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hScoreSigTrans1p {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hScoreSigTransmp {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hScoremp {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir EFVsOffline {
-					dir BDT {
-						dir 1p_nonCorrected {
-							hist hCentFracRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hChPiEMEOverCaloEMERatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hDRmaxRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEMPOverTrkSysPRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEtOverPtLeadTrkRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hInnerTrkAvgDistRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hIpSigLeadTrkRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hPtRatioEflowApproxRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hSumPtTrkFracRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hTopoInvMassRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-						dir mp_nonCorrected {
-							hist hCentFracRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hChPiEMEOverCaloEMERatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hDRmaxRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEMPOverTrkSysPRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEtOverPtLeadTrkRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hInnerTrkAvgDistRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hMEflowApproxRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hMassTrkSysRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hPtRatioEflowApproxRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hTrFlightPathSigRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-					}
-					hist   all_in_dir {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFVsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFvsOffnTrks {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFVsOffline
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFvsOffnWideTrks {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFVsOffline
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir L1RoI {
-					hist hL1EtVsEta {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1EtVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1EtaVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIEMIso {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIEta {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIHadCore {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIHadIsol {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIPhi {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoITauClus {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoITauClusEMIso {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIeT {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIisol {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir L1VsOffline {
-					hist hL1EtRatio {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/L1VsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir PreselectionTau {
-					hist hEFEt {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEt2 {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtaVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEtVsEta {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEtVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEta {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hFTFnTrack {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hFTFnWideTrack {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hPhi {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir PreselectionVsOffline {
-					hist hEFEtRatio {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/PreselectionVsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEtaRatio {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/PreselectionVsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hPhiRatio {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/PreselectionVsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hPreselvsOffnTrks {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/PreselectionVsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hPreselvsOffnWideTrks {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/PreselectionVsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir TurnOnCurves {
-					dir RecoEfficiency {
-						hist TProfRecoHLTEtaEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTHighPt1pEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTHighPt3pEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTHighPtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTMuEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTNTrackEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTNVtxEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPhiEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPt1PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPt3PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1EtaEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1HighPt1PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1HighPt3PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1HighPtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1MuEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1NTrackEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1NVtxEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1PhiEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1Pt1PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1Pt3PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1PtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-					}
-				}
-			}
-			dir tau25_idperf_tracktwo {
-				dir EFTau {
-					dir BDT {
-						dir 1p_nonCorrected {
-							hist hEFChPiEMEOverCaloEME1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFEMPOverTrkSysP1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFSumPtTrkFrac1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFcentFrac1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFetOverPtLeadTrk1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFinnerTrkAvgDist1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFipSigLeadTrk1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFptRatioEflowApprox1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-						dir mp_nonCorrected {
-							hist hEFChPiEMEOverCaloEMEMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFEMPOverTrkSysPMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFcentFracMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFdRmaxMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFetOverPtLeadTrkMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFinnerTrkAvgDistMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFmEflowApproxMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFmassTrkSysMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFptRatioEflowApproxMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFtrFlightPathSigMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-					}
-					hist hEFEMFraction {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEt {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtRaw {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtVsEta {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEta {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtaVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFIsoFrac {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFNUM {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFNUMvsmu {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFPhi {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFnTrack {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFnWideTrack {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hScore1p {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hScoreSigTrans1p {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hScoreSigTransmp {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hScoremp {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir EFVsOffline {
-					dir BDT {
-						dir 1p_nonCorrected {
-							hist hCentFracRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hChPiEMEOverCaloEMERatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hDRmaxRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEMPOverTrkSysPRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEtOverPtLeadTrkRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hInnerTrkAvgDistRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hIpSigLeadTrkRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hPtRatioEflowApproxRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hSumPtTrkFracRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hTopoInvMassRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-						dir mp_nonCorrected {
-							hist hCentFracRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hChPiEMEOverCaloEMERatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hDRmaxRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEMPOverTrkSysPRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEtOverPtLeadTrkRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hInnerTrkAvgDistRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hMEflowApproxRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hMassTrkSysRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hPtRatioEflowApproxRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hTrFlightPathSigRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-					}
-					hist   all_in_dir {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFVsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFvsOffnTrks {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFVsOffline
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFvsOffnWideTrks {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFVsOffline
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir L1RoI {
-					hist hL1EtVsEta {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1EtVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1EtaVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIEMIso {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIEta {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIHadCore {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIHadIsol {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIPhi {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoITauClus {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoITauClusEMIso {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIeT {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIisol {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir L1VsOffline {
-					hist hL1EtRatio {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/L1VsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir PreselectionTau {
-					hist hEFEt {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEt2 {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtaVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEtVsEta {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEtVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEta {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hFTFnTrack {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hFTFnWideTrack {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hPhi {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir PreselectionVsOffline {
-					hist hEFEtRatio {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/PreselectionVsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEtaRatio {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/PreselectionVsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hPhiRatio {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/PreselectionVsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hPreselvsOffnTrks {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/PreselectionVsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hPreselvsOffnWideTrks {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/PreselectionVsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir TurnOnCurves {
-					dir RecoEfficiency {
-						hist TProfRecoHLTEtaEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTHighPt1pEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTHighPt3pEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTHighPtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTMuEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTNTrackEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTNVtxEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPhiEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPt1PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPt3PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1EtaEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1HighPt1PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1HighPt3PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1HighPtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1MuEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1NTrackEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1NVtxEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1PhiEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1Pt1PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1Pt3PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1PtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-					}
-				}
-			}
-			dir tau25_idperf_tracktwoEF {
-				dir EFTau {
-					dir BDT {
-						dir 1p_nonCorrected {
-							hist hEFChPiEMEOverCaloEME1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFEMPOverTrkSysP1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFSumPtTrkFrac1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFcentFrac1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFetOverPtLeadTrk1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFinnerTrkAvgDist1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFipSigLeadTrk1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFptRatioEflowApprox1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-						dir mp_nonCorrected {
-							hist hEFChPiEMEOverCaloEMEMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFEMPOverTrkSysPMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFcentFracMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFdRmaxMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFetOverPtLeadTrkMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFinnerTrkAvgDistMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFmEflowApproxMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFmassTrkSysMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFptRatioEflowApproxMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFtrFlightPathSigMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-					}
-					hist hEFEMFraction {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEt {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtRaw {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtVsEta {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEta {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtaVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFIsoFrac {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFNUM {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFNUMvsmu {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFPhi {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFnTrack {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFnWideTrack {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hScore1p {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hScoreSigTrans1p {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hScoreSigTransmp {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hScoremp {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir EFVsOffline {
-					dir BDT {
-						dir 1p_nonCorrected {
-							hist hCentFracRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hChPiEMEOverCaloEMERatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hDRmaxRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEMPOverTrkSysPRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEtOverPtLeadTrkRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hInnerTrkAvgDistRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hIpSigLeadTrkRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hPtRatioEflowApproxRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hSumPtTrkFracRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hTopoInvMassRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-						dir mp_nonCorrected {
-							hist hCentFracRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hChPiEMEOverCaloEMERatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hDRmaxRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEMPOverTrkSysPRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEtOverPtLeadTrkRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hInnerTrkAvgDistRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hMEflowApproxRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hMassTrkSysRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hPtRatioEflowApproxRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hTrFlightPathSigRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-					}
-					hist   all_in_dir {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFVsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFvsOffnTrks {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFVsOffline
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFvsOffnWideTrks {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFVsOffline
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir L1RoI {
-					hist hL1EtVsEta {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1EtVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1EtaVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIEMIso {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIEta {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIHadCore {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIHadIsol {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIPhi {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoITauClus {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoITauClusEMIso {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIeT {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIisol {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir L1VsOffline {
-					hist hL1EtRatio {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/L1VsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir TurnOnCurves {
-					dir RecoEfficiency {
-						hist TProfRecoHLTEtaEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTHighPt1pEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTHighPt3pEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTHighPtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTMuEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTNTrackEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTNVtxEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPhiEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPt1PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPt3PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1EtaEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1HighPt1PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1HighPt3PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1HighPtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1MuEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1NTrackEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1NVtxEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1PhiEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1Pt1PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1Pt3PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1PtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-					}
-				}
-			}
-			dir tau25_idperf_tracktwoEFmvaTES {
-				dir EFTau {
-					dir BDT {
-						dir 1p_nonCorrected {
-							hist hEFChPiEMEOverCaloEME1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFEMPOverTrkSysP1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFSumPtTrkFrac1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFcentFrac1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFetOverPtLeadTrk1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFinnerTrkAvgDist1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFipSigLeadTrk1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFptRatioEflowApprox1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-						dir mp_nonCorrected {
-							hist hEFChPiEMEOverCaloEMEMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFEMPOverTrkSysPMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFcentFracMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFdRmaxMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFetOverPtLeadTrkMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFinnerTrkAvgDistMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFmEflowApproxMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFmassTrkSysMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFptRatioEflowApproxMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFtrFlightPathSigMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-					}
-					hist hEFEMFraction {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEt {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtRaw {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtVsEta {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEta {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtaVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFIsoFrac {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFNUM {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFNUMvsmu {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFPhi {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFnTrack {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFnWideTrack {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hScore1p {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hScoreSigTrans1p {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hScoreSigTransmp {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hScoremp {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir EFVsOffline {
-					dir BDT {
-						dir 1p_nonCorrected {
-							hist hCentFracRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hChPiEMEOverCaloEMERatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hDRmaxRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEMPOverTrkSysPRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEtOverPtLeadTrkRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hInnerTrkAvgDistRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hIpSigLeadTrkRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hPtRatioEflowApproxRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hSumPtTrkFracRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hTopoInvMassRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-						dir mp_nonCorrected {
-							hist hCentFracRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hChPiEMEOverCaloEMERatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hDRmaxRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEMPOverTrkSysPRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEtOverPtLeadTrkRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hInnerTrkAvgDistRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hMEflowApproxRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hMassTrkSysRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hPtRatioEflowApproxRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hTrFlightPathSigRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-					}
-					hist   all_in_dir {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFVsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFvsOffnTrks {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFVsOffline
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFvsOffnWideTrks {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFVsOffline
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir L1RoI {
-					hist hL1EtVsEta {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1EtVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1EtaVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIEMIso {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIEta {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIHadCore {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIHadIsol {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIPhi {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoITauClus {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoITauClusEMIso {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIeT {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIisol {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir L1VsOffline {
-					hist hL1EtRatio {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/L1VsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir TurnOnCurves {
-					dir RecoEfficiency {
-						hist TProfRecoHLTEtaEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTHighPt1pEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTHighPt3pEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTHighPtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTMuEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTNTrackEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTNVtxEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPhiEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPt1PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPt3PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1EtaEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1HighPt1PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1HighPt3PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1HighPtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1MuEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1NTrackEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1NVtxEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1PhiEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1Pt1PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1Pt3PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1PtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-					}
-				}
-			}
-			dir tau25_idperf_tracktwoMVA {
-				dir EFTau {
-					dir BDT {
-						dir 1p_nonCorrected {
-							hist hEFChPiEMEOverCaloEME1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFEMPOverTrkSysP1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFSumPtTrkFrac1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFcentFrac1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFetOverPtLeadTrk1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFinnerTrkAvgDist1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFipSigLeadTrk1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFptRatioEflowApprox1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-						dir mp_nonCorrected {
-							hist hEFChPiEMEOverCaloEMEMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFEMPOverTrkSysPMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFcentFracMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFdRmaxMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFetOverPtLeadTrkMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFinnerTrkAvgDistMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFmEflowApproxMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFmassTrkSysMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFptRatioEflowApproxMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFtrFlightPathSigMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-					}
-					dir RNN {
-						dir InputScalar1p {
-							hist hEFRNNInput_Scalar_EMPOverTrkSysP_log_1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau/RNN/InputScalar1p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_SumPtTrkFrac_1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau/RNN/InputScalar1p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_absipSigLeadTrk_1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau/RNN/InputScalar1p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_centFrac_1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau/RNN/InputScalar1p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_dRmax_1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau/RNN/InputScalar1p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_etOverPtLeadTrk_log_1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau/RNN/InputScalar1p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_mEflowApprox_log_1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau/RNN/InputScalar1p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_ptDetectorAxis_log_1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau/RNN/InputScalar1p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_ptRatioEflowApprox_1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau/RNN/InputScalar1p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-						dir InputScalar3p {
-							hist hEFRNNInput_Scalar_EMPOverTrkSysP_log_3P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau/RNN/InputScalar3p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_SumPtTrkFrac_3P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau/RNN/InputScalar3p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_centFrac_3P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau/RNN/InputScalar3p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_dRmax_3P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau/RNN/InputScalar3p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_etOverPtLeadTrk_log_3P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau/RNN/InputScalar3p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_mEflowApprox_log_3P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau/RNN/InputScalar3p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_massTrkSys_log_3P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau/RNN/InputScalar3p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_ptDetectorAxis_log_3P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau/RNN/InputScalar3p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_ptRatioEflowApprox_3P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau/RNN/InputScalar3p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_trFlightPathSig_log_3P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau/RNN/InputScalar3p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-						dir Output {
-							hist hEFRNNJetScore {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau/RNN/Output
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNJetScoreSigTrans {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau/RNN/Output
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-					}
-					hist hEFEMFraction {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEt {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtRaw {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtVsEta {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEta {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtaVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFIsoFrac {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFNUM {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFNUMvsmu {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFPhi {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFnTrack {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFnWideTrack {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hScore1p {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hScoreSigTrans1p {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hScoreSigTransmp {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hScoremp {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir EFVsOffline {
-					dir BDT {
-						dir 1p_nonCorrected {
-							hist hCentFracRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hChPiEMEOverCaloEMERatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hDRmaxRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEMPOverTrkSysPRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEtOverPtLeadTrkRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hInnerTrkAvgDistRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hIpSigLeadTrkRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hPtRatioEflowApproxRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hSumPtTrkFracRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hTopoInvMassRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-						dir mp_nonCorrected {
-							hist hCentFracRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hChPiEMEOverCaloEMERatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hDRmaxRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEMPOverTrkSysPRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEtOverPtLeadTrkRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hInnerTrkAvgDistRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hMEflowApproxRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hMassTrkSysRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hPtRatioEflowApproxRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hTrFlightPathSigRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-					}
-					hist   all_in_dir {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFVsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFvsOffnTrks {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFVsOffline
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFvsOffnWideTrks {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFVsOffline
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir L1RoI {
-					hist hL1EtVsEta {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1EtVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1EtaVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIEMIso {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIEta {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIHadCore {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIHadIsol {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIPhi {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoITauClus {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoITauClusEMIso {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIeT {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIisol {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir L1VsOffline {
-					hist hL1EtRatio {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/L1VsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir TurnOnCurves {
-					dir RecoEfficiency {
-						hist TProfRecoHLTEtaEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTHighPt1pEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTHighPt3pEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTHighPtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTMuEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTNTrackEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTNVtxEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPhiEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPt1PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPt3PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1EtaEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1HighPt1PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1HighPt3PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1HighPtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1MuEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1NTrackEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1NVtxEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1PhiEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1Pt1PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1Pt3PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1PtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-					}
-				}
-			}
-			dir tau25_looseRNN_tracktwo {
-				dir EFTau {
-					dir RNN {
-						dir InputScalar1p {
-							hist hEFRNNInput_Scalar_EMPOverTrkSysP_log_1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwo/EFTau/RNN/InputScalar1p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_SumPtTrkFrac_1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwo/EFTau/RNN/InputScalar1p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_absipSigLeadTrk_1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwo/EFTau/RNN/InputScalar1p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_centFrac_1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwo/EFTau/RNN/InputScalar1p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_dRmax_1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwo/EFTau/RNN/InputScalar1p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_etOverPtLeadTrk_log_1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwo/EFTau/RNN/InputScalar1p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_mEflowApprox_log_1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwo/EFTau/RNN/InputScalar1p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_ptDetectorAxis_log_1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwo/EFTau/RNN/InputScalar1p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_ptRatioEflowApprox_1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwo/EFTau/RNN/InputScalar1p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-						dir InputScalar3p {
-							hist hEFRNNInput_Scalar_EMPOverTrkSysP_log_3P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwo/EFTau/RNN/InputScalar3p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_SumPtTrkFrac_3P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwo/EFTau/RNN/InputScalar3p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_centFrac_3P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwo/EFTau/RNN/InputScalar3p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_dRmax_3P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwo/EFTau/RNN/InputScalar3p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_etOverPtLeadTrk_log_3P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwo/EFTau/RNN/InputScalar3p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_mEflowApprox_log_3P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwo/EFTau/RNN/InputScalar3p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_massTrkSys_log_3P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwo/EFTau/RNN/InputScalar3p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_ptDetectorAxis_log_3P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwo/EFTau/RNN/InputScalar3p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_ptRatioEflowApprox_3P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwo/EFTau/RNN/InputScalar3p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_trFlightPathSig_log_3P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwo/EFTau/RNN/InputScalar3p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-						dir Output {
-							hist hEFRNNJetScore {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwo/EFTau/RNN/Output
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNJetScoreSigTrans {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwo/EFTau/RNN/Output
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-					}
-					hist hEFEMFraction {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEt {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtRaw {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtVsEta {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEta {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtaVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFIsoFrac {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFNUM {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFNUMvsmu {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFPhi {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFnTrack {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFnWideTrack {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir EFVsOffline {
-					dir BDT {
-						dir 1p_nonCorrected {
-							hist hCentFracRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwo/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hChPiEMEOverCaloEMERatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwo/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hDRmaxRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwo/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEMPOverTrkSysPRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwo/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEtOverPtLeadTrkRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwo/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hInnerTrkAvgDistRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwo/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hIpSigLeadTrkRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwo/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hPtRatioEflowApproxRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwo/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hSumPtTrkFracRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwo/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hTopoInvMassRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwo/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-						dir mp_nonCorrected {
-							hist hCentFracRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwo/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hChPiEMEOverCaloEMERatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwo/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hDRmaxRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwo/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEMPOverTrkSysPRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwo/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEtOverPtLeadTrkRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwo/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hInnerTrkAvgDistRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwo/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hMEflowApproxRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwo/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hMassTrkSysRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwo/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hPtRatioEflowApproxRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwo/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hTrFlightPathSigRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwo/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-					}
-					hist   all_in_dir {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwo/EFVsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFvsOffnTrks {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwo/EFVsOffline
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFvsOffnWideTrks {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwo/EFVsOffline
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir L1RoI {
-					hist hL1EtVsEta {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwo/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1EtVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwo/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1EtaVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwo/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIEMIso {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwo/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIEta {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwo/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIHadCore {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwo/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIHadIsol {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwo/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIPhi {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwo/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoITauClus {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwo/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoITauClusEMIso {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwo/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIeT {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwo/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIisol {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwo/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir L1VsOffline {
-					hist hL1EtRatio {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwo/L1VsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir PreselectionTau {
-					hist hEFEt {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwo/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEt2 {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwo/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtaVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwo/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEtVsEta {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwo/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEtVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwo/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEta {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwo/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hFTFnTrack {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwo/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hFTFnWideTrack {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwo/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hPhi {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwo/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir PreselectionVsOffline {
-					hist hEFEtRatio {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwo/PreselectionVsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEtaRatio {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwo/PreselectionVsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hPhiRatio {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwo/PreselectionVsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hPreselvsOffnTrks {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwo/PreselectionVsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hPreselvsOffnWideTrks {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwo/PreselectionVsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir TurnOnCurves {
-					dir RecoEfficiency {
-						hist TProfRecoHLTEtaEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTHighPt1pEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTHighPt3pEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTHighPtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTMuEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTNTrackEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTNVtxEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPhiEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPt1PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPt3PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1EtaEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1HighPt1PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1HighPt3PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1HighPtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1MuEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1NTrackEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1NVtxEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1PhiEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1Pt1PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1Pt3PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1PtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-					}
-				}
-			}
-			dir tau25_looseRNN_tracktwoMVA {
-				dir EFTau {
-					dir RNN {
-						dir InputScalar1p {
-							hist hEFRNNInput_Scalar_EMPOverTrkSysP_log_1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/EFTau/RNN/InputScalar1p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_SumPtTrkFrac_1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/EFTau/RNN/InputScalar1p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_absipSigLeadTrk_1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/EFTau/RNN/InputScalar1p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_centFrac_1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/EFTau/RNN/InputScalar1p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_dRmax_1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/EFTau/RNN/InputScalar1p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_etOverPtLeadTrk_log_1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/EFTau/RNN/InputScalar1p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_mEflowApprox_log_1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/EFTau/RNN/InputScalar1p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_ptDetectorAxis_log_1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/EFTau/RNN/InputScalar1p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_ptRatioEflowApprox_1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/EFTau/RNN/InputScalar1p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-						dir InputScalar3p {
-							hist hEFRNNInput_Scalar_EMPOverTrkSysP_log_3P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/EFTau/RNN/InputScalar3p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_SumPtTrkFrac_3P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/EFTau/RNN/InputScalar3p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_centFrac_3P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/EFTau/RNN/InputScalar3p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_dRmax_3P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/EFTau/RNN/InputScalar3p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_etOverPtLeadTrk_log_3P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/EFTau/RNN/InputScalar3p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_mEflowApprox_log_3P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/EFTau/RNN/InputScalar3p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_massTrkSys_log_3P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/EFTau/RNN/InputScalar3p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_ptDetectorAxis_log_3P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/EFTau/RNN/InputScalar3p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_ptRatioEflowApprox_3P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/EFTau/RNN/InputScalar3p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_trFlightPathSig_log_3P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/EFTau/RNN/InputScalar3p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-						dir Output {
-							hist hEFRNNJetScore {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/EFTau/RNN/Output
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNJetScoreSigTrans {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/EFTau/RNN/Output
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-					}
-					hist hEFEMFraction {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEt {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtRaw {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtVsEta {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEta {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtaVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFIsoFrac {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFNUM {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFNUMvsmu {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFPhi {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFnTrack {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFnWideTrack {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir EFVsOffline {
-					dir BDT {
-						dir 1p_nonCorrected {
-							hist hCentFracRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hChPiEMEOverCaloEMERatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hDRmaxRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEMPOverTrkSysPRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEtOverPtLeadTrkRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hInnerTrkAvgDistRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hIpSigLeadTrkRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hPtRatioEflowApproxRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hSumPtTrkFracRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hTopoInvMassRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-						dir mp_nonCorrected {
-							hist hCentFracRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hChPiEMEOverCaloEMERatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hDRmaxRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEMPOverTrkSysPRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEtOverPtLeadTrkRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hInnerTrkAvgDistRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hMEflowApproxRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hMassTrkSysRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hPtRatioEflowApproxRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hTrFlightPathSigRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-					}
-					hist   all_in_dir {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/EFVsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFvsOffnTrks {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/EFVsOffline
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFvsOffnWideTrks {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/EFVsOffline
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir L1RoI {
-					hist hL1EtVsEta {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1EtVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1EtaVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIEMIso {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIEta {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIHadCore {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIHadIsol {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIPhi {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoITauClus {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoITauClusEMIso {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIeT {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIisol {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir L1VsOffline {
-					hist hL1EtRatio {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/L1VsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir TurnOnCurves {
-					dir RecoEfficiency {
-						hist TProfRecoHLTEtaEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTHighPt1pEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTHighPt3pEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTHighPtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTMuEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTNTrackEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTNVtxEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPhiEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPt1PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPt3PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1EtaEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1HighPt1PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1HighPt3PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1HighPtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1MuEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1NTrackEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1NVtxEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1PhiEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1Pt1PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1Pt3PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1PtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-					}
-				}
-			}
-			dir tau25_medium1NoPt_tracktwoEFmvaTES {
-				dir EFTau {
-					dir BDT {
-						dir 1p_nonCorrected {
-							hist hEFChPiEMEOverCaloEME1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFEMPOverTrkSysP1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFSumPtTrkFrac1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFcentFrac1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFetOverPtLeadTrk1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFinnerTrkAvgDist1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFipSigLeadTrk1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFptRatioEflowApprox1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-						dir mp_nonCorrected {
-							hist hEFChPiEMEOverCaloEMEMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFEMPOverTrkSysPMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFcentFracMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFdRmaxMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFetOverPtLeadTrkMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFinnerTrkAvgDistMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFmEflowApproxMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFmassTrkSysMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFptRatioEflowApproxMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFtrFlightPathSigMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-					}
-					hist hEFEMFraction {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEt {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtRaw {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtVsEta {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEta {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtaVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFIsoFrac {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFNUM {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFNUMvsmu {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFPhi {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFnTrack {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFnWideTrack {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hScore1p {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hScoreSigTrans1p {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hScoreSigTransmp {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hScoremp {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir EFVsOffline {
-					dir BDT {
-						dir 1p_nonCorrected {
-							hist hCentFracRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hChPiEMEOverCaloEMERatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hDRmaxRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEMPOverTrkSysPRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEtOverPtLeadTrkRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hInnerTrkAvgDistRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hIpSigLeadTrkRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hPtRatioEflowApproxRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hSumPtTrkFracRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hTopoInvMassRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-						dir mp_nonCorrected {
-							hist hCentFracRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hChPiEMEOverCaloEMERatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hDRmaxRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEMPOverTrkSysPRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEtOverPtLeadTrkRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hInnerTrkAvgDistRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hMEflowApproxRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hMassTrkSysRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hPtRatioEflowApproxRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hTrFlightPathSigRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-					}
-					hist   all_in_dir {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFVsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFvsOffnTrks {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFVsOffline
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFvsOffnWideTrks {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFVsOffline
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir L1RoI {
-					hist hL1EtVsEta {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1EtVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1EtaVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIEMIso {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIEta {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIHadCore {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIHadIsol {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIPhi {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoITauClus {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoITauClusEMIso {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIeT {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIisol {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir L1VsOffline {
-					hist hL1EtRatio {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/L1VsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir TurnOnCurves {
-					dir RecoEfficiency {
-						hist TProfRecoHLTEtaEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTHighPt1pEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTHighPt3pEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTHighPtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTMuEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTNTrackEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTNVtxEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPhiEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPt1PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPt3PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1EtaEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1HighPt1PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1HighPt3PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1HighPtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1MuEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1NTrackEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1NVtxEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1PhiEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1Pt1PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1Pt3PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1PtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-					}
-				}
-			}
-			dir tau25_medium1_tracktwo {
-				dir EFTau {
-					dir BDT {
-						dir 1p_nonCorrected {
-							hist hEFChPiEMEOverCaloEME1PNCmu {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFChPiEMEOverCaloEME1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFEMPOverTrkSysP1PNCmu {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFEMPOverTrkSysP1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFSumPtTrkFrac1PNCmu {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFSumPtTrkFrac1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFcentFrac1PNCmu {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFcentFrac1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFetOverPtLeadTrk1PNCmu {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFetOverPtLeadTrk1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFinnerTrkAvgDist1PNCmu {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFinnerTrkAvgDist1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFipSigLeadTrk1PNCmu {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFipSigLeadTrk1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFptRatioEflowApprox1PNCmu {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFptRatioEflowApprox1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-						dir mp_nonCorrected {
-							hist hEFChPiEMEOverCaloEMEMPNCmu {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFChPiEMEOverCaloEMEMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFEMPOverTrkSysPMPNCmu {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFEMPOverTrkSysPMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFcentFracMPNCmu {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFcentFracMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFdRmaxMPNCmu {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFdRmaxMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFetOverPtLeadTrkMPNCmu {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFetOverPtLeadTrkMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFinnerTrkAvgDistMPNCmu {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFinnerTrkAvgDistMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFmEflowApproxMPNCmu {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFmEflowApproxMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFmassTrkSysMPNCmu {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFmassTrkSysMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFptRatioEflowApproxMPNCmu {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFptRatioEflowApproxMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFtrFlightPathSigMPNCmu {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFtrFlightPathSigMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-					}
-					hist hEFEMFraction {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEt {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtRaw {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtVsEta {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEta {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtaVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFIsoFrac {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFNUM {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFNUMvsmu {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFPhi {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFnTrack {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFnWideTrack {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hScore1p {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hScoreSigTrans1p {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hScoreSigTransmp {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hScoremp {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir EFVsOffline {
-					dir BDT {
-						dir 1p_nonCorrected {
-							hist hCentFracRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hCentFracVsmu1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hCentFracVspt1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hChPiEMEOvCaloEMEVsmu1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hChPiEMEOvCaloEMEVspt1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hChPiEMEOverCaloEMERatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hDRmaxRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hDRmaxVsmu1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hDRmaxVspt1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEMPOverTrkSysPRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEMPOverTrkSysPVsmu1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEMPOverTrkSysPVspt1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEtOverPtLeadTrkRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEtOverPtLeadTrkVsmu1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEtOverPtLeadTrkVspt1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hInnerTrkAvgDistRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hInnerTrkAvgDistVsmu1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hInnerTrkAvgDistVspt1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hIpSigLeadTrkRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hIpSigLeadTrkVsmu1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hIpSigLeadTrkVspt1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hPtRatioEflowApproxRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hPtRatioEflowApproxVsmu1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hPtRatioEflowApproxVspt1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hSumPtTrkFracRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hSumPtTrkFracVsmu1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hSumPtTrkFracVspt1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hTopoInvMassRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hTopoInvMassVsmu1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hTopoInvMassVspt1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-						dir mp_nonCorrected {
-							hist hCentFracRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hCentFracVsmuMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hCentFracVsptMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hChPiEMEOvCaloEMEVsmuMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hChPiEMEOvCaloEMEVsptMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hChPiEMEOverCaloEMERatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hDRmaxRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hDRmaxVsmuMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hDRmaxVsptMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEMPOverTrkSysPRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEMPOverTrkSysPVsmuMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEMPOverTrkSysPVsptMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEtOverPtLeadTrkRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEtOverPtLeadTrkVsmuMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEtOverPtLeadTrkVsptMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hInnerTrkAvgDistRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hInnerTrkAvgDistVsmuMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hInnerTrkAvgDistVsptMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hMEflowApproxRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hMEflowApproxVsmuMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hMEflowApproxVsptMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hMassTrkSysRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hMassTrkSysVsmuMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hMassTrkSysVsptMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hPtRatioEflowApproxRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hPtRatioEflowApproxVsmuMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hPtRatioEflowApproxVsptMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hTrFlightPathSigRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hTrFlightPathSigVsmuMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hTrFlightPathSigVsptMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-					}
-					hist   all_in_dir {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFvsOffnTrks {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFvsOffnWideTrks {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir L1RoI {
-					hist hL1EtVsEta {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1EtVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1EtaVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIEMIso {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIEta {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIHadCore {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIHadIsol {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIPhi {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoITauClus {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoITauClusEMIso {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIeT {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIisol {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir L1VsOffline {
-					hist hL1EtRatio {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/L1VsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir PreselectionTau {
-					hist hEFEt {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEt2 {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtaVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEtVsEta {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEtVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEta {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hFTFnTrack {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hFTFnWideTrack {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hPhi {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir PreselectionVsOffline {
-					hist hEFEtRatio {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/PreselectionVsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEtaRatio {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/PreselectionVsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hPhiRatio {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/PreselectionVsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hPreselvsOffnTrks {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/PreselectionVsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hPreselvsOffnWideTrks {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/PreselectionVsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir TurnOnCurves {
-					dir RecoEfficiency {
-						hist TProfRecoHLTEtaEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTHighPt1pEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTHighPt3pEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTHighPtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTMuEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTNTrackEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTNVtxEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPhiEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPt1PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPt3PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1EtaEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1HighPt1PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1HighPt3PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1HighPtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1MuEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1NTrackEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1NVtxEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1PhiEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1Pt1PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1Pt3PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1PtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-					}
-				}
-			}
-			dir tau25_medium1_tracktwoEF {
-				dir EFTau {
-					dir BDT {
-						dir 1p_nonCorrected {
-							hist hEFChPiEMEOverCaloEME1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFEMPOverTrkSysP1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFSumPtTrkFrac1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFcentFrac1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFetOverPtLeadTrk1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFinnerTrkAvgDist1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFipSigLeadTrk1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFptRatioEflowApprox1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-						dir mp_nonCorrected {
-							hist hEFChPiEMEOverCaloEMEMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFEMPOverTrkSysPMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFcentFracMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFdRmaxMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFetOverPtLeadTrkMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFinnerTrkAvgDistMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFmEflowApproxMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFmassTrkSysMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFptRatioEflowApproxMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFtrFlightPathSigMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-					}
-					hist hEFEMFraction {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEt {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtRaw {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtVsEta {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEta {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtaVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFIsoFrac {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFNUM {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFNUMvsmu {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFPhi {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFnTrack {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFnWideTrack {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hScore1p {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hScoreSigTrans1p {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hScoreSigTransmp {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hScoremp {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir EFVsOffline {
-					dir BDT {
-						dir 1p_nonCorrected {
-							hist hCentFracRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hChPiEMEOverCaloEMERatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hDRmaxRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEMPOverTrkSysPRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEtOverPtLeadTrkRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hInnerTrkAvgDistRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hIpSigLeadTrkRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hPtRatioEflowApproxRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hSumPtTrkFracRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hTopoInvMassRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-						dir mp_nonCorrected {
-							hist hCentFracRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hChPiEMEOverCaloEMERatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hDRmaxRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEMPOverTrkSysPRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEtOverPtLeadTrkRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hInnerTrkAvgDistRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hMEflowApproxRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hMassTrkSysRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hPtRatioEflowApproxRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hTrFlightPathSigRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-					}
-					hist   all_in_dir {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFVsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFvsOffnTrks {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFVsOffline
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFvsOffnWideTrks {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFVsOffline
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir L1RoI {
-					hist hL1EtVsEta {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1EtVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1EtaVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIEMIso {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIEta {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIHadCore {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIHadIsol {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIPhi {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoITauClus {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoITauClusEMIso {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIeT {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIisol {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir L1VsOffline {
-					hist hL1EtRatio {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/L1VsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir TurnOnCurves {
-					dir RecoEfficiency {
-						hist TProfRecoHLTEtaEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTHighPt1pEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTHighPt3pEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTHighPtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTMuEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTNTrackEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTNVtxEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPhiEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPt1PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPt3PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1EtaEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1HighPt1PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1HighPt3PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1HighPtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1MuEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1NTrackEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1NVtxEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1PhiEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1Pt1PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1Pt3PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1PtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-					}
-				}
-			}
-			dir tau25_medium1_tracktwoEFmvaTES {
-				dir EFTau {
-					dir BDT {
-						dir 1p_nonCorrected {
-							hist hEFChPiEMEOverCaloEME1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFEMPOverTrkSysP1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFSumPtTrkFrac1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFcentFrac1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFetOverPtLeadTrk1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFinnerTrkAvgDist1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFipSigLeadTrk1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFptRatioEflowApprox1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-						dir mp_nonCorrected {
-							hist hEFChPiEMEOverCaloEMEMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFEMPOverTrkSysPMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFcentFracMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFdRmaxMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFetOverPtLeadTrkMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFinnerTrkAvgDistMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFmEflowApproxMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFmassTrkSysMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFptRatioEflowApproxMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFtrFlightPathSigMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-					}
-					hist hEFEMFraction {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEt {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtRaw {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtVsEta {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEta {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtaVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFIsoFrac {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFNUM {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFNUMvsmu {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFPhi {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFnTrack {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFnWideTrack {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hScore1p {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hScoreSigTrans1p {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hScoreSigTransmp {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hScoremp {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir EFVsOffline {
-					dir BDT {
-						dir 1p_nonCorrected {
-							hist hCentFracRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hChPiEMEOverCaloEMERatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hDRmaxRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEMPOverTrkSysPRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEtOverPtLeadTrkRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hInnerTrkAvgDistRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hIpSigLeadTrkRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hPtRatioEflowApproxRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hSumPtTrkFracRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hTopoInvMassRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-						dir mp_nonCorrected {
-							hist hCentFracRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hChPiEMEOverCaloEMERatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hDRmaxRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEMPOverTrkSysPRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEtOverPtLeadTrkRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hInnerTrkAvgDistRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hMEflowApproxRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hMassTrkSysRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hPtRatioEflowApproxRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hTrFlightPathSigRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-					}
-					hist   all_in_dir {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFVsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFvsOffnTrks {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFVsOffline
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFvsOffnWideTrks {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFVsOffline
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir L1RoI {
-					hist hL1EtVsEta {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1EtVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1EtaVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIEMIso {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIEta {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIHadCore {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIHadIsol {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIPhi {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoITauClus {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoITauClusEMIso {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIeT {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIisol {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir L1VsOffline {
-					hist hL1EtRatio {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/L1VsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir TurnOnCurves {
-					dir RecoEfficiency {
-						hist TProfRecoHLTEtaEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTHighPt1pEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTHighPt3pEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTHighPtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTMuEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTNTrackEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTNVtxEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPhiEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPt1PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPt3PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1EtaEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1HighPt1PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1HighPt3PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1HighPtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1MuEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1NTrackEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1NVtxEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1PhiEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1Pt1PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1Pt3PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1PtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-					}
-				}
-			}
-			dir tau25_medium1_tracktwoMVA {
-				dir EFTau {
-					dir BDT {
-						dir 1p_nonCorrected {
-							hist hEFChPiEMEOverCaloEME1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoMVA/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFEMPOverTrkSysP1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoMVA/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFSumPtTrkFrac1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoMVA/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFcentFrac1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoMVA/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFetOverPtLeadTrk1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoMVA/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFinnerTrkAvgDist1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoMVA/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFipSigLeadTrk1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoMVA/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFptRatioEflowApprox1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoMVA/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-						dir mp_nonCorrected {
-							hist hEFChPiEMEOverCaloEMEMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoMVA/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFEMPOverTrkSysPMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoMVA/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFcentFracMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoMVA/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFdRmaxMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoMVA/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFetOverPtLeadTrkMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoMVA/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFinnerTrkAvgDistMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoMVA/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFmEflowApproxMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoMVA/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFmassTrkSysMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoMVA/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFptRatioEflowApproxMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoMVA/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFtrFlightPathSigMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoMVA/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-					}
-					hist hEFEMFraction {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoMVA/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEt {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoMVA/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtRaw {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoMVA/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtVsEta {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoMVA/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoMVA/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEta {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoMVA/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtaVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoMVA/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFIsoFrac {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoMVA/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFNUM {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoMVA/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFNUMvsmu {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoMVA/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFPhi {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoMVA/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFnTrack {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoMVA/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFnWideTrack {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoMVA/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hScore1p {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoMVA/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hScoreSigTrans1p {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoMVA/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hScoreSigTransmp {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoMVA/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hScoremp {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoMVA/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir EFVsOffline {
-					dir BDT {
-						dir 1p_nonCorrected {
-							hist hCentFracRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoMVA/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hChPiEMEOverCaloEMERatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoMVA/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hDRmaxRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoMVA/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEMPOverTrkSysPRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoMVA/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEtOverPtLeadTrkRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoMVA/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hInnerTrkAvgDistRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoMVA/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hIpSigLeadTrkRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoMVA/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hPtRatioEflowApproxRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoMVA/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hSumPtTrkFracRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoMVA/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hTopoInvMassRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoMVA/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-						dir mp_nonCorrected {
-							hist hCentFracRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoMVA/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hChPiEMEOverCaloEMERatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoMVA/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hDRmaxRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoMVA/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEMPOverTrkSysPRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoMVA/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEtOverPtLeadTrkRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoMVA/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hInnerTrkAvgDistRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoMVA/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hMEflowApproxRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoMVA/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hMassTrkSysRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoMVA/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hPtRatioEflowApproxRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoMVA/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hTrFlightPathSigRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoMVA/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-					}
-					hist   all_in_dir {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoMVA/EFVsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFvsOffnTrks {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoMVA/EFVsOffline
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFvsOffnWideTrks {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoMVA/EFVsOffline
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir L1RoI {
-					hist hL1EtVsEta {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoMVA/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1EtVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoMVA/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1EtaVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoMVA/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIEMIso {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoMVA/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIEta {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoMVA/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIHadCore {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoMVA/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIHadIsol {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoMVA/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIPhi {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoMVA/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoITauClus {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoMVA/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoITauClusEMIso {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoMVA/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIeT {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoMVA/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIisol {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoMVA/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir L1VsOffline {
-					hist hL1EtRatio {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoMVA/L1VsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir TurnOnCurves {
-					dir RecoEfficiency {
-						hist TProfRecoHLTEtaEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTHighPt1pEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTHighPt3pEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTHighPtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTMuEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTNTrackEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTNVtxEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPhiEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPt1PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPt3PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1EtaEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1HighPt1PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1HighPt3PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1HighPtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1MuEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1NTrackEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1NVtxEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1PhiEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1Pt1PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1Pt3PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1PtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-					}
-				}
-			}
-			dir tau25_mediumRNN_tracktwo {
-				dir EFTau {
-					dir RNN {
-						dir InputScalar1p {
-							hist hEFRNNInput_Scalar_EMPOverTrkSysP_log_1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwo/EFTau/RNN/InputScalar1p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_SumPtTrkFrac_1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwo/EFTau/RNN/InputScalar1p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_absipSigLeadTrk_1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwo/EFTau/RNN/InputScalar1p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_centFrac_1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwo/EFTau/RNN/InputScalar1p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_dRmax_1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwo/EFTau/RNN/InputScalar1p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_etOverPtLeadTrk_log_1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwo/EFTau/RNN/InputScalar1p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_mEflowApprox_log_1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwo/EFTau/RNN/InputScalar1p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_ptDetectorAxis_log_1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwo/EFTau/RNN/InputScalar1p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_ptRatioEflowApprox_1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwo/EFTau/RNN/InputScalar1p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-						dir InputScalar3p {
-							hist hEFRNNInput_Scalar_EMPOverTrkSysP_log_3P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwo/EFTau/RNN/InputScalar3p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_SumPtTrkFrac_3P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwo/EFTau/RNN/InputScalar3p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_centFrac_3P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwo/EFTau/RNN/InputScalar3p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_dRmax_3P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwo/EFTau/RNN/InputScalar3p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_etOverPtLeadTrk_log_3P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwo/EFTau/RNN/InputScalar3p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_mEflowApprox_log_3P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwo/EFTau/RNN/InputScalar3p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_massTrkSys_log_3P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwo/EFTau/RNN/InputScalar3p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_ptDetectorAxis_log_3P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwo/EFTau/RNN/InputScalar3p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_ptRatioEflowApprox_3P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwo/EFTau/RNN/InputScalar3p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_trFlightPathSig_log_3P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwo/EFTau/RNN/InputScalar3p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-						dir Output {
-							hist hEFRNNJetScore {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwo/EFTau/RNN/Output
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNJetScoreSigTrans {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwo/EFTau/RNN/Output
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-					}
-					hist hEFEMFraction {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEt {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtRaw {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtVsEta {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEta {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtaVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFIsoFrac {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFNUM {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFNUMvsmu {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFPhi {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFnTrack {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFnWideTrack {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir EFVsOffline {
-					dir BDT {
-						dir 1p_nonCorrected {
-							hist hCentFracRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwo/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hChPiEMEOverCaloEMERatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwo/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hDRmaxRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwo/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEMPOverTrkSysPRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwo/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEtOverPtLeadTrkRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwo/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hInnerTrkAvgDistRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwo/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hIpSigLeadTrkRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwo/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hPtRatioEflowApproxRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwo/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hSumPtTrkFracRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwo/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hTopoInvMassRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwo/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-						dir mp_nonCorrected {
-							hist hCentFracRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwo/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hChPiEMEOverCaloEMERatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwo/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hDRmaxRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwo/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEMPOverTrkSysPRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwo/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEtOverPtLeadTrkRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwo/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hInnerTrkAvgDistRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwo/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hMEflowApproxRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwo/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hMassTrkSysRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwo/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hPtRatioEflowApproxRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwo/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hTrFlightPathSigRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwo/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-					}
-					hist   all_in_dir {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwo/EFVsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFvsOffnTrks {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwo/EFVsOffline
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFvsOffnWideTrks {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwo/EFVsOffline
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir L1RoI {
-					hist hL1EtVsEta {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwo/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1EtVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwo/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1EtaVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwo/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIEMIso {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwo/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIEta {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwo/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIHadCore {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwo/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIHadIsol {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwo/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIPhi {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwo/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoITauClus {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwo/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoITauClusEMIso {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwo/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIeT {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwo/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIisol {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwo/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir L1VsOffline {
-					hist hL1EtRatio {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwo/L1VsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir PreselectionTau {
-					hist hEFEt {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwo/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEt2 {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwo/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtaVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwo/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEtVsEta {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwo/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEtVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwo/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEta {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwo/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hFTFnTrack {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwo/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hFTFnWideTrack {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwo/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hPhi {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwo/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir PreselectionVsOffline {
-					hist hEFEtRatio {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwo/PreselectionVsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEtaRatio {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwo/PreselectionVsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hPhiRatio {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwo/PreselectionVsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hPreselvsOffnTrks {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwo/PreselectionVsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hPreselvsOffnWideTrks {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwo/PreselectionVsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir TurnOnCurves {
-					dir RecoEfficiency {
-						hist TProfRecoHLTEtaEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTHighPt1pEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTHighPt3pEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTHighPtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTMuEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTNTrackEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTNVtxEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPhiEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPt1PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPt3PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1EtaEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1HighPt1PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1HighPt3PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1HighPtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1MuEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1NTrackEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1NVtxEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1PhiEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1Pt1PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1Pt3PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1PtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-					}
-				}
-			}
-			dir tau25_mediumRNN_tracktwoMVA {
-				dir EFTau {
-					dir RNN {
-						dir InputScalar1p {
-							hist hEFRNNInput_Scalar_EMPOverTrkSysP_log_1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/EFTau/RNN/InputScalar1p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_SumPtTrkFrac_1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/EFTau/RNN/InputScalar1p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_absipSigLeadTrk_1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/EFTau/RNN/InputScalar1p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_centFrac_1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/EFTau/RNN/InputScalar1p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_dRmax_1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/EFTau/RNN/InputScalar1p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_etOverPtLeadTrk_log_1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/EFTau/RNN/InputScalar1p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_mEflowApprox_log_1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/EFTau/RNN/InputScalar1p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_ptDetectorAxis_log_1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/EFTau/RNN/InputScalar1p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_ptRatioEflowApprox_1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/EFTau/RNN/InputScalar1p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-						dir InputScalar3p {
-							hist hEFRNNInput_Scalar_EMPOverTrkSysP_log_3P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/EFTau/RNN/InputScalar3p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_SumPtTrkFrac_3P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/EFTau/RNN/InputScalar3p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_centFrac_3P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/EFTau/RNN/InputScalar3p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_dRmax_3P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/EFTau/RNN/InputScalar3p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_etOverPtLeadTrk_log_3P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/EFTau/RNN/InputScalar3p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_mEflowApprox_log_3P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/EFTau/RNN/InputScalar3p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_massTrkSys_log_3P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/EFTau/RNN/InputScalar3p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_ptDetectorAxis_log_3P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/EFTau/RNN/InputScalar3p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_ptRatioEflowApprox_3P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/EFTau/RNN/InputScalar3p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_trFlightPathSig_log_3P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/EFTau/RNN/InputScalar3p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-						dir Output {
-							hist hEFRNNJetScore {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/EFTau/RNN/Output
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNJetScoreSigTrans {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/EFTau/RNN/Output
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-					}
-					hist hEFEMFraction {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEt {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtRaw {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtVsEta {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEta {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtaVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFIsoFrac {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFNUM {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFNUMvsmu {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFPhi {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFnTrack {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFnWideTrack {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir EFVsOffline {
-					dir BDT {
-						dir 1p_nonCorrected {
-							hist hCentFracRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hChPiEMEOverCaloEMERatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hDRmaxRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEMPOverTrkSysPRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEtOverPtLeadTrkRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hInnerTrkAvgDistRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hIpSigLeadTrkRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hPtRatioEflowApproxRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hSumPtTrkFracRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hTopoInvMassRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-						dir mp_nonCorrected {
-							hist hCentFracRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hChPiEMEOverCaloEMERatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hDRmaxRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEMPOverTrkSysPRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEtOverPtLeadTrkRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hInnerTrkAvgDistRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hMEflowApproxRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hMassTrkSysRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hPtRatioEflowApproxRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hTrFlightPathSigRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-					}
-					hist   all_in_dir {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/EFVsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFvsOffnTrks {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/EFVsOffline
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFvsOffnWideTrks {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/EFVsOffline
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir L1RoI {
-					hist hL1EtVsEta {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1EtVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1EtaVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIEMIso {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIEta {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIHadCore {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIHadIsol {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIPhi {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoITauClus {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoITauClusEMIso {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIeT {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIisol {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir L1VsOffline {
-					hist hL1EtRatio {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/L1VsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir TurnOnCurves {
-					dir RecoEfficiency {
-						hist TProfRecoHLTEtaEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTHighPt1pEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTHighPt3pEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTHighPtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTMuEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTNTrackEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTNVtxEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPhiEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPt1PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPt3PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1EtaEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1HighPt1PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1HighPt3PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1HighPtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1MuEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1NTrackEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1NVtxEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1PhiEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1Pt1PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1Pt3PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1PtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-					}
-				}
-			}
-			dir tau25_perf_tracktwo {
-				dir EFTau {
-					dir BDT {
-						dir 1p_nonCorrected {
-							hist hEFChPiEMEOverCaloEME1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFEMPOverTrkSysP1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFSumPtTrkFrac1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFcentFrac1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFetOverPtLeadTrk1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFinnerTrkAvgDist1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFipSigLeadTrk1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFptRatioEflowApprox1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-						dir mp_nonCorrected {
-							hist hEFChPiEMEOverCaloEMEMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFEMPOverTrkSysPMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFcentFracMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFdRmaxMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFetOverPtLeadTrkMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFinnerTrkAvgDistMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFmEflowApproxMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFmassTrkSysMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFptRatioEflowApproxMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFtrFlightPathSigMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-					}
-					hist hEFEMFraction {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEt {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtRaw {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtVsEta {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEta {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtaVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFIsoFrac {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFNUM {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFNUMvsmu {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFPhi {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFnTrack {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFnWideTrack {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hScore1p {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hScoreSigTrans1p {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hScoreSigTransmp {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hScoremp {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir EFVsOffline {
-					dir BDT {
-						dir 1p_nonCorrected {
-							hist hCentFracRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hChPiEMEOverCaloEMERatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hDRmaxRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEMPOverTrkSysPRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEtOverPtLeadTrkRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hInnerTrkAvgDistRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hIpSigLeadTrkRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hPtRatioEflowApproxRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hSumPtTrkFracRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hTopoInvMassRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-						dir mp_nonCorrected {
-							hist hCentFracRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hChPiEMEOverCaloEMERatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hDRmaxRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEMPOverTrkSysPRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEtOverPtLeadTrkRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hInnerTrkAvgDistRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hMEflowApproxRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hMassTrkSysRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hPtRatioEflowApproxRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hTrFlightPathSigRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-					}
-					hist   all_in_dir {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFVsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFvsOffnTrks {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFVsOffline
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFvsOffnWideTrks {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFVsOffline
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir L1RoI {
-					hist hL1EtVsEta {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/L1RoI
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1EtVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/L1RoI
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1EtaVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/L1RoI
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIEMIso {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/L1RoI
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIEta {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/L1RoI
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIHadCore {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/L1RoI
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIHadIsol {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/L1RoI
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIPhi {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/L1RoI
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoITauClus {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/L1RoI
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoITauClusEMIso {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/L1RoI
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIeT {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/L1RoI
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIisol {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/L1RoI
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir L1VsOffline {
-					hist hL1EtRatio {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/L1VsOffline
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir PreselectionTau {
-					hist hEFEt {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/PreselectionTau
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEt2 {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/PreselectionTau
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtaVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/PreselectionTau
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEtVsEta {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/PreselectionTau
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEtVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/PreselectionTau
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEta {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/PreselectionTau
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hFTFnTrack {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/PreselectionTau
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hFTFnWideTrack {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/PreselectionTau
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hPhi {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/PreselectionTau
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir PreselectionVsOffline {
-					hist hEFEtRatio {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/PreselectionVsOffline
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEtaRatio {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/PreselectionVsOffline
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hPhiRatio {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/PreselectionVsOffline
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hPreselvsOffnTrks {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/PreselectionVsOffline
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hPreselvsOffnWideTrks {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/PreselectionVsOffline
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir TurnOnCurves {
-					dir RecoEfficiency {
-						hist TProfRecoHLTEtaEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTHighPt1pEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTHighPt3pEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTHighPtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTMuEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTNTrackEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTNVtxEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPhiEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPt1PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPt3PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1EtaEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1HighPt1PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1HighPt3PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1HighPtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1MuEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1NTrackEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1NVtxEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1PhiEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1Pt1PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1Pt3PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1PtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-					}
-				}
-			}
-			dir tau25_perf_tracktwoEF {
-				dir EFTau {
-					dir BDT {
-						dir 1p_nonCorrected {
-							hist hEFChPiEMEOverCaloEME1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-								reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFEMPOverTrkSysP1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-								reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFSumPtTrkFrac1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-								reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFcentFrac1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-								reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFetOverPtLeadTrk1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-								reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFinnerTrkAvgDist1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-								reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFipSigLeadTrk1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-								reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFptRatioEflowApprox1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-								reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-						dir mp_nonCorrected {
-							hist hEFChPiEMEOverCaloEMEMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-								reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFEMPOverTrkSysPMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-								reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFcentFracMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-								reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFdRmaxMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-								reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFetOverPtLeadTrkMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-								reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFinnerTrkAvgDistMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-								reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFmEflowApproxMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-								reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFmassTrkSysMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-								reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFptRatioEflowApproxMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-								reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFtrFlightPathSigMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-								reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-					}
-					hist hEFEMFraction {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFTau
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEt {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFTau
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtRaw {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFTau
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtVsEta {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFTau
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFTau
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEta {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFTau
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtaVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFTau
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFIsoFrac {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFTau
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFNUM {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFTau
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFNUMvsmu {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFTau
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFPhi {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFTau
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFnTrack {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFTau
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFnWideTrack {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFTau
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hScore1p {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFTau
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hScoreSigTrans1p {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFTau
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hScoreSigTransmp {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFTau
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hScoremp {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFTau
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir EFVsOffline {
-					dir BDT {
-						dir 1p_nonCorrected {
-							hist hCentFracRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-								reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hChPiEMEOverCaloEMERatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-								reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hDRmaxRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-								reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEMPOverTrkSysPRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-								reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEtOverPtLeadTrkRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-								reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hInnerTrkAvgDistRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-								reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hIpSigLeadTrkRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-								reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hPtRatioEflowApproxRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-								reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hSumPtTrkFracRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-								reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hTopoInvMassRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-								reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-						dir mp_nonCorrected {
-							hist hCentFracRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-								reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hChPiEMEOverCaloEMERatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-								reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hDRmaxRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-								reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEMPOverTrkSysPRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-								reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEtOverPtLeadTrkRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-								reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hInnerTrkAvgDistRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-								reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hMEflowApproxRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-								reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hMassTrkSysRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-								reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hPtRatioEflowApproxRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-								reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hTrFlightPathSigRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-								reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-					}
-					hist   all_in_dir {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFVsOffline
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFvsOffnTrks {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFVsOffline
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFvsOffnWideTrks {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFVsOffline
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir L1RoI {
-					hist hL1EtVsEta {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/L1RoI
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1EtVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/L1RoI
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1EtaVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/L1RoI
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIEMIso {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/L1RoI
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIEta {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/L1RoI
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIHadCore {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/L1RoI
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIHadIsol {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/L1RoI
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIPhi {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/L1RoI
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoITauClus {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/L1RoI
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoITauClusEMIso {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/L1RoI
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIeT {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/L1RoI
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIisol {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/L1RoI
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir L1VsOffline {
-					hist hL1EtRatio {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/L1VsOffline
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir TurnOnCurves {
-					dir RecoEfficiency {
-						hist TProfRecoHLTEtaEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTHighPt1pEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTHighPt3pEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTHighPtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTMuEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTNTrackEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTNVtxEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPhiEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPt1PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPt3PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1EtaEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1HighPt1PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1HighPt3PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1HighPtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1MuEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1NTrackEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1NVtxEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1PhiEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1Pt1PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1Pt3PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1PtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-					}
-				}
-			}
-			dir tau25_perf_tracktwoEFmvaTES {
-				dir EFTau {
-					dir BDT {
-						dir 1p_nonCorrected {
-							hist hEFChPiEMEOverCaloEME1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-								reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFEMPOverTrkSysP1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-								reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFSumPtTrkFrac1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-								reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFcentFrac1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-								reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFetOverPtLeadTrk1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-								reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFinnerTrkAvgDist1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-								reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFipSigLeadTrk1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-								reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFptRatioEflowApprox1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-								reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-						dir mp_nonCorrected {
-							hist hEFChPiEMEOverCaloEMEMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFEMPOverTrkSysPMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFcentFracMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFdRmaxMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFetOverPtLeadTrkMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFinnerTrkAvgDistMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFmEflowApproxMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFmassTrkSysMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFptRatioEflowApproxMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFtrFlightPathSigMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-					}
-					hist hEFEMFraction {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEt {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtRaw {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtVsEta {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEta {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtaVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFIsoFrac {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFNUM {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFNUMvsmu {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFPhi {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFnTrack {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFnWideTrack {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hScore1p {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hScoreSigTrans1p {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hScoreSigTransmp {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hScoremp {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir EFVsOffline {
-					dir BDT {
-						dir 1p_nonCorrected {
-							hist hCentFracRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hChPiEMEOverCaloEMERatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hDRmaxRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEMPOverTrkSysPRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEtOverPtLeadTrkRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hInnerTrkAvgDistRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hIpSigLeadTrkRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hPtRatioEflowApproxRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hSumPtTrkFracRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hTopoInvMassRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-						dir mp_nonCorrected {
-							hist hCentFracRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hChPiEMEOverCaloEMERatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hDRmaxRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEMPOverTrkSysPRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEtOverPtLeadTrkRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hInnerTrkAvgDistRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hMEflowApproxRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hMassTrkSysRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hPtRatioEflowApproxRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hTrFlightPathSigRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-					}
-					hist   all_in_dir {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFVsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFvsOffnTrks {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFVsOffline
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFvsOffnWideTrks {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFVsOffline
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir L1RoI {
-					hist hL1EtVsEta {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1EtVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1EtaVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIEMIso {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIEta {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIHadCore {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIHadIsol {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIPhi {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoITauClus {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoITauClusEMIso {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIeT {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIisol {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir L1VsOffline {
-					hist hL1EtRatio {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/L1VsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir TurnOnCurves {
-					dir RecoEfficiency {
-						hist TProfRecoHLTEtaEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTHighPt1pEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTHighPt3pEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTHighPtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTMuEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTNTrackEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTNVtxEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPhiEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPt1PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPt3PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1EtaEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1HighPt1PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1HighPt3PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1HighPtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1MuEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1NTrackEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1NVtxEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1PhiEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1Pt1PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1Pt3PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1PtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-					}
-				}
-			}
-			dir tau25_perf_tracktwoMVA {
-				dir EFTau {
-					dir BDT {
-						dir 1p_nonCorrected {
-							hist hEFChPiEMEOverCaloEME1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFEMPOverTrkSysP1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFSumPtTrkFrac1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFcentFrac1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFetOverPtLeadTrk1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFinnerTrkAvgDist1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFipSigLeadTrk1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFptRatioEflowApprox1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-						dir mp_nonCorrected {
-							hist hEFChPiEMEOverCaloEMEMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFEMPOverTrkSysPMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFcentFracMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFdRmaxMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFetOverPtLeadTrkMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFinnerTrkAvgDistMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFmEflowApproxMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFmassTrkSysMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFptRatioEflowApproxMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFtrFlightPathSigMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-					}
-					dir RNN {
-						dir InputScalar1p {
-							hist hEFRNNInput_Scalar_EMPOverTrkSysP_log_1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau/RNN/InputScalar1p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_SumPtTrkFrac_1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau/RNN/InputScalar1p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_absipSigLeadTrk_1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau/RNN/InputScalar1p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_centFrac_1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau/RNN/InputScalar1p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_dRmax_1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau/RNN/InputScalar1p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_etOverPtLeadTrk_log_1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau/RNN/InputScalar1p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_mEflowApprox_log_1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau/RNN/InputScalar1p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_ptDetectorAxis_log_1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau/RNN/InputScalar1p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_ptRatioEflowApprox_1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau/RNN/InputScalar1p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-						dir InputScalar3p {
-							hist hEFRNNInput_Scalar_EMPOverTrkSysP_log_3P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau/RNN/InputScalar3p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_SumPtTrkFrac_3P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau/RNN/InputScalar3p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_centFrac_3P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau/RNN/InputScalar3p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_dRmax_3P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau/RNN/InputScalar3p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_etOverPtLeadTrk_log_3P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau/RNN/InputScalar3p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_mEflowApprox_log_3P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau/RNN/InputScalar3p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_massTrkSys_log_3P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau/RNN/InputScalar3p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_ptDetectorAxis_log_3P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau/RNN/InputScalar3p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_ptRatioEflowApprox_3P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau/RNN/InputScalar3p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_trFlightPathSig_log_3P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau/RNN/InputScalar3p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-						dir Output {
-							hist hEFRNNJetScore {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau/RNN/Output
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNJetScoreSigTrans {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau/RNN/Output
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-					}
-					hist hEFEMFraction {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEt {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtRaw {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtVsEta {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEta {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtaVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFIsoFrac {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFNUM {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFNUMvsmu {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFPhi {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFnTrack {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFnWideTrack {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hScore1p {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hScoreSigTrans1p {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hScoreSigTransmp {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hScoremp {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir EFVsOffline {
-					dir BDT {
-						dir 1p_nonCorrected {
-							hist hCentFracRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hChPiEMEOverCaloEMERatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hDRmaxRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEMPOverTrkSysPRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEtOverPtLeadTrkRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hInnerTrkAvgDistRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hIpSigLeadTrkRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hPtRatioEflowApproxRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hSumPtTrkFracRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hTopoInvMassRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-						dir mp_nonCorrected {
-							hist hCentFracRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hChPiEMEOverCaloEMERatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hDRmaxRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEMPOverTrkSysPRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEtOverPtLeadTrkRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hInnerTrkAvgDistRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hMEflowApproxRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hMassTrkSysRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hPtRatioEflowApproxRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hTrFlightPathSigRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-					}
-					hist   all_in_dir {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFVsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFvsOffnTrks {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFVsOffline
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFvsOffnWideTrks {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFVsOffline
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir L1RoI {
-					hist hL1EtVsEta {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1EtVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1EtaVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIEMIso {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIEta {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIHadCore {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIHadIsol {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIPhi {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoITauClus {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoITauClusEMIso {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIeT {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIisol {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir L1VsOffline {
-					hist hL1EtRatio {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/L1VsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir TurnOnCurves {
-					dir RecoEfficiency {
-						hist TProfRecoHLTEtaEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTHighPt1pEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTHighPt3pEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTHighPtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTMuEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTNTrackEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTNVtxEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPhiEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPt1PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPt3PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1EtaEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1HighPt1PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1HighPt3PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1HighPtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1MuEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1NTrackEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1NVtxEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1PhiEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1Pt1PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1Pt3PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1PtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-					}
-				}
-			}
-			dir tau25_tightRNN_tracktwo {
-				dir EFTau {
-					dir RNN {
-						dir InputScalar1p {
-							hist hEFRNNInput_Scalar_EMPOverTrkSysP_log_1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwo/EFTau/RNN/InputScalar1p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_SumPtTrkFrac_1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwo/EFTau/RNN/InputScalar1p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_absipSigLeadTrk_1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwo/EFTau/RNN/InputScalar1p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_centFrac_1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwo/EFTau/RNN/InputScalar1p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_dRmax_1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwo/EFTau/RNN/InputScalar1p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_etOverPtLeadTrk_log_1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwo/EFTau/RNN/InputScalar1p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_mEflowApprox_log_1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwo/EFTau/RNN/InputScalar1p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_ptDetectorAxis_log_1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwo/EFTau/RNN/InputScalar1p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_ptRatioEflowApprox_1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwo/EFTau/RNN/InputScalar1p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-						dir InputScalar3p {
-							hist hEFRNNInput_Scalar_EMPOverTrkSysP_log_3P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwo/EFTau/RNN/InputScalar3p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_SumPtTrkFrac_3P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwo/EFTau/RNN/InputScalar3p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_centFrac_3P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwo/EFTau/RNN/InputScalar3p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_dRmax_3P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwo/EFTau/RNN/InputScalar3p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_etOverPtLeadTrk_log_3P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwo/EFTau/RNN/InputScalar3p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_mEflowApprox_log_3P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwo/EFTau/RNN/InputScalar3p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_massTrkSys_log_3P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwo/EFTau/RNN/InputScalar3p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_ptDetectorAxis_log_3P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwo/EFTau/RNN/InputScalar3p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_ptRatioEflowApprox_3P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwo/EFTau/RNN/InputScalar3p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_trFlightPathSig_log_3P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwo/EFTau/RNN/InputScalar3p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-						dir Output {
-							hist hEFRNNJetScore {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwo/EFTau/RNN/Output
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNJetScoreSigTrans {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwo/EFTau/RNN/Output
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-					}
-					hist hEFEMFraction {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEt {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtRaw {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtVsEta {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEta {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtaVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFIsoFrac {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFNUM {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFNUMvsmu {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFPhi {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFnTrack {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFnWideTrack {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir EFVsOffline {
-					dir BDT {
-						dir 1p_nonCorrected {
-							hist hCentFracRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwo/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hChPiEMEOverCaloEMERatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwo/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hDRmaxRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwo/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEMPOverTrkSysPRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwo/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEtOverPtLeadTrkRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwo/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hInnerTrkAvgDistRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwo/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hIpSigLeadTrkRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwo/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hPtRatioEflowApproxRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwo/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hSumPtTrkFracRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwo/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hTopoInvMassRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwo/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-						dir mp_nonCorrected {
-							hist hCentFracRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwo/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hChPiEMEOverCaloEMERatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwo/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hDRmaxRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwo/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEMPOverTrkSysPRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwo/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEtOverPtLeadTrkRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwo/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hInnerTrkAvgDistRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwo/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hMEflowApproxRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwo/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hMassTrkSysRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwo/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hPtRatioEflowApproxRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwo/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hTrFlightPathSigRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwo/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-					}
-					hist   all_in_dir {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwo/EFVsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFvsOffnTrks {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwo/EFVsOffline
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFvsOffnWideTrks {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwo/EFVsOffline
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir L1RoI {
-					hist hL1EtVsEta {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwo/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1EtVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwo/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1EtaVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwo/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIEMIso {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwo/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIEta {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwo/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIHadCore {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwo/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIHadIsol {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwo/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIPhi {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwo/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoITauClus {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwo/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoITauClusEMIso {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwo/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIeT {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwo/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIisol {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwo/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir L1VsOffline {
-					hist hL1EtRatio {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwo/L1VsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir PreselectionTau {
-					hist hEFEt {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwo/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEt2 {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwo/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtaVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwo/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEtVsEta {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwo/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEtVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwo/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEta {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwo/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hFTFnTrack {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwo/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hFTFnWideTrack {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwo/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hPhi {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwo/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir PreselectionVsOffline {
-					hist hEFEtRatio {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwo/PreselectionVsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEtaRatio {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwo/PreselectionVsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hPhiRatio {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwo/PreselectionVsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hPreselvsOffnTrks {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwo/PreselectionVsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hPreselvsOffnWideTrks {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwo/PreselectionVsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir TurnOnCurves {
-					dir RecoEfficiency {
-						hist TProfRecoHLTEtaEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTHighPt1pEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTHighPt3pEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTHighPtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTMuEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTNTrackEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTNVtxEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPhiEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPt1PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPt3PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1EtaEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1HighPt1PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1HighPt3PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1HighPtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1MuEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1NTrackEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1NVtxEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1PhiEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1Pt1PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1Pt3PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1PtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-					}
-				}
-			}
-			dir tau25_tightRNN_tracktwoMVA {
-				dir EFTau {
-					dir RNN {
-						dir InputScalar1p {
-							hist hEFRNNInput_Scalar_EMPOverTrkSysP_log_1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwoMVA/EFTau/RNN/InputScalar1p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_SumPtTrkFrac_1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwoMVA/EFTau/RNN/InputScalar1p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_absipSigLeadTrk_1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwoMVA/EFTau/RNN/InputScalar1p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_centFrac_1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwoMVA/EFTau/RNN/InputScalar1p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_dRmax_1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwoMVA/EFTau/RNN/InputScalar1p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_etOverPtLeadTrk_log_1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwoMVA/EFTau/RNN/InputScalar1p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_mEflowApprox_log_1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwoMVA/EFTau/RNN/InputScalar1p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_ptDetectorAxis_log_1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwoMVA/EFTau/RNN/InputScalar1p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_ptRatioEflowApprox_1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwoMVA/EFTau/RNN/InputScalar1p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-						dir InputScalar3p {
-							hist hEFRNNInput_Scalar_EMPOverTrkSysP_log_3P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwoMVA/EFTau/RNN/InputScalar3p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_SumPtTrkFrac_3P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwoMVA/EFTau/RNN/InputScalar3p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_centFrac_3P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwoMVA/EFTau/RNN/InputScalar3p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_dRmax_3P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwoMVA/EFTau/RNN/InputScalar3p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_etOverPtLeadTrk_log_3P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwoMVA/EFTau/RNN/InputScalar3p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_mEflowApprox_log_3P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwoMVA/EFTau/RNN/InputScalar3p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_massTrkSys_log_3P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwoMVA/EFTau/RNN/InputScalar3p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_ptDetectorAxis_log_3P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwoMVA/EFTau/RNN/InputScalar3p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_ptRatioEflowApprox_3P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwoMVA/EFTau/RNN/InputScalar3p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_trFlightPathSig_log_3P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwoMVA/EFTau/RNN/InputScalar3p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-						dir Output {
-							hist hEFRNNJetScore {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwoMVA/EFTau/RNN/Output
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNJetScoreSigTrans {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwoMVA/EFTau/RNN/Output
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-					}
-					hist hEFEMFraction {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwoMVA/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEt {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwoMVA/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtRaw {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwoMVA/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtVsEta {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwoMVA/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwoMVA/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEta {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwoMVA/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtaVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwoMVA/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFIsoFrac {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwoMVA/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFNUM {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwoMVA/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFNUMvsmu {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwoMVA/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFPhi {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwoMVA/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFnTrack {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwoMVA/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFnWideTrack {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwoMVA/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir EFVsOffline {
-					dir BDT {
-						dir 1p_nonCorrected {
-							hist hCentFracRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwoMVA/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hChPiEMEOverCaloEMERatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwoMVA/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hDRmaxRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwoMVA/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEMPOverTrkSysPRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwoMVA/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEtOverPtLeadTrkRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwoMVA/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hInnerTrkAvgDistRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwoMVA/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hIpSigLeadTrkRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwoMVA/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hPtRatioEflowApproxRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwoMVA/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hSumPtTrkFracRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwoMVA/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hTopoInvMassRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwoMVA/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-						dir mp_nonCorrected {
-							hist hCentFracRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwoMVA/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hChPiEMEOverCaloEMERatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwoMVA/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hDRmaxRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwoMVA/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEMPOverTrkSysPRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwoMVA/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEtOverPtLeadTrkRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwoMVA/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hInnerTrkAvgDistRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwoMVA/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hMEflowApproxRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwoMVA/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hMassTrkSysRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwoMVA/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hPtRatioEflowApproxRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwoMVA/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hTrFlightPathSigRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwoMVA/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-					}
-					hist   all_in_dir {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwoMVA/EFVsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFvsOffnTrks {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwoMVA/EFVsOffline
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFvsOffnWideTrks {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwoMVA/EFVsOffline
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir L1RoI {
-					hist hL1EtVsEta {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwoMVA/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1EtVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwoMVA/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1EtaVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwoMVA/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIEMIso {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwoMVA/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIEta {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwoMVA/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIHadCore {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwoMVA/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIHadIsol {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwoMVA/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIPhi {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwoMVA/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoITauClus {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwoMVA/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoITauClusEMIso {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwoMVA/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIeT {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwoMVA/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIisol {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwoMVA/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir L1VsOffline {
-					hist hL1EtRatio {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwoMVA/L1VsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir TurnOnCurves {
-					dir RecoEfficiency {
-						hist TProfRecoHLTEtaEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTHighPt1pEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTHighPt3pEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTHighPtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTMuEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTNTrackEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTNVtxEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPhiEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPt1PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPt3PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1EtaEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1HighPt1PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1HighPt3PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1HighPtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1MuEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1NTrackEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1NVtxEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1PhiEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1Pt1PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1Pt3PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1PtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_tightRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-					}
-				}
-			}
-			dir tau25_verylooseRNN_tracktwo {
-				dir EFTau {
-					dir RNN {
-						dir InputScalar1p {
-							hist hEFRNNInput_Scalar_EMPOverTrkSysP_log_1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwo/EFTau/RNN/InputScalar1p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_SumPtTrkFrac_1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwo/EFTau/RNN/InputScalar1p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_absipSigLeadTrk_1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwo/EFTau/RNN/InputScalar1p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_centFrac_1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwo/EFTau/RNN/InputScalar1p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_dRmax_1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwo/EFTau/RNN/InputScalar1p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_etOverPtLeadTrk_log_1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwo/EFTau/RNN/InputScalar1p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_mEflowApprox_log_1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwo/EFTau/RNN/InputScalar1p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_ptDetectorAxis_log_1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwo/EFTau/RNN/InputScalar1p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_ptRatioEflowApprox_1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwo/EFTau/RNN/InputScalar1p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-						dir InputScalar3p {
-							hist hEFRNNInput_Scalar_EMPOverTrkSysP_log_3P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwo/EFTau/RNN/InputScalar3p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_SumPtTrkFrac_3P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwo/EFTau/RNN/InputScalar3p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_centFrac_3P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwo/EFTau/RNN/InputScalar3p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_dRmax_3P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwo/EFTau/RNN/InputScalar3p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_etOverPtLeadTrk_log_3P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwo/EFTau/RNN/InputScalar3p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_mEflowApprox_log_3P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwo/EFTau/RNN/InputScalar3p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_massTrkSys_log_3P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwo/EFTau/RNN/InputScalar3p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_ptDetectorAxis_log_3P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwo/EFTau/RNN/InputScalar3p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_ptRatioEflowApprox_3P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwo/EFTau/RNN/InputScalar3p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_trFlightPathSig_log_3P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwo/EFTau/RNN/InputScalar3p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-						dir Output {
-							hist hEFRNNJetScore {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwo/EFTau/RNN/Output
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNJetScoreSigTrans {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwo/EFTau/RNN/Output
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-					}
-					hist hEFEMFraction {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEt {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtRaw {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtVsEta {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEta {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtaVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFIsoFrac {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFNUM {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFNUMvsmu {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFPhi {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFnTrack {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFnWideTrack {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir EFVsOffline {
-					dir BDT {
-						dir 1p_nonCorrected {
-							hist hCentFracRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwo/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hChPiEMEOverCaloEMERatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwo/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hDRmaxRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwo/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEMPOverTrkSysPRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwo/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEtOverPtLeadTrkRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwo/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hInnerTrkAvgDistRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwo/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hIpSigLeadTrkRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwo/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hPtRatioEflowApproxRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwo/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hSumPtTrkFracRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwo/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hTopoInvMassRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwo/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-						dir mp_nonCorrected {
-							hist hCentFracRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwo/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hChPiEMEOverCaloEMERatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwo/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hDRmaxRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwo/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEMPOverTrkSysPRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwo/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEtOverPtLeadTrkRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwo/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hInnerTrkAvgDistRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwo/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hMEflowApproxRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwo/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hMassTrkSysRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwo/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hPtRatioEflowApproxRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwo/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hTrFlightPathSigRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwo/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-					}
-					hist   all_in_dir {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwo/EFVsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFvsOffnTrks {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwo/EFVsOffline
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFvsOffnWideTrks {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwo/EFVsOffline
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir L1RoI {
-					hist hL1EtVsEta {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwo/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1EtVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwo/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1EtaVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwo/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIEMIso {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwo/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIEta {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwo/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIHadCore {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwo/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIHadIsol {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwo/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIPhi {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwo/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoITauClus {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwo/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoITauClusEMIso {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwo/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIeT {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwo/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIisol {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwo/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir L1VsOffline {
-					hist hL1EtRatio {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwo/L1VsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir PreselectionTau {
-					hist hEFEt {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwo/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEt2 {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwo/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtaVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwo/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEtVsEta {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwo/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEtVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwo/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEta {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwo/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hFTFnTrack {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwo/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hFTFnWideTrack {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwo/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hPhi {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwo/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir PreselectionVsOffline {
-					hist hEFEtRatio {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwo/PreselectionVsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEtaRatio {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwo/PreselectionVsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hPhiRatio {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwo/PreselectionVsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hPreselvsOffnTrks {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwo/PreselectionVsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hPreselvsOffnWideTrks {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwo/PreselectionVsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir TurnOnCurves {
-					dir RecoEfficiency {
-						hist TProfRecoHLTEtaEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTHighPt1pEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTHighPt3pEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTHighPtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTMuEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTNTrackEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTNVtxEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPhiEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPt1PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPt3PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1EtaEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1HighPt1PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1HighPt3PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1HighPtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1MuEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1NTrackEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1NVtxEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1PhiEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1Pt1PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1Pt3PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1PtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwo/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-					}
-				}
-			}
-			dir tau25_verylooseRNN_tracktwoMVA {
-				dir EFTau {
-					dir RNN {
-						dir InputScalar1p {
-							hist hEFRNNInput_Scalar_EMPOverTrkSysP_log_1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwoMVA/EFTau/RNN/InputScalar1p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_SumPtTrkFrac_1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwoMVA/EFTau/RNN/InputScalar1p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_absipSigLeadTrk_1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwoMVA/EFTau/RNN/InputScalar1p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_centFrac_1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwoMVA/EFTau/RNN/InputScalar1p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_dRmax_1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwoMVA/EFTau/RNN/InputScalar1p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_etOverPtLeadTrk_log_1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwoMVA/EFTau/RNN/InputScalar1p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_mEflowApprox_log_1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwoMVA/EFTau/RNN/InputScalar1p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_ptDetectorAxis_log_1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwoMVA/EFTau/RNN/InputScalar1p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_ptRatioEflowApprox_1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwoMVA/EFTau/RNN/InputScalar1p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-						dir InputScalar3p {
-							hist hEFRNNInput_Scalar_EMPOverTrkSysP_log_3P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwoMVA/EFTau/RNN/InputScalar3p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_SumPtTrkFrac_3P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwoMVA/EFTau/RNN/InputScalar3p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_centFrac_3P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwoMVA/EFTau/RNN/InputScalar3p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_dRmax_3P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwoMVA/EFTau/RNN/InputScalar3p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_etOverPtLeadTrk_log_3P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwoMVA/EFTau/RNN/InputScalar3p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_mEflowApprox_log_3P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwoMVA/EFTau/RNN/InputScalar3p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_massTrkSys_log_3P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwoMVA/EFTau/RNN/InputScalar3p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_ptDetectorAxis_log_3P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwoMVA/EFTau/RNN/InputScalar3p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_ptRatioEflowApprox_3P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwoMVA/EFTau/RNN/InputScalar3p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNInput_Scalar_trFlightPathSig_log_3P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwoMVA/EFTau/RNN/InputScalar3p
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-						dir Output {
-							hist hEFRNNJetScore {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwoMVA/EFTau/RNN/Output
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFRNNJetScoreSigTrans {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwoMVA/EFTau/RNN/Output
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-					}
-					hist hEFEMFraction {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwoMVA/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEt {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwoMVA/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtRaw {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwoMVA/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtVsEta {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwoMVA/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwoMVA/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEta {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwoMVA/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtaVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwoMVA/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFIsoFrac {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwoMVA/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFNUM {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwoMVA/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFNUMvsmu {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwoMVA/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFPhi {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwoMVA/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFnTrack {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwoMVA/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFnWideTrack {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwoMVA/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir EFVsOffline {
-					dir BDT {
-						dir 1p_nonCorrected {
-							hist hCentFracRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwoMVA/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hChPiEMEOverCaloEMERatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwoMVA/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hDRmaxRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwoMVA/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEMPOverTrkSysPRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwoMVA/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEtOverPtLeadTrkRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwoMVA/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hInnerTrkAvgDistRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwoMVA/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hIpSigLeadTrkRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwoMVA/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hPtRatioEflowApproxRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwoMVA/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hSumPtTrkFracRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwoMVA/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hTopoInvMassRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwoMVA/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-						dir mp_nonCorrected {
-							hist hCentFracRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwoMVA/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hChPiEMEOverCaloEMERatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwoMVA/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hDRmaxRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwoMVA/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEMPOverTrkSysPRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwoMVA/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEtOverPtLeadTrkRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwoMVA/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hInnerTrkAvgDistRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwoMVA/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hMEflowApproxRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwoMVA/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hMassTrkSysRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwoMVA/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hPtRatioEflowApproxRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwoMVA/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hTrFlightPathSigRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwoMVA/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-					}
-					hist   all_in_dir {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwoMVA/EFVsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFvsOffnTrks {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwoMVA/EFVsOffline
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFvsOffnWideTrks {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwoMVA/EFVsOffline
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir L1RoI {
-					hist hL1EtVsEta {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwoMVA/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1EtVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwoMVA/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1EtaVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwoMVA/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIEMIso {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwoMVA/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIEta {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwoMVA/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIHadCore {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwoMVA/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIHadIsol {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwoMVA/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIPhi {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwoMVA/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoITauClus {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwoMVA/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoITauClusEMIso {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwoMVA/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIeT {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwoMVA/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIisol {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwoMVA/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir L1VsOffline {
-					hist hL1EtRatio {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwoMVA/L1VsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir TurnOnCurves {
-					dir RecoEfficiency {
-						hist TProfRecoHLTEtaEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTHighPt1pEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTHighPt3pEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTHighPtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTMuEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTNTrackEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTNVtxEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPhiEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPt1PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPt3PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1EtaEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1HighPt1PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1HighPt3PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1HighPtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1MuEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1NTrackEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1NVtxEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1PhiEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1Pt1PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1Pt3PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1PtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau25_verylooseRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-					}
-				}
-			}
-			dir tau35_medium1_tracktwo_tau25_medium1_tracktwo_L1TAU20IM_2TAU12IM {
-				dir EFTau {
-					dir BDT {
-						dir 1p_nonCorrected {
-							hist   all_in_dir {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_tau25_medium1_tracktwo_L1TAU20IM_2TAU12IM/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-						dir mp_nonCorrected {
-							hist   all_in_dir {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_tau25_medium1_tracktwo_L1TAU20IM_2TAU12IM/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-					}
-					hist   all_in_dir {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_tau25_medium1_tracktwo_L1TAU20IM_2TAU12IM/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFNUMvsmu {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_tau25_medium1_tracktwo_L1TAU20IM_2TAU12IM/EFTau
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtaVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_tau25_medium1_tracktwo_L1TAU20IM_2TAU12IM/EFTau
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_tau25_medium1_tracktwo_L1TAU20IM_2TAU12IM/EFTau
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtVsEta {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_tau25_medium1_tracktwo_L1TAU20IM_2TAU12IM/EFTau
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir EFVsOffline {
-					dir BDT {
-						dir 1p_nonCorrected {
-							hist   all_in_dir {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_tau25_medium1_tracktwo_L1TAU20IM_2TAU12IM/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-						dir mp_nonCorrected {
-							hist   all_in_dir {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_tau25_medium1_tracktwo_L1TAU20IM_2TAU12IM/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-					}
-					hist   all_in_dir {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_tau25_medium1_tracktwo_L1TAU20IM_2TAU12IM/EFVsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFvsOffnTrks {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_tau25_medium1_tracktwo_L1TAU20IM_2TAU12IM/EFVsOffline
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFvsOffnWideTrks {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_tau25_medium1_tracktwo_L1TAU20IM_2TAU12IM/EFVsOffline
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir L1RoI {
-					hist   all_in_dir {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_tau25_medium1_tracktwo_L1TAU20IM_2TAU12IM/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1EtaVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_tau25_medium1_tracktwo_L1TAU20IM_2TAU12IM/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoITauClusEMIso {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_tau25_medium1_tracktwo_L1TAU20IM_2TAU12IM/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1EtVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_tau25_medium1_tracktwo_L1TAU20IM_2TAU12IM/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1EtVsEta {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_tau25_medium1_tracktwo_L1TAU20IM_2TAU12IM/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir L1VsOffline {
-					hist   all_in_dir {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_tau25_medium1_tracktwo_L1TAU20IM_2TAU12IM/L1VsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir PreselectionTau {
-					hist   all_in_dir {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_tau25_medium1_tracktwo_L1TAU20IM_2TAU12IM/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtaVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_tau25_medium1_tracktwo_L1TAU20IM_2TAU12IM/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEtVsEta {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_tau25_medium1_tracktwo_L1TAU20IM_2TAU12IM/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEtVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_tau25_medium1_tracktwo_L1TAU20IM_2TAU12IM/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir PreselectionVsOffline {
-					hist   all_in_dir {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_tau25_medium1_tracktwo_L1TAU20IM_2TAU12IM/PreselectionVsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hPreselvsOffnTrks {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_tau25_medium1_tracktwo_L1TAU20IM_2TAU12IM/PreselectionVsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hPreselvsOffnWideTrks {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_tau25_medium1_tracktwo_L1TAU20IM_2TAU12IM/PreselectionVsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir TurnOnCurves {
-					dir RecoEfficiency {
-						hist   all_in_dir {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_tau25_medium1_tracktwo_L1TAU20IM_2TAU12IM/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-					}
-				}
-			}
-			dir tau35_medium1_tracktwo_xe70_L1XE45 {
-				dir EFTau {
-					dir BDT {
-						dir 1p_nonCorrected {
-							hist hEFChPiEMEOverCaloEME1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFEMPOverTrkSysP1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFSumPtTrkFrac1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFcentFrac1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFetOverPtLeadTrk1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFinnerTrkAvgDist1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFipSigLeadTrk1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFptRatioEflowApprox1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-						dir mp_nonCorrected {
-							hist hEFChPiEMEOverCaloEMEMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFEMPOverTrkSysPMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFcentFracMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFdRmaxMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFetOverPtLeadTrkMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFinnerTrkAvgDistMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFmEflowApproxMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFmassTrkSysMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFptRatioEflowApproxMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFtrFlightPathSigMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-					}
-					hist hEFEMFraction {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEt {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtRaw {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtVsEta {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEta {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtaVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFIsoFrac {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFNUM {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFNUMvsmu {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFPhi {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFnTrack {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFnWideTrack {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hScore1p {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hScoreSigTrans1p {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hScoreSigTransmp {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hScoremp {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir EFVsOffline {
-					dir BDT {
-						dir 1p_nonCorrected {
-							hist hCentFracRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hChPiEMEOverCaloEMERatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hDRmaxRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEMPOverTrkSysPRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEtOverPtLeadTrkRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hInnerTrkAvgDistRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hIpSigLeadTrkRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hPtRatioEflowApproxRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hSumPtTrkFracRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hTopoInvMassRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-						dir mp_nonCorrected {
-							hist hCentFracRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hChPiEMEOverCaloEMERatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hDRmaxRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEMPOverTrkSysPRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEtOverPtLeadTrkRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hInnerTrkAvgDistRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hMEflowApproxRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hMassTrkSysRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hPtRatioEflowApproxRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hTrFlightPathSigRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-					}
-					hist   all_in_dir {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFVsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFvsOffnTrks {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFVsOffline
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFvsOffnWideTrks {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFVsOffline
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir L1RoI {
-					hist hL1EtVsEta {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1EtVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1EtaVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIEMIso {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIEta {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIHadCore {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIHadIsol {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIPhi {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoITauClus {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoITauClusEMIso {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIeT {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIisol {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir L1VsOffline {
-					hist hL1EtRatio {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/L1VsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir PreselectionTau {
-					hist hEFEt {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEt2 {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtaVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEtVsEta {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEtVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEta {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hFTFnTrack {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hFTFnWideTrack {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hPhi {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir PreselectionVsOffline {
-					hist hEFEtRatio {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/PreselectionVsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEtaRatio {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/PreselectionVsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hPhiRatio {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/PreselectionVsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hPreselvsOffnTrks {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/PreselectionVsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hPreselvsOffnWideTrks {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/PreselectionVsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir TurnOnCurves {
-					dir RecoEfficiency {
-						hist TProfRecoHLTEtaEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTHighPt1pEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTHighPt3pEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTHighPtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTMuEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTNTrackEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTNVtxEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPhiEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPt1PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPt3PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1EtaEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1HighPt1PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1HighPt3PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1HighPtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1MuEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1NTrackEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1NVtxEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1PhiEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1Pt1PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1Pt3PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1PtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-					}
-				}
-			}
-			dir tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12 {
-				dir EFTau {
-					dir BDT {
-						dir 1p_nonCorrected {
-							hist hEFChPiEMEOverCaloEME1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFEMPOverTrkSysP1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFSumPtTrkFrac1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFcentFrac1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFetOverPtLeadTrk1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFinnerTrkAvgDist1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFipSigLeadTrk1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFptRatioEflowApprox1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-						dir mp_nonCorrected {
-							hist hEFChPiEMEOverCaloEMEMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFEMPOverTrkSysPMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFcentFracMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFdRmaxMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFetOverPtLeadTrkMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFinnerTrkAvgDistMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFmEflowApproxMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFmassTrkSysMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFptRatioEflowApproxMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFtrFlightPathSigMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-					}
-					hist hEFEMFraction {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEt {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtRaw {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtVsEta {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEta {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtaVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFIsoFrac {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFNUM {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFNUMvsmu {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFPhi {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFnTrack {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFnWideTrack {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hScore1p {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hScoreSigTrans1p {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hScoreSigTransmp {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hScoremp {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir EFVsOffline {
-					dir BDT {
-						dir 1p_nonCorrected {
-							hist hCentFracRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hChPiEMEOverCaloEMERatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hDRmaxRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEMPOverTrkSysPRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEtOverPtLeadTrkRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hInnerTrkAvgDistRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hIpSigLeadTrkRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hPtRatioEflowApproxRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hSumPtTrkFracRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hTopoInvMassRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-						dir mp_nonCorrected {
-							hist hCentFracRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hChPiEMEOverCaloEMERatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hDRmaxRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEMPOverTrkSysPRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEtOverPtLeadTrkRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hInnerTrkAvgDistRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hMEflowApproxRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hMassTrkSysRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hPtRatioEflowApproxRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hTrFlightPathSigRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-					}
-					hist   all_in_dir {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFVsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFvsOffnTrks {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFVsOffline
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFvsOffnWideTrks {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFVsOffline
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir L1RoI {
-					hist hL1EtVsEta {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1EtVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1EtaVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIEMIso {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIEta {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIHadCore {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIHadIsol {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIPhi {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoITauClus {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoITauClusEMIso {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIeT {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIisol {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir L1VsOffline {
-					hist hL1EtRatio {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/L1VsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir PreselectionTau {
-					hist hEFEt {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEt2 {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtaVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEtVsEta {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEtVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEta {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hFTFnTrack {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hFTFnWideTrack {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hPhi {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir PreselectionVsOffline {
-					hist hEFEtRatio {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/PreselectionVsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEtaRatio {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/PreselectionVsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hPhiRatio {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/PreselectionVsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hPreselvsOffnTrks {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/PreselectionVsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hPreselvsOffnWideTrks {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/PreselectionVsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir TurnOnCurves {
-					dir RecoEfficiency {
-						hist TProfRecoHLTEtaEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTHighPt1pEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTHighPt3pEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTHighPtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTMuEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTNTrackEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTNVtxEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPhiEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPt1PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPt3PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1EtaEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1HighPt1PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1HighPt3PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1HighPtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1MuEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1NTrackEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1NVtxEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1PhiEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1Pt1PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1Pt3PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1PtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-					}
-				}
-			}
-			dir tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40 {
-				dir EFTau {
-					dir BDT {
-						dir 1p_nonCorrected {
-							hist hEFChPiEMEOverCaloEME1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFEMPOverTrkSysP1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFSumPtTrkFrac1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFcentFrac1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFetOverPtLeadTrk1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFinnerTrkAvgDist1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFipSigLeadTrk1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFptRatioEflowApprox1PNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFTau/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-						dir mp_nonCorrected {
-							hist hEFChPiEMEOverCaloEMEMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFEMPOverTrkSysPMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFcentFracMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFdRmaxMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFetOverPtLeadTrkMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFinnerTrkAvgDistMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFmEflowApproxMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFmassTrkSysMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFptRatioEflowApproxMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEFtrFlightPathSigMPNCorr {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFTau/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-					}
-					hist hEFEMFraction {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEt {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtRaw {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtVsEta {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEta {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtaVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFIsoFrac {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFNUM {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFNUMvsmu {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFPhi {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFnTrack {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFnWideTrack {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hScore1p {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hScoreSigTrans1p {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hScoreSigTransmp {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hScoremp {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir EFVsOffline {
-					dir BDT {
-						dir 1p_nonCorrected {
-							hist hCentFracRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hChPiEMEOverCaloEMERatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hDRmaxRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEMPOverTrkSysPRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEtOverPtLeadTrkRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hInnerTrkAvgDistRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hIpSigLeadTrkRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hPtRatioEflowApproxRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hSumPtTrkFracRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hTopoInvMassRatio1P {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFVsOffline/BDT/1p_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-						dir mp_nonCorrected {
-							hist hCentFracRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hChPiEMEOverCaloEMERatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hDRmaxRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEMPOverTrkSysPRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hEtOverPtLeadTrkRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hInnerTrkAvgDistRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hMEflowApproxRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hMassTrkSysRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hPtRatioEflowApproxRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-							hist hTrFlightPathSigRatioMP {
-								algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-								description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-								output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFVsOffline/BDT/mp_nonCorrected
-								display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-							}
-						}
-					}
-					hist   all_in_dir {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFVsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFvsOffnTrks {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFVsOffline
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFvsOffnWideTrks {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFVsOffline
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir L1RoI {
-					hist hL1EtVsEta {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1EtVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1EtaVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIEMIso {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIEta {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIHadCore {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIHadIsol {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIPhi {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoITauClus {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoITauClusEMIso {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIeT {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIisol {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir L1VsOffline {
-					hist hL1EtRatio {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/L1VsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir PreselectionTau {
-					hist hEFEt {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEt2 {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtaVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEtVsEta {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEtVsPhi {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEta {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hFTFnTrack {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hFTFnWideTrack {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hPhi {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir PreselectionVsOffline {
-					hist hEFEtRatio {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/PreselectionVsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEtaRatio {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/PreselectionVsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hPhiRatio {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/PreselectionVsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hPreselvsOffnTrks {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/PreselectionVsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hPreselvsOffnWideTrks {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/PreselectionVsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir TurnOnCurves {
-					dir RecoEfficiency {
-						hist TProfRecoHLTEtaEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTHighPt1pEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTHighPt3pEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTHighPtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTMuEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTNTrackEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTNVtxEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPhiEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPt1PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPt3PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoHLTPtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1EtaEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1HighPt1PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1HighPt3PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1HighPtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1MuEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1NTrackEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1NVtxEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1PhiEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1Pt1PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1Pt3PEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-						hist TProfRecoL1PtEfficiency {
-							algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
-							description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-							output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/TurnOnCurves/RecoEfficiency
-							display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-						}
-					}
-				}
-			}
-		}
-		dir Shifter {
-			dir OtherPlots {
-				hist hHLTCounts_shifter {
-					algorithm   	= TAU_HistKolmogorovTest_MaxDist
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-					output      	= HLT/TauMon/Shifter/OtherPlots
-					display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-				}
-				hist hL1Counts_shifter {
-					algorithm   	= TAU_HistKolmogorovTest_MaxDist
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-					output      	= HLT/TauMon/Shifter/OtherPlots
-					display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-				}
-				hist hL1Emulation_shifter {
-					algorithm   	= TAU_HistKolmogorovTest_MaxDist
-					description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-					output      	= HLT/TauMon/Shifter/OtherPlots
-					display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-				}
-				dir tau35_medium1_tracktwoEF_tau25_medium1_tracktwoEF {
-					hist TProfRecoL1_dREfficiency_shifter {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Shifter/OtherPlots/tau35_medium1_tracktwoEF_tau25_medium1_tracktwoEF
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir tau35_medium1_tracktwoEF_tau25_medium1_tracktwoEF_03dR30_L1DR-TAU20ITAU12I-J25 {
-					hist TProfRecoL1_dREfficiency_shifter {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Shifter/OtherPlots/tau35_medium1_tracktwoEF_tau25_medium1_tracktwoEF_03dR30_L1DR-TAU20ITAU12I-J25
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir tau35_medium1_tracktwoEF_tau25_medium1_tracktwoEF_L1DR-TAU20ITAU12I-J25 {
-					hist TProfRecoL1_dREfficiency_shifter {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Shifter/OtherPlots/tau35_medium1_tracktwoEF_tau25_medium1_tracktwoEF_L1DR-TAU20ITAU12I-J25
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir tau35_medium1_tracktwo_tau25_medium1_tracktwo {
-					hist TProfRecoL1_dREfficiency_shifter {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Shifter/OtherPlots/tau35_medium1_tracktwo_tau25_medium1_tracktwo
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir tau35_medium1_tracktwo_tau25_medium1_tracktwo_03dR30_L1DR-TAU20ITAU12I {
-					hist   all_in_dir {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Shifter/OtherPlots/tau35_medium1_tracktwo_tau25_medium1_tracktwo_03dR30_L1DR-TAU20ITAU12I
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir tau35_medium1_tracktwo_tau25_medium1_tracktwo_03dR30_L1DR-TAU20ITAU12I-J25 {
-					hist   all_in_dir {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Shifter/OtherPlots/tau35_medium1_tracktwo_tau25_medium1_tracktwo_03dR30_L1DR-TAU20ITAU12I-J25
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir tau35_medium1_tracktwo_tau25_medium1_tracktwo_L1DR-TAU20ITAU12I {
-					hist   all_in_dir {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Shifter/OtherPlots/tau35_medium1_tracktwo_tau25_medium1_tracktwo_L1DR-TAU20ITAU12I
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir tau35_medium1_tracktwo_tau25_medium1_tracktwo_L1DR-TAU20ITAU12I-J25 {
-					hist   all_in_dir {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Shifter/OtherPlots/tau35_medium1_tracktwo_tau25_medium1_tracktwo_L1DR-TAU20ITAU12I-J25
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir tau35_medium1_tracktwo_tau25_medium1_tracktwo_L1TAU20IM_2TAU12IM {
-					hist   all_in_dir {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Shifter/OtherPlots/tau35_medium1_tracktwo_tau25_medium1_tracktwo_L1TAU20IM_2TAU12IM
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir tau80_medium1_tracktwoEF_L1TAU60_tau35_medium1_tracktwoEF_L1TAU12IM_L1TAU60_DR-TAU20ITAU12I {
-					hist TProfRecoL1_dREfficiency_shifter {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Shifter/OtherPlots/tau80_medium1_tracktwoEF_L1TAU60_tau35_medium1_tracktwoEF_L1TAU12IM_L1TAU60_DR-TAU20ITAU12I
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir tau80_medium1_tracktwo_L1TAU60_tau35_medium1_tracktwo_L1TAU12IM_L1TAU60_DR-TAU20ITAU12I {
-					hist TProfRecoL1_dREfficiency_shifter {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Shifter/OtherPlots/tau80_medium1_tracktwo_L1TAU60_tau35_medium1_tracktwo_L1TAU12IM_L1TAU60_DR-TAU20ITAU12I
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-			}
-			dir tau25_medium1_tracktwo {
-				dir EFTau {
-					hist hEFEMFraction_shifter {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEMPOverTrkSysP1PNCorr_shifter {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEMPOverTrkSysPMPNCorr_shifter {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtRaw_shifter {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtVsEta_shifter {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtVsPhi_shifter {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEt_shifter {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtaVsPhi_shifter {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEta_shifter {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFIsoFrac_shifter {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFPhi_shifter {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFSumPtTrkFrac1PNCorr_shifter {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFcentFrac1PNCorr_shifter {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFcentFracMPNCorr_shifter {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFdRmaxMPNCorr_shifter {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFetOverPtLeadTrk1PNCorr_shifter {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFetOverPtLeadTrkMPNCorr_shifter {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFinnerTrkAvgDist1PNCorr_shifter {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFinnerTrkAvgDistMPNCorr_shifter {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFipSigLeadTrk1PNCorr_shifter {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFnTrack_shifter {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFnWideTrack_shifter {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFtrFlightPathSigMPNCorr_shifter {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hScore1p_shifter {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hScoreSigTrans1p_shifter {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hScoreSigTransmp_shifter {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hScoremp_shifter {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwo/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir EFVsOffline {
-					hist   all_in_dir {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwo/EFVsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFvsOffnTrks_shifter {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwo/EFVsOffline
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFvsOffnWideTrks_shifter {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwo/EFVsOffline
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir L1RoI {
-					hist hL1EtaVsPhi_shifter {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwo/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIEMIso_shifter {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwo/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIEta_shifter {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwo/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIHadCore_shifter {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwo/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIHadIsol_shifter {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwo/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIPhi_shifter {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwo/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoITauClusEMIso_shifter {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwo/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoITauClus_shifter {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwo/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIeT_shifter {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwo/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIisol_shifter {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwo/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir L1VsOffline {
-					hist hL1EtRatio_shifter {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwo/L1VsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir PreselectionTau {
-					hist hEFEt_shifter {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwo/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtaVsPhi_shifter {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwo/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEta_shifter {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwo/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hFTFnTrack_shifter {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwo/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hFTFnWideTrack_shifter {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwo/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hPhi_shifter {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwo/PreselectionTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir PreselectionVsOffline {
-					hist hPreselvsOffnTrks_shifter {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwo/PreselectionVsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hPreselvsOffnWideTrks_shifter {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwo/PreselectionVsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir TurnOnCurves {
-					hist   all_in_dir {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwo/TurnOnCurves
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-			}
-			dir tau25_medium1_tracktwoEF {
-				dir EFTau {
-					hist hEFEMFraction_shifter {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwoEF/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEMPOverTrkSysP1PNCorr_shifter {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwoEF/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEMPOverTrkSysPMPNCorr_shifter {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwoEF/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtRaw_shifter {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwoEF/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtVsEta_shifter {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwoEF/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtVsPhi_shifter {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwoEF/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEt_shifter {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwoEF/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEtaVsPhi_shifter {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwoEF/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFEta_shifter {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwoEF/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFIsoFrac_shifter {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwoEF/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFPhi_shifter {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwoEF/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFSumPtTrkFrac1PNCorr_shifter {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwoEF/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFcentFrac1PNCorr_shifter {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwoEF/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFcentFracMPNCorr_shifter {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwoEF/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFdRmaxMPNCorr_shifter {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwoEF/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFetOverPtLeadTrk1PNCorr_shifter {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwoEF/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFetOverPtLeadTrkMPNCorr_shifter {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwoEF/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFinnerTrkAvgDist1PNCorr_shifter {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwoEF/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFinnerTrkAvgDistMPNCorr_shifter {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwoEF/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFipSigLeadTrk1PNCorr_shifter {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwoEF/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFnTrack_shifter {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwoEF/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFnWideTrack_shifter {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwoEF/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFtrFlightPathSigMPNCorr_shifter {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwoEF/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hScore1p_shifter {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwoEF/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hScoreSigTrans1p_shifter {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwoEF/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hScoreSigTransmp_shifter {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwoEF/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hScoremp_shifter {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwoEF/EFTau
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir EFVsOffline {
-					hist   all_in_dir {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwoEF/EFVsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFvsOffnTrks_shifter {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwoEF/EFVsOffline
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hEFvsOffnWideTrks_shifter {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwoEF/EFVsOffline
-						display     	= StatBox
-						reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir L1RoI {
-					hist hL1EtaVsPhi_shifter {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwoEF/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIEMIso_shifter {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwoEF/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIEta_shifter {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwoEF/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIHadCore_shifter {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwoEF/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIHadIsol_shifter {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwoEF/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIPhi_shifter {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwoEF/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoITauClusEMIso_shifter {
-						algorithm   	= HLT_Histogram_Not_Empty&GatherData
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwoEF/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoITauClus_shifter {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwoEF/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIeT_shifter {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwoEF/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-					hist hL1RoIisol_shifter {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwoEF/L1RoI
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir L1VsOffline {
-					hist hL1EtRatio_shifter {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwoEF/L1VsOffline
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-				dir TurnOnCurves {
-					hist   all_in_dir {
-						algorithm   	= TAU_HistKolmogorovTest_MaxDist
-						description 	= https://twiki.cern.ch/twiki/bin/view/Atlas/HltTrackingDataQualityMonitoring#Tier0
-						output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwoEF/TurnOnCurves
-						display     	= StatBox
-							reference     = CentrallyManagedReferences_Trigger
-					}
-				}
-			}
-		}
-	}
+  dir TauMon {
+    dir Expert {
+      dir Emulation {
+        hist hL1Emulation {
+          algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+          output      	= HLT/TauMon/Expert/Emulation
+          display     	= StatBox
+        }
+      }
+      dir HLTefficiency {
+        dir EffRatios_FTKvsNonFTK {
+          hist TProfRecoHLTLSTEta1PEfficiency_CompFTKNoPrecvsNonFTK_medium0 {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/HLTefficiency/EffRatios_FTKvsNonFTK
+            display     	= StatBox
+          }
+          hist TProfRecoHLTLSTEta1PEfficiency_CompFTKNoPrecvsNonFTK_medium1 {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/HLTefficiency/EffRatios_FTKvsNonFTK
+            display     	= StatBox
+          }
+          hist TProfRecoHLTLSTEta3PEfficiency_CompFTKNoPrecvsNonFTK_medium0 {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/HLTefficiency/EffRatios_FTKvsNonFTK
+            display     	= StatBox
+          }
+          hist TProfRecoHLTLSTEta3PEfficiency_CompFTKNoPrecvsNonFTK_medium1 {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/HLTefficiency/EffRatios_FTKvsNonFTK
+            display     	= StatBox
+          }
+          hist TProfRecoHLTLSTEtaEfficiency_CompFTKNoPrecvsNonFTK_medium0 {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/HLTefficiency/EffRatios_FTKvsNonFTK
+            display     	= StatBox
+          }
+          hist TProfRecoHLTLSTEtaEfficiency_CompFTKNoPrecvsNonFTK_medium1 {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/HLTefficiency/EffRatios_FTKvsNonFTK
+            display     	= StatBox
+          }
+          hist TProfRecoHLTLSTMu1PEfficiency_CompFTKNoPrecvsNonFTK_medium0 {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/HLTefficiency/EffRatios_FTKvsNonFTK
+            display     	= StatBox
+          }
+          hist TProfRecoHLTLSTMu1PEfficiency_CompFTKNoPrecvsNonFTK_medium1 {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/HLTefficiency/EffRatios_FTKvsNonFTK
+            display     	= StatBox
+          }
+          hist TProfRecoHLTLSTMu3PEfficiency_CompFTKNoPrecvsNonFTK_medium0 {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/HLTefficiency/EffRatios_FTKvsNonFTK
+            display     	= StatBox
+          }
+          hist TProfRecoHLTLSTMu3PEfficiency_CompFTKNoPrecvsNonFTK_medium1 {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/HLTefficiency/EffRatios_FTKvsNonFTK
+            display     	= StatBox
+          }
+          hist TProfRecoHLTLSTMuEfficiency_CompFTKNoPrecvsNonFTK_medium0 {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/HLTefficiency/EffRatios_FTKvsNonFTK
+            display     	= StatBox
+          }
+          hist TProfRecoHLTLSTMuEfficiency_CompFTKNoPrecvsNonFTK_medium1 {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/HLTefficiency/EffRatios_FTKvsNonFTK
+            display     	= StatBox
+          }
+          hist TProfRecoHLTLSTNTrackEfficiency_CompFTKNoPrecvsNonFTK_medium0 {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/HLTefficiency/EffRatios_FTKvsNonFTK
+            display     	= StatBox
+          }
+          hist TProfRecoHLTLSTNTrackEfficiency_CompFTKNoPrecvsNonFTK_medium1 {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/HLTefficiency/EffRatios_FTKvsNonFTK
+            display     	= StatBox
+          }
+          hist TProfRecoHLTLSTPt1PEfficiency_CompFTKNoPrecvsNonFTK_medium0 {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/HLTefficiency/EffRatios_FTKvsNonFTK
+            display     	= StatBox
+          }
+          hist TProfRecoHLTLSTPt1PEfficiency_CompFTKNoPrecvsNonFTK_medium1 {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/HLTefficiency/EffRatios_FTKvsNonFTK
+            display     	= StatBox
+          }
+          hist TProfRecoHLTLSTPt3PEfficiency_CompFTKNoPrecvsNonFTK_medium0 {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/HLTefficiency/EffRatios_FTKvsNonFTK
+            display     	= StatBox
+          }
+          hist TProfRecoHLTLSTPt3PEfficiency_CompFTKNoPrecvsNonFTK_medium1 {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/HLTefficiency/EffRatios_FTKvsNonFTK
+            display     	= StatBox
+          }
+          hist TProfRecoHLTLSTPtEfficiency_CompFTKNoPrecvsNonFTK_medium0 {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/HLTefficiency/EffRatios_FTKvsNonFTK
+            display     	= StatBox
+          }
+          hist TProfRecoHLTLSTPtEfficiency_CompFTKNoPrecvsNonFTK_medium1 {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/HLTefficiency/EffRatios_FTKvsNonFTK
+            display     	= StatBox
+          }
+        }
+        hist TProfRecoHLT160PtEfficiency {
+          algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+          output      	= HLT/TauMon/Expert/HLTefficiency
+          display     	= StatBox
+        }
+        hist TProfRecoHLT160PtEfficiency_2 {
+          algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+          output      	= HLT/TauMon/Expert/HLTefficiency
+          display     	= StatBox
+        }
+        hist TProfRecoHLT25Eta1PEfficiency {
+          algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+          output      	= HLT/TauMon/Expert/HLTefficiency
+          display     	= StatBox
+        }
+        hist TProfRecoHLT25Eta1PEfficiency_2 {
+          algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+          output      	= HLT/TauMon/Expert/HLTefficiency
+          display     	= StatBox
+        }
+        hist TProfRecoHLT25Eta3PEfficiency {
+          algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+          output      	= HLT/TauMon/Expert/HLTefficiency
+          display     	= StatBox
+        }
+        hist TProfRecoHLT25Eta3PEfficiency_2 {
+          algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+          output      	= HLT/TauMon/Expert/HLTefficiency
+          display     	= StatBox
+        }
+        hist TProfRecoHLT25EtaEfficiency {
+          algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+          output      	= HLT/TauMon/Expert/HLTefficiency
+          display     	= StatBox
+        }
+        hist TProfRecoHLT25EtaEfficiency_2 {
+          algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+          output      	= HLT/TauMon/Expert/HLTefficiency
+          display     	= StatBox
+        }
+        hist TProfRecoHLT25Mu1PEfficiency {
+          algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+          output      	= HLT/TauMon/Expert/HLTefficiency
+          display     	= StatBox
+        }
+        hist TProfRecoHLT25Mu1PEfficiency_2 {
+          algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+          output      	= HLT/TauMon/Expert/HLTefficiency
+          display     	= StatBox
+        }
+        hist TProfRecoHLT25Mu3PEfficiency {
+          algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+          output      	= HLT/TauMon/Expert/HLTefficiency
+          display     	= StatBox
+        }
+        hist TProfRecoHLT25Mu3PEfficiency_2 {
+          algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+          output      	= HLT/TauMon/Expert/HLTefficiency
+          display     	= StatBox
+        }
+        hist TProfRecoHLT25MuEfficiency {
+          algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+          output      	= HLT/TauMon/Expert/HLTefficiency
+          display     	= StatBox
+        }
+        hist TProfRecoHLT25MuEfficiency_2 {
+          algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+          output      	= HLT/TauMon/Expert/HLTefficiency
+          display     	= StatBox
+        }
+        hist TProfRecoHLT25NTrackEfficiency {
+          algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+          output      	= HLT/TauMon/Expert/HLTefficiency
+          display     	= StatBox
+        }
+        hist TProfRecoHLT25NTrackEfficiency_2 {
+          algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+          output      	= HLT/TauMon/Expert/HLTefficiency
+          display     	= StatBox
+        }
+        hist TProfRecoHLT25NVtxEfficiency {
+          algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+          output      	= HLT/TauMon/Expert/HLTefficiency
+          display     	= StatBox
+        }
+        hist TProfRecoHLT25NVtxEfficiency_2 {
+          algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+          output      	= HLT/TauMon/Expert/HLTefficiency
+          display     	= StatBox
+        }
+        hist TProfRecoHLT25PhiEfficiency {
+          algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+          output      	= HLT/TauMon/Expert/HLTefficiency
+          display     	= StatBox
+        }
+        hist TProfRecoHLT25PhiEfficiency_2 {
+          algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+          output      	= HLT/TauMon/Expert/HLTefficiency
+          display     	= StatBox
+        }
+        hist TProfRecoHLT25Pt1PEfficiency {
+          algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+          output      	= HLT/TauMon/Expert/HLTefficiency
+          display     	= StatBox
+        }
+        hist TProfRecoHLT25Pt1PEfficiency_2 {
+          algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+          output      	= HLT/TauMon/Expert/HLTefficiency
+          display     	= StatBox
+        }
+        hist TProfRecoHLT25Pt3PEfficiency {
+          algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+          output      	= HLT/TauMon/Expert/HLTefficiency
+          display     	= StatBox
+        }
+        hist TProfRecoHLT25Pt3PEfficiency_2 {
+          algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+          output      	= HLT/TauMon/Expert/HLTefficiency
+          display     	= StatBox
+        }
+        hist TProfRecoHLT25PtEfficiency {
+          algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+          output      	= HLT/TauMon/Expert/HLTefficiency
+          display     	= StatBox
+        }
+        hist TProfRecoHLT25PtEfficiency_2 {
+          algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+          output      	= HLT/TauMon/Expert/HLTefficiency
+          display     	= StatBox
+        }
+        hist TProfRecoHLTLSTEtaEfficiency_0prong_FTKNoPrec_2 {
+          algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+          output      	= HLT/TauMon/Expert/HLTefficiency
+          display     	= StatBox
+        }
+        hist TProfRecoHLTLSTEtaEfficiency_0prong_FTK_1 {
+          algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+          output      	= HLT/TauMon/Expert/HLTefficiency
+          display     	= StatBox
+        }
+        hist TProfRecoHLTLSTEtaEfficiency_0prong_FTK_2 {
+          algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+          output      	= HLT/TauMon/Expert/HLTefficiency
+          display     	= StatBox
+        }
+        hist TProfRecoHLTLSTEtaEfficiency_FTKNoPrec_2 {
+          algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+          output      	= HLT/TauMon/Expert/HLTefficiency
+          display     	= StatBox
+        }
+        hist TProfRecoHLTLSTEtaEfficiency_FTK_1 {
+          algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+          output      	= HLT/TauMon/Expert/HLTefficiency
+          display     	= StatBox
+        }
+        hist TProfRecoHLTLSTEtaEfficiency_FTK_2 {
+          algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+          output      	= HLT/TauMon/Expert/HLTefficiency
+          display     	= StatBox
+        }
+        hist TProfRecoHLTLSTMuEfficiency_0prong_FTKNoPrec_2 {
+          algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+          output      	= HLT/TauMon/Expert/HLTefficiency
+          display     	= StatBox
+        }
+        hist TProfRecoHLTLSTMuEfficiency_0prong_FTK_1 {
+          algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+          output      	= HLT/TauMon/Expert/HLTefficiency
+          display     	= StatBox
+        }
+        hist TProfRecoHLTLSTMuEfficiency_0prong_FTK_2 {
+          algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+          output      	= HLT/TauMon/Expert/HLTefficiency
+          display     	= StatBox
+        }
+        hist TProfRecoHLTLSTMuEfficiency_FTKNoPrec_2 {
+          algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+          output      	= HLT/TauMon/Expert/HLTefficiency
+          display     	= StatBox
+        }
+        hist TProfRecoHLTLSTMuEfficiency_FTK_1 {
+          algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+          output      	= HLT/TauMon/Expert/HLTefficiency
+          display     	= StatBox
+        }
+        hist TProfRecoHLTLSTMuEfficiency_FTK_2 {
+          algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+          output      	= HLT/TauMon/Expert/HLTefficiency
+          display     	= StatBox
+        }
+        hist TProfRecoHLTLSTNTrackEfficiency_0prong_FTKNoPrec_2 {
+          algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+          output      	= HLT/TauMon/Expert/HLTefficiency
+          display     	= StatBox
+        }
+        hist TProfRecoHLTLSTNTrackEfficiency_0prong_FTK_1 {
+          algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+          output      	= HLT/TauMon/Expert/HLTefficiency
+          display     	= StatBox
+        }
+        hist TProfRecoHLTLSTNTrackEfficiency_0prong_FTK_2 {
+          algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+          output      	= HLT/TauMon/Expert/HLTefficiency
+          display     	= StatBox
+        }
+        hist TProfRecoHLTLSTNTrackEfficiency_FTKNoPrec_2 {
+          algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+          output      	= HLT/TauMon/Expert/HLTefficiency
+          display     	= StatBox
+        }
+        hist TProfRecoHLTLSTNTrackEfficiency_FTK_1 {
+          algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+          output      	= HLT/TauMon/Expert/HLTefficiency
+          display     	= StatBox
+        }
+        hist TProfRecoHLTLSTNTrackEfficiency_FTK_2 {
+          algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+          output      	= HLT/TauMon/Expert/HLTefficiency
+          display     	= StatBox
+        }
+        hist TProfRecoHLTLSTPt1PEfficiency_0prong_FTKNoPrec_2 {
+          algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+          output      	= HLT/TauMon/Expert/HLTefficiency
+          display     	= StatBox
+        }
+        hist TProfRecoHLTLSTPt1PEfficiency_0prong_FTK_1 {
+          algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+          output      	= HLT/TauMon/Expert/HLTefficiency
+          display     	= StatBox
+        }
+        hist TProfRecoHLTLSTPt1PEfficiency_0prong_FTK_2 {
+          algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+          output      	= HLT/TauMon/Expert/HLTefficiency
+          display     	= StatBox
+        }
+        hist TProfRecoHLTLSTPt1PEfficiency_FTKNoPrec_2 {
+          algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+          output      	= HLT/TauMon/Expert/HLTefficiency
+          display     	= StatBox
+        }
+        hist TProfRecoHLTLSTPt1PEfficiency_FTK_1 {
+          algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+          output      	= HLT/TauMon/Expert/HLTefficiency
+          display     	= StatBox
+        }
+        hist TProfRecoHLTLSTPt1PEfficiency_FTK_2 {
+          algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+          output      	= HLT/TauMon/Expert/HLTefficiency
+          display     	= StatBox
+        }
+        hist TProfRecoHLTLSTPt3PEfficiency_0prong_FTKNoPrec_2 {
+          algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+          output      	= HLT/TauMon/Expert/HLTefficiency
+          display     	= StatBox
+        }
+        hist TProfRecoHLTLSTPt3PEfficiency_0prong_FTK_1 {
+          algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+          output      	= HLT/TauMon/Expert/HLTefficiency
+          display     	= StatBox
+        }
+        hist TProfRecoHLTLSTPt3PEfficiency_0prong_FTK_2 {
+          algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+          output      	= HLT/TauMon/Expert/HLTefficiency
+          display     	= StatBox
+        }
+        hist TProfRecoHLTLSTPt3PEfficiency_FTKNoPrec_2 {
+          algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+          output      	= HLT/TauMon/Expert/HLTefficiency
+          display     	= StatBox
+        }
+        hist TProfRecoHLTLSTPt3PEfficiency_FTK_1 {
+          algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+          output      	= HLT/TauMon/Expert/HLTefficiency
+          display     	= StatBox
+        }
+        hist TProfRecoHLTLSTPt3PEfficiency_FTK_2 {
+          algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+          output      	= HLT/TauMon/Expert/HLTefficiency
+          display     	= StatBox
+        }
+        hist TProfRecoHLTLSTPtEfficiency_0prong_FTKNoPrec_2 {
+          algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+          output      	= HLT/TauMon/Expert/HLTefficiency
+          display     	= StatBox
+        }
+        hist TProfRecoHLTLSTPtEfficiency_0prong_FTK_1 {
+          algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+          output      	= HLT/TauMon/Expert/HLTefficiency
+          display     	= StatBox
+        }
+        hist TProfRecoHLTLSTPtEfficiency_0prong_FTK_2 {
+          algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+          output      	= HLT/TauMon/Expert/HLTefficiency
+          display     	= StatBox
+        }
+        hist TProfRecoHLTLSTPtEfficiency_FTKNoPrec_2 {
+          algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+          output      	= HLT/TauMon/Expert/HLTefficiency
+          display     	= StatBox
+        }
+        hist TProfRecoHLTLSTPtEfficiency_FTK_1 {
+          algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+          output      	= HLT/TauMon/Expert/HLTefficiency
+          display     	= StatBox
+        }
+        hist TProfRecoHLTLSTPtEfficiency_FTK_2 {
+          algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+          output      	= HLT/TauMon/Expert/HLTefficiency
+          display     	= StatBox
+        }
+        hist TProfRecoL1_J25Pt1PEfficiency {
+          algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+          output      	= HLT/TauMon/Expert/HLTefficiency
+          display     	= StatBox
+        }
+        hist TProfRecoL1_J25Pt3PEfficiency {
+          algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+          output      	= HLT/TauMon/Expert/HLTefficiency
+          display     	= StatBox
+        }
+        hist TProfRecoL1_J25PtEfficiency {
+          algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+          output      	= HLT/TauMon/Expert/HLTefficiency
+          display     	= StatBox
+        }
+        hist hRecoHLT25EtaVsPhiEfficiency {
+          algorithm   	= HLT_Histogram_Not_Empty&GatherData
+          output      	= HLT/TauMon/Expert/HLTefficiency
+          display     	= StatBox
+        }
+        hist hRecoHLT25EtaVsPhiEfficiency_2 {
+          algorithm   	= HLT_Histogram_Not_Empty&GatherData
+          output      	= HLT/TauMon/Expert/HLTefficiency
+          display     	= StatBox
+        }
+        hist hRecoHLT25EtaVsPhiNum {
+          algorithm   	= HLT_Histogram_Not_Empty&GatherData
+          output      	= HLT/TauMon/Expert/HLTefficiency
+          display     	= StatBox
+        }
+        hist hRecoHLT25EtaVsPhiNum_2 {
+          algorithm   	= HLT_Histogram_Not_Empty&GatherData
+          output      	= HLT/TauMon/Expert/HLTefficiency
+          display     	= StatBox
+        }
+        hist hRecoTau25EtaVsPhiDenom {
+          algorithm   	= HLT_Histogram_Not_Empty&GatherData
+          output      	= HLT/TauMon/Expert/HLTefficiency
+          display     	= StatBox
+        }
+        hist hRecoTau25EtaVsPhiDenom_2 {
+          algorithm   	= HLT_Histogram_Not_Empty&GatherData
+          output      	= HLT/TauMon/Expert/HLTefficiency
+          display     	= StatBox
+        }
+      }
+      dir RealZtautauEff {
+        dir tau25_medium1_tracktwoEF {
+          hist TProfRealZttHLTPt1PEfficiency {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/RealZtautauEff/tau25_medium1_tracktwoEF
+            display     	= StatBox
+          }
+          hist TProfRealZttHLTPt3PEfficiency {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/RealZtautauEff/tau25_medium1_tracktwoEF
+            display     	= StatBox
+          }
+          hist TProfRealZttL1Pt1PEfficiency {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/RealZtautauEff/tau25_medium1_tracktwoEF
+            display     	= StatBox
+          }
+          hist TProfRealZttL1Pt3PEfficiency {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/RealZtautauEff/tau25_medium1_tracktwoEF
+            display     	= StatBox
+          }
+        }
+        dir tau25_mediumRNN_tracktwoMVA {
+          hist TProfRealZttHLTPt1PEfficiency {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/RealZtautauEff/tau25_mediumRNN_tracktwoMVA
+            display     	= StatBox
+          }
+          hist TProfRealZttHLTPt3PEfficiency {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/RealZtautauEff/tau25_mediumRNN_tracktwoMVA
+            display     	= StatBox
+          }
+          hist TProfRealZttL1Pt1PEfficiency {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/RealZtautauEff/tau25_mediumRNN_tracktwoMVA
+            display     	= StatBox
+          }
+          hist TProfRealZttL1Pt3PEfficiency {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/RealZtautauEff/tau25_mediumRNN_tracktwoMVA
+            display     	= StatBox
+          }
+        }
+      }
+      dir TopoDiTau {
+        dir tau35_medium1_tracktwoEF_tau25_medium1_tracktwoEF {
+          hist TProfRecoL1_dREfficiency {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/TopoDiTau/tau35_medium1_tracktwoEF_tau25_medium1_tracktwoEF
+            display     	= StatBox
+          }
+          hist hHLTdR {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/TopoDiTau/tau35_medium1_tracktwoEF_tau25_medium1_tracktwoEF
+            display     	= StatBox
+          }
+        }
+        dir tau35_medium1_tracktwoEF_tau25_medium1_tracktwoEF_03dR30_L1DR-TAU20ITAU12I-J25 {
+          hist TProfRecoL1_dREfficiency {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/TopoDiTau/tau35_medium1_tracktwoEF_tau25_medium1_tracktwoEF_03dR30_L1DR-TAU20ITAU12I-J25
+            display     	= StatBox
+          }
+          hist hHLTdR {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/TopoDiTau/tau35_medium1_tracktwoEF_tau25_medium1_tracktwoEF_03dR30_L1DR-TAU20ITAU12I-J25
+            display     	= StatBox
+          }
+        }
+        dir tau35_medium1_tracktwoEF_tau25_medium1_tracktwoEF_L1DR-TAU20ITAU12I-J25 {
+          hist TProfRecoL1_dREfficiency {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/TopoDiTau/tau35_medium1_tracktwoEF_tau25_medium1_tracktwoEF_L1DR-TAU20ITAU12I-J25
+            display     	= StatBox
+          }
+          hist hHLTdR {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/TopoDiTau/tau35_medium1_tracktwoEF_tau25_medium1_tracktwoEF_L1DR-TAU20ITAU12I-J25
+            display     	= StatBox
+          }
+        }
+        dir tau35_medium1_tracktwo_tau25_medium1_tracktwo {
+          hist TProfRecoL1_dREfficiency {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/TopoDiTau/tau35_medium1_tracktwo_tau25_medium1_tracktwo
+            display     	= StatBox
+          }
+          hist hHLTdR {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/TopoDiTau/tau35_medium1_tracktwo_tau25_medium1_tracktwo
+            display     	= StatBox
+          }
+        }
+        dir tau35_medium1_tracktwo_tau25_medium1_tracktwo_03dR30_L1DR-TAU20ITAU12I-J25 {          
+	  hist   all_in_dir {
+            algorithm           = TAU_HistKolmogorovTest_MaxDist_loose
+            output              = HLT/TauMon/Expert/TopoDiTau/tau35_medium1_tracktwo_tau25_medium1_tracktwo_03dR30_L1DR-TAU20ITAU12I-J25
+            display             = StatBox
+	    reference           = HLT_TauTrigger_MainReference
+          }
+        }
+        dir tau35_medium1_tracktwo_tau25_medium1_tracktwo_L1DR-TAU20ITAU12I-J25 {
+          hist   all_in_dir {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/TopoDiTau/tau35_medium1_tracktwo_tau25_medium1_tracktwo_L1DR-TAU20ITAU12I-J25
+            display     	= StatBox
+            reference           = HLT_TauTrigger_MainReference
+          }
+        }
+        dir tau35_medium1_tracktwo_tau25_medium1_tracktwo_L1TAU20IM_2TAU12IM {
+          hist   all_in_dir {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/TopoDiTau/tau35_medium1_tracktwo_tau25_medium1_tracktwo_L1TAU20IM_2TAU12IM
+            display     	= StatBox
+            reference           = HLT_TauTrigger_MainReference
+          }
+        }
+        dir tau80_medium1_tracktwoEF_L1TAU60_tau35_medium1_tracktwoEF_L1TAU12IM_L1TAU60_DR-TAU20ITAU12I {
+          hist TProfRecoL1_dREfficiency {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/TopoDiTau/tau80_medium1_tracktwoEF_L1TAU60_tau35_medium1_tracktwoEF_L1TAU12IM_L1TAU60_DR-TAU20ITAU12I
+            display     	= StatBox
+          }
+          hist hHLTdR {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/TopoDiTau/tau80_medium1_tracktwoEF_L1TAU60_tau35_medium1_tracktwoEF_L1TAU12IM_L1TAU60_DR-TAU20ITAU12I
+            display     	= StatBox
+          }
+        }
+        dir tau80_medium1_tracktwo_L1TAU60_tau35_medium1_tracktwo_L1TAU12IM_L1TAU60_DR-TAU20ITAU12I {
+          hist TProfRecoL1_dREfficiency {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/TopoDiTau/tau80_medium1_tracktwo_L1TAU60_tau35_medium1_tracktwo_L1TAU12IM_L1TAU60_DR-TAU20ITAU12I
+            display     	= StatBox
+          }
+          hist hHLTdR {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/TopoDiTau/tau80_medium1_tracktwo_L1TAU60_tau35_medium1_tracktwo_L1TAU12IM_L1TAU60_DR-TAU20ITAU12I
+            display     	= StatBox
+          }
+        }
+      }
+      dir TopoElTau {
+        dir e17_lhmedium_nod0_ivarloose_tau25_medium1_tracktwo {
+          hist TProfRecoL1_dREfficiency {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/TopoElTau/e17_lhmedium_nod0_ivarloose_tau25_medium1_tracktwo
+            display     	= StatBox
+          }
+          hist hHLTdR {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/TopoElTau/e17_lhmedium_nod0_ivarloose_tau25_medium1_tracktwo
+            display     	= StatBox
+          }
+        }
+        dir e17_lhmedium_nod0_ivarloose_tau25_medium1_tracktwo_L1DR-EM15TAU12I-J25 {
+          hist TProfRecoL1_dREfficiency {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/TopoElTau/e17_lhmedium_nod0_ivarloose_tau25_medium1_tracktwo_L1DR-EM15TAU12I-J25
+            display     	= StatBox
+          }
+          hist hHLTdR {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/TopoElTau/e17_lhmedium_nod0_ivarloose_tau25_medium1_tracktwo_L1DR-EM15TAU12I-J25
+            display     	= StatBox
+          }
+        }
+      }
+      dir TopoMuTau {
+        dir mu14_ivarloose_tau25_medium1_tracktwo {
+          hist TProfRecoL1_dREfficiency {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/TopoMuTau/mu14_ivarloose_tau25_medium1_tracktwo
+            display     	= StatBox
+          }
+          hist hHLTdR {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/TopoMuTau/mu14_ivarloose_tau25_medium1_tracktwo
+            display     	= StatBox
+          }
+        }
+        dir mu14_ivarloose_tau25_medium1_tracktwo_L1DR-MU10TAU12I_TAU12I-J25 {
+          hist TProfRecoL1_dREfficiency {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/TopoMuTau/mu14_ivarloose_tau25_medium1_tracktwo_L1DR-MU10TAU12I_TAU12I-J25
+            display     	= StatBox
+          }
+          hist hHLTdR {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/TopoMuTau/mu14_ivarloose_tau25_medium1_tracktwo_L1DR-MU10TAU12I_TAU12I-J25
+            display     	= StatBox
+          }
+        }
+      }
+      dir dijetFakeTausEff {
+        dir tau160_idperf_tracktwo_L1TAU100 {
+          hist TProfDijetFakeTausHLTEtaEfficiency {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/dijetFakeTausEff/tau160_idperf_tracktwo_L1TAU100
+            display     	= StatBox
+          }
+          hist TProfDijetFakeTausHLTMuEfficiency {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/dijetFakeTausEff/tau160_idperf_tracktwo_L1TAU100
+            display     	= StatBox
+          }
+          hist TProfDijetFakeTausHLTNTracksEfficiency {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/dijetFakeTausEff/tau160_idperf_tracktwo_L1TAU100
+            display     	= StatBox
+          }
+          hist TProfDijetFakeTausHLTPtEfficiency {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/dijetFakeTausEff/tau160_idperf_tracktwo_L1TAU100
+            display     	= StatBox
+          }
+          hist TProfDijetFakeTausL1EtaEfficiency {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/dijetFakeTausEff/tau160_idperf_tracktwo_L1TAU100
+            display     	= StatBox
+          }
+          hist TProfDijetFakeTausL1MuEfficiency {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/dijetFakeTausEff/tau160_idperf_tracktwo_L1TAU100
+            display     	= StatBox
+          }
+          hist TProfDijetFakeTausL1NTracksEfficiency {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/dijetFakeTausEff/tau160_idperf_tracktwo_L1TAU100
+            display     	= StatBox
+          }
+          hist TProfDijetFakeTausL1PtEfficiency {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/dijetFakeTausEff/tau160_idperf_tracktwo_L1TAU100
+            display     	= StatBox
+          }
+        }
+        dir tau160_medium1_tracktwo_L1TAU100 {
+          hist TProfDijetFakeTausHLTEtaEfficiency {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/dijetFakeTausEff/tau160_medium1_tracktwo_L1TAU100
+            display     	= StatBox
+          }
+          hist TProfDijetFakeTausHLTMuEfficiency {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/dijetFakeTausEff/tau160_medium1_tracktwo_L1TAU100
+            display     	= StatBox
+          }
+          hist TProfDijetFakeTausHLTNTracksEfficiency {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/dijetFakeTausEff/tau160_medium1_tracktwo_L1TAU100
+            display     	= StatBox
+          }
+          hist TProfDijetFakeTausHLTPtEfficiency {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/dijetFakeTausEff/tau160_medium1_tracktwo_L1TAU100
+            display     	= StatBox
+          }
+          hist TProfDijetFakeTausL1EtaEfficiency {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/dijetFakeTausEff/tau160_medium1_tracktwo_L1TAU100
+            display     	= StatBox
+          }
+          hist TProfDijetFakeTausL1MuEfficiency {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/dijetFakeTausEff/tau160_medium1_tracktwo_L1TAU100
+            display     	= StatBox
+          }
+          hist TProfDijetFakeTausL1NTracksEfficiency {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/dijetFakeTausEff/tau160_medium1_tracktwo_L1TAU100
+            display     	= StatBox
+          }
+          hist TProfDijetFakeTausL1PtEfficiency {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/dijetFakeTausEff/tau160_medium1_tracktwo_L1TAU100
+            display     	= StatBox
+          }
+        }
+        dir tau80_medium1_tracktwo_L1TAU60 {
+          hist TProfDijetFakeTausHLTEtaEfficiency {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/dijetFakeTausEff/tau80_medium1_tracktwo_L1TAU60
+            display     	= StatBox
+          }
+          hist TProfDijetFakeTausHLTMuEfficiency {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/dijetFakeTausEff/tau80_medium1_tracktwo_L1TAU60
+            display     	= StatBox
+          }
+          hist TProfDijetFakeTausHLTNTracksEfficiency {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/dijetFakeTausEff/tau80_medium1_tracktwo_L1TAU60
+            display     	= StatBox
+          }
+          hist TProfDijetFakeTausHLTPtEfficiency {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/dijetFakeTausEff/tau80_medium1_tracktwo_L1TAU60
+            display     	= StatBox
+          }
+          hist TProfDijetFakeTausL1EtaEfficiency {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/dijetFakeTausEff/tau80_medium1_tracktwo_L1TAU60
+            display     	= StatBox
+          }
+          hist TProfDijetFakeTausL1MuEfficiency {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/dijetFakeTausEff/tau80_medium1_tracktwo_L1TAU60
+            display     	= StatBox
+          }
+          hist TProfDijetFakeTausL1NTracksEfficiency {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/dijetFakeTausEff/tau80_medium1_tracktwo_L1TAU60
+            display     	= StatBox
+          }
+          hist TProfDijetFakeTausL1PtEfficiency {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/dijetFakeTausEff/tau80_medium1_tracktwo_L1TAU60
+            display     	= StatBox
+          }
+        }
+      }
+      dir tau0_perf_ptonly_L1TAU100 {
+        dir EFTau {
+          dir BDT {
+            dir 1p_nonCorrected {
+              hist hEFChPiEMEOverCaloEME1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFEMPOverTrkSysP1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFSumPtTrkFrac1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFcentFrac1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFetOverPtLeadTrk1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFinnerTrkAvgDist1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFipSigLeadTrk1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFptRatioEflowApprox1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+            }
+            dir mp_nonCorrected {
+              hist hEFChPiEMEOverCaloEMEMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFEMPOverTrkSysPMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFcentFracMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFdRmaxMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFetOverPtLeadTrkMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFinnerTrkAvgDistMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFmEflowApproxMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFmassTrkSysMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFptRatioEflowApproxMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFtrFlightPathSigMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+            }
+          }
+          hist hEFEMFraction {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFTau
+            display     	= StatBox
+          }
+          hist hEFEt {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFTau
+            display     	= StatBox
+          }
+          hist hEFEtRaw {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFTau
+            display     	= StatBox
+          }
+          hist hEFEtVsEta {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFTau
+            display     	= StatBox
+          }
+          hist hEFEtVsPhi {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFTau
+            display     	= StatBox
+          }
+          hist hEFEta {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFTau
+            display     	= StatBox
+          }
+          hist hEFEtaVsPhi {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFTau
+            display     	= StatBox
+          }
+          hist hEFIsoFrac {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFTau
+            display     	= StatBox
+          }
+          hist hEFNUM {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFTau
+            display     	= StatBox
+          }
+          hist hEFNUMvsmu {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFTau
+            display     	= StatBox
+          }
+          hist hEFPhi {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFTau
+            display     	= StatBox
+          }
+          hist hEFnTrack {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFTau
+            display     	= StatBox
+          }
+          hist hEFnWideTrack {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFTau
+            display     	= StatBox
+          }
+          hist hScore1p {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFTau
+            display     	= StatBox
+          }
+          hist hScoreSigTrans1p {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFTau
+            display     	= StatBox
+          }
+          hist hScoreSigTransmp {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFTau
+            display     	= StatBox
+          }
+          hist hScoremp {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFTau
+            display     	= StatBox
+          }
+        }
+        dir EFVsOffline {
+          dir BDT {
+            dir 1p_nonCorrected {
+              hist hCentFracRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hChPiEMEOverCaloEMERatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hDRmaxRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEMPOverTrkSysPRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEtOverPtLeadTrkRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hInnerTrkAvgDistRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hIpSigLeadTrkRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hPtRatioEflowApproxRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hSumPtTrkFracRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hTopoInvMassRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+            }
+            dir mp_nonCorrected {
+              hist hCentFracRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hChPiEMEOverCaloEMERatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hDRmaxRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEMPOverTrkSysPRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEtOverPtLeadTrkRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hInnerTrkAvgDistRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hMEflowApproxRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hMassTrkSysRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hPtRatioEflowApproxRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hTrFlightPathSigRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+            }
+          }
+          hist hEFvsOffnTrks {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFVsOffline
+            display     	= StatBox
+          }
+          hist hEFvsOffnWideTrks {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/EFVsOffline
+            display     	= StatBox
+          }
+        }
+        dir L1RoI {
+          hist hL1EtVsEta {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/L1RoI
+            display     	= StatBox
+          }
+          hist hL1EtVsPhi {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/L1RoI
+            display     	= StatBox
+          }
+          hist hL1EtaVsPhi {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIEMIso {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIEta {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIHadCore {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIHadIsol {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIPhi {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoITauClus {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoITauClusEMIso {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIeT {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIisol {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/L1RoI
+            display     	= StatBox
+          }
+        }
+        dir L1VsOffline {
+          hist hL1EtRatio {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/L1VsOffline
+            display     	= StatBox
+          }
+        }
+        dir TurnOnCurves {
+          dir RecoEfficiency {
+            hist TProfRecoHLTEtaEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPt1pEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPt3pEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPtEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTMuEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTLBEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTNTrackEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTNVtxEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPhiEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPt1PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPt3PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPtEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1EtaEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPt1PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPt3PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPtEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1MuEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1NTrackEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1NVtxEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1PhiEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1Pt1PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1Pt3PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1PtEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTEtaEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPt1pEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPt3pEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPtEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTMuEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTLBEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTNTrackEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTNVtxEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPhiEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPt1PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPt3PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPtEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1EtaEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPt1PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPt3PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPtEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1MuEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1NTrackEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1NVtxEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1PhiEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1Pt1PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1Pt3PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1PtEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+          }
+        }
+      }
+      dir tau0_perf_ptonly_L1TAU12 {
+        dir EFTau {
+          dir BDT {
+            dir 1p_nonCorrected {
+              hist hEFChPiEMEOverCaloEME1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFEMPOverTrkSysP1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFSumPtTrkFrac1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFcentFrac1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFetOverPtLeadTrk1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFinnerTrkAvgDist1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFipSigLeadTrk1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFptRatioEflowApprox1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+            }
+            dir mp_nonCorrected {
+              hist hEFChPiEMEOverCaloEMEMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFEMPOverTrkSysPMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFcentFracMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFdRmaxMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFetOverPtLeadTrkMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFinnerTrkAvgDistMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFmEflowApproxMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFmassTrkSysMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFptRatioEflowApproxMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFtrFlightPathSigMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+            }
+          }
+          hist hEFEMFraction {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFTau
+            display     	= StatBox
+          }
+          hist hEFEt {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFTau
+            display     	= StatBox
+          }
+          hist hEFEtRaw {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFTau
+            display     	= StatBox
+          }
+          hist hEFEtVsEta {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFTau
+            display     	= StatBox
+          }
+          hist hEFEtVsPhi {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFTau
+            display     	= StatBox
+          }
+          hist hEFEta {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFTau
+            display     	= StatBox
+          }
+          hist hEFEtaVsPhi {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFTau
+            display     	= StatBox
+          }
+          hist hEFIsoFrac {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFTau
+            display     	= StatBox
+          }
+          hist hEFNUM {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFTau
+            display     	= StatBox
+          }
+          hist hEFNUMvsmu {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFTau
+            display     	= StatBox
+          }
+          hist hEFPhi {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFTau
+            display     	= StatBox
+          }
+          hist hEFnTrack {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFTau
+            display     	= StatBox
+          }
+          hist hEFnWideTrack {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFTau
+            display     	= StatBox
+          }
+          hist hScore1p {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFTau
+            display     	= StatBox
+          }
+          hist hScoreSigTrans1p {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFTau
+            display     	= StatBox
+          }
+          hist hScoreSigTransmp {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFTau
+            display     	= StatBox
+          }
+          hist hScoremp {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFTau
+            display     	= StatBox
+          }
+        }
+        dir EFVsOffline {
+          dir BDT {
+            dir 1p_nonCorrected {
+              hist hCentFracRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hChPiEMEOverCaloEMERatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hDRmaxRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEMPOverTrkSysPRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEtOverPtLeadTrkRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hInnerTrkAvgDistRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hIpSigLeadTrkRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hPtRatioEflowApproxRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hSumPtTrkFracRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hTopoInvMassRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+            }
+            dir mp_nonCorrected {
+              hist hCentFracRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hChPiEMEOverCaloEMERatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hDRmaxRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEMPOverTrkSysPRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEtOverPtLeadTrkRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hInnerTrkAvgDistRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hMEflowApproxRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hMassTrkSysRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hPtRatioEflowApproxRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hTrFlightPathSigRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+            }
+          }
+          hist hEFvsOffnTrks {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFVsOffline
+            display     	= StatBox
+          }
+          hist hEFvsOffnWideTrks {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/EFVsOffline
+            display     	= StatBox
+          }
+        }
+        dir L1RoI {
+          hist hL1EtVsEta {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/L1RoI
+            display     	= StatBox
+          }
+          hist hL1EtVsPhi {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/L1RoI
+            display     	= StatBox
+          }
+          hist hL1EtaVsPhi {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIEMIso {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIEta {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIHadCore {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIHadIsol {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIPhi {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoITauClus {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoITauClusEMIso {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIeT {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIisol {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/L1RoI
+            display     	= StatBox
+          }
+        }
+        dir L1VsOffline {
+          hist hL1EtRatio {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/L1VsOffline
+            display     	= StatBox
+          }
+        }
+        dir TurnOnCurves {
+          dir RecoEfficiency {
+            hist TProfRecoHLTEtaEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPt1pEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPt3pEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPtEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTMuEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTLBEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTNTrackEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTNVtxEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPhiEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPt1PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPt3PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPtEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1EtaEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPt1PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPt3PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPtEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1MuEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1NTrackEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1NVtxEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1PhiEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1Pt1PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1Pt3PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1PtEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTEtaEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPt1pEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPt3pEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPtEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTMuEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTLBEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTNTrackEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTNVtxEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPhiEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPt1PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPt3PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPtEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1EtaEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPt1PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPt3PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPtEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1MuEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1NTrackEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1NVtxEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1PhiEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1Pt1PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1Pt3PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1PtEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau0_perf_ptonly_L1TAU12/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+          }
+        }
+      }
+      dir tau160_idperf_tracktwo_L1TAU100 {
+        dir EFTau {
+          dir BDT {
+            dir 1p_nonCorrected {
+              hist hEFChPiEMEOverCaloEME1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFEMPOverTrkSysP1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFSumPtTrkFrac1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFcentFrac1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFetOverPtLeadTrk1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFinnerTrkAvgDist1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFipSigLeadTrk1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFptRatioEflowApprox1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+            }
+            dir mp_nonCorrected {
+              hist hEFChPiEMEOverCaloEMEMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFEMPOverTrkSysPMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFcentFracMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFdRmaxMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFetOverPtLeadTrkMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFinnerTrkAvgDistMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFmEflowApproxMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFmassTrkSysMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFptRatioEflowApproxMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFtrFlightPathSigMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+            }
+          }
+          hist hEFEMFraction {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFTau
+            display     	= StatBox
+          }
+          hist hEFEt {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFTau
+            display     	= StatBox
+          }
+          hist hEFEtRaw {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFTau
+            display     	= StatBox
+          }
+          hist hEFEtVsEta {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFTau
+            display     	= StatBox
+          }
+          hist hEFEtVsPhi {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFTau
+            display     	= StatBox
+          }
+          hist hEFEta {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFTau
+            display     	= StatBox
+          }
+          hist hEFEtaVsPhi {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFTau
+            display     	= StatBox
+          }
+          hist hEFIsoFrac {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFTau
+            display     	= StatBox
+          }
+          hist hEFNUM {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFTau
+            display     	= StatBox
+          }
+          hist hEFNUMvsmu {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFTau
+            display     	= StatBox
+          }
+          hist hEFPhi {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFTau
+            display     	= StatBox
+          }
+          hist hEFnTrack {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFTau
+            display     	= StatBox
+          }
+          hist hEFnWideTrack {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFTau
+            display     	= StatBox
+          }
+          hist hScore1p {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFTau
+            display     	= StatBox
+          }
+          hist hScoreSigTrans1p {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFTau
+            display     	= StatBox
+          }
+          hist hScoreSigTransmp {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFTau
+            display     	= StatBox
+          }
+          hist hScoremp {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFTau
+            display     	= StatBox
+          }
+        }
+        dir EFVsOffline {
+          dir BDT {
+            dir 1p_nonCorrected {
+              hist hCentFracRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hChPiEMEOverCaloEMERatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hDRmaxRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEMPOverTrkSysPRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEtOverPtLeadTrkRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hInnerTrkAvgDistRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hIpSigLeadTrkRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hPtRatioEflowApproxRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hSumPtTrkFracRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hTopoInvMassRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+            }
+            dir mp_nonCorrected {
+              hist hCentFracRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hChPiEMEOverCaloEMERatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hDRmaxRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEMPOverTrkSysPRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEtOverPtLeadTrkRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hInnerTrkAvgDistRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hMEflowApproxRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hMassTrkSysRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hPtRatioEflowApproxRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hTrFlightPathSigRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+            }
+          }
+          hist hEFvsOffnTrks {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFVsOffline
+            display     	= StatBox
+          }
+          hist hEFvsOffnWideTrks {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/EFVsOffline
+            display     	= StatBox
+          }
+        }
+        dir L1RoI {
+          hist hL1EtVsEta {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/L1RoI
+            display     	= StatBox
+          }
+          hist hL1EtVsPhi {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/L1RoI
+            display     	= StatBox
+          }
+          hist hL1EtaVsPhi {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIEMIso {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIEta {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIHadCore {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIHadIsol {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIPhi {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoITauClus {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoITauClusEMIso {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIeT {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIisol {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/L1RoI
+            display     	= StatBox
+          }
+        }
+        dir L1VsOffline {
+          hist hL1EtRatio {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/L1VsOffline
+            display     	= StatBox
+          }
+        }
+        dir PreselectionTau {
+          hist hEFEt {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/PreselectionTau
+            display     	= StatBox
+          }
+          hist hEFEt2 {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/PreselectionTau
+            display     	= StatBox
+          }
+          hist hEFEtaVsPhi {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/PreselectionTau
+            display     	= StatBox
+          }
+          hist hEtVsEta {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/PreselectionTau
+            display     	= StatBox
+          }
+          hist hEtVsPhi {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/PreselectionTau
+            display     	= StatBox
+          }
+          hist hEta {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/PreselectionTau
+            display     	= StatBox
+          }
+          hist hFTFnTrack {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/PreselectionTau
+            display     	= StatBox
+          }
+          hist hFTFnWideTrack {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/PreselectionTau
+            display     	= StatBox
+          }
+          hist hPhi {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/PreselectionTau
+            display     	= StatBox
+          }
+        }
+        dir PreselectionVsOffline {
+          hist hEFEtRatio {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/PreselectionVsOffline
+            display     	= StatBox
+          }
+          hist hEtaRatio {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/PreselectionVsOffline
+            display     	= StatBox
+          }
+          hist hPhiRatio {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/PreselectionVsOffline
+            display     	= StatBox
+          }
+          hist hPreselvsOffnTrks {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/PreselectionVsOffline
+            display     	= StatBox
+          }
+          hist hPreselvsOffnWideTrks {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/PreselectionVsOffline
+            display     	= StatBox
+          }
+        }
+        dir TurnOnCurves {
+          dir RecoEfficiency {
+            hist TProfRecoHLTEtaEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPt1pEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPt3pEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPtEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTMuEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTLBEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTNTrackEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTNVtxEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPhiEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPt1PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPt3PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPtEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1EtaEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPt1PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPt3PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPtEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1MuEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1NTrackEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1NVtxEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1PhiEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1Pt1PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1Pt3PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1PtEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTEtaEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPt1pEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPt3pEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPtEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTMuEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTLBEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTNTrackEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTNVtxEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPhiEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPt1PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPt3PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPtEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1EtaEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPt1PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPt3PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPtEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1MuEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1NTrackEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1NVtxEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1PhiEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1Pt1PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1Pt3PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1PtEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_idperf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+          }
+        }
+      }
+      dir tau160_medium1_tracktwo_L1TAU100 {
+        dir EFTau {
+          dir BDT {
+            dir 1p_nonCorrected {
+              hist hEFChPiEMEOverCaloEME1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFEMPOverTrkSysP1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFSumPtTrkFrac1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFcentFrac1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFetOverPtLeadTrk1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFinnerTrkAvgDist1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFipSigLeadTrk1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFptRatioEflowApprox1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+            }
+            dir mp_nonCorrected {
+              hist hEFChPiEMEOverCaloEMEMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFEMPOverTrkSysPMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFcentFracMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFdRmaxMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFetOverPtLeadTrkMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFinnerTrkAvgDistMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFmEflowApproxMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFmassTrkSysMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFptRatioEflowApproxMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFtrFlightPathSigMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+            }
+          }
+          hist hEFEMFraction {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFTau
+            display     	= StatBox
+          }
+          hist hEFEt {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFTau
+            display     	= StatBox
+          }
+          hist hEFEtRaw {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFTau
+            display     	= StatBox
+          }
+          hist hEFEtVsEta {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFTau
+            display     	= StatBox
+          }
+          hist hEFEtVsPhi {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFTau
+            display     	= StatBox
+          }
+          hist hEFEta {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFTau
+            display     	= StatBox
+          }
+          hist hEFEtaVsPhi {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFTau
+            display     	= StatBox
+          }
+          hist hEFIsoFrac {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFTau
+            display     	= StatBox
+          }
+          hist hEFNUM {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFTau
+            display     	= StatBox
+          }
+          hist hEFNUMvsmu {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFTau
+            display     	= StatBox
+          }
+          hist hEFPhi {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFTau
+            display     	= StatBox
+          }
+          hist hEFnTrack {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFTau
+            display     	= StatBox
+          }
+          hist hEFnWideTrack {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFTau
+            display     	= StatBox
+          }
+          hist hScore1p {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFTau
+            display     	= StatBox
+          }
+          hist hScoreSigTrans1p {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFTau
+            display     	= StatBox
+          }
+          hist hScoreSigTransmp {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFTau
+            display     	= StatBox
+          }
+          hist hScoremp {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFTau
+            display     	= StatBox
+          }
+        }
+        dir EFVsOffline {
+          dir BDT {
+            dir 1p_nonCorrected {
+              hist hCentFracRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hChPiEMEOverCaloEMERatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hDRmaxRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEMPOverTrkSysPRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEtOverPtLeadTrkRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hInnerTrkAvgDistRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hIpSigLeadTrkRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hPtRatioEflowApproxRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hSumPtTrkFracRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hTopoInvMassRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+            }
+            dir mp_nonCorrected {
+              hist hCentFracRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hChPiEMEOverCaloEMERatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hDRmaxRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEMPOverTrkSysPRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEtOverPtLeadTrkRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hInnerTrkAvgDistRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hMEflowApproxRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hMassTrkSysRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hPtRatioEflowApproxRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hTrFlightPathSigRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+            }
+          }
+          hist hEFvsOffnTrks {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFVsOffline
+            display     	= StatBox
+          }
+          hist hEFvsOffnWideTrks {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/EFVsOffline
+            display     	= StatBox
+          }
+        }
+        dir L1RoI {
+          hist hL1EtVsEta {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/L1RoI
+            display     	= StatBox
+          }
+          hist hL1EtVsPhi {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/L1RoI
+            display     	= StatBox
+          }
+          hist hL1EtaVsPhi {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIEMIso {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIEta {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIHadCore {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIHadIsol {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIPhi {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoITauClus {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoITauClusEMIso {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIeT {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIisol {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/L1RoI
+            display     	= StatBox
+          }
+        }
+        dir L1VsOffline {
+          hist hL1EtRatio {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/L1VsOffline
+            display     	= StatBox
+          }
+        }
+        dir PreselectionTau {
+          hist hEFEt {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/PreselectionTau
+            display     	= StatBox
+          }
+          hist hEFEt2 {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/PreselectionTau
+            display     	= StatBox
+          }
+          hist hEFEtaVsPhi {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/PreselectionTau
+            display     	= StatBox
+          }
+          hist hEtVsEta {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/PreselectionTau
+            display     	= StatBox
+          }
+          hist hEtVsPhi {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/PreselectionTau
+            display     	= StatBox
+          }
+          hist hEta {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/PreselectionTau
+            display     	= StatBox
+          }
+          hist hFTFnTrack {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/PreselectionTau
+            display     	= StatBox
+          }
+          hist hFTFnWideTrack {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/PreselectionTau
+            display     	= StatBox
+          }
+          hist hPhi {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/PreselectionTau
+            display     	= StatBox
+          }
+        }
+        dir PreselectionVsOffline {
+          hist hEFEtRatio {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/PreselectionVsOffline
+            display     	= StatBox
+          }
+          hist hEtaRatio {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/PreselectionVsOffline
+            display     	= StatBox
+          }
+          hist hPhiRatio {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/PreselectionVsOffline
+            display     	= StatBox
+          }
+          hist hPreselvsOffnTrks {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/PreselectionVsOffline
+            display     	= StatBox
+          }
+          hist hPreselvsOffnWideTrks {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/PreselectionVsOffline
+            display     	= StatBox
+          }
+        }
+        dir TurnOnCurves {
+          dir RecoEfficiency {
+            hist TProfRecoHLTEtaEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPt1pEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPt3pEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPtEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTMuEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTLBEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTNTrackEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTNVtxEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPhiEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPt1PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPt3PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPtEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1EtaEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPt1PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPt3PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPtEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1MuEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1NTrackEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1NVtxEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1PhiEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1Pt1PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1Pt3PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1PtEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTEtaEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPt1pEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPt3pEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPtEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTMuEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTLBEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTNTrackEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTNVtxEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPhiEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPt1PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPt3PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPtEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1EtaEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPt1PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPt3PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPtEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1MuEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1NTrackEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1NVtxEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1PhiEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1Pt1PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1Pt3PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1PtEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_medium1_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+          }
+        }
+      }
+      dir tau160_perf_tracktwo_L1TAU100 {
+        dir EFTau {
+          dir BDT {
+            dir 1p_nonCorrected {
+              hist hEFChPiEMEOverCaloEME1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFEMPOverTrkSysP1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFSumPtTrkFrac1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFcentFrac1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFetOverPtLeadTrk1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFinnerTrkAvgDist1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFipSigLeadTrk1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFptRatioEflowApprox1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+            }
+            dir mp_nonCorrected {
+              hist hEFChPiEMEOverCaloEMEMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFEMPOverTrkSysPMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFcentFracMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFdRmaxMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFetOverPtLeadTrkMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFinnerTrkAvgDistMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFmEflowApproxMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFmassTrkSysMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFptRatioEflowApproxMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFtrFlightPathSigMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+            }
+          }
+          hist hEFEMFraction {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFTau
+            display     	= StatBox
+          }
+          hist hEFEt {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFTau
+            display     	= StatBox
+          }
+          hist hEFEtRaw {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFTau
+            display     	= StatBox
+          }
+          hist hEFEtVsEta {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFTau
+            display     	= StatBox
+          }
+          hist hEFEtVsPhi {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFTau
+            display     	= StatBox
+          }
+          hist hEFEta {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFTau
+            display     	= StatBox
+          }
+          hist hEFEtaVsPhi {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFTau
+            display     	= StatBox
+          }
+          hist hEFIsoFrac {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFTau
+            display     	= StatBox
+          }
+          hist hEFNUM {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFTau
+            display     	= StatBox
+          }
+          hist hEFNUMvsmu {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFTau
+            display     	= StatBox
+          }
+          hist hEFPhi {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFTau
+            display     	= StatBox
+          }
+          hist hEFnTrack {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFTau
+            display     	= StatBox
+          }
+          hist hEFnWideTrack {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFTau
+            display     	= StatBox
+          }
+          hist hScore1p {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFTau
+            display     	= StatBox
+          }
+          hist hScoreSigTrans1p {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFTau
+            display     	= StatBox
+          }
+          hist hScoreSigTransmp {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFTau
+            display     	= StatBox
+          }
+          hist hScoremp {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFTau
+            display     	= StatBox
+          }
+        }
+        dir EFVsOffline {
+          dir BDT {
+            dir 1p_nonCorrected {
+              hist hCentFracRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hChPiEMEOverCaloEMERatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hDRmaxRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEMPOverTrkSysPRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEtOverPtLeadTrkRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hInnerTrkAvgDistRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hIpSigLeadTrkRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hPtRatioEflowApproxRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hSumPtTrkFracRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hTopoInvMassRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+            }
+            dir mp_nonCorrected {
+              hist hCentFracRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hChPiEMEOverCaloEMERatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hDRmaxRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEMPOverTrkSysPRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEtOverPtLeadTrkRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hInnerTrkAvgDistRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hMEflowApproxRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hMassTrkSysRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hPtRatioEflowApproxRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hTrFlightPathSigRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+            }
+          }
+          hist hEFvsOffnTrks {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFVsOffline
+            display     	= StatBox
+          }
+          hist hEFvsOffnWideTrks {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/EFVsOffline
+            display     	= StatBox
+          }
+        }
+        dir L1RoI {
+          hist hL1EtVsEta {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/L1RoI
+            display     	= StatBox
+          }
+          hist hL1EtVsPhi {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/L1RoI
+            display     	= StatBox
+          }
+          hist hL1EtaVsPhi {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIEMIso {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIEta {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIHadCore {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIHadIsol {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIPhi {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoITauClus {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoITauClusEMIso {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIeT {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIisol {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/L1RoI
+            display     	= StatBox
+          }
+        }
+        dir L1VsOffline {
+          hist hL1EtRatio {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/L1VsOffline
+            display     	= StatBox
+          }
+        }
+        dir PreselectionTau {
+          hist hEFEt {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/PreselectionTau
+            display     	= StatBox
+          }
+          hist hEFEt2 {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/PreselectionTau
+            display     	= StatBox
+          }
+          hist hEFEtaVsPhi {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/PreselectionTau
+            display     	= StatBox
+          }
+          hist hEtVsEta {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/PreselectionTau
+            display     	= StatBox
+          }
+          hist hEtVsPhi {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/PreselectionTau
+            display     	= StatBox
+          }
+          hist hEta {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/PreselectionTau
+            display     	= StatBox
+          }
+          hist hFTFnTrack {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/PreselectionTau
+            display     	= StatBox
+          }
+          hist hFTFnWideTrack {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/PreselectionTau
+            display     	= StatBox
+          }
+          hist hPhi {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/PreselectionTau
+            display     	= StatBox
+          }
+        }
+        dir PreselectionVsOffline {
+          hist hEFEtRatio {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/PreselectionVsOffline
+            display     	= StatBox
+          }
+          hist hEtaRatio {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/PreselectionVsOffline
+            display     	= StatBox
+          }
+          hist hPhiRatio {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/PreselectionVsOffline
+            display     	= StatBox
+          }
+          hist hPreselvsOffnTrks {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/PreselectionVsOffline
+            display     	= StatBox
+          }
+          hist hPreselvsOffnWideTrks {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/PreselectionVsOffline
+            display     	= StatBox
+          }
+        }
+        dir TurnOnCurves {
+          dir RecoEfficiency {
+            hist TProfRecoHLTEtaEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPt1pEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPt3pEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPtEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTMuEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTLBEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTNTrackEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTNVtxEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPhiEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPt1PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPt3PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPtEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1EtaEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPt1PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPt3PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPtEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1MuEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1NTrackEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1NVtxEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1PhiEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1Pt1PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1Pt3PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1PtEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTEtaEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPt1pEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPt3pEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPtEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTMuEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTLBEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTNTrackEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTNVtxEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPhiEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPt1PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPt3PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPtEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1EtaEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPt1PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPt3PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPtEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1MuEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1NTrackEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1NVtxEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1PhiEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1Pt1PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1Pt3PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1PtEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau160_perf_tracktwo_L1TAU100/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+          }
+        }
+      }
+      dir tau25_idperf_tracktwo {
+        dir EFTau {
+          dir BDT {
+            dir 1p_nonCorrected {
+              hist hEFChPiEMEOverCaloEME1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFEMPOverTrkSysP1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFSumPtTrkFrac1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFcentFrac1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFetOverPtLeadTrk1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFinnerTrkAvgDist1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFipSigLeadTrk1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFptRatioEflowApprox1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+            }
+            dir mp_nonCorrected {
+              hist hEFChPiEMEOverCaloEMEMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFEMPOverTrkSysPMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFcentFracMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFdRmaxMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFetOverPtLeadTrkMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFinnerTrkAvgDistMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFmEflowApproxMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFmassTrkSysMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFptRatioEflowApproxMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFtrFlightPathSigMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+            }
+          }
+          hist hEFEMFraction {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFTau
+            display     	= StatBox
+          }
+          hist hEFEt {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFTau
+            display     	= StatBox
+          }
+          hist hEFEtRaw {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFTau
+            display     	= StatBox
+          }
+          hist hEFEtVsEta {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFTau
+            display     	= StatBox
+          }
+          hist hEFEtVsPhi {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFTau
+            display     	= StatBox
+          }
+          hist hEFEta {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFTau
+            display     	= StatBox
+          }
+          hist hEFEtaVsPhi {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFTau
+            display     	= StatBox
+          }
+          hist hEFIsoFrac {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFTau
+            display     	= StatBox
+          }
+          hist hEFNUM {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFTau
+            display     	= StatBox
+          }
+          hist hEFNUMvsmu {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFTau
+            display     	= StatBox
+          }
+          hist hEFPhi {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFTau
+            display     	= StatBox
+          }
+          hist hEFnTrack {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFTau
+            display     	= StatBox
+          }
+          hist hEFnWideTrack {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFTau
+            display     	= StatBox
+          }
+          hist hScore1p {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFTau
+            display     	= StatBox
+          }
+          hist hScoreSigTrans1p {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFTau
+            display     	= StatBox
+          }
+          hist hScoreSigTransmp {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFTau
+            display     	= StatBox
+          }
+          hist hScoremp {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFTau
+            display     	= StatBox
+          }
+        }
+        dir EFVsOffline {
+          dir BDT {
+            dir 1p_nonCorrected {
+              hist hCentFracRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hChPiEMEOverCaloEMERatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hDRmaxRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEMPOverTrkSysPRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEtOverPtLeadTrkRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hInnerTrkAvgDistRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hIpSigLeadTrkRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hPtRatioEflowApproxRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hSumPtTrkFracRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hTopoInvMassRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+            }
+            dir mp_nonCorrected {
+              hist hCentFracRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hChPiEMEOverCaloEMERatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hDRmaxRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEMPOverTrkSysPRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEtOverPtLeadTrkRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hInnerTrkAvgDistRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hMEflowApproxRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hMassTrkSysRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hPtRatioEflowApproxRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hTrFlightPathSigRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+            }
+          }
+          hist hEFvsOffnTrks {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFVsOffline
+            display     	= StatBox
+          }
+          hist hEFvsOffnWideTrks {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/EFVsOffline
+            display     	= StatBox
+          }
+        }
+        dir L1RoI {
+          hist hL1EtVsEta {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/L1RoI
+            display     	= StatBox
+          }
+          hist hL1EtVsPhi {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/L1RoI
+            display     	= StatBox
+          }
+          hist hL1EtaVsPhi {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIEMIso {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIEta {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIHadCore {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIHadIsol {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIPhi {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoITauClus {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoITauClusEMIso {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIeT {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIisol {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/L1RoI
+            display     	= StatBox
+          }
+        }
+        dir L1VsOffline {
+          hist hL1EtRatio {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/L1VsOffline
+            display     	= StatBox
+          }
+        }
+        dir PreselectionTau {
+          hist hEFEt {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/PreselectionTau
+            display     	= StatBox
+          }
+          hist hEFEt2 {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/PreselectionTau
+            display     	= StatBox
+          }
+          hist hEFEtaVsPhi {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/PreselectionTau
+            display     	= StatBox
+          }
+          hist hEtVsEta {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/PreselectionTau
+            display     	= StatBox
+          }
+          hist hEtVsPhi {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/PreselectionTau
+            display     	= StatBox
+          }
+          hist hEta {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/PreselectionTau
+            display     	= StatBox
+          }
+          hist hFTFnTrack {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/PreselectionTau
+            display     	= StatBox
+          }
+          hist hFTFnWideTrack {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/PreselectionTau
+            display     	= StatBox
+          }
+          hist hPhi {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/PreselectionTau
+            display     	= StatBox
+          }
+        }
+        dir PreselectionVsOffline {
+          hist hEFEtRatio {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/PreselectionVsOffline
+            display     	= StatBox
+          }
+          hist hEtaRatio {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/PreselectionVsOffline
+            display     	= StatBox
+          }
+          hist hPhiRatio {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/PreselectionVsOffline
+            display     	= StatBox
+          }
+          hist hPreselvsOffnTrks {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/PreselectionVsOffline
+            display     	= StatBox
+          }
+          hist hPreselvsOffnWideTrks {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/PreselectionVsOffline
+            display     	= StatBox
+          }
+        }
+        dir TurnOnCurves {
+          dir RecoEfficiency {
+            hist TProfRecoHLTEtaEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPt1pEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPt3pEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPtEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTMuEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTLBEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTNTrackEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTNVtxEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPhiEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPt1PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPt3PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPtEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1EtaEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPt1PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPt3PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPtEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1MuEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1NTrackEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1NVtxEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1PhiEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1Pt1PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1Pt3PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1PtEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTEtaEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPt1pEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPt3pEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPtEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTMuEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTLBEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTNTrackEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTNVtxEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPhiEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPt1PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPt3PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPtEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1EtaEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPt1PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPt3PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPtEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1MuEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1NTrackEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1NVtxEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1PhiEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1Pt1PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1Pt3PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1PtEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+          }
+        }
+      }
+      dir tau25_idperf_tracktwoEF {
+        dir EFTau {
+          dir BDT {
+            dir 1p_nonCorrected {
+              hist hEFChPiEMEOverCaloEME1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFEMPOverTrkSysP1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFSumPtTrkFrac1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFcentFrac1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFetOverPtLeadTrk1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFinnerTrkAvgDist1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFipSigLeadTrk1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFptRatioEflowApprox1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+            }
+            dir mp_nonCorrected {
+              hist hEFChPiEMEOverCaloEMEMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFEMPOverTrkSysPMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFcentFracMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFdRmaxMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFetOverPtLeadTrkMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFinnerTrkAvgDistMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFmEflowApproxMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFmassTrkSysMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFptRatioEflowApproxMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFtrFlightPathSigMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+            }
+          }
+          hist hEFEMFraction {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFTau
+            display     	= StatBox
+          }
+          hist hEFEt {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFTau
+            display     	= StatBox
+          }
+          hist hEFEtRaw {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFTau
+            display     	= StatBox
+          }
+          hist hEFEtVsEta {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFTau
+            display     	= StatBox
+          }
+          hist hEFEtVsPhi {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFTau
+            display     	= StatBox
+          }
+          hist hEFEta {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFTau
+            display     	= StatBox
+          }
+          hist hEFEtaVsPhi {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFTau
+            display     	= StatBox
+          }
+          hist hEFIsoFrac {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFTau
+            display     	= StatBox
+          }
+          hist hEFNUM {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFTau
+            display     	= StatBox
+          }
+          hist hEFNUMvsmu {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFTau
+            display     	= StatBox
+          }
+          hist hEFPhi {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFTau
+            display     	= StatBox
+          }
+          hist hEFnTrack {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFTau
+            display     	= StatBox
+          }
+          hist hEFnWideTrack {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFTau
+            display     	= StatBox
+          }
+          hist hScore1p {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFTau
+            display     	= StatBox
+          }
+          hist hScoreSigTrans1p {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFTau
+            display     	= StatBox
+          }
+          hist hScoreSigTransmp {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFTau
+            display     	= StatBox
+          }
+          hist hScoremp {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFTau
+            display     	= StatBox
+          }
+        }
+        dir EFVsOffline {
+          dir BDT {
+            dir 1p_nonCorrected {
+              hist hCentFracRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hChPiEMEOverCaloEMERatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hDRmaxRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEMPOverTrkSysPRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEtOverPtLeadTrkRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hInnerTrkAvgDistRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hIpSigLeadTrkRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hPtRatioEflowApproxRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hSumPtTrkFracRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hTopoInvMassRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+            }
+            dir mp_nonCorrected {
+              hist hCentFracRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hChPiEMEOverCaloEMERatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hDRmaxRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEMPOverTrkSysPRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEtOverPtLeadTrkRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hInnerTrkAvgDistRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hMEflowApproxRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hMassTrkSysRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hPtRatioEflowApproxRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hTrFlightPathSigRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+            }
+          }
+          hist hEFvsOffnTrks {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFVsOffline
+            display     	= StatBox
+          }
+          hist hEFvsOffnWideTrks {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/EFVsOffline
+            display     	= StatBox
+          }
+        }
+        dir L1RoI {
+          hist hL1EtVsEta {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/L1RoI
+            display     	= StatBox
+          }
+          hist hL1EtVsPhi {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/L1RoI
+            display     	= StatBox
+          }
+          hist hL1EtaVsPhi {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIEMIso {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIEta {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIHadCore {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIHadIsol {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIPhi {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoITauClus {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoITauClusEMIso {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIeT {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIisol {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/L1RoI
+            display     	= StatBox
+          }
+        }
+        dir L1VsOffline {
+          hist hL1EtRatio {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/L1VsOffline
+            display     	= StatBox
+          }
+        }
+        dir TurnOnCurves {
+          dir RecoEfficiency {
+            hist TProfRecoHLTEtaEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPt1pEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPt3pEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPtEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTMuEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTLBEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTNTrackEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTNVtxEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPhiEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPt1PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPt3PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPtEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1EtaEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPt1PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPt3PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPtEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1MuEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1NTrackEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1NVtxEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1PhiEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1Pt1PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1Pt3PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1PtEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTEtaEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPt1pEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPt3pEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPtEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTMuEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTLBEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTNTrackEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTNVtxEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPhiEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPt1PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPt3PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPtEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1EtaEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPt1PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPt3PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPtEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1MuEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1NTrackEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1NVtxEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1PhiEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1Pt1PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1Pt3PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1PtEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+          }
+        }
+      }
+      dir tau25_idperf_tracktwoEFmvaTES {
+        dir EFTau {
+          dir BDT {
+            dir 1p_nonCorrected {
+              hist hEFChPiEMEOverCaloEME1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFEMPOverTrkSysP1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFSumPtTrkFrac1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFcentFrac1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFetOverPtLeadTrk1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFinnerTrkAvgDist1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFipSigLeadTrk1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFptRatioEflowApprox1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+            }
+            dir mp_nonCorrected {
+              hist hEFChPiEMEOverCaloEMEMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFEMPOverTrkSysPMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFcentFracMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFdRmaxMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFetOverPtLeadTrkMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFinnerTrkAvgDistMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFmEflowApproxMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFmassTrkSysMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFptRatioEflowApproxMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFtrFlightPathSigMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+            }
+          }
+          hist hEFEMFraction {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFTau
+            display     	= StatBox
+          }
+          hist hEFEt {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFTau
+            display     	= StatBox
+          }
+          hist hEFEtRaw {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFTau
+            display     	= StatBox
+          }
+          hist hEFEtVsEta {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFTau
+            display     	= StatBox
+          }
+          hist hEFEtVsPhi {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFTau
+            display     	= StatBox
+          }
+          hist hEFEta {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFTau
+            display     	= StatBox
+          }
+          hist hEFEtaVsPhi {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFTau
+            display     	= StatBox
+          }
+          hist hEFIsoFrac {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFTau
+            display     	= StatBox
+          }
+          hist hEFNUM {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFTau
+            display     	= StatBox
+          }
+          hist hEFNUMvsmu {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFTau
+            display     	= StatBox
+          }
+          hist hEFPhi {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFTau
+            display     	= StatBox
+          }
+          hist hEFnTrack {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFTau
+            display     	= StatBox
+          }
+          hist hEFnWideTrack {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFTau
+            display     	= StatBox
+          }
+          hist hScore1p {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFTau
+            display     	= StatBox
+          }
+          hist hScoreSigTrans1p {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFTau
+            display     	= StatBox
+          }
+          hist hScoreSigTransmp {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFTau
+            display     	= StatBox
+          }
+          hist hScoremp {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFTau
+            display     	= StatBox
+          }
+        }
+        dir EFVsOffline {
+          dir BDT {
+            dir 1p_nonCorrected {
+              hist hCentFracRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hChPiEMEOverCaloEMERatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hDRmaxRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEMPOverTrkSysPRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEtOverPtLeadTrkRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hInnerTrkAvgDistRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hIpSigLeadTrkRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hPtRatioEflowApproxRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hSumPtTrkFracRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hTopoInvMassRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+            }
+            dir mp_nonCorrected {
+              hist hCentFracRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hChPiEMEOverCaloEMERatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hDRmaxRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEMPOverTrkSysPRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEtOverPtLeadTrkRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hInnerTrkAvgDistRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hMEflowApproxRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hMassTrkSysRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hPtRatioEflowApproxRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hTrFlightPathSigRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+            }
+          }
+          hist hEFvsOffnTrks {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFVsOffline
+            display     	= StatBox
+          }
+          hist hEFvsOffnWideTrks {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/EFVsOffline
+            display     	= StatBox
+          }
+        }
+        dir L1RoI {
+          hist hL1EtVsEta {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/L1RoI
+            display     	= StatBox
+          }
+          hist hL1EtVsPhi {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/L1RoI
+            display     	= StatBox
+          }
+          hist hL1EtaVsPhi {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIEMIso {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIEta {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIHadCore {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIHadIsol {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIPhi {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoITauClus {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoITauClusEMIso {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIeT {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIisol {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/L1RoI
+            display     	= StatBox
+          }
+        }
+        dir L1VsOffline {
+          hist hL1EtRatio {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/L1VsOffline
+            display     	= StatBox
+          }
+        }
+        dir TurnOnCurves {
+          dir RecoEfficiency {
+            hist TProfRecoHLTEtaEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPt1pEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPt3pEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPtEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTMuEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTLBEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTNTrackEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTNVtxEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPhiEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPt1PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPt3PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPtEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1EtaEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPt1PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPt3PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPtEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1MuEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1NTrackEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1NVtxEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1PhiEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1Pt1PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1Pt3PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1PtEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTEtaEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPt1pEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPt3pEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPtEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTMuEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTLBEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTNTrackEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTNVtxEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPhiEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPt1PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPt3PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPtEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1EtaEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPt1PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPt3PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPtEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1MuEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1NTrackEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1NVtxEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1PhiEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1Pt1PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1Pt3PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1PtEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+          }
+        }
+      }
+      dir tau25_idperf_tracktwoMVA {
+        dir EFTau {
+          dir BDT {
+            dir 1p_nonCorrected {
+              hist hEFChPiEMEOverCaloEME1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFEMPOverTrkSysP1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFSumPtTrkFrac1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFcentFrac1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFetOverPtLeadTrk1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFinnerTrkAvgDist1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFipSigLeadTrk1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFptRatioEflowApprox1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+            }
+            dir mp_nonCorrected {
+              hist hEFChPiEMEOverCaloEMEMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFEMPOverTrkSysPMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFcentFracMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFdRmaxMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFetOverPtLeadTrkMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFinnerTrkAvgDistMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFmEflowApproxMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFmassTrkSysMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFptRatioEflowApproxMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFtrFlightPathSigMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+            }
+          }
+          dir RNN {
+            dir InputScalar1p {
+              hist hEFRNNInput_Scalar_EMPOverTrkSysP_log_1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau/RNN/InputScalar1p
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Scalar_SumPtTrkFrac_1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau/RNN/InputScalar1p
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Scalar_absipSigLeadTrk_1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau/RNN/InputScalar1p
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Scalar_centFrac_1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau/RNN/InputScalar1p
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Scalar_dRmax_1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau/RNN/InputScalar1p
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Scalar_etOverPtLeadTrk_log_1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau/RNN/InputScalar1p
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Scalar_mEflowApprox_log_1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau/RNN/InputScalar1p
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Scalar_ptDetectorAxis_log_1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau/RNN/InputScalar1p
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Scalar_ptRatioEflowApprox_1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau/RNN/InputScalar1p
+                display     	= StatBox
+              }
+            }
+            dir InputScalar3p {
+              hist hEFRNNInput_Scalar_EMPOverTrkSysP_log_3P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau/RNN/InputScalar3p
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Scalar_SumPtTrkFrac_3P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau/RNN/InputScalar3p
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Scalar_centFrac_3P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau/RNN/InputScalar3p
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Scalar_dRmax_3P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau/RNN/InputScalar3p
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Scalar_etOverPtLeadTrk_log_3P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau/RNN/InputScalar3p
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Scalar_mEflowApprox_log_3P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau/RNN/InputScalar3p
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Scalar_massTrkSys_log_3P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau/RNN/InputScalar3p
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Scalar_ptDetectorAxis_log_3P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau/RNN/InputScalar3p
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Scalar_ptRatioEflowApprox_3P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau/RNN/InputScalar3p
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Scalar_trFlightPathSig_log_3P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau/RNN/InputScalar3p
+                display     	= StatBox
+              }
+            }
+            dir InputTrack {
+              hist hEFRNNInput_Track_pt_log {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau/RNN/InputTrack
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Track_pt_jetseed_log {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau/RNN/InputTrack
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Track_dEta {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau/RNN/InputTrack
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Track_dPhi {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau/RNN/InputTrack
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Track_d0_abs_log {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau/RNN/InputTrack
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Track_z0sinThetaTJVA_abs_log {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau/RNN/InputTrack
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Track_nIBLHitsAndExp {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau/RNN/InputTrack
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Track_nPixelHitsPlusDeadSensors {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau/RNN/InputTrack
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Track_nSCTHitsPlusDeadSensors {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau/RNN/InputTrack
+                display     	= StatBox
+              }
+            }
+            dir InputCluster {
+              hist hEFRNNInput_Cluster_et_log {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau/RNN/InputCluster
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Cluster_pt_jetseed_log {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau/RNN/InputCluster
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Cluster_dEta {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau/RNN/InputCluster
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Cluster_dPhi {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau/RNN/InputCluster
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Cluster_SECOND_R_log10 {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau/RNN/InputCluster
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Cluster_SECOND_LAMBDA_log10 {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau/RNN/InputCluster
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Cluster_CENTER_LAMBDA_log10 {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau/RNN/InputCluster
+                display     	= StatBox
+              }
+            }
+            dir Output {
+              hist hEFRNNJetScore_0P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau/RNN/Output
+                display     	= StatBox
+              }
+              hist hEFRNNJetScore_1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau/RNN/Output
+                display     	= StatBox
+              }
+              hist hEFRNNJetScore_3P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau/RNN/Output
+                display     	= StatBox
+              }
+              hist hEFRNNJetScoreSigTrans_0P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau/RNN/Output
+                display     	= StatBox
+              }
+              hist hEFRNNJetScoreSigTrans_1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau/RNN/Output
+                display     	= StatBox
+              }
+              hist hEFRNNJetScoreSigTrans_3P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau/RNN/Output
+                display     	= StatBox
+              }
+            }
+          }
+          hist hEFEMFraction {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau
+            display     	= StatBox
+          }
+          hist hEFEt {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau
+            display     	= StatBox
+          }
+          hist hEFEtRaw {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau
+            display     	= StatBox
+          }
+          hist hEFEtVsEta {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau
+            display     	= StatBox
+          }
+          hist hEFEtVsPhi {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau
+            display     	= StatBox
+          }
+          hist hEFEta {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau
+            display     	= StatBox
+          }
+          hist hEFEtaVsPhi {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau
+            display     	= StatBox
+          }
+          hist hEFIsoFrac {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau
+            display     	= StatBox
+          }
+          hist hEFNUM {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau
+            display     	= StatBox
+          }
+          hist hEFNUMvsmu {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau
+            display     	= StatBox
+          }
+          hist hEFPhi {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau
+            display     	= StatBox
+          }
+          hist hEFnTrack {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau
+            display     	= StatBox
+          }
+          hist hEFnWideTrack {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau
+            display     	= StatBox
+          }
+          hist hScore1p {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau
+            display     	= StatBox
+          }
+          hist hScoreSigTrans1p {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau
+            display     	= StatBox
+          }
+          hist hScoreSigTransmp {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau
+            display     	= StatBox
+          }
+          hist hScoremp {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFTau
+            display     	= StatBox
+          }
+        }
+        dir EFVsOffline {
+          dir BDT {
+            dir 1p_nonCorrected {
+              hist hCentFracRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hChPiEMEOverCaloEMERatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hDRmaxRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEMPOverTrkSysPRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEtOverPtLeadTrkRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hInnerTrkAvgDistRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hIpSigLeadTrkRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hPtRatioEflowApproxRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hSumPtTrkFracRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hTopoInvMassRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+            }
+            dir mp_nonCorrected {
+              hist hCentFracRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hChPiEMEOverCaloEMERatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hDRmaxRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEMPOverTrkSysPRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEtOverPtLeadTrkRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hInnerTrkAvgDistRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hMEflowApproxRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hMassTrkSysRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hPtRatioEflowApproxRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hTrFlightPathSigRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+            }
+          }
+          hist hEFvsOffnTrks {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFVsOffline
+            display     	= StatBox
+          }
+          hist hEFvsOffnWideTrks {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/EFVsOffline
+            display     	= StatBox
+          }
+        }
+        dir L1RoI {
+          hist hL1EtVsEta {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/L1RoI
+            display     	= StatBox
+          }
+          hist hL1EtVsPhi {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/L1RoI
+            display     	= StatBox
+          }
+          hist hL1EtaVsPhi {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIEMIso {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIEta {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIHadCore {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIHadIsol {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIPhi {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoITauClus {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoITauClusEMIso {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIeT {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIisol {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/L1RoI
+            display     	= StatBox
+          }
+        }
+        dir L1VsOffline {
+          hist hL1EtRatio {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/L1VsOffline
+            display     	= StatBox
+          }
+        }
+        dir TurnOnCurves {
+          dir RecoEfficiency {
+            hist TProfRecoHLTEtaEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPt1pEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPt3pEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPtEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTMuEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTLBEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTNTrackEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTNVtxEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPhiEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPt1PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPt3PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPtEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1EtaEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPt1PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPt3PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPtEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1MuEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1NTrackEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1NVtxEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1PhiEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1Pt1PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1Pt3PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1PtEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTEtaEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPt1pEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPt3pEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPtEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTMuEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTLBEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTNTrackEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTNVtxEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPhiEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPt1PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPt3PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPtEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1EtaEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPt1PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPt3PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPtEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1MuEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1NTrackEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1NVtxEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1PhiEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1Pt1PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1Pt3PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1PtEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_idperf_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+          }
+        }
+      }
+      dir tau25_looseRNN_tracktwoMVA {
+        dir EFTau {
+          dir RNN {
+            dir InputScalar1p {
+              hist hEFRNNInput_Scalar_EMPOverTrkSysP_log_1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/EFTau/RNN/InputScalar1p
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Scalar_SumPtTrkFrac_1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/EFTau/RNN/InputScalar1p
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Scalar_absipSigLeadTrk_1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/EFTau/RNN/InputScalar1p
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Scalar_centFrac_1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/EFTau/RNN/InputScalar1p
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Scalar_dRmax_1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/EFTau/RNN/InputScalar1p
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Scalar_etOverPtLeadTrk_log_1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/EFTau/RNN/InputScalar1p
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Scalar_mEflowApprox_log_1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/EFTau/RNN/InputScalar1p
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Scalar_ptDetectorAxis_log_1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/EFTau/RNN/InputScalar1p
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Scalar_ptRatioEflowApprox_1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/EFTau/RNN/InputScalar1p
+                display     	= StatBox
+              }
+            }
+            dir InputScalar3p {
+              hist hEFRNNInput_Scalar_EMPOverTrkSysP_log_3P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/EFTau/RNN/InputScalar3p
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Scalar_SumPtTrkFrac_3P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/EFTau/RNN/InputScalar3p
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Scalar_centFrac_3P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/EFTau/RNN/InputScalar3p
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Scalar_dRmax_3P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/EFTau/RNN/InputScalar3p
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Scalar_etOverPtLeadTrk_log_3P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/EFTau/RNN/InputScalar3p
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Scalar_mEflowApprox_log_3P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/EFTau/RNN/InputScalar3p
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Scalar_massTrkSys_log_3P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/EFTau/RNN/InputScalar3p
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Scalar_ptDetectorAxis_log_3P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/EFTau/RNN/InputScalar3p
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Scalar_ptRatioEflowApprox_3P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/EFTau/RNN/InputScalar3p
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Scalar_trFlightPathSig_log_3P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/EFTau/RNN/InputScalar3p
+                display     	= StatBox
+              }
+            }
+            dir InputTrack {
+              hist hEFRNNInput_Track_pt_log {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/EFTau/RNN/InputTrack
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Track_pt_jetseed_log {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/EFTau/RNN/InputTrack
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Track_dEta {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/EFTau/RNN/InputTrack
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Track_dPhi {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/EFTau/RNN/InputTrack
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Track_d0_abs_log {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/EFTau/RNN/InputTrack
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Track_z0sinThetaTJVA_abs_log {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/EFTau/RNN/InputTrack
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Track_nIBLHitsAndExp {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/EFTau/RNN/InputTrack
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Track_nPixelHitsPlusDeadSensors {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/EFTau/RNN/InputTrack
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Track_nSCTHitsPlusDeadSensors {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/EFTau/RNN/InputTrack
+                display     	= StatBox
+              }
+            }
+            dir InputCluster {
+              hist hEFRNNInput_Cluster_et_log {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/EFTau/RNN/InputCluster
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Cluster_pt_jetseed_log {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/EFTau/RNN/InputCluster
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Cluster_dEta {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/EFTau/RNN/InputCluster
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Cluster_dPhi {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/EFTau/RNN/InputCluster
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Cluster_SECOND_R_log10 {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/EFTau/RNN/InputCluster
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Cluster_SECOND_LAMBDA_log10 {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/EFTau/RNN/InputCluster
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Cluster_CENTER_LAMBDA_log10 {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/EFTau/RNN/InputCluster
+                display     	= StatBox
+              }
+            }
+            dir Output {
+              hist hEFRNNJetScore_0P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/EFTau/RNN/Output
+                display     	= StatBox
+              }
+              hist hEFRNNJetScore_1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/EFTau/RNN/Output
+                display     	= StatBox
+              }
+              hist hEFRNNJetScore_3P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/EFTau/RNN/Output
+                display     	= StatBox
+              }
+              hist hEFRNNJetScoreSigTrans_0P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/EFTau/RNN/Output
+                display     	= StatBox
+              }
+              hist hEFRNNJetScoreSigTrans_1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/EFTau/RNN/Output
+                display     	= StatBox
+              }
+              hist hEFRNNJetScoreSigTrans_3P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/EFTau/RNN/Output
+                display     	= StatBox
+              }
+            }
+          }
+          hist hEFEMFraction {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/EFTau
+            display     	= StatBox
+          }
+          hist hEFEt {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/EFTau
+            display     	= StatBox
+          }
+          hist hEFEtRaw {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/EFTau
+            display     	= StatBox
+          }
+          hist hEFEtVsEta {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/EFTau
+            display     	= StatBox
+          }
+          hist hEFEtVsPhi {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/EFTau
+            display     	= StatBox
+          }
+          hist hEFEta {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/EFTau
+            display     	= StatBox
+          }
+          hist hEFEtaVsPhi {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/EFTau
+            display     	= StatBox
+          }
+          hist hEFIsoFrac {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/EFTau
+            display     	= StatBox
+          }
+          hist hEFNUM {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/EFTau
+            display     	= StatBox
+          }
+          hist hEFNUMvsmu {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/EFTau
+            display     	= StatBox
+          }
+          hist hEFPhi {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/EFTau
+            display     	= StatBox
+          }
+          hist hEFnTrack {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/EFTau
+            display     	= StatBox
+          }
+          hist hEFnWideTrack {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/EFTau
+            display     	= StatBox
+          }
+        }
+        dir EFVsOffline {
+          hist hEFvsOffnTrks {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/EFVsOffline
+            display     	= StatBox
+          }
+          hist hEFvsOffnWideTrks {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/EFVsOffline
+            display     	= StatBox
+          }
+        }
+        dir L1RoI {
+          hist hL1EtVsEta {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/L1RoI
+            display     	= StatBox
+          }
+          hist hL1EtVsPhi {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/L1RoI
+            display     	= StatBox
+          }
+          hist hL1EtaVsPhi {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIEMIso {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIEta {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIHadCore {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIHadIsol {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIPhi {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoITauClus {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoITauClusEMIso {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIeT {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIisol {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/L1RoI
+            display     	= StatBox
+          }
+        }
+        dir L1VsOffline {
+          hist hL1EtRatio {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/L1VsOffline
+            display     	= StatBox
+          }
+        }
+        dir TurnOnCurves {
+          dir RecoEfficiency {
+            hist TProfRecoHLTEtaEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPt1pEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPt3pEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPtEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTMuEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTLBEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTNTrackEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTNVtxEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPhiEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPt1PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPt3PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPtEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1EtaEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPt1PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPt3PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPtEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1MuEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1NTrackEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1NVtxEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1PhiEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1Pt1PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1Pt3PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1PtEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTEtaEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPt1pEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPt3pEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPtEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTMuEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTLBEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTNTrackEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTNVtxEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPhiEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPt1PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPt3PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPtEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1EtaEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPt1PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPt3PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPtEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1MuEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1NTrackEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1NVtxEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1PhiEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1Pt1PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1Pt3PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1PtEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_looseRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+          }
+        }
+      }
+      dir tau25_medium1NoPt_tracktwoEFmvaTES {
+        dir EFTau {
+          dir BDT {
+            dir 1p_nonCorrected {
+              hist hEFChPiEMEOverCaloEME1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFEMPOverTrkSysP1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFSumPtTrkFrac1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFcentFrac1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFetOverPtLeadTrk1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFinnerTrkAvgDist1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFipSigLeadTrk1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFptRatioEflowApprox1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+            }
+            dir mp_nonCorrected {
+              hist hEFChPiEMEOverCaloEMEMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFEMPOverTrkSysPMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFcentFracMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFdRmaxMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFetOverPtLeadTrkMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFinnerTrkAvgDistMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFmEflowApproxMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFmassTrkSysMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFptRatioEflowApproxMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFtrFlightPathSigMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+            }
+          }
+          hist hEFEMFraction {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFTau
+            display     	= StatBox
+          }
+          hist hEFEt {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFTau
+            display     	= StatBox
+          }
+          hist hEFEtRaw {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFTau
+            display     	= StatBox
+          }
+          hist hEFEtVsEta {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFTau
+            display     	= StatBox
+          }
+          hist hEFEtVsPhi {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFTau
+            display     	= StatBox
+          }
+          hist hEFEta {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFTau
+            display     	= StatBox
+          }
+          hist hEFEtaVsPhi {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFTau
+            display     	= StatBox
+          }
+          hist hEFIsoFrac {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFTau
+            display     	= StatBox
+          }
+          hist hEFNUM {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFTau
+            display     	= StatBox
+          }
+          hist hEFNUMvsmu {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFTau
+            display     	= StatBox
+          }
+          hist hEFPhi {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFTau
+            display     	= StatBox
+          }
+          hist hEFnTrack {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFTau
+            display     	= StatBox
+          }
+          hist hEFnWideTrack {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFTau
+            display     	= StatBox
+          }
+          hist hScore1p {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFTau
+            display     	= StatBox
+          }
+          hist hScoreSigTrans1p {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFTau
+            display     	= StatBox
+          }
+          hist hScoreSigTransmp {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFTau
+            display     	= StatBox
+          }
+          hist hScoremp {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFTau
+            display     	= StatBox
+          }
+        }
+        dir EFVsOffline {
+          dir BDT {
+            dir 1p_nonCorrected {
+              hist hCentFracRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hChPiEMEOverCaloEMERatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hDRmaxRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEMPOverTrkSysPRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEtOverPtLeadTrkRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hInnerTrkAvgDistRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hIpSigLeadTrkRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hPtRatioEflowApproxRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hSumPtTrkFracRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hTopoInvMassRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+            }
+            dir mp_nonCorrected {
+              hist hCentFracRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hChPiEMEOverCaloEMERatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hDRmaxRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEMPOverTrkSysPRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEtOverPtLeadTrkRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hInnerTrkAvgDistRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hMEflowApproxRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hMassTrkSysRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hPtRatioEflowApproxRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hTrFlightPathSigRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+            }
+          }
+          hist hEFvsOffnTrks {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFVsOffline
+            display     	= StatBox
+          }
+          hist hEFvsOffnWideTrks {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/EFVsOffline
+            display     	= StatBox
+          }
+        }
+        dir L1RoI {
+          hist hL1EtVsEta {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/L1RoI
+            display     	= StatBox
+          }
+          hist hL1EtVsPhi {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/L1RoI
+            display     	= StatBox
+          }
+          hist hL1EtaVsPhi {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIEMIso {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIEta {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIHadCore {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIHadIsol {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIPhi {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoITauClus {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoITauClusEMIso {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIeT {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIisol {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/L1RoI
+            display     	= StatBox
+          }
+        }
+        dir L1VsOffline {
+          hist hL1EtRatio {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/L1VsOffline
+            display     	= StatBox
+          }
+        }
+        dir TurnOnCurves {
+          dir RecoEfficiency {
+            hist TProfRecoHLTEtaEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPt1pEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPt3pEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPtEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTMuEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTLBEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTNTrackEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTNVtxEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPhiEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPt1PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPt3PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPtEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1EtaEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPt1PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPt3PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPtEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1MuEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1NTrackEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1NVtxEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1PhiEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1Pt1PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1Pt3PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1PtEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTEtaEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPt1pEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPt3pEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPtEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTMuEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTLBEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTNTrackEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTNVtxEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPhiEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPt1PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPt3PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPtEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1EtaEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPt1PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPt3PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPtEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1MuEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1NTrackEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1NVtxEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1PhiEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1Pt1PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1Pt3PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1PtEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1NoPt_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+          }
+        }
+      }
+      dir tau25_medium1_tracktwo {
+        dir EFTau {
+          dir BDT {
+            dir 1p_nonCorrected {
+              hist hEFChPiEMEOverCaloEME1PNCmu {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFChPiEMEOverCaloEME1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFEMPOverTrkSysP1PNCmu {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFEMPOverTrkSysP1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFSumPtTrkFrac1PNCmu {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFSumPtTrkFrac1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFcentFrac1PNCmu {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFcentFrac1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFetOverPtLeadTrk1PNCmu {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFetOverPtLeadTrk1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFinnerTrkAvgDist1PNCmu {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFinnerTrkAvgDist1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFipSigLeadTrk1PNCmu {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFipSigLeadTrk1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFptRatioEflowApprox1PNCmu {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFptRatioEflowApprox1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+            }
+            dir mp_nonCorrected {
+              hist hEFChPiEMEOverCaloEMEMPNCmu {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFChPiEMEOverCaloEMEMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFEMPOverTrkSysPMPNCmu {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFEMPOverTrkSysPMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFcentFracMPNCmu {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFcentFracMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFdRmaxMPNCmu {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFdRmaxMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFetOverPtLeadTrkMPNCmu {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFetOverPtLeadTrkMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFinnerTrkAvgDistMPNCmu {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFinnerTrkAvgDistMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFmEflowApproxMPNCmu {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFmEflowApproxMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFmassTrkSysMPNCmu {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFmassTrkSysMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFptRatioEflowApproxMPNCmu {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFptRatioEflowApproxMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFtrFlightPathSigMPNCmu {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFtrFlightPathSigMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+            }
+          }
+          hist hEFEMFraction {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFTau
+            display     	= StatBox
+          }
+          hist hEFEt {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFTau
+            display     	= StatBox
+          }
+          hist hEFEtRaw {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFTau
+            display     	= StatBox
+          }
+          hist hEFEtVsEta {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFTau
+            display     	= StatBox
+          }
+          hist hEFEtVsPhi {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFTau
+            display     	= StatBox
+          }
+          hist hEFEta {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFTau
+            display     	= StatBox
+          }
+          hist hEFEtaVsPhi {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFTau
+            display     	= StatBox
+          }
+          hist hEFIsoFrac {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFTau
+            display     	= StatBox
+          }
+          hist hEFNUM {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFTau
+            display     	= StatBox
+          }
+          hist hEFNUMvsmu {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFTau
+            display     	= StatBox
+          }
+          hist hEFPhi {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFTau
+            display     	= StatBox
+          }
+          hist hEFnTrack {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFTau
+            display     	= StatBox
+          }
+          hist hEFnWideTrack {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFTau
+            display     	= StatBox
+          }
+          hist hScore1p {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFTau
+            display     	= StatBox
+          }
+          hist hScoreSigTrans1p {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFTau
+            display     	= StatBox
+          }
+          hist hScoreSigTransmp {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFTau
+            display     	= StatBox
+          }
+          hist hScoremp {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFTau
+            display     	= StatBox
+          }
+        }
+        dir EFVsOffline {
+          dir BDT {
+            dir 1p_nonCorrected {
+              hist hCentFracRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hCentFracVsmu1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hCentFracVspt1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hChPiEMEOvCaloEMEVsmu1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hChPiEMEOvCaloEMEVspt1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hChPiEMEOverCaloEMERatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hDRmaxRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hDRmaxVsmu1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hDRmaxVspt1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEMPOverTrkSysPRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEMPOverTrkSysPVsmu1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEMPOverTrkSysPVspt1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEtOverPtLeadTrkRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEtOverPtLeadTrkVsmu1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEtOverPtLeadTrkVspt1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hInnerTrkAvgDistRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hInnerTrkAvgDistVsmu1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hInnerTrkAvgDistVspt1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hIpSigLeadTrkRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hIpSigLeadTrkVsmu1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hIpSigLeadTrkVspt1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hPtRatioEflowApproxRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hPtRatioEflowApproxVsmu1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hPtRatioEflowApproxVspt1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hSumPtTrkFracRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hSumPtTrkFracVsmu1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hSumPtTrkFracVspt1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hTopoInvMassRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hTopoInvMassVsmu1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hTopoInvMassVspt1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+            }
+            dir mp_nonCorrected {
+              hist hCentFracRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hCentFracVsmuMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hCentFracVsptMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hChPiEMEOvCaloEMEVsmuMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hChPiEMEOvCaloEMEVsptMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hChPiEMEOverCaloEMERatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hDRmaxRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hDRmaxVsmuMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hDRmaxVsptMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEMPOverTrkSysPRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEMPOverTrkSysPVsmuMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEMPOverTrkSysPVsptMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEtOverPtLeadTrkRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEtOverPtLeadTrkVsmuMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEtOverPtLeadTrkVsptMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hInnerTrkAvgDistRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hInnerTrkAvgDistVsmuMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hInnerTrkAvgDistVsptMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hMEflowApproxRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hMEflowApproxVsmuMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hMEflowApproxVsptMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hMassTrkSysRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hMassTrkSysVsmuMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hMassTrkSysVsptMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hPtRatioEflowApproxRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hPtRatioEflowApproxVsmuMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hPtRatioEflowApproxVsptMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hTrFlightPathSigRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hTrFlightPathSigVsmuMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hTrFlightPathSigVsptMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+            }
+          }
+          hist hEFvsOffnTrks {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline
+            display     	= StatBox
+          }
+          hist hEFvsOffnWideTrks {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/EFVsOffline
+            display     	= StatBox
+          }
+        }
+        dir L1RoI {
+          hist hL1EtVsEta {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/L1RoI
+            display     	= StatBox
+          }
+          hist hL1EtVsPhi {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/L1RoI
+            display     	= StatBox
+          }
+          hist hL1EtaVsPhi {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIEMIso {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIEta {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIHadCore {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIHadIsol {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIPhi {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoITauClus {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoITauClusEMIso {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIeT {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIisol {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/L1RoI
+            display     	= StatBox
+          }
+        }
+        dir L1VsOffline {
+          hist hL1EtRatio {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/L1VsOffline
+            display     	= StatBox
+          }
+        }
+        dir PreselectionTau {
+          hist hEFEt {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/PreselectionTau
+            display     	= StatBox
+          }
+          hist hEFEt2 {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/PreselectionTau
+            display     	= StatBox
+          }
+          hist hEFEtaVsPhi {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/PreselectionTau
+            display     	= StatBox
+          }
+          hist hEtVsEta {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/PreselectionTau
+            display     	= StatBox
+          }
+          hist hEtVsPhi {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/PreselectionTau
+            display     	= StatBox
+          }
+          hist hEta {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/PreselectionTau
+            display     	= StatBox
+          }
+          hist hFTFnTrack {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/PreselectionTau
+            display     	= StatBox
+          }
+          hist hFTFnWideTrack {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/PreselectionTau
+            display     	= StatBox
+          }
+          hist hPhi {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/PreselectionTau
+            display     	= StatBox
+          }
+        }
+        dir PreselectionVsOffline {
+          hist hEFEtRatio {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/PreselectionVsOffline
+            display     	= StatBox
+          }
+          hist hEtaRatio {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/PreselectionVsOffline
+            display     	= StatBox
+          }
+          hist hPhiRatio {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/PreselectionVsOffline
+            display     	= StatBox
+          }
+          hist hPreselvsOffnTrks {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/PreselectionVsOffline
+            display     	= StatBox
+          }
+          hist hPreselvsOffnWideTrks {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/PreselectionVsOffline
+            display     	= StatBox
+          }
+        }
+        dir TurnOnCurves {
+          dir RecoEfficiency {
+            hist TProfRecoHLTEtaEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPt1pEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPt3pEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPtEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTMuEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTLBEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTNTrackEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTNVtxEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPhiEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPt1PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPt3PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPtEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1EtaEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPt1PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPt3PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPtEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1MuEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1NTrackEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1NVtxEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1PhiEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1Pt1PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1Pt3PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1PtEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTEtaEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPt1pEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPt3pEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPtEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTMuEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTLBEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTNTrackEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTNVtxEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPhiEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPt1PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPt3PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPtEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1EtaEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPt1PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPt3PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPtEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1MuEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1NTrackEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1NVtxEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1PhiEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1Pt1PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1Pt3PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1PtEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+          }
+        }
+      }
+      dir tau25_medium1_tracktwoEF {
+        dir EFTau {
+          dir BDT {
+            dir 1p_nonCorrected {
+              hist hEFChPiEMEOverCaloEME1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFEMPOverTrkSysP1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFSumPtTrkFrac1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFcentFrac1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFetOverPtLeadTrk1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFinnerTrkAvgDist1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFipSigLeadTrk1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFptRatioEflowApprox1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+            }
+            dir mp_nonCorrected {
+              hist hEFChPiEMEOverCaloEMEMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFEMPOverTrkSysPMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFcentFracMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFdRmaxMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFetOverPtLeadTrkMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFinnerTrkAvgDistMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFmEflowApproxMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFmassTrkSysMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFptRatioEflowApproxMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFtrFlightPathSigMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+            }
+          }
+          hist hEFEMFraction {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFTau
+            display     	= StatBox
+          }
+          hist hEFEt {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFTau
+            display     	= StatBox
+          }
+          hist hEFEtRaw {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFTau
+            display     	= StatBox
+          }
+          hist hEFEtVsEta {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFTau
+            display     	= StatBox
+          }
+          hist hEFEtVsPhi {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFTau
+            display     	= StatBox
+          }
+          hist hEFEta {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFTau
+            display     	= StatBox
+          }
+          hist hEFEtaVsPhi {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFTau
+            display     	= StatBox
+          }
+          hist hEFIsoFrac {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFTau
+            display     	= StatBox
+          }
+          hist hEFNUM {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFTau
+            display     	= StatBox
+          }
+          hist hEFNUMvsmu {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFTau
+            display     	= StatBox
+          }
+          hist hEFPhi {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFTau
+            display     	= StatBox
+          }
+          hist hEFnTrack {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFTau
+            display     	= StatBox
+          }
+          hist hEFnWideTrack {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFTau
+            display     	= StatBox
+          }
+          hist hScore1p {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFTau
+            display     	= StatBox
+          }
+          hist hScoreSigTrans1p {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFTau
+            display     	= StatBox
+          }
+          hist hScoreSigTransmp {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFTau
+            display     	= StatBox
+          }
+          hist hScoremp {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFTau
+            display     	= StatBox
+          }
+        }
+        dir EFVsOffline {
+          dir BDT {
+            dir 1p_nonCorrected {
+              hist hCentFracRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hChPiEMEOverCaloEMERatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hDRmaxRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEMPOverTrkSysPRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEtOverPtLeadTrkRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hInnerTrkAvgDistRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hIpSigLeadTrkRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hPtRatioEflowApproxRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hSumPtTrkFracRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hTopoInvMassRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+            }
+            dir mp_nonCorrected {
+              hist hCentFracRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hChPiEMEOverCaloEMERatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hDRmaxRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEMPOverTrkSysPRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEtOverPtLeadTrkRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hInnerTrkAvgDistRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hMEflowApproxRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hMassTrkSysRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hPtRatioEflowApproxRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hTrFlightPathSigRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+            }
+          }
+          hist hEFvsOffnTrks {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFVsOffline
+            display     	= StatBox
+          }
+          hist hEFvsOffnWideTrks {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/EFVsOffline
+            display     	= StatBox
+          }
+        }
+        dir L1RoI {
+          hist hL1EtVsEta {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/L1RoI
+            display     	= StatBox
+          }
+          hist hL1EtVsPhi {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/L1RoI
+            display     	= StatBox
+          }
+          hist hL1EtaVsPhi {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIEMIso {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIEta {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIHadCore {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIHadIsol {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIPhi {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoITauClus {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoITauClusEMIso {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIeT {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIisol {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/L1RoI
+            display     	= StatBox
+          }
+        }
+        dir L1VsOffline {
+          hist hL1EtRatio {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/L1VsOffline
+            display     	= StatBox
+          }
+        }
+        dir TurnOnCurves {
+          dir RecoEfficiency {
+            hist TProfRecoHLTEtaEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPt1pEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPt3pEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPtEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTMuEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTLBEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTNTrackEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTNVtxEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPhiEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPt1PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPt3PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPtEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1EtaEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPt1PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPt3PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPtEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1MuEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1NTrackEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1NVtxEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1PhiEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1Pt1PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1Pt3PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1PtEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTEtaEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPt1pEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPt3pEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPtEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTMuEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTLBEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTNTrackEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTNVtxEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPhiEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPt1PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPt3PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPtEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1EtaEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPt1PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPt3PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPtEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1MuEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1NTrackEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1NVtxEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1PhiEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1Pt1PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1Pt3PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1PtEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+          }
+        }
+      }
+      dir tau25_medium1_tracktwoEFmvaTES {
+        dir EFTau {
+          dir BDT {
+            dir 1p_nonCorrected {
+              hist hEFChPiEMEOverCaloEME1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFEMPOverTrkSysP1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFSumPtTrkFrac1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFcentFrac1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFetOverPtLeadTrk1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFinnerTrkAvgDist1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFipSigLeadTrk1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFptRatioEflowApprox1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+            }
+            dir mp_nonCorrected {
+              hist hEFChPiEMEOverCaloEMEMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFEMPOverTrkSysPMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFcentFracMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFdRmaxMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFetOverPtLeadTrkMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFinnerTrkAvgDistMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFmEflowApproxMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFmassTrkSysMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFptRatioEflowApproxMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFtrFlightPathSigMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+            }
+          }
+          hist hEFEMFraction {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFTau
+            display     	= StatBox
+          }
+          hist hEFEt {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFTau
+            display     	= StatBox
+          }
+          hist hEFEtRaw {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFTau
+            display     	= StatBox
+          }
+          hist hEFEtVsEta {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFTau
+            display     	= StatBox
+          }
+          hist hEFEtVsPhi {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFTau
+            display     	= StatBox
+          }
+          hist hEFEta {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFTau
+            display     	= StatBox
+          }
+          hist hEFEtaVsPhi {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFTau
+            display     	= StatBox
+          }
+          hist hEFIsoFrac {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFTau
+            display     	= StatBox
+          }
+          hist hEFNUM {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFTau
+            display     	= StatBox
+          }
+          hist hEFNUMvsmu {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFTau
+            display     	= StatBox
+          }
+          hist hEFPhi {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFTau
+            display     	= StatBox
+          }
+          hist hEFnTrack {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFTau
+            display     	= StatBox
+          }
+          hist hEFnWideTrack {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFTau
+            display     	= StatBox
+          }
+          hist hScore1p {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFTau
+            display     	= StatBox
+          }
+          hist hScoreSigTrans1p {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFTau
+            display     	= StatBox
+          }
+          hist hScoreSigTransmp {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFTau
+            display     	= StatBox
+          }
+          hist hScoremp {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFTau
+            display     	= StatBox
+          }
+        }
+        dir EFVsOffline {
+          dir BDT {
+            dir 1p_nonCorrected {
+              hist hCentFracRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hChPiEMEOverCaloEMERatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hDRmaxRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEMPOverTrkSysPRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEtOverPtLeadTrkRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hInnerTrkAvgDistRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hIpSigLeadTrkRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hPtRatioEflowApproxRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hSumPtTrkFracRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hTopoInvMassRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+            }
+            dir mp_nonCorrected {
+              hist hCentFracRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hChPiEMEOverCaloEMERatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hDRmaxRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEMPOverTrkSysPRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEtOverPtLeadTrkRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hInnerTrkAvgDistRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hMEflowApproxRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hMassTrkSysRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hPtRatioEflowApproxRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hTrFlightPathSigRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+            }
+          }
+          hist hEFvsOffnTrks {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFVsOffline
+            display     	= StatBox
+          }
+          hist hEFvsOffnWideTrks {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/EFVsOffline
+            display     	= StatBox
+          }
+        }
+        dir L1RoI {
+          hist hL1EtVsEta {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/L1RoI
+            display     	= StatBox
+          }
+          hist hL1EtVsPhi {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/L1RoI
+            display     	= StatBox
+          }
+          hist hL1EtaVsPhi {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIEMIso {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIEta {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIHadCore {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIHadIsol {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIPhi {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoITauClus {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoITauClusEMIso {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIeT {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIisol {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/L1RoI
+            display     	= StatBox
+          }
+        }
+        dir L1VsOffline {
+          hist hL1EtRatio {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/L1VsOffline
+            display     	= StatBox
+          }
+        }
+        dir TurnOnCurves {
+          dir RecoEfficiency {
+            hist TProfRecoHLTEtaEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPt1pEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPt3pEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPtEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTMuEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTLBEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTNTrackEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTNVtxEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPhiEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPt1PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPt3PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPtEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1EtaEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPt1PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPt3PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPtEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1MuEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1NTrackEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1NVtxEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1PhiEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1Pt1PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1Pt3PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1PtEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTEtaEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPt1pEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPt3pEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPtEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTMuEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTLBEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTNTrackEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTNVtxEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPhiEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPt1PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPt3PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPtEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1EtaEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPt1PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPt3PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPtEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1MuEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1NTrackEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1NVtxEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1PhiEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1Pt1PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1Pt3PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1PtEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_medium1_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+          }
+        }
+      }
+      dir tau25_mediumRNN_tracktwoMVA {
+        dir EFTau {
+          dir RNN {
+            dir InputScalar1p {
+              hist hEFRNNInput_Scalar_EMPOverTrkSysP_log_1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/EFTau/RNN/InputScalar1p
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Scalar_SumPtTrkFrac_1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/EFTau/RNN/InputScalar1p
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Scalar_absipSigLeadTrk_1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/EFTau/RNN/InputScalar1p
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Scalar_centFrac_1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/EFTau/RNN/InputScalar1p
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Scalar_dRmax_1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/EFTau/RNN/InputScalar1p
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Scalar_etOverPtLeadTrk_log_1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/EFTau/RNN/InputScalar1p
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Scalar_mEflowApprox_log_1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/EFTau/RNN/InputScalar1p
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Scalar_ptDetectorAxis_log_1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/EFTau/RNN/InputScalar1p
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Scalar_ptRatioEflowApprox_1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/EFTau/RNN/InputScalar1p
+                display     	= StatBox
+              }
+            }
+            dir InputScalar3p {
+              hist hEFRNNInput_Scalar_EMPOverTrkSysP_log_3P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/EFTau/RNN/InputScalar3p
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Scalar_SumPtTrkFrac_3P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/EFTau/RNN/InputScalar3p
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Scalar_centFrac_3P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/EFTau/RNN/InputScalar3p
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Scalar_dRmax_3P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/EFTau/RNN/InputScalar3p
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Scalar_etOverPtLeadTrk_log_3P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/EFTau/RNN/InputScalar3p
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Scalar_mEflowApprox_log_3P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/EFTau/RNN/InputScalar3p
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Scalar_massTrkSys_log_3P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/EFTau/RNN/InputScalar3p
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Scalar_ptDetectorAxis_log_3P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/EFTau/RNN/InputScalar3p
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Scalar_ptRatioEflowApprox_3P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/EFTau/RNN/InputScalar3p
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Scalar_trFlightPathSig_log_3P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/EFTau/RNN/InputScalar3p
+                display     	= StatBox
+              }
+            }
+            dir InputTrack {
+              hist hEFRNNInput_Track_pt_log {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/EFTau/RNN/InputTrack
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Track_pt_jetseed_log {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/EFTau/RNN/InputTrack
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Track_dEta {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/EFTau/RNN/InputTrack
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Track_dPhi {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/EFTau/RNN/InputTrack
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Track_d0_abs_log {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/EFTau/RNN/InputTrack
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Track_z0sinThetaTJVA_abs_log {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/EFTau/RNN/InputTrack
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Track_nIBLHitsAndExp {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/EFTau/RNN/InputTrack
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Track_nPixelHitsPlusDeadSensors {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/EFTau/RNN/InputTrack
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Track_nSCTHitsPlusDeadSensors {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/EFTau/RNN/InputTrack
+                display     	= StatBox
+              }
+            }
+            dir InputCluster {
+              hist hEFRNNInput_Cluster_et_log {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/EFTau/RNN/InputCluster
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Cluster_pt_jetseed_log {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/EFTau/RNN/InputCluster
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Cluster_dEta {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/EFTau/RNN/InputCluster
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Cluster_dPhi {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/EFTau/RNN/InputCluster
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Cluster_SECOND_R_log10 {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/EFTau/RNN/InputCluster
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Cluster_SECOND_LAMBDA_log10 {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/EFTau/RNN/InputCluster
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Cluster_CENTER_LAMBDA_log10 {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/EFTau/RNN/InputCluster
+                display     	= StatBox
+              }
+            }
+            dir Output {
+              hist hEFRNNJetScore_0P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/EFTau/RNN/Output
+                display     	= StatBox
+              }
+              hist hEFRNNJetScore_1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/EFTau/RNN/Output
+                display     	= StatBox
+              }
+              hist hEFRNNJetScore_3P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/EFTau/RNN/Output
+                display     	= StatBox
+              }
+              hist hEFRNNJetScoreSigTrans_0P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/EFTau/RNN/Output
+                display     	= StatBox
+              }
+              hist hEFRNNJetScoreSigTrans_1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/EFTau/RNN/Output
+                display     	= StatBox
+              }
+              hist hEFRNNJetScoreSigTrans_3P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/EFTau/RNN/Output
+                display     	= StatBox
+              }
+            }
+          }
+          hist hEFEMFraction {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/EFTau
+            display     	= StatBox
+          }
+          hist hEFEt {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/EFTau
+            display     	= StatBox
+          }
+          hist hEFEtRaw {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/EFTau
+            display     	= StatBox
+          }
+          hist hEFEtVsEta {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/EFTau
+            display     	= StatBox
+          }
+          hist hEFEtVsPhi {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/EFTau
+            display     	= StatBox
+          }
+          hist hEFEta {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/EFTau
+            display     	= StatBox
+          }
+          hist hEFEtaVsPhi {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/EFTau
+            display     	= StatBox
+          }
+          hist hEFIsoFrac {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/EFTau
+            display     	= StatBox
+          }
+          hist hEFNUM {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/EFTau
+            display     	= StatBox
+          }
+          hist hEFNUMvsmu {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/EFTau
+            display     	= StatBox
+          }
+          hist hEFPhi {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/EFTau
+            display     	= StatBox
+          }
+          hist hEFnTrack {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/EFTau
+            display     	= StatBox
+          }
+          hist hEFnWideTrack {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/EFTau
+            display     	= StatBox
+          }
+        }
+        dir EFVsOffline {
+          hist hEFvsOffnTrks {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/EFVsOffline
+            display     	= StatBox
+          }
+          hist hEFvsOffnWideTrks {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/EFVsOffline
+            display     	= StatBox
+          }
+        }
+        dir L1RoI {
+          hist hL1EtVsEta {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/L1RoI
+            display     	= StatBox
+          }
+          hist hL1EtVsPhi {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/L1RoI
+            display     	= StatBox
+          }
+          hist hL1EtaVsPhi {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIEMIso {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIEta {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIHadCore {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIHadIsol {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIPhi {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoITauClus {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoITauClusEMIso {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIeT {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIisol {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/L1RoI
+            display     	= StatBox
+          }
+        }
+        dir L1VsOffline {
+          hist hL1EtRatio {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/L1VsOffline
+            display     	= StatBox
+          }
+        }
+        dir TurnOnCurves {
+          dir RecoEfficiency {
+            hist TProfRecoHLTEtaEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPt1pEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPt3pEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPtEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTMuEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTLBEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTNTrackEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTNVtxEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPhiEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPt1PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPt3PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPtEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1EtaEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPt1PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPt3PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPtEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1MuEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1NTrackEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1NVtxEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1PhiEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1Pt1PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1Pt3PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1PtEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTEtaEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPt1pEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPt3pEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPtEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTMuEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTLBEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTNTrackEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTNVtxEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPhiEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPt1PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPt3PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPtEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1EtaEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPt1PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPt3PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPtEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1MuEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1NTrackEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1NVtxEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1PhiEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1Pt1PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1Pt3PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1PtEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_mediumRNN_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+          }
+        }
+      }
+      dir tau25_perf_tracktwo {
+        dir EFTau {
+          dir BDT {
+            dir 1p_nonCorrected {
+              hist hEFChPiEMEOverCaloEME1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFEMPOverTrkSysP1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFSumPtTrkFrac1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFcentFrac1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFetOverPtLeadTrk1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFinnerTrkAvgDist1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFipSigLeadTrk1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFptRatioEflowApprox1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+            }
+            dir mp_nonCorrected {
+              hist hEFChPiEMEOverCaloEMEMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFEMPOverTrkSysPMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFcentFracMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFdRmaxMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFetOverPtLeadTrkMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFinnerTrkAvgDistMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFmEflowApproxMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFmassTrkSysMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFptRatioEflowApproxMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFtrFlightPathSigMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+            }
+          }
+          hist hEFEMFraction {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFTau
+            display     	= StatBox
+          }
+          hist hEFEt {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFTau
+            display     	= StatBox
+          }
+          hist hEFEtRaw {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFTau
+            display     	= StatBox
+          }
+          hist hEFEtVsEta {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFTau
+            display     	= StatBox
+          }
+          hist hEFEtVsPhi {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFTau
+            display     	= StatBox
+          }
+          hist hEFEta {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFTau
+            display     	= StatBox
+          }
+          hist hEFEtaVsPhi {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFTau
+            display     	= StatBox
+          }
+          hist hEFIsoFrac {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFTau
+            display     	= StatBox
+          }
+          hist hEFNUM {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFTau
+            display     	= StatBox
+          }
+          hist hEFNUMvsmu {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFTau
+            display     	= StatBox
+          }
+          hist hEFPhi {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFTau
+            display     	= StatBox
+          }
+          hist hEFnTrack {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFTau
+            display     	= StatBox
+          }
+          hist hEFnWideTrack {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFTau
+            display     	= StatBox
+          }
+          hist hScore1p {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFTau
+            display     	= StatBox
+          }
+          hist hScoreSigTrans1p {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFTau
+            display     	= StatBox
+          }
+          hist hScoreSigTransmp {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFTau
+            display     	= StatBox
+          }
+          hist hScoremp {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFTau
+            display     	= StatBox
+          }
+        }
+        dir EFVsOffline {
+          dir BDT {
+            dir 1p_nonCorrected {
+              hist hCentFracRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hChPiEMEOverCaloEMERatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hDRmaxRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEMPOverTrkSysPRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEtOverPtLeadTrkRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hInnerTrkAvgDistRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hIpSigLeadTrkRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hPtRatioEflowApproxRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hSumPtTrkFracRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hTopoInvMassRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+            }
+            dir mp_nonCorrected {
+              hist hCentFracRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hChPiEMEOverCaloEMERatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hDRmaxRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEMPOverTrkSysPRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEtOverPtLeadTrkRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hInnerTrkAvgDistRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hMEflowApproxRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hMassTrkSysRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hPtRatioEflowApproxRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hTrFlightPathSigRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+            }
+          }
+          hist hEFvsOffnTrks {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFVsOffline
+            display     	= StatBox
+          }
+          hist hEFvsOffnWideTrks {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/EFVsOffline
+            display     	= StatBox
+          }
+        }
+        dir L1RoI {
+          hist hL1EtVsEta {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/L1RoI
+            display     	= StatBox
+          }
+          hist hL1EtVsPhi {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/L1RoI
+            display     	= StatBox
+          }
+          hist hL1EtaVsPhi {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIEMIso {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIEta {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIHadCore {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIHadIsol {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIPhi {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoITauClus {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoITauClusEMIso {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIeT {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIisol {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/L1RoI
+            display     	= StatBox
+          }
+        }
+        dir L1VsOffline {
+          hist hL1EtRatio {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/L1VsOffline
+            display     	= StatBox
+          }
+        }
+        dir PreselectionTau {
+          hist hEFEt {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/PreselectionTau
+            display     	= StatBox
+          }
+          hist hEFEt2 {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/PreselectionTau
+            display     	= StatBox
+          }
+          hist hEFEtaVsPhi {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/PreselectionTau
+            display     	= StatBox
+          }
+          hist hEtVsEta {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/PreselectionTau
+            display     	= StatBox
+          }
+          hist hEtVsPhi {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/PreselectionTau
+            display     	= StatBox
+          }
+          hist hEta {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/PreselectionTau
+            display     	= StatBox
+          }
+          hist hFTFnTrack {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/PreselectionTau
+            display     	= StatBox
+          }
+          hist hFTFnWideTrack {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/PreselectionTau
+            display     	= StatBox
+          }
+          hist hPhi {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/PreselectionTau
+            display     	= StatBox
+          }
+        }
+        dir PreselectionVsOffline {
+          hist hEFEtRatio {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/PreselectionVsOffline
+            display     	= StatBox
+          }
+          hist hEtaRatio {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/PreselectionVsOffline
+            display     	= StatBox
+          }
+          hist hPhiRatio {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/PreselectionVsOffline
+            display     	= StatBox
+          }
+          hist hPreselvsOffnTrks {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/PreselectionVsOffline
+            display     	= StatBox
+          }
+          hist hPreselvsOffnWideTrks {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/PreselectionVsOffline
+            display     	= StatBox
+          }
+        }
+        dir TurnOnCurves {
+          dir RecoEfficiency {
+            hist TProfRecoHLTEtaEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPt1pEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPt3pEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPtEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTMuEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTLBEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTNTrackEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTNVtxEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPhiEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPt1PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPt3PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPtEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1EtaEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPt1PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPt3PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPtEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1MuEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1NTrackEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1NVtxEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1PhiEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1Pt1PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1Pt3PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1PtEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTEtaEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPt1pEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPt3pEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPtEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTMuEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTLBEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTNTrackEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTNVtxEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPhiEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPt1PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPt3PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPtEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1EtaEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPt1PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPt3PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPtEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1MuEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1NTrackEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1NVtxEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1PhiEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1Pt1PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1Pt3PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1PtEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwo/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+          }
+        }
+      }
+      dir tau25_perf_tracktwoEF {
+        dir EFTau {
+          dir BDT {
+            dir 1p_nonCorrected {
+              hist hEFChPiEMEOverCaloEME1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFEMPOverTrkSysP1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFSumPtTrkFrac1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFcentFrac1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFetOverPtLeadTrk1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFinnerTrkAvgDist1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFipSigLeadTrk1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFptRatioEflowApprox1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+            }
+            dir mp_nonCorrected {
+              hist hEFChPiEMEOverCaloEMEMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFEMPOverTrkSysPMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFcentFracMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFdRmaxMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFetOverPtLeadTrkMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFinnerTrkAvgDistMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFmEflowApproxMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFmassTrkSysMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFptRatioEflowApproxMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFtrFlightPathSigMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+            }
+          }
+          hist hEFEMFraction {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFTau
+            display     	= StatBox
+          }
+          hist hEFEt {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFTau
+            display     	= StatBox
+          }
+          hist hEFEtRaw {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFTau
+            display     	= StatBox
+          }
+          hist hEFEtVsEta {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFTau
+            display     	= StatBox
+          }
+          hist hEFEtVsPhi {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFTau
+            display     	= StatBox
+          }
+          hist hEFEta {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFTau
+            display     	= StatBox
+          }
+          hist hEFEtaVsPhi {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFTau
+            display     	= StatBox
+          }
+          hist hEFIsoFrac {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFTau
+            display     	= StatBox
+          }
+          hist hEFNUM {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFTau
+            display     	= StatBox
+          }
+          hist hEFNUMvsmu {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFTau
+            display     	= StatBox
+          }
+          hist hEFPhi {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFTau
+            display     	= StatBox
+          }
+          hist hEFnTrack {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFTau
+            display     	= StatBox
+          }
+          hist hEFnWideTrack {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFTau
+            display     	= StatBox
+          }
+          hist hScore1p {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFTau
+            display     	= StatBox
+          }
+          hist hScoreSigTrans1p {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFTau
+            display     	= StatBox
+          }
+          hist hScoreSigTransmp {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFTau
+            display     	= StatBox
+          }
+          hist hScoremp {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFTau
+            display     	= StatBox
+          }
+        }
+        dir EFVsOffline {
+          dir BDT {
+            dir 1p_nonCorrected {
+              hist hCentFracRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hChPiEMEOverCaloEMERatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hDRmaxRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEMPOverTrkSysPRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEtOverPtLeadTrkRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hInnerTrkAvgDistRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hIpSigLeadTrkRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hPtRatioEflowApproxRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hSumPtTrkFracRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hTopoInvMassRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+            }
+            dir mp_nonCorrected {
+              hist hCentFracRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hChPiEMEOverCaloEMERatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hDRmaxRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEMPOverTrkSysPRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEtOverPtLeadTrkRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hInnerTrkAvgDistRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hMEflowApproxRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hMassTrkSysRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hPtRatioEflowApproxRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hTrFlightPathSigRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+            }
+          }
+          hist hEFvsOffnTrks {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFVsOffline
+            display     	= StatBox
+          }
+          hist hEFvsOffnWideTrks {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/EFVsOffline
+            display     	= StatBox
+          }
+        }
+        dir L1RoI {
+          hist hL1EtVsEta {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/L1RoI
+            display     	= StatBox
+          }
+          hist hL1EtVsPhi {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/L1RoI
+            display     	= StatBox
+          }
+          hist hL1EtaVsPhi {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIEMIso {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIEta {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIHadCore {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIHadIsol {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIPhi {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoITauClus {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoITauClusEMIso {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIeT {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIisol {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/L1RoI
+            display     	= StatBox
+          }
+        }
+        dir L1VsOffline {
+          hist hL1EtRatio {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/L1VsOffline
+            display     	= StatBox
+          }
+        }
+        dir TurnOnCurves {
+          dir RecoEfficiency {
+            hist TProfRecoHLTEtaEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPt1pEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPt3pEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPtEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTMuEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTLBEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTNTrackEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTNVtxEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPhiEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPt1PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPt3PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPtEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1EtaEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPt1PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPt3PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPtEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1MuEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1NTrackEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1NVtxEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1PhiEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1Pt1PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1Pt3PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1PtEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTEtaEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPt1pEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPt3pEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPtEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTMuEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTLBEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTNTrackEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTNVtxEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPhiEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPt1PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPt3PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPtEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1EtaEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPt1PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPt3PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPtEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1MuEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1NTrackEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1NVtxEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1PhiEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1Pt1PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1Pt3PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1PtEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEF/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+          }
+        }
+      }
+      dir tau25_perf_tracktwoEFmvaTES {
+        dir EFTau {
+          dir BDT {
+            dir 1p_nonCorrected {
+              hist hEFChPiEMEOverCaloEME1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFEMPOverTrkSysP1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFSumPtTrkFrac1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFcentFrac1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFetOverPtLeadTrk1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFinnerTrkAvgDist1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFipSigLeadTrk1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFptRatioEflowApprox1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+            }
+            dir mp_nonCorrected {
+              hist hEFChPiEMEOverCaloEMEMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFEMPOverTrkSysPMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFcentFracMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFdRmaxMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFetOverPtLeadTrkMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFinnerTrkAvgDistMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFmEflowApproxMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFmassTrkSysMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFptRatioEflowApproxMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFtrFlightPathSigMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+            }
+          }
+          hist hEFEMFraction {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFTau
+            display     	= StatBox
+          }
+          hist hEFEt {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFTau
+            display     	= StatBox
+          }
+          hist hEFEtRaw {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFTau
+            display     	= StatBox
+          }
+          hist hEFEtVsEta {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFTau
+            display     	= StatBox
+          }
+          hist hEFEtVsPhi {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFTau
+            display     	= StatBox
+          }
+          hist hEFEta {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFTau
+            display     	= StatBox
+          }
+          hist hEFEtaVsPhi {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFTau
+            display     	= StatBox
+          }
+          hist hEFIsoFrac {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFTau
+            display     	= StatBox
+          }
+          hist hEFNUM {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFTau
+            display     	= StatBox
+          }
+          hist hEFNUMvsmu {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFTau
+            display     	= StatBox
+          }
+          hist hEFPhi {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFTau
+            display     	= StatBox
+          }
+          hist hEFnTrack {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFTau
+            display     	= StatBox
+          }
+          hist hEFnWideTrack {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFTau
+            display     	= StatBox
+          }
+          hist hScore1p {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFTau
+            display     	= StatBox
+          }
+          hist hScoreSigTrans1p {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFTau
+            display     	= StatBox
+          }
+          hist hScoreSigTransmp {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFTau
+            display     	= StatBox
+          }
+          hist hScoremp {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFTau
+            display     	= StatBox
+          }
+        }
+        dir EFVsOffline {
+          dir BDT {
+            dir 1p_nonCorrected {
+              hist hCentFracRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hChPiEMEOverCaloEMERatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hDRmaxRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEMPOverTrkSysPRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEtOverPtLeadTrkRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hInnerTrkAvgDistRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hIpSigLeadTrkRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hPtRatioEflowApproxRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hSumPtTrkFracRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hTopoInvMassRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+            }
+            dir mp_nonCorrected {
+              hist hCentFracRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hChPiEMEOverCaloEMERatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hDRmaxRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEMPOverTrkSysPRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEtOverPtLeadTrkRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hInnerTrkAvgDistRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hMEflowApproxRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hMassTrkSysRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hPtRatioEflowApproxRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hTrFlightPathSigRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+            }
+          }
+          hist hEFvsOffnTrks {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFVsOffline
+            display     	= StatBox
+          }
+          hist hEFvsOffnWideTrks {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/EFVsOffline
+            display     	= StatBox
+          }
+        }
+        dir L1RoI {
+          hist hL1EtVsEta {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/L1RoI
+            display     	= StatBox
+          }
+          hist hL1EtVsPhi {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/L1RoI
+            display     	= StatBox
+          }
+          hist hL1EtaVsPhi {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIEMIso {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIEta {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIHadCore {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIHadIsol {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIPhi {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoITauClus {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoITauClusEMIso {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIeT {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIisol {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/L1RoI
+            display     	= StatBox
+          }
+        }
+        dir L1VsOffline {
+          hist hL1EtRatio {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/L1VsOffline
+            display     	= StatBox
+          }
+        }
+        dir TurnOnCurves {
+          dir RecoEfficiency {
+            hist TProfRecoHLTEtaEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPt1pEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPt3pEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPtEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTMuEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTLBEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTNTrackEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTNVtxEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPhiEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPt1PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPt3PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPtEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1EtaEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPt1PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPt3PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPtEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1MuEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1NTrackEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1NVtxEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1PhiEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1Pt1PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1Pt3PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1PtEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTEtaEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPt1pEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPt3pEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPtEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTMuEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTLBEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTNTrackEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTNVtxEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPhiEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPt1PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPt3PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPtEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1EtaEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPt1PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPt3PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPtEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1MuEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1NTrackEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1NVtxEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1PhiEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1Pt1PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1Pt3PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1PtEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoEFmvaTES/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+          }
+        }
+      }
+      dir tau25_perf_tracktwoMVA {
+        dir EFTau {
+          dir BDT {
+            dir 1p_nonCorrected {
+              hist hEFChPiEMEOverCaloEME1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFEMPOverTrkSysP1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFSumPtTrkFrac1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFcentFrac1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFetOverPtLeadTrk1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFinnerTrkAvgDist1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFipSigLeadTrk1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFptRatioEflowApprox1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+            }
+            dir mp_nonCorrected {
+              hist hEFChPiEMEOverCaloEMEMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFEMPOverTrkSysPMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFcentFracMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFdRmaxMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFetOverPtLeadTrkMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFinnerTrkAvgDistMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFmEflowApproxMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFmassTrkSysMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFptRatioEflowApproxMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFtrFlightPathSigMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+            }
+          }
+          dir RNN {
+            dir InputScalar1p {
+              hist hEFRNNInput_Scalar_EMPOverTrkSysP_log_1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau/RNN/InputScalar1p
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Scalar_SumPtTrkFrac_1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau/RNN/InputScalar1p
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Scalar_absipSigLeadTrk_1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau/RNN/InputScalar1p
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Scalar_centFrac_1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau/RNN/InputScalar1p
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Scalar_dRmax_1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau/RNN/InputScalar1p
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Scalar_etOverPtLeadTrk_log_1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau/RNN/InputScalar1p
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Scalar_mEflowApprox_log_1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau/RNN/InputScalar1p
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Scalar_ptDetectorAxis_log_1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau/RNN/InputScalar1p
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Scalar_ptRatioEflowApprox_1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau/RNN/InputScalar1p
+                display     	= StatBox
+              }
+            }
+            dir InputScalar3p {
+              hist hEFRNNInput_Scalar_EMPOverTrkSysP_log_3P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau/RNN/InputScalar3p
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Scalar_SumPtTrkFrac_3P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau/RNN/InputScalar3p
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Scalar_centFrac_3P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau/RNN/InputScalar3p
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Scalar_dRmax_3P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau/RNN/InputScalar3p
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Scalar_etOverPtLeadTrk_log_3P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau/RNN/InputScalar3p
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Scalar_mEflowApprox_log_3P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau/RNN/InputScalar3p
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Scalar_massTrkSys_log_3P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau/RNN/InputScalar3p
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Scalar_ptDetectorAxis_log_3P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau/RNN/InputScalar3p
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Scalar_ptRatioEflowApprox_3P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau/RNN/InputScalar3p
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Scalar_trFlightPathSig_log_3P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau/RNN/InputScalar3p
+                display     	= StatBox
+              }
+            }
+            dir InputTrack {
+              hist hEFRNNInput_Track_pt_log {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau/RNN/InputTrack
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Track_pt_jetseed_log {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau/RNN/InputTrack
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Track_dEta {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau/RNN/InputTrack
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Track_dPhi {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau/RNN/InputTrack
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Track_d0_abs_log {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau/RNN/InputTrack
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Track_z0sinThetaTJVA_abs_log {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau/RNN/InputTrack
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Track_nIBLHitsAndExp {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau/RNN/InputTrack
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Track_nPixelHitsPlusDeadSensors {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau/RNN/InputTrack
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Track_nSCTHitsPlusDeadSensors {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau/RNN/InputTrack
+                display     	= StatBox
+              }
+            }
+            dir InputCluster {
+              hist hEFRNNInput_Cluster_et_log {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau/RNN/InputCluster
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Cluster_pt_jetseed_log {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau/RNN/InputCluster
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Cluster_dEta {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau/RNN/InputCluster
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Cluster_dPhi {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau/RNN/InputCluster
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Cluster_SECOND_R_log10 {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau/RNN/InputCluster
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Cluster_SECOND_LAMBDA_log10 {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau/RNN/InputCluster
+                display     	= StatBox
+              }
+              hist hEFRNNInput_Cluster_CENTER_LAMBDA_log10 {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau/RNN/InputCluster
+                display     	= StatBox
+              }
+            }
+            dir Output {
+              hist hEFRNNJetScore_0P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau/RNN/Output
+                display     	= StatBox
+              }
+              hist hEFRNNJetScore_1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau/RNN/Output
+                display     	= StatBox
+              }
+              hist hEFRNNJetScore_3P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau/RNN/Output
+                display     	= StatBox
+              }
+              hist hEFRNNJetScoreSigTrans_0P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau/RNN/Output
+                display     	= StatBox
+              }
+              hist hEFRNNJetScoreSigTrans_1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau/RNN/Output
+                display     	= StatBox
+              }
+              hist hEFRNNJetScoreSigTrans_3P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau/RNN/Output
+                display     	= StatBox
+              }
+            }
+          }
+          hist hEFEMFraction {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau
+            display     	= StatBox
+          }
+          hist hEFEt {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau
+            display     	= StatBox
+          }
+          hist hEFEtRaw {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau
+            display     	= StatBox
+          }
+          hist hEFEtVsEta {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau
+            display     	= StatBox
+          }
+          hist hEFEtVsPhi {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau
+            display     	= StatBox
+          }
+          hist hEFEta {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau
+            display     	= StatBox
+          }
+          hist hEFEtaVsPhi {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau
+            display     	= StatBox
+          }
+          hist hEFIsoFrac {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau
+            display     	= StatBox
+          }
+          hist hEFNUM {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau
+            display     	= StatBox
+          }
+          hist hEFNUMvsmu {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau
+            display     	= StatBox
+          }
+          hist hEFPhi {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau
+            display     	= StatBox
+          }
+          hist hEFnTrack {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau
+            display     	= StatBox
+          }
+          hist hEFnWideTrack {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau
+            display     	= StatBox
+          }
+          hist hScore1p {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau
+            display     	= StatBox
+          }
+          hist hScoreSigTrans1p {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau
+            display     	= StatBox
+          }
+          hist hScoreSigTransmp {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau
+            display     	= StatBox
+          }
+          hist hScoremp {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFTau
+            display     	= StatBox
+          }
+        }
+        dir EFVsOffline {
+          dir BDT {
+            dir 1p_nonCorrected {
+              hist hCentFracRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hChPiEMEOverCaloEMERatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hDRmaxRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEMPOverTrkSysPRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEtOverPtLeadTrkRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hInnerTrkAvgDistRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hIpSigLeadTrkRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hPtRatioEflowApproxRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hSumPtTrkFracRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hTopoInvMassRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+            }
+            dir mp_nonCorrected {
+              hist hCentFracRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hChPiEMEOverCaloEMERatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hDRmaxRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEMPOverTrkSysPRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEtOverPtLeadTrkRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hInnerTrkAvgDistRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hMEflowApproxRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hMassTrkSysRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hPtRatioEflowApproxRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hTrFlightPathSigRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+            }
+          }
+          hist hEFvsOffnTrks {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFVsOffline
+            display     	= StatBox
+          }
+          hist hEFvsOffnWideTrks {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/EFVsOffline
+            display     	= StatBox
+          }
+        }
+        dir L1RoI {
+          hist hL1EtVsEta {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/L1RoI
+            display     	= StatBox
+          }
+          hist hL1EtVsPhi {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/L1RoI
+            display     	= StatBox
+          }
+          hist hL1EtaVsPhi {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIEMIso {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIEta {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIHadCore {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIHadIsol {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIPhi {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoITauClus {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoITauClusEMIso {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIeT {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIisol {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/L1RoI
+            display     	= StatBox
+          }
+        }
+        dir L1VsOffline {
+          hist hL1EtRatio {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/L1VsOffline
+            display     	= StatBox
+          }
+        }
+        dir TurnOnCurves {
+          dir RecoEfficiency {
+            hist TProfRecoHLTEtaEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPt1pEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPt3pEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPtEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTMuEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTLBEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTNTrackEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTNVtxEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPhiEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPt1PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPt3PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPtEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1EtaEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPt1PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPt3PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPtEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1MuEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1NTrackEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1NVtxEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1PhiEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1Pt1PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1Pt3PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1PtEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTEtaEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPt1pEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPt3pEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPtEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTMuEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTLBEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTNTrackEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTNVtxEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPhiEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPt1PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPt3PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPtEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1EtaEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPt1PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPt3PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPtEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1MuEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1NTrackEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1NVtxEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1PhiEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1Pt1PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1Pt3PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1PtEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau25_perf_tracktwoMVA/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+          }
+        }
+      }
+      dir tau35_medium1_tracktwo_tau25_medium1_tracktwo_L1TAU20IM_2TAU12IM {
+        dir EFTau {
+          dir BDT {
+            dir 1p_nonCorrected {
+              hist   all_in_dir {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_tau25_medium1_tracktwo_L1TAU20IM_2TAU12IM/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+                reference       = HLT_TauTrigger_MainReference
+              }
+            }
+            dir mp_nonCorrected {
+              hist   all_in_dir {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_tau25_medium1_tracktwo_L1TAU20IM_2TAU12IM/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+                reference       = HLT_TauTrigger_MainReference
+              }
+            }
+          }
+          hist hEFNUMvsmu {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_tau25_medium1_tracktwo_L1TAU20IM_2TAU12IM/EFTau
+            display     	= StatBox
+          }
+          hist hEFEtaVsPhi {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_tau25_medium1_tracktwo_L1TAU20IM_2TAU12IM/EFTau
+            display     	= StatBox
+          }
+          hist hEFEtVsPhi {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_tau25_medium1_tracktwo_L1TAU20IM_2TAU12IM/EFTau
+            display     	= StatBox
+          }
+          hist hEFEtVsEta {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_tau25_medium1_tracktwo_L1TAU20IM_2TAU12IM/EFTau
+            display     	= StatBox
+          }
+        }
+        dir EFVsOffline {
+          dir BDT {
+            dir 1p_nonCorrected {
+              hist   all_in_dir {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_tau25_medium1_tracktwo_L1TAU20IM_2TAU12IM/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+                reference       = HLT_TauTrigger_MainReference
+              }
+            }
+            dir mp_nonCorrected {
+              hist   all_in_dir {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_tau25_medium1_tracktwo_L1TAU20IM_2TAU12IM/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+                reference       = HLT_TauTrigger_MainReference
+              }
+            }
+          }
+          hist hEFvsOffnTrks {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_tau25_medium1_tracktwo_L1TAU20IM_2TAU12IM/EFVsOffline
+            display     	= StatBox
+          }
+          hist hEFvsOffnWideTrks {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_tau25_medium1_tracktwo_L1TAU20IM_2TAU12IM/EFVsOffline
+            display     	= StatBox
+          }
+        }
+        dir L1RoI {
+          hist hL1EtaVsPhi {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_tau25_medium1_tracktwo_L1TAU20IM_2TAU12IM/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoITauClusEMIso {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_tau25_medium1_tracktwo_L1TAU20IM_2TAU12IM/L1RoI
+            display     	= StatBox
+          }
+          hist hL1EtVsPhi {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_tau25_medium1_tracktwo_L1TAU20IM_2TAU12IM/L1RoI
+            display     	= StatBox
+          }
+          hist hL1EtVsEta {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_tau25_medium1_tracktwo_L1TAU20IM_2TAU12IM/L1RoI
+            display     	= StatBox
+          }
+        }
+        dir L1VsOffline {
+          hist   all_in_dir {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_tau25_medium1_tracktwo_L1TAU20IM_2TAU12IM/L1VsOffline
+            display     	= StatBox
+            reference           = HLT_TauTrigger_MainReference
+          }
+        }
+        dir PreselectionTau {
+          hist hEFEtaVsPhi {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_tau25_medium1_tracktwo_L1TAU20IM_2TAU12IM/PreselectionTau
+            display     	= StatBox
+          }
+          hist hEtVsEta {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_tau25_medium1_tracktwo_L1TAU20IM_2TAU12IM/PreselectionTau
+            display     	= StatBox
+          }
+          hist hEtVsPhi {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_tau25_medium1_tracktwo_L1TAU20IM_2TAU12IM/PreselectionTau
+            display     	= StatBox
+          }
+        }
+        dir PreselectionVsOffline {
+          hist hPreselvsOffnTrks {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_tau25_medium1_tracktwo_L1TAU20IM_2TAU12IM/PreselectionVsOffline
+            display     	= StatBox
+          }
+          hist hPreselvsOffnWideTrks {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_tau25_medium1_tracktwo_L1TAU20IM_2TAU12IM/PreselectionVsOffline
+            display     	= StatBox
+          }
+        }
+        dir TurnOnCurves {
+          dir RecoEfficiency {
+            hist   all_in_dir {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_tau25_medium1_tracktwo_L1TAU20IM_2TAU12IM/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+              reference         = HLT_TauTrigger_MainReference
+            }
+          }
+        }
+      }
+      dir tau35_medium1_tracktwo_xe70_L1XE45 {
+        dir EFTau {
+          dir BDT {
+            dir 1p_nonCorrected {
+              hist hEFChPiEMEOverCaloEME1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFEMPOverTrkSysP1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFSumPtTrkFrac1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFcentFrac1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFetOverPtLeadTrk1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFinnerTrkAvgDist1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFipSigLeadTrk1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFptRatioEflowApprox1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+            }
+            dir mp_nonCorrected {
+              hist hEFChPiEMEOverCaloEMEMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFEMPOverTrkSysPMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFcentFracMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFdRmaxMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFetOverPtLeadTrkMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFinnerTrkAvgDistMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFmEflowApproxMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFmassTrkSysMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFptRatioEflowApproxMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFtrFlightPathSigMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+            }
+          }
+          hist hEFEMFraction {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFTau
+            display     	= StatBox
+          }
+          hist hEFEt {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFTau
+            display     	= StatBox
+          }
+          hist hEFEtRaw {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFTau
+            display     	= StatBox
+          }
+          hist hEFEtVsEta {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFTau
+            display     	= StatBox
+          }
+          hist hEFEtVsPhi {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFTau
+            display     	= StatBox
+          }
+          hist hEFEta {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFTau
+            display     	= StatBox
+          }
+          hist hEFEtaVsPhi {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFTau
+            display     	= StatBox
+          }
+          hist hEFIsoFrac {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFTau
+            display     	= StatBox
+          }
+          hist hEFNUM {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFTau
+            display     	= StatBox
+          }
+          hist hEFNUMvsmu {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFTau
+            display     	= StatBox
+          }
+          hist hEFPhi {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFTau
+            display     	= StatBox
+          }
+          hist hEFnTrack {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFTau
+            display     	= StatBox
+          }
+          hist hEFnWideTrack {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFTau
+            display     	= StatBox
+          }
+          hist hScore1p {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFTau
+            display     	= StatBox
+          }
+          hist hScoreSigTrans1p {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFTau
+            display     	= StatBox
+          }
+          hist hScoreSigTransmp {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFTau
+            display     	= StatBox
+          }
+          hist hScoremp {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFTau
+            display     	= StatBox
+          }
+        }
+        dir EFVsOffline {
+          dir BDT {
+            dir 1p_nonCorrected {
+              hist hCentFracRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hChPiEMEOverCaloEMERatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hDRmaxRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEMPOverTrkSysPRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEtOverPtLeadTrkRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hInnerTrkAvgDistRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hIpSigLeadTrkRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hPtRatioEflowApproxRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hSumPtTrkFracRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hTopoInvMassRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+            }
+            dir mp_nonCorrected {
+              hist hCentFracRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hChPiEMEOverCaloEMERatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hDRmaxRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEMPOverTrkSysPRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEtOverPtLeadTrkRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hInnerTrkAvgDistRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hMEflowApproxRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hMassTrkSysRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hPtRatioEflowApproxRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hTrFlightPathSigRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+            }
+          }
+          hist hEFvsOffnTrks {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFVsOffline
+            display     	= StatBox
+          }
+          hist hEFvsOffnWideTrks {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/EFVsOffline
+            display     	= StatBox
+          }
+        }
+        dir L1RoI {
+          hist hL1EtVsEta {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/L1RoI
+            display     	= StatBox
+          }
+          hist hL1EtVsPhi {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/L1RoI
+            display     	= StatBox
+          }
+          hist hL1EtaVsPhi {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIEMIso {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIEta {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIHadCore {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIHadIsol {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIPhi {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoITauClus {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoITauClusEMIso {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIeT {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIisol {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/L1RoI
+            display     	= StatBox
+          }
+        }
+        dir L1VsOffline {
+          hist hL1EtRatio {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/L1VsOffline
+            display     	= StatBox
+          }
+        }
+        dir PreselectionTau {
+          hist hEFEt {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/PreselectionTau
+            display     	= StatBox
+          }
+          hist hEFEt2 {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/PreselectionTau
+            display     	= StatBox
+          }
+          hist hEFEtaVsPhi {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/PreselectionTau
+            display     	= StatBox
+          }
+          hist hEtVsEta {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/PreselectionTau
+            display     	= StatBox
+          }
+          hist hEtVsPhi {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/PreselectionTau
+            display     	= StatBox
+          }
+          hist hEta {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/PreselectionTau
+            display     	= StatBox
+          }
+          hist hFTFnTrack {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/PreselectionTau
+            display     	= StatBox
+          }
+          hist hFTFnWideTrack {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/PreselectionTau
+            display     	= StatBox
+          }
+          hist hPhi {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/PreselectionTau
+            display     	= StatBox
+          }
+        }
+        dir PreselectionVsOffline {
+          hist hEFEtRatio {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/PreselectionVsOffline
+            display     	= StatBox
+          }
+          hist hEtaRatio {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/PreselectionVsOffline
+            display     	= StatBox
+          }
+          hist hPhiRatio {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/PreselectionVsOffline
+            display     	= StatBox
+          }
+          hist hPreselvsOffnTrks {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/PreselectionVsOffline
+            display     	= StatBox
+          }
+          hist hPreselvsOffnWideTrks {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/PreselectionVsOffline
+            display     	= StatBox
+          }
+        }
+        dir TurnOnCurves {
+          dir RecoEfficiency {
+            hist TProfRecoHLTEtaEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPt1pEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPt3pEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPtEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTMuEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTLBEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTNTrackEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTNVtxEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPhiEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPt1PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPt3PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPtEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1EtaEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPt1PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPt3PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPtEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1MuEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1NTrackEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1NVtxEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1PhiEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1Pt1PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1Pt3PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1PtEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTEtaEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPt1pEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPt3pEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPtEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTMuEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTLBEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTNTrackEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTNVtxEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPhiEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPt1PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPt3PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPtEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1EtaEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPt1PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPt3PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPtEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1MuEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1NTrackEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1NVtxEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1PhiEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1Pt1PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1Pt3PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1PtEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau35_medium1_tracktwo_xe70_L1XE45/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+          }
+        }
+      }
+      dir tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12 {
+        dir EFTau {
+          dir BDT {
+            dir 1p_nonCorrected {
+              hist hEFChPiEMEOverCaloEME1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFEMPOverTrkSysP1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFSumPtTrkFrac1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFcentFrac1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFetOverPtLeadTrk1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFinnerTrkAvgDist1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFipSigLeadTrk1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFptRatioEflowApprox1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+            }
+            dir mp_nonCorrected {
+              hist hEFChPiEMEOverCaloEMEMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFEMPOverTrkSysPMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFcentFracMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFdRmaxMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFetOverPtLeadTrkMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFinnerTrkAvgDistMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFmEflowApproxMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFmassTrkSysMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFptRatioEflowApproxMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFtrFlightPathSigMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+            }
+          }
+          hist hEFEMFraction {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFTau
+            display     	= StatBox
+          }
+          hist hEFEt {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFTau
+            display     	= StatBox
+          }
+          hist hEFEtRaw {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFTau
+            display     	= StatBox
+          }
+          hist hEFEtVsEta {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFTau
+            display     	= StatBox
+          }
+          hist hEFEtVsPhi {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFTau
+            display     	= StatBox
+          }
+          hist hEFEta {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFTau
+            display     	= StatBox
+          }
+          hist hEFEtaVsPhi {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFTau
+            display     	= StatBox
+          }
+          hist hEFIsoFrac {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFTau
+            display     	= StatBox
+          }
+          hist hEFNUM {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFTau
+            display     	= StatBox
+          }
+          hist hEFNUMvsmu {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFTau
+            display     	= StatBox
+          }
+          hist hEFPhi {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFTau
+            display     	= StatBox
+          }
+          hist hEFnTrack {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFTau
+            display     	= StatBox
+          }
+          hist hEFnWideTrack {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFTau
+            display     	= StatBox
+          }
+          hist hScore1p {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFTau
+            display     	= StatBox
+          }
+          hist hScoreSigTrans1p {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFTau
+            display     	= StatBox
+          }
+          hist hScoreSigTransmp {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFTau
+            display     	= StatBox
+          }
+          hist hScoremp {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFTau
+            display     	= StatBox
+          }
+        }
+        dir EFVsOffline {
+          dir BDT {
+            dir 1p_nonCorrected {
+              hist hCentFracRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hChPiEMEOverCaloEMERatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hDRmaxRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEMPOverTrkSysPRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEtOverPtLeadTrkRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hInnerTrkAvgDistRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hIpSigLeadTrkRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hPtRatioEflowApproxRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hSumPtTrkFracRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hTopoInvMassRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+            }
+            dir mp_nonCorrected {
+              hist hCentFracRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hChPiEMEOverCaloEMERatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hDRmaxRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEMPOverTrkSysPRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEtOverPtLeadTrkRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hInnerTrkAvgDistRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hMEflowApproxRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hMassTrkSysRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hPtRatioEflowApproxRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hTrFlightPathSigRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+            }
+          }
+          hist hEFvsOffnTrks {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFVsOffline
+            display     	= StatBox
+          }
+          hist hEFvsOffnWideTrks {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/EFVsOffline
+            display     	= StatBox
+          }
+        }
+        dir L1RoI {
+          hist hL1EtVsEta {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/L1RoI
+            display     	= StatBox
+          }
+          hist hL1EtVsPhi {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/L1RoI
+            display     	= StatBox
+          }
+          hist hL1EtaVsPhi {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIEMIso {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIEta {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIHadCore {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIHadIsol {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIPhi {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoITauClus {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoITauClusEMIso {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIeT {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIisol {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/L1RoI
+            display     	= StatBox
+          }
+        }
+        dir L1VsOffline {
+          hist hL1EtRatio {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/L1VsOffline
+            display     	= StatBox
+          }
+        }
+        dir PreselectionTau {
+          hist hEFEt {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/PreselectionTau
+            display     	= StatBox
+          }
+          hist hEFEt2 {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/PreselectionTau
+            display     	= StatBox
+          }
+          hist hEFEtaVsPhi {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/PreselectionTau
+            display     	= StatBox
+          }
+          hist hEtVsEta {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/PreselectionTau
+            display     	= StatBox
+          }
+          hist hEtVsPhi {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/PreselectionTau
+            display     	= StatBox
+          }
+          hist hEta {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/PreselectionTau
+            display     	= StatBox
+          }
+          hist hFTFnTrack {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/PreselectionTau
+            display     	= StatBox
+          }
+          hist hFTFnWideTrack {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/PreselectionTau
+            display     	= StatBox
+          }
+          hist hPhi {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/PreselectionTau
+            display     	= StatBox
+          }
+        }
+        dir PreselectionVsOffline {
+          hist hEFEtRatio {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/PreselectionVsOffline
+            display     	= StatBox
+          }
+          hist hEtaRatio {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/PreselectionVsOffline
+            display     	= StatBox
+          }
+          hist hPhiRatio {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/PreselectionVsOffline
+            display     	= StatBox
+          }
+          hist hPreselvsOffnTrks {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/PreselectionVsOffline
+            display     	= StatBox
+          }
+          hist hPreselvsOffnWideTrks {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/PreselectionVsOffline
+            display     	= StatBox
+          }
+        }
+        dir TurnOnCurves {
+          dir RecoEfficiency {
+            hist TProfRecoHLTEtaEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPt1pEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPt3pEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPtEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTMuEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTLBEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTNTrackEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTNVtxEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPhiEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPt1PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPt3PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPtEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1EtaEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPt1PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPt3PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPtEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1MuEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1NTrackEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1NVtxEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1PhiEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1Pt1PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1Pt3PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1PtEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTEtaEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPt1pEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPt3pEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPtEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTMuEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTLBEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTNTrackEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTNVtxEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPhiEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPt1PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPt3PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPtEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1EtaEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPt1PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPt3PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPtEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1MuEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1NTrackEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1NVtxEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1PhiEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1Pt1PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1Pt3PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1PtEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+          }
+        }
+      }
+      dir tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40 {
+        dir EFTau {
+          dir BDT {
+            dir 1p_nonCorrected {
+              hist hEFChPiEMEOverCaloEME1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFEMPOverTrkSysP1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFSumPtTrkFrac1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFcentFrac1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFetOverPtLeadTrk1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFinnerTrkAvgDist1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFipSigLeadTrk1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFptRatioEflowApprox1PNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFTau/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+            }
+            dir mp_nonCorrected {
+              hist hEFChPiEMEOverCaloEMEMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFEMPOverTrkSysPMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFcentFracMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFdRmaxMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFetOverPtLeadTrkMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFinnerTrkAvgDistMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFmEflowApproxMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFmassTrkSysMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFptRatioEflowApproxMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEFtrFlightPathSigMPNCorr {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFTau/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+            }
+          }
+          hist hEFEMFraction {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFTau
+            display     	= StatBox
+          }
+          hist hEFEt {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFTau
+            display     	= StatBox
+          }
+          hist hEFEtRaw {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFTau
+            display     	= StatBox
+          }
+          hist hEFEtVsEta {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFTau
+            display     	= StatBox
+          }
+          hist hEFEtVsPhi {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFTau
+            display     	= StatBox
+          }
+          hist hEFEta {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFTau
+            display     	= StatBox
+          }
+          hist hEFEtaVsPhi {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFTau
+            display     	= StatBox
+          }
+          hist hEFIsoFrac {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFTau
+            display     	= StatBox
+          }
+          hist hEFNUM {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFTau
+            display     	= StatBox
+          }
+          hist hEFNUMvsmu {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFTau
+            display     	= StatBox
+          }
+          hist hEFPhi {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFTau
+            display     	= StatBox
+          }
+          hist hEFnTrack {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFTau
+            display     	= StatBox
+          }
+          hist hEFnWideTrack {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFTau
+            display     	= StatBox
+          }
+          hist hScore1p {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFTau
+            display     	= StatBox
+          }
+          hist hScoreSigTrans1p {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFTau
+            display     	= StatBox
+          }
+          hist hScoreSigTransmp {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFTau
+            display     	= StatBox
+          }
+          hist hScoremp {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFTau
+            display     	= StatBox
+          }
+        }
+        dir EFVsOffline {
+          dir BDT {
+            dir 1p_nonCorrected {
+              hist hCentFracRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hChPiEMEOverCaloEMERatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hDRmaxRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEMPOverTrkSysPRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hEtOverPtLeadTrkRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hInnerTrkAvgDistRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hIpSigLeadTrkRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hPtRatioEflowApproxRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hSumPtTrkFracRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+              hist hTopoInvMassRatio1P {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFVsOffline/BDT/1p_nonCorrected
+                display     	= StatBox
+              }
+            }
+            dir mp_nonCorrected {
+              hist hCentFracRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hChPiEMEOverCaloEMERatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hDRmaxRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEMPOverTrkSysPRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hEtOverPtLeadTrkRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hInnerTrkAvgDistRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hMEflowApproxRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hMassTrkSysRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hPtRatioEflowApproxRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+              hist hTrFlightPathSigRatioMP {
+                algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+                output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFVsOffline/BDT/mp_nonCorrected
+                display     	= StatBox
+              }
+            }
+          }
+          hist hEFvsOffnTrks {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFVsOffline
+            display     	= StatBox
+          }
+          hist hEFvsOffnWideTrks {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/EFVsOffline
+            display     	= StatBox
+          }
+        }
+        dir L1RoI {
+          hist hL1EtVsEta {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/L1RoI
+            display     	= StatBox
+          }
+          hist hL1EtVsPhi {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/L1RoI
+            display     	= StatBox
+          }
+          hist hL1EtaVsPhi {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIEMIso {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIEta {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIHadCore {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIHadIsol {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIPhi {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoITauClus {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoITauClusEMIso {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIeT {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIisol {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/L1RoI
+            display     	= StatBox
+          }
+        }
+        dir L1VsOffline {
+          hist hL1EtRatio {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/L1VsOffline
+            display     	= StatBox
+          }
+        }
+        dir PreselectionTau {
+          hist hEFEt {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/PreselectionTau
+            display     	= StatBox
+          }
+          hist hEFEt2 {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/PreselectionTau
+            display     	= StatBox
+          }
+          hist hEFEtaVsPhi {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/PreselectionTau
+            display     	= StatBox
+          }
+          hist hEtVsEta {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/PreselectionTau
+            display     	= StatBox
+          }
+          hist hEtVsPhi {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/PreselectionTau
+            display     	= StatBox
+          }
+          hist hEta {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/PreselectionTau
+            display     	= StatBox
+          }
+          hist hFTFnTrack {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/PreselectionTau
+            display     	= StatBox
+          }
+          hist hFTFnWideTrack {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/PreselectionTau
+            display     	= StatBox
+          }
+          hist hPhi {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/PreselectionTau
+            display     	= StatBox
+          }
+        }
+        dir PreselectionVsOffline {
+          hist hEFEtRatio {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/PreselectionVsOffline
+            display     	= StatBox
+          }
+          hist hEtaRatio {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/PreselectionVsOffline
+            display     	= StatBox
+          }
+          hist hPhiRatio {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+            output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/PreselectionVsOffline
+            display     	= StatBox
+          }
+          hist hPreselvsOffnTrks {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/PreselectionVsOffline
+            display     	= StatBox
+          }
+          hist hPreselvsOffnWideTrks {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/PreselectionVsOffline
+            display     	= StatBox
+          }
+        }
+        dir TurnOnCurves {
+          dir RecoEfficiency {
+            hist TProfRecoHLTEtaEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPt1pEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPt3pEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPtEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTMuEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTLBEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTNTrackEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTNVtxEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPhiEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPt1PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPt3PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPtEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1EtaEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPt1PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPt3PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPtEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1MuEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1NTrackEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1NVtxEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1PhiEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1Pt1PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1Pt3PEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1PtEfficiency {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTEtaEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPt1pEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPt3pEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTHighPtEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTMuEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTLBEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTNTrackEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTNVtxEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPhiEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPt1PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPt3PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoHLTPtEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1EtaEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPt1PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPt3PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1HighPtEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1MuEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1NTrackEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1NVtxEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1PhiEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1Pt1PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1Pt3PEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+            hist TProfRecoL1PtEfficiency_Unbiased {
+              algorithm   	= TAU_HistKolmogorovTest_MaxDist_loose
+              output      	= HLT/TauMon/Expert/tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40/TurnOnCurves/RecoEfficiency
+              display     	= StatBox
+            }
+          }
+        }
+      }
+    }
+    dir Shifter {
+      dir OtherPlots {
+        hist hHLTCounts_shifter {
+          algorithm   	= TAU_HistKolmogorovTest_MaxDist
+          output      	= HLT/TauMon/Shifter/OtherPlots
+          display     	= StatBox
+        }
+        hist hL1Counts_shifter {
+          algorithm   	= TAU_HistKolmogorovTest_MaxDist
+          output      	= HLT/TauMon/Shifter/OtherPlots
+          display     	= StatBox
+        }
+        hist hL1Emulation_shifter {
+          algorithm   	= TAU_HistKolmogorovTest_MaxDist
+          output      	= HLT/TauMon/Shifter/OtherPlots
+          display     	= StatBox
+        }
+        dir tau35_medium1_tracktwoEF_tau25_medium1_tracktwoEF {
+          hist TProfRecoL1_dREfficiency_shifter {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist
+            output      	= HLT/TauMon/Shifter/OtherPlots/tau35_medium1_tracktwoEF_tau25_medium1_tracktwoEF
+            display     	= StatBox
+          }
+        }
+        dir tau35_medium1_tracktwoEF_tau25_medium1_tracktwoEF_03dR30_L1DR-TAU20ITAU12I-J25 {
+          hist TProfRecoL1_dREfficiency_shifter {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist
+            output      	= HLT/TauMon/Shifter/OtherPlots/tau35_medium1_tracktwoEF_tau25_medium1_tracktwoEF_03dR30_L1DR-TAU20ITAU12I-J25
+            display     	= StatBox
+          }
+        }
+        dir tau35_medium1_tracktwoEF_tau25_medium1_tracktwoEF_L1DR-TAU20ITAU12I-J25 {
+          hist TProfRecoL1_dREfficiency_shifter {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist
+            output      	= HLT/TauMon/Shifter/OtherPlots/tau35_medium1_tracktwoEF_tau25_medium1_tracktwoEF_L1DR-TAU20ITAU12I-J25
+            display     	= StatBox
+          }
+        }
+        dir tau35_medium1_tracktwo_tau25_medium1_tracktwo {
+          hist TProfRecoL1_dREfficiency_shifter {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist
+            output      	= HLT/TauMon/Shifter/OtherPlots/tau35_medium1_tracktwo_tau25_medium1_tracktwo
+            display     	= StatBox
+          }
+        }
+        dir tau35_medium1_tracktwo_tau25_medium1_tracktwo_03dR30_L1DR-TAU20ITAU12I-J25 {
+          hist   all_in_dir {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist
+            output      	= HLT/TauMon/Shifter/OtherPlots/tau35_medium1_tracktwo_tau25_medium1_tracktwo_03dR30_L1DR-TAU20ITAU12I-J25
+            display     	= StatBox
+            reference           = HLT_TauTrigger_MainReference
+          }
+        }
+        dir tau35_medium1_tracktwo_tau25_medium1_tracktwo_L1DR-TAU20ITAU12I-J25 {
+          hist   all_in_dir {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist
+            output      	= HLT/TauMon/Shifter/OtherPlots/tau35_medium1_tracktwo_tau25_medium1_tracktwo_L1DR-TAU20ITAU12I-J25
+            display     	= StatBox
+            reference           = HLT_TauTrigger_MainReference
+          }
+        }
+        dir tau35_medium1_tracktwo_tau25_medium1_tracktwo_L1TAU20IM_2TAU12IM {
+          hist   all_in_dir {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist
+            output      	= HLT/TauMon/Shifter/OtherPlots/tau35_medium1_tracktwo_tau25_medium1_tracktwo_L1TAU20IM_2TAU12IM
+            display     	= StatBox
+            reference           = HLT_TauTrigger_MainReference
+          }
+        }
+        dir tau80_medium1_tracktwoEF_L1TAU60_tau35_medium1_tracktwoEF_L1TAU12IM_L1TAU60_DR-TAU20ITAU12I {
+          hist TProfRecoL1_dREfficiency_shifter {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist
+            output      	= HLT/TauMon/Shifter/OtherPlots/tau80_medium1_tracktwoEF_L1TAU60_tau35_medium1_tracktwoEF_L1TAU12IM_L1TAU60_DR-TAU20ITAU12I
+            display     	= StatBox
+          }
+        }
+        dir tau80_medium1_tracktwo_L1TAU60_tau35_medium1_tracktwo_L1TAU12IM_L1TAU60_DR-TAU20ITAU12I {
+          hist TProfRecoL1_dREfficiency_shifter {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist
+            output      	= HLT/TauMon/Shifter/OtherPlots/tau80_medium1_tracktwo_L1TAU60_tau35_medium1_tracktwo_L1TAU12IM_L1TAU60_DR-TAU20ITAU12I
+            display     	= StatBox
+          }
+        }
+      }
+      dir tau25_mediumRNN_tracktwoMVA {
+        dir EFTau {
+          hist hEFEMFraction_shifter {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist
+            output      	= HLT/TauMon/Shifter/tau25_mediumRNN_tracktwoMVA/EFTau
+            display     	= StatBox
+          }
+          hist hEFEMPOverTrkSysP1PNCorr_shifter {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist
+            output      	= HLT/TauMon/Shifter/tau25_mediumRNN_tracktwoMVA/EFTau
+            display     	= StatBox
+          }
+          hist hEFEMPOverTrkSysPMPNCorr_shifter {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist
+            output      	= HLT/TauMon/Shifter/tau25_mediumRNN_tracktwoMVA/EFTau
+            display     	= StatBox
+          }
+          hist hEFEtRaw_shifter {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist
+            output      	= HLT/TauMon/Shifter/tau25_mediumRNN_tracktwoMVA/EFTau
+            display     	= StatBox
+          }
+          hist hEFEtVsEta_shifter {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Shifter/tau25_mediumRNN_tracktwoMVA/EFTau
+            display     	= StatBox
+          }
+          hist hEFEtVsPhi_shifter {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Shifter/tau25_mediumRNN_tracktwoMVA/EFTau
+            display     	= StatBox
+          }
+          hist hEFEt_shifter {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist
+            output      	= HLT/TauMon/Shifter/tau25_mediumRNN_tracktwoMVA/EFTau
+            display     	= StatBox
+          }
+          hist hEFEtaVsPhi_shifter {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Shifter/tau25_mediumRNN_tracktwoMVA/EFTau
+            display     	= StatBox
+          }
+          hist hEFEta_shifter {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist
+            output      	= HLT/TauMon/Shifter/tau25_mediumRNN_tracktwoMVA/EFTau
+            display     	= StatBox
+          }
+          hist hEFIsoFrac_shifter {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist
+            output      	= HLT/TauMon/Shifter/tau25_mediumRNN_tracktwoMVA/EFTau
+            display     	= StatBox
+          }
+          hist hEFPhi_shifter {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist
+            output      	= HLT/TauMon/Shifter/tau25_mediumRNN_tracktwoMVA/EFTau
+            display     	= StatBox
+          }
+          hist hEFSumPtTrkFrac1PNCorr_shifter {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist
+            output      	= HLT/TauMon/Shifter/tau25_mediumRNN_tracktwoMVA/EFTau
+            display     	= StatBox
+          }
+          hist hEFcentFrac1PNCorr_shifter {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist
+            output      	= HLT/TauMon/Shifter/tau25_mediumRNN_tracktwoMVA/EFTau
+            display     	= StatBox
+          }
+          hist hEFcentFracMPNCorr_shifter {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist
+            output      	= HLT/TauMon/Shifter/tau25_mediumRNN_tracktwoMVA/EFTau
+            display     	= StatBox
+          }
+          hist hEFdRmaxMPNCorr_shifter {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist
+            output      	= HLT/TauMon/Shifter/tau25_mediumRNN_tracktwoMVA/EFTau
+            display     	= StatBox
+          }
+          hist hEFetOverPtLeadTrk1PNCorr_shifter {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist
+            output      	= HLT/TauMon/Shifter/tau25_mediumRNN_tracktwoMVA/EFTau
+            display     	= StatBox
+          }
+          hist hEFetOverPtLeadTrkMPNCorr_shifter {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist
+            output      	= HLT/TauMon/Shifter/tau25_mediumRNN_tracktwoMVA/EFTau
+            display     	= StatBox
+          }
+          hist hEFinnerTrkAvgDist1PNCorr_shifter {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist
+            output      	= HLT/TauMon/Shifter/tau25_mediumRNN_tracktwoMVA/EFTau
+            display     	= StatBox
+          }
+          hist hEFinnerTrkAvgDistMPNCorr_shifter {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist
+            output      	= HLT/TauMon/Shifter/tau25_mediumRNN_tracktwoMVA/EFTau
+            display     	= StatBox
+          }
+          hist hEFipSigLeadTrk1PNCorr_shifter {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist
+            output      	= HLT/TauMon/Shifter/tau25_mediumRNN_tracktwoMVA/EFTau
+            display     	= StatBox
+          }
+          hist hEFnTrack_shifter {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist
+            output      	= HLT/TauMon/Shifter/tau25_mediumRNN_tracktwoMVA/EFTau
+            display     	= StatBox
+          }
+          hist hEFnWideTrack_shifter {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist
+            output      	= HLT/TauMon/Shifter/tau25_mediumRNN_tracktwoMVA/EFTau
+            display     	= StatBox
+          }
+          hist hEFtrFlightPathSigMPNCorr_shifter {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist
+            output      	= HLT/TauMon/Shifter/tau25_mediumRNN_tracktwoMVA/EFTau
+            display     	= StatBox
+          }
+          hist hScore1p_shifter {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist
+            output      	= HLT/TauMon/Shifter/tau25_mediumRNN_tracktwoMVA/EFTau
+            display     	= StatBox
+          }
+          hist hScoreSigTrans1p_shifter {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist
+            output      	= HLT/TauMon/Shifter/tau25_mediumRNN_tracktwoMVA/EFTau
+            display     	= StatBox
+          }
+          hist hScoreSigTransmp_shifter {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist
+            output      	= HLT/TauMon/Shifter/tau25_mediumRNN_tracktwoMVA/EFTau
+            display     	= StatBox
+          }
+          hist hScoremp_shifter {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist
+            output      	= HLT/TauMon/Shifter/tau25_mediumRNN_tracktwoMVA/EFTau
+            display     	= StatBox
+          }
+        }
+        dir EFVsOffline {
+          hist hEFvsOffnTrks_shifter {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Shifter/tau25_mediumRNN_tracktwoMVA/EFVsOffline
+            display     	= StatBox
+          }
+          hist hEFvsOffnWideTrks_shifter {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Shifter/tau25_mediumRNN_tracktwoMVA/EFVsOffline
+            display     	= StatBox
+          }
+        }
+        dir L1RoI {
+          hist hL1EtaVsPhi_shifter {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Shifter/tau25_mediumRNN_tracktwoMVA/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIEMIso_shifter {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist
+            output      	= HLT/TauMon/Shifter/tau25_mediumRNN_tracktwoMVA/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIEta_shifter {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist
+            output      	= HLT/TauMon/Shifter/tau25_mediumRNN_tracktwoMVA/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIHadCore_shifter {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist
+            output      	= HLT/TauMon/Shifter/tau25_mediumRNN_tracktwoMVA/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIHadIsol_shifter {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist
+            output      	= HLT/TauMon/Shifter/tau25_mediumRNN_tracktwoMVA/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIPhi_shifter {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist
+            output      	= HLT/TauMon/Shifter/tau25_mediumRNN_tracktwoMVA/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoITauClusEMIso_shifter {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Shifter/tau25_mediumRNN_tracktwoMVA/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoITauClus_shifter {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist
+            output      	= HLT/TauMon/Shifter/tau25_mediumRNN_tracktwoMVA/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIeT_shifter {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist
+            output      	= HLT/TauMon/Shifter/tau25_mediumRNN_tracktwoMVA/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIisol_shifter {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist
+            output      	= HLT/TauMon/Shifter/tau25_mediumRNN_tracktwoMVA/L1RoI
+            display     	= StatBox
+          }
+        }
+        dir L1VsOffline {
+          hist hL1EtRatio_shifter {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist
+            output      	= HLT/TauMon/Shifter/tau25_mediumRNN_tracktwoMVA/L1VsOffline
+            display     	= StatBox
+          }
+        }
+        dir TurnOnCurves {
+          hist   all_in_dir {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist
+            output      	= HLT/TauMon/Shifter/tau25_mediumRNN_tracktwoMVA/TurnOnCurves
+            display     	= StatBox
+     	    reference           = HLT_TauTrigger_MainReference
+          }
+        }
+      }
+      dir tau25_medium1_tracktwoEF {
+        dir EFTau {
+          hist hEFEMFraction_shifter {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist
+            output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwoEF/EFTau
+            display     	= StatBox
+          }
+          hist hEFEMPOverTrkSysP1PNCorr_shifter {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist
+            output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwoEF/EFTau
+            display     	= StatBox
+          }
+          hist hEFEMPOverTrkSysPMPNCorr_shifter {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist
+            output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwoEF/EFTau
+            display     	= StatBox
+          }
+          hist hEFEtRaw_shifter {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist
+            output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwoEF/EFTau
+            display     	= StatBox
+          }
+          hist hEFEtVsEta_shifter {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwoEF/EFTau
+            display     	= StatBox
+          }
+          hist hEFEtVsPhi_shifter {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwoEF/EFTau
+            display     	= StatBox
+          }
+          hist hEFEt_shifter {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist
+            output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwoEF/EFTau
+            display     	= StatBox
+          }
+          hist hEFEtaVsPhi_shifter {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwoEF/EFTau
+            display     	= StatBox
+          }
+          hist hEFEta_shifter {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist
+            output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwoEF/EFTau
+            display     	= StatBox
+          }
+          hist hEFIsoFrac_shifter {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist
+            output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwoEF/EFTau
+            display     	= StatBox
+          }
+          hist hEFPhi_shifter {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist
+            output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwoEF/EFTau
+            display     	= StatBox
+          }
+          hist hEFSumPtTrkFrac1PNCorr_shifter {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist
+            output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwoEF/EFTau
+            display     	= StatBox
+          }
+          hist hEFcentFrac1PNCorr_shifter {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist
+            output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwoEF/EFTau
+            display     	= StatBox
+          }
+          hist hEFcentFracMPNCorr_shifter {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist
+            output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwoEF/EFTau
+            display     	= StatBox
+          }
+          hist hEFdRmaxMPNCorr_shifter {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist
+            output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwoEF/EFTau
+            display     	= StatBox
+          }
+          hist hEFetOverPtLeadTrk1PNCorr_shifter {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist
+            output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwoEF/EFTau
+            display     	= StatBox
+          }
+          hist hEFetOverPtLeadTrkMPNCorr_shifter {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist
+            output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwoEF/EFTau
+            display     	= StatBox
+          }
+          hist hEFinnerTrkAvgDist1PNCorr_shifter {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist
+            output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwoEF/EFTau
+            display     	= StatBox
+          }
+          hist hEFinnerTrkAvgDistMPNCorr_shifter {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist
+            output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwoEF/EFTau
+            display     	= StatBox
+          }
+          hist hEFipSigLeadTrk1PNCorr_shifter {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist
+            output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwoEF/EFTau
+            display     	= StatBox
+          }
+          hist hEFnTrack_shifter {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist
+            output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwoEF/EFTau
+            display     	= StatBox
+          }
+          hist hEFnWideTrack_shifter {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist
+            output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwoEF/EFTau
+            display     	= StatBox
+          }
+          hist hEFtrFlightPathSigMPNCorr_shifter {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist
+            output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwoEF/EFTau
+            display     	= StatBox
+          }
+          hist hScore1p_shifter {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist
+            output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwoEF/EFTau
+            display     	= StatBox
+          }
+          hist hScoreSigTrans1p_shifter {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist
+            output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwoEF/EFTau
+            display     	= StatBox
+          }
+          hist hScoreSigTransmp_shifter {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist
+            output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwoEF/EFTau
+            display     	= StatBox
+          }
+          hist hScoremp_shifter {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist
+            output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwoEF/EFTau
+            display     	= StatBox
+          }
+        }
+        dir EFVsOffline {
+          hist hEFvsOffnTrks_shifter {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwoEF/EFVsOffline
+            display     	= StatBox
+          }
+          hist hEFvsOffnWideTrks_shifter {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwoEF/EFVsOffline
+            display     	= StatBox
+          }
+        }
+        dir L1RoI {
+          hist hL1EtaVsPhi_shifter {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwoEF/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIEMIso_shifter {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist
+            output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwoEF/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIEta_shifter {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist
+            output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwoEF/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIHadCore_shifter {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist
+            output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwoEF/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIHadIsol_shifter {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist
+            output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwoEF/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIPhi_shifter {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist
+            output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwoEF/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoITauClusEMIso_shifter {
+            algorithm   	= HLT_Histogram_Not_Empty&GatherData
+            output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwoEF/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoITauClus_shifter {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist
+            output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwoEF/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIeT_shifter {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist
+            output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwoEF/L1RoI
+            display     	= StatBox
+          }
+          hist hL1RoIisol_shifter {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist
+            output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwoEF/L1RoI
+            display     	= StatBox
+          }
+        }
+        dir L1VsOffline {
+          hist hL1EtRatio_shifter {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist
+            output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwoEF/L1VsOffline
+            display     	= StatBox
+          }
+        }
+        dir TurnOnCurves {
+          hist   all_in_dir {
+            algorithm   	= TAU_HistKolmogorovTest_MaxDist
+            output      	= HLT/TauMon/Shifter/tau25_medium1_tracktwoEF/TurnOnCurves
+            display     	= StatBox
+            reference           = HLT_TauTrigger_MainReference
+          }
+        }
+      }
+    }
+  }
 }
 
 ##############
@@ -24732,13 +16994,15 @@ dir HLT {
 algorithm HLT_TAU_Histogram_Not_Empty&GatherData {
   libname = libdqm_algorithms.so
   name =  HLT_TAU_Histogram_Not_Empty&GatherData
-  reference = stream=physics_Main:CentrallyManagedReferences_TriggerMain;CentrallyManagedReferences_Trigger
+#  reference = stream=physics_Main:CentrallyManagedReferences_TriggerMain;CentrallyManagedReferences_Trigger
+  reference = stream=physics_Main:HLT_TauTrigger_MainReference;HLT_TauTrigger_ExpressReference
 }
 
 compositeAlgorithm HLT_TAU_Histogram_Not_Empty&GatherData {
   subalgs = GatherData,Histogram_Not_Empty
   libnames = libdqm_algorithms.so
-  reference = stream=physics_Main:CentrallyManagedReferences_TriggerMain;CentrallyManagedReferences_Trigger
+#  reference = stream=physics_Main:CentrallyManagedReferences_TriggerMain;CentrallyManagedReferences_Trigger
+  reference = stream=physics_Main:HLT_TauTrigger_MainReference;HLT_TauTrigger_ExpressReference
 }
 
 algorithm TAU_HistKolmogorovTest_MaxDist {
@@ -24746,7 +17010,8 @@ algorithm TAU_HistKolmogorovTest_MaxDist {
   name = KolmogorovTest_MaxDist
   thresholds = TAU_HistKolmogorovTest_MaxDist_Threshold
   MinStat = -1
-  reference = stream=physics_Main:CentrallyManagedReferences_TriggerMain;CentrallyManagedReferences_Trigger
+#  reference = stream=physics_Main:CentrallyManagedReferences_TriggerMain;CentrallyManagedReferences_Trigger
+  reference = stream=physics_Main:HLT_TauTrigger_MainReference;HLT_TauTrigger_ExpressReference
 }
 
 algorithm TAU_HistKolmogorovTest_MaxDist_loose {
@@ -24754,7 +17019,8 @@ algorithm TAU_HistKolmogorovTest_MaxDist_loose {
   name = KolmogorovTest_MaxDist
   thresholds = TAU_HistKolmogorovTest_MaxDist_Threshold_loose
   MinStat = -1
-  reference = stream=physics_Main:CentrallyManagedReferences_TriggerMain;CentrallyManagedReferences_Trigger
+#  reference = stream=physics_Main:CentrallyManagedReferences_TriggerMain;CentrallyManagedReferences_Trigger
+  reference = stream=physics_Main:HLT_TauTrigger_MainReference;HLT_TauTrigger_ExpressReference
 }
 
 ###############
@@ -24774,3 +17040,21 @@ thresholds TAU_HistKolmogorovTest_MaxDist_Threshold_loose {
     error = 28.0
   }
 }
+
+###############################################
+# Local references for last days of 2018 pp run
+###############################################
+
+reference HLT_TauTrigger_ExpressReference {
+  location = /eos/atlas/atlascerngroupdisk/data-dqm/references/Collisions/,root://eosatlas.cern.ch//eos/atlas/atlascerngroupdisk/data-dqm/references/Collisions/
+  file = data18_13TeV.00362661.express_express.merge.HIST.f993_h325._0001.1
+  path = run_362661
+  name = same_name
+}
+
+reference HLT_TauTrigger_MainReference {
+  location = /eos/atlas/atlascerngroupdisk/data-dqm/references/Collisions/,root://eosatlas.cern.ch//eos/atlas/atlascerngroupdisk/data-dqm/references/Collisions/
+  file = data18_13TeV.00362661.physics_Main.merge.HIST.f993_h325._0001.1
+  path = run_362661
+  name = same_name
+}
diff --git a/DataQuality/DataQualityConfigurations/config/JetTagging/collisions_minutes10.config b/DataQuality/DataQualityConfigurations/config/JetTagging/collisions_minutes10.config
index 54048e37b85528355c39c835a110995895c4a91e..ddcc15da80846c03d148fe8c322bc6343c7568c7 100644
--- a/DataQuality/DataQualityConfigurations/config/JetTagging/collisions_minutes10.config
+++ b/DataQuality/DataQualityConfigurations/config/JetTagging/collisions_minutes10.config
@@ -11,6 +11,8 @@ output top_level {
 	output Quality_Control {
         }
     	output Diagnostics {
+    		output JetInformation {
+                }
     		output TrackInformation {
 			output TracksWithFailedCuts {
 			}
@@ -36,11 +38,75 @@ dir JetTagging {
 
 	reference = CentrallyManagedReferences
 
+	hist track_selector_all_LS {
+		algorithm = JetTag_BinsDiffFromStripMedian
+		output = JetTagging/Quality_Control
+	}
 	hist track_selector_eff_LS {
-		algorithm = JetTag_GatherData
+		algorithm = JetTag_BinsDiffFromStripMedian
 		output = JetTagging/Quality_Control
 	}
 
+  hist jet_2D_kinematic_LS {
+    algorithm = JetTag_BinsDiffFromStripMedian
+    output = JetTagging/Diagnostics/JetInformation
+  }
+  hist jet_2D_quality_LS {
+    algorithm = JetTag_BinsDiffFromStripMedian
+    output = JetTagging/Diagnostics/JetInformation
+  }
+  hist mv_tag_60_rate_2D_LS {
+    algorithm = JetTag_BinsDiffFromStripMedian
+    output = JetTagging/Diagnostics/JetInformation
+  }
+  hist mv_tag_70_rate_2D_LS {
+    algorithm = JetTag_BinsDiffFromStripMedian
+    output = JetTagging/Diagnostics/JetInformation
+  }
+  hist mv_tag_77_rate_2D_LS {
+    algorithm = JetTag_BinsDiffFromStripMedian
+    output = JetTagging/Diagnostics/JetInformation
+  }
+  hist mv_tag_85_rate_2D_LS {
+    algorithm = JetTag_BinsDiffFromStripMedian
+    output = JetTagging/Diagnostics/JetInformation
+  }
+  hist tag_mv_w_LS {
+    display = LogY
+    algorithm =  KolTest
+    weight = 0.8
+    output = JetTagging/Diagnostics
+  }
+  hist tag_mv_w_pT10_20_LS {
+    display = LogY
+    algorithm =  KolTest
+    weight = 0.8
+    output = JetTagging/Quality_Control
+  }
+  hist tag_mv_w_pT20_50_LS {
+    display = LogY
+    algorithm =  KolTest
+    weight = 0.8
+    output = JetTagging/Quality_Control
+  }
+  hist tag_mv_w_pT50_100_LS {
+    display = LogY
+    algorithm =  KolTest
+    weight = 0.8
+    output = JetTagging/Quality_Control
+  }
+  hist tag_mv_w_pT100_200_LS {
+    display = LogY
+    algorithm =  KolTest
+    weight = 0.8
+    output = JetTagging/Quality_Control
+  }
+  hist tag_mv_w_pT200_LS {
+    display = LogY
+    algorithm =  KolTest
+    weight = 0.8
+    output = JetTagging/Quality_Control
+  }
 	hist tracks_pTMin_2D_LS {
 		algorithm = JetTag_BinsDiffFromStripMedian
 		output = JetTagging/Diagnostics/TrackInformation
@@ -62,10 +128,6 @@ dir JetTagging {
 		algorithm = JetTag_BinsDiffFromStripMedian
 		output = JetTagging/Diagnostics/TrackInformation/TracksWithFailedCuts
 	}
-	###hist tracks_etaMax_2D_LS {
-	###	algorithm = JetTag_BinsDiffFromStripMedian
-	###	output = JetTagging/Diagnostics/TrackInformation/TracksWithFailedCuts
-	###}
 	hist tracks_nHitBLayer_2D_LS {
 		algorithm = JetTag_BinsDiffFromStripMedian
 		output = JetTagging/Diagnostics/TrackInformation/TracksWithFailedCuts
diff --git a/DataQuality/DataQualityConfigurations/config/JetTagging/collisions_run.config b/DataQuality/DataQualityConfigurations/config/JetTagging/collisions_run.config
index c8b889e36358487eaed8350b71f9eef223077275..29034db3832b33f96149d9bb6a207710410926a6 100644
--- a/DataQuality/DataQualityConfigurations/config/JetTagging/collisions_run.config
+++ b/DataQuality/DataQualityConfigurations/config/JetTagging/collisions_run.config
@@ -177,49 +177,41 @@ dir JetTagging {
     output = JetTagging/Quality_Control
   }
   hist tag_MV_w_phi_sum85OP {
-    ###display = LogY
     algorithm =  KolTest
     weight = 0.8
     output = JetTagging/Quality_Control
   }
   hist tag_MV_w_phi_sum77OP {
-    ###display = LogY
     algorithm =  KolTest
     weight = 0.8
     output = JetTagging/Quality_Control
   }
   hist tag_MV_w_phi_sum70OP {
-    ###display = LogY
     algorithm =  KolTest
     weight = 0.8
     output = JetTagging/Quality_Control
   }
   hist tag_MV_w_phi_sumAll {
-    ###display = LogY
     algorithm =  KolTest
     weight = 0.8
     output = JetTagging/Quality_Control
   }
   hist tag_MV_w_phi_frac85OP {
-    ###display = LogY
     algorithm =  KolTest
     weight = 0.8
     output = JetTagging/Quality_Control
   }
   hist tag_MV_w_phi_frac77OP {
-    ###display = LogY
     algorithm =  KolTest
     weight = 0.8
     output = JetTagging/Quality_Control
   }
   hist tag_MV_w_phi_frac70OP {
-    ###display = LogY
     algorithm =  KolTest
     weight = 0.8
     output = JetTagging/Quality_Control
   }
   hist tag_MV_w_phi_frac50OP { #switch to 60OP?
-   ### display = LogY
     algorithm =  KolTest
     weight = 0.8
     output = JetTagging/Quality_Control
@@ -239,11 +231,6 @@ dir JetTagging {
 
   ####### NEW: 2018 DQ ###############
 
-  hist jet_MV_top {
-    algorithm = KolTest
-    display = LogY
-    output = JetTagging/Quality_Control
-  }
   hist n_smt_jet {
     algorithm = KolTest
     display = LogY
@@ -266,7 +253,7 @@ dir JetTagging {
     weight = 0.8
     output = JetTagging/Quality_Control
   }
-  hist tag_MV_w_mu50_70 {
+  hist tag_MV_w_mu50_100 {
     algorithm = KolTest
     display = LogY
     weight = 0.8
@@ -294,16 +281,6 @@ dir JetTagging {
     algorithm = KolTest
     output = JetTagging/Diagnostics
   }
-  hist global_xPrimVtx {
-    algorithm = KolTest_Koord
-    display = LogY
-    output = JetTagging/Diagnostics
-  }
-  hist global_yPrimVtx {
-    algorithm = KolTest_Koord
-    display = LogY
-    output = JetTagging/Diagnostics
-  }
   hist global_zPrimVtx {
     algorithm = KolTest_Koord
     output = JetTagging/Diagnostics
@@ -317,22 +294,6 @@ dir JetTagging {
     algorithm = KolTest
     output = JetTagging/Diagnostics
   }
- ### hist tag_IP2D_n {
- ###   algorithm = KolTest
- ###   output = JetTagging/Diagnostics
- ### }
- ### hist tag_IP2D_b {
- ###   algorithm = KolTest
- ###   output = JetTagging/Diagnostics
- ### }
- ### hist tag_IP2D_u {
- ###   algorithm = KolTest
- ###   output = JetTagging/Diagnostics
- ###  }
- ### hist tag_IP2D_c {
- ###   algorithm = KolTest
- ###   output = JetTagging/Diagnostics
- ###  }
   hist tag_IP2D_llr {
     display = LogY
     algorithm = KolTest
@@ -342,35 +303,11 @@ dir JetTagging {
     algorithm = KolTest
     output = JetTagging/Diagnostics
   }
- ### hist tag_IP3D_b {
- ###   algorithm = KolTest
- ###   output = JetTagging/Diagnostics
- ### }
- ### hist tag_IP3D_u {
- ###   algorithm = KolTest
- ###   output = JetTagging/Diagnostics
- ### }
- ### hist tag_IP3D_c {
- ###   algorithm = KolTest
- ###   output = JetTagging/Diagnostics
- ### }
   hist tag_IP3D_llr {
     display = LogY
     algorithm = KolTest
     output = JetTagging/Diagnostics
   }
- ### hist tag_SV1_b {
- ###   algorithm = KolTest
- ###   output = JetTagging/Diagnostics
- ### }
- ### hist tag_SV1_u {
- ###   algorithm = KolTest
- ###   output = JetTagging/Diagnostics
- ### }
- ### hist tag_SV1_c {
- ###   algorithm = KolTest
- ###   output = JetTagging/Diagnostics
- ### }
   hist tag_SV1_llr {
     display = LogY
     algorithm = KolTest
@@ -415,6 +352,11 @@ dir JetTagging {
     algorithm = KolTest
     output = JetTagging/Diagnostics
   }
+  hist jet_MV_top {
+    algorithm = KolTest
+    display = LogY
+    output = JetTagging/Diagnostics
+  }
   hist n_mu {
     algorithm = KolTest
     output = JetTagging/Diagnostics
@@ -462,15 +404,15 @@ dir JetTagging {
     algorithm = JetTag_BinsDiffFromStripMedian
     output = JetTagging/Diagnostics/JetInformation
   }
-  hist mv_tag_80_rate_2D {
+  hist mv_tag_77_rate_2D {
     algorithm = JetTag_BinsDiffFromStripMedian
     output = JetTagging/Diagnostics/JetInformation
   }
-  hist jet_2D_jvt {
+  hist mv_tag_85_rate_2D {
     algorithm = JetTag_BinsDiffFromStripMedian
     output = JetTagging/Diagnostics/JetInformation
   }
-  hist jet_2D_kinematic {
+  hist jet_2D_all {
     algorithm = JetTag_BinsDiffFromStripMedian
     output = JetTagging/Diagnostics/JetInformation
   }
@@ -478,7 +420,17 @@ dir JetTagging {
     algorithm = JetTag_BinsDiffFromStripMedian
     output = JetTagging/Diagnostics/JetInformation
   }
-  hist jet_2D_all {
+  hist jet_2D_kinematic {
+    algorithm = JetTag_BinsDiffFromStripMedian
+    output = JetTagging/Diagnostics/JetInformation
+  }
+  ####### NEW: 2018 DQ ###############
+  hist jet_2D_mjvt {
+    algorithm = JetTag_BinsDiffFromStripMedian
+    output = JetTagging/Diagnostics/JetInformation
+  }
+  ####### NEW: 2018 DQ ###############
+  hist jet_2D_overlap {
     algorithm = JetTag_BinsDiffFromStripMedian
     output = JetTagging/Diagnostics/JetInformation
   }
@@ -490,6 +442,15 @@ dir JetTagging {
     algorithm = JetTag_BinsDiffFromStripMedian
     output = JetTagging/Diagnostics/JetInformation
   }
+  ####### NEW: 2018 DQ ###############
+  hist jet_2D_tbad {
+    algorithm = JetTag_BinsDiffFromStripMedian
+    output = JetTagging/Diagnostics/JetInformation
+  }
+  hist jet_2D_tsmt {
+    algorithm = JetTag_BinsDiffFromStripMedian
+    output = JetTagging/Diagnostics/JetInformation
+  }
 
   ##################################################################
   ###  Diagnostics/TrackInformation
@@ -532,10 +493,6 @@ dir JetTagging {
     algorithm = JetTag_BinsDiffFromStripMedian
     output = JetTagging/Diagnostics/TrackInformation/TracksWithFailedCuts
   }
-  ###hist tracks_etaMax_2D {
-  ###  algorithm = JetTag_BinsDiffFromStripMedian
-  ###  output = JetTagging/Diagnostics/TrackInformation/TracksWithFailedCuts
-  ###}
   hist tracks_nHitBLayer_2D {
     algorithm = JetTag_BinsDiffFromStripMedian
     output = JetTagging/Diagnostics/TrackInformation/TracksWithFailedCuts
diff --git a/DataQuality/DataQualityConfigurations/config/JetTagging/heavyions_minutes10.config b/DataQuality/DataQualityConfigurations/config/JetTagging/heavyions_minutes10.config
index d6b36a4c0fbcc4959d662ab251d4bf54a6978fa8..ab6283ec0fd04b17d0c5b67bd5e931a1d8956841 100644
--- a/DataQuality/DataQualityConfigurations/config/JetTagging/heavyions_minutes10.config
+++ b/DataQuality/DataQualityConfigurations/config/JetTagging/heavyions_minutes10.config
@@ -1,5 +1,5 @@
 # **********************************************************************
-# $Id: heavyions_minutes10.config 516887 2012-09-09 22:34:18Z vogel $
+# $Id: heavyions_minutes10.config 2018-10-24 16:46:00 alaperto $
 # **********************************************************************
 
 ##############
@@ -11,6 +11,8 @@ output top_level {
 	output Quality_Control {
         }
     	output Diagnostics {
+    		output JetInformation {
+                }		
     		output TrackInformation {
 			output TracksWithFailedCuts {
 			}
@@ -36,11 +38,75 @@ dir JetTagging {
 
 	reference = CentrallyManagedReferences
 
+	hist track_selector_all_LS {
+		algorithm = JetTag_BinsDiffFromStripMedian
+		output = JetTagging/Quality_Control
+	}
 	hist track_selector_eff_LS {
-		algorithm = JetTag_GatherData
+		algorithm = JetTag_BinsDiffFromStripMedian
 		output = JetTagging/Quality_Control
 	}
 
+  hist jet_2D_kinematic_LS {
+    algorithm = JetTag_BinsDiffFromStripMedian
+    output = JetTagging/Diagnostics/JetInformation
+  }
+  hist jet_2D_quality_LS {
+    algorithm = JetTag_BinsDiffFromStripMedian
+    output = JetTagging/Diagnostics/JetInformation
+  }
+  hist mv_tag_60_rate_2D_LS {
+    algorithm = JetTag_BinsDiffFromStripMedian
+    output = JetTagging/Diagnostics/JetInformation
+  }
+  hist mv_tag_70_rate_2D_LS {
+    algorithm = JetTag_BinsDiffFromStripMedian
+    output = JetTagging/Diagnostics/JetInformation
+  }
+  hist mv_tag_77_rate_2D_LS {
+    algorithm = JetTag_BinsDiffFromStripMedian
+    output = JetTagging/Diagnostics/JetInformation
+  }
+  hist mv_tag_85_rate_2D_LS {
+    algorithm = JetTag_BinsDiffFromStripMedian
+    output = JetTagging/Diagnostics/JetInformation
+  }
+  hist tag_mv_w_LS {
+    display = LogY
+    algorithm =  KolTest
+    weight = 0.8
+    output = JetTagging/Diagnostics
+  }
+  hist tag_mv_w_pT10_20_LS {
+    display = LogY
+    algorithm =  KolTest
+    weight = 0.8
+    output = JetTagging/Quality_Control
+  }
+  hist tag_mv_w_pT20_50_LS {
+    display = LogY
+    algorithm =  KolTest
+    weight = 0.8
+    output = JetTagging/Quality_Control
+  }
+  hist tag_mv_w_pT50_100_LS {
+    display = LogY
+    algorithm =  KolTest
+    weight = 0.8
+    output = JetTagging/Quality_Control
+  }
+  hist tag_mv_w_pT100_200_LS {
+    display = LogY
+    algorithm =  KolTest
+    weight = 0.8
+    output = JetTagging/Quality_Control
+  }
+  hist tag_mv_w_pT200_LS {
+    display = LogY
+    algorithm =  KolTest
+    weight = 0.8
+    output = JetTagging/Quality_Control
+  }
 	hist tracks_pTMin_2D_LS {
 		algorithm = JetTag_BinsDiffFromStripMedian
 		output = JetTagging/Diagnostics/TrackInformation
@@ -62,10 +128,6 @@ dir JetTagging {
 		algorithm = JetTag_BinsDiffFromStripMedian
 		output = JetTagging/Diagnostics/TrackInformation/TracksWithFailedCuts
 	}
-	hist tracks_etaMax_2D_LS {
-		algorithm = JetTag_BinsDiffFromStripMedian
-		output = JetTagging/Diagnostics/TrackInformation/TracksWithFailedCuts
-	}
 	hist tracks_nHitBLayer_2D_LS {
 		algorithm = JetTag_BinsDiffFromStripMedian
 		output = JetTagging/Diagnostics/TrackInformation/TracksWithFailedCuts
@@ -107,7 +169,16 @@ dir JetTagging {
 		algorithm = JetTag_BinsDiffFromStripMedian
 		output = JetTagging/Diagnostics/TrackInformation/TracksWithFailedCuts
 	}
-
+  	hist jet_tracks_d0_LS {
+    	        display = LogY
+    	        algorithm = KolTest
+   	        output = JetTagging/Diagnostics/TrackInformation
+	} 
+  	hist jet_tracks_z0_LS {
+    	        display = LogY
+    		algorithm = KolTest
+    		output = JetTagging/Diagnostics/TrackInformation
+  	} 
  
 }
 
@@ -127,7 +198,7 @@ algorithm KolmogorovTest_MaxDistPlusNorm {
   	name = KolmogorovTest_MaxDistPlusNorm
 thresholds = KVT_Maxdist
 #reference = LocallyManagedReferences
-reference = CentrallyManagedReferences
+reference = stream=physics_Main:CentrallyManagedReferences_Main;CentrallyManagedReferences
 }
 
 #algorithm GatherData {
@@ -178,7 +249,7 @@ libname = libdqm_algorithms.so
 algorithm KolTest {
   name = KolmogorovTest_MaxDistPlusNorm&GatherData&Histogram_Not_Empty
   #reference = LocallyManagedReferences
-  reference = CentrallyManagedReferences
+  reference = stream=physics_Main:CentrallyManagedReferences_Main;CentrallyManagedReferences
   KolmogorovTest_MaxDistPlusNorm|thresholds = KVT_Maxdist
 }
 
@@ -191,7 +262,7 @@ libname = libdqm_algorithms.so
 algorithm KolTest_Koord {
   name = KolmogorovTest_MaxDistPlusNorm&GatherData
   #reference = LocallyManagedReferences
-  reference = CentrallyManagedReferences
+  reference = stream=physics_Main:CentrallyManagedReferences_Main;CentrallyManagedReferences
 KolmogorovTest_MaxDistPlusNorm|thresholds = KVT_Maxdist_Koord
 }
 
@@ -212,7 +283,7 @@ compositeAlgorithm Simple_gaus_Fit&KolmogorovTest_MaxDistPlusNorm&GatherData&His
 algorithm KolTestPlusGaus {
   	name = Simple_gaus_Fit&KolmogorovTest_MaxDistPlusNorm&GatherData&Histogram_Not_Empty
   	#reference = LocallyManagedReferences
-  reference = CentrallyManagedReferences
+  reference = stream=physics_Main:CentrallyManagedReferences_Main;CentrallyManagedReferences
   	KolmogorovTest_MaxDistPlusNorm|thresholds = KVT_Maxdist
 	Simple_gaus_Fit|thresholds = GausFitThres
 }
@@ -231,7 +302,7 @@ compositeAlgorithm Simple_pol1_Fit&KolmogorovTest_MaxDistPlusNorm&GatherData&His
 algorithm KolTestPlusLinear {
   	name = Simple_pol1_Fit&KolmogorovTest_MaxDistPlusNorm&GatherData&Histogram_Not_Empty
   	#reference = LocallyManagedReferences
-  reference = CentrallyManagedReferences
+  reference = stream=physics_Main:CentrallyManagedReferences_Main;CentrallyManagedReferences
   	KolmogorovTest_MaxDistPlusNorm|thresholds = KVT_Maxdist
 	Simple_pol1_Fit|thresholds = LinFitThres
 }
diff --git a/DataQuality/DataQualityConfigurations/config/JetTagging/heavyions_run.config b/DataQuality/DataQualityConfigurations/config/JetTagging/heavyions_run.config
index e171a7ef675d7b070e66dbd568e07dc66d219bba..605707b1a313ef8692b21065400e202f9d21d48e 100644
--- a/DataQuality/DataQualityConfigurations/config/JetTagging/heavyions_run.config
+++ b/DataQuality/DataQualityConfigurations/config/JetTagging/heavyions_run.config
@@ -1,622 +1,538 @@
 # **********************************************************************
-# $Id: heavyions_run.config 516887 2012-09-09 22:34:18Z vogel $
+# $Id: heavyions_run.config 2018-10-24 16:46:00 alaperto $
 # **********************************************************************
 
 #######################
 # Histogram Assessments
 #######################
 
+dir JetTagging {
 
+    reference = CentrallyManagedReferences
 
-dir JetTagging {
+  ##################################################################
+  ###  Quality_Control
+  ##################################################################
+  hist DQ_Cutflow {
+    algorithm = KolTest
+    display = LogY
+    output = JetTagging/Quality_Control
+  }
+  hist Jet_Cutflow {
+    algorithm = KolTest
+    display = LogY
+    output = JetTagging/Quality_Control
+  }
+  hist jet_tracks_n {
+    algorithm = KolTest
+    output = JetTagging/Quality_Control
+  }
+  hist jet_tracks_pt {
+    display = LogY
+    algorithm = KolTest
+    output = JetTagging/Quality_Control
+  }
+  hist jet_tracks_eta {
+    algorithm = KolTest
+    output = JetTagging/Quality_Control
+  }
+  hist jet_tracks_phi {
+    algorithm = KolTest
+    output = JetTagging/Quality_Control
+  }
+  hist jet_tracks_hits_SCT {
+    algorithm = KolTest
+    output = JetTagging/Quality_Control
+  }
+  hist jet_tracks_hits_Pixel {
+    algorithm = KolTest
+    output = JetTagging/Quality_Control
+  }
+  hist jet_tracks_hits_BLayer {
+    algorithm = KolTest
+    output = JetTagging/Quality_Control
+  }
+  hist track_selector_eff {
+    algorithm = JetTag_GatherData
+    output = JetTagging/Quality_Control
+  }
+  hist track_selector_suspect {
+    algorithm = JetTag_GatherData
+    output = JetTagging/Quality_Control
+  }
+  hist track_selector_all {
+    algorithm = JetTag_GatherData
+    output = JetTagging/Quality_Control
+  }
+  hist global_BLayerHits {
+    algorithm = KolTest
+    output = JetTagging/Quality_Control
+  }
+  hist global_PixelHits {
+    algorithm = KolTest
+    output = JetTagging/Quality_Control
+  }
+  hist global_SiHits {
+    algorithm = KolTest
+    output = JetTagging/Quality_Control
+  }
+  hist global_nPrimVtx {
+    algorithm = KolTest
+    output = JetTagging/Quality_Control
+  }
+  hist tag_SV1IP3D_w {
+    display = LogY
+    algorithm =  KolTest
+    weight = 0.8
+    output = JetTagging/Quality_Control
+  }
+  hist tag_MV_w_pT10_20 {
+    display = LogY
+    algorithm =  KolTest
+    weight = 0.8
+    output = JetTagging/Quality_Control
+  }
+  hist tag_MV_w_pT20_50 {
+    display = LogY
+    algorithm =  KolTest
+    weight = 0.8
+    output = JetTagging/Quality_Control
+  }
+  hist tag_MV_w_pT50_100 {
+    display = LogY
+    algorithm =  KolTest
+    weight = 0.8
+    output = JetTagging/Quality_Control
+  }
+  hist tag_MV_w_pT100_200 {
+    display = LogY
+    algorithm =  KolTest
+    weight = 0.8
+    output = JetTagging/Quality_Control
+  }
+  hist tag_MV_w_pT200 {
+    display = LogY
+    algorithm =  KolTest
+    weight = 0.8
+    output = JetTagging/Quality_Control
+  }
+  hist tag_MV_w_eta0_05 {
+    display = LogY
+    algorithm =  KolTest
+    weight = 0.8
+    output = JetTagging/Quality_Control
+  }
+  hist tag_MV_w_eta05_10 {
+    display = LogY
+    algorithm =  KolTest
+    weight = 0.8
+    output = JetTagging/Quality_Control
+  }
+  hist tag_MV_w_eta10_15 {
+    display = LogY
+    algorithm =  KolTest
+    weight = 0.8
+    output = JetTagging/Quality_Control
+  }
+  hist tag_MV_w_eta15_20 {
+    display = LogY
+    algorithm =  KolTest
+    weight = 0.8
+    output = JetTagging/Quality_Control
+  }
+  hist tag_MV_w_eta20_25 {
+    display = LogY
+    algorithm =  KolTest
+    weight = 0.8
+    output = JetTagging/Quality_Control
+  }
+  hist tag_MV_w_phi0_07 {
+    display = LogY
+    algorithm =  KolTest
+    weight = 0.8
+    output = JetTagging/Quality_Control
+  }
+  hist tag_MV_w_phi07_14 {
+    display = LogY
+    algorithm =  KolTest
+    weight = 0.8
+    output = JetTagging/Quality_Control
+  }
+  hist tag_MV_w_phi14_21 {
+    display = LogY
+    algorithm =  KolTest
+    weight = 0.8
+    output = JetTagging/Quality_Control
+  }
+  hist tag_MV_w_phi21_28 {
+    display = LogY
+    algorithm =  KolTest
+    weight = 0.8
+    output = JetTagging/Quality_Control
+  }
+  hist tag_MV_w_phi28 {
+    display = LogY
+    algorithm =  KolTest
+    weight = 0.8
+    output = JetTagging/Quality_Control
+  }
+  hist tag_MV_w_phi_sum85OP {
+    algorithm =  KolTest
+    weight = 0.8
+    output = JetTagging/Quality_Control
+  }
+  hist tag_MV_w_phi_sum77OP {
+    algorithm =  KolTest
+    weight = 0.8
+    output = JetTagging/Quality_Control
+  }
+  hist tag_MV_w_phi_sum70OP {
+    algorithm =  KolTest
+    weight = 0.8
+    output = JetTagging/Quality_Control
+  }
+  hist tag_MV_w_phi_sumAll {
+    algorithm =  KolTest
+    weight = 0.8
+    output = JetTagging/Quality_Control
+  }
+  hist tag_MV_w_phi_frac85OP {
+    algorithm =  KolTest
+    weight = 0.8
+    output = JetTagging/Quality_Control
+  }
+  hist tag_MV_w_phi_frac77OP {
+    algorithm =  KolTest
+    weight = 0.8
+    output = JetTagging/Quality_Control
+  }
+  hist tag_MV_w_phi_frac70OP {
+    algorithm =  KolTest
+    weight = 0.8
+    output = JetTagging/Quality_Control
+  }
+  hist tag_MV_w_phi_frac50OP { #switch to 60OP?
+    algorithm =  KolTest
+    weight = 0.8
+    output = JetTagging/Quality_Control
+  }
+  hist tag_SV1IP3D_w_sj {
+    display = LogY
+    algorithm =  KolTest
+    weight = 0.8
+    output = JetTagging/Quality_Control
+  }
+  hist tag_MV_w_sj {
+    display = LogY
+    algorithm =  KolTest
+    weight = 0.8
+    output = JetTagging/Quality_Control
+  }
+
+  ####### NEW: 2018 DQ ###############
 
-	reference = CentrallyManagedReferences
-
-	hist jet_tracks_hits_SCT {
-		algorithm = KolTest
-		output = JetTagging/Quality_Control
-	}
-	hist jet_tracks_hits_Pixel {
-		algorithm = KolTest
-		output = JetTagging/Quality_Control
-	}
-
-
-	hist taggability {
-		algorithm = JetTag_GatherData
-		output = JetTagging/Quality_Control
-	}
-
-
-	#hist jet_electrons_n {
-	#	algorithm = KolTest
-	#	output = JetTagging/Diagnostics
-	#}
-	hist jet_muons_n {
-		algorithm = KolTest
-		display = LogY
-		output = JetTagging/Diagnostics
-	}
-	hist tag_SV0_w {
-		algorithm = KolTest
- 		weight = 0.8
-		display = LogY
-		output = JetTagging/Diagnostics
-	}
-
-	hist track_selector_eff {
-		algorithm = JetTag_GatherData
-		output = JetTagging/Quality_Control
-	}
-
-	hist ip3d_tag_neg_rate_2D {
-		algorithm = JetTag_BinsDiffFromStripMedian
-		output = JetTagging/Diagnostics/JetInformation
-	}
-
-	hist ip3d_tag_pos_rate_2D {
-		algorithm = JetTag_BinsDiffFromStripMedian
-		output = JetTagging/Diagnostics/JetInformation
-	}
-
-	hist mv1_tag_neg_rate_2D {
-		algorithm = JetTag_BinsDiffFromStripMedian
-		output = JetTagging/Diagnostics/JetInformation
-	}
-
-	hist mv1_tag_pos_rate_2D {
-		algorithm = JetTag_BinsDiffFromStripMedian
-		output = JetTagging/Diagnostics/JetInformation
-	}
-
-
-	hist sv1_tag_neg_rate_2D {
-		algorithm = JetTag_BinsDiffFromStripMedian
-		output = JetTagging/Diagnostics/JetInformation
-	}
-
-	hist sv1_tag_pos_rate_2D {
-		algorithm = JetTag_BinsDiffFromStripMedian
-		output = JetTagging/Diagnostics/JetInformation
-	}
-
-	hist sv2_tag_neg_rate_2D {
-		algorithm = JetTag_BinsDiffFromStripMedian
-		output = JetTagging/Diagnostics/JetInformation
-	}
-
-	hist sv2_tag_pos_rate_2D {
-		algorithm = JetTag_BinsDiffFromStripMedian
-		output = JetTagging/Diagnostics/JetInformation
-	}
-
-	hist jet_2D_kinematic {
-		algorithm = JetTag_BinsDiffFromStripMedian
-		output = JetTagging/Diagnostics/JetInformation
-	}
-
-	hist jet_2D_good {
-		algorithm = JetTag_BinsDiffFromStripMedian
-		output = JetTagging/Diagnostics/JetInformation
-	}
-
-	hist tracks_pTMin_2D {
-		algorithm = JetTag_BinsDiffFromStripMedian
-		output = JetTagging/Diagnostics/TrackInformation
-	}
-
-	hist tracks_d0Max_2D {
-		algorithm = JetTag_BinsDiffFromStripMedian
-		output = JetTagging/Diagnostics/TrackInformation/TracksWithFailedCuts
-	}
-	hist tracks_z0Max_2D {
-		algorithm = JetTag_BinsDiffFromStripMedian
-		output = JetTagging/Diagnostics/TrackInformation/TracksWithFailedCuts
-	}
-	hist tracks_sigd0Max_2D {
-		algorithm = JetTag_BinsDiffFromStripMedian
-		output = JetTagging/Diagnostics/TrackInformation/TracksWithFailedCuts
-	}
-	hist tracks_sigz0Max_2D {
-		algorithm = JetTag_BinsDiffFromStripMedian
-		output = JetTagging/Diagnostics/TrackInformation/TracksWithFailedCuts
-	}
-	hist tracks_etaMax_2D {
-		algorithm = JetTag_BinsDiffFromStripMedian
-		output = JetTagging/Diagnostics/TrackInformation/TracksWithFailedCuts
-	}
-	hist tracks_nHitBLayer_2D {
-		algorithm = JetTag_BinsDiffFromStripMedian
-		output = JetTagging/Diagnostics/TrackInformation/TracksWithFailedCuts
-	}
-	hist tracks_deadBLayer_2D {
-		algorithm = JetTag_BinsDiffFromStripMedian
-		output = JetTagging/Diagnostics/TrackInformation/TracksWithFailedCuts
-	}
-	hist tracks_nHitPix_2D {
-		algorithm = JetTag_BinsDiffFromStripMedian
-		output = JetTagging/Diagnostics/TrackInformation/TracksWithFailedCuts
-	}
-
-	hist tracks_nHitSct_2D {
-		algorithm = JetTag_BinsDiffFromStripMedian
-		output = JetTagging/Diagnostics/TrackInformation/TracksWithFailedCuts
-	}
-	hist tracks_nHitSi_2D {
-		algorithm = JetTag_BinsDiffFromStripMedian
-		output = JetTagging/Diagnostics/TrackInformation/TracksWithFailedCuts
-	}
-	hist tracks_nHitTrt_2D {
-		algorithm = JetTag_BinsDiffFromStripMedian
-		output = JetTagging/Diagnostics/TrackInformation/TracksWithFailedCuts
-	}
-	hist tracks_nHitTrtHighE_2D {
-		algorithm = JetTag_BinsDiffFromStripMedian
-		output = JetTagging/Diagnostics/TrackInformation/TracksWithFailedCuts
-	}
-	hist tracks_fitChi2_2D {
-		algorithm = JetTag_BinsDiffFromStripMedian
-		output = JetTagging/Diagnostics/TrackInformation/TracksWithFailedCuts
-	}
-	hist tracks_fitProb_2D {
-		algorithm = JetTag_BinsDiffFromStripMedian
-		output = JetTagging/Diagnostics/TrackInformation/TracksWithFailedCuts
-	}
-	hist tracks_fitChi2OnNdfMax_2D {
-		algorithm = JetTag_BinsDiffFromStripMedian
-		output = JetTagging/Diagnostics/TrackInformation/TracksWithFailedCuts
-	}
-
-
-
-
-	hist jet_2D_all {
-		algorithm = JetTag_BinsDiffFromStripMedian
-		output = JetTagging/Diagnostics/JetInformation
-	}
-
-
-	hist tracks_all_2D {
-		algorithm = JetTag_GatherData
-		output = JetTagging/Diagnostics/TrackInformation
-	}
-
-
-
-
-	hist NTrackParticle {
-		algorithm = KolTest
-		display = LogY
-		output = JetTagging/Diagnostics
-	}
-
-	hist global_xPrimVtx {
-		algorithm = KolTest_Koord
-		display = LogY
-		output = JetTagging/Diagnostics
-	}
-	hist global_yPrimVtx {
-		algorithm = KolTest_Koord
-		display = LogY
-		output = JetTagging/Diagnostics
-	}
-	hist global_zPrimVtx {
-		algorithm = KolTest_Koord
-		output = JetTagging/Diagnostics
-
-	}
-	hist global_BLayerHits {
-		algorithm = KolTest
-		output = JetTagging/Quality_Control
-	}
-   	hist jet_tracks_hits_BLayer {
-		algorithm = KolTest
-		output = JetTagging/Quality_Control
-	}
-
-	hist global_TRTHits {
-		algorithm = KolTest
-		display = LogY
-		output = JetTagging/Diagnostics
-	}
-	hist global_PixelHits {
-		algorithm = KolTest
-		output = JetTagging/Quality_Control
-	}
-	hist global_SiHits {
-		algorithm = KolTest
-		output = JetTagging/Quality_Control
-	}
-	hist global_SCTHits {
-		algorithm = KolTest
-		output = JetTagging/Diagnostics
-	}
-	hist jet_n {
-		algorithm = KolTest
-		output = JetTagging/Diagnostics
-	}
-
-	hist jet_muons_pt {
-		display = LogY
-		algorithm = KolTest
-		output = JetTagging/Diagnostics/JetInformation
-	}
-	hist jet_nTag {
-		algorithm = KolTest
-		output = JetTagging/Diagnostics/JetInformation
-	}
-	hist jet_phi {
-		algorithm = KolTest
-		output = JetTagging/Diagnostics/JetInformation
-	}
-	hist jet_et {
-		display = LogY
-		algorithm = KolTest
-		output = JetTagging/Diagnostics/JetInformation
-	}
-	hist jet_eta {
-		algorithm = KolTest
-		output = JetTagging/Diagnostics/JetInformation
-	}
-	hist tag_IP2D_b {
-		algorithm = KolTest
-		output = JetTagging/Diagnostics
-	}
-	hist tag_IP3D_b {
-		algorithm = KolTest
-		output = JetTagging/Diagnostics
-	}
-	hist tag_IP2D_n {
-		algorithm = KolTest
-		output = JetTagging/Diagnostics
-	}
-	hist tag_IP3D_n {
-		algorithm = KolTest
-		output = JetTagging/Diagnostics
-	}
-	hist tag_IP2D_u {
-		algorithm = KolTest
-		output = JetTagging/Diagnostics
-	}
-	hist tag_IP3D_u {
-		algorithm = KolTest
-		output = JetTagging/Diagnostics
-	}
-
-	hist tag_IP2D_w {
-		display = LogY
-		algorithm = KolTest
- 		weight = 0.5
-		output = JetTagging/Diagnostics
-	}
-
-	hist tag_IP3D_w {
-		display = LogY
-		algorithm = KolTest
-  		weight = 0.5
-		output = JetTagging/Quality_Control
-	}
-#	hist tag_LHSIG_w {
-#		display = LogY
-# 		algorithm = JetTag_GatherData
-#		output = JetTagging/Diagnostics
-#		weight = 0
-#		set_weight = 0
-#	}
-	hist tag_SV1_w {
-		algorithm = KolTest
- 		weight = 0.5
-		display = LogY
-		output = JetTagging/Diagnostics
-	}
-	hist tag_SV2_w {
-		algorithm = KolTest
-		 weight = 0.5
-		display = LogY
-		output = JetTagging/Diagnostics
-	}
-   	hist ip3d_tag_def_rate_2D {
-		algorithm = JetTag_GatherData
-		output = JetTagging/Quality_Control
-	}
-
-	hist tag_COMB_w {
-		algorithm = KolTest
-		display = LogY
- 		weight = 0.8
-		output = JetTagging/Quality_Control
-	}
-	hist tag_MV1_w {
-		display = LogY
-		algorithm =  KolTest
- 		weight = 0.8
-		output = JetTagging/Quality_Control
-	}
-
-	#hist tag_SVBU_w {
-	#	algorithm = JetTag_GatherData
-	#	output = JetTagging/Diagnostics
-	#}
-
-	hist DQ_Cutflow {
-		algorithm = KolTest
-		display = LogY
-		output = JetTagging/Quality_Control
-	}
-
-	hist Jet_Cutflow {
-		algorithm = KolTest
-		display = LogY	
-		output = JetTagging/Quality_Control
-	}
-	hist trigPassed {
-		display = LogY
-		algorithm = KolTest
-		output = JetTagging/Diagnostics
-	}
-
-	hist global_nPrimVtx {
-		algorithm = KolTest
-		output = JetTagging/Quality_Control
-	}
-
-	hist jet_tracks_n {
-		algorithm = KolTest
-		output = JetTagging/Quality_Control
-	}
-
-	hist priVtx_trks {
-		algorithm = KolTest
-		output = JetTagging/Diagnostics
-	}
-	hist d0Sig_EtaRange_0_PtRange_0 {
-		algorithm = JetTag_GatherDataPlusOverUnder
-		output = JetTagging/Diagnostics/ImpactParameters
-	}
-	hist d0Sig_EtaRange_0_PtRange_1 {
-		algorithm = JetTag_GatherDataPlusOverUnder
-		output = JetTagging/Diagnostics/ImpactParameters
-	}
-	hist d0Sig_EtaRange_0_PtRange_2 {
-		algorithm = JetTag_GatherDataPlusOverUnder
-		output = JetTagging/Diagnostics/ImpactParameters
-	}
-	hist d0Sig_EtaRange_1_PtRange_0 {
-		algorithm = JetTag_GatherDataPlusOverUnder
-		output = JetTagging/Diagnostics/ImpactParameters
-	}
-	hist d0Sig_EtaRange_1_PtRange_1 {
-		algorithm = JetTag_GatherDataPlusOverUnder
-		output = JetTagging/Diagnostics/ImpactParameters
-	}
-	hist d0Sig_EtaRange_1_PtRange_2 {
-		algorithm = JetTag_GatherDataPlusOverUnder
-		output = JetTagging/Diagnostics/ImpactParameters
-	}
-	hist d0Sig_EtaRange_2_PtRange_0 {
-		algorithm = JetTag_GatherDataPlusOverUnder
-		output = JetTagging/Diagnostics/ImpactParameters
-	}
-	hist d0Sig_EtaRange_2_PtRange_1 {
-		algorithm = JetTag_GatherDataPlusOverUnder
-		output = JetTagging/Diagnostics/ImpactParameters
-	}
-	hist d0Sig_EtaRange_2_PtRange_2 {
-		algorithm = JetTag_GatherDataPlusOverUnder
-		output = JetTagging/Diagnostics/ImpactParameters
-	}
-	hist d0Sig_EtaRange_3_PtRange_0 {
-		algorithm = JetTag_GatherDataPlusOverUnder
-		output = JetTagging/Diagnostics/ImpactParameters
-	}
-	hist d0Sig_EtaRange_3_PtRange_1 {
-		algorithm = JetTag_GatherDataPlusOverUnder
-		output = JetTagging/Diagnostics/ImpactParameters
-	}
-	hist d0Sig_EtaRange_3_PtRange_2 {
-		algorithm = JetTag_GatherDataPlusOverUnder
-		output = JetTagging/Diagnostics/ImpactParameters
-	}
-	hist d0Sig_EtaRange_4_PtRange_0 {
-		algorithm = JetTag_GatherDataPlusOverUnder
-		output = JetTagging/Diagnostics/ImpactParameters
-	}
-	hist d0Sig_EtaRange_4_PtRange_1 {
-		algorithm = JetTag_GatherDataPlusOverUnder
-		output = JetTagging/Diagnostics/ImpactParameters
-	}
-	hist d0Sig_EtaRange_4_PtRange_2 {
-		algorithm = JetTag_GatherDataPlusOverUnder
-		output = JetTagging/Diagnostics/ImpactParameters
-	}
-	hist z0Sig_EtaRange_0_PtRange_0 {
-		algorithm = JetTag_GatherDataPlusOverUnder
-		output = JetTagging/Diagnostics/ImpactParameters
-	}
-	hist z0Sig_EtaRange_0_PtRange_1 {
-		algorithm = JetTag_GatherDataPlusOverUnder
-		output = JetTagging/Diagnostics/ImpactParameters
-	}
-	hist z0Sig_EtaRange_0_PtRange_2 {
-		algorithm = JetTag_GatherDataPlusOverUnder
-		output = JetTagging/Diagnostics/ImpactParameters
-	}
-	hist z0Sig_EtaRange_1_PtRange_0 {
-		algorithm = JetTag_GatherDataPlusOverUnder
-		output = JetTagging/Diagnostics/ImpactParameters
-	}
-	hist z0Sig_EtaRange_1_PtRange_1 {
-		algorithm = JetTag_GatherDataPlusOverUnder
-		output = JetTagging/Diagnostics/ImpactParameters
-	}
-	hist z0Sig_EtaRange_1_PtRange_2 {
-		algorithm = JetTag_GatherDataPlusOverUnder
-		output = JetTagging/Diagnostics/ImpactParameters
-	}
-	hist z0Sig_EtaRange_2_PtRange_0 {
-		algorithm = JetTag_GatherDataPlusOverUnder
-		output = JetTagging/Diagnostics/ImpactParameters
-	}
-	hist z0Sig_EtaRange_2_PtRange_1 {
-		algorithm = JetTag_GatherDataPlusOverUnder
-		output = JetTagging/Diagnostics/ImpactParameters
-	}
-	hist z0Sig_EtaRange_2_PtRange_2 {
-		algorithm = JetTag_GatherDataPlusOverUnder
-		output = JetTagging/Diagnostics/ImpactParameters
-	}
-	hist z0Sig_EtaRange_3_PtRange_0 {
-		algorithm = JetTag_GatherDataPlusOverUnder
-		output = JetTagging/Diagnostics/ImpactParameters
-	}
-	hist z0Sig_EtaRange_3_PtRange_1 {
-		algorithm = JetTag_GatherDataPlusOverUnder
-		output = JetTagging/Diagnostics/ImpactParameters
-	}
-	hist z0Sig_EtaRange_3_PtRange_2 {
-		algorithm = JetTag_GatherDataPlusOverUnder
-		output = JetTagging/Diagnostics/ImpactParameters
-	}
-	hist z0Sig_EtaRange_4_PtRange_0 {
-		algorithm = JetTag_GatherDataPlusOverUnder
-		output = JetTagging/Diagnostics/ImpactParameters
-	}
-	hist z0Sig_EtaRange_4_PtRange_1 {
-		algorithm = JetTag_GatherDataPlusOverUnder
-		output = JetTagging/Diagnostics/ImpactParameters
-	}
-	hist z0Sig_EtaRange_4_PtRange_2 {
-		algorithm = JetTag_GatherDataPlusOverUnder
-		output = JetTagging/Diagnostics/ImpactParameters
-	}
-	hist d0_EtaRange_0_PtRange_0 {
-		algorithm = JetTag_GatherDataPlusOverUnder
-		output = JetTagging/Diagnostics/ImpactParameters
-	}
-	hist d0_EtaRange_0_PtRange_1 {
-		algorithm = JetTag_GatherDataPlusOverUnder
-		output = JetTagging/Diagnostics/ImpactParameters
-	}
-	hist d0_EtaRange_0_PtRange_2 {
-		algorithm = JetTag_GatherDataPlusOverUnder
-		output = JetTagging/Diagnostics/ImpactParameters
-	}
-	hist d0_EtaRange_1_PtRange_0 {
-		algorithm = JetTag_GatherDataPlusOverUnder
-		output = JetTagging/Diagnostics/ImpactParameters
-	}
-	hist d0_EtaRange_1_PtRange_1 {
-		algorithm = JetTag_GatherDataPlusOverUnder
-		output = JetTagging/Diagnostics/ImpactParameters
-	}
-	hist d0_EtaRange_1_PtRange_2 {
-		algorithm = JetTag_GatherDataPlusOverUnder
-		output = JetTagging/Diagnostics/ImpactParameters
-	}
-	hist d0_EtaRange_2_PtRange_0 {
-		algorithm = JetTag_GatherDataPlusOverUnder
-		output = JetTagging/Diagnostics/ImpactParameters
-	}
-	hist d0_EtaRange_2_PtRange_1 {
-		algorithm = JetTag_GatherDataPlusOverUnder
-		output = JetTagging/Diagnostics/ImpactParameters
-	}
-	hist d0_EtaRange_2_PtRange_2 {
-		algorithm = JetTag_GatherDataPlusOverUnder
-		output = JetTagging/Diagnostics/ImpactParameters
-	}
-	hist d0_EtaRange_3_PtRange_0 {
-		algorithm = JetTag_GatherDataPlusOverUnder
-		output = JetTagging/Diagnostics/ImpactParameters
-	}
-	hist d0_EtaRange_3_PtRange_1 {
-		algorithm = JetTag_GatherDataPlusOverUnder
-		output = JetTagging/Diagnostics/ImpactParameters
-	}
-	hist d0_EtaRange_3_PtRange_2 {
-		algorithm = JetTag_GatherDataPlusOverUnder
-		output = JetTagging/Diagnostics/ImpactParameters
-	}
-	hist d0_EtaRange_4_PtRange_0 {
-		algorithm = JetTag_GatherDataPlusOverUnder
-		output = JetTagging/Diagnostics/ImpactParameters
-	}
-	hist d0_EtaRange_4_PtRange_1 {
-		algorithm = JetTag_GatherDataPlusOverUnder
-		output = JetTagging/Diagnostics/ImpactParameters
-	}
-	hist d0_EtaRange_4_PtRange_2 {
-		algorithm = JetTag_GatherDataPlusOverUnder
-		output = JetTagging/Diagnostics/ImpactParameters
-	}
-	hist z0_EtaRange_0_PtRange_0 {
-		algorithm = JetTag_GatherDataPlusOverUnder
-		output = JetTagging/Diagnostics/ImpactParameters
-	}
-	hist z0_EtaRange_0_PtRange_1 {
-		algorithm = JetTag_GatherDataPlusOverUnder
-		output = JetTagging/Diagnostics/ImpactParameters
-	}
-	hist z0_EtaRange_0_PtRange_2 {
-		algorithm = JetTag_GatherDataPlusOverUnder
-		output = JetTagging/Diagnostics/ImpactParameters
-	}
-	hist z0_EtaRange_1_PtRange_0 {
-		algorithm = JetTag_GatherDataPlusOverUnder
-		output = JetTagging/Diagnostics/ImpactParameters
-	}
-	hist z0_EtaRange_1_PtRange_1 {
-		algorithm = JetTag_GatherDataPlusOverUnder
-		output = JetTagging/Diagnostics/ImpactParameters
-	}
-	hist z0_EtaRange_1_PtRange_2 {
-		algorithm = JetTag_GatherDataPlusOverUnder
-		output = JetTagging/Diagnostics/ImpactParameters
-	}
-	hist z0_EtaRange_2_PtRange_0 {
-		algorithm = JetTag_GatherDataPlusOverUnder
-		output = JetTagging/Diagnostics/ImpactParameters
-	}
-	hist z0_EtaRange_2_PtRange_1 {
-		algorithm = JetTag_GatherDataPlusOverUnder
-		output = JetTagging/Diagnostics/ImpactParameters
-	}
-	hist z0_EtaRange_2_PtRange_2 {
-		algorithm = JetTag_GatherDataPlusOverUnder
-		output = JetTagging/Diagnostics/ImpactParameters
-	}
-	hist z0_EtaRange_3_PtRange_0 {
-		algorithm = JetTag_GatherDataPlusOverUnder
-		output = JetTagging/Diagnostics/ImpactParameters
-	}
-	hist z0_EtaRange_3_PtRange_1 {
-		algorithm = JetTag_GatherDataPlusOverUnder
-		output = JetTagging/Diagnostics/ImpactParameters
-	}
-	hist z0_EtaRange_3_PtRange_2 {
-		algorithm = JetTag_GatherDataPlusOverUnder
-		output = JetTagging/Diagnostics/ImpactParameters
-	}
-	hist z0_EtaRange_4_PtRange_0 {
-		algorithm = JetTag_GatherDataPlusOverUnder
-		output = JetTagging/Diagnostics/ImpactParameters
-	}
-	hist z0_EtaRange_4_PtRange_1 {
-		algorithm = JetTag_GatherDataPlusOverUnder
-		output = JetTagging/Diagnostics/ImpactParameters
-	}
-	hist z0_EtaRange_4_PtRange_2 {
-		algorithm = JetTag_GatherDataPlusOverUnder
-		output = JetTagging/Diagnostics/ImpactParameters
-	}
-
-	#hist vertexProb {
-	#	algorithm = KolTestPlusLinear
-	#	display = AxisRange(0,1000,"X")
-	#	output = JetTagging/Diagnostics
-	#}
+  hist n_smt_jet {
+    algorithm = KolTest
+    display = LogY
+    output = JetTagging/Quality_Control
+  }
+  hist smt_jet_MV_w {
+    algorithm = KolTest
+    display = LogY
+    output = JetTagging/Quality_Control
+  }
+  hist tag_MV_w_mu0_30 {
+    algorithm = KolTest
+    display = LogY
+    weight = 0.8
+    output = JetTagging/Quality_Control
+  }
+  hist tag_MV_w_mu30_50 {
+    algorithm = KolTest
+    display = LogY
+    weight = 0.8
+    output = JetTagging/Quality_Control
+  }
+  hist tag_MV_w_mu50_100 {
+    algorithm = KolTest
+    display = LogY
+    weight = 0.8
+    output = JetTagging/Quality_Control
+  }
+
+  ##################################################################
+  ###  Diagnostics
+  ##################################################################
+  hist trigPassed {
+    display = LogY
+    algorithm = KolTest
+    output = JetTagging/Diagnostics
+  }
+  hist jet_n {
+    algorithm = KolTest
+    output = JetTagging/Diagnostics
+  }
+  hist NTrackParticle {
+    display = LogY
+    algorithm = KolTest
+    output = JetTagging/Diagnostics
+  }
+  hist priVtx_trks {
+    algorithm = KolTest
+    output = JetTagging/Diagnostics
+  }
+  hist global_zPrimVtx {
+    algorithm = KolTest_Koord
+    output = JetTagging/Diagnostics
+  }
+  hist global_TRTHits {
+    algorithm = KolTest
+    display = LogY
+    output = JetTagging/Diagnostics
+  }
+  hist global_SCTHits {
+    algorithm = KolTest
+    output = JetTagging/Diagnostics
+  }
+  hist tag_IP2D_llr {
+    display = LogY
+    algorithm = KolTest
+    output = JetTagging/Diagnostics
+  }
+  hist tag_IP3D_n {
+    algorithm = KolTest
+    output = JetTagging/Diagnostics
+  }
+  hist tag_IP3D_llr {
+    display = LogY
+    algorithm = KolTest
+    output = JetTagging/Diagnostics
+  }
+  hist tag_SV1_llr {
+    display = LogY
+    algorithm = KolTest
+    output = JetTagging/Diagnostics
+  }
+  hist tag_SV0_sig3d {
+    display = LogY
+    algorithm = KolTest
+    output = JetTagging/Diagnostics
+  }
+  hist tag_JetFitter_llr {
+    display = LogY
+    algorithm = KolTest
+    output = JetTagging/Diagnostics
+  }
+  hist tag_JFCNN_llr {
+    display = LogY
+    algorithm = KolTest
+    output = JetTagging/Diagnostics
+  }
+  hist n_iso_el {
+    algorithm = KolTest
+    output = JetTagging/Diagnostics
+  }
+  hist n_iso_mu {
+    algorithm = KolTest
+    output = JetTagging/Diagnostics
+  }
+  hist jet_top_eff {
+    algorithm = KolTest
+    output = JetTagging/Diagnostics
+  }
+  hist jet_pt_top {
+    algorithm = KolTest
+    output = JetTagging/Diagnostics
+  }
+  hist jet_pt_top_tagged {
+    algorithm = KolTest
+    output = JetTagging/Diagnostics
+  }
+  hist jet_pt_top_eff {
+    algorithm = KolTest
+    output = JetTagging/Diagnostics
+  }
+  hist jet_MV_top {
+    algorithm = KolTest
+    display = LogY
+    output = JetTagging/Diagnostics
+  }
+  hist n_mu {
+    algorithm = KolTest
+    output = JetTagging/Diagnostics
+  }
+  hist tag_MV_w {
+    display = LogY
+    algorithm =  KolTest
+    weight = 0.8
+    output = JetTagging/Diagnostics
+  }
 
+  ##################################################################
+  ###  Diagnostics/ImpactParameters
+  ##################################################################
 
+  ##################################################################
+  ###  Diagnostics/JetInformation
+  ##################################################################
+  hist jet_phi {
+    algorithm = KolTest
+    output = JetTagging/Diagnostics/JetInformation
+  }
+  hist jet_et {
+    display = LogY
+    algorithm = KolTest
+    output = JetTagging/Diagnostics/JetInformation
+  }
+  hist jet_eta {
+    algorithm = KolTest
+    output = JetTagging/Diagnostics/JetInformation
+  }
+  hist sv1ip3d_tag_neg_rate_2D {
+    algorithm = JetTag_BinsDiffFromStripMedian
+    output = JetTagging/Diagnostics/JetInformation
+  }
+  hist sv1ip3d_tag_pos_rate_2D {
+    algorithm = JetTag_BinsDiffFromStripMedian
+    output = JetTagging/Diagnostics/JetInformation
+  }
+  hist mv_tag_60_rate_2D {
+    algorithm = JetTag_BinsDiffFromStripMedian
+    output = JetTagging/Diagnostics/JetInformation
+  }
+  hist mv_tag_70_rate_2D {
+    algorithm = JetTag_BinsDiffFromStripMedian
+    output = JetTagging/Diagnostics/JetInformation
+  }
+  hist mv_tag_77_rate_2D {
+    algorithm = JetTag_BinsDiffFromStripMedian
+    output = JetTagging/Diagnostics/JetInformation
+  }
+  hist mv_tag_85_rate_2D {
+    algorithm = JetTag_BinsDiffFromStripMedian
+    output = JetTagging/Diagnostics/JetInformation
+  }
+  hist jet_2D_all {
+    algorithm = JetTag_BinsDiffFromStripMedian
+    output = JetTagging/Diagnostics/JetInformation
+  }
+  hist jet_2D_good {
+    algorithm = JetTag_BinsDiffFromStripMedian
+    output = JetTagging/Diagnostics/JetInformation
+  }
+  hist jet_2D_kinematic {
+    algorithm = JetTag_BinsDiffFromStripMedian
+    output = JetTagging/Diagnostics/JetInformation
+  }
+  ####### NEW: 2018 DQ ###############
+  hist jet_2D_mjvt {
+    algorithm = JetTag_BinsDiffFromStripMedian
+    output = JetTagging/Diagnostics/JetInformation
+  }
+  ####### NEW: 2018 DQ ###############
+  hist jet_2D_overlap {
+    algorithm = JetTag_BinsDiffFromStripMedian
+    output = JetTagging/Diagnostics/JetInformation
+  }
+  hist jet_2D_quality {
+    algorithm = JetTag_BinsDiffFromStripMedian
+    output = JetTagging/Diagnostics/JetInformation
+  }
+  hist jet_2D_suspect {
+    algorithm = JetTag_BinsDiffFromStripMedian
+    output = JetTagging/Diagnostics/JetInformation
+  }
+  ####### NEW: 2018 DQ ###############
+  hist jet_2D_tbad {
+    algorithm = JetTag_BinsDiffFromStripMedian
+    output = JetTagging/Diagnostics/JetInformation
+  }
+  hist jet_2D_tsmt {
+    algorithm = JetTag_BinsDiffFromStripMedian
+    output = JetTagging/Diagnostics/JetInformation
+  }
+
+  ##################################################################
+  ###  Diagnostics/TrackInformation
+  ##################################################################
+  hist tracks_all_2D {
+    algorithm = JetTag_GatherData
+    output = JetTagging/Diagnostics/TrackInformation
+  }
+  hist tracks_pTMin_2D {
+    algorithm = JetTag_BinsDiffFromStripMedian
+    output = JetTagging/Diagnostics/TrackInformation
+  }
+  hist jet_tracks_d0 {
+    display = LogY
+    algorithm = KolTest
+    output = JetTagging/Diagnostics/TrackInformation
+  } 
+  hist jet_tracks_z0 {
+    display = LogY
+    algorithm = KolTest
+    output = JetTagging/Diagnostics/TrackInformation
+  } 
+
+  ##################################################################
+  ###  Diagnostics/TrackInformation/TracksWithFailedCuts
+  ##################################################################
+  hist tracks_d0Max_2D {
+    algorithm = JetTag_BinsDiffFromStripMedian
+    output = JetTagging/Diagnostics/TrackInformation/TracksWithFailedCuts
+  }
+  hist tracks_z0Max_2D {
+    algorithm = JetTag_BinsDiffFromStripMedian
+    output = JetTagging/Diagnostics/TrackInformation/TracksWithFailedCuts
+  }
+  hist tracks_sigd0Max_2D {
+    algorithm = JetTag_BinsDiffFromStripMedian
+    output = JetTagging/Diagnostics/TrackInformation/TracksWithFailedCuts
+  }
+  hist tracks_sigz0Max_2D {
+    algorithm = JetTag_BinsDiffFromStripMedian
+    output = JetTagging/Diagnostics/TrackInformation/TracksWithFailedCuts
+  }
+  hist tracks_nHitBLayer_2D {
+    algorithm = JetTag_BinsDiffFromStripMedian
+    output = JetTagging/Diagnostics/TrackInformation/TracksWithFailedCuts
+  }
+  hist tracks_deadBLayer_2D {
+    algorithm = JetTag_BinsDiffFromStripMedian
+    output = JetTagging/Diagnostics/TrackInformation/TracksWithFailedCuts
+  }
+  hist tracks_nHitPix_2D {
+    algorithm = JetTag_BinsDiffFromStripMedian
+    output = JetTagging/Diagnostics/TrackInformation/TracksWithFailedCuts
+  }
+  hist tracks_nHitSct_2D {
+    algorithm = JetTag_BinsDiffFromStripMedian
+    output = JetTagging/Diagnostics/TrackInformation/TracksWithFailedCuts
+  }
+  hist tracks_nHitSi_2D {
+    algorithm = JetTag_BinsDiffFromStripMedian
+    output = JetTagging/Diagnostics/TrackInformation/TracksWithFailedCuts
+  }
+  hist tracks_nHitTrt_2D {
+    algorithm = JetTag_BinsDiffFromStripMedian
+    output = JetTagging/Diagnostics/TrackInformation/TracksWithFailedCuts
+  }
+  hist tracks_nHitTrtHighE_2D {
+    algorithm = JetTag_BinsDiffFromStripMedian
+    output = JetTagging/Diagnostics/TrackInformation/TracksWithFailedCuts
+  }
+  hist tracks_fitChi2_2D {
+    algorithm = JetTag_BinsDiffFromStripMedian
+    output = JetTagging/Diagnostics/TrackInformation/TracksWithFailedCuts
+  }
+  hist tracks_fitProb_2D {
+    algorithm = JetTag_BinsDiffFromStripMedian
+    output = JetTagging/Diagnostics/TrackInformation/TracksWithFailedCuts
+  }
+  hist tracks_fitChi2OnNdfMax_2D {
+    algorithm = JetTag_BinsDiffFromStripMedian
+    output = JetTagging/Diagnostics/TrackInformation/TracksWithFailedCuts
+  }
 }
 
 ###########################
@@ -627,7 +543,7 @@ algorithm KolmogorovTest_MaxDistPlusNorm {
   	libname = libdqm_algorithms.so
   	name = KolmogorovTest_MaxDistPlusNorm
 thresholds = KVT_Maxdist
-reference = CentrallyManagedReferences
+reference = stream=physics_Main:CentrallyManagedReferences_Main;CentrallyManagedReferences
 }
 
 #algorithm GatherData {
@@ -635,9 +551,6 @@ reference = CentrallyManagedReferences
 #  	name = GatherData
 #}
 
-
-
-
 #algorithm BinsFilledOutRange {
 #  	libname = libdqm_algorithms.so
 #  	name = BinsFilledOutRange
@@ -659,14 +572,10 @@ algorithm Simple_gaus_Fit {
 }
 
 
-
-
-
 ####
 ## Composited algorithms to extend Kolgomorov tests
 ####
 
-
 ####
 ##Simple KolTest just to check histograms
 ####
@@ -677,11 +586,10 @@ libname = libdqm_algorithms.so
 
 algorithm KolTest {
   name = KolmogorovTest_MaxDistPlusNorm&GatherData&Histogram_Not_Empty
-  reference = CentrallyManagedReferences
+  reference = stream=physics_Main:CentrallyManagedReferences_Main;CentrallyManagedReferences
   KolmogorovTest_MaxDistPlusNorm|thresholds = KVT_Maxdist
 }
 
-
 compositeAlgorithm KolmogorovTest_MaxDistPlusNorm&GatherData {
 subalgs = KolmogorovTest_MaxDistPlusNorm,GatherData,Histogram_Not_Empty
 libname = libdqm_algorithms.so
@@ -689,16 +597,10 @@ libname = libdqm_algorithms.so
 
 algorithm KolTest_Koord {
   name = KolmogorovTest_MaxDistPlusNorm&GatherData
-  reference = CentrallyManagedReferences
+  reference = stream=physics_Main:CentrallyManagedReferences_Main;CentrallyManagedReferences
 KolmogorovTest_MaxDistPlusNorm|thresholds = KVT_Maxdist_Koord
 }
 
-
-####
-
-
-
-
 ####
 ##KolTest with added gaus fit. For primary vertex shapes
 ####
@@ -709,12 +611,10 @@ compositeAlgorithm Simple_gaus_Fit&KolmogorovTest_MaxDistPlusNorm&GatherData&His
 
 algorithm KolTestPlusGaus {
   	name = Simple_gaus_Fit&KolmogorovTest_MaxDistPlusNorm&GatherData&Histogram_Not_Empty
-  reference = CentrallyManagedReferences
+  reference = stream=physics_Main:CentrallyManagedReferences_Main;CentrallyManagedReferences
   	KolmogorovTest_MaxDistPlusNorm|thresholds = KVT_Maxdist
 	Simple_gaus_Fit|thresholds = GausFitThres
 }
-####
-
 
 ####
 ##KolTest with a check how much bins out of a given range will be filled.
@@ -727,12 +627,10 @@ compositeAlgorithm Simple_pol1_Fit&KolmogorovTest_MaxDistPlusNorm&GatherData&His
 
 algorithm KolTestPlusLinear {
   	name = Simple_pol1_Fit&KolmogorovTest_MaxDistPlusNorm&GatherData&Histogram_Not_Empty
-  reference = CentrallyManagedReferences
+  reference = stream=physics_Main:CentrallyManagedReferences_Main;CentrallyManagedReferences
   	KolmogorovTest_MaxDistPlusNorm|thresholds = KVT_Maxdist
 	Simple_pol1_Fit|thresholds = LinFitThres
 }
-####
-
 
 #compositeAlgorithm BinsFilledOutRange&KolmogorovTest_MaxDistPlusNorm&GatherData&Histogram_Not_Empty {
 #  subalgs = KolmogorovTest_MaxDistPlusNorm,GatherData,Histogram_Not_Empty,BinsFilledOutRange
@@ -742,29 +640,23 @@ algorithm KolTestPlusLinear {
 #algorithm KolTestPlusBinsOutOfRange {
 #	libname = libdqm_algorithms.so
 #	name = BinsFilledOutRange&KolmogorovTest_MaxDistPlusNorm&GatherData&Histogram_Not_Empty
- # 	KolmogorovTest_MaxDistPlusNorm|thresholds = KVT_Maxdist
+# 	KolmogorovTest_MaxDistPlusNorm|thresholds = KVT_Maxdist
 #	BinsFilledOutRange|xmin = 0
 #	BinsFilledOutRange|xmax = 1000
 #	BinsFilledOutRange|thresholds = OutOfRangeThres
 #}
 
-
-
 ##Gather data and non empty test
 #compositeAlgorithm Histogram_Not_Empty&GatherData {
 #subalgs = Histogram_Not_Empty,GatherData
 #libname = libdqm_algorithms.so
 #name = KolmogorovTest_MaxDistPlusNorm&GatherData
-
 #}
 
 algorithm JetTag_GatherData {
   name = Histogram_Not_Empty&GatherData
 }
 
-
-
-
 ##Gather data and non empty test with over-/underflow information
 compositeAlgorithm No_UnderFlows&No_OverFlows&Histogram_Not_Empty&GatherData {
 subalgs = No_UnderFlows,No_OverFlows,Histogram_Not_Empty,GatherData
@@ -781,8 +673,6 @@ algorithm JetTag_BinsDiffFromStripMedian {
   thresholds = JetTag_BinsDiffFromStripMedian_threshold 
 }
 
-
-
 ######################
 
 thresholds JetTag_BinsDiffFromStripMedian_threshold {
@@ -792,7 +682,6 @@ thresholds JetTag_BinsDiffFromStripMedian_threshold {
   }
 }
 
-
 thresholds th_CSC_KSTest_JetTag {
   limits P {
     warning = 0.4
@@ -836,10 +725,9 @@ error = 2
 }
 }
 
-
-  ##############
-    # Output
-    ##############
+ ##############
+ # Output
+ ##############
     output top_level {
     algorithm = WorstCaseSummary
 
@@ -857,7 +745,6 @@ error = 2
     #    weight = 0
     #}
 
-
 }
     output Diagnostics {
     set_weight = 0.0
@@ -873,16 +760,10 @@ error = 2
             set_weight = 0
             weight = 0
     }
-}
-    output ImpactParameters {
-    set_weight = 0
-    weight = 0
-    }
-
-    }
-
+   }
 
+  }
 
-    }
-    }
 
+ }
+}
diff --git a/DataQuality/DataQualityConfigurations/config/MuonCombined/collisions_run.config b/DataQuality/DataQualityConfigurations/config/MuonCombined/collisions_run.config
index 855a525730b154bee5ac46227df7a30ee6e0c798..178210c63b0923b2ce2898ceb4264ed894df228b 100644
--- a/DataQuality/DataQualityConfigurations/config/MuonCombined/collisions_run.config
+++ b/DataQuality/DataQualityConfigurations/config/MuonCombined/collisions_run.config
@@ -603,8 +603,6 @@ dir MuonPhysics {
                 display = Ref2DSignif,TCanvas(490,900)
             }
             hist Muons_CBMuons_Origin_eta_phi {
-                output = MuonTracking/Shifter/Muons
-				display = Ref2DSignif,TCanvas(490,900)
                 description = All Muons, Eta and Phi distributions
             }
             # --------------------------------------------
@@ -730,6 +728,38 @@ dir MuonPhysics {
                 display = AxisRange(0.0,6.0,"Z")
             }
         } #dir CBMuons
+		
+		dir MuonStandAlone {
+		    hist Muons_MuonStandAlone_Origin_eta_phi {
+                output = MuonTracking/Shifter/Muons
+				#display = Ref2DSignif,TCanvas(490,900)
+                description = StandAlone, Eta and Phi distributions
+            }
+		} #dir MuonStandAlone
+		
+		dir CaloTagged {
+		    hist Muons_CaloTagged_Origin_eta_phi {
+                output = MuonTracking/Shifter/Muons
+				#display = Ref2DSignif,TCanvas(490,900)
+                description = CaloTagged, Eta and Phi distributions
+            }
+		} #dir CaloTagged
+		
+		dir SegmentTagged {
+		    hist Muons_SegmentTagged_Origin_eta_phi {
+                output = MuonTracking/Shifter/Muons
+				#display = Ref2DSignif,TCanvas(490,900)
+                description = SegmentTagged, Eta and Phi distributions
+            }
+		} #dir SegmentTagged
+		
+		dir SiliconAssociatedForward {
+		    hist Muons_SiliconAssociatedForward_Origin_eta_phi {
+                output = MuonTracking/Shifter/Muons
+				#display = Ref2DSignif,TCanvas(490,900)
+                description = SiliconAssociatedForward, Eta and Phi distributions
+            }
+		} #dir SiliconAssociatedForward
 
         dir NonCBMuons {
             output = MuonTracking/Expert/NonCBMuons
diff --git a/DataQuality/DataQualityConfigurations/config/common/collisions_run.config b/DataQuality/DataQualityConfigurations/config/common/collisions_run.config
index 0e787006d6f305e79daedfa1a7a2f277e1b097f8..77dd696f39238633ffb5edae71ef1ee476fd1b14 100644
--- a/DataQuality/DataQualityConfigurations/config/common/collisions_run.config
+++ b/DataQuality/DataQualityConfigurations/config/common/collisions_run.config
@@ -8,33 +8,33 @@
 
 reference CentrallyManagedReferences {
   location = /eos/atlas/atlascerngroupdisk/data-dqm/references/,root://eosatlas.cern.ch//eos/atlas/atlascerngroupdisk/data-dqm/references/
-  file = data17_13TeV.00341534.express_express.merge.HIST.f903_h277._0001.1
-  path = run_341534
-  info = Run 341534, express_express
+  file = data18_13TeV.00358031.express_express.merge.HIST.f961_h322._0001.1
+  path = run_358031
+  info = Run 358031, express_express
   name = same_name
 }
 
 reference CentrallyManagedReferences_Main {
   location = /eos/atlas/atlascerngroupdisk/data-dqm/references/,root://eosatlas.cern.ch//eos/atlas/atlascerngroupdisk/data-dqm/references/
-  file = data17_13TeV.00341534.physics_Main.merge.HIST.f903_h277._0001.1
-  path = run_341534
-  info = Run 341534, physics_Main
+  file = data18_13TeV.00358031.physics_Main.merge.HIST.f961_h322._0001.1
+  path = run_358031
+  info = Run 358031, physics_Main
   name = same_name
 }
 
 reference CentrallyManagedReferences_Trigger {
   location = /eos/atlas/atlascerngroupdisk/data-dqm/references/,root://eosatlas.cern.ch//eos/atlas/atlascerngroupdisk/data-dqm/references/
-  file = data17_13TeV.00341534.express_express.merge.HIST.f903_h277._0001.1
-  path = run_341534
-  info = Run 341534, express_express
+  file = data18_13TeV.00356177.express_express.merge.HIST.f956_h317._0001.1
+  path = run_356177
+  info = Run 356177, express_express
   name = same_name
 }
 
 reference CentrallyManagedReferences_TriggerMain {
   location = /eos/atlas/atlascerngroupdisk/data-dqm/references/,root://eosatlas.cern.ch//eos/atlas/atlascerngroupdisk/data-dqm/references/
-  file = data17_13TeV.00341534.physics_Main.merge.HIST.f903_h277._0001.1
-  path = run_341534
-  info = Run 341534, physics_Main
+  file = data18_13TeV.00356177.physics_Main.merge.HIST.f956_h319._0001.1
+  path = run_356177
+  info = Run 356177, physics_Main
   name = same_name
 }
 
diff --git a/DataQuality/DataQualityConfigurations/scripts/UploadDQAMITag.py b/DataQuality/DataQualityConfigurations/scripts/UploadDQAMITag.py
index 33f5d97f996c0e2b42928c9a89d068bfd259cd12..2c877ef5bb559291885f9b09558b398611ed5d45 100755
--- a/DataQuality/DataQualityConfigurations/scripts/UploadDQAMITag.py
+++ b/DataQuality/DataQualityConfigurations/scripts/UploadDQAMITag.py
@@ -314,4 +314,4 @@ if __name__ == '__main__':
     elif args[0].lower() == 'release':
         update_dict_for_release(cfgdict, args[1])
 
-    #upload_new_config(amiclient, nextTag, cfgdict)
+    upload_new_config(amiclient, nextTag, cfgdict)
diff --git a/DataQuality/DataQualityInterfaces/src/HanConfig.cxx b/DataQuality/DataQualityInterfaces/src/HanConfig.cxx
index 9c3410d6432418141cb715674e9696118b513ca2..0cc8236f258bc9f7d35d7730861e699c9a6b8769 100644
--- a/DataQuality/DataQualityInterfaces/src/HanConfig.cxx
+++ b/DataQuality/DataQualityInterfaces/src/HanConfig.cxx
@@ -25,6 +25,7 @@
 #include <TBox.h>
 #include <TLine.h>
 #include <TROOT.h>
+#include <TEfficiency.h>
 
 #include "dqm_core/LibraryManager.h"
 #include "dqm_core/Parameter.h"
@@ -336,9 +337,9 @@ Visit( const MiniConfigTreeNode* node ) const
   TObject* obj;
   std::string name = node->GetAttribute("name");
   std::string fileName = node->GetAttribute("file");
-  fileName = SplitReference(node->GetAttribute("location"), fileName);
-  std::string refInfo = node->GetAttribute("info");
   if( fileName != "" && name != "" && name != "same_name" ) {
+    fileName = SplitReference(node->GetAttribute("location"), fileName);
+    std::string refInfo = node->GetAttribute("info");
     std::auto_ptr<TFile> infile( TFile::Open(fileName.c_str()) );
     TKey* key = getObjKey( infile.get(), name );
     if( key == 0 ) {
@@ -906,7 +907,8 @@ Visit( const MiniConfigTreeNode* node ) const
         TObject* tmpobj = key->ReadObj();
         TH1* tmph = dynamic_cast<TH1*>(tmpobj);
         TGraph* tmpg = dynamic_cast<TGraph*>(tmpobj);
-        if( tmph == 0 && tmpg == 0 )
+        TEfficiency* tmpe = dynamic_cast<TEfficiency*>(tmpobj);
+        if( tmph == 0 && tmpg == 0 && tmpe == 0 )
           continue;
         
         objName = objPath;
@@ -1237,7 +1239,13 @@ ChangeOutputDir( TFile* file, std::string path, DirMap_t& directories )
       std::string dirName;
       std::string::size_type k = subPath.find_last_of('/');
       dirName = (k != std::string::npos) ? std::string( subPath, k+1, std::string::npos ) : subPath;
-      TDirectory* dir = parDir->mkdir( dirName.c_str() );
+      TDirectory* dir;
+      if (!parDir->FindKey(dirName.c_str())) {
+	dir = parDir->mkdir( dirName.c_str() );
+      }
+      else{
+	std::cout << "Failed to make directory " << dirName.c_str() << std::endl;
+      }
       DirMap_t::value_type dirVal( subPath, dir );
       directories.insert( dirVal );
       return dir;
diff --git a/DataQuality/DataQualityInterfaces/src/HanConfigAssessor.cxx b/DataQuality/DataQualityInterfaces/src/HanConfigAssessor.cxx
index e3d6616fe405fbf285b928f6657d34c70de76519..437466ae898ef926b5806d12f5cdea4eafe2fc84 100644
--- a/DataQuality/DataQualityInterfaces/src/HanConfigAssessor.cxx
+++ b/DataQuality/DataQualityInterfaces/src/HanConfigAssessor.cxx
@@ -421,7 +421,10 @@ GetList( TDirectory* basedir, std::map<std::string,TSeqCollection*>& mp )
     TKey* key = getObjKey( basedir, GetHistPath() );
     if( key != 0 ) {
       const char* className = key->GetClassName();
-      if( (strncmp(className, "TH", 2) == 0) || (strncmp(className, "TGraph", 6) == 0) || (strncmp(className, "TProfile", 8) == 0) ) {
+      if( (strncmp(className, "TH", 2) == 0) 
+       || (strncmp(className, "TGraph", 6) == 0) 
+       || (strncmp(className, "TProfile", 8) == 0)
+       || (strncmp(className, "TEfficiency", 11) == 0) ) {
 	// TNamed* transobj = dynamic_cast<TNamed*>(key->ReadObj());
 	// if (transobj != NULL) {
 	std::string::size_type rslash = nameString.rfind("/");
diff --git a/DataQuality/DataQualityInterfaces/src/HanInputRootFile.cxx b/DataQuality/DataQualityInterfaces/src/HanInputRootFile.cxx
index 45080efc680bee3f67468d145ca07be50d2003bf..165d3ec36921379223ef14c8f832251229ab0677 100644
--- a/DataQuality/DataQualityInterfaces/src/HanInputRootFile.cxx
+++ b/DataQuality/DataQualityInterfaces/src/HanInputRootFile.cxx
@@ -7,6 +7,7 @@
 #include "TH1.h"
 #include "TGraph.h"
 #include "TDirectoryFile.h"
+#include "TEfficiency.h"
 #include <iostream>
 #include <cstring>
 
@@ -108,7 +109,7 @@ addListener( const boost::regex& regex, dqm_core::InputListener* listener )
       if (boost::regex_match(*str, regex)) {
         // is this actually a histogram/graph?
         TObject* temp = m_basedir->Get(str->c_str());
-        if (dynamic_cast<TH1*>(temp) || dynamic_cast<TGraph*>(temp)) {
+        if (dynamic_cast<TH1*>(temp) || dynamic_cast<TGraph*>(temp) || dynamic_cast<TEfficiency*>(temp) ) {
           std::cout << "Regular expression " << regex << " matches " << *str << std::endl;
           addListener(*str, listener);
         }
diff --git a/DataQuality/DataQualityInterfaces/src/HanOutput.cxx b/DataQuality/DataQualityInterfaces/src/HanOutput.cxx
index 72334bb5d74b023a60252dc4d745dc7519f364f8..f33c716c3c1f9af6a3e80da7216713c1e7c6d558 100644
--- a/DataQuality/DataQualityInterfaces/src/HanOutput.cxx
+++ b/DataQuality/DataQualityInterfaces/src/HanOutput.cxx
@@ -26,6 +26,7 @@
 #include <TROOT.h>
 #include <TH1.h>
 #include <TGraph.h>
+#include <TEfficiency.h>
 
 #include "dqm_core/exceptions.h"
 #include "dqm_core/OutputListener.h"
@@ -58,6 +59,9 @@ bool setNameGeneral(TObject* obj, const std::string& name) {
     } else if (TGraph* g=dynamic_cast<TGraph*>(obj)) {
       g->SetName(name.c_str());
       return true;
+    } else if (TEfficiency* e=dynamic_cast<TEfficiency*>(obj)) {
+      e->SetName(name.c_str());
+      return true;
     } else {
       TClass* kl = obj->IsA();
       TMethod* klm = kl->GetMethod("SetName", "\"Reference\"");
@@ -263,7 +267,10 @@ flushResults()
 		  	TKey* key = getObjKey(m_input, storename);
 		  	if( key != 0 ) {
 		  		const char* className = key->GetClassName();
-		  		if( (strncmp(className, "TH", 2) == 0) || (strncmp(className, "TGraph", 6) == 0) || (strncmp(className, "TProfile", 8) == 0) ) {
+		  		if( (strncmp(className, "TH", 2) == 0) 
+                                 || (strncmp(className, "TGraph", 6) == 0) 
+                                 || (strncmp(className, "TProfile", 8) == 0)
+                                 || (strncmp(className, "TEfficiency", 11) == 0) ) {
 				  TNamed* transobj = dynamic_cast<TNamed*>(key->ReadObj());
 				  if (transobj != NULL) {
 				    HanHistogramLink* hhl = new HanHistogramLink(m_input, storename);
@@ -373,13 +380,21 @@ static void WriteListToDirectory(TDirectory *dir, TSeqCollection *list, TFile* f
         str = tmp;
         tmp = strtok(0, "/");
       }
-      TDirectory* daughter = dir->mkdir(str);
+      TDirectory* daughter;
+      if (!dir->FindKey(str)) {
+	daughter = dir->mkdir(str);
+      }
+      else{ 
+	std::cout << "Failed to make " << str << " from " << tmpList->GetName() << std::endl;
+	continue; 
+      }
       WriteListToDirectory(daughter, tmpList, file, level-1);
       if (level > 0) { file->Write(); delete daughter; }
     }
     else if ((strncmp(obj->ClassName(), "TH", 2) == 0)
 	     || (strncmp(obj->ClassName(), "TGraph", 6) == 0)
-	     || (strncmp(obj->ClassName(), "TProfile", 8) ==0)) {
+	     || (strncmp(obj->ClassName(), "TProfile", 8) ==0)
+             || (strncmp(obj->ClassName(), "TEfficiency", 11) == 0) ) {
       dir->GetMotherDir()->WriteTObject(obj);
     } else {
       // anything else put it in current directory
diff --git a/DataQuality/DataQualityTools/DataQualityTools/DQTDataFlowMonTool.h b/DataQuality/DataQualityTools/DataQualityTools/DQTDataFlowMonTool.h
index 68a3619d6ed2206a8ddfc08e76bbe378f9bbf5b7..562e5d8fb7f32f6fde4ca57efebf5bf2680d949a 100644
--- a/DataQuality/DataQualityTools/DataQualityTools/DQTDataFlowMonTool.h
+++ b/DataQuality/DataQualityTools/DataQualityTools/DQTDataFlowMonTool.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 // ********************************************************************
@@ -19,6 +19,7 @@
 #include "GaudiKernel/ToolHandle.h"
 #include <stdint.h>
 
+#include "StoreGate/ReadHandleKey.h"
 #include "xAODEventInfo/EventInfo.h"
 
 #include "DataQualityTools/DataQualityFatherMonTool.h"
@@ -32,15 +33,15 @@ class DQTDataFlowMonTool: public DataQualityFatherMonTool
   
   DQTDataFlowMonTool(const std::string & type, const std::string & name, const IInterface* parent);
 
-  ~DQTDataFlowMonTool();
+  virtual ~DQTDataFlowMonTool();
 
-  //StatusCode initialize();
+  virtual StatusCode initialize() override;
     
-  StatusCode bookHistogramsRecurrent( );
-  StatusCode bookHistograms( );
-  StatusCode fillHistograms( );
-  StatusCode procHistograms( );
-  StatusCode checkHists(bool fromFinalize);
+  virtual StatusCode bookHistogramsRecurrent( ) override;
+  virtual StatusCode bookHistograms( ) override;
+  virtual StatusCode fillHistograms( ) override;
+  virtual StatusCode procHistograms( ) override;
+  virtual StatusCode checkHists(bool fromFinalize) override;
 
 private:
 
@@ -61,6 +62,8 @@ private:
   typedef std::pair<unsigned int, unsigned int> EvFlagPt_t;
   //std::vector<EvFlagPt_t>* m_eventflag_vec[xAOD::EventInfo::nDets];
 
+  SG::ReadHandleKey<xAOD::EventInfo> m_eventInfoKey
+  { this, "EventInfoKey", "EventInfo", "" };
 };
 
 #endif
diff --git a/DataQuality/DataQualityTools/src/DQTDataFlowMonTool.cxx b/DataQuality/DataQualityTools/src/DQTDataFlowMonTool.cxx
index bd0297b7712916546ae5054b7b22952b25f72e20..c0c03fcd7cc4bd38e9b3333149eb86d14ae6bf4e 100644
--- a/DataQuality/DataQualityTools/src/DQTDataFlowMonTool.cxx
+++ b/DataQuality/DataQualityTools/src/DQTDataFlowMonTool.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 // ********************************************************************
@@ -18,6 +18,7 @@
 
 #include "GaudiKernel/MsgStream.h"
 #include "GaudiKernel/ITHistSvc.h"
+#include "StoreGate/ReadHandle.h"
 
 static const char* envstrings[AthenaMonManager::altprod+1] = { "user", "noOutput", "online", "tier0", 
 							       "tier0Raw", "tier0ESD", "AOD", "altprod" };
@@ -67,10 +68,18 @@ DQTDataFlowMonTool::~DQTDataFlowMonTool()
   */
 }
 
+//----------------------------------------------------------------------------------
+StatusCode DQTDataFlowMonTool::initialize()
+{
+  ATH_CHECK( DataQualityFatherMonTool::initialize() );
+  ATH_CHECK( m_eventInfoKey.initialize() );
+  return StatusCode::SUCCESS;
+}
 //----------------------------------------------------------------------------------
 StatusCode DQTDataFlowMonTool::bookHistograms(  )
 //----------------------------------------------------------------------------------
 {
+  const EventContext& ctx = Gaudi::Hive::currentContext();
   bool failure(false);
 
   if (m_releaseStageString == "") {
@@ -99,15 +108,9 @@ StatusCode DQTDataFlowMonTool::bookHistograms(  )
     m_release_stage_lowStat->GetXaxis()->SetBinLabel(m_environment+1, m_releaseStageString.c_str());
   }
 
-  const EventInfo* evtinfo;
-  StatusCode sc(evtStore()->retrieve(evtinfo));
-  if (sc.isFailure()) {
-    ATH_MSG_ERROR("Unable to retrieve EventInfo object");
-    failure = true;
-  } else {
-    if (evtinfo->eventType(xAOD::EventInfo::IS_SIMULATION)) {
-      failure |= rolling_hists.regHist(m_sumweights = new TH1D("m_sumweights", "Sum of MC event weights", 50, 0.5, 50.5)).isFailure();
-    }
+  SG::ReadHandle<xAOD::EventInfo> evtinfo (m_eventInfoKey, ctx);
+  if (evtinfo->eventType(xAOD::EventInfo::IS_SIMULATION)) {
+    failure |= rolling_hists.regHist(m_sumweights = new TH1D("m_sumweights", "Sum of MC event weights", 50, 0.5, 50.5)).isFailure();
   }
 
   if (failure) {return  StatusCode::FAILURE;}
diff --git a/DataQuality/DataQualityUtils/CMakeLists.txt b/DataQuality/DataQualityUtils/CMakeLists.txt
index 55f000783ba80cf1c70e8e74fef726e7b770f451..5c47606c9eaa9df534042e0927c3d7bc6c3fd3d1 100644
--- a/DataQuality/DataQualityUtils/CMakeLists.txt
+++ b/DataQuality/DataQualityUtils/CMakeLists.txt
@@ -7,7 +7,8 @@ atlas_subdir( DataQualityUtils )
 
 # Declare the package's dependencies:
 atlas_depends_on_subdirs( PRIVATE
-                          DataQuality/DataQualityInterfaces )
+                          DataQuality/DataQualityInterfaces
+                          DataQuality/ZLumiScripts )
 
 # External dependencies:
 find_package( Boost COMPONENTS regex filesystem thread system )
@@ -80,7 +81,7 @@ atlas_add_executable( han-results-print
 
 # Install files from the package:
 atlas_install_python_modules( python/*.py )
-atlas_install_scripts( scripts/CreateDB.py scripts/CreateDB_Histo.py scripts/DQHistogramMerge.py scripts/DQHistogramPrintStatistics.py scripts/DQWebDisplay.py scripts/hancool_histo.py scripts/hancool.py scripts/handi.py scripts/historyDisplay.py scripts/DQFileMove.py scripts/CreateMDTConfig_algos.sh scripts/CreateMDTConfig_chambers.sh scripts/CreateMDTConfig_config.sh scripts/CreateMDTConfig_files.sh scripts/CreateMDTConfig_readme.sh scripts/DQM_Tier0Wrapper_trf.py scripts/DQHistogramMergeRegExp.py scripts/dq_make_web_display.py scripts/ScanHistFile.py scripts/physval_make_web_display.py )
+atlas_install_scripts( scripts/CreateDB.py scripts/CreateDB_Histo.py scripts/DQHistogramMerge.py scripts/DQHistogramPrintStatistics.py scripts/DQWebDisplay.py scripts/hancool_histo.py scripts/hancool.py scripts/handi.py scripts/historyDisplay.py scripts/DQFileMove.py scripts/CreateMDTConfig_algos.sh scripts/CreateMDTConfig_chambers.sh scripts/CreateMDTConfig_config.sh scripts/CreateMDTConfig_files.sh scripts/CreateMDTConfig_readme.sh scripts/DQM_Tier0Wrapper_trf.py scripts/DQM_Tier0Wrapper_tf.py scripts/DQHistogramMergeRegExp.py scripts/dq_make_web_display.py scripts/ScanHistFile.py scripts/physval_make_web_display.py )
 
 # Aliases:
 atlas_add_alias( DQHistogramPrintStatistics "DQHistogramPrintStatistics.py" )
diff --git a/DataQuality/DataQualityUtils/DataQualityUtils/HanOutputFile.h b/DataQuality/DataQualityUtils/DataQualityUtils/HanOutputFile.h
index 4de87c1dbca2b9a7e4434b3cc267517e733e6009..b952560ce644fd082dbc442882b9d2aebc0d0088 100644
--- a/DataQuality/DataQualityUtils/DataQualityUtils/HanOutputFile.h
+++ b/DataQuality/DataQualityUtils/DataQualityUtils/HanOutputFile.h
@@ -19,6 +19,8 @@ class TH1;
 class TH2;
 class TStyle;
 class TGraph;
+class TImage;
+class TEfficiency;
 
 namespace dqutils {
 
@@ -67,13 +69,26 @@ public:
   virtual void streamAllDQAssessments( std::ostream& o, bool streamAll );
   virtual void streamHistoAssessments( std::ostream& o, bool streamAll );
   virtual void streamAllHistograms( std::ostream& o, bool streamAll );
-  virtual int  saveAllHistograms( std::string location, bool drawRefs, std::string run_min_LB );
+
+  /**
+   * cnvsType: 1=pngOnly;2=jsonOnly;3=pngAndJson
+   */
+  virtual int  saveAllHistograms( std::string location, bool drawRefs, std::string run_min_LB,int cnvsType = 1);
   static bool containsDir(std::string dirname, std::string maindir);
 
   virtual bool saveHistogramToFile( std::string nameHis, std::string location,
-                 TDirectory* groupDir, bool drawRefs,std::string run_min_LB, std::string pathName );
+                 TDirectory* groupDir, bool drawRefs,std::string run_min_LB, std::string pathName,int cnvsType = 1);
+  virtual std::pair<std::string,std::string> getHistogram( std::string nameHis,
+				       TDirectory* groupDir, bool drawRefs,
+				       std::string run_min_LB, std::string pathName,int cnvsType=1);
+  virtual std::string getHistogramPNG( std::string nameHis,
+				       TDirectory* groupDir, bool drawRefs,
+				       std::string run_min_LB, std::string pathName );
+  virtual std::pair<std::string,std::string> getHistogramJSON( std::string nameHis,
+				       TDirectory* groupDir, bool drawRefs,
+				       std::string run_min_LB, std::string pathName );
   virtual bool saveHistogramToFileSuperimposed( std::string nameHis, std::string location,
-                 TDirectory* groupDir1, TDirectory* groupDir2, bool drawRefs,std::string run_min_LB, std::string pathName );
+                 TDirectory* groupDir1, TDirectory* groupDir2, bool drawRefs,std::string run_min_LB, std::string pathName,int cnvsType=1);
 
   virtual bool drawH2(TCanvas* canv,TH2* hist,std::string &drawopt,std::string &display);
   virtual bool drawH1(TCanvas* canv,TH1* hist,TH1* reference,std::string &drawopt,std::string &display,std::string &AlgoName);
@@ -92,6 +107,7 @@ public:
   virtual void formatTH1( TCanvas* c, TH1* h ) const;
   virtual void formatTH2( TCanvas* c, TH2* h ) const;
   virtual void formatTGraph( TCanvas* c, TGraph* g ) const;
+  virtual void formatTEfficiency( TCanvas* c, TEfficiency* e ) const;
 
   virtual double  getNEntries( std::string location, std::string histname );
   virtual double  getNEntries( const TObject* obj );
@@ -100,6 +116,12 @@ public:
 protected:
   
   virtual void clearData();
+  virtual void convertToGraphics(int cnvsType, TCanvas* myC,std::string &json, TImage *img = 0, char ** x=0, int *y=0);
+  virtual void convertToGraphics(int cnvsType, TCanvas* myC,std::string namePNG,std::string nameJSON);
+  virtual bool saveFile(int cnvsType, std::string pngfName,std::string pngContent, std::string jsonfName, std::string jsonfContent);
+
+
+  virtual bool writeToFile(std::string fName, std::string content);
 
   
   TFile*        m_file;
diff --git a/DataQuality/DataQualityUtils/DataQualityUtils/MonitoringFile.h b/DataQuality/DataQualityUtils/DataQualityUtils/MonitoringFile.h
index 4b9168657f9d62a2db888cc399584d8fe7377e0d..aaafe1f15ea44f3e7c24eb1a9853d9dd93325cbc 100644
--- a/DataQuality/DataQualityUtils/DataQualityUtils/MonitoringFile.h
+++ b/DataQuality/DataQualityUtils/DataQualityUtils/MonitoringFile.h
@@ -41,6 +41,7 @@ class TKey;
 class TTree;
 class TString;
 class RooPlot;
+class TEfficiency;
 
 
 namespace dqutils {
@@ -391,8 +392,10 @@ namespace dqutils {
       virtual ~HistogramOperation() { }
       virtual bool execute(TH1* hist) = 0;
       virtual bool execute(TGraph* graph) = 0;
+      virtual bool execute(TEfficiency* efficiency) = 0;
       virtual bool executeMD(TH1* hist, const MetaData&) { return execute(hist); }
       virtual bool executeMD(TGraph* graph, const MetaData&) { return execute(graph); }
+      virtual bool executeMD(TEfficiency* efficiency, const MetaData&) {return execute(efficiency); }
     };
 
     class CopyHistogram : public HistogramOperation {
@@ -401,8 +404,11 @@ namespace dqutils {
       virtual ~CopyHistogram();
       virtual bool execute(TH1* hist);
       virtual bool execute(TGraph* graph);
+      virtual bool execute(TEfficiency* eff);
       virtual bool executeMD(TH1* hist, const MetaData& md);
       virtual bool executeMD(TGraph* graph, const MetaData& md);
+      virtual bool executeMD(TEfficiency* eff, const MetaData& md);
+
     protected:
       void copyString(char* to, const std::string& from);
       TDirectory*  m_target;
@@ -420,6 +426,7 @@ namespace dqutils {
       GatherStatistics(std::string dirName);
       virtual bool execute(TH1* hist);
       virtual bool execute(TGraph* graph);
+      virtual bool execute(TEfficiency* eff);
 
       std::string  m_dirName;
       int m_nHist1D;
@@ -428,6 +435,8 @@ namespace dqutils {
       int m_nGraphPoints;
       int m_nHist2D;
       int m_nHist2DBins;
+      int m_nEfficiency;
+      int m_nEfficiencyBins;
     };
 
     class GatherNames : public HistogramOperation {
@@ -435,6 +444,7 @@ namespace dqutils {
       GatherNames();
       virtual bool execute(TH1* hist);
       virtual bool execute(TGraph* graph);
+      virtual bool execute( TEfficiency* eff );
 
       std::vector<std::string> m_names;
     };
diff --git a/DataQuality/DataQualityUtils/python/DQPostProcessMod.py b/DataQuality/DataQualityUtils/python/DQPostProcessMod.py
index 6185651f62f19c2a4c800af665c25c2fc7702641..231e1bbac89cf1c9937b178d76f81382372eb7ab 100644
--- a/DataQuality/DataQualityUtils/python/DQPostProcessMod.py
+++ b/DataQuality/DataQualityUtils/python/DQPostProcessMod.py
@@ -83,7 +83,7 @@ def _ProtectPostProcessing( funcinfo, outFileName, isIncremental ):
         if isProduction:
             import smtplib
             server = smtplib.SMTP('localhost')
-            mail_cc = ['ponyisi@utexas.edu', 'yuriy.ilchenko@cern.ch']
+            mail_cc = ['ponyisi@utexas.edu', 'rnarayan@utexas.edu']
             msg = ['From: atlasdqm@cern.ch',
                    'To: %s' % ', '.join(mail_to),
                    'Cc: %s' % ', '.join(mail_cc),
@@ -132,6 +132,11 @@ def DQPostProcess( outFileName, isIncremental=False ):
                                                            createMDTConditionDBNoisy)
             createMDTConditionDBDead()
             createMDTConditionDBNoisy()
+
+    def zlumi(fname, isIncremental):
+        if not isIncremental:
+            from DataQualityUtils.doZLumi import go
+            go(fname)
  
     funclist = [ 
                  (mf.fitMergedFile_IDPerfMonManager,
@@ -181,7 +186,9 @@ def DQPostProcess( outFileName, isIncremental=False ):
                  (mf.PixelPostProcess,
                   ['daiki.yamaguchi@cern.ch']),
                  (mf.MuonTrackPostProcess,
-                  ['baojia.tong@cern.ch', 'alexander.tuna@cern.ch'])
+                  ['baojia.tong@cern.ch', 'alexander.tuna@cern.ch']),
+                 (zlumi,
+                  ['ponyisi@utexas.edu', 'harish.potti@utexas.edu']),
                ]
 
     # first try all at once
diff --git a/DataQuality/DataQualityUtils/python/TestCases.py b/DataQuality/DataQualityUtils/python/TestCases.py
index e74754273b1e6db536598176e447169eb71950bf..427765fb7d1ff808ccf1513bf7a37ec65e1f14a5 100644
--- a/DataQuality/DataQualityUtils/python/TestCases.py
+++ b/DataQuality/DataQualityUtils/python/TestCases.py
@@ -1,5 +1,8 @@
 # Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 
+# None of this works, but keep it around in case someone wants to resurrect it later...
+# - PO 20180419
+
 import unittest
 import sys, os, shutil
 
diff --git a/DataQuality/DataQualityUtils/python/doZLumi.py b/DataQuality/DataQualityUtils/python/doZLumi.py
new file mode 100644
index 0000000000000000000000000000000000000000..f3b2954e8de92610deb2a0719b1671b08675b2e6
--- /dev/null
+++ b/DataQuality/DataQualityUtils/python/doZLumi.py
@@ -0,0 +1,90 @@
+# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration                   
+
+def getRun(fname):
+    import ROOT
+    fin = ROOT.TFile.Open(fname)
+    if not fin: return None
+    runname = None
+    for key in fin.GetListOfKeys():
+        if key.GetName().startswith('run_'):
+            runname = key.GetName()
+            break
+    if runname: return int(runname[4:])
+    else: return None
+
+def copyPlot(infname, outfname):
+    import ROOT
+    run = getRun(outfname)
+    if not run: return
+    fin = ROOT.TFile.Open(infname, 'READ')
+    if not fin: return
+    fout = ROOT.TFile.Open(outfname, 'UPDATE')
+    if not fout: return
+    for objname in ['z_lumi']:
+        obj = fin.Get(objname)
+        if obj:
+            d = fout.Get('run_%d/GLOBAL/DQTGlobalWZFinder' % run)
+            if d:
+                d.WriteTObject(obj)
+    fin.Close(); fout.Close()
+            
+def makeGRL(run, defect, fname):
+    from ROOT import TString
+    import DQUtils, DQDefects
+    import os
+
+    tag = 'HEAD'
+    runs = [run]
+    print 'Query run information...',
+    from DQUtils.db import fetch_iovs
+    dbinstance = 'CONDBR2'
+    eor = fetch_iovs('EOR', (min(runs) << 32) | 1,
+                     (max(runs) << 32) | 0xFFFFFFFF,
+                     with_channel=False, what=[], database='COOLONL_TDAQ/%s' % dbinstance)
+    eor = eor.trim_iovs
+    eor = DQUtils.IOVSet(iov for iov in eor if iov.since.run in runs)
+    print 'done'
+    print 'Query defects...',
+    ddb = DQDefects.DefectsDB('COOLOFL_GLOBAL/%s' % dbinstance, tag=tag)
+    ignores = set([_ for _ in ddb.defect_names if 'UNCHECKED' in _])
+    try:
+        defectiovs = ddb.retrieve(since = min(runs) << 32 | 1,
+                                  until = max(runs) << 32 | 0xffffffff,
+                                  channels = [defect],
+                                  evaluate_full = False,
+                                  ignore=ignores)
+    except Exception, e:
+        print e
+        raise
+    print 'Doing exclusions...',
+    okiovs = eor.logical_and(eor, defectiovs.logical_not())
+    print 'done'
+
+    print 'Generating GRL...',
+    data = DQUtils.grl.make_grl(okiovs, '', '2.1')
+    with open(fname, 'w') as outf:
+        outf.write(data)
+
+def go(fname):
+    import subprocess, os, shutil
+    if 'DQ_STREAM' in os.environ:
+        if (os.environ.get('DQPRODUCTION', '0') == '1'
+            and os.environ['DQ_STREAM'] != 'physics_Main'):
+            return
+    if 'DISPLAY' in os.environ: del os.environ['DISPLAY']
+    runno = getRun(fname)
+    print 'Seen run', runno
+    grlcmd = []
+    if runno >= 325000:
+        makeGRL(runno, 'PHYS_StandardGRL_All_Good', 'grl.xml')
+        grlcmd = ['--grl', 'grl.xml']
+    else:
+        print 'Run number', runno, 'not 2017 data'
+
+    subprocess.call(['dqt_zlumi_compute_lumi.py', fname, '--out', 'zlumiraw.root', '--dblivetime', '--plotdir', ''] + grlcmd)
+    subprocess.call(['dqt_zlumi_alleff_HIST.py', fname, '--out', 'zlumieff.root', '--plotdir', ''])
+    subprocess.call(['dqt_zlumi_combine_lumi.py', 'zlumiraw.root', 'zlumieff.root', 'zlumi.root'])
+    subprocess.call(['dqt_zlumi_display_z_rate.py', 'zlumi.root', '--plotdir', ''])
+    copyPlot('zlumi.root', fname)
+    if os.path.isfile('zlumi.root_zrate.csv'):
+        shutil.move('zlumi.root_zrate.csv', 'zrate.csv')
diff --git a/DataQuality/DataQualityUtils/python/filemovemod.py b/DataQuality/DataQualityUtils/python/filemovemod.py
index 84f2797246ab38eda18ea8de78ddc4e800b58d11..daf89dd585f1da6cf65378a36766c52fa6bd9c17 100644
--- a/DataQuality/DataQualityUtils/python/filemovemod.py
+++ b/DataQuality/DataQualityUtils/python/filemovemod.py
@@ -1,14 +1,22 @@
 # Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 
 def move_files(prefix, config):
-    import os, shutil
+    import os, shutil, subprocess
     
     filemap = config.filemap
     if filemap == {}:
         return
     for src, dest in filemap.items():
+        print src, dest
         if os.access(src, os.R_OK):
-            try:
-                shutil.copy2(src, os.path.join(dest, prefix + '_' + os.path.basename(src)))
-            except IOError, e:
-                print e
+            if dest.startswith('root://'):
+                try:
+                    subprocess.check_call(['xrdcp', src, os.path.join(dest, prefix + '_' + os.path.basename(src))])
+                except subprocess.CalledProcessError, e:
+                    print e
+            else:
+                try:
+                    shutil.copy2(src, os.path.join(dest, prefix + '_' + os.path.basename(src)))
+                except IOError, e:
+                    print e
+                
diff --git a/DataQuality/DataQualityUtils/python/hancoolmod.py b/DataQuality/DataQualityUtils/python/hancoolmod.py
index ec729409dceab935facce7f83c1a53e5dabda9c1..d35e805170c04f570de5d0ab548069f97ff1d7da 100644
--- a/DataQuality/DataQualityUtils/python/hancoolmod.py
+++ b/DataQuality/DataQualityUtils/python/hancoolmod.py
@@ -355,7 +355,10 @@ def sct_conf_defects(d, i, runNumber):
         if not histogram: 
             return None
         for bin in mapping:
-            if histogram.GetBinContent(bin) > 40:
+            threshold = 40
+            if mapping[bin] == 'SCT_MOD_OUT_GT40':
+                threshold = 80
+            if histogram.GetBinContent(bin) > threshold:
                 rv.append(defect_val(mapping[bin], '%.1d modules affected' % histogram.GetBinContent(bin), False))
         return rv
 
diff --git a/DataQuality/DataQualityUtils/python/handimod.py b/DataQuality/DataQualityUtils/python/handimod.py
index d0f2c9ac9da18f8c7b910762f62428eaddc2c340..d36927543cdbd051a5d688bef22933d0891a2eec 100644
--- a/DataQuality/DataQualityUtils/python/handimod.py
+++ b/DataQuality/DataQualityUtils/python/handimod.py
@@ -23,14 +23,16 @@ from ROOT import dqutils
 
 ## LumiBlock length (in minutes)
 LBlength = 1.0
+jsonFileCull = set()
 
-def handiWithComparisons( name, resultsFile, htmlDir, runlistLoc, compare, browserMenu, allDirsScriptDir ):
+def handiWithComparisons( name, resultsFile, htmlDir, runlistLoc, compare, browserMenu,allDirsScriptDir,jsRoot=1 ):
   ## compare: True if you want a "compare" button on every 1histo page, False by default
   ## javaScriptLoc = url of the javascript for the "compare" button
   ## HjavaScriptLoc = url of the javascript for the "history" button
   ## runlistLoc = url where to find runlist.xml (runlist catalog)
   ## browserMenu = True if you want a browser menu instead of the 
   ## allDirsScript = url of javascript to create browser menu
+  ## jsRoot = enable jsRoot ;1=png;2=json;3=png&json
   
   if ( htmlDir.rfind("/")!=(len(htmlDir)-1) ):  # htmlDir needs "/" at the end
         htmlDir+="/"
@@ -63,7 +65,7 @@ def handiWithComparisons( name, resultsFile, htmlDir, runlistLoc, compare, brows
     hi_limit = int(digit*30.0/LBlength)
     LB_range = ', LB '+str(low_limit)+' - ' + str(hi_limit)
 
-  nSaved = saveAllHistograms( resultsFile, htmlDir, True, (name+LB_range) )
+  nSaved = saveAllHistograms( resultsFile, htmlDir, True, (name+LB_range), jsRoot)
   if nSaved == 0:
     print "There are no histograms in this file; writing a dummy index file"
     if( not os.access(htmlDir,os.F_OK) ):
@@ -96,19 +98,23 @@ def handiWithComparisons( name, resultsFile, htmlDir, runlistLoc, compare, brows
 
   if (browserMenu):
     makeAllDirsXml( htmlDir, name, s, number, resultsFile)
-    list, namelist = makeAllDirsBrowserFile( htmlDir, name, s, number, resultsFile,allDirsScriptDir )
+    dirlist, namelist = makeAllDirsBrowserFile( htmlDir, name, s, number, resultsFile,allDirsScriptDir )
   else:
-    list, namelist = makeAllDirsFile( htmlDir, name, s, number, resultsFile )
+    dirlist, namelist = makeAllDirsFile( htmlDir, name, s, number, resultsFile )
     
-  for x in range(0,len(list)):
-    makeSubDirFile( htmlDir, name, s, number, namelist[x], list[x], runlistLoc, compare, allDirsScriptDir )
-    makeColorFile( htmlDir, name, s, number, namelist[x], list[x], 'Red', runlistLoc, compare, allDirsScriptDir)
-    makeColorFile( htmlDir, name, s, number, namelist[x], list[x], 'Yellow', runlistLoc, compare, allDirsScriptDir)
-    makeColorFile( htmlDir, name, s, number, namelist[x], list[x], 'Green', runlistLoc, compare, allDirsScriptDir )
+  for x in range(0,len(dirlist)):
+    makeSubDirFile( htmlDir, name, s, number, namelist[x], dirlist[x], runlistLoc, compare, allDirsScriptDir,jsRoot )
+    makeColorFile( htmlDir, name, s, number, namelist[x], dirlist[x], 'Red', runlistLoc, compare, allDirsScriptDir,jsRoot )
+    makeColorFile( htmlDir, name, s, number, namelist[x], dirlist[x], 'Yellow', runlistLoc, compare, allDirsScriptDir,jsRoot )
+    makeColorFile( htmlDir, name, s, number, namelist[x], dirlist[x], 'Green', runlistLoc, compare, allDirsScriptDir,jsRoot )
     makeCSSFile( htmlDir,"", namelist[x] )
   
   makeCSSFile( htmlDir,"", "." )
 
+  for path in jsonFileCull:
+      if os.path.isfile(path):
+          os.system("rm "+path)
+
 
 def makeAllDirsXml( htmlDir, name, s, number, resultsFile ):
   g=open(htmlDir+'AllDirs.xml','w')
@@ -180,8 +186,8 @@ def makeAllDirsFile( htmlDir, name, s, number, resultsFile ):
 
   # initial number of white spaces, will change to positive value once we go over the lines
   spaces=-1
-  # list = list with directories (the line number) that contain histos
-  list=[]
+  # dirlist = list with directories (the line number) that contain histos
+  dirlist=[]
   # namelist = list with corresponding direcotory names
   namelist=[]
 
@@ -224,7 +230,7 @@ def makeAllDirsFile( htmlDir, name, s, number, resultsFile ):
         else:
           g.write('<a href="'+namedir +'/index.html" >'+shortNameDir+ ':</a>')
         g.write('&nbsp;&nbsp;&nbsp;<font class="'+ sp[1]+'">'+ sp[1] + '</font>\n')
-        list.append(x)
+        dirlist.append(x)
         namelist.append(namedir)
       else:
         g.write(shortNameDir+ ':')
@@ -240,7 +246,7 @@ def makeAllDirsFile( htmlDir, name, s, number, resultsFile ):
   g.write('</font></td>\n</tr>\n</table>')
   g.write('</body>\n</html>\n')
   g.close()
-  return list, namelist
+  return dirlist, namelist
 
 
 def makeAllDirsBrowserFile( htmlDir, name, s, number, resultsFile,AllDirsScriptDir ):
@@ -268,8 +274,8 @@ def makeAllDirsBrowserFile( htmlDir, name, s, number, resultsFile,AllDirsScriptD
   g.write('</body>\n</html>\n')
   g.close()
   
-  # list = list with directories (the line number) that contain histos
-  list=[]
+  # dirlist = list with directories (the line number) that contain histos
+  dirlist=[]
   # namelist = list with corresponding direcotory names
   namelist=[]
 
@@ -282,12 +288,12 @@ def makeAllDirsBrowserFile( htmlDir, name, s, number, resultsFile,AllDirsScriptD
       if ( (x<number-1) and (s[x+1].rsplit())[3]=='ass' ): # check that dir contains histos
         if namedir=='<top_level>':
           namedir = '.'
-        list.append(x)
+        dirlist.append(x)
         namelist.append(namedir)
   g.close()
-  return list, namelist
+  return dirlist, namelist
 
-def makeSubDirFile( htmlDir, name, s, number, subname, assessIndex, runlistLoc,compare, AllDirsScriptDir):
+def makeSubDirFile( htmlDir, name, s, number, subname, assessIndex, runlistLoc,compare, AllDirsScriptDir,jsRoot ):
   
   if( subname == '.' ):
     h=open(htmlDir+'/'+subname+'/toplevel.html','w')
@@ -335,7 +341,7 @@ def makeSubDirFile( htmlDir, name, s, number, subname, assessIndex, runlistLoc,c
       h.write('<td class="' + sp[1] + '" align="center"><a href="'+sp[0]+'.html" class="hintanchor" onmouseover="showhint(\'' +title+'\', this, event, \'400px\')"><img src="'+ sp[0] +'.png" height="200" alt="' + name + ' ' + subname+'/'+sp[0]+'.png" /></a><br/><div style="text-overflow:ellipsis;overflow:hidden;max-width:240px">'+sp[0]+'</div></td>\n')
     temp = s[y].rsplit(" title ")
     sp = temp[0].split()
-    makeOneHistFile( htmlDir, name, subname, sp, runlistLoc,compare )
+    makeOneHistFile( htmlDir, name, subname, sp, runlistLoc,compare,jsRoot)
     y=y+1
     if y< number:
       sp=s[y].rsplit()
@@ -345,7 +351,7 @@ def makeSubDirFile( htmlDir, name, s, number, subname, assessIndex, runlistLoc,c
   h.close()
 
 
-def makeColorFile( htmlDir, name, s, number, subname, assessIndex , color, runlistLoc,compare,AllDirsScriptDir):
+def makeColorFile( htmlDir, name, s, number, subname, assessIndex , color, runlistLoc,compare,AllDirsScriptDir,jsRoot ):
   
   if( subname == '.' ):
     h=open(htmlDir+'/'+subname+'/'+color+'.html','w')
@@ -392,7 +398,7 @@ def makeColorFile( htmlDir, name, s, number, subname, assessIndex , color, runli
         h.write('<td class="' + sp[1] + '"><a href="'+sp[0]+'.html" class="hintanchor" onmouseover="showhint(\'' +title+'\', this, event, \'400px\')"><img src="'+ sp[0] +'.png" height="200" alt="' + name + ' ' + subname+'/'+sp[0]+'.png" /></a></td>\n')
       temp = s[y].rsplit(" title ")
       sp = temp[0]  
-      makeOneHistFile( htmlDir, name, subname, sp, runlistLoc,compare)
+      makeOneHistFile( htmlDir, name, subname, sp, runlistLoc,compare,jsRoot)
     y=y+1
     if y< number:
       sp=s[y].rsplit()
@@ -423,7 +429,7 @@ def writeLimitDiagram( k, limitName, lowColor, hiColor, loVal, hiVal ):
   k.write('</tr>\n</table>\n')
 
 
-def makeOneHistFile( htmlDir, name, subname, sp, runlistLoc, compare ):
+def makeOneHistFile( htmlDir, name, subname, sp, runlistLoc, compare,jsRoot ):
   import re
   runmatch = re.compile('^Run ([0-9]+), ([0-9]+)/(.+)$')
   subrunmatch = re.compile('^Run ([0-9]+), (.+)_(.*), ([0-9]+)/(.+)$')
@@ -443,7 +449,9 @@ def makeOneHistFile( htmlDir, name, subname, sp, runlistLoc, compare ):
   k.write('<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />\n')
   k.write('<title>'+name+ ' ' + subname+ ' ' + sp[0]+'</title>\n')
   k.write('<link rel="stylesheet" href="AutomChecks.css" type="text/css" />\n')
-#   k.write('<script type=\"text/javascript\" src=\"'+javaScriptLoc +'\"><!-- dont contract-->\n</script>\n')
+  k.write('<script src="https://cdnjs.cloudflare.com/ajax/libs/require.js/2.1.10/require.min.js"></script>\n')
+  k.write('<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/2.0.3/jquery.min.js"></script>')
+##   k.write('<script type=\"text/javascript\" src=\"'+javaScriptLoc +'\"><!-- dont contract-->\n</script>\n')
   k.write('</head>\n')
   k.write('<body>\n')
   k.write('<center>\n')
@@ -571,10 +579,25 @@ def makeOneHistFile( htmlDir, name, subname, sp, runlistLoc, compare ):
       cc+=2
       extra-=2
   k.write('</table>\n</td>\n')
+  jsonPath = htmlDir+'/'+sp[21]+".json" if sp[0] else ""
+  jsonFileCull.add(jsonPath)
+  jsonFile = open(jsonPath,'r') if os.path.isfile(jsonPath) else "" 
   if subname == '.':
-    k.write('<td><a href="toplevel.html"><img src="'+ sp[0] +'.png" alt="' + name + ' ' + subname+'/'+sp[0]+'.png" /></a></td>\n')
+    if(jsRoot and os.path.isfile(jsonPath)):
+       jsonFile.seek(0)
+       jsonStr = jsonFile.read()
+       jsonStr = jsonStr.replace('\n','')
+       k.write('<td><div id="root_plot_1" style="width: 600px; height: 400px"></div></td>\n<script>\n requirejs.config( { paths: { \'JSRootCore\'    : \'https://root.cern.ch/js/dev//scripts/JSRootCore\', \'JSRootPainter\' : \'https://root.cern.ch/js/dev//scripts/JSRootPainter\', } });require([\'JSRootCore\', \'JSRootPainter\'], function(Core, Painter) {\n var obj = Core.parse(\''+jsonStr+'\');\nPainter.draw("root_plot_1", obj, ""); });</script>\n')
+    else:
+       k.write('<td><a href="toplevel.html"><img src="'+ sp[0] +'.png" alt="' + name + ' ' + subname+'/'+sp[0]+'.png" /></a></td>\n')
   else:
-    k.write('<td><a href="index.html"><img src="'+ sp[0] +'.png" alt="' + name + ' ' + subname+'/'+sp[0]+'.png" /></a></td>\n')
+      if(jsRoot and os.path.isfile(jsonPath)):
+         jsonFile.seek(0)
+         jsonStr = jsonFile.read()
+         jsonStr = jsonStr.replace('\n','');
+         k.write('<td><div id="root_plot_2" style="width: 600px; height: 400px"></div></td>\n<script>\n requirejs.config( { paths: { \'JSRootCore\'    : \'https://root.cern.ch/js/dev//scripts/JSRootCore\', \'JSRootPainter\' : \'https://root.cern.ch/js/dev//scripts/JSRootPainter\', } });require([\'JSRootCore\', \'JSRootPainter\'], function(Core, Painter) {\n var obj = Core.parse(\''+jsonStr+'\');\nPainter.draw("root_plot_2", obj, ""); });</script>\n')
+      else: 
+         k.write('<td><a href="index.html"><img src="'+ sp[0] +'.png" alt="' + name + ' ' + subname+'/'+sp[0]+'.png" /></a></td>\n')
   k.write('</tr></table>\n')
   k.write('</center>\n')
   now = time.localtime()
@@ -691,10 +714,9 @@ def stringAllDQAssessments( resultsFile ):
   return total
 
 
-def saveAllHistograms( resultsFile, location, drawRefs, run_min_LB ):
+def saveAllHistograms( resultsFile, location, drawRefs, run_min_LB ,jsRoot ):
   of = dqutils.HanOutputFile( resultsFile )
-  nSaved = of.saveAllHistograms( location, drawRefs, run_min_LB )
+  cnvType=1 if jsRoot==1 else 3
+  nSaved = of.saveAllHistograms( location, drawRefs, run_min_LB ,cnvType)
   of.setFile('')
   return nSaved
-
-
diff --git a/DataQuality/DataQualityUtils/scripts/pathExtract.py b/DataQuality/DataQualityUtils/python/pathExtract.py
similarity index 81%
rename from DataQuality/DataQualityUtils/scripts/pathExtract.py
rename to DataQuality/DataQualityUtils/python/pathExtract.py
index 55886ef82f9c5b78d6ab47a5144241fe7b3ba8fa..8c760155b0685774a55d7782e5417a72a0693e2c 100644
--- a/DataQuality/DataQualityUtils/scripts/pathExtract.py
+++ b/DataQuality/DataQualityUtils/python/pathExtract.py
@@ -24,30 +24,6 @@ def returnEosHistPath(run,stream,amiTag,tag="data16_13TeV"):
 
    return "FILE NOT FOUND"
 
-# OBSOLETE - See below
-# Return the path of the output of tier0 monitoring for the single LB (available only a couple of days after processing)
-#def returnEosHistPathLB(run,lb,stream,amiTag,tag="data16_13TeV"):
-#   prefix = {'express':'express_','Egamma':'physics_','CosmicCalo':'physics_','JetTauEtmiss':'physics_','Main':'physics_','ZeroBias':'physics_'}
-#   path = '/eos/atlas/atlastier0/tzero/prod/'+tag+'/'+prefix[stream]+stream+'/00'+str(run)+'/'
-#   P = sp.Popen(['/afs/cern.ch/project/eos/installation/0.3.84-aquamarine/bin/eos.select','ls',path],stdout=sp.PIPE,stderr=sp.PIPE)
-#   p = P.communicate()
-#   listOfFiles = p[0].split('\n')
-#
-#   for iFile in listOfFiles:
-#      if ("recon.HIST.%s"%(amiTag) in iFile and "LOG" not in iFile):
-#         path = '/eos/atlas/atlastier0/tzero/prod/'+tag+'/'+prefix[stream]+stream+'/00'+str(run)+'/'+iFile
-#         P = sp.Popen(['/afs/cern.ch/project/eos/installation/0.3.84-aquamarine/bin/eos.select','ls',path],stdout=sp.PIPE,stderr=sp.PIPE)
-#         p = P.communicate()
-#         listOfFiles2 = p[0].split('\n')
-#         for iFile2 in listOfFiles2:            
-#            print iFile2
-#            ilb = int((iFile2.split("_lb")[1]).split("._SFO")[0])
-#            if (lb == ilb):
-#               path = '/eos/atlas/atlastier0/tzero/prod/'+tag+'/'+prefix[stream]+stream+'/00'+str(run)+'/'+iFile+'/'+iFile2
-#               return path
-#
-#   return "FILE NOT FOUND"
-
 # Return the path of the output of tier0 monitoring for a range of single LB (available only a couple of days after processing)
 def returnEosHistPathLB(run,lb0,lb1,stream,amiTag,tag="data16_13TeV"):
    prefix = {'express':'express_','Egamma':'physics_','CosmicCalo':'physics_','JetTauEtmiss':'physics_','Main':'physics_','ZeroBias':'physics_'}
diff --git a/DataQuality/DataQualityUtils/scripts/DQM_Tier0Wrapper_tf.py b/DataQuality/DataQualityUtils/scripts/DQM_Tier0Wrapper_tf.py
new file mode 100755
index 0000000000000000000000000000000000000000..fe089d5f5bf16558005441de9acf25a307726f0c
--- /dev/null
+++ b/DataQuality/DataQualityUtils/scripts/DQM_Tier0Wrapper_tf.py
@@ -0,0 +1,549 @@
+#!/usr/bin/env python
+
+# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+
+#########################################################################
+##
+## Tier-0 combined transformation for DQM histogram merging 
+## and web display creation
+##
+##  - to be run in two modes: 
+##    1. in regular (15min?) intervals, merges the new results with 
+##       the statistics accumulated so far (cached on DQM AFS area)
+##    2. at the end of a run, to obtain the final statistics/results
+##       (replaces all temporary histograms/results) 
+##
+##  - input parameter: file containing a json dictionary consisting of the key/value pairs
+##     1) 'inputHistFiles': python list 
+##         ['datasetname#filename1', 'datasetname#filename2', ...] (input HIST_TMP dataset + file names)
+##        or list of file dictionaries
+##         [{'lfn':'fname1', 'checksum':'cks1', 'dsn':'dsn1', 'size':sz1, 'guid':'guid1', 'events':nevts1, ...}, 
+##          {'lfn':'fname2', 'checksum':'cks2', 'dsn':'dsn2', 'size':sz2, 'guid':'guid2', 'events':nevts2, ...}, ...]
+##     2) 'outputHistFile': string 'datasetname#filename'
+##        (HIST output dataset name + file)
+##     optional parameters:
+##     3) 'incrementalMode': string ('True'/'False', default: 'False')
+##        ('True': do incremental update of DQM webpages on top of existing statistics;
+##         'False': create final DQM webpages, replace temporary ones)
+##     4) 'postProcessing': string ('True'/'False', default: 'True')
+##        ('False': run histogram merging and DQ assessment only;
+##         'True': run additional post-processing step (fitting, etc.))
+##     5) 'procNumber': int (number of processing pass, e.g. 1,2, ...)
+##     6) 'runNumber': int  
+##     7) 'streamName': string (e.g., physics_IDCosmic, physics_Express, ...)
+##     8) 'projectTag': string (e.g., data10_7TeV, TrigDisplay)
+##     9) 'allowCOOLUpload': string ('True'/'False', default: 'True')
+##        ('True': allow upload of defects to database;
+##         'False': do not upload defects to database)
+##     10) 'doWebDisplay': string ('True'/'False', default: 'True')
+##        ('True': run the web display;
+##         'False': do not run the web display)
+##     11) 'filepaths': dictionary; keys are 'basename' (top level directory
+##                      of han configurations; 'Collisions', 'Cosmics', and
+##                      'HeavyIons', which are themselves dicts with keys
+##                      'minutes10', 'minutes30', 'run' with values the han
+##                      configuration file paths relative to basename
+##     12) 'productionMode': string ('True'/'False', default: 'True')
+##         ('True': run as if on Tier-0. 'False': Assume testing.)
+##
+## (C) N. Boelaert, L. Goossens, A. Nairz, P. Onyisi, S. Schaetzel, M. Wilson 
+##     (April 2008 - July 2010)
+##    Modified for dumping resource log in case of problems
+##    S. Kama (March 2011)
+##    Transformed into accepting argJSON as input 
+##    and reporting new format of jobReport.json
+##    J. Guenther (February 2017)
+#########################################################################
+
+import sys, string, commands, os.path, os, json, time, pprint, xmlrpclib, traceback
+#sami
+import hashlib
+
+#########################################################################
+
+# Utility function
+
+def getSubFileMap(fname, nevts=0) :
+    if os.path.isfile(fname) :
+        sz = os.path.getsize(fname)
+        map = { 'name': fname,
+                'file_size' : sz,
+                'nentries' : nevts,
+              }
+    else : 
+        map = {}
+    return map
+
+def publish_success_to_mq(run, ptag, stream, incr, ami, procpass, hcfg, isprod):
+  import stomp, json, os, ssl
+  from DataQualityUtils import stompconfig
+  dest='/topic/atlas.dqm.progress'
+  conn=stomp.Connection([('atlas-mb.cern.ch', 61013)], **stompconfig.config())
+  conn.start()
+  conn.connect(wait=True)
+
+  body = {
+    'run': run,
+    'project_tag': ptag,
+    'stream': stream,
+    'ami': ami,
+    'pass': procpass,
+    'hcfg': hcfg,
+    }
+  headers = {
+    'MsgClass':'DQ', 
+    'MsgType': (('' if isprod else 'Development') +
+                ('WebDisplayRunComplete' if not incr else 'WebDisplayIncremental')),
+    'type':'textMessage', 
+    'persistent': 'true',
+    'destination': dest,
+    }
+  conn.send(message=json.dumps(body), destination=dest,headers=headers,ack='auto')
+  conn.disconnect()
+
+#########################################################################
+
+def genmd5sum(filename):
+  md5summer=hashlib.md5()
+  if os.path.isfile(filename):
+    try:
+      infil=open(filename,'rb')
+      while True:
+        fs=infil.read(8192)
+        if not fs:
+          break
+        md5summer.update(fs)
+    finally:
+        infil.close()
+  print "md5 sum of the \"%s\" is %s"%(filename,md5summer.hexdigest())
+  return
+      
+def dq_combined_trf(jsonfile, outmap):
+
+  print "\n##################################################################"
+  print   "## STEP 1: creating file with list of root files ..."
+  print   "##################################################################\n"
+  
+  nfiles=0
+
+  try:
+    # extract parameters from json file
+    print "Using json file ", jsonfile, " for input parameters"
+    f = open(jsonfile, 'r')
+    parmap = json.load(f)
+    f.close()
+
+    print "\nFull Tier-0 run options:\n"
+    pprint.pprint(parmap)
+
+    inputfilelist = parmap.get('inputHistFiles', [])
+    nfiles = len(inputfilelist) 
+    histMergeCompressionLevel=parmap.get('histMergeCompressionLevel', 1)
+    histMergeDebugLevel=parmap.get('histMergeDebugLevel', 0)
+  except: 
+    outmap['exitCode'] = 101
+    outmap['exitAcronym'] = 'TRF_NOINPUT'
+    outmap['exitMsg'] = 'Trouble reading json input dict.'
+    traceback.print_exc()
+    return
+  
+  if not nfiles :   # problem with job definition or reading json file
+    outmap['exitCode'] = 102
+    outmap['exitAcronym'] = 'TRF_NOINPUT'
+    outmap['exitMsg'] = 'Empty input file list.'
+    return
+
+  histtmpflist = []
+  nevts = 0
+
+  try:
+    if isinstance(inputfilelist[0], unicode) :  
+      histtmpdsname = (inputfilelist[0]).split('#')[0]
+      for val in inputfilelist :
+        histtmpflist.append(val.split('#')[1])
+    
+    elif isinstance(inputfilelist[0], dict) :
+      histtmpdsname = inputfilelist[0]['dsn']
+      for fdict in inputfilelist :
+        histtmpflist.append(fdict['lfn'])
+        nevt = fdict.get('events', 0)
+        if nevt is None:
+          nevt=0
+          print "WARNING Can't get number of events from input json file"
+        nevts+=nevt
+  
+    f = open('hist_merge.list', 'w')
+    txtstr = ""
+    for hf in histtmpflist : 
+      txtstr += "%s\n" % hf
+    f.write(txtstr)
+    f.close()
+
+    cmd = "cat hist_merge.list"
+    (s,o) = commands.getstatusoutput(cmd)
+    print "\nContents of file hist_merge.list:\n"
+    print o
+  except:
+    outmap['exitCode'] = 103
+    outmap['exitAcronym'] = 'TRF_INPUTINFO'
+    outmap['exitMsg'] = 'ERROR: crash in assembling input file list (STEP 1)'
+    traceback.print_exc()
+    return
+
+  try:
+    print "\n##################################################################"
+    print   "## STEP 2: determining job parameters..."
+    print   "##################################################################\n"
+
+    # output file
+    histdsname = (parmap['outputHistFile']).split('#')[0]
+    histfile = (parmap['outputHistFile']).split('#')[1]
+    amitag = histfile.split('.')[5]
+
+
+    # incremental mode on/off
+    incr = parmap.get('incrementalMode', 'False') 
+    
+    # post-processing on/off
+    postproc = parmap.get('postProcessing', 'True')
+
+    # database uploading on/off
+    allowCOOLUpload = parmap.get('allowCOOLUpload', 'True')
+
+    # do web display
+    doWebDisplay = parmap.get('doWebDisplay', 'True')
+
+    # production mode
+    productionMode = parmap.get('productionMode', 'True')
+    if productionMode != 'True' and incr == 'True':
+      print("Production mode is not True, turning off incremental mode")
+      incr = 'False'
+    
+    # get file paths, put into environment vars
+    filepaths = parmap.get('filepaths', None)
+    if filepaths and isinstance(filepaths, dict):
+      if 'basename' not in filepaths:
+        print("Improperly formed 'filepaths' (no 'basename')")
+      else:
+        for evtclass in ('Collisions', 'Cosmics', 'HeavyIons'):
+          if evtclass not in filepaths:
+            print("Improperly formed 'filepaths' (no '%s')" % evtclass)
+          else:
+            clinfo = filepaths[evtclass]
+            for timeclass in ('run', 'minutes10', 'minutes30'):
+              if timeclass not in clinfo:
+                print("Improperly formed 'filepaths[%s]' (no '%s')" % (evtclass, timeclass))
+              else:
+                dqcenvvar = 'DQC_HCFG_%s_%s' % (evtclass.upper(), timeclass.upper())
+                fpath = os.path.join(filepaths['basename'], clinfo[timeclass])
+                print("Setting %s = %s" % (dqcenvvar, fpath))
+                os.environ[dqcenvvar] = fpath
+
+    # extract info from dataset name
+    # AMI project name
+    # override if tag has been specified in parmap
+    try :
+      dqproject = histdsname.split('.')[0]
+    except :
+      dqproject = 'data_test'
+    dqproject = parmap.get('projectTag', dqproject)
+    
+    # run number
+    if parmap.has_key('runNumber') : 
+      runnr = parmap['runNumber']
+    else :
+      try :
+        runnr = int(histdsname.split('.')[1])
+      except :
+        runnr = 1234567890
+
+    # stream name  
+    if parmap.has_key('streamName') : 
+      stream = parmap['streamName']
+    else :
+      try :
+        stream = histdsname.split('.')[2]
+      except :
+        stream = 'test_dummy'
+    
+    # processing pass number  
+    MAX_XMLRPC_TRIES = 5 
+    if parmap.has_key('procNumber') : 
+      procnumber = parmap['procNumber']
+    else :
+      n_xmlrpc_tries = 1
+      while n_xmlrpc_tries <= MAX_XMLRPC_TRIES :
+        procnumber = 99
+        try :
+          xmlrpcserver = xmlrpclib.ServerProxy('http://atlasdqm.cern.ch:8888')
+          procnumber = xmlrpcserver.get_next_proc_pass(runnr, stream, 'tier0')
+          break 
+        except :
+          print 'Web service connection failed, attempt', n_xmlrpc_tries, 'of', MAX_XMLRPC_TRIES
+          n_xmlrpc_tries += 1
+          if n_xmlrpc_tries <= MAX_XMLRPC_TRIES:
+            time.sleep(20*2**n_xmlrpc_tries)
+
+    print "Job parameters:\n"
+    print "  Run number:      ", runnr
+    print "  Stream name:     ", stream
+    print "  Processing pass: ", procnumber
+    print "  Incremental mode:", incr
+    print "  Post-processing: ", postproc
+    print "  COOL uploads:    ", allowCOOLUpload
+    print "  Production mode: ", productionMode
+
+  except:
+    outmap['exitCode'] = 104
+    outmap['exitAcronym'] = 'TRF_JOBPARS'
+    outmap['exitMsg'] = 'Error in determining job parameters (STEP 2).'
+    traceback.print_exc()
+    return
+
+  try:
+    print "\n##################################################################"
+    print   "## STEP 3: running histogram merging procedure ..."
+    print   "##################################################################\n"
+
+    # environment setting
+    os.environ['DQPRODUCTION'] = '1' if productionMode == 'True' else '0'
+    print "Setting env variable DQPRODUCTION to %s\n" % os.environ['DQPRODUCTION']
+    os.environ['DQ_STREAM'] = stream
+    print "Setting env variable DQ_STREAM to %s\n" % os.environ['DQ_STREAM']
+    os.environ['COOLUPLOADS'] = '1' if allowCOOLUpload == 'True' and productionMode == 'True' else '0'
+    print "Setting env variable COOLUPLOADS to %s\n" % os.environ['COOLUPLOADS']
+
+    if postproc == 'True' :
+      if incr == 'True':
+        cmd = "python -u `which DQHistogramMerge.py` hist_merge.list %s 1 1 %d %d " % (histfile,histMergeCompressionLevel,histMergeDebugLevel)
+      else:        
+        cmd = "python -u `which DQHistogramMerge.py` hist_merge.list %s 1 0 %d %d"  % (histfile,histMergeCompressionLevel,histMergeDebugLevel)
+    else :  
+      cmd = "python -u `which DQHistogramMerge.py` hist_merge.list %s 0 0 %d %d"    % (histfile,histMergeCompressionLevel,histMergeDebugLevel)
+    
+    print "Histogram merging command:\n"
+    print cmd
+    print "\n##################################################################\n"
+    
+    print "## ... logfile from DQHistogramMerge.py: "
+    print "--------------------------------------------------------------------------------"
+    tstart = time.time()
+    # execute command
+    retcode1 = os.system(cmd)
+    print "--------------------------------------------------------------------------------"
+    t1 = time.time()
+    dt1 = int(t1 - tstart)
+    
+    print "\n## DQHistogramMerge.py finished with retcode = %s" % retcode1
+    print   "## ... elapsed time: ", dt1, " sec"
+
+    if retcode1 != 0 :
+      outmap['exitCode'] = retcode1
+      outmap['exitAcronym'] = 'TRF_DQMHISTMERGE_EXE'
+      outmap['exitMsg'] = 'ERROR: DQHistogramMerge.py execution problem! (STEP 3).'
+      print "ERROR: DQHistogramMerge.py execution problem!"
+      retcode = retcode1
+      txt = 'DQHistogramMerge.py execution problem'
+      try:
+        try:
+          infilelist=open('hist_merge.list','r')
+          for infname in infilelist:
+            genmd5sum(infname.rstrip(os.linesep))
+        finally:
+            infilelist.close()
+        genmd5sum(histfile)
+        DQResFile="DQResourceUtilization.txt"
+        if os.path.exists(DQResFile):
+          print "dumping resource utilization log"
+          with open(DQResFile) as resfile:
+            for resline in resfile:
+              print resline,
+      except:
+        outmap['exitMsg'] = 'ERROR: DQHistogramMerge.py execution problem + problem dumping DQResourceUtilization! (STEP 3).'
+        traceback.print_exc()
+        print "ERROR: DQHistogramMerge.py execution problem + problem dumping DQResourceUtilization!"
+      return
+
+    if postproc == 'True' and incr == 'False':
+      print "\n##################################################################"
+      print "## STEP 3b: copying postprocessing output to AFS ..."
+      print "##################################################################\n"
+
+      cmd = "python -u `which DQFileMove.py` %s %s_%s_%s" % (dqproject, runnr, stream, procnumber)
+
+      print "File move command:\n"
+      print cmd
+      print "\n##################################################################\n"
+
+      print "## ... logfile from DQFileMove.py: "
+      print "--------------------------------------------------------------------------------"
+      # execute command
+      retcode1b = os.system(cmd)
+      print "--------------------------------------------------------------------------------"
+      t1b = time.time()
+      dt1b = int(t1b - t1)
+      t1 = t1b
+
+      print "\n## DQFileMove.py finished with retcode = %s" % retcode1b
+      print   "## ... elapsed time: ", dt1b, " sec"
+  except:
+      outmap['exitCode'] = 105
+      outmap['exitAcronym'] = 'TRF_DQMHISTMERGE_EXE'
+      outmap['exitMsg'] = 'ERROR: Failure in histogram merging or copying postprocessing output to AFS (STEP 3/3b).'
+      traceback.print_exc()
+      return
+
+  try:
+    retcode2 = 0
+    dt2 = 0
+    if doWebDisplay == 'True':
+      print "\n##################################################################"
+      print   "## STEP 4: running web-display creation procedure ..."
+      print   "##################################################################\n"
+
+      cmd = "python -u `which DQWebDisplay.py` %s %s %s %s stream=%s" % (histfile, dqproject, procnumber, incr, stream)
+
+      print "Web display creation command:\n"
+      print cmd
+      print "\n##################################################################\n"
+
+      print "## ... logfile from DQWebDisplay.py: "
+      print "--------------------------------------------------------------------------------"
+      # execute command
+      retcode2 = os.system(cmd)
+      print 'DO NOT REPORT "Error in TH1: cannot merge histograms" ERRORS! THESE ARE IRRELEVANT!'
+      print "--------------------------------------------------------------------------------"
+      t2 = time.time()
+      dt2 = int(t2 - t1)
+
+      print "\n## DQWebDisplay.py finished with retcode = %s" % retcode2
+      print   "## ... elapsed time: ", dt2, " sec"
+      if not (retcode2 >> 8) in (0, 5) :
+        print "ERROR: DQWebDisplay.py execution problem!"
+        outmap['exitCode'] = retcode2
+        outmap['exitAcronym'] = 'TRF_DQMDISPLAY_EXE'
+        outmap['exitMsg'] = 'ERROR: DQWebDisplay.py execution problem! (STEP 4).'
+        try:
+          infilelist=open('hist_merge.list','r')
+          for infname in infilelist:
+            genmd5sum(infname.rstrip(os.linesep))
+        finally:
+          infilelist.close()
+        genmd5sum(histfile)
+        return
+      if productionMode == 'True': 
+          try:
+              print 'Publishing to message service'
+              publish_success_to_mq(runnr, dqproject, stream, incr=(incr=='True'), ami=amitag, procpass=procnumber, hcfg=filepaths, isprod=(productionMode=='True'))
+          except:
+              outmap['exitCode'] = 106
+              outmap['exitAcronym'] = 'TRF_DQMDISPLAY_EXE'
+              outmap['exitMsg'] = 'ERROR: Failure in publishing info to messaging service (STEP 4).'
+              traceback.print_exc()
+              return
+    else:
+      print "\n##################################################################"
+      print   "## WEB DISPLAY CREATION SKIPPED BY USER REQUEST"
+      print   "##################################################################\n"
+      print 'Web display off, not publishing to message service'
+  except: 
+    outmap['exitCode'] = 106
+    outmap['exitAcronym'] = 'TRF_DQMDISPLAY_EXE'
+    outmap['exitMsg'] = 'ERROR: Failure in web-display creation procedure (STEP 4).'
+    print 'ERROR: Failure in web-display creation procedure (STEP 4).'
+    traceback.print_exc()
+    return
+  
+  print "\n##################################################################"
+  print   "## STEP 5: finishing the job ..."
+  print   "##################################################################\n"
+        
+  # get info for report json file
+  try:
+    outfiles = [getSubFileMap(histfile, nevts=nevts)]
+    # assemble job report map
+    outmap['files']['output'][0]['dataset'] = histdsname
+    outmap['files']['output'][0]['subFiles'] = outfiles
+    outmap['resource']['transform']['processedEvents'] = long(nevts)
+    return
+  except: 
+    outmap['exitCode'] = 107
+    outmap['exitAcronym'] = 'TRF_JOBREPORT'
+    outmap['exitMsg'] = 'ERROR: in job report creation (STEP 5)'
+    print "ERROR: in job report creation (STEP 5) !"
+    traceback.print_exc()
+    return
+
+def dq_trf_wrapper(jsonfile):
+  print "\n##################################################################"
+  print   "##              ATLAS Tier-0 Offline DQM Processing             ##"
+  print   "##################################################################\n"
+
+  outmap = { 'exitAcronym' : 'OK',
+               'exitCode' : 0,
+               'exitMsg' : 'trf finished OK',
+               'files' : { 'output' : [{ 'dataset' : '',
+                                         'subFiles' : [ {},
+                                                      ]}
+                                    ] },
+                'resource' : { 'transform' : { 'processedEvents' : 0L } }
+                 }
+
+  # dq_combined_trf will update outmap
+  tstart = time.time()
+  dq_combined_trf(jsonfile, outmap)
+  outmap['resource']['transform']['wallTime'] = int(time.time() - tstart) 
+   
+  # dump json report map
+  f = open('jobReport.json', 'w')
+  json.dump(outmap, f)
+  f.close()
+
+  # summarize status
+  print "\n## ... job finished with retcode : %s" % outmap['exitCode']
+  print   "## ... error acronym: ", outmap['exitAcronym']
+  print   "## ... job status message: ", outmap['exitMsg']
+  print   "## ... elapsed time: ", outmap['resource']['transform']['wallTime'], "sec"
+  print   "##"
+  print   "##################################################################"
+  print   "## End of job."
+  print   "##################################################################\n"
+
+
+########################################
+## main()
+########################################
+
+if __name__ == "__main__":
+
+  if (len(sys.argv) != 2) and (not sys.argv[1].startswith('--argJSON=')) :
+    print "Input format wrong --- use "
+    print "   --argJSON=<json-dictionary containing input info> "
+    print "   with key/value pairs: "
+    print "     1) 'inputHistFiles': python list "
+    print "          ['datasetname#filename1', 'datasetname#filename2',...] (input dataset + file names) "
+    print "        or list of file dictionaries "
+    print "          [{'lfn':'fname1', 'checksum':'cks1', 'dsn':'dsn1', 'size':sz1, 'guid':'guid1', 'events':nevts1, ...}, " 
+    print "           {'lfn':'fname2', 'checksum':'cks2', 'dsn':'dsn2', 'size':sz2, 'guid':'guid2', 'events':nevts2, ...}, ...] "
+    print "     2) 'outputHistFile': string 'datasetname#filename' "
+    print "        (HIST output dataset name + file) "
+    print "     optional parameters: "
+    print "     3) 'incrementalMode': string ('True'/'False') "
+    print "        ('True': do incremental update of DQM webpages on top of existing statistics; "
+    print "         'False': create final DQM webpages, replace temporary ones) "
+    print "     4) 'postProcessing': string ('True'/'False', default: 'True') "
+    print "        ('False': run histogram merging and DQ assessment only; "
+    print "         'True': run additional post-processing step (fitting, etc.)) "
+    print "     5) 'procNumber': int (number of processing pass, e.g. 1,2, ...) "
+    print "     6) 'runNumber': int "  
+    print "     7) 'streamName': string (e.g., physics_IDCosmic, physics_Express, ...) "  
+    print "     8) 'projectTag': string (e.g., data10_7TeV, TrigDisplay)"
+    print "     9) 'allowCOOLUpload': string ('True'/'False', default: 'True')"
+    print "        ('True': allow upload of defects to database; "
+    print "         'False': do not upload defects to database)"
+    sys.exit(-1)
+  
+  else :
+    jsonfile = sys.argv[1][len('--argJSON='):]
+    dq_trf_wrapper(jsonfile)
+  
diff --git a/DataQuality/DataQualityUtils/scripts/DQM_Tier0Wrapper_trf.py b/DataQuality/DataQualityUtils/scripts/DQM_Tier0Wrapper_trf.py
index 810b1c553b10df28238b52cd0e369b22a319d423..173f2f5a4c16282668500610df01f3af701aa1df 100755
--- a/DataQuality/DataQualityUtils/scripts/DQM_Tier0Wrapper_trf.py
+++ b/DataQuality/DataQualityUtils/scripts/DQM_Tier0Wrapper_trf.py
@@ -300,6 +300,7 @@ def dq_combined_trf(picklefile):
 
     # environment setting
     os.environ['DQPRODUCTION'] = '1' if productionMode == 'True' else '0'
+    os.environ['DQ_STREAM'] = stream
     print "Setting env variable DQPRODUCTION to %s\n" % os.environ['DQPRODUCTION']
     os.environ['COOLUPLOADS'] = '1' if allowCOOLUpload == 'True' and productionMode == 'True' else '0'
     print "Setting env variable COOLUPLOADS to %s\n" % os.environ['COOLUPLOADS']
diff --git a/DataQuality/DataQualityUtils/scripts/checkCorrelInHIST.py b/DataQuality/DataQualityUtils/scripts/checkCorrelInHIST.py
index 21c97ad3dd1a13d3a6aa0c4985fc0cdab2bf58a2..4f56fa1f26ee5d346779bbecd266424baecd67f6 100644
--- a/DataQuality/DataQualityUtils/scripts/checkCorrelInHIST.py
+++ b/DataQuality/DataQualityUtils/scripts/checkCorrelInHIST.py
@@ -39,7 +39,7 @@ import string
 import argparse
 import xmlrpclib
 
-import pathExtract         
+from DataQualityUtils import pathExtract         
 
 from ROOT import TFile,TCanvas,TBox,TPaveText,TColor
 from ROOT import TH1,TH2,TH1I,TH1D,TH2D
diff --git a/DataQuality/DataQualityUtils/scripts/hotSpotInHIST.py b/DataQuality/DataQualityUtils/scripts/hotSpotInHIST.py
index 0c28384caadce7854d454ff5160c42a4227dc17b..78ea304591cba970f39f46db770fd770be7757de 100644
--- a/DataQuality/DataQualityUtils/scripts/hotSpotInHIST.py
+++ b/DataQuality/DataQualityUtils/scripts/hotSpotInHIST.py
@@ -36,7 +36,7 @@ import os, sys
 import string
 import argparse,xmlrpclib
 
-import pathExtract         
+from DataQualityUtils import pathExtract         
 
 from ROOT import TFile,TCanvas,TBox,TColor,TLegend
 from ROOT import TH1,TH2,TH1I
@@ -211,8 +211,8 @@ if (objectType == "EMTopoJets_eta"):
 # Tau
 if (objectType == "Tau"):
   histoPath  = {"NoCut":"run_%d/Tau/tauPhiVsEta"%(runNumber),
-                "Et15GeV":"run_%d/Tau/tauPhiVsEta_et15"%(runNumber),
-                "Et15GeVBdtLoose":"run_%d/Tau/tauPhiVsEta_et15_BDTLoose"%(runNumber)}
+                "Et15GeV":"run_%d/Tau/tauPhiVsEtaEt15"%(runNumber),
+                "Et15GeVBdtLoose":"run_%d/Tau/tauPhiVsEtaEt15BDTLoose"%(runNumber)}
   histoLegend = {"NoCut":"Et > 4GeV",
                  "Et15GeV":"Et > 10GeV",
                  "Et15GeVBdtLoose":"Et > 15GeV-BDT loose"}
diff --git a/DataQuality/DataQualityUtils/scripts/hotSpotInTAG.py b/DataQuality/DataQualityUtils/scripts/hotSpotInTAG.py
index 48b677a87cfb8c1dcd9d537c82a2159e20660ed8..4c3860cbed85c87038b0085bd3bc4e22dde01a1d 100644
--- a/DataQuality/DataQualityUtils/scripts/hotSpotInTAG.py
+++ b/DataQuality/DataQualityUtils/scripts/hotSpotInTAG.py
@@ -23,7 +23,7 @@ import os, sys
 import string,math
 from math import fabs
 import argparse
-import pathExtract
+from DataQualityUtils import pathExtract
 
 import ROOT
 from ROOT import *
@@ -130,7 +130,7 @@ if tagDirectory=="": # TAG files stored on EOS
   listOfFiles = pathExtract.returnEosTagPath(run,stream,amiTag,tag)
   if len(listOfFiles)>0:
     for files in listOfFiles:
-      tree.AddFile("root://eosatlas.cern.ch/%s"%(files))
+      tree.AddFile("root://eosatlas/%s"%(files))
       print "I chained the file %s"%(files)
   else:
     print "No file found on EOS.Exiting..."
diff --git a/DataQuality/DataQualityUtils/scripts/physval_make_web_display.py b/DataQuality/DataQualityUtils/scripts/physval_make_web_display.py
index ece67fc82208fe3f9db2991436a9f70d83279dfd..f11fe0c7c2a113828bb3773db01f8fcb11bbf825 100755
--- a/DataQuality/DataQualityUtils/scripts/physval_make_web_display.py
+++ b/DataQuality/DataQualityUtils/scripts/physval_make_web_display.py
@@ -35,7 +35,7 @@ def recurse(rdir, dqregion, ignorepath, refs=None, displaystring='Draw=PE', disp
         if ' ' in key.GetName():
             print 'WARNING: cannot have spaces in histogram names for han config; not including %s %s' % (cl, key.GetName())
             continue
-        if rcl.InheritsFrom('TH1'):
+        if rcl.InheritsFrom('TH1') or rcl.InheritsFrom('TGraph') or rcl.InheritsFrom('TEfficiency'):
             if '/' in key.GetName():
                 print 'WARNING: cannot have slashes in histogram names, encountered in directory %s, histogram %s' % (rdir.GetPath(), key.GetName())
                 continue
@@ -74,6 +74,8 @@ def recurse(rdir, dqregion, ignorepath, refs=None, displaystring='Draw=PE', disp
             if options.ratio: drawstrs.append('RatioPad')
             #if options.ratio: drawstrs.append('Ref2DSignif')
             if options.ratio2D: drawstrs.append('Ref2DRatio')
+            if options.ratiorange is not None:
+              drawstrs.append('delta(%f)' % options.ratiorange)
 
             drawstrs.append('DataName=%s' % options.title)
             dqpar.addAnnotation('display', ','.join(drawstrs))
@@ -226,7 +228,8 @@ def super_process(fname, options):
                                            hanoutput,
                                            options.outdir,
                                            '', False, False, 
-                                           'https://atlasdqm.web.cern.ch/atlasdqm/js/')
+                                           'https://atlasdqm.web.cern.ch/atlasdqm/js/',
+                                           3 if options.jsRoot else 1)
 ##            print '====> Copying to', hantargetdir
 ##            hantargetfile = os.path.join(hantargetdir, 'out_han.root')
 ##            if not os.access(hantargetdir, os.W_OK):
@@ -291,7 +294,10 @@ if __name__=="__main__":
                       help='Draw histograms with ratio plots')
     parser.add_option('--ratio2D', default=False, action='store_true',
                       help='Draw 2D histograms with ratio plots')
-
+    parser.add_option('--jsRoot',action='store_true', default=False,
+                      help="make interactive jsRoot displays")
+    parser.add_option('--ratiorange', default=None, type=float,
+                      help='set range for ratio plots (as delta to 1.0)')
 
     options, args = parser.parse_args()
     
diff --git a/DataQuality/DataQualityUtils/scripts/readTier0HIST.py b/DataQuality/DataQualityUtils/scripts/readTier0HIST.py
index a46ff408bf2d52adb91aecb6ceb2a312d132f583..c871a9b7dadb45b3bfc0c0c75595dd2cfe712168 100644
--- a/DataQuality/DataQualityUtils/scripts/readTier0HIST.py
+++ b/DataQuality/DataQualityUtils/scripts/readTier0HIST.py
@@ -18,7 +18,7 @@ import os, sys
 import argparse
 import xmlrpclib
 
-import pathExtract         
+from DataQualityUtils import pathExtract
 
 from ROOT import TFile,TBrowser
 from ROOT import gStyle
diff --git a/DataQuality/DataQualityUtils/scripts/readTier0LARNOISE.py b/DataQuality/DataQualityUtils/scripts/readTier0LARNOISE.py
index 70428e4bc9524e91d5277872c59aa78fb8b2b016..31dbeefa551b0325c7c483277f5dd01e0f2adffd 100644
--- a/DataQuality/DataQualityUtils/scripts/readTier0LARNOISE.py
+++ b/DataQuality/DataQualityUtils/scripts/readTier0LARNOISE.py
@@ -14,10 +14,10 @@
 import os, sys  
 import argparse
 
-import pathExtract         
+from DataQualityUtils import pathExtract         
 import xmlrpclib
 
-from ROOT import TFile,TBrowser
+from ROOT import TFile,TBrowser,TChain
 from ROOT import gStyle
 
 gStyle.SetPalette(1)
@@ -65,7 +65,7 @@ tree = TChain("CollectionTree")
 print listOfFiles
 for fileNames in listOfFiles:
   print "Adding %s"%(fileNames)
-  tree.AddFile("root://eosatlas.cern.ch/%s"%(fileNames))
+  tree.AddFile("root://eosatlas/%s"%(fileNames))
 
 entries = tree.GetEntries()
 if entries != 0:
diff --git a/DataQuality/DataQualityUtils/scripts/readTier0TAGs.py b/DataQuality/DataQualityUtils/scripts/readTier0TAGs.py
index 4e80211c19d7afed6067dedc3f1e4bcd44d85df3..bd31946cc4a452512456545d593de45ce828648f 100644
--- a/DataQuality/DataQualityUtils/scripts/readTier0TAGs.py
+++ b/DataQuality/DataQualityUtils/scripts/readTier0TAGs.py
@@ -14,14 +14,12 @@
 import os, sys  
 import argparse
 
-import pathExtract         
+from DataQualityUtils import pathExtract         
 import xmlrpclib
 
 from ROOT import TFile,TChain
 from ROOT import gStyle
 
-
-#gROOT.Reset()
 gStyle.SetPalette(1)
 gStyle.SetOptStat("em")
   
@@ -67,7 +65,7 @@ tree = TChain("POOLCollectionTree")
 file = {}
 for fileNames in listOfFiles:
   print "Adding %s"%(fileNames)
-  tree.AddFile("root://eosatlas.cern.ch/%s"%(fileNames))
+  tree.AddFile("root://eosatlas/%s"%(fileNames))
 
 entries = tree.GetEntries()
 if entries != 0:
diff --git a/DataQuality/DataQualityUtils/src/HanOutputFile.cxx b/DataQuality/DataQualityUtils/src/HanOutputFile.cxx
index 120c13f93ff5e33896b1d3e56de071b590d27975..adb22229ecbe40b319af5532fb19fd9d859321f1 100644
--- a/DataQuality/DataQualityUtils/src/HanOutputFile.cxx
+++ b/DataQuality/DataQualityUtils/src/HanOutputFile.cxx
@@ -10,6 +10,7 @@
 #include "DataQualityInterfaces/HanUtils.h"
 
 #include <sstream>
+#include <fstream>
 #include <cstdlib>
 #include <boost/algorithm/string/case_conv.hpp>
 #include <boost/lexical_cast.hpp>
@@ -31,6 +32,10 @@
 #include <TF1.h>
 #include <TMath.h>
 #include <THStack.h>
+#include <TImage.h>
+#include <TBufferJSON.h>
+#include <TString.h>
+#include <TEfficiency.h>
 
 #define BINLOEDGE(h,n) h->GetXaxis()->GetBinLowEdge(n)
 #define BINWIDTH(h,n) h->GetXaxis()->GetBinWidth(n)
@@ -164,8 +169,7 @@ getAllAssessments( AssMap_t& dirmap, TDirectory* dir )
   TKey* key;
   while( (key = dynamic_cast<TKey*>( next() )) != 0 ) {
     TObject* obj = key->ReadObj();
-    //TH1* h = dynamic_cast<TH1*>( obj );
-    if( dynamic_cast<TH1*>(obj) || dynamic_cast<TGraph*>(obj) ) {
+    if( dynamic_cast<TH1*>(obj) || dynamic_cast<TGraph*>(obj) || dynamic_cast<TEfficiency*>(obj) ) {
       const char * path(dir->GetPath() ); 
       std::string assName( obj->GetName() );
       AssMap_t::value_type AssmapVal(assName, path);
@@ -260,6 +264,12 @@ getNEntries( std::string location, std::string histname )
     Nentries = g->GetN();
     delete g;
   }
+  TEfficiency* e(0);
+  gDirectory->GetObject( histname.c_str(),e );
+  if ( e != 0 ) {
+    Nentries = e->GetCopyTotalHisto()->GetEntries();
+    delete e;
+  }
   
   return Nentries;
 }
@@ -272,6 +282,8 @@ getNEntries( const TObject* obj )
     return h->GetEntries();
   } else if (const TGraph* g = dynamic_cast<const TGraph*>(obj)) {
     return g->GetN();
+  } else if (const TEfficiency* e = dynamic_cast<const TEfficiency*>(obj)) {
+    return e->GetCopyTotalHisto()->GetEntries();
   } else {
     std::cerr << "HanOutputFile::getNEntries(): "
 	      << "provided object is not a histogram or graph\n";
@@ -787,7 +799,7 @@ streamAllHistograms( std::ostream& o, bool streamAll )
 
 int
 HanOutputFile::
-saveAllHistograms( std::string location, bool drawRefs, std::string run_min_LB ) 
+saveAllHistograms( std::string location, bool drawRefs, std::string run_min_LB ,int cnvsType)
 {
   if( m_file == 0 ) {
     std::cerr << "HanOutputFile::saveAllHistograms(): "
@@ -824,7 +836,7 @@ saveAllHistograms( std::string location, bool drawRefs, std::string run_min_LB )
       completeDir += "/";
       std::cout << "Saving " << completeDir << " " << hisName << "\n" << std::flush;
       bool isSaved = saveHistogramToFile(hisName,completeDir,idir->second,drawRefs,run_min_LB,
-                                         (hisPath + "/" + hisName));
+                                         (hisPath + "/" + hisName),cnvsType);
       if( isSaved )
         ++nSaved;
     }
@@ -832,10 +844,46 @@ saveAllHistograms( std::string location, bool drawRefs, std::string run_min_LB )
   return nSaved;
 }
 
+void getImageBuffer(TImage* img, TCanvas* myC, char** x, int* y){
+  img->FromPad(myC);
+  img->GetImageBuffer(x, y, TImage::kPng);
+}
 
-bool
+bool HanOutputFile::saveHistogramToFile( std::string nameHis, std::string location, TDirectory* groupDir, bool drawRefs,std::string run_min_LB, std::string pathName,int cnvsType){
+  std::pair<std::string,std::string> pngAndJson = getHistogram(nameHis,groupDir,drawRefs,run_min_LB,pathName,cnvsType);
+  //std::string tosave = getHistogramPNG(nameHis, groupDir, drawRefs, run_min_LB, pathName);
+  if (pngAndJson.first== "") {
+    return false;
+  }
+  std::string namePNG   = nameHis;
+  std::string nameJSON  = nameHis;
+
+  namePNG   +=".png";
+  nameJSON  +=".json";
+
+  std::string::size_type i = location.find_last_of( '/' );
+  if( i != (location.size()-1) ) {
+    location+="/";
+  }
+  namePNG   = location + namePNG;
+  nameJSON  = location + nameJSON;
+
+  return saveFile(cnvsType, namePNG,pngAndJson.first,nameJSON,pngAndJson.second);
+}
+
+std::string
 HanOutputFile::
-saveHistogramToFile( std::string nameHis, std::string location, TDirectory* groupDir, bool drawRefs,std::string run_min_LB, std::string pathName){
+getHistogramPNG( std::string nameHis, TDirectory* groupDir, bool drawRefs,std::string run_min_LB, std::string pathName){
+    int cnvsType = 0;
+    return getHistogram(nameHis, groupDir,drawRefs,run_min_LB,pathName,cnvsType).first;
+}
+
+std::pair<std::string,std::string> HanOutputFile:: getHistogramJSON( std::string nameHis, TDirectory* groupDir, bool drawRefs,std::string run_min_LB, std::string pathName){
+    int cnvsType = 1;
+    return getHistogram(nameHis, groupDir,drawRefs,run_min_LB,pathName,cnvsType);
+}
+
+std::pair<std::string,std::string> HanOutputFile:: getHistogram( std::string nameHis, TDirectory* groupDir, bool drawRefs, std::string run_min_LB, std::string pathName,int cnvsType){
   dqi::DisableMustClean disabled;
   groupDir->cd();
  
@@ -860,6 +908,10 @@ saveHistogramToFile( std::string nameHis, std::string location, TDirectory* grou
   gStyle->SetStatW(0.2);
   gStyle->SetStatH(0.1);
   
+  char* x;
+  int y;
+  std::string json;
+  TImage* img = TImage::Create();  
 
   gROOT->SetBatch();
   std::string pathname( groupDir->GetPath() );
@@ -935,7 +987,7 @@ saveHistogramToFile( std::string nameHis, std::string location, TDirectory* grou
   TKey* hkey = groupDir->FindKey( nameHis.c_str() );
   if( hkey == 0 ) {
     std::cerr << "Did not find TKey for \"" << nameHis << "\", will not save this histogram.\n";
-    return false;
+    return std::pair<std::string,std::string>{"",""};
   }
   TLegend* legend(0);
   TObject* hobj = hkey->ReadObj();
@@ -947,14 +999,15 @@ saveHistogramToFile( std::string nameHis, std::string location, TDirectory* grou
   TH1* h = dynamic_cast<TH1*>( hobj );
   TH2* h2 = dynamic_cast<TH2*>( h );
   TGraph* g = dynamic_cast<TGraph*>( hobj );
+  TEfficiency* e = dynamic_cast<TEfficiency*>( hobj );
 
   std::string name=nameHis;
-  name+=".png";
+  /*  name+=".png";
   std::string::size_type i = location.find_last_of( '/' );
   if( i != (location.size()-1) ) {
     location+="/";
   }
-  name=location + name;
+  name=location + name; */
   std::string AlgoName=getStringName(pathname+"/"+nameHis+"_/Config/name");
   int ww = 550;
   int wh = 490;
@@ -967,7 +1020,6 @@ saveHistogramToFile( std::string nameHis, std::string location, TDirectory* grou
   }
 
   if( h!=0 ){     
-
     TCanvas *myC = new TCanvas( nameHis.c_str(), "myC", ww, wh );
 
     // if(  h->GetMinimum() >= 0) {
@@ -1002,26 +1054,26 @@ saveHistogramToFile( std::string nameHis, std::string location, TDirectory* grou
       std::size_t fpos1,fpos2,fpos;
       fpos=display.find("MinStat");
       if (fpos!= std::string::npos){
-	fpos1=display.find("(",fpos+1);
-	if (fpos1!=std::string::npos) {
-	  fpos2 = display.find(")",fpos1+1);
-	  if (fpos2!=std::string::npos) {
-	    std::string s_minstat=display.substr(fpos1+1,fpos2-fpos1-1);
-	    minstat=std::strtod(s_minstat.c_str(),NULL);
-    	  }
+  fpos1=display.find("(",fpos+1);
+  if (fpos1!=std::string::npos) {
+    fpos2 = display.find(")",fpos1+1);
+    if (fpos2!=std::string::npos) {
+      std::string s_minstat=display.substr(fpos1+1,fpos2-fpos1-1);
+      minstat=std::strtod(s_minstat.c_str(),NULL);
+        }
     
-	}
+  }
       }
       std::string fitopt("");
       fpos=display.find("FitOption");
       if (fpos!= std::string::npos){
-	  fpos1=display.find("(",fpos+1);
-	  if (fpos1!=std::string::npos) {
-	    fpos2 = display.find(")",fpos1+1);
-	    if (fpos2!=std::string::npos) {
-	      fitopt=display.substr(fpos1+1,fpos2-fpos1-1);
-	    }    
-	  }
+          fpos1=display.find("(",fpos+1);
+          if (fpos1!=std::string::npos) {
+              fpos2 = display.find(")",fpos1+1);
+              if (fpos2!=std::string::npos) {
+                  fitopt=display.substr(fpos1+1,fpos2-fpos1-1);
+              }    
+          }
       }
       //plot double gaus
       std::size_t found1 = display.find("doublegaus");
@@ -1157,14 +1209,14 @@ saveHistogramToFile( std::string nameHis, std::string location, TDirectory* grou
                   << "Inconsistent x-axis settings:  min=" << h->GetXaxis()->GetXmin() << ", "
                   << "max=" << h->GetXaxis()->GetXmax() << ", "
                   << "Will not save this histogram.\n";
-        return false;
+        return std::pair<std::string,std::string>{"",""};
       }
       if( h->GetYaxis()->GetXmin() >= h->GetYaxis()->GetXmax() ) {
         std::cerr << "HanOutputFile::saveHistogramToFile(): "
                   << "Inconsistent y-axis settings:  min=" << h->GetYaxis()->GetXmin() << ", "
                   << "max=" << h->GetYaxis()->GetXmax() << ", "
                   << "Will not save this histogram.\n";
-        return false;
+        return std::pair<std::string,std::string>{"",""};
       }
       axisOption(display,h2);
       if (drawopt =="") {
@@ -1201,8 +1253,8 @@ saveHistogramToFile( std::string nameHis, std::string location, TDirectory* grou
       tt.SetNDC();
       tt.SetTextSize(0.03);
       tt.DrawLatex(0.02,0.01,pathName.c_str());
-
-      myC->SaveAs( name.c_str() );
+      
+      convertToGraphics(cnvsType,myC,json,img,&x,&y);
 
     } else if( h != 0 ){
       formatTH1( myC, h );
@@ -1214,7 +1266,7 @@ saveHistogramToFile( std::string nameHis, std::string location, TDirectory* grou
                   << "Inconsistent x-axis settings:  min=" << h->GetXaxis()->GetXmin() << ", "
                   << "max=" << h->GetXaxis()->GetXmax() << ", "
                   << "Will not save this histogram.\n";
-        return false;
+        return std::pair<std::string,std::string>{"",""};
       }
       h->SetLineColor(kBlack);
       h->SetMarkerColor(1);
@@ -1402,7 +1454,9 @@ saveHistogramToFile( std::string nameHis, std::string location, TDirectory* grou
       tt.SetNDC();
       tt.SetTextSize(0.03);
       tt.DrawLatex(0.02,0.01,pathName.c_str());
-      myC->SaveAs(name.c_str());
+
+      convertToGraphics(cnvsType,myC,json,img,&x,&y);
+
     }
     delete myC;
     gStyle->Reset();
@@ -1433,20 +1487,49 @@ saveHistogramToFile( std::string nameHis, std::string location, TDirectory* grou
     tt.SetNDC();
     tt.SetTextSize(0.03);
     tt.DrawLatex(0.02,0.01,pathName.c_str());
-    myC->SaveAs( name.c_str() );
+    //myC->SaveAs( name.c_str() );
+   
+    convertToGraphics(cnvsType,myC,json,img,&x,&y);
+
     delete myC;
     gStyle->Reset();
   }
 
+  /*************************************************************************************************************/
+  if( e != 0 ) {
+    TCanvas *myC = new TCanvas( nameHis.c_str(), "myC", ww, wh );
+    myC->cd();
+    formatTEfficiency( myC, e );
+    e->Draw((std::string("AP") + drawopt).c_str());
+    displayExtra(myC,display);
+    TLatex t;
+    t.SetNDC();
+    t.SetTextSize(0.03);
+    t.DrawLatex(0.02,0.04,run_min_LB.c_str());
+    TLatex tt;
+    tt.SetNDC();
+    tt.SetTextSize(0.03);
+    tt.DrawLatex(0.02,0.01,pathName.c_str());
+    convertToGraphics(cnvsType,myC,json,img,&x,&y);
+    delete myC;
+    gStyle->Reset();
+  }
+
+
+  std::string rv(x, y);
+  std::pair<std::string,std::string>rvPair{rv,json};
+
+  delete img;
   delete hobj;
   delete hRef;
   delete legend;
-  return true;
+  return rvPair;
+  
 }
 
 bool HanOutputFile::saveHistogramToFileSuperimposed( std::string nameHis, std::string location, 
 				 TDirectory* groupDir1, TDirectory* groupDir2, 
-				 bool drawRefs,std::string run_min_LB, std::string pathName){
+				 bool drawRefs,std::string run_min_LB, std::string pathName,int cnvsType){
   dqi::DisableMustClean disabled;
   groupDir1->cd();
   gStyle->SetFrameBorderMode(0);
@@ -1507,14 +1590,19 @@ bool HanOutputFile::saveHistogramToFileSuperimposed( std::string nameHis, std::s
   TH1* h(0),*hist2(0);
   TH2* h2(0),*h2_2(0),*h2Diff(0);
   TGraph* g(0),*g2(0);
+  TEfficiency *e(0), *e2(0);
 
-  std::string name=nameHis;
-  name+=".png";
+  std::string json;
+  std::string nameJSON  = nameHis;
+  std::string namePNG   = nameHis;
+  namePNG+=".png";
+  nameJSON+=".json";
   std::string::size_type i = location.find_last_of( '/' );
   if( i != (location.size()-1) ) {
     location+="/";
   }
-  name=location + name;
+  namePNG   =location + namePNG;
+  nameJSON  =location + nameJSON;
   std::string AlgoName=getStringName(pathname+"/"+nameHis+"_/Config/name");
   int ww = 550;
   int wh = 490;
@@ -1560,7 +1648,8 @@ bool HanOutputFile::saveHistogramToFileSuperimposed( std::string nameHis, std::s
       tt.SetTextSize(0.03);
       tt.DrawLatex(0.02,0.01,pathName.c_str());
 
-      myC->SaveAs( name.c_str() );
+      convertToGraphics(cnvsType,myC,namePNG,nameJSON);
+
     } else if( h != 0 && hist2!=0){
       h->SetMarkerColor(1);
       h->SetFillStyle(0);
@@ -1597,7 +1686,9 @@ bool HanOutputFile::saveHistogramToFileSuperimposed( std::string nameHis, std::s
       tt.SetNDC();
       tt.SetTextSize(0.03);
       tt.DrawLatex(0.02,0.01,pathName.c_str());
-      myC->SaveAs(name.c_str());
+
+      convertToGraphics(cnvsType,myC,namePNG,nameJSON);
+
     } //end histogram drawing
     delete myC;
     delete h2Diff;
@@ -1626,7 +1717,35 @@ bool HanOutputFile::saveHistogramToFileSuperimposed( std::string nameHis, std::s
     tt.SetNDC();
     tt.SetTextSize(0.03);
     tt.DrawLatex(0.02,0.01,pathName.c_str());
-    myC->SaveAs( name.c_str() );
+
+    convertToGraphics(cnvsType,myC,namePNG,nameJSON);
+    
+    delete myC;
+    gStyle->Reset();
+  }
+
+  if(((e = dynamic_cast<TEfficiency*>(hobj))!=0 ) && ((e2=dynamic_cast<TEfficiency*>(hobj2))!=0) ){
+    TCanvas *myC = new TCanvas( nameHis.c_str(), "myC", ww, wh );
+    myC->cd();
+
+    formatTEfficiency( myC, e );
+    formatTEfficiency( myC, e2 );
+    e->Draw((std::string("AP") + drawopt).c_str());
+    displayExtra(myC,display);
+    e2->SetMarkerColor(2);
+    e2->SetLineColor(2);
+    e2->Draw((std::string("P") + drawopt+" same").c_str());
+    TLatex t;
+    t.SetNDC();
+    t.SetTextSize(0.03);
+    t.DrawLatex(0.02,0.04,run_min_LB.c_str());
+    TLatex tt;
+    tt.SetNDC();
+    tt.SetTextSize(0.03);
+    tt.DrawLatex(0.02,0.01,pathName.c_str());
+    
+    convertToGraphics(cnvsType,myC,namePNG,nameJSON);
+    
     delete myC;
     gStyle->Reset();
   }
@@ -2141,7 +2260,14 @@ void HanOutputFile::ratioplot (TCanvas* myC_upperpad ,TH1* h,TH1* hRef,std::stri
     
     formatTH1( myC_ratiopad, clonehist);
     clonehist->SetTitle("");
-    clonehist->SetAxisRange(0.25,1.75,"Y");
+
+    // extract delta value from string that holds the draw options
+    double delta = 0.75;
+    if (display.find("delta(") != std::string::npos) {
+      delta = std::stod(display.substr(display.find("delta(") + 6));
+    }
+    clonehist->SetAxisRange(1. - delta, 1. + delta, "Y");
+
     clonehist->GetYaxis()->SetNdivisions(3, true);
     clonehist->SetMarkerStyle(1);
     clonehist->Draw("E");
@@ -2571,6 +2697,14 @@ formatTGraph( TCanvas* c, TGraph* g ) const
   g->SetMarkerStyle(20);
 }
 
+void HanOutputFile::formatTEfficiency( TCanvas* c, TEfficiency* e ) const {
+  if( c == 0 || e == 0 ) return;
+  c->SetLeftMargin(0.15);
+  c->SetRightMargin(0.13);
+  c->SetBottomMargin(0.15);
+  c->SetTopMargin(0.12);
+}
+
 // *********************************************************************
 // Protected Methods
 // *********************************************************************
@@ -2598,6 +2732,69 @@ clearData()
 //   gROOT->SetMustClean(useRecursiveDelete);
 }
 
+bool
+HanOutputFile::
+writeToFile(std::string fname ,std::string content)
+{
+    std::ofstream outfile(fname);
+    if (!outfile.is_open()){
+        std::cerr << "Error writing file to " << fname <<std::endl;
+        return false;
+    }
+    outfile<<content;
+    outfile.close();
+    return true;
+}
+
+void HanOutputFile::
+convertToGraphics(int cnvsType, TCanvas* myC,std::string &json, TImage *img,char **x, int *y)
+{
+    int GENERATE_PNG        = 1; // Make PNG with TImage
+    int GENERATE_JSON       = 2; // Make JSON
+    if (cnvsType & GENERATE_PNG) 
+    {
+        if(img) getImageBuffer(img,myC,x,y);
+    }
+    if (cnvsType & GENERATE_JSON)
+    {
+        json = TBufferJSON::ConvertToJSON(myC);
+    }
+}
+
+void HanOutputFile::
+convertToGraphics(int cnvsType, TCanvas* myC,std::string namePNG,std::string nameJSON)
+{
+    int GENERATE_PNG        = 1; // Make PNG with TImage
+    int GENERATE_JSON       = 2; // Make JSON
+    if (cnvsType & GENERATE_PNG) 
+    {
+        myC->SaveAs(namePNG.c_str());
+    }
+    if (cnvsType & GENERATE_JSON)
+    {
+        std::string json = std::string(TBufferJSON::ConvertToJSON(myC));
+        writeToFile(nameJSON,json);
+    }
+}
+
+bool HanOutputFile::
+saveFile(int cnvsType, std::string pngfName,std::string pngContent, std::string jsonfName, std::string jsonfContent)
+{
+    int GENERATE_PNG        = 1; // Make PNG with TImage
+    int GENERATE_JSON       = 2; // Make JSON
+
+    bool png =false;
+    bool json=false;
+    if (cnvsType & GENERATE_PNG) 
+    {
+      png   = writeToFile(pngfName,pngContent);
+    }
+    if (cnvsType & GENERATE_JSON) 
+    {
+      json  = writeToFile(jsonfName,jsonfContent);
+    }
+    return (png || json);
+}
 
 } // namespace dqutils
 
diff --git a/DataQuality/DataQualityUtils/src/MonitoringFile.cxx b/DataQuality/DataQualityUtils/src/MonitoringFile.cxx
index 951ea9669a3dc436ed45a2c85e4568b91775adf8..f80b65917e6bc7cc8f0f62b3a4bd629001c3e205 100644
--- a/DataQuality/DataQualityUtils/src/MonitoringFile.cxx
+++ b/DataQuality/DataQualityUtils/src/MonitoringFile.cxx
@@ -37,6 +37,7 @@
 #include <TKey.h>
 #include <TROOT.h>
 #include <TTree.h>
+#include <TEfficiency.h>
 
 ClassImp(dqutils::MonitoringFile)
 
@@ -570,6 +571,7 @@ mergeDirectory( TDirectory* outputDir, const std::vector<TFile*>& inputFiles, bo
 
          TH1* h(0);
          TGraph* g(0);
+         TEfficiency* e(0);
          TDirectory* d(0);
          TTree* t(0);
          TObject* targetObj(0);
@@ -579,9 +581,13 @@ mergeDirectory( TDirectory* outputDir, const std::vector<TFile*>& inputFiles, bo
 //          g = dynamic_cast<TGraph*>( obj.get() );
 //          t = dynamic_cast<TTree*>( obj.get() );
 
-         if((targetDir)&&((h = dynamic_cast<TH1*>( obj.get() )) ||  //merge only objects below target directory
-	     (g = dynamic_cast<TGraph*>( obj.get() ))|| 
-		((keyName != "metadata") && (t = dynamic_cast<TTree*>( obj.get() )))))  {
+         //merge only objects below target directory
+         if ( (targetDir) && (  (h = dynamic_cast<TH1*>(obj.get()))
+                             || (g = dynamic_cast<TGraph*>(obj.get()))
+                             ||((t = dynamic_cast<TTree*>(obj.get())) && (keyName!="metadata"))
+                             || (e = dynamic_cast<TEfficiency*>(obj.get()))
+                             ) 
+            ) {
 	   //skip cases where regexp doesn't match object name, all directories are processed by default
 	   if(m_useRE){
 	     if(!boost::regex_search(keyName,*m_mergeMatchHistoRE)){
@@ -615,6 +621,12 @@ mergeDirectory( TDirectory* outputDir, const std::vector<TFile*>& inputFiles, bo
                         << "  TTree \"" << keyName << "\" requests merging type " << mergeType
                         << " but only default merging implemented for TTrees\n";
                }
+               if( e && (md.merge != "<default>") ) {
+                  std::cerr << "MonitoringFile::mergeDirectory(): "
+                        << "In directory \"" << inputDir->GetPath() << "\",\n"
+                        << "  TEfficiency \"" << keyName << "\" requests merging type " << mergeType
+                        << " but only default merging implemented for TEfficiency\n";
+               }
             }else {
                std::cerr << "MonitoringFile::mergeDirectory(): "
                   << "In directory \"" << inputDir->GetPath() << "\",\n"
@@ -742,7 +754,7 @@ void
 MonitoringFile::
 mergeFiles( std::string outFileName, const std::vector<std::string>& files )
 {
-  //dqi::DisableMustClean disabled;
+  dqi::DisableMustClean disabled;
   TH1::AddDirectory(false);
   if(m_useRE){
     std::cout<<" ========== Using regular expressions for selective merging ========== "<<std::endl;
@@ -1401,6 +1413,12 @@ execute( TGraph* graph )
   return true;
 }
 
+bool MonitoringFile::CopyHistogram::execute( TEfficiency* eff ) {
+  m_target->cd();
+  eff->Write();
+  return true;
+}
+
 
 bool
 MonitoringFile::CopyHistogram::
@@ -1437,6 +1455,18 @@ executeMD( TGraph* graph, const MetaData& md )
 }
 
 
+bool MonitoringFile::CopyHistogram::executeMD( TEfficiency* eff, const MetaData& md ) {
+  m_target->cd();
+  eff->Write();
+  copyString( m_nameData, md.name );
+  copyString( m_intervalData, md.interval );
+  copyString( m_chainData, md.chain );
+  copyString( m_mergeData, md.merge );
+  m_metadata->Fill();
+  return true;
+}
+
+
 void
 MonitoringFile::CopyHistogram::
 copyString( char* to, const std::string& from )
@@ -1490,6 +1520,22 @@ execute( TGraph* graph )
 }
 
 
+bool MonitoringFile::GatherStatistics::execute( TEfficiency* eff ) {
+  ++m_nEfficiency;
+  
+  TH1* h_total = eff->GetCopyPassedHisto();
+  TH2* h_total2D = dynamic_cast<TH2*>( h_total );
+
+  if( h_total2D != 0 ) {
+    m_nEfficiencyBins += (h_total2D->GetNbinsX() * h_total2D->GetNbinsY());
+    return true;
+  } else {
+    m_nEfficiencyBins += h_total->GetNbinsX();
+    return true;
+  }
+}
+
+
 MonitoringFile::GatherNames::
 GatherNames()
 {
@@ -1514,6 +1560,12 @@ execute( TGraph* graph )
 }
 
 
+bool MonitoringFile::GatherNames::execute( TEfficiency* eff ) {
+  m_names.push_back( std::string(eff->GetName()) );
+  return true;
+}
+
+
 void
 MonitoringFile::
 clearData()
@@ -1582,15 +1634,15 @@ loopOnHistograms( HistogramOperation& fcn, TDirectory* dir )
   TKey* key;
   while( (key = dynamic_cast<TKey*>( next() )) != 0 ) {
     TObject* obj = key->ReadObj();
-    TH1* h = dynamic_cast<TH1*>( obj );
-    if( h != 0 ) {
+    TH1* h(0);
+    TGraph* g(0);
+    TEfficiency* e(0);
+    if ((h = dynamic_cast<TH1*>(obj))) {
       fcn.execute( h );
-    }
-    else {
-      TGraph* g = dynamic_cast<TGraph*>( obj );
-      if( g != 0 ) {
-        fcn.execute( g );
-      }
+    } else if ((g = dynamic_cast<TGraph*>(obj))) {
+      fcn.execute( g );
+    } else if ((e = dynamic_cast<TEfficiency*>(obj))) {
+      fcn.execute( e );
     }
     delete obj;
   }
@@ -1738,6 +1790,7 @@ int MonitoringFile::mergeObjs(TObject *objTarget, TObject *obj, std::string merg
    TH2 *h2=0, *nextH2=0;
    TGraph *g=0; 
    TTree *t=0;
+   TEfficiency *e=0;
 
 //    h = dynamic_cast<TH1*>( objTarget );
 //    g = dynamic_cast<TGraph*>( objTarget );
@@ -1794,6 +1847,16 @@ int MonitoringFile::mergeObjs(TObject *objTarget, TObject *obj, std::string merg
      listG.Add( nextG );
      g->Merge( &listG );
      listG.Clear();
+   }else if( (e = dynamic_cast<TEfficiency*>( objTarget )) ) {  // TEfficiencies
+     if( mergeType != "<default>" ) {
+       std::cerr << name << ": TEfficiency " << obj->GetName() << " request mergeType = " << mergeType
+     << " but only default merging implemented for TEfficiencies.\n";              
+     }
+     TEfficiency *nextE = dynamic_cast<TEfficiency*>( obj );
+     TList listE;
+     listE.Add( nextE );
+     e->Merge( &listE );
+     listE.Clear();
    }else if ((t = dynamic_cast<TTree*>( objTarget ))) { // TTrees
      if ( debugLevel >= VERBOSE) {
        std::cout << "Merging Tree " << obj->GetName() << std::endl;
@@ -1908,7 +1971,8 @@ int MonitoringFile::mergeLB_createListOfHistos(TDirectory *dir_top, TDirectory *
       std::string keyClassName(key->GetClassName());
       if( ( (keyClassName.size() > 2) && ( (keyClassName.substr(0,3) == "TH1") || (keyClassName.substr(0,3) == "TH2")  ) ) ||
           ( (keyClassName.size() > 7) && ( (keyClassName.substr(0,8) == "TProfile") ) ) || 
-          ( (keyClassName.size() > 5) && ( (keyClassName.substr(0,6) == "TGraph") ) ) ) {
+          ( (keyClassName.size() > 5) && ( (keyClassName.substr(0,6) == "TGraph") ) ) ||
+          ( (keyClassName.size() > 10) && ( (keyClassName.substr(0,11) == "TEfficiency") ) ) ) {
          if( debugLevel >= VERBOSE )
             std::cout << name << ": found object: " << key->GetName();  
 
@@ -2178,7 +2242,7 @@ void MonitoringFile::buildLBToIntervalMap(std::vector<TDirectory*>& v_dirLBs, st
 					<< v_splits[1] << std::endl;
     try {
       v_ranges.push_back(std::make_pair(*dirit, std::make_pair(boost::lexical_cast<int>(v_splits[0]), boost::lexical_cast<int>(v_splits[1]))));
-    } catch (const boost::bad_lexical_cast& e) {
+    } catch (boost::bad_lexical_cast e) {
       std::cerr << "Unable to cast to integers: " << v_splits[0] << " " 
 		<< v_splits[1] << std::endl;
     }
diff --git a/DataQuality/DataQualityUtils/src/MonitoringFile_HLTJetPostProcess.cxx b/DataQuality/DataQualityUtils/src/MonitoringFile_HLTJetPostProcess.cxx
index e36ab289eeaf9c77a72e97fb5b5d097ac824b17e..1f25a9b566fcde204d5baa1de71095cf5700adca 100644
--- a/DataQuality/DataQualityUtils/src/MonitoringFile_HLTJetPostProcess.cxx
+++ b/DataQuality/DataQualityUtils/src/MonitoringFile_HLTJetPostProcess.cxx
@@ -36,6 +36,8 @@
 
 namespace dqutils {
 
+  static const bool hltjet_debug = false;
+
   void 
   MonitoringFile::HLTJetPostProcess( std::string inFilename, bool /* isIncremental */ ) 
   {
diff --git a/DataQuality/DataQualityUtils/src/MonitoringFile_HLTMETPostProcess.cxx b/DataQuality/DataQualityUtils/src/MonitoringFile_HLTMETPostProcess.cxx
index c44591fde9d7b484c6f9d6265cc55c3fe84726ce..0fe1fdb0eff4e7c2889e3e08541d26063620d9b5 100644
--- a/DataQuality/DataQualityUtils/src/MonitoringFile_HLTMETPostProcess.cxx
+++ b/DataQuality/DataQualityUtils/src/MonitoringFile_HLTMETPostProcess.cxx
@@ -36,6 +36,8 @@
 
 namespace dqutils {
 
+  static const bool hltmet_debug = false;
+
   void 
   MonitoringFile::HLTMETPostProcess( std::string inFilename, bool /* isIncremental */ ) 
   {
diff --git a/DataQuality/DataQualityUtils/src/MonitoringFile_HLTMuonHistogramDivision.cxx b/DataQuality/DataQualityUtils/src/MonitoringFile_HLTMuonHistogramDivision.cxx
index fb25403aec48117592be46c9753ee22b8942f289..41738295d3535a0a0acde8977a6c27c803f30cfb 100644
--- a/DataQuality/DataQualityUtils/src/MonitoringFile_HLTMuonHistogramDivision.cxx
+++ b/DataQuality/DataQualityUtils/src/MonitoringFile_HLTMuonHistogramDivision.cxx
@@ -110,7 +110,7 @@ namespace dqutils {
       TString muon_dir = run_dir + "/HLT/MuonMon/";
 
       TString cm_dir = muon_dir + "Common/";
-      TString mf_dir = muon_dir + "muFast/";
+      TString mf_dir = muon_dir + "L2MuonSA/";
       TString mc_dir = muon_dir + "muComb/";
       TString mi_dir = muon_dir + "muIso/";
       TString tm_dir = muon_dir + "TileMu/";
@@ -136,10 +136,11 @@ namespace dqutils {
       TH1F* h1num(0);
       TH1F* h1den(0);
       TH1F* h1sumeff(0); // new YY
+      TH1F *h1effsum(nullptr);
       TGraphAsymmErrors* h1tmpg;
 
       //==Efficiency
-      //  muFast efficiency
+      //  L2MuonSA efficiency
       TDirectory* dir = mf.GetDirectory(eff_dir);
       if(!dir){
 	std::cerr<< "HLTMuonHistogramDivision: directory "<<eff_dir<<" not found"<<std::endl;
@@ -147,11 +148,11 @@ namespace dqutils {
       }
 
       std::vector<TString> effnames;
-      effnames.push_back("muFast_effi_toRecMuonCB_pt");
-      effnames.push_back("muFast_effi_toRecMuonCB_pt_barrel");
-      effnames.push_back("muFast_effi_toRecMuonCB_pt_endcap");
-      effnames.push_back("muFast_effi_toRecMuonCB_eta");
-      effnames.push_back("muFast_effi_toRecMuonCB_phi");
+      effnames.push_back("L2MuonSA_effi_toRecMuonCB_pt");
+      effnames.push_back("L2MuonSA_effi_toRecMuonCB_pt_barrel");
+      effnames.push_back("L2MuonSA_effi_toRecMuonCB_pt_endcap");
+      effnames.push_back("L2MuonSA_effi_toRecMuonCB_eta");
+      effnames.push_back("L2MuonSA_effi_toRecMuonCB_phi");
 
       for( std::vector<TString>::iterator it = effnames.begin(); it != effnames.end(); it++ ){
 	seff = eff_dir + (*it);
@@ -491,8 +492,10 @@ namespace dqutils {
 	//iSTDL = 54;  // 15 GeV
 	iSTDH = 75; // 25 GeV
       }else{
-	iSTDL = 91;  // 40 GeV
+	iSTDL = 105;  // 60 GeV
+	//iSTDL = 91;  // 40 GeV
 	iSTDH = 120; // 100 GeV
+	//iSTDH = 120; // 100 GeV
       }
       int iMSL = 105;  // 60 GeV
       int iMSH = 120;  // 100 GeV
@@ -503,7 +506,7 @@ namespace dqutils {
       }
       // YY added:
       enum ieffAlgo {
-	iMuFast = 0,   // StdAlgo
+	iL2MuonSA = 0,   // StdAlgo
 	iMuComb = 1,   // StdAlgo
 	iEFCB   = 2,   // StdAlgo
 	iMuGirl = 3,   // StdAlgo
@@ -512,8 +515,8 @@ namespace dqutils {
       };
 
       //  Standard Chains
-      //TString m_alg[5] = {"_MuFast", "_MuComb", "_MuonEFMS", "_MuonEFSA", "_MuonEFCB"};
-      //TString m_wrtalg[5] = {"_L1", "_MuFast", "_MuComb", "_MuComb", "_MuComb"};
+      //TString alg[5] = {"_L2MuonSA", "_MuComb", "_MuonEFMS", "_MuonEFSA", "_MuonEFCB"};
+      //TString wrtalg[5] = {"_L1", "_L2MuonSA", "_MuComb", "_MuComb", "_MuComb"};
 
       // ******************************************************//
       // start the code add by Yuan //
@@ -673,14 +676,14 @@ namespace dqutils {
 	  continue;
 	}
 
-	int iSTDL = 39;
+	int iSTDL = 75;//25GeV
 	int iSTDH = 120;
 	if(HI_pp_key){//HI run 4-25GeV
 	  iSTDL = 17;
 	  iSTDH = 75;				
 	}
 	double sumeff, sumerr;
-	double sumn = h1numb->Integral(iSTDL, iSTDH); // 10-100 GeV
+	double sumn = h1numb->Integral(iSTDL, iSTDH); // 60-100 GeV
 	double sumd = h1denb->Integral(iSTDL, iSTDH);
 	if (sumd == 0.) {
 	  sumeff = 0.;
@@ -702,6 +705,7 @@ namespace dqutils {
 	  sumeff = (double)sumn / (double) sumd;
 	  sumerr = sqrt((double)sumn * (1.-sumeff)) / (double)sumd;
 	}
+	h1sumL->GetYaxis()->SetTitle("Efficiency");     				  
 	h1sumL->SetBinContent(2, sumeff);
 	h1sumL->SetBinError(2, sumerr);
         h1sumL->SetMinimum(0.0);
@@ -774,7 +778,7 @@ namespace dqutils {
 	  continue;
 	}
 
-	sumn = h1num_mu0_15->Integral(iSTDL, iSTDH); // 10-100 GeV
+	sumn = h1num_mu0_15->Integral(iSTDL, iSTDH); // 25-100 GeV
 	sumd = h1den_mu0_15->Integral(iSTDL, iSTDH);
 	if (sumd == 0.) {
 	  sumeff = 0.;
@@ -808,16 +812,19 @@ namespace dqutils {
 	  sumeff = (double)sumn / (double) sumd;
 	  sumerr = sqrt((double)sumn * (1.-sumeff)) / (double)sumd;
 	}
+	h1sum_mu->GetYaxis()->SetTitle("Efficiency");     				  
 	h1sum_mu->SetBinContent(3, sumeff);
 	h1sum_mu->SetBinError(3, sumerr);
+	h1sum_mu->SetMaximum(1.05);
+	h1sum_mu->SetMinimum(0.0);
 	dir->cd();
 	h1sum_mu->Write("",TObject::kOverwrite);
 	mf.Write();
       }
       //  end of the code add by Yuan //
       // ******************************************************//
-      TString alg2[3] = {"_MuFast", "_MuonEFMS", "_MuonEFSA"};
-      TString wrtalg2[3] = {"_L1", "_MuFast", "_MuFast"};
+      TString alg2[3] = {"_L2MuonSA", "_MuonEFMS", "_MuonEFSA"};
+      TString wrtalg2[3] = {"_L1", "_L2MuonSA", "_L2MuonSA"};
 
       // ******************************************************//
       // ******************  MSonly Chains ********************//
@@ -888,7 +895,7 @@ namespace dqutils {
 		  }
 		  int iholx = -1;
 		  if (0 == alg) {
-		    iholx = static_cast<int>(iMuFast);
+		    iholx = static_cast<int>(iL2MuonSA);
 		  } else if (2 == alg) {
 		    iholx = static_cast<int>(iEFSA);
 		  }
@@ -905,6 +912,7 @@ namespace dqutils {
 		    }
 		    h1sumeff->SetBinContent(iholx+1, sumeff);
 		    h1sumeff->SetBinError(iholx+1, sumerr);
+                    h1sumeff->GetYaxis()->SetTitleOffset(1.3);
                     h1sumeff->SetMinimum(0.0);
 	            h1sumeff->SetMaximum(1.05);
 		    // saving
@@ -979,7 +987,7 @@ namespace dqutils {
 	      }
 	      int iholx = -1;
 	      if (0 == alg) {
-		iholx = static_cast<int>(iMuFast);
+		iholx = static_cast<int>(iL2MuonSA);
 	      } else if (2 == alg) {
 		iholx = static_cast<int>(iEFSA);
 	      }
@@ -994,6 +1002,7 @@ namespace dqutils {
 		  }
 		  continue;
 		}
+                h1sumeff->GetYaxis()->SetTitleOffset(1.3);
 		h1sumeff->SetBinContent(iholx+1, sumeff);
 		h1sumeff->SetBinError(iholx+1, sumerr);
   	        h1sumeff->SetMinimum(0.0);
@@ -1013,7 +1022,7 @@ namespace dqutils {
 	    // for ES, L1 ------------------------------------------------------------
 	    if (0 == alg) {
 	      sden = nd_dir + chainName + triggerES[ies] + "_Turn_On_Curve_wrt_MuidSA_Denominator";
-	      snum = nd_dir + chainName + triggerES[ies] + "_MuFast" + "_Turn_On_Curve_wrt" + "_L1" + "_Denominator";
+	      snum = nd_dir + chainName + triggerES[ies] + "_L2MuonSA" + "_Turn_On_Curve_wrt" + "_L1" + "_Denominator";
 	      seff = eff_dir + chainName + triggerES[ies] + "_L1" + "_Turn_On_Curve_wrt_MuidSA";
 	      seffg = seff + "_Fit";
 	      stmp = chainName + triggerES[alg] + "_L1"+"_Turn_On_Curve_wrt_MuidSA";
@@ -1060,7 +1069,7 @@ namespace dqutils {
 
 	      for (int be = 0; be < 2; be++) {
 		sden = nd_dir + chainName + triggerES[ies] + "_Turn_On_Curve_wrt_MuidSA" + bestr[be] + "_Denominator";
-		snum = nd_dir + chainName + triggerES[ies] + "_MuFast" + "_Turn_On_Curve_wrt" + "_L1" + bestr[be] + "_Denominator";
+		snum = nd_dir + chainName + triggerES[ies] + "_L2MuonSA" + "_Turn_On_Curve_wrt" + "_L1" + bestr[be] + "_Denominator";
 		seff  = eff_dir + chainName + triggerES[ies] + "_L1" + bestr[be] + "_Turn_On_Curve_wrt_MuidSA";
 		seffg = seff + "_Fit";
 		stmp = chainName + triggerES[ies] + "_L1" + bestr[be] + "_Turn_On_Curve_wrt_MuidSA";
@@ -1167,7 +1176,7 @@ namespace dqutils {
 		  }
 		  int iholx = -1;
 		  if (0 == alg) {
-		    iholx = static_cast<int>(iMuFast);
+		    iholx = static_cast<int>(iL2MuonSA);
 		  } else if (2 == alg) {
 		    iholx = static_cast<int>(iEFSA);
 		  }
@@ -1182,6 +1191,7 @@ namespace dqutils {
 		      }
 		      continue;
 		    }
+                    h1sumeff->GetYaxis()->SetTitleOffset(1.3);
 		    h1sumeff->SetBinContent(iholx+1, sumeff);
 		    h1sumeff->SetBinError(iholx+1, sumerr);
                     h1sumeff->SetMinimum(0.0);
@@ -1779,14 +1789,14 @@ namespace dqutils {
 	    }
 
 	    if(h1num && h1den){
-	      h1tmp = (TH1F*)h1den->Clone();
-	      h1tmp->SetName(stmp);                          				
-	      h1tmp->SetTitle(stmp);                         			  
-	      h1tmp->GetYaxis()->SetTitle("Efficiency");     				  
-	      h1tmp->Reset();                                				  
-	      h1tmp->Divide(h1num, h1den, 1., 1., "B");      				  
-	      dir->cd();                                    				  
-	      h1tmp->Write();
+	     // h1tmp = (TH1F*)h1den->Clone();
+	     // h1tmp->SetName(stmp);                          				
+	     // h1tmp->SetTitle(stmp);                         			  
+	    //  h1tmp->GetYaxis()->SetTitle("Efficiency");     				  
+	    //  h1tmp->Reset();                                				  
+	    //  h1tmp->Divide(h1num, h1den, 1., 1., "B");      				  
+	    //  dir->cd();                                    				  
+	    //  h1tmp->Write();
 	      h1tmpg = new TGraphAsymmErrors();
 	      h1tmpg->SetName(stmpg);
 	      h1tmpg->SetMarkerStyle(20);
@@ -1795,7 +1805,7 @@ namespace dqutils {
 	      h1tmpg->BayesDivide(h1num, h1den);
 	      h1tmpg->GetYaxis()->SetTitle("Efficiency");     				  
 	      h1tmpg->GetXaxis()->SetTitle(h1den->GetXaxis()->GetTitle());     				  
-	      dir->cd();
+	      ztpdir->cd();
 	      h1tmpg->Write();
 	      delete h1tmpg;
 	    }
@@ -1933,7 +1943,7 @@ namespace dqutils {
 	//const int MAXARR = 3;
 	//std::string charr[MAXARR] = {"mu36_tight", "mu24i_tight", "mu50_MSonly_barrel_tight"};
 	//std::string monarr[MAXARR] = {"_EFmuon", "_EFmuon", "_MuonEFSA"};
-	//std::string monL2arr[MAXARR] = {"_MuFast", "_MuFast", "_MuFast"};
+	//std::string monL2arr[MAXARR] = {"_L2MuonSA", "_L2MuonSA", "_L2MuonSA"};
 	//bool isBarrelMon[MAXARR] = {false, false, true}; // enable MSonly
 	//bool isMSbMon[MAXARR] = {true, false, false}; // Skip isol and MSonly
 	//bool monL1[MAXARR] = {true, true, false}; // Skip MSonly
@@ -1943,7 +1953,7 @@ namespace dqutils {
 	const int MAXARR = 6;
 	std::string charr[MAXARR] = {"muChain1", "muChain2", "muChainEFiso1", "muChainEFiso2","muChainMSonly1","muChainMSonly2"};
 	std::string monarr[MAXARR] = {"_EFmuon", "_EFmuon", "_EFmuon", "_EFmuon", "_MuonEFSA", "_MuonEFSA"};
-	std::string monL2arr[MAXARR] = {"_MuFast", "_MuFast", "_MuFast", "_MuFast", "_MuFast", "_MuFast"};
+	std::string monL2arr[MAXARR] = {"_L2MuonSA", "_L2MuonSA", "_L2MuonSA", "_L2MuonSA", "_L2MuonSA", "_L2MuonSA"};
 	bool isBarrelMon[MAXARR] = {false, false, false, false, true, true}; // enable MSonly
 	bool isMSbMon[MAXARR] = {true, true,false, false,false, false}; // Skip isol and MSonly
 	bool monL1[MAXARR] = {true, true, true, true, false, false}; // Skip MSonly
@@ -2006,6 +2016,7 @@ namespace dqutils {
 		sumeff = (double)sumn / (double) sumd;
 		sumerr = sqrt((double)sumn * (1.-sumeff)) / (double)sumd;
 	      }
+	      h1eff->GetYaxis()->SetTitle("Efficiency");     				  
 	      h1eff->SetBinContent(ibin-1, sumeff);  ////
 	      h1eff->SetBinError(ibin-1, sumerr);    ////
 	      h1eff->SetMinimum(0.0);
@@ -2016,8 +2027,8 @@ namespace dqutils {
 	  /* 3. Picking up chainDQ MSonly graph   abandoned !!!*/
 	  /* EF efficiency wrt L1, as for the ztp graph = overall HLT efficiency wrt L1: not possible, wrt offline 
 	     if (isMSbMon[ialg]) {  // skip muIso and MSonly !!!
-	     TString histChNum = nd_dir + chainName + m_MSchainName + MoniAlg + "_Turn_On_Curve_Numerator";
-	     TString histChDen = nd_dir + chainName + m_MSchainName + MoniL2Alg + "_Turn_On_Curve_wrt_L1_Denominator";
+	     TString histChNum = nd_dir + chainName + MSchainName + MoniAlg + "_Turn_On_Curve_Numerator";
+	     TString histChDen = nd_dir + chainName + MSchainName + MoniL2Alg + "_Turn_On_Curve_wrt_L1_Denominator";
 
 	     h1num = 0; mf.get(histChNum, h1num);
 	     if (!h1num) {
@@ -2100,9 +2111,11 @@ namespace dqutils {
 
 	    double sumeff, sumerr;
 	    double sumn = h1numb->Integral(13, 25); // 12-25 GeV
-	    if(HI_pp_key)sumn = h1numb->Integral(7, 10); // 30-50 GeV
+	    if(HI_pp_key)sumn = h1numb->Integral(13, 20); // 60-100 GeV
+	    //if(HI_pp_key)sumn = h1numb->Integral(7, 10); // 30-50 GeV
 	    double sumd = h1denb->Integral(13, 25);
-	    if(HI_pp_key)sumd = h1denb->Integral(7, 10);
+	    if(HI_pp_key)sumd = h1denb->Integral(13, 20);
+	    //if(HI_pp_key)sumd = h1denb->Integral(7, 10);
 	    if (sumd == 0.) {
 	      sumeff = 0.;
 	      sumerr = 0.;
@@ -2114,9 +2127,11 @@ namespace dqutils {
 	    h1sumL->SetBinError(1, sumerr);
 
 	    sumn = h1nume->Integral(13, 25);
-	    if(HI_pp_key)sumn = h1numb->Integral(7, 10); // 30-50 GeV
+	    if(HI_pp_key)sumn = h1numb->Integral(13, 20); // 60-100 GeV
+	    //if(HI_pp_key)sumn = h1numb->Integral(7, 10); // 30-50 GeV
 	    sumd = h1dene->Integral(13, 25);
-	    if(HI_pp_key)sumd = h1denb->Integral(7, 10);
+	    if(HI_pp_key)sumd = h1denb->Integral(13, 20);
+	    //if(HI_pp_key)sumd = h1denb->Integral(7, 10);
 	    if (sumd == 0.) {
 	      sumeff = 0.;
 	      sumerr = 0.;
@@ -2124,6 +2139,7 @@ namespace dqutils {
 	      sumeff = (double)sumn / (double) sumd;
 	      sumerr = sqrt((double)sumn * (1.-sumeff)) / (double)sumd;
 	    }
+	    h1sumL->GetYaxis()->SetTitle("Efficiency");     				  
 	    h1sumL->SetBinContent(2, sumeff);
 	    h1sumL->SetBinError(2, sumerr);
 	    h1sumL->SetMinimum(0.0);
@@ -2139,8 +2155,8 @@ namespace dqutils {
       // ******************************************************//
       // *********************  generic ***********************//
       // ******************************************************//
-      TString monalg[3]={"_MuFast", "_MuComb", "_EFmuon"};
-      TString wrtalg[3]={"_L1", "_MuFast", "_MuComb"};
+      TString monalg[3]={"_L2MuonSA", "_MuComb", "_EFmuon"};
+      TString wrtalg[3]={"_L1", "_L2MuonSA", "_MuComb"};
       TString numer, denom, effi;
       TString histdireff = eff_dir;
 
@@ -2194,14 +2210,14 @@ namespace dqutils {
 	      // L1 efficiency: new for 2011 HI runs and afterward
 	      // only division once since it is "the zero-th" algorithm
 	      denom = chainName + triggerES[i] + "_Turn_On_Curve_wrt_MuidCB_Denominator";
-	      numer = chainName + triggerES[i] + "_MuFast" + "_Turn_On_Curve_wrt" + "_L1" + "_Denominator";
+	      numer = chainName + triggerES[i] + "_L2MuonSA" + "_Turn_On_Curve_wrt" + "_L1" + "_Denominator";
 	      effi  = chainName + triggerES[i] + "_L1" + "_Turn_On_Curve_wrt_MuidCB";
 	      HLTMuonHDiv(mf, histdireff, numer, denom, effi, "_Fit");
 
 	      // Need to implement barrel and endcap ...
 	      for (int be = 0; be < 2; be++) {
 		denom = chainName + triggerES[i] + "_Turn_On_Curve_wrt_MuidCB" + bestr[be] + "_Denominator";
-		numer = chainName + triggerES[i] + "_MuFast" + "_Turn_On_Curve_wrt" + "_L1" + bestr[be] + "_Denominator";
+		numer = chainName + triggerES[i] + "_L2MuonSA" + "_Turn_On_Curve_wrt" + "_L1" + bestr[be] + "_Denominator";
 		effi  = chainName + triggerES[i] + "_L1" + bestr[be] + "_Turn_On_Curve_wrt_MuidCB";
 		HLTMuonHDiv(mf, histdireff, numer, denom, effi, "_Fit");
 
@@ -2225,7 +2241,7 @@ namespace dqutils {
 		if (ESINDEP == i) {
 		  // integrating over and fill in a summary histogram
 		  double sumeff, sumerr;
-		  double sumn = h1num->Integral(iSTDL, iSTDH); // 40-80 GeV
+		  double sumn = h1num->Integral(iSTDL, iSTDH); // 60-100 GeV
 		  double sumd = h1den->Integral(iSTDL, iSTDH);
 		  if (sumd == 0.) {
 		    sumeff = 0.;
@@ -2290,7 +2306,7 @@ namespace dqutils {
 	      }
 	      int iholx = -1;
 	      if (0 == alg) {
-		iholx = static_cast<int>(iMuFast);
+		iholx = static_cast<int>(iL2MuonSA);
 	      } else if (1 == alg) {
 		iholx = static_cast<int>(iMuComb);
 	      } else if (2 == alg) {
@@ -2298,14 +2314,14 @@ namespace dqutils {
 	      }
 
 	      TString s = histdireff + chainName + "_highpt_effsummary_by" + triggerES[i];
-	      TH1F *h1effsum = 0;
 	      mf.get(s, h1effsum);
 	      if (!h1effsum) {
 		if (fdbg) {
-		  std::cerr <<"HLTMuon PostProcessing: no such histogram!! "<< sden << std::endl;
+		  std::cerr <<"HLTMuon PostProcessing: no such histogram!! "<< s << std::endl;
 		}
 		continue;
 	      }
+              h1effsum->GetYaxis()->SetTitleOffset(1.3);
 	      h1effsum->SetBinContent(iholx+1, sumeff);
 	      h1effsum->SetBinError(iholx+1, sumerr);
 	      h1effsum->SetMinimum(0.0);
@@ -2366,7 +2382,7 @@ namespace dqutils {
       TH1F* h1tmpf(0);
       TH1F* h1num(0);
       TH1F* h1den(0);
-      TGraphAsymmErrors* h1tmpfg = new TGraphAsymmErrors();
+      TGraphAsymmErrors* h1tmpfg = new TGraphAsymmErrors();;
       TString stmp = seff + seffg;
       h1num = 0;
       mf.get(sdir + "NumDenom/" + snum, h1num);
@@ -2394,6 +2410,10 @@ namespace dqutils {
 	h1tmpf->GetYaxis()->SetTitle("Efficiency");     				  
 	h1tmpf->Reset();                                				  
 	h1tmpf->Divide(h1num, h1den, 1., 1., "B");      				  
+	h1tmpf->GetXaxis()->SetTitle(h1den->GetXaxis()->GetTitle());     				  
+	h1tmpf->SetMinimum(0.0);
+	h1tmpfg->SetMaximum(1.05);
+	h1tmpf->SetName(stmp);
 	dir->cd();                                    				  
 	h1tmpf->Write();                                				  
 	h1tmpfg->SetMarkerStyle(20);
@@ -2404,7 +2424,7 @@ namespace dqutils {
 	h1tmpfg->GetXaxis()->SetTitle(h1den->GetXaxis()->GetTitle());     				  
 	dir->cd();
 	h1tmpfg->SetName(stmp);
-	h1tmpfg->Write();
+        h1tmpfg->Write();
 	delete h1tmpfg;
       }
     }
diff --git a/DataQuality/DataQualityUtils/src/MonitoringFile_IDAlignPostProcess.cxx b/DataQuality/DataQualityUtils/src/MonitoringFile_IDAlignPostProcess.cxx
index 57e079c6f3005db1cb5f0b767141f5a9de83218f..b59486cc0125251be4e174b027a761ab00c1f09c 100644
--- a/DataQuality/DataQualityUtils/src/MonitoringFile_IDAlignPostProcess.cxx
+++ b/DataQuality/DataQualityUtils/src/MonitoringFile_IDAlignPostProcess.cxx
@@ -1091,11 +1091,11 @@ fitMergedFile_IDAlignMonResiduals( TFile* f, std::string run_dir, std::string tr
   pix_ecc_yresvsmodphi->GetYaxis()->SetTitle("Mean Residual Y [mm]");
   pix_ecc_yresvsmodphi->GetXaxis()->SetTitle("(Modified) Module Phi-ID");
   meanRMSProjections2D(pix_ecc_yresvsmodphi_2d,pix_ecc_yresvsmodphi,2);
-  TH1F* sct_eca_xresvsmodphi = new TH1F("sct_eca_xresvsmodphi","X Residual Mean vs (Modified) Module Phi SCT Endcap A",495,0,495);
+  TH1F* sct_eca_xresvsmodphi = new TH1F("sct_eca_xresvsmodphi","X Residual Mean vs (Modified) Module Phi SCT Endcap A",558,0,558);
   sct_eca_xresvsmodphi->GetYaxis()->SetTitle("Mean Residual X [mm]");
   sct_eca_xresvsmodphi->GetXaxis()->SetTitle("(Modified) Module Phi-ID");
   meanRMSProjections2D(sct_eca_xresvsmodphi_2d,sct_eca_xresvsmodphi,2);
-  TH1F* sct_ecc_xresvsmodphi = new TH1F("sct_ecc_xresvsmodphi","X Residual Mean vs (Modified) Module Phi SCT Endcap C",495,0,495);
+  TH1F* sct_ecc_xresvsmodphi = new TH1F("sct_ecc_xresvsmodphi","X Residual Mean vs (Modified) Module Phi SCT Endcap C",558,0,558);
   sct_ecc_xresvsmodphi->GetYaxis()->SetTitle("Mean Residual X [mm]");
   sct_ecc_xresvsmodphi->GetXaxis()->SetTitle("(Modified) Module Phi-ID");
   meanRMSProjections2D(sct_ecc_xresvsmodphi_2d,sct_ecc_xresvsmodphi,2);
diff --git a/DataQuality/DataQualityUtils/src/MonitoringFile_IDPerfPostProcess.cxx b/DataQuality/DataQualityUtils/src/MonitoringFile_IDPerfPostProcess.cxx
index 531bcc735c7c7555635bc2c957977ffa4ee2a4e0..34c0312da7ad879b7df98ebf30f0db22932d34ae 100644
--- a/DataQuality/DataQualityUtils/src/MonitoringFile_IDPerfPostProcess.cxx
+++ b/DataQuality/DataQualityUtils/src/MonitoringFile_IDPerfPostProcess.cxx
@@ -371,18 +371,18 @@ fitMergedFile_IDPerfMonKshort( TFile* f, std::string run_dir, std::string Trigge
     h_rate->SetBinError(1,rate_error);
     h_rate->Write("",TObject::kOverwrite);
   }
-//   TH1F* m_mass_scaled = (TH1F*)(f->Get((path+"/ks_mass").c_str())->Clone("ks_mass_scaled_copy"));
-//   TString title(m_mass_scaled->GetTitle());
+//   TH1F* h_mass_scaled = (TH1F*)(f->Get((path+"/ks_mass").c_str())->Clone("ks_mass_scaled_copy"));
+//   TString title(h_mass_scaled->GetTitle());
 //   if (CheckHistogram(f,(path+"/ks_mass_scaled").c_str())) {
 //     if (CheckHistogram(f,(path+"/Nevents").c_str())) {
-//       TH1F* Nevents=(TH1F*)f->Get((path+"/Nevents").c_str());
-//       double Ntot =Nevents->GetEntries();
-//       if (Ntot!=0.) m_mass_scaled->Scale(1./Ntot);
-//       m_mass_scaled->SetTitle(title+" (per event)");
-//       m_mass_scaled->Write("ks_mass_scaled",TObject::kOverwrite);
+//       TH1F* h_Nevents=(TH1F*)f->Get((path+"/Nevents").c_str());
+//       double Ntot =h_Nevents->GetEntries();
+//       if (Ntot!=0.) h_mass_scaled->Scale(1./Ntot);
+//       h_mass_scaled->SetTitle(title+" (per event)");
+//       h_mass_scaled->Write("ks_mass_scaled",TObject::kOverwrite);
 //     }  
 //   }
-//   delete m_mass_scaled;
+//   delete h_mass_scaled;
 
   h_massVPtBinFittedHistos[0] = (TH1F*)(f->Get((path+"/MassVptBinFitted0").c_str())->Clone());
   h_massVPtBinFittedHistos[1] = (TH1F*)(f->Get((path+"/MassVptBinFitted1").c_str())->Clone());
@@ -796,19 +796,19 @@ fitMergedFile_IDPerfMonJpsi( TFile* f, std::string run_dir, std::string TriggerN
     h_rate->SetBinError(1,rate_error);
     h_rate->Write("",TObject::kOverwrite);
   }
-//   TH1F* m_mass_scaled = (TH1F*)(f->Get((path+"/Jpsi_invmass").c_str())->Clone("Jpsi_invmass_scaled_copy"));
-//   m_mass_scaled->SetMarkerStyle(21);
-//   TString title(m_mass_scaled->GetTitle());
+//   TH1F* h_mass_scaled = (TH1F*)(f->Get((path+"/Jpsi_invmass").c_str())->Clone("Jpsi_invmass_scaled_copy"));
+//   h_mass_scaled->SetMarkerStyle(21);
+//   TString title(h_mass_scaled->GetTitle());
 //   if (CheckHistogram(f,(path+"/Jpsi_invmass_scaled").c_str())) {
 //     if (CheckHistogram(f,(path+"/Nevents").c_str())) {
-//       TH1F* Nevents=(TH1F*)f->Get((path+"/Nevents").c_str());
-//       double Ntot =Nevents->GetEntries();
-//       if (Ntot!=0.) m_mass_scaled->Scale(1./Ntot);
-//       m_mass_scaled->SetTitle(title+" (per event)");
-//       m_mass_scaled->Write("Jpsi_invmass_scaled",TObject::kOverwrite);
+//       TH1F* h_Nevents=(TH1F*)f->Get((path+"/Nevents").c_str());
+//       double Ntot =h_Nevents->GetEntries();
+//       if (Ntot!=0.) h_mass_scaled->Scale(1./Ntot);
+//       h_mass_scaled->SetTitle(title+" (per event)");
+//       h_mass_scaled->Write("Jpsi_invmass_scaled",TObject::kOverwrite);
 //     }  
 //   }
-//   delete m_mass_scaled;
+//   delete h_mass_scaled;
   if (CheckHistogram( f,(path+"/Jpsi_invmass").c_str())) {
     TH1F* h_mass_rebin = (TH1F*)(f->Get((path+"/Jpsi_invmass").c_str())->Clone("Jpsi_invmass_rebin"));
     TString title = h_mass_rebin->GetTitle();
@@ -910,7 +910,7 @@ fitMergedFile_IDPerfMonJpsi( TFile* f, std::string run_dir, std::string TriggerN
   TCanvas *myCanvas = new TCanvas("MyCanvas");
   myCanvas->cd();
   
-//   mass->Fit(f1,"RQMN");
+//   h_mass->Fit(f1,"RQMN");
 
   fitJpsiHistograms(h_jpsi_invmass_vs_pt,h_jpsi_width_vs_pt,hpt,nbins);
   fitJpsiHistograms(h_jpsi_invmass_vs_z0,h_jpsi_width_vs_z0,hz0,nbins);
@@ -1117,19 +1117,19 @@ fitMergedFile_IDPerfMonUpsilon( TFile* f, std::string run_dir, std::string Trigg
     h_rate->SetBinError(1,rate_error);
     h_rate->Write("",TObject::kOverwrite);
   }
-//   TH1F* m_mass_scaled = (TH1F*)(f->Get((path+"/Upsilon_invmass").c_str())->Clone("Upsilon_invmass_scaled_copy"));
-//   m_mass_scaled->SetMarkerStyle(21);
-//   TString title(m_mass_scaled->GetTitle());
+//   TH1F* h_mass_scaled = (TH1F*)(f->Get((path+"/Upsilon_invmass").c_str())->Clone("Upsilon_invmass_scaled_copy"));
+//   h_mass_scaled->SetMarkerStyle(21);
+//   TString title(h_mass_scaled->GetTitle());
 //   if (CheckHistogram(f,(path+"/Upsilon_invmass_scaled").c_str())) {
 //     if (CheckHistogram(f,(path+"/Nevents").c_str())) {
-//       TH1F* Nevents=(TH1F*)f->Get((path+"/Nevents").c_str());
-//       double Ntot =Nevents->GetEntries();
-//       if (Ntot!=0.) m_mass_scaled->Scale(1./Ntot);
-//       m_mass_scaled->SetTitle(title+" (per event)");
-//       m_mass_scaled->Write("Upsilon_invmass_scaled",TObject::kOverwrite);
+//       TH1F* h_Nevents=(TH1F*)f->Get((path+"/Nevents").c_str());
+//       double Ntot =h_Nevents->GetEntries();
+//       if (Ntot!=0.) h_mass_scaled->Scale(1./Ntot);
+//       h_mass_scaled->SetTitle(title+" (per event)");
+//       h_mass_scaled->Write("Upsilon_invmass_scaled",TObject::kOverwrite);
 //     }  
 //   }
-//   delete m_mass_scaled;
+//   delete h_mass_scaled;
   if (CheckHistogram( f,(path+"/Upsilon_invmass").c_str())) {
     TH1F* h_mass_rebin = (TH1F*)(f->Get((path+"/Upsilon_invmass").c_str())->Clone("Upsilon_invmass_rebin"));
     TString title = h_mass_rebin->GetTitle();
@@ -1216,7 +1216,7 @@ fitMergedFile_IDPerfMonUpsilon( TFile* f, std::string run_dir, std::string Trigg
   TCanvas *myCanvas = new TCanvas("MyCanvas");
   myCanvas->cd();
   
-//   mass->Fit(f1,"RQMN");
+//   h_mass->Fit(f1,"RQMN");
 
 
   fitUpsilonHistograms(h_upsilon_invmass_vs_pt,h_upsilon_width_vs_pt,hpt,nbins);
@@ -1346,20 +1346,20 @@ fitMergedFile_IDPerfMonZee ( TFile* f, std::string run_dir,std::string TriggerNa
     h_rate->SetBinError(1,rate_error);
     h_rate->Write("",TObject::kOverwrite);
   }
-//   TH1F* m_mass_scaled = (TH1F*)(f->Get((path+"/Zee_trk_invmass").c_str())->Clone("Zee_trk_invmass_scaled_copy"));
-//   TString title(m_mass_scaled->GetTitle());
+//   TH1F* h_mass_scaled = (TH1F*)(f->Get((path+"/Zee_trk_invmass").c_str())->Clone("Zee_trk_invmass_scaled_copy"));
+//   TString title(h_mass_scaled->GetTitle());
 //   if (CheckHistogram(f,(path+"/Zee_trk_invmass_scaled").c_str())) {
 //     if (CheckHistogram(f,(path+"/Nevents").c_str())) {
-//       TH1F* Nevents=(TH1F*)f->Get((path+"/Nevents").c_str());
-//       double Ntot =Nevents->GetEntries();
-//       if (Ntot!=0.) m_mass_scaled->Scale(1./Ntot);
-//       m_mass_scaled->SetTitle(title+" (per event)");
-//       m_mass_scaled->Write("Zee_trk_invmass_scaled",TObject::kOverwrite);
+//       TH1F* h_Nevents=(TH1F*)f->Get((path+"/Nevents").c_str());
+//       double Ntot =h_Nevents->GetEntries();
+//       if (Ntot!=0.) h_mass_scaled->Scale(1./Ntot);
+//       h_mass_scaled->SetTitle(title+" (per event)");
+//       h_mass_scaled->Write("Zee_trk_invmass_scaled",TObject::kOverwrite);
 //     }  
 //   }
-//   delete m_mass_scaled;
+//   delete h_mass_scaled;
 
-  enum m_eta_region { incl, barrel, eca, ecc, Nregions };
+  enum eta_region { incl, barrel, eca, ecc, Nregions };
   std::vector<std::string> region_strings;
   region_strings.push_back("incl");
   region_strings.push_back("barrel");
@@ -1529,20 +1529,20 @@ fitMergedFile_IDPerfMonWenu ( TFile* f, std::string run_dir,std::string TriggerN
     h_rate->SetBinError(1,rate_error);
     h_rate->Write("",TObject::kOverwrite);
   }
-//   TH1F* m_mass_scaled = (TH1F*)(f->Get((path+"/Wenu_trk_transmass_sel").c_str())->Clone("Wenu_trk_transmass_sel_scaled_copy"));
-//   TString title(m_mass_scaled->GetTitle());
+//   TH1F* h_mass_scaled = (TH1F*)(f->Get((path+"/Wenu_trk_transmass_sel").c_str())->Clone("Wenu_trk_transmass_sel_scaled_copy"));
+//   TString title(h_mass_scaled->GetTitle());
 //   if (CheckHistogram(f,(path+"/Wenu_trk_transmass_sel_scaled").c_str())) {
 //     if (CheckHistogram(f,(path+"/Nevents").c_str())) {
-//       TH1F* Nevents=(TH1F*)f->Get((path+"/Nevents").c_str());
-//       double Ntot =Nevents->GetEntries();
-//       if (Ntot!=0.) m_mass_scaled->Scale(1./Ntot);
-//       m_mass_scaled->SetTitle(title+" (per event)");
-//       m_mass_scaled->Write("Wenu_trk_transmass_sel_scaled",TObject::kOverwrite);
+//       TH1F* h_Nevents=(TH1F*)f->Get((path+"/Nevents").c_str());
+//       double Ntot =h_Nevents->GetEntries();
+//       if (Ntot!=0.) h_mass_scaled->Scale(1./Ntot);
+//       h_mass_scaled->SetTitle(title+" (per event)");
+//       h_mass_scaled->Write("Wenu_trk_transmass_sel_scaled",TObject::kOverwrite);
 //     }  
 //   }
-//   delete m_mass_scaled;
+//   delete h_mass_scaled;
 
-  enum m_eta_region { incl, barrel, eca, ecc, Nregions };
+  enum eta_region { incl, barrel, eca, ecc, Nregions };
   std::vector<std::string> region_strings;
   region_strings.push_back("incl");
   region_strings.push_back("barrel");
diff --git a/DataQuality/DataQualityUtils/src/MonitoringFile_RPCPostProcess.cxx b/DataQuality/DataQualityUtils/src/MonitoringFile_RPCPostProcess.cxx
index 657953b7a574010eb3b4a579b2baf74fb5ee09d8..038dd3899b4afe145dbc993c0d95c1b131c19cce 100644
--- a/DataQuality/DataQualityUtils/src/MonitoringFile_RPCPostProcess.cxx
+++ b/DataQuality/DataQualityUtils/src/MonitoringFile_RPCPostProcess.cxx
@@ -30,6 +30,13 @@ MonitoringFile::RPCPostProcess( std::string inFilename, bool /* isIncremental */
 {
  // std::cout << "Running RPC post processing \n" ;
   
+  bool  applyEffThreshold  =  true;
+  bool  EffThreshold       = false;
+  bool  printout           = true ;
+  float Minimum_efficiency =  0.5;
+  
+  
+  
   TFile* f = TFile::Open(inFilename.c_str(),"UPDATE");
   if (f == 0) {
     std::cerr << "MonitoringFile::RPCPostProcess(): "
@@ -602,7 +609,7 @@ MonitoringFile::RPCPostProcess( std::string inFilename, bool /* isIncremental */
 	int countpanelindb = 0 ;
 	int countpaneleff0 = 0 ;
 	int countpaneltrack0 = 0 ;
-	for (int i_sec=0; i_sec!=15+1; i_sec++) {
+	for (int i_sec=0; i_sec!=15*1+1; i_sec++) {
 	  char sector_char[100]   ;
 	  std::string sector_name ;
           sprintf(sector_char,"_Sector%.2d",i_sec+1) ;  // sector number with 2 digits
@@ -1102,6 +1109,7 @@ MonitoringFile::RPCPostProcess( std::string inFilename, bool /* isIncremental */
 	   float cl_sizeeta        = -9999;	  float cl_sizephi	  = -9999;  	 char arr_cl_sizeeta	  [10];      char arr_cl_sizephi        [10];	    
            float errcl_sizeeta     = -1; 	  float errcl_sizephi	  =-1;  	 char arr_errcl_sizeeta	  [10];      char arr_errcl_sizephi     [10];	    
   		
+           float eta_effphi        =  0;          float phi_effeta        = 0;      		
 	 
 	   int   PanelCode   = 0;
 	   int   Binposition   = 0;
@@ -1124,75 +1132,75 @@ MonitoringFile::RPCPostProcess( std::string inFilename, bool /* isIncremental */
 	      if (h_TrackProj) n_tr_pphi  =(int)h_TrackProj   -> GetBinContent(ibin) ;
 	      if(n_tr_pphi <1000 ) continue;
 
-	      if ( h_Eff	 )effphi	      = h_Eff		  ->GetBinContent(ibin) ;
-              sprintf(arr_effphi		,    "%f ", effphi	      ) ;   arr_effphi	       [5]   =0;
-	      if ( h_Eff	 )erreffphi	      = h_Eff		  ->GetBinError  (ibin) ;
-              sprintf(arr_erreffphi	,    "%f ", erreffphi	      ) ;   arr_erreffphi        [5]   =0;
-	      if ( h_Res_CS1	 )resphi_cs1	      = h_Res_CS1	  ->GetBinContent(ibin) ;
-              sprintf(arr_resphi_cs1	,    "%f ", resphi_cs1        ) ;   arr_resphi_cs1       [5]   =0;
-	      if ( h_Res_CS1	 )errresphi_cs1       = h_Res_CS1	  ->GetBinError  (ibin) ;
-              sprintf(arr_errresphi_cs1	,    "%f ", errresphi_cs1     ) ;   arr_errresphi_cs1    [5]   =0;
-	      if ( h_Res_CS2	 )resphi_cs2	      = h_Res_CS2	  ->GetBinContent(ibin) ;
-              sprintf(arr_resphi_cs2	,    "%f ", resphi_cs2        ) ;   arr_resphi_cs2       [5]   =0;
-	      if ( h_Res_CS2	 )errresphi_cs2       = h_Res_CS2	  ->GetBinError  (ibin) ;
-              sprintf(arr_errresphi_cs2	,    "%f ", errresphi_cs2     ) ;   arr_errresphi_cs2    [5]   =0;
-	      if ( h_Res_CSmore2 )resphi_csother      = h_Res_CSmore2	  ->GetBinContent(ibin) ;
-              sprintf(arr_resphi_csother	,    "%f ", resphi_csother    ) ;   arr_resphi_csother   [5]   =0;
-	      if ( h_Res_CSmore2 )errresphi_csother   = h_Res_CSmore2	  ->GetBinError  (ibin) ;
-              sprintf(arr_errresphi_csother,    "%f ", errresphi_csother ) ;   arr_errresphi_csother[5]   =0;
-	      if ( h_Time	 )timephi	      = h_Time  	  ->GetBinContent(ibin) ;
-              sprintf(arr_timephi  	,    "%f ", timephi	      ) ;   arr_timephi	       [5]   =0;
-              if ( h_Time	 )errtimephi	      = h_Time  	  ->GetBinError  (ibin) ;
-              sprintf(arr_errtimephi	,    "%f ", errtimephi        ) ;   arr_errtimephi       [5]   =0;
-	      if ( h_NoiseTot	 )noisephi	      = h_NoiseTot	  ->GetBinContent(ibin) ;
-              sprintf(arr_noisephi 	,    "%f ", noisephi	      ) ;   arr_noisephi         [5]   =0;
-	      if ( h_NoiseTot	 )errnoisephi	      = h_NoiseTot	  ->GetBinError  (ibin) ;
-              sprintf(arr_errnoisephi	,    "%f ", errnoisephi       ) ;   arr_errnoisephi      [5]   =0;
-	      if ( h_NoiseCorr   )noisephi_cor        = h_NoiseCorr	  ->GetBinContent(ibin) ;
-              sprintf(arr_noisephi_cor	,    "%f ", noisephi_cor      ) ;   arr_noisephi_cor     [5]   =0;
-	      if ( h_NoiseCorr   )errnoisephi_cor     = h_NoiseCorr	  ->GetBinError  (ibin) ;
-              sprintf(arr_errnoisephi_cor  ,    "%f ", errnoisephi_cor   ) ;   arr_errnoisephi_cor  [5]   =0;
-	      if ( h_CS 	 )cl_sizephi	      = h_CS		  ->GetBinContent(ibin) ;
-              sprintf(arr_cl_sizephi	,    "%f ", cl_sizephi        ) ;   arr_cl_sizephi       [5]   =0;
-	      if ( h_CS 	 )errcl_sizephi       = h_CS		  ->GetBinError  (ibin) ;
-              sprintf(arr_errcl_sizephi	,    "%f ", errcl_sizephi     ) ;   arr_errcl_sizephi    [5]   =0;
+	      if ( h_Eff	 )effphi	      = h_Eff		  ->GetBinContent(ibin) ;    
+	      sprintf(arr_effphi		,    "%f ", effphi	      ) ;   arr_effphi	       [5]   =0;
+	      if ( h_Eff	 )erreffphi	      = h_Eff		  ->GetBinError  (ibin) ;    
+	      sprintf(arr_erreffphi	,    "%f ", erreffphi	      ) ;   arr_erreffphi        [5]   =0;
+	      if ( h_Res_CS1	 )resphi_cs1	      = h_Res_CS1	  ->GetBinContent(ibin) ;    
+	      sprintf(arr_resphi_cs1	,    "%f ", resphi_cs1        ) ;   arr_resphi_cs1       [5]   =0;
+	      if ( h_Res_CS1	 )errresphi_cs1       = h_Res_CS1	  ->GetBinError  (ibin) ;    
+	      sprintf(arr_errresphi_cs1	,    "%f ", errresphi_cs1     ) ;   arr_errresphi_cs1    [5]   =0;
+	      if ( h_Res_CS2	 )resphi_cs2	      = h_Res_CS2	  ->GetBinContent(ibin) ;    
+	      sprintf(arr_resphi_cs2	,    "%f ", resphi_cs2        ) ;   arr_resphi_cs2       [5]   =0;
+	      if ( h_Res_CS2	 )errresphi_cs2       = h_Res_CS2	  ->GetBinError  (ibin) ;    
+	      sprintf(arr_errresphi_cs2	,    "%f ", errresphi_cs2     ) ;   arr_errresphi_cs2    [5]   =0;
+	      if ( h_Res_CSmore2 )resphi_csother      = h_Res_CSmore2	  ->GetBinContent(ibin) ;    
+	      sprintf(arr_resphi_csother	,    "%f ", resphi_csother    ) ;   arr_resphi_csother   [5]   =0;
+	      if ( h_Res_CSmore2 )errresphi_csother   = h_Res_CSmore2	  ->GetBinError  (ibin) ;    
+	      sprintf(arr_errresphi_csother,    "%f ", errresphi_csother ) ;   arr_errresphi_csother[5]   =0;
+	      if ( h_Time	 )timephi	      = h_Time  	  ->GetBinContent(ibin) ;    
+	      sprintf(arr_timephi  	,    "%f ", timephi	      ) ;   arr_timephi	       [5]   =0;
+              if ( h_Time	 )errtimephi	      = h_Time  	  ->GetBinError  (ibin) ;    
+	      sprintf(arr_errtimephi	,    "%f ", errtimephi        ) ;   arr_errtimephi       [5]   =0;
+	      if ( h_NoiseTot	 )noisephi	      = h_NoiseTot	  ->GetBinContent(ibin) ;    
+	      sprintf(arr_noisephi 	,    "%f ", noisephi	      ) ;   arr_noisephi         [5]   =0;
+	      if ( h_NoiseTot	 )errnoisephi	      = h_NoiseTot	  ->GetBinError  (ibin) ;    
+	      sprintf(arr_errnoisephi	,    "%f ", errnoisephi       ) ;   arr_errnoisephi      [5]   =0;
+	      if ( h_NoiseCorr   )noisephi_cor        = h_NoiseCorr	  ->GetBinContent(ibin) ;    
+	      sprintf(arr_noisephi_cor	,    "%f ", noisephi_cor      ) ;   arr_noisephi_cor     [5]   =0;
+	      if ( h_NoiseCorr   )errnoisephi_cor     = h_NoiseCorr	  ->GetBinError  (ibin) ;    
+	      sprintf(arr_errnoisephi_cor  ,    "%f ", errnoisephi_cor   ) ;   arr_errnoisephi_cor  [5]   =0;
+	      if ( h_CS 	 )cl_sizephi	      = h_CS		  ->GetBinContent(ibin) ;    
+	      sprintf(arr_cl_sizephi	,    "%f ", cl_sizephi        ) ;   arr_cl_sizephi       [5]   =0;
+	      if ( h_CS 	 )errcl_sizephi       = h_CS		  ->GetBinError  (ibin) ;    
+	      sprintf(arr_errcl_sizephi	,    "%f ", errcl_sizephi     ) ;   arr_errcl_sizephi    [5]   =0;
 	     
 	     }else{
 	      if (h_TrackProj) {n_tr_peta  =(int)h_TrackProj   -> GetBinContent(ibin) ;}
               if(n_tr_peta <1000) continue;
 
- 	      if ( h_Eff	)effeta 	     = h_Eff		 ->GetBinContent(ibin) ;
-              sprintf(arr_effeta  	 ,    "%f ", effeta	       ) ;   arr_effeta		[5]   =0;
-	      if ( h_Eff	)erreffeta	     = h_Eff		 ->GetBinError  (ibin) ;
-              sprintf(arr_erreffeta	 ,    "%f ", erreffeta         ) ;   arr_erreffeta	[5]   =0;
-	      if ( h_Res_CS1	)reseta_cs1	     = h_Res_CS1	 ->GetBinContent(ibin) ;
-              sprintf(arr_reseta_cs1	 ,    "%f ", reseta_cs1        ) ;   arr_reseta_cs1	[5]   =0;
-	      if ( h_Res_CS1	)errreseta_cs1       = h_Res_CS1	 ->GetBinError  (ibin) ;
-              sprintf(arr_errreseta_cs1	 ,    "%f ", errreseta_cs1     ) ;   arr_errreseta_cs1	[5]   =0;
-	      if ( h_Res_CS2	)reseta_cs2	     = h_Res_CS2	 ->GetBinContent(ibin) ;
-              sprintf(arr_reseta_cs2	 ,    "%f ", reseta_cs2        ) ;   arr_reseta_cs2	[5]   =0;
-	      if ( h_Res_CS2	)errreseta_cs2       = h_Res_CS2	 ->GetBinError  (ibin) ;
-              sprintf(arr_errreseta_cs2	 ,    "%f ", errreseta_cs2     ) ;   arr_errreseta_cs2	[5]   =0;
-              if ( h_Res_CSmore2)reseta_csother      = h_Res_CSmore2	 ->GetBinContent(ibin) ;
-              sprintf(arr_reseta_csother   ,    "%f ", reseta_csother    ) ;   arr_reseta_csother	[5]   =0;
-	      if ( h_Res_CSmore2)errreseta_csother   = h_Res_CSmore2	 ->GetBinError  (ibin) ;
-              sprintf(arr_errreseta_csother,    "%f ", errreseta_csother ) ;   arr_errreseta_csother[5]   =0;
-	      if ( h_Time	)timeeta	     = h_Time		 ->GetBinContent(ibin) ;
-              sprintf(arr_timeeta 	 ,    "%f ", timeeta	       ) ;   arr_timeeta  	[5]   =0;
-	      if ( h_Time	)errtimeeta	     = h_Time		 ->GetBinError  (ibin) ;
-              sprintf(arr_errtimeeta	 ,    "%f ", errtimeeta        ) ;   arr_errtimeeta	[5]   =0;
-	      if ( h_NoiseTot	)noiseeta	     = h_NoiseTot	 ->GetBinContent(ibin) ;
-              sprintf(arr_noiseeta	 ,    "%f ", noiseeta	       ) ;   arr_noiseeta 	[5]   =0;
-	      if ( h_NoiseTot	)errnoiseeta	     = h_NoiseTot	 ->GetBinError  (ibin) ;
-              sprintf(arr_errnoiseeta	 ,    "%f ", errnoiseeta       ) ;   arr_errnoiseeta	[5]   =0;
-	      if ( h_NoiseCorr  )noiseeta_cor	     = h_NoiseCorr	 ->GetBinContent(ibin) ;
-              sprintf(arr_noiseeta_cor	 ,    "%f ", noiseeta_cor      ) ;   arr_noiseeta_cor	[5]   =0;
-	      if ( h_NoiseCorr  )errnoiseeta_cor     = h_NoiseCorr	 ->GetBinError  (ibin) ;
-              sprintf(arr_errnoiseeta_cor  ,    "%f ", errnoiseeta_cor   ) ;   arr_errnoiseeta_cor  [5]   =0;
-	      if ( h_CS 	)cl_sizeeta	     = h_CS		 ->GetBinContent(ibin) ;
-              sprintf(arr_cl_sizeeta	 ,    "%f ", cl_sizeeta        ) ;   arr_cl_sizeeta	[5]   =0;
-	      if ( h_CS 	)errcl_sizeeta       = h_CS		 ->GetBinError  (ibin) ;
-              sprintf(arr_errcl_sizeeta	 ,    "%f ", errcl_sizeeta     ) ;   arr_errcl_sizeeta	[5]   =0;	     
+ 	      if ( h_Eff	)effeta 	     = h_Eff		 ->GetBinContent(ibin) ;      
+	      sprintf(arr_effeta  	 ,    "%f ", effeta	       ) ;   arr_effeta		[5]   =0;
+	      if ( h_Eff	)erreffeta	     = h_Eff		 ->GetBinError  (ibin) ;      
+	      sprintf(arr_erreffeta	 ,    "%f ", erreffeta         ) ;   arr_erreffeta	[5]   =0;
+	      if ( h_Res_CS1	)reseta_cs1	     = h_Res_CS1	 ->GetBinContent(ibin) ;      
+	      sprintf(arr_reseta_cs1	 ,    "%f ", reseta_cs1        ) ;   arr_reseta_cs1	[5]   =0;
+	      if ( h_Res_CS1	)errreseta_cs1       = h_Res_CS1	 ->GetBinError  (ibin) ;      
+	      sprintf(arr_errreseta_cs1	 ,    "%f ", errreseta_cs1     ) ;   arr_errreseta_cs1	[5]   =0;
+	      if ( h_Res_CS2	)reseta_cs2	     = h_Res_CS2	 ->GetBinContent(ibin) ;      
+	      sprintf(arr_reseta_cs2	 ,    "%f ", reseta_cs2        ) ;   arr_reseta_cs2	[5]   =0;
+	      if ( h_Res_CS2	)errreseta_cs2       = h_Res_CS2	 ->GetBinError  (ibin) ;      
+	      sprintf(arr_errreseta_cs2	 ,    "%f ", errreseta_cs2     ) ;   arr_errreseta_cs2	[5]   =0;
+              if ( h_Res_CSmore2)reseta_csother      = h_Res_CSmore2	 ->GetBinContent(ibin) ;      
+	      sprintf(arr_reseta_csother   ,    "%f ", reseta_csother    ) ;   arr_reseta_csother	[5]   =0;
+	      if ( h_Res_CSmore2)errreseta_csother   = h_Res_CSmore2	 ->GetBinError  (ibin) ;      
+	      sprintf(arr_errreseta_csother,    "%f ", errreseta_csother ) ;   arr_errreseta_csother[5]   =0;
+	      if ( h_Time	)timeeta	     = h_Time		 ->GetBinContent(ibin) ;      
+	      sprintf(arr_timeeta 	 ,    "%f ", timeeta	       ) ;   arr_timeeta  	[5]   =0;
+	      if ( h_Time	)errtimeeta	     = h_Time		 ->GetBinError  (ibin) ;      
+	      sprintf(arr_errtimeeta	 ,    "%f ", errtimeeta        ) ;   arr_errtimeeta	[5]   =0;
+	      if ( h_NoiseTot	)noiseeta	     = h_NoiseTot	 ->GetBinContent(ibin) ;      
+	      sprintf(arr_noiseeta	 ,    "%f ", noiseeta	       ) ;   arr_noiseeta 	[5]   =0;
+	      if ( h_NoiseTot	)errnoiseeta	     = h_NoiseTot	 ->GetBinError  (ibin) ;      
+	      sprintf(arr_errnoiseeta	 ,    "%f ", errnoiseeta       ) ;   arr_errnoiseeta	[5]   =0;
+	      if ( h_NoiseCorr  )noiseeta_cor	     = h_NoiseCorr	 ->GetBinContent(ibin) ;      
+	      sprintf(arr_noiseeta_cor	 ,    "%f ", noiseeta_cor      ) ;   arr_noiseeta_cor	[5]   =0;
+	      if ( h_NoiseCorr  )errnoiseeta_cor     = h_NoiseCorr	 ->GetBinError  (ibin) ;      
+	      sprintf(arr_errnoiseeta_cor  ,    "%f ", errnoiseeta_cor   ) ;   arr_errnoiseeta_cor  [5]   =0;
+	      if ( h_CS 	)cl_sizeeta	     = h_CS		 ->GetBinContent(ibin) ;      
+	      sprintf(arr_cl_sizeeta	 ,    "%f ", cl_sizeeta        ) ;   arr_cl_sizeeta	[5]   =0;
+	      if ( h_CS 	)errcl_sizeeta       = h_CS		 ->GetBinError  (ibin) ;      
+	      sprintf(arr_errcl_sizeeta	 ,    "%f ", errcl_sizeeta     ) ;   arr_errcl_sizeeta	[5]   =0;	     
 	     
 	    
               //std::cout<<"PanelCode  "<<PanelCode<<" etaprimo "<<"\n";
@@ -1220,10 +1228,10 @@ MonitoringFile::RPCPostProcess( std::string inFilename, bool /* isIncremental */
 ////////////////////////////////////////////////////////////////////////////////////////////////////////
 	   
             int   TableVersionCondDB  = 2 ;         //RPC conditionDB table versioning
-	    float effeleeta           = -9999;	       char arr_effeleeta 	 [10];  	   
-            float erreffeleeta        = -1;	       char arr_erreffeleeta	 [10];  	   
-            float effelephi	      = -9999;	       char arr_effelephi 	 [10];
-	    float erreffelephi        = -1;            char arr_erreffelephi	 [10];
+	    float gapeffeta           = -9999;	       char arr_gapeffeta 	 [10];  	   
+            float errgapeffeta        = -1;	       char arr_errgapeffeta	 [10];  	   
+            float gapeffphi	      = -9999;	       char arr_gapeffphi 	 [10];
+	    float errgapeffphi        = -1;            char arr_errgapeffphi	 [10];
 	    float gapeff              = -9999;			    
             float errgapeff           = -1;
 	    float entriesCSeta        = -1;
@@ -1238,6 +1246,8 @@ MonitoringFile::RPCPostProcess( std::string inFilename, bool /* isIncremental */
             float rateCS1phi	      = -1;	       char arr_rateCS1phi	 [10]; 
             float rateCS2phi	      = -1;	       char arr_rateCS2phi	 [10]; 
             float rateCSmore2phi      = -1;	       char arr_rateCSmore2phi	 [10]; 
+	    
+	    
 
  	    coolrpc.coolDbFolder("sqlite://;schema=RPCConditionDB.db;dbname=RPC_DQA","/OFFLINE/FINAL");
   	    std::string dir_cool_raw = run_dir + "/Muon/MuonRawDataMonitoring/RPC/CoolDB/";
@@ -1257,7 +1267,7 @@ MonitoringFile::RPCPostProcess( std::string inFilename, bool /* isIncremental */
 	    int StripProfileContenent = 0;
 	  
 	    for ( std::vector<std::string>::const_iterator iter=layerList.begin(); iter!=layerList.end(); iter++ ) {
-	      for ( int i_dblPhi=0; i_dblPhi!=2; i_dblPhi++ ) {
+	      for ( int i_dblPhi=0; i_dblPhi!=2*1+1; i_dblPhi++ ) {
 	        char coolName[40];
 		sprintf(coolName, "Sector%.2d_%s_dblPhi%d", i_sec+1, (*iter).c_str(), i_dblPhi+1 );
 		std::string stripId_name       = dir_cool_raw + coolName + "_PanelId" ;
@@ -1273,8 +1283,10 @@ MonitoringFile::RPCPostProcess( std::string inFilename, bool /* isIncremental */
 		 
 		  int  SingleStripsValue    = 0;
 		  int  StripsOnPanel        = 1; //number of strip on panel
-		  char SingleStripsStatus[80]  ;
-		  std::string PanelStripsStatus;
+		  char SingleStripsStatus  [80]  ;
+		  char SingleStripsStatusOK[80]  ;
+		  std::string PanelStripsStatus  ;
+		  std::string PanelStripsStatusOK;
 		  
 		  NumberLayerStrip = h_stripProfile->GetNbinsX() ;
 		  for(int Nstrips=1 ; Nstrips!=NumberLayerStrip+1 ; Nstrips++){
@@ -1286,11 +1298,14 @@ MonitoringFile::RPCPostProcess( std::string inFilename, bool /* isIncremental */
 		    if (StripOccupancy>0.9) SingleStripsValue=9;
 		    		    
 		    if(h_stripId-> GetBinCenter(Nstrips) > 0){ 
-		     sprintf(SingleStripsStatus, "%d 000.0 0.000|", SingleStripsValue );
+		     sprintf(SingleStripsStatus  , "%d 000.0 0.000|", SingleStripsValue );
+		     sprintf(SingleStripsStatusOK,  "5 000.0 0.000|"                    );
 		    }else{ 
 		     sprintf(SingleStripsStatus, "|000.0 0.000 %d", SingleStripsValue );
+		     sprintf(SingleStripsStatusOK, "|000.0 0.000 5"                   );
 		    }
-		    PanelStripsStatus = PanelStripsStatus + SingleStripsStatus;
+		    PanelStripsStatus   = PanelStripsStatus   +   SingleStripsStatus;
+		    PanelStripsStatusOK = PanelStripsStatusOK + SingleStripsStatusOK;
 		    
 		    
 
@@ -1302,7 +1317,8 @@ MonitoringFile::RPCPostProcess( std::string inFilename, bool /* isIncremental */
   
 		    if(h_stripId-> GetBinCenter(Nstrips) < 0){		    		    
 		     //std::cout << " PanelStripsStatus " << PanelStripsStatus <<std::endl;		    
-		     std::reverse(PanelStripsStatus.begin(), PanelStripsStatus.end());		
+		     std::reverse(PanelStripsStatus  .begin(), PanelStripsStatus  .end());				    
+		     std::reverse(PanelStripsStatusOK.begin(), PanelStripsStatusOK.end());		
 		    }
                        
 		      for(int ibin=1 ; ibin!=nbin+1 ; ibin++){
@@ -1310,13 +1326,27 @@ MonitoringFile::RPCPostProcess( std::string inFilename, bool /* isIncremental */
 	                if(PanelCode !=PanelStripId)continue;
 			  if(ibin%2!=0){
 			    if (h_TrackProj) {n_tr_peta  =(int)h_TrackProj   -> GetBinContent(ibin) ;}
-			      //if(n_tr_peta >0){
-	 
+			      //if(n_tr_peta >0){				
+				if ( h_PanelId )Binposition = (int)h_PanelId-> GetBinCenter(ibin) ;
+				int ibin_perp=0;
+	                        if(Binposition>0){ 
+				 ibin_perp=ibin+1;
+			         if ( h_Eff 	)eta_effphi 	     = h_Eff		 ->GetBinContent(ibin+1) ;
+			        }else{
+				 ibin_perp=ibin-1;
+			         if ( h_Eff 	)eta_effphi 	     = h_Eff		 ->GetBinContent(ibin-1) ;
+ 			        }
 			    	if ( h_GapEff	  )gapeff	       = h_GapEff	   ->GetBinContent(ibin) ;
-			    	if ( h_GapEff	  )errgapeff	       = h_GapEff	   ->GetBinError  (ibin) ;
+			    	if ( h_GapEff	  )errgapeff	       = h_GapEff	   ->GetBinError  (ibin) ;				
  			    	if ( h_Eff	  )effeta	       = h_Eff  	   ->GetBinContent(ibin) ;
  			    	if ( h_Eff	  )erreffeta	       = h_Eff  	   ->GetBinError  (ibin) ;
-			    	if ( h_Res_CS1    )reseta_cs1	       = h_Res_CS1	   ->GetBinContent(ibin) ;
+				
+				gapeffeta   =               gapeff;
+				errgapeffeta=            errgapeff;
+				EffThreshold = (effeta<Minimum_efficiency)|| (eta_effphi<Minimum_efficiency);
+				
+				
+				if ( h_Res_CS1    )reseta_cs1	       = h_Res_CS1	   ->GetBinContent(ibin) ;
  			    	if ( h_Res_CS1    )errreseta_cs1       = h_Res_CS1	   ->GetBinError  (ibin) ;
  			    	if ( h_Res_CS2    )reseta_cs2	       = h_Res_CS2	   ->GetBinContent(ibin) ;
  			    	if ( h_Res_CS2    )errreseta_cs2       = h_Res_CS2	   ->GetBinError  (ibin) ;
@@ -1339,19 +1369,42 @@ MonitoringFile::RPCPostProcess( std::string inFilename, bool /* isIncremental */
                                  rateCSmore2eta =(entriesCSeta-(entriesCS1eta+entriesCS2eta))/entriesCSeta;
                                 }
 
- 			    	if(gapeff!=0 && effeta !=0){
-			    	  effeleeta=effeta/gapeff;
-			    	  erreffeleeta=((erreffeta/effeta)+(errgapeff/gapeff))*effeleeta;
-			    	}else{
-			    	  effeleeta     =0.000;
- 			    	  erreffeleeta  =0.000;
-			    	}
-        		        //std::cout << " effeleeta " << effeleeta <<"  erreffeleeta  "<<erreffeleeta<<"  erreffeta  "<<erreffeta << "  effeta  "<<effeta <<"  errgapeff  "<<errgapeff << "  gapeff  "<<gapeff <<" rateCS1eta  "<<  rateCS1eta << " rateCS2eta " << rateCS2eta <<std::endl;
+				if (applyEffThreshold){ 
+				 if(effeta<Minimum_efficiency&&eta_effphi<Minimum_efficiency){
+				   effeta      =Minimum_efficiency;
+				   gapeffeta   =Minimum_efficiency;
+				   erreffeta   =                 0.1;
+				   errgapeffeta=                 0.1;
+				   PanelStripsStatus   = PanelStripsStatusOK;
+				   cl_sizeeta     =   1;
+				   errcl_sizeeta  = 0.1,
+			           rateCS1eta     =   1;
+                                   rateCS2eta     =   0;
+                                   rateCSmore2eta =   0; 
+				 }
+				 else if(effeta<Minimum_efficiency&&eta_effphi>Minimum_efficiency){
+				   effeta      = Minimum_efficiency;
+				   gapeffeta   =            eta_effphi;
+				   erreffeta   =                   0.1;
+				   errgapeffeta=                   0.1;
+				   PanelStripsStatus   = PanelStripsStatusOK;
+				   cl_sizeeta     =   1;
+				   errcl_sizeeta  = 0.1,
+			           rateCS1eta     = 1;
+                                   rateCS2eta     = 0;
+                                   rateCSmore2eta = 0;
+				 }
+				 else if(effeta>Minimum_efficiency&&eta_effphi<Minimum_efficiency){
+				   gapeffeta   =              effeta;
+				   errgapeffeta=                 0.1;
+				 }
+				}
+        		        //std::cout << "  erreffeta  "<<erreffeta << "  effeta  "<<effeta <<"  errgapeff  "<<errgapeff << "  gapeff  "<<gapeff <<" rateCS1eta  "<<  rateCS1eta << " rateCS2eta " << rateCS2eta <<std::endl;
 	
 			    	sprintf(arr_effeta	   ,	"%f ", effeta		 ) ;   arr_effeta 	  [5]	=0;
 			    	sprintf(arr_erreffeta	   ,	"%f ", erreffeta	 ) ;   arr_erreffeta	  [5]	=0;
-			    	sprintf(arr_effeleeta	   ,	"%f ", effeleeta	 ) ;   arr_effeleeta	  [5]	=0;
-			    	sprintf(arr_erreffeleeta     ,	"%f ", erreffeleeta	 ) ;   arr_erreffeleeta	  [5]	=0;
+			    	sprintf(arr_gapeffeta	   ,	"%f ", gapeffeta	 ) ;   arr_gapeffeta	  [5]	=0;
+			    	sprintf(arr_errgapeffeta     ,	"%f ", errgapeffeta	 ) ;   arr_errgapeffeta	  [5]	=0;
 			    	sprintf(arr_reseta_cs1	   ,	"%f ", reseta_cs1	 ) ;   arr_reseta_cs1	  [5]	=0;
 			    	sprintf(arr_errreseta_cs1    ,	"%f ", errreseta_cs1	 ) ;   arr_errreseta_cs1    [5]	=0;
 			    	sprintf(arr_reseta_cs2	   ,	"%f ", reseta_cs2	 ) ;   arr_reseta_cs2	  [5]	=0;
@@ -1371,31 +1424,45 @@ MonitoringFile::RPCPostProcess( std::string inFilename, bool /* isIncremental */
 			        char PanelRes   [255]; //eff_eta, res_cs1, res_cs2, res_csother, time, mean and rms
 			        char StripStatus   [4096]; //strips status 0 to 9 for dead noisy strips
 				
- 			        sprintf(PanelRes,  "%d %d %d %s %s %s %s %s %s %s %s %s %s %s %s %s %s %s %s %s %s %s", TableVersionCondDB,  n_tr_peta, StripsOnPanel,  arr_effeta, arr_erreffeta,  arr_effeleeta, arr_erreffeleeta, arr_reseta_cs1, arr_errreseta_cs1, arr_reseta_cs2, arr_errreseta_cs2, arr_reseta_csother, arr_errreseta_csother, arr_noiseeta, arr_errnoiseeta, arr_noiseeta_cor, arr_errnoiseeta_cor, arr_cl_sizeeta, arr_errcl_sizeeta, arr_rateCS1eta, arr_rateCS2eta, arr_rateCSmore2eta) ;
+ 			        sprintf(PanelRes,  "%d %d %d %s %s %s %s %s %s %s %s %s %s %s %s %s %s %s %s %s %s %s", TableVersionCondDB,  n_tr_peta, StripsOnPanel,  arr_effeta, arr_erreffeta,  arr_gapeffeta, arr_errgapeffeta, arr_reseta_cs1, arr_errreseta_cs1, arr_reseta_cs2, arr_errreseta_cs2, arr_reseta_csother, arr_errreseta_csother, arr_noiseeta, arr_errnoiseeta, arr_noiseeta_cor, arr_errnoiseeta_cor, arr_cl_sizeeta, arr_errcl_sizeeta, arr_rateCS1eta, arr_rateCS2eta, arr_rateCSmore2eta) ;
  			        sprintf(StripStatus, "%s", PanelStripsStatus.c_str()) ;
 				std::string cool_tagCondDB="RecoCondDB";		        
                                 coolrpc.setSince(0U,0U);		
                                 coolrpc.setUntil(4294967295U,0U);	
  			        coolrpc.insertCondDB_withTag(run_number*0+429496729U,PanelCode,PanelRes, StripStatus,cool_tagCondDB);
-			        //std::cout <<"Eta " << PanelCode << " --- " << PanelRes<< " --- " << StripStatus << std::endl;	
+			        if(printout&&EffThreshold)std::cout << stripProfile_name << " under THR "<< EffThreshold <<" "<< PanelCode << " ibin " << ibin << " h_EffEta " << h_Eff->GetBinContent(ibin) <<" h_EffPhi " << h_Eff->GetBinContent(ibin_perp) << " h_GapEffEta " << h_GapEff->GetBinContent(ibin) <<" h_GapEffPhi " << h_GapEff->GetBinContent(ibin_perp) << " cool_EtaEff "<< effeta <<" cool_GapEffEta "<< gapeffeta <<" --- Eta Summary " << PanelRes<< " --- StripStatus " << StripStatus << std::endl;
+				if(printout&&EffThreshold)std::cout<<"inCOOL_ETA_id_ntrk_panelEff_gapEff "<<PanelCode<<" "<<n_tr_peta<<" "<<(int)(n_tr_peta*effeta)<<" "<<(int)(n_tr_peta*gapeffeta)<<std::endl;	
 			        countpanelindb++;
 			        if(effeta==0.0)countpaneleff0++;
 			        if(n_tr_peta==0)countpaneltrack0++;
-			      //}
+			      
 			    }else{
 			     if (h_TrackProj) n_tr_pphi  =(int)h_TrackProj   -> GetBinContent(ibin) ;
  			     //if(n_tr_pphi >0){
  
 			     if ( h_PanelId )Binposition = (int)h_PanelId-> GetBinCenter(ibin) ;
+			     int ibin_perp=0;
 			     if(Binposition>0){
+			       ibin_perp=ibin-1;
 			       if ( h_GapEff	)gapeff 	     = h_GapEff 	 ->GetBinContent(ibin-1) ;
 			       if ( h_GapEff	)errgapeff	     = h_GapEff 	 ->GetBinError  (ibin-1) ;
+			       if ( h_Eff 	)phi_effeta 	     = h_Eff		 ->GetBinContent(ibin-1) ;
+			       
 			     }else{
+			       ibin_perp=ibin+1;
 			       if ( h_GapEff	)gapeff 	     = h_GapEff 	 ->GetBinContent(ibin+1) ;
  			       if ( h_GapEff	)errgapeff	     = h_GapEff 	 ->GetBinError  (ibin+1) ;
+			       if ( h_Eff 	)phi_effeta 	     = h_Eff		 ->GetBinContent(ibin+1) ;
  			     }
 			     if ( h_Eff 	)effphi 	     = h_Eff		 ->GetBinContent(ibin) ;
  			     if ( h_Eff 	)erreffphi	     = h_Eff		 ->GetBinError  (ibin) ;
+			     
+
+			     gapeffphi   =               gapeff;
+			     errgapeffphi=            errgapeff;
+			     EffThreshold = (effphi<Minimum_efficiency)|| (phi_effeta<Minimum_efficiency);
+			     
+			     
 			     if ( h_Res_CS1	)resphi_cs1	     = h_Res_CS1	 ->GetBinContent(ibin) ;
 			     if ( h_Res_CS1	)errresphi_cs1       = h_Res_CS1	 ->GetBinError  (ibin) ;
  			     if ( h_Res_CS2	)resphi_cs2	     = h_Res_CS2	 ->GetBinContent(ibin) ;
@@ -1415,21 +1482,54 @@ MonitoringFile::RPCPostProcess( std::string inFilename, bool /* isIncremental */
 			      rateCS1phi     =entriesCS1phi/entriesCSphi;
                               rateCS2phi     =entriesCS2phi/entriesCSphi;
                               rateCSmore2phi =(entriesCSphi-(entriesCS1phi+entriesCS2phi))/entriesCSphi;
- 			     }
- 			     if(gapeff !=0 && effphi !=0){
- 			       effelephi=effphi/gapeff;
-			       erreffelephi=((erreffphi/effphi)+(errgapeff/gapeff))*effelephi;
- 			     }else{
-			       effelephi     = 0.000;
-			       erreffelephi  = 0.000;
- 			     }			    
-        		     //std::cout << " effelephi " << effelephi <<"  erreffelephi  "<<erreffelephi<<"  erreffphi  "<<erreffphi << "  effphi  "<<effphi <<"  errgapeff  "<<errgapeff << "  gapeff  "<<gapeff << "  rateCS1phi  "<<rateCS1phi<< " rateCS2phi   "<<rateCS2phi<<std::endl;
+ 			     }	
+			     
+			     
+			     if (applyEffThreshold){ 
+			      if(effphi<Minimum_efficiency&&phi_effeta<Minimum_efficiency){
+				  effphi      =Minimum_efficiency;
+				  gapeffphi   =Minimum_efficiency;
+				  erreffphi   =                 0.1;
+				  errgapeffphi=                 0.1;
+				  PanelStripsStatus   = PanelStripsStatusOK;
+				  cl_sizephi     =   1;
+				  errcl_sizephi  = 0.1,
+			          rateCS1phi     = 1;
+                                  rateCS2phi     = 0;
+                                  rateCSmore2phi = 0;
+			      }
+			      else if(effphi<Minimum_efficiency&&phi_effeta>Minimum_efficiency){
+				  effphi      =       Minimum_efficiency;
+				  gapeffphi   =                 phi_effeta;
+				  erreffphi   =                        0.1;
+				  errgapeffphi=                        0.1;
+				  PanelStripsStatus   = PanelStripsStatusOK;
+				  cl_sizephi     =   1;
+				  errcl_sizephi  = 0.1,
+			          rateCS1phi     = 1;
+                                  rateCS2phi     = 0;
+                                  rateCSmore2phi = 0;
+			      }
+			      else if(effphi>Minimum_efficiency&&phi_effeta<Minimum_efficiency){   
+				  gapeffphi   =              effphi; 
+				  errgapeffphi=                 0.1;
+				  PanelStripsStatus   = PanelStripsStatusOK;
+			      }  
+			     }
+			     
+			     
+			     
+			     
+			     
+			     
+			     	    
+        		     //std::cout << "  erreffphi  "<<erreffphi << "  effphi  "<<effphi <<"  errgapeff  "<<errgapeff << "  gapeff  "<<gapeff << "  rateCS1phi  "<<rateCS1phi<< " rateCS2phi   "<<rateCS2phi<<std::endl;
 			     
 			     
 			     sprintf(arr_effphi		,    "%f ", effphi	      ) ;   arr_effphi	       [5]   =0;
 			     sprintf(arr_erreffphi	,    "%f ", erreffphi	      ) ;   arr_erreffphi        [5]   =0;
- 			     sprintf(arr_effelephi	,    "%f ", effelephi	      ) ;   arr_effelephi        [5]   =0;
-			     sprintf(arr_erreffelephi	,    "%f ", erreffelephi      ) ;   arr_erreffelephi     [5]   =0;
+ 			     sprintf(arr_gapeffphi	,    "%f ", gapeffphi	      ) ;   arr_gapeffphi        [5]   =0;
+			     sprintf(arr_errgapeffphi	,    "%f ", errgapeffphi      ) ;   arr_errgapeffphi     [5]   =0;
 			     sprintf(arr_resphi_cs1	,    "%f ", resphi_cs1        ) ;   arr_resphi_cs1       [5]   =0;
 			     sprintf(arr_errresphi_cs1	,    "%f ", errresphi_cs1     ) ;   arr_errresphi_cs1    [5]   =0;
 			     sprintf(arr_resphi_cs2	,    "%f ", resphi_cs2        ) ;   arr_resphi_cs2       [5]   =0;
@@ -1448,24 +1548,26 @@ MonitoringFile::RPCPostProcess( std::string inFilename, bool /* isIncremental */
 			    		
 			     char PanelRes   [255]; //eff_eta, res_cs1, res_cs2, res_csother, time, mean and rms
 			     char StripStatus   [4096]; //strips status 0 to 9 for dead noisy strips
- 			     sprintf(PanelRes,  "%d %d %d %s %s %s %s %s %s %s %s %s %s %s %s %s %s %s %s %s %s %s", TableVersionCondDB,  n_tr_pphi, StripsOnPanel,  arr_effphi, arr_erreffphi,  arr_effelephi, arr_erreffelephi, arr_resphi_cs1, arr_errresphi_cs1, arr_resphi_cs2, arr_errresphi_cs2, arr_resphi_csother, arr_errresphi_csother, arr_noisephi, arr_errnoisephi, arr_noisephi_cor, arr_errnoisephi_cor, arr_cl_sizephi, arr_errcl_sizephi, arr_rateCS1phi, arr_rateCS2phi, arr_rateCSmore2phi) ;
+ 			     sprintf(PanelRes,  "%d %d %d %s %s %s %s %s %s %s %s %s %s %s %s %s %s %s %s %s %s %s", TableVersionCondDB,  n_tr_pphi, StripsOnPanel,  arr_effphi, arr_erreffphi,  arr_gapeffphi, arr_errgapeffphi, arr_resphi_cs1, arr_errresphi_cs1, arr_resphi_cs2, arr_errresphi_cs2, arr_resphi_csother, arr_errresphi_csother, arr_noisephi, arr_errnoisephi, arr_noisephi_cor, arr_errnoisephi_cor, arr_cl_sizephi, arr_errcl_sizephi, arr_rateCS1phi, arr_rateCS2phi, arr_rateCSmore2phi) ;
  			     sprintf(StripStatus, "%s", PanelStripsStatus.c_str()) ;
  			     std::string cool_tag="RecoCondDB";		        
                              coolrpc.setSince(0U,0U);		
                              coolrpc.setUntil(4294967295U,0U);	
  			     coolrpc.insertCondDB_withTag(run_number*0+429496729U,PanelCode,PanelRes, StripStatus,cool_tag);
-			     //std::cout <<"Phi " << PanelCode << " --- " << PanelRes<< " --- " << StripStatus << std::endl;	
-			    //}	
+			     if(printout&&EffThreshold)std::cout << stripProfile_name << " under THR "<< EffThreshold <<" " << PanelCode << " ibin " << ibin << " h_EffPhi " << h_Eff->GetBinContent(ibin) <<" h_EffEta " << h_Eff->GetBinContent(ibin_perp) << " h_GapEffPhi " << h_GapEff->GetBinContent(ibin) <<" h_GapEffEta " << h_GapEff->GetBinContent(ibin_perp) << " cool_PhiEff "<< effphi <<" cool_GapEffPhi "<< gapeffphi <<" --- Phi Summary " << PanelRes<< " --- StripStatus " << StripStatus << std::endl;
+			     if(printout&&EffThreshold)std::cout<<"inCOOL_PHI_id_ntrk_panelEff_gapEff "<<PanelCode<<" "<<n_tr_pphi<<" "<<(int)(n_tr_pphi*effphi)<<" "<<(int)(n_tr_pphi*gapeffphi)<<std::endl;
 			    countpanelindb++;
 			    if(effphi==0.0)countpaneleff0++;
 			    if(n_tr_pphi==0)countpaneltrack0++;
 			  }		
 	    	          StripsOnPanel=1;
 	      	          PanelStripsStatus.clear();
+	      	          PanelStripsStatusOK.clear();
  		        }
 			//if(StripsOnPanel>1) std::cout<<stripProfile_name<< " bin " << Nstrips << " Not found PanelStripId " << PanelStripId<< std::endl;		
 	    	        StripsOnPanel=1;
-	      	        PanelStripsStatus.clear();			
+	      	        PanelStripsStatus.clear();
+	      	        PanelStripsStatusOK.clear();			
 		      }
                     }		  
 		  }				
diff --git a/DataQuality/DataQualityUtils/src/MonitoringFile_SCTPostProcess.cxx b/DataQuality/DataQualityUtils/src/MonitoringFile_SCTPostProcess.cxx
index 989f4ef68ac34f053d4586df4fdca1b7ba63cd4e..283dabc91a8fcf8afa6bd8288fe79a5f7684c588 100644
--- a/DataQuality/DataQualityUtils/src/MonitoringFile_SCTPostProcess.cxx
+++ b/DataQuality/DataQualityUtils/src/MonitoringFile_SCTPostProcess.cxx
@@ -37,265 +37,541 @@
 
 namespace dqutils {
 
-	static const bool rno_debug = false;
-
-	void
-		MonitoringFile::SCTPostProcess( std::string inFilename, bool /* isIncremental */ )
-		{
-			if (rno_debug) std::cout << "Start SCT post-processing" <<std::endl;
-
-			TFile *infile = TFile::Open(inFilename.c_str(),"UPDATE");
-			if(infile==0 || ! infile->IsOpen()){
-				std::cerr << "--> SCTPostProcess: Input file not opened" <<std::endl;
-				return;
-			}
-			if(infile->IsZombie()){
-				std::cerr << "--> SCTPostProcess: Input file " << inFilename << " cannot be opened" <<std::endl;
-				return;
-			}
-			if(infile->GetSize()<1000){
-				std::cerr << "--> SCTPostProcess: Input file empty " <<std::endl;
-				return;
-			}
-
-			//start postprocessing
-
-			TIter next_run(infile->GetListOfKeys());
-			TKey *key_run(0);
-			key_run = (TKey*)next_run();
-			TDirectory *dir0 = dynamic_cast<TDirectory*> (key_run->ReadObj());
-			if (!dir0) return; // should never fail
-			dir0->cd();
-
-			TString run_dir;
-			const int N_dir=4;
-			const int N_BARREL=4, N_DISKS=9;
-			TString subDetName[N_dir] = {"/GENERAL", "/SCTEC", "/SCTB", "/SCTEA"};
-			int times = 1;
-			while (times--) {  // just once
-				run_dir = dir0->GetName();
-
-				TString rno_dir = run_dir + "/SCT/GENERAL/RatioNoise/";
-				TDirectory *dir = infile->GetDirectory(rno_dir);
-				if(!dir){
-					std::cerr << "--> SCTPostProcess: directory " << rno_dir << " not found " <<std::endl;
-					return;
-				}
-				TString noSideHitHist = rno_dir + "h_NZ1_vs_modnum";
-				TString oneSideHitHist = rno_dir + "h_N11_vs_modnum";
-				TH1F *h_nosidehit = (TH1F*)infile->Get(noSideHitHist);
-				TH1F *h_onesidehit = (TH1F*)infile->Get(oneSideHitHist);      
-				if(!h_nosidehit || !h_onesidehit){
-					std::cerr << "--> SCTPostProcess: no such histogram " <<std::endl;
-					return;
-				}
-
-				TString maxerrortitles[15]={"SCTMaskedLinkmaxVsLbs","SCTROBFragmentmaxVsLbs","SCTABCDerrsmaxVsLbs","SCTRawerrsmaxVsLbs","SCTTimeOutmaxVsLbs","SCTLVL1IDerrsmaxVsLbs","SCTBCIDerrsmaxVsLbs","SCTPreamblemaxVsLbs","SCTFormattererrsmaxVsLbs","SCTRODClockerrsmaxVsLbs","SCTTruncatedRODmaxVsLbs","SCTBSParseerrsmaxVsLbs","SCTMissingLinkmaxVsLbs","SCTmaxNumberOfErrors","SCTmaxModulesWithErrors"};
-				TString conf_dir = run_dir + "/SCT/GENERAL/Conf/";      
-				TString err_dir = run_dir + "/SCT/GENERAL/errors/tmp/";      
-				TDirectory *confdir = infile->GetDirectory(conf_dir);
-				if(!confdir){
-					std::cerr << "--> SCTPostProcess: directory " << conf_dir << " not found " <<std::endl;
-					return;
-				}
-
-				TString maxErrHist[15];
-				TH1F *maxErrHist_new[15];
-				TString maxerrortitles_2d[15];
-				for(int i=0;i<15;i++){
-					maxErrHist[i] = conf_dir + maxerrortitles[i];
-					maxErrHist_new[i] = (TH1F*)infile->Get(maxErrHist[i]);
-					maxerrortitles_2d[i] = err_dir + maxerrortitles[i] + "_2d";
-				}
-
-				//Name of directory where there are efficiency maps
-				TString posi_eff[3] = {"m_eff_", "eff_", "p_eff_"};
-				TString eff_dir[N_dir];
-				//Object of directoty
-				TDirectory *effDir[N_dir];
-				//Name of histogram
-				TString mapName[N_DISKS*2 + N_BARREL][2];
-				//Histogram
-				std::array < std::array < TProfile2D *, 2 >, N_DISKS*2 + N_BARREL > effMap;
-				//New histogram is made by postprocessing
-				TH1F *h_EffDist = new TH1F("SctEffDistribution", "SCT Efficiency Distribution", 500, 0, 1);
-				h_EffDist->GetXaxis()->SetTitle("Efficiency");
-				h_EffDist->GetYaxis()->SetTitle("Links");
-				//
-				int det_num=-1;
-				int layers[3] = {N_DISKS, N_BARREL, N_DISKS};
-				//
-				for(int i=0;i<N_dir;i++){
-					eff_dir[i] = run_dir + "/SCT" + subDetName[i] + "/eff/";
-					effDir[i] = (TDirectory*)infile->GetDirectory(eff_dir[i]);
-					if(!effDir[i]){
-						std::cerr << "--> SCTPostProcess: directory " << eff_dir[i] << " not found " <<std::endl;
-						return;
-					}
-				}
-				//Calculate and Fill
-				for(Long_t i=0;i<3;i++){
-					effDir[i+1]->cd();
-					for(Long_t j=0;j<layers[i];j++){
-						if(i==0) det_num=j;
-						else if(i==1) det_num=j+N_DISKS;
-						else if(i==2) det_num=j+N_DISKS+N_BARREL;
-						else {
-                                                  std::cerr << "--> Detector region (barrel, endcap A, endcap C) could not be determined" <<std::endl;
-                                                  return;
-						}
-						for(Long_t k=0;k<2;k++){
-							mapName[det_num][k] = eff_dir[i+1] + posi_eff[i]+j+"_"+k;
-							effMap[det_num][k] = (TProfile2D*) infile->Get(mapName[det_num][k]);
-							if(!effMap[det_num][k] ){
-								std::cerr << "--> SCTPostProcess: no such histogram: "<<mapName[det_num][k]<<std::endl;
-								continue;
-							}
-							for(int xbin=1;xbin<effMap[det_num][k]->GetNbinsX()+1;xbin++){
-								for(int ybin=1;ybin<effMap[det_num][k]->GetNbinsY()+1;ybin++){
-									if(effMap[det_num][k]->GetBinEntries(effMap[det_num][k]->GetBin(xbin,ybin))==0) continue;
-									h_EffDist->Fill(effMap[det_num][k]->GetBinContent(xbin,ybin));
-								}
-							}
-						}
-					}
-				}
-				effDir[0]->cd();
-				//Overwriting
-				h_EffDist->Write("", TObject::kOverwrite);
-				//end of eff dist 15.09.2016
-				TH1F *hist_all = new TH1F("h_NO","Noise Occupancy for Barrel and Endcaps",500,0.,100.);
-				TH1F *hist_bar = new TH1F("h_NOb","Noise Occupancy for Barrel",500,0.,100.);
-				TH1F *hist_end = new TH1F("h_NOEC","Noise Occupancy for Endcaps",500,0.,100.);
-				TH1F *hist_endc = new TH1F("hist_endcapC","endcap C",500,0.,100.);
-				TH1F *hist_enda = new TH1F("hist_endcapA","endcap A",500,0.,100.);
-
-				TH1F *hist_bar_layer[4];
-				for(int i=0;i<4;i++){
-					hist_bar_layer[i] = new TH1F(Form("h_NOb_layer%d",i),Form("Noise Occupancy Barrel Layer %d",i),500,0.,100.);
-				}
-				TH1F *hist_endC_disk[9];
-				for(int i=0;i<9;i++){
-					hist_endC_disk[i] = new TH1F(Form("h_NOECC_disk%d",i),Form("Noise Occupancy Endcap C disk %d",i),500,0.,100.);
-				}
-				TH1F *hist_endA_disk[9];
-				for(int i=0;i<9;i++){
-					hist_endA_disk[i] = new TH1F(Form("h_NOECA_disk%d",i),Form("Noise Occupancy Endcap A disk %d",i),500,0.,100.);
-				}
-				TH1F *hist_inner = new TH1F("h_NOEC_Inner","Noise Occupancy Inner Endcap Modules",500,0.,100.);
-				TH1F *hist_middle = new TH1F("h_NOEC_Middle","Noise Occupancy Middle Endcap Modules",500,0.,100.);
-				TH1F *hist_outer = new TH1F("h_NOEC_Outer","Noise Occupancy Outer Endcap Modules",500,0.,100.);
-				TH1F *hist_smiddle = new TH1F("h_NOEC_ShortMiddle","Noise Occupancy Short Middle Endcap Modules",500,0.,100.);
-
-				int nModuleEndCap1[9] = {0, 92, 224, 356, 488, 620, 752, 844, 936};
-				int nModuleEndCap2[9] = {92, 224, 356, 488, 620, 752, 844, 936, 988};
-				int nModuleBarrel1[4] = {0, 384, 864, 1440};
-				int nModuleBarrel2[4] = {384, 864, 1440, 2112};
-
-
-				for(int i=0;i<4088;i++){
-					int nosidehit = h_nosidehit->GetBinContent(i+1);
-					int onesidehit = h_onesidehit->GetBinContent(i+1);
-					if(nosidehit>0){
-						double Rval = (double)onesidehit/(double)nosidehit;
-						double NOval = 1./768.*Rval/(2.+Rval);
-						if(NOval!=0){
-							hist_all->Fill(100000.*NOval);
-							if(i>=0 && i<988){
-								hist_end->Fill(100000.*NOval);
-								hist_endc->Fill(100000.*NOval);
-								for(int j=0;j<9;j++){
-									if(i>=nModuleEndCap1[j] && i<nModuleEndCap2[j]){
-										hist_endC_disk[j]->Fill(100000.*NOval);
-										if(i-nModuleEndCap1[j]<52){
-											hist_outer->Fill(100000.*NOval);
-										}else if(i-nModuleEndCap1[j]>=52 && i-nModuleEndCap1[j]<92){
-											if(i<844){
-												hist_middle->Fill(100000.*NOval);
-											}else if(i>=844){
-												hist_smiddle->Fill(100000.*NOval);
-											}
-										}else if(i-nModuleEndCap1[j]>=92 && i-nModuleEndCap1[j]<132){
-											hist_inner->Fill(100000.*NOval);
-										}
-									}
-								}
-							}else if(i>=988 && i<3100){
-								hist_bar->Fill(100000.*NOval);
-								for(int j=0;j<4;j++){
-									if(i>=nModuleBarrel1[j]+988 && i<nModuleBarrel2[j]+988){
-										hist_bar_layer[j]->Fill(100000*NOval);
-									}
-								}
-							}else if(i>=3100 && i<4088){
-								hist_end->Fill(100000.*NOval);
-								hist_enda->Fill(100000.*NOval);
-								for(int j=0;j<9;j++){
-									if(i>=nModuleEndCap1[j]+3100 && i<nModuleEndCap2[j]+3100){
-										hist_endA_disk[j]->Fill(100000*NOval);
-										if(i-nModuleEndCap1[j]-3100<52){
-											hist_outer->Fill(100000.*NOval);
-										}else if(i-nModuleEndCap1[j]-3100>=52 && i-nModuleEndCap1[j]-3100<92){
-											if(i-3100<844){
-												hist_middle->Fill(100000.*NOval);
-											}else if(i-3100>=844){
-												hist_smiddle->Fill(100000.*NOval);
-											}
-										}else if(i-nModuleEndCap1[j]-3100>=92 && i-nModuleEndCap1[j]-3100<132){
-											hist_inner->Fill(100000.*NOval);
-										}
-									}
-								}
-							}
-						}
-					}
-				}
-				hist_all->SetBinContent(hist_all->GetNbinsX(),hist_all->GetBinContent(hist_all->GetNbinsX() ) + hist_all->GetBinContent(hist_all->GetNbinsX() +1));
-				hist_bar->SetBinContent(hist_bar->GetNbinsX(),hist_bar->GetBinContent(hist_bar->GetNbinsX() ) + hist_bar->GetBinContent(hist_bar->GetNbinsX() +1));
-				hist_end->SetBinContent(hist_end->GetNbinsX(),hist_end->GetBinContent(hist_end->GetNbinsX() ) + hist_end->GetBinContent(hist_end->GetNbinsX() +1));
-
-				dir->cd();
-				hist_all->Write("", TObject::kOverwrite);
-				hist_bar->Write("", TObject::kOverwrite);
-				hist_end->Write("", TObject::kOverwrite);
-				for(int i=0;i<4;i++){
-					hist_bar_layer[i]->Write("", TObject::kOverwrite);
-				}
-				for(int i=0;i<9;i++){
-					hist_endC_disk[i]->Write("", TObject::kOverwrite);
-				}
-				for(int i=0;i<9;i++){
-					hist_endA_disk[i]->Write("", TObject::kOverwrite);
-				}
-				hist_inner->Write("", TObject::kOverwrite);
-				hist_middle->Write("", TObject::kOverwrite);
-				hist_outer->Write("", TObject::kOverwrite);
-				hist_smiddle->Write("", TObject::kOverwrite);
-
-				TH2I *h2_maxErrHist[15];
-				confdir->cd();
-				TDirectory *errdir = infile->GetDirectory(err_dir);
-				if(errdir){
-					for(int i=0;i<15;i++){
-						h2_maxErrHist[i] = (TH2I*)infile->Get(maxerrortitles_2d[i]);
-						if(h2_maxErrHist[i]&&maxErrHist_new[i]){
-							for(int m=0;m<h2_maxErrHist[i]->GetXaxis()->GetNbins();m++){
-								for(int n=0;n<8176;n++){
-									int maxModErrs = h2_maxErrHist[i]->GetBinContent(m+1,8176-n);
-									if(maxModErrs!=0){
-										maxErrHist_new[i]->SetBinContent(m+1,8176-n);
-										break;
-									}
-								}
-							}
-							maxErrHist_new[i]->Write("", TObject::kOverwrite);            
-						}
-					}
-				}
-
-				infile->Write();
-
-			}//while
+  static const bool rno_debug = false;
+
+  void
+  MonitoringFile::SCTPostProcess( std::string inFilename, bool /* isIncremental */ )
+  {
+    if (rno_debug) std::cout << "Start SCT post-processing" <<std::endl;
+
+    TH1::SetDefaultSumw2();
+    TFile *infile = TFile::Open(inFilename.c_str(),"UPDATE");
+    if(infile==0 || ! infile->IsOpen()){
+      std::cerr << "--> SCTPostProcess: Input file not opened" <<std::endl;
+      return;
+    }
+    if(infile->IsZombie()){
+      std::cerr << "--> SCTPostProcess: Input file " << inFilename << " cannot be opened" <<std::endl;
+      return;
+    }
+    if(infile->GetSize()<1000){
+      std::cerr << "--> SCTPostProcess: Input file empty " <<std::endl;
+      return;
+    }
+
+    // start postprocessing
+
+    TIter next_run(infile->GetListOfKeys());
+    TKey *key_run(0);
+    key_run = (TKey*)next_run();
+    TDirectory *dir0 = dynamic_cast<TDirectory*> (key_run->ReadObj());
+    if(!dir0) return; // should never fail
+    dir0->cd();
+
+    TString run_dir;
+    const int N_dir=4;
+    const int N_BARREL=4, N_DISKS=9;
+    TString subDetName[N_dir] = {"/GENERAL", "/SCTEC", "/SCTB", "/SCTEA"};
+
+    int times = 1;
+    while (times--) {  // just once
+      run_dir = dir0->GetName();
+      bool do_rno = true;
+      bool do_no = true;
+      bool do_conf = true;
+      bool do_eff = true;
+
+      // setup directories
+
+      TString rno_dir[N_dir];
+      TDirectory *rnodir[N_dir];
+      for(int i=0;i<N_dir;i++){
+	rno_dir[i] = run_dir + "/SCT" + subDetName[i] + "/RatioNoise/";
+	rnodir[i] = (TDirectory*)infile->GetDirectory(rno_dir[i]);
+	if(!rnodir[i]){
+	  std::cerr << "--> SCTPostProcess: directory " << rno_dir[i] << " not found " <<std::endl;
+	  do_rno = false;
+	  //return;
+	}
+      }
+
+      TString no_dir[N_dir];
+      TDirectory *nodir[N_dir];
+      for(int i=0;i<N_dir;i++){
+	if(i==0)no_dir[i] = run_dir + "/SCT" + subDetName[i] + "/noise/";
+	else no_dir[i] = run_dir + "/SCT" + subDetName[i] + "/Noise/";
+	nodir[i] = (TDirectory*)infile->GetDirectory(no_dir[i]);
+	if(!nodir[i]){
+	  std::cerr << "--> SCTPostProcess: directory " << no_dir[i] << " not found " <<std::endl;
+	  do_no = false;
+	  //return;
+	}
+      }
+
+      TString conf_dir[N_dir];
+      TDirectory *confdir[N_dir];
+      for(int i=0;i<N_dir;i++){
+	conf_dir[i] = run_dir + "/SCT" + subDetName[i] + "/Conf/";
+	confdir[i] = (TDirectory*)infile->GetDirectory(conf_dir[i]);
+	if(!confdir[i]){
+	  std::cerr << "--> SCTPostProcess: directory " << conf_dir[i] << " not found " <<std::endl;
+	  do_conf = false;
+	  //return;
+	}
+      }
+
+      TString eff_dir[N_dir];
+      TDirectory *effdir[N_dir];
+      for(int i=0;i<N_dir;i++){
+	eff_dir[i] = run_dir + "/SCT" + subDetName[i] + "/eff/";
+	effdir[i] = (TDirectory*)infile->GetDirectory(eff_dir[i]);
+	if(!effdir[i]){
+	  std::cerr << "--> SCTPostProcess: directory " << eff_dir[i] << " not found " <<std::endl;
+	  do_eff = false;
+	  //return;
+	}
+      }
+
+      int layers[3] = {N_DISKS, N_BARREL, N_DISKS};
+      if (rno_debug) std::cout << "SCT post-processing: efficiency" <<std::endl;
+      // efficiency
+      if(do_eff){
+	TString posi_eff[3] = {"m_eff_", "eff_", "p_eff_"};
+
+	effdir[0]->cd();
+	TH1F *h_EffDist = new TH1F("SctEffDistribution", "SCT Efficiency Distribution", 500, 0, 1);
+	h_EffDist->GetXaxis()->SetTitle("Efficiency");
+	h_EffDist->GetYaxis()->SetTitle("Links");
+
+	TString mapName = "";
+	TProfile2D *tp2dMap = 0;
+
+	for(Long_t i=0;i<3;i++){
+	  effdir[i+1]->cd();
+	  for(Long_t j=0;j<layers[i];j++){
+	    for(Long_t k=0;k<2;k++){
+	      mapName = eff_dir[i+1] + posi_eff[i]+j+"_"+k;
+	      tp2dMap = (TProfile2D*) infile->Get(mapName);
+	      if(!tp2dMap){
+		std::cerr << "--> SCTPostProcess: no such histogram: "<<mapName<<std::endl;
+		continue;
+	      }
+	      for(int xbin=1;xbin<tp2dMap->GetNbinsX()+1;xbin++){
+		for(int ybin=1;ybin<tp2dMap->GetNbinsY()+1;ybin++){
+		  if(tp2dMap->GetBinEntries(tp2dMap->GetBin(xbin,ybin))==0) continue;
+		  h_EffDist->Fill(tp2dMap->GetBinContent(xbin,ybin));
+		}
+	      }
+	    }
+	  }
+	}
+	effdir[0]->cd();
+	h_EffDist->Write("", TObject::kOverwrite);
+      }
+
+      if (rno_debug) std::cout << "SCT post-processing: ratio noise" <<std::endl;
+      // ratio noise
+      if(do_rno){
+	int nModuleEndCap1[9] = {0, 92, 224, 356, 488, 620, 752, 844, 936};
+	int nModuleEndCap2[9] = {92, 224, 356, 488, 620, 752, 844, 936, 988};
+	int nModuleBarrel1[4] = {0, 384, 864, 1440};
+	int nModuleBarrel2[4] = {384, 864, 1440, 2112};
+
+	rnodir[0]->cd();
+	TH1F *hist_all = new TH1F("h_NO","Noise Occupancy for Barrel and Endcaps",500,0.,100.);
+	TH1F *hist_bar = new TH1F("h_NOb","Noise Occupancy for Barrel",500,0.,100.);
+	TH1F *hist_end = new TH1F("h_NOEC","Noise Occupancy for Endcaps",500,0.,100.);
+	TH1F *hist_endc = new TH1F("hist_endcapC","endcap C",500,0.,100.);
+	TH1F *hist_enda = new TH1F("hist_endcapA","endcap A",500,0.,100.);
+
+	TH1F *hist_inner = new TH1F("h_NOEC_Inner","Noise Occupancy Inner Endcap Modules",500,0.,100.);
+	TH1F *hist_middle = new TH1F("h_NOEC_Middle","Noise Occupancy Middle Endcap Modules",500,0.,100.);
+	TH1F *hist_outer = new TH1F("h_NOEC_Outer","Noise Occupancy Outer Endcap Modules",500,0.,100.);
+	TH1F *hist_smiddle = new TH1F("h_NOEC_ShortMiddle","Noise Occupancy Short Middle Endcap Modules",500,0.,100.);
+
+	TH1F *hist_bar_layer[4];
+	for(int i=0;i<4;i++){
+	  rnodir[2]->cd();
+	  hist_bar_layer[i] = new TH1F(Form("h_NOb_layer%d",i),Form("Noise Occupancy Barrel Layer %d",i),500,0.,100.);
+	}
+	TH1F *hist_endC_disk[9];
+	for(int i=0;i<9;i++){
+	  rnodir[1]->cd();
+	  hist_endC_disk[i] = new TH1F(Form("h_NOECC_disk%d",i),Form("Noise Occupancy Endcap C disk %d",i),500,0.,100.);
+	}
+	TH1F *hist_endA_disk[9];
+	for(int i=0;i<9;i++){
+	  rnodir[3]->cd();
+	  hist_endA_disk[i] = new TH1F(Form("h_NOECA_disk%d",i),Form("Noise Occupancy Endcap A disk %d",i),500,0.,100.);
+	}
+
+	rnodir[0]->cd();
+	TString noSideHitHist = rno_dir[0] + "h_NZ1_vs_modnum";
+	TString oneSideHitHist = rno_dir[0] + "h_N11_vs_modnum";
+	TH1F *h_nosidehit = (TH1F*)infile->Get(noSideHitHist);
+	TH1F *h_onesidehit = (TH1F*)infile->Get(oneSideHitHist);
+	if(!h_nosidehit || !h_onesidehit){
+	  std::cerr << "--> SCTPostProcess: no such histograms " << noSideHitHist << "and/or" << oneSideHitHist <<std::endl;
+	}
+
+	for(int i=0;i<4088;i++){
+	  int nosidehit = h_nosidehit ? h_nosidehit->GetBinContent(i+1): -999;
+	  int onesidehit = h_onesidehit ? h_onesidehit->GetBinContent(i+1): -999;
+	  if(nosidehit>0 && onesidehit>-999){
+	    double Rval = (double)onesidehit/(double)nosidehit;
+	    double NOval = 1./768.*Rval/(2.+Rval);
+	    if(NOval!=0){
+	      hist_all->Fill(100000.*NOval);
+	      if(i>=0 && i<988){
+		hist_end->Fill(100000.*NOval);
+		hist_endc->Fill(100000.*NOval);
+		for(int j=0;j<9;j++){
+		  if(i>=nModuleEndCap1[j] && i<nModuleEndCap2[j]){
+		    hist_endC_disk[j]->Fill(100000.*NOval);
+		    if(i-nModuleEndCap1[j]<52){
+		      hist_outer->Fill(100000.*NOval);
+		    }else if(i-nModuleEndCap1[j]>=52 && i-nModuleEndCap1[j]<92){
+		      if(i<844){
+			hist_middle->Fill(100000.*NOval);
+		      }else if(i>=844){
+			hist_smiddle->Fill(100000.*NOval);
+		      }
+		    }else if(i-nModuleEndCap1[j]>=92 && i-nModuleEndCap1[j]<132){
+		      hist_inner->Fill(100000.*NOval);
+		    }
+		  }
+		}
+	      }else if(i>=988 && i<3100){
+		hist_bar->Fill(100000.*NOval);
+		for(int j=0;j<4;j++){
+		  if(i>=nModuleBarrel1[j]+988 && i<nModuleBarrel2[j]+988){
+		    hist_bar_layer[j]->Fill(100000*NOval);
+		  }
+		}
+	      }else if(i>=3100 && i<4088){
+		hist_end->Fill(100000.*NOval);
+		hist_enda->Fill(100000.*NOval);
+		for(int j=0;j<9;j++){
+		  if(i>=nModuleEndCap1[j]+3100 && i<nModuleEndCap2[j]+3100){
+		    hist_endA_disk[j]->Fill(100000*NOval);
+		    if(i-nModuleEndCap1[j]-3100<52){
+		      hist_outer->Fill(100000.*NOval);
+		    }else if(i-nModuleEndCap1[j]-3100>=52 && i-nModuleEndCap1[j]-3100<92){
+		      if(i-3100<844){
+			hist_middle->Fill(100000.*NOval);
+		      }else if(i-3100>=844){
+			hist_smiddle->Fill(100000.*NOval);
+		      }
+		    }else if(i-nModuleEndCap1[j]-3100>=92 && i-nModuleEndCap1[j]-3100<132){
+		      hist_inner->Fill(100000.*NOval);
+		    }
+		  }
+		}
+	      }
+	    }
+	  }
+	}
+	hist_all->SetBinContent(hist_all->GetNbinsX(),hist_all->GetBinContent(hist_all->GetNbinsX() ) + hist_all->GetBinContent(hist_all->GetNbinsX() +1));
+	hist_bar->SetBinContent(hist_bar->GetNbinsX(),hist_bar->GetBinContent(hist_bar->GetNbinsX() ) + hist_bar->GetBinContent(hist_bar->GetNbinsX() +1));
+	hist_end->SetBinContent(hist_end->GetNbinsX(),hist_end->GetBinContent(hist_end->GetNbinsX() ) + hist_end->GetBinContent(hist_end->GetNbinsX() +1));
+
+	rnodir[0]->cd();
+	hist_all->Write("", TObject::kOverwrite);
+	hist_bar->Write("", TObject::kOverwrite);
+	hist_end->Write("", TObject::kOverwrite);
+	hist_inner->Write("", TObject::kOverwrite);
+	hist_middle->Write("", TObject::kOverwrite);
+	hist_outer->Write("", TObject::kOverwrite);
+	hist_smiddle->Write("", TObject::kOverwrite);
+	for(int i=0;i<9;i++){
+	  rnodir[1]->cd();
+	  hist_endC_disk[i]->Write("", TObject::kOverwrite);
+	}
+	for(int i=0;i<4;i++){
+	  rnodir[2]->cd();
+	  hist_bar_layer[i]->Write("", TObject::kOverwrite);
+	}
+	for(int i=0;i<9;i++){
+	  rnodir[3]->cd();
+	  hist_endA_disk[i]->Write("", TObject::kOverwrite);
+	}
+      }
+
+      if (rno_debug) std::cout << "SCT post-processing: noise occupancy" <<std::endl;
+      // noise occupancy
+      if(do_no){
+	TString posi_notrg[3] = {"/noiseoccupancymaptriggerECm_", "/noiseoccupancymaptrigger_", "/noiseoccupancymaptriggerECp_"};
+	TString posi_no[3] = {"/noiseoccupancymapECm_", "/noiseoccupancymap_", "/noiseoccupancymapECp_"};
+	TString posi_hotrg[3] = {"/hitoccupancymaptriggerECm_", "/hitoccupancymaptrigger_", "/hitoccupancymaptriggerECp_"};
+	TString posi_ho[3] = {"/hitoccupancymapECm_", "/hitoccupancymap_", "/hitoccupancymapECp_"};
+
+	TString tmpName = no_dir[0]+"SCTNOdistributionTrigger";
+	TString NO_title = "";
+	nodir[0]->cd();
+	TH1F* h_SCTNOTrigger = 0;
+	if(!infile->Get(tmpName)){
+	  NO_title = "NO Distribution for the SCT for EMPTY trigger";
+	}
+	else{
+	  NO_title = ((TH1F*)infile->Get(tmpName))->GetTitle();
+	}
+	h_SCTNOTrigger = new TH1F("SCTNOdistributionTrigger", NO_title, 8000,1e-1 ,20000);
+	h_SCTNOTrigger->GetXaxis()->SetTitle("Noise Occupancy [10^{-5}]");
+	h_SCTNOTrigger->GetYaxis()->SetTitle("Modules");
+
+	TH1F* h_SCTNO = new TH1F("SCTNOdistribution", "NO Distribution for the SCT", 8000,1e-1 ,20000);
+	h_SCTNO->GetXaxis()->SetTitle("Noise Occupancy [10^{-5}]");
+	h_SCTNO->GetYaxis()->SetTitle("Modules");
+
+	NO_title.ReplaceAll("SCT", "Barrel");
+	TH1F* h_barrelNOTrigger = new TH1F("barrelNOdistributionTrigger", NO_title, 8000,1e-1 ,20000);
+	h_barrelNOTrigger->GetXaxis()->SetTitle("Noise Occupancy [10^{-5}]");
+	h_barrelNOTrigger->GetYaxis()->SetTitle("Modules");
+	TH1F* h_barrelNO = new TH1F("barrelNOdistribution", "NO Distribution for the Barrel", 8000,1e-1 ,20000);
+	h_barrelNO->GetXaxis()->SetTitle("Noise Occupancy [10^{-5}]");
+	h_barrelNO->GetYaxis()->SetTitle("Modules");
+
+	NO_title.ReplaceAll("Barrel", "EndCap A");
+	TH1F* h_ECANOTrigger = new TH1F("ECANOdistributionTrigger", NO_title, 8000,1e-1 ,20000);
+	h_ECANOTrigger->GetXaxis()->SetTitle("Noise Occupancy [10^{-5}]");
+	h_ECANOTrigger->GetYaxis()->SetTitle("Modules");
+	TH1F* h_ECANO = new TH1F("ECANOdistribution", "NO Distribution for the EndCap A", 8000,1e-1 ,20000);
+	h_ECANO->GetXaxis()->SetTitle("Noise Occupancy [10^{-5}]");
+	h_ECANO->GetYaxis()->SetTitle("Modules");
+
+	NO_title.ReplaceAll("EndCap A", "EndCap C");
+	TH1F* h_ECCNOTrigger = new TH1F("ECCNOdistributionTrigger", NO_title, 8000,1e-1 ,20000);
+	h_ECCNOTrigger->GetXaxis()->SetTitle("Noise Occupancy [10^{-5}]");
+	h_ECCNOTrigger->GetYaxis()->SetTitle("Modules");
+	TH1F* h_ECCNO = new TH1F("ECCNOdistribution", "NO Distribution for the EndCap C", 8000,1e-1 ,20000);
+	h_ECCNO->GetXaxis()->SetTitle("Noise Occupancy [10^{-5}]");
+	h_ECCNO->GetYaxis()->SetTitle("Modules");
+
+	tmpName = no_dir[0]+"SCTHOdistributionTrigger";
+	TString HO_title = "";
+	nodir[0]->cd();
+	TH1F* h_SCTHOTrigger = 0;
+	if(!infile->Get(tmpName)){
+	  HO_title = "HO Distribution for the SCT for EMPTY trigger";
+	}
+	else{
+	  HO_title = ((TH1F*)infile->Get(tmpName))->GetTitle();
+	}
+	h_SCTHOTrigger = new TH1F("SCTHOdistributionTrigger", HO_title, 8000,1e-1 ,20000);
+	h_SCTHOTrigger->GetXaxis()->SetTitle("Noise Occupancy [10^{-5}]");
+	h_SCTHOTrigger->GetYaxis()->SetTitle("Modules");
+
+	TH1F* h_SCTHO = new TH1F("SCTHOdistribution", "HO Distribution for the SCT", 8000,1e-1 ,20000);
+	h_SCTHO->GetXaxis()->SetTitle("Noise Occupancy [10^{-5}]");
+	h_SCTHO->GetYaxis()->SetTitle("Modules");
+
+	HO_title.ReplaceAll("SCT", "Barrel");
+	TH1F* h_barrelHOTrigger = new TH1F("barrelHOdistributionTrigger", HO_title, 8000,1e-1 ,20000);
+	h_barrelHOTrigger->GetXaxis()->SetTitle("Hit Occupancy [10^{-5}]");
+	h_barrelHOTrigger->GetYaxis()->SetTitle("Modules");
+	TH1F* h_barrelHO = new TH1F("barrelHOdistribution", "HO Distribution for the Barrel", 8000,1e-1 ,20000);
+	h_barrelHO->GetXaxis()->SetTitle("Hit Occupancy [10^{-5}]");
+	h_barrelHO->GetYaxis()->SetTitle("Modules");
+
+	HO_title.ReplaceAll("Barrel", "EndCap A");
+	TH1F* h_ECAHOTrigger = new TH1F("ECAHOdistributionTrigger", HO_title, 8000,1e-1 ,20000);
+	h_ECAHOTrigger->GetXaxis()->SetTitle("Hit Occupancy [10^{-5}]");
+	h_ECAHOTrigger->GetYaxis()->SetTitle("Modules");
+	TH1F* h_ECAHO = new TH1F("ECAHOdistribution", "HO Distribution for the EndCap A", 8000,1e-1 ,20000);
+	h_ECAHO->GetXaxis()->SetTitle("Hit Occupancy [10^{-5}]");
+	h_ECAHO->GetYaxis()->SetTitle("Modules");
+
+	HO_title.ReplaceAll("EndCap A", "EndCap C");
+	TH1F* h_ECCHOTrigger = new TH1F("ECCHOdistributionTrigger", HO_title, 8000,1e-1 ,20000);
+	h_ECCHOTrigger->GetXaxis()->SetTitle("Hit Occupancy [10^{-5}]");
+	h_ECCHOTrigger->GetYaxis()->SetTitle("Modules");
+	TH1F* h_ECCHO = new TH1F("ECCHOdistribution", "HO Distribution for the EndCap C", 8000,1e-1 ,20000);
+	h_ECCHO->GetXaxis()->SetTitle("Hit Occupancy [10^{-5}]");
+	h_ECCHO->GetYaxis()->SetTitle("Modules");
+
+	TString mapName = "";
+	TProfile2D *tp2dMap = 0;
+
+	for(Long_t i=0;i<3;i++){
+	  nodir[i+1]->cd();
+	  for(Long_t j=0;j<layers[i];j++){
+	    for(Long_t k=0;k<2;k++){
+	      mapName = no_dir[i+1] + posi_no[i]+j+"_"+k;
+	      tp2dMap = (TProfile2D*) infile->Get(mapName);
+	      if(!tp2dMap){
+		std::cerr << "--> SCTPostProcess: no such histogram: "<<mapName<<std::endl;
+		continue;
+	      }
+	      for(int xbin=1;xbin<tp2dMap->GetNbinsX()+1;xbin++){
+		for(int ybin=1;ybin<tp2dMap->GetNbinsY()+1;ybin++){
+		  if(tp2dMap->GetBinEntries(tp2dMap->GetBin(xbin,ybin))==0) continue;
+		  h_SCTNO->Fill(tp2dMap->GetBinContent(xbin,ybin));
+		  if(i==0) h_ECCNO->Fill(tp2dMap->GetBinContent(xbin,ybin));
+		  if(i==1) h_barrelNO->Fill(tp2dMap->GetBinContent(xbin,ybin));
+		  if(i==2) h_ECANO->Fill(tp2dMap->GetBinContent(xbin,ybin));
 		}
+	      }
+	    }
+	    for(Long_t k=0;k<2;k++){
+	      mapName = no_dir[i+1] + posi_notrg[i]+j+"_"+k;
+	      tp2dMap = (TProfile2D*) infile->Get(mapName);
+	      if(!tp2dMap){
+		std::cerr << "--> SCTPostProcess: no such histogram: "<<mapName<<std::endl;
+		continue;
+	      }
+	      for(int xbin=1;xbin<tp2dMap->GetNbinsX()+1;xbin++){
+		for(int ybin=1;ybin<tp2dMap->GetNbinsY()+1;ybin++){
+		  if(tp2dMap->GetBinEntries(tp2dMap->GetBin(xbin,ybin))==0) continue;
+		  h_SCTNOTrigger->Fill(tp2dMap->GetBinContent(xbin,ybin));
+		  if(i==0) h_ECCNOTrigger->Fill(tp2dMap->GetBinContent(xbin,ybin));
+		  if(i==1) h_barrelNOTrigger->Fill(tp2dMap->GetBinContent(xbin,ybin));
+		  if(i==2) h_ECANOTrigger->Fill(tp2dMap->GetBinContent(xbin,ybin));
+		}
+	      }
+	    }
+	    for(Long_t k=0;k<2;k++){
+	      mapName = no_dir[i+1] + posi_ho[i]+j+"_"+k;
+	      tp2dMap = (TProfile2D*) infile->Get(mapName);
+	      if(!tp2dMap){
+		std::cerr << "--> SCTPostProcess: no such histogram: "<<mapName<<std::endl;
+		continue;
+	      }
+	      for(int xbin=1;xbin<tp2dMap->GetNbinsX()+1;xbin++){
+		for(int ybin=1;ybin<tp2dMap->GetNbinsY()+1;ybin++){
+		  if(tp2dMap->GetBinEntries(tp2dMap->GetBin(xbin,ybin))==0) continue;
+		  h_SCTHO->Fill(tp2dMap->GetBinContent(xbin,ybin));
+		  if(i==0) h_ECCHO->Fill(tp2dMap->GetBinContent(xbin,ybin));
+		  if(i==1) h_barrelHO->Fill(tp2dMap->GetBinContent(xbin,ybin));
+		  if(i==2) h_ECAHO->Fill(tp2dMap->GetBinContent(xbin,ybin));
+		}
+	      }
+	    }
+	    for(Long_t k=0;k<2;k++){
+	      mapName = no_dir[i+1] + posi_hotrg[i]+j+"_"+k;
+	      tp2dMap = (TProfile2D*) infile->Get(mapName);
+	      if(!tp2dMap){
+		std::cerr << "--> SCTPostProcess: no such histogram: "<<mapName<<std::endl;
+		continue;
+	      }
+	      for(int xbin=1;xbin<tp2dMap->GetNbinsX()+1;xbin++){
+		for(int ybin=1;ybin<tp2dMap->GetNbinsY()+1;ybin++){
+		  if(tp2dMap->GetBinEntries(tp2dMap->GetBin(xbin,ybin))==0) continue;
+		  h_SCTHOTrigger->Fill(tp2dMap->GetBinContent(xbin,ybin));
+		  if(i==0) h_ECCHOTrigger->Fill(tp2dMap->GetBinContent(xbin,ybin));
+		  if(i==1) h_barrelHOTrigger->Fill(tp2dMap->GetBinContent(xbin,ybin));
+		  if(i==2) h_ECAHOTrigger->Fill(tp2dMap->GetBinContent(xbin,ybin));
+		}
+	      }
+	    }
+	  }
+	}
+
+	nodir[0]->cd();
+
+	h_SCTNOTrigger->Write("", TObject::kOverwrite);
+	h_SCTNO->Write("", TObject::kOverwrite);
+	h_barrelNOTrigger->Write("", TObject::kOverwrite);
+	h_barrelNO->Write("", TObject::kOverwrite);
+	h_ECCNOTrigger->Write("", TObject::kOverwrite);
+	h_ECCNO->Write("", TObject::kOverwrite);
+	h_ECANOTrigger->Write("", TObject::kOverwrite);
+	h_ECANO->Write("", TObject::kOverwrite);
+
+	h_SCTHOTrigger->Write("", TObject::kOverwrite);
+	h_SCTHO->Write("", TObject::kOverwrite);
+	h_barrelHOTrigger->Write("", TObject::kOverwrite);
+	h_barrelHO->Write("", TObject::kOverwrite);
+	h_ECCHOTrigger->Write("", TObject::kOverwrite);
+	h_ECCHO->Write("", TObject::kOverwrite);
+	h_ECAHOTrigger->Write("", TObject::kOverwrite);
+	h_ECAHO->Write("", TObject::kOverwrite);
+      }
+
+      if (rno_debug) std::cout << "SCT post-processing: Configuration" <<std::endl;
+      // Configuration
+      if(do_conf){
+	const int N_hist = 3;
+	double Threshold[N_hist] = {0.7,0.1,150};
+	TString name_hist[N_hist][N_dir] = {
+	  {"","/errors/Errors/SCT_NumberOfErrorsEC_", "/errors/Errors/SCT_NumberOfErrorsB_", "/errors/Errors/SCT_NumberOfErrorsEA_"},
+	  {"","/eff/ineffm_", "/eff/ineff_", "/eff/ineffp_"},
+	  {"","/Noise/noiseoccupancymaptriggerECm_", "/Noise/noiseoccupancymaptrigger_", "/Noise/noiseoccupancymaptriggerECp_"}
+	};
+	int countM[N_hist][N_dir];
+	for (int ibc = 0; ibc != N_dir; ++ibc) { // region
+	  for(int ih = 0; ih != N_hist; ++ih) { // hist
+	    countM[ih][ibc]=0;
+	  }
+	}
+
+	TH2F* hist0 = 0;
+	TH2F* hist1 = 0;
+	TString mapName = "";
+
+	confdir[0]->cd();
+	for (int ibc = 1; ibc != N_dir; ++ibc) { // region(B=1,ECA=2,ECC=3)
+	  for (int lyr = 0; lyr != layers[ibc-1]; ++lyr) { // layer
+	    for (int ih = 0; ih!= N_hist; ++ih) { // hist
+	      hist0 = 0; hist1 = 0;
+	      mapName =  run_dir + "/SCT" + subDetName[ibc] + name_hist[ih][ibc] + TString::Itoa(lyr,10) + "_0";
+	      hist0 = (TH2F*)infile->Get(mapName);
+	      mapName =  run_dir + "/SCT" + subDetName[ibc] + name_hist[ih][ibc] + TString::Itoa(lyr,10) + "_1";
+	      hist1 = (TH2F*)infile->Get(mapName);
+	      if(!hist0 || !hist1){
+		std::cerr << "--> SCTPostProcess: no such histogram: " << mapName + " or _0" <<std::endl;
+		continue;
+	      }
+	      int xbins = hist0->GetNbinsX() + 1;
+	      int ybins = hist0->GetNbinsY() + 1;
+	      for (int xb = 1; xb != xbins; ++xb) {
+		for (int yb = 1; yb != ybins; ++yb) {
+		  if (hist0->GetBinContent(xb,yb) > Threshold[ih] || hist1->GetBinContent(xb,yb) > Threshold[ih]){
+		    countM[ih][0]++;
+		    countM[ih][ibc]++;
+		  }
+		}
+	      }
+	    }
+	  }
+	}
+
+	dir0->cd();
+	TString conftitleNew[N_dir] = {
+	  "SCTConf", "SCTConfEndcapC", "SCTConfBarrel", "SCTConfEndcapA"
+	};
+	TString conflabel[N_dir] = {
+	  "Num of Problematic Module in All Region", "Num of Problematic Module in EndcapC",
+	  "Num of Problematic Module in Barrel", "Num of Problematic Module in EndcapA"
+	};
+	TH1F *ConfNew[N_dir];
+	for(int i=0;i<N_dir;i++){
+	  TH1F* h_tmp = (TH1F*)infile->Get(conf_dir[i] + conftitleNew[i]);
+	  confdir[i]->cd();
+	  ConfNew[i] = new TH1F(conftitleNew[i]+"New", conflabel[i], 5, -0.5, 4.5);
+	  ConfNew[i]->GetXaxis()->SetBinLabel(1,"Flagged Links");
+	  if(h_tmp) ConfNew[i]->SetBinContent(1,h_tmp->GetBinContent(2));
+	  if(h_tmp) ConfNew[i]->SetBinError(1,TMath::Sqrt(h_tmp->GetBinContent(2)));
+	  ConfNew[i]->GetXaxis()->SetBinLabel(2,"Masked Links");
+	  if(h_tmp) ConfNew[i]->SetBinContent(2,h_tmp->GetBinContent(3));
+	  if(h_tmp) ConfNew[i]->SetBinError(2,TMath::Sqrt(h_tmp->GetBinContent(3)));
+	  ConfNew[i]->GetXaxis()->SetBinLabel(3,"Errors");
+	  ConfNew[i]->SetBinContent(3,countM[0][i]);
+	  ConfNew[i]->SetBinError(3,TMath::Sqrt(countM[0][i]));
+	  ConfNew[i]->GetXaxis()->SetBinLabel(4,"Inefficient");
+	  ConfNew[i]->SetBinContent(4,countM[1][i]);
+	  ConfNew[i]->SetBinError(4,TMath::Sqrt(countM[1][i]));
+	  ConfNew[i]->GetXaxis()->SetBinLabel(5,"Noisy");
+	  ConfNew[i]->SetBinContent(5,countM[2][i]);
+	  ConfNew[i]->SetBinError(5,TMath::Sqrt(countM[2][i]));
+	  ConfNew[i]->Write("", TObject::kOverwrite);
+	}
+      }
+
+      if (rno_debug) std::cout<<"Writing Histograms for SCT..."<<std::endl;
+      infile->Write();
+
+    }//while
+    //infile->Close();
+  }
 
 }//namespace
diff --git a/DataQuality/ZLumiScripts/CMakeLists.txt b/DataQuality/ZLumiScripts/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..b658acb5bba60af166e5ece565628c9b784817fd
--- /dev/null
+++ b/DataQuality/ZLumiScripts/CMakeLists.txt
@@ -0,0 +1,15 @@
+################################################################################
+# Package: ZLumiScripts
+################################################################################
+
+# Declare the package name:
+atlas_subdir( ZLumiScripts )
+
+# Declare the package's dependencies:
+#atlas_depends_on_subdirs( )
+
+# External dependencies:
+find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
+
+# Install files from the package:
+atlas_install_scripts( scripts/*.py )
diff --git a/DataQuality/ZLumiScripts/scripts/dqt_zlumi_alleff_HIST.py b/DataQuality/ZLumiScripts/scripts/dqt_zlumi_alleff_HIST.py
new file mode 100755
index 0000000000000000000000000000000000000000..ecb4f90b5e0d2951ee40585e766dd2da7ca9b252
--- /dev/null
+++ b/DataQuality/ZLumiScripts/scripts/dqt_zlumi_alleff_HIST.py
@@ -0,0 +1,229 @@
+#!/usr/bin/env python
+# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration                   
+import sys, os, glob
+import ROOT
+
+ROOT.gStyle.SetOptStat(0)
+
+#ACCEPTANCE = 3.173927e-01
+ACCEPTANCE = 3.323224e-01
+
+import argparse
+parser = argparse.ArgumentParser()
+parser.add_argument('infile', type=str, help='input HIST file')
+parser.add_argument('--out', type=str, help='output ROOT file')
+parser.add_argument('--plotdir', type=str, help='Directory to dump plots',
+                    default='plots')
+parser.add_argument('--debug', action='store_true', help='Be verbose in output')
+parser.add_argument('--mode', type=str, help='Zee or Zmumu')
+
+
+args = parser.parse_args()
+
+infilename = args.infile
+infile = ROOT.TFile.Open(infilename, 'READ')
+
+runmode = args.mode
+print 'Running in', runmode, 'mode'
+
+
+runname = None
+for k in infile.GetListOfKeys():
+    if k.GetName().startswith('run_'):
+        runname = k.GetName()
+        break
+if not runname:
+    print 'Cannot find run directory in input file'
+    sys.exit(1)
+else:
+    print 'Found runname', runname
+
+lbdirs = []
+for k in infile.Get(runname).GetListOfKeys():
+    if k.GetName().startswith('lb_'):
+        lbdirs.append(k.GetName())
+
+print 'Now to dump'
+lbnums = sorted([int(_[3:]) for _ in lbdirs])
+
+effcyt = ROOT.TH1F('effcyt', 'Trigger efficiency', lbnums[-1]-lbnums[0]+1, lbnums[0]-0.5, 
+               lbnums[-1]+0.5)
+effcyr = ROOT.TH1F('effcyr', 'Loose muon reco efficiency', lbnums[-1]-lbnums[0]+1, lbnums[0]-0.5, 
+               lbnums[-1]+0.5)
+effcya = ROOT.TH1F('effcya', 'Combined acc x efficiency', lbnums[-1]-lbnums[0]+1, lbnums[0]-0.5, 
+               lbnums[-1]+0.5)
+effcydir = ROOT.TH1F('effcydir', 'Direct acc x efficiency', lbnums[-1]-lbnums[0]+1, lbnums[0]-0.5, 
+               lbnums[-1]+0.5)
+
+from array import array
+fout = ROOT.TFile(args.out if args.out else '%s_all.root' % runname[4:], 'RECREATE')
+o_run = array('I', [0])
+o_lb = array('I', [0])
+o_lbwhen = array('d', [0., 0.])
+o_z_one = array('f', [0.])
+o_z_two = array('f', [0.])
+o_trigeff = array('f', [0.])
+o_trigeffstat = array('f', [0.])
+o_recoeff = array('f', [0.])
+o_recoeffstat = array('f', [0.])
+o_alleff = array('f', [0.])
+o_alleffstat = array('f', [0.])
+o_ae = array('f', [0.])
+o_aestat = array('f', [0.])
+tl = ROOT.TTree( 'lumitree', 'Luminosity tree' )
+tl.Branch('run', o_run, 'run/i')
+tl.Branch('lb', o_lb, 'lb/i')
+tl.Branch('lbwhen', o_lbwhen, 'lbwhen[2]/D')
+tl.Branch('z_one', o_z_one, 'z_one/F')
+tl.Branch('z_two', o_z_two, 'z_two/F')
+tl.Branch('trigeff', o_trigeff, 'trigeff/F')
+tl.Branch('trigeffstat', o_trigeffstat, 'trigeffstat/F')
+tl.Branch('recoeff', o_recoeff, 'recoeff/F')
+tl.Branch('recoeffstat', o_recoeffstat, 'recoeffstat/F')
+tl.Branch('alleff', o_alleff, 'alleff/F')
+tl.Branch('alleffstat', o_alleffstat, 'alleffstat/F')
+tl.Branch('ae', o_ae, 'ae/F')
+tl.Branch('aestat', o_aestat, 'aestat/F')
+
+
+from DQUtils import fetch_iovs
+#rset=set(_[0] for _ in rlb)
+#print rset
+lblb = fetch_iovs("LBLB", runs=int(runname[4:])).by_run
+for lb in sorted(lbdirs):
+    if runmode == "Zee":
+        h = infile.Get('%s/%s/GLOBAL/DQTGlobalWZFinder/m_eltrigtp_matches' % (runname, lb))
+        hmo = infile.Get('%s/%s/GLOBAL/DQTGlobalWZFinder/m_ele_tight_good_os' % (runname, lb))
+        hms = infile.Get('%s/%s/GLOBAL/DQTGlobalWZFinder/m_ele_tight_good_ss' % (runname, lb))
+        hno = infile.Get('%s/%s/GLOBAL/DQTGlobalWZFinder/m_ele_tight_bad_os' % (runname, lb))
+        hns = infile.Get('%s/%s/GLOBAL/DQTGlobalWZFinder/m_ele_tight_bad_ss' % (runname, lb))
+    if runmode == "Zmumu":
+        h = infile.Get('%s/%s/GLOBAL/DQTGlobalWZFinder/m_mutrigtp_matches' % (runname, lb))
+        hmo = infile.Get('%s/%s/GLOBAL/DQTGlobalWZFinder/m_muloosetp_match_os' % (runname, lb))
+        hms = infile.Get('%s/%s/GLOBAL/DQTGlobalWZFinder/m_muloosetp_match_ss' % (runname, lb))
+        hno = infile.Get('%s/%s/GLOBAL/DQTGlobalWZFinder/m_muloosetp_nomatch_os' % (runname, lb))
+        hns = infile.Get('%s/%s/GLOBAL/DQTGlobalWZFinder/m_muloosetp_nomatch_ss' % (runname, lb))
+    lbnum = int(lb[3:])
+    yld = (h[2], h[3])
+    ylderr = (h.GetBinError(2), h.GetBinError(3))
+    #print yld, ylderr
+    A, B = yld
+    o_z_one[0], o_z_two[0] = yld
+    if B == 0: continue
+    eff = 1./(float(A)/B/2.+1.)
+    inverrsq = ((1/2./B)*ylderr[0])**2+((A/2./B**2)*ylderr[1])**2
+    o_trigeff[0] = eff
+    o_trigeffstat[0] = (inverrsq**.5)*(eff**2)
+    o_run[0], o_lb[0] = int(runname[4:]), lbnum
+    try:
+        iov = lblb[int(runname[4:])][lbnum-1]
+        o_lbwhen[0], o_lbwhen[1] = iov.StartTime/1e9, iov.EndTime/1e9
+    except Exception, e:
+        o_lbwhen[0], o_lbwhen[1] = 0, 0
+    effcyt.SetBinContent(lbnum-lbnums[0]+1, eff)
+    effcyt.SetBinError(lbnum-lbnums[0]+1, o_trigeffstat[0])
+
+    def extract(histogram):
+        dbl = ROOT.Double()
+        rv1 = histogram.IntegralAndError(21, 30, dbl)
+        return (rv1, float(dbl))
+    matchos, matchoserr = extract(hmo)
+    matchss, matchsserr = extract(hms)
+    nomatchos, nomatchoserr = extract(hno)
+    nomatchss, nomatchsserr = extract(hns)
+    if args.debug:
+        print lb
+        print ' ->', matchos, matchoserr
+        print ' ->', matchss, matchsserr
+        print ' ->', nomatchos, nomatchoserr
+        print ' ->', nomatchss, nomatchsserr
+    A = float(matchos-matchss)
+    Aerr = (matchoserr**2+matchsserr**2)**.5
+    B = float(nomatchos-nomatchss)
+    Berr = (nomatchoserr**2+nomatchsserr**2)**.5
+    if Berr == 0: Berr = 1.
+    if A == 0 or B/A == -1: 
+        eff = 1.
+        inverrsq = 1.
+    else:
+        eff = 1./(1.+B/A)
+        inverrsq = ((-B/A**2)*Aerr)**2+((1./A)*Berr)**2
+    o_recoeff[0] = eff
+    o_recoeffstat[0] = (inverrsq**.5)*(eff**2)
+    effcyr.SetBinContent(lbnum-lbnums[0]+1, eff)
+    effcyr.SetBinError(lbnum-lbnums[0]+1, o_recoeffstat[0])
+
+    o_ae[0] = ACCEPTANCE*(1-(1-o_trigeff[0])**2)*(o_recoeff[0])**2
+    o_aestat[0] = ACCEPTANCE*((o_recoeff[0]**2*2*(1-o_trigeff[0])*o_trigeffstat[0])**2+(2*o_recoeff[0]*(1-(1-o_trigeff[0])**2)*o_recoeffstat[0])**2)**.5
+    o_alleff[0] = (1-(1-o_trigeff[0])**2)*(o_recoeff[0])**2
+    o_alleffstat[0] = ((o_recoeff[0]**2*2*(1-o_trigeff[0])*o_trigeffstat[0])**2+(2*o_recoeff[0]*(1-(1-o_trigeff[0])**2)*o_recoeffstat[0])**2)**.5
+    effcya.SetBinContent(lbnum-lbnums[0]+1, o_ae[0])
+    effcya.SetBinError(lbnum-lbnums[0]+1, o_aestat[0])
+
+
+    tl.Fill()
+tl.Write()
+print 'Done'
+
+c1 = ROOT.TCanvas()
+effcya.SetMarkerStyle(21)
+effcya.SetMarkerColor(ROOT.kBlue)
+effcya.GetYaxis().SetRangeUser(0.25,0.31)
+effcya.Draw('PE')
+c1.Print(os.path.join(args.plotdir, '%s_combined_efficiency.eps' % runname[4:]))
+fout.WriteTObject(effcya)
+c1.Clear()
+effcyt.SetMarkerStyle(21)
+effcyt.SetMarkerColor(ROOT.kBlue)
+effcyt.GetYaxis().SetRangeUser(0.66,0.86)
+effcyt.Draw('PE')
+c1.Print(os.path.join(args.plotdir, '%s_trigger_efficiency.eps' % runname[4:]))
+fout.WriteTObject(effcyt)
+c1.Clear()
+effcyr.SetMarkerStyle(21)
+effcyr.SetMarkerColor(ROOT.kBlue)
+effcyr.GetYaxis().SetRangeUser(0.9,1.0)
+effcyr.Draw('PE')
+c1.Print(os.path.join(args.plotdir, '%s_reco_efficiency.eps' % runname[4:]))
+fout.WriteTObject(effcyr)
+fout.Close()
+
+if runmode == "Zee":
+    sumweights = infile.Get('%s/GLOBAL/DQTDataFlow/m_sumweights' % runname)
+    ctr = infile.Get('%s/GLOBAL/DQTGlobalWZFinder/m_Z_Counter_el' % runname)
+if runmode == "Zmumu":
+    sumweights = infile.Get('%s/GLOBAL/DQTDataFlow/m_sumweights' % runname)
+    ctr = infile.Get('%s/GLOBAL/DQTGlobalWZFinder/m_Z_Counter_mu' % runname)
+if sumweights:
+    for ibin in xrange(1,sumweights.GetNbinsX()+1):
+        o_lb[0] = int(sumweights.GetBinCenter(ibin))
+        ctrbin = ctr.FindBin(o_lb[0])
+        print ibin, o_lb[0], sumweights[ibin], ctr[ctrbin]
+        if sumweights[ibin] == 0: continue
+        p = ctr[ctrbin]/sumweights[ibin]
+        o_alleff[0]=p
+        try:
+            o_alleffstat[0]=(p*(1-p))**.5*(sumweights.GetBinError(ibin)/sumweights[ibin])
+        except ValueError:
+            o_alleffstat[0]=(sumweights.GetBinError(ibin)/sumweights[ibin])
+        effcydir.SetBinContent(effcydir.FindBin(o_lb[0]), p)
+        effcydir.SetBinError(effcydir.FindBin(o_lb[0]), o_alleffstat[0])
+
+    effcya.GetYaxis().SetRangeUser(0.27,0.31)
+    effcya.Draw('PE')
+    effcydir.SetMarkerStyle(20)
+    effcydir.SetMarkerColor(ROOT.kRed)
+    effcydir.Draw('SAME,PE')
+    leg=ROOT.TLegend(0.65, 0.7, 0.89, 0.89)
+    leg.AddEntry(effcya, 'Predicted A#epsilon', 'PE')
+    leg.AddEntry(effcydir, 'Actual A#epsilon', 'PE')
+    leg.Draw()
+    c1.Print(os.path.join(args.plotdir, '%s_tp_comparison.eps' % runname[4:]))
+
+    effcyrat=effcydir.Clone()
+    effcyrat.Divide(effcya)
+    effcyrat.SetTitle('MC Correction Factor')
+    effcyrat.SetXTitle('<#mu>')
+    effcyrat.Draw('PE')
+    effcyrat.Fit('pol1')
+    c1.Print(os.path.join(args.plotdir, '%s_tp_correction.eps' % runname[4:]))
diff --git a/DataQuality/ZLumiScripts/scripts/dqt_zlumi_combine_lumi.py b/DataQuality/ZLumiScripts/scripts/dqt_zlumi_combine_lumi.py
new file mode 100755
index 0000000000000000000000000000000000000000..9cefac39d98184e18c11aab1d3bb55dac8afad58
--- /dev/null
+++ b/DataQuality/ZLumiScripts/scripts/dqt_zlumi_combine_lumi.py
@@ -0,0 +1,135 @@
+#!/usr/bin/env python
+# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration                    
+import ROOT
+import sys
+
+import argparse
+parser = argparse.ArgumentParser()
+parser.add_argument('recofile', type=str, help='File with per-LB yields')
+parser.add_argument('efffile', type=str, help='File with efficiencies')
+parser.add_argument('outfile', type=str, help='Output file')
+parser.add_argument('--nlb', type=int, help='# of LBs to combine',
+                    default=20)
+args = parser.parse_args()
+
+recozfname = args.recofile
+effzfname = args.efffile
+outfname = args.outfile
+
+LUMIBLOCKS = args.nlb
+#ACCEPTANCE = 3.173927e-01
+ACCEPTANCE = 3.323224e-01
+ZXSEC=1.929
+ZPURITYFACTOR=0.9935
+
+def correction(mu):
+    # R20.7
+    # return 1.04524-0.000108956*mu
+    # R21
+    #return 1.04701-0.000206159*mu
+    return 0.998758-0.000157214*mu
+    #return 1.
+
+recozfile = ROOT.TFile.Open(recozfname)
+effzfile = ROOT.TFile.Open(effzfname)
+
+recoztree = recozfile.lumitree
+effztree = effzfile.lumitree
+
+entrydict = {}
+
+for i in xrange(recoztree.GetEntries()):
+    recoztree.GetEntry(i)
+    if not recoztree.pass_grl: continue
+    # If livetime less than 10 sec, ignore
+    if recoztree.lblive < 10 : continue
+    effztree.Draw('alleff:alleffstat', 'run==%s&&lb==%s' % (recoztree.run, recoztree.lb), 'goff')
+    if effztree.GetSelectedRows() == 0:
+        print 'Broken for run, lb %s %s' % (recoztree.run, recoztree.lb)
+        print 'We THINK there are %d events here ...' % (recoztree.zraw)
+        continue
+    lbzero = (recoztree.lb // LUMIBLOCKS)*LUMIBLOCKS
+    run = recoztree.run
+    if (run, lbzero) not in entrydict: entrydict[(run, lbzero)] = {'zcount': 0., 'zcounterrsq': 0., 'livetime': 0., 'lbwhen': [-1, -1], 'mu': 0., 'offlumi': 0., 'rolleff': 0., 'rollefferrsq': 0., 'lhcfill': recoztree.lhcfill}
+    thisdict = entrydict[(run, lbzero)]
+    effcy = (effztree.GetV1()[0]*correction(recoztree.mu))
+    #thisdict['zcount'] += recoztree.zraw/effcy
+    #thisdict['zcounterrsq'] += (1/effcy*recoztree.zrawstat)**2+(recoztree.zraw/effcy**2*effztree.GetV2()[0])**2
+    thisdict['zcount'] += recoztree.zraw
+    thisdict['zcounterrsq'] += recoztree.zrawstat**2
+    effcywght = (effztree.GetV2()[0]*correction(recoztree.mu))**2
+    thisdict['rolleff'] += effcy/effcywght
+    thisdict['rollefferrsq'] += 1/effcywght
+    loclivetime = recoztree.lblive
+    #loclivetime = (recoztree.lbwhen[1]-recoztree.lbwhen[0])
+    thisdict['livetime'] += loclivetime
+    thisdict['mu'] += recoztree.mu*loclivetime
+    thisdict['offlumi'] += recoztree.offlumi*loclivetime
+    if thisdict['lbwhen'][0] > recoztree.lbwhen[0] or thisdict['lbwhen'][0] == -1:
+        thisdict['lbwhen'][0] = recoztree.lbwhen[0]
+    if thisdict['lbwhen'][1] < recoztree.lbwhen[1] or thisdict['lbwhen'][1] == -1:
+        thisdict['lbwhen'][1] = recoztree.lbwhen[1]
+
+from array import array
+ 
+fout = ROOT.TFile.Open(outfname, 'RECREATE')
+o_run = array('I', [0])
+o_lb = array('I', [0])
+o_lbwhen = array('d', [0., 0.])
+o_zrate = array('f', [0.])
+o_zratestat = array('f', [0.])
+o_zlumi = array('f', [0.])
+o_zlumistat = array('f', [0.])
+o_mu = array('f', [0.])
+o_alleffcorr = array('f', [0.])
+o_alleffcorrstat = array('f', [0.])
+o_offlumi = array('f', [0.])
+o_lblive = array('f', [0.])
+o_lhcfill = array('I', [0])
+t = ROOT.TTree( 'lumitree', 'Luminosity tree' )
+t.Branch('run', o_run, 'run/i')
+t.Branch('lb', o_lb, 'lb/i')
+t.Branch('lbwhen', o_lbwhen, 'lbwhen[2]/D')
+t.Branch('zrate', o_zrate, 'zrate/F')
+t.Branch('zratestat', o_zratestat, 'zratestat/F')
+t.Branch('zlumi', o_zlumi, 'zlumi/F')
+t.Branch('zlumistat', o_zlumistat, 'zlumistat/F')
+t.Branch('offlumi', o_offlumi, 'offlumi/F')
+t.Branch('mu', o_mu, 'mu/F')
+t.Branch('alleffcorr', o_alleffcorr, 'alleffcorr/F')
+t.Branch('alleffcorrstat', o_alleffcorrstat, 'alleffcorrstat/F')
+t.Branch('lblive', o_lblive, 'lblive/F')
+t.Branch('lhcfill', o_lhcfill, 'lhcfill/i')
+
+for entry, entryval in sorted(entrydict.items()):
+    if entryval['livetime'] > 0:
+        entryval['mu'] /= entryval['livetime']
+        entryval['offlumi'] /= entryval['livetime']
+        eff = entryval['rolleff']/entryval['rollefferrsq']
+        efferr = 1/entryval['rollefferrsq']**.5
+        #print 'LIVETIME2', entryval['livetime']
+        entryval['zrate'] = entryval['zcount']/eff/entryval['livetime']
+        entryval['zratestat'] = (entryval['zcounterrsq']/eff/eff + (entryval['zcount']/eff**2*efferr)**2)**.5/entryval['livetime']
+        o_run[0], o_lb[0] = entry
+        o_lbwhen[0], o_lbwhen[1] = entryval['lbwhen']
+        o_zrate[0] = entryval['zrate']
+        o_zratestat[0] = entryval['zratestat']
+        o_zlumi[0] = o_zrate[0]*ZPURITYFACTOR/ACCEPTANCE/ZXSEC
+        o_zlumistat[0] = o_zratestat[0]*ZPURITYFACTOR/ACCEPTANCE/ZXSEC
+        o_mu[0] = entryval['mu']
+        o_alleffcorr[0] = eff
+        o_alleffcorrstat[0] = efferr
+        o_offlumi[0] = entryval['offlumi']
+        o_lblive[0] = entryval['livetime']
+        o_lhcfill[0] = entryval['lhcfill']
+        if o_zlumi[0] < 4 or o_zlumi[0] > 15:
+            print o_lb[0], o_zlumi[0], entryval['zcount'], eff, entryval['livetime']
+        t.Fill()
+#t.Write()
+newrzt = recoztree.CloneTree()
+newrzt.SetName("recolumitree")
+newezt = effztree.CloneTree()
+newezt.SetName("efflumitree")
+fout.Write()
+fout.Close()
+        
diff --git a/DataQuality/ZLumiScripts/scripts/dqt_zlumi_compute_lumi.py b/DataQuality/ZLumiScripts/scripts/dqt_zlumi_compute_lumi.py
new file mode 100755
index 0000000000000000000000000000000000000000..44a2e9f770cd55b203052f4fd1ba02776233db5a
--- /dev/null
+++ b/DataQuality/ZLumiScripts/scripts/dqt_zlumi_compute_lumi.py
@@ -0,0 +1,325 @@
+#!/usr/bin/env python
+# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+
+import ROOT
+import sys, os
+import logging
+logging.basicConfig(format='%(levelname)s:%(message)s', level=logging.INFO)
+import argparse
+parser = argparse.ArgumentParser()
+parser.add_argument('infile', type=str, help='input HIST file')
+parser.add_argument('--grl', type=str, help='Specify an input GRL')
+parser.add_argument('--out', type=str, help='output ROOT file')
+parser.add_argument('--tag', type=str, help='Lumi tag',
+                    default='OflLumiAcct-001')
+parser.add_argument('--useofficial', action='store_true', help='Use official lumi folder (otherwise, use OflLumiAcct')
+parser.add_argument('--lumifolder', type=str, help='Lumi folder', default='/TRIGGER/OFLLUMI/OflPrefLumi')
+parser.add_argument('--lumitag', type=str, help='Lumi tag', default='OflLumi-13TeV-009')
+parser.add_argument('--plotdir', type=str, help='Directory to dump plots',
+                    default='plots')
+parser.add_argument('--mudep', type=int, help='Run mu-dependent efficiencies',
+                    default=0)
+parser.add_argument('--dblivetime', action='store_true',
+                    help='Look up livetime from DB')
+parser.add_argument('--mode', type=str, help='Zee or Zmumu')
+
+args = parser.parse_args()
+
+BINWIDTH=10
+
+ZPURITYFACTOR=0.9935
+ZXSEC=1.929
+#ZATIMESC=0.2578
+ZATIMESC=0.29632
+
+def mu_dep_eff(mu):
+    #make breakpoint at 8 match
+    if 0 <= mu < 8: return 0.3152 #0.3141
+    elif 8 <= mu < 27: return 0.3191 - 0.000493*mu
+    elif 27 <= mu: return 0.3443 - 0.00143*mu
+    else:
+        print 'WTF??'
+        return ZATIMESC
+
+ROOT.gStyle.SetOptStat(0)
+
+fin = ROOT.TFile.Open(args.infile)
+runname = None
+for key in fin.GetListOfKeys():
+    if key.GetName().startswith('run_'):
+        runname = key.GetName()
+        break
+
+if args.grl:
+    import DQUtils
+    grl = DQUtils.grl.load_grl(args.grl)
+else:
+    grl = None
+
+if not runname:
+    logging.critical("Can't find run_* directory in input file %s", args.infile)
+    sys.exit(1)
+
+z_m = fin.Get('%s/GLOBAL/DQTGlobalWZFinder/m_Z_Counter_mu' % runname)
+if args.out:
+    outfname = args.out
+else:
+    outfname = '%s_data.root' % runname[4:]
+
+runmode = args.mode
+print 'Running in', runmode, 'mode'
+if runmode == 'Zee':
+    z_m = fin.Get('%s/GLOBAL/DQTGlobalWZFinder/m_Z_Counter_el' % runname)
+    if not z_m:
+        logging.critical("Can't retrieve m_Z_Counter_el")
+        sys.exit(1)
+
+if runmode == 'Zmumu':
+    z_m = fin.Get('%s/GLOBAL/DQTGlobalWZFinder/m_Z_Counter_mu' % runname)
+    if not z_m:
+        logging.critical("Can't retrieve m_Z_Counter_mu")
+        sys.exit(1)
+
+
+fout = None
+t = None
+
+from array import array
+o_passgrl = array('i', [0])
+o_mu = array('f', [0.])
+
+o_lb_rb = array('I', [0,0])
+o_lbwhen_rb = array('d', [0., 0.])
+o_zlumi_rb = array('f', [0.])
+o_zlumistat_rb = array('f', [0.])
+o_offlumi_rb = array('f', [0.])
+o_mu_rb = array('f', [0.])
+o_lblive_rb = array('f', [0.])
+if True:
+    fout = ROOT.TFile.Open(outfname, 'RECREATE')
+    o_run = array('I', [int(runname[4:])])
+    o_lb = array('I', [0])
+    o_lbwhen = array('d', [0., 0.])
+    o_zraw = array('f', [0.])
+    o_zrawstat = array('f', [0.])
+    o_zlumi = array('f', [0.])
+    o_zlumistat = array('f', [0.])
+    o_offlumi = array('f', [0.])
+    o_lblive = array('f', [0.])
+    o_lhcfill = array('I', [0])
+    t = ROOT.TTree( 'lumitree', 'Luminosity tree' )
+    t.Branch('run', o_run, 'run/i')
+    t.Branch('lb', o_lb, 'lb/i')
+    t.Branch('lbwhen', o_lbwhen, 'lbwhen[2]/D')
+    t.Branch('zraw', o_zraw, 'zraw/F')
+    t.Branch('zrawstat', o_zrawstat, 'zrawstat/F')
+    t.Branch('zlumi', o_zlumi, 'zlumi/F')
+    t.Branch('zlumistat', o_zlumistat, 'zlumistat/F')
+    t.Branch('offlumi', o_offlumi, 'offlumi/F')
+    t.Branch('mu', o_mu, 'mu/F')
+    t.Branch('lblive', o_lblive, 'lblive/F')
+    t.Branch('pass_grl', o_passgrl, 'pass_grl/I')
+    t.Branch('lhcfill', o_lhcfill, 'lhcfill/i')
+
+    t_rb = ROOT.TTree( 'lumitree_rb', 'Luminosity tree, rebinned' )
+    t_rb.Branch('run', o_run, 'run/i')
+    t_rb.Branch('lb', o_lb_rb, 'lb[2]/i')
+    t_rb.Branch('lbwhen', o_lbwhen_rb, 'lbwhen[2]/D')
+    t_rb.Branch('zlumi', o_zlumi_rb, 'zlumi/F')
+    t_rb.Branch('zlumistat', o_zlumistat_rb, 'zlumistat/F')
+    t_rb.Branch('offlumi', o_offlumi_rb, 'offlumi/F')
+    t_rb.Branch('mu', o_mu_rb, 'mu/F')
+    t_rb.Branch('lblive', o_lblive_rb, 'lblive/F')
+
+    ROOT.gROOT.cd('/')
+
+
+lb_length = fin.Get('%s/GLOBAL/DQTGlobalWZFinder/m_lblength_lb' % runname)
+lbmin, lbmax = lb_length.GetXaxis().GetXmin(), lb_length.GetXaxis().GetXmax()
+logging.info('low, high LBs: %s, %s', lbmin, lbmax)
+
+if args.dblivetime:
+    logging.info('Starting livetime lookup ... (remove when we have a proper in-file implementation ...)')
+    livetime = ROOT.TProfile('livetime', 'Livetime', int(lbmax-lbmin), lbmin, lbmax)
+else:
+    livetime = fin.Get('%s/GLOBAL/DQTGlobalWZFinder/m_livetime_lb' % runname)
+
+official_lum = ROOT.TProfile('official_lum', 'official integrated luminosity', int(lbmax-lbmin), lbmin, lbmax)
+official_lum_zero = ROOT.TProfile('official_lum_zero', 'official inst luminosity', int(lbmax-lbmin), lbmin, lbmax)
+official_mu = ROOT.TProfile('official_mu', 'official mu', int(lbmax-lbmin), lbmin, lbmax)
+from DQUtils import fetch_iovs
+from DQUtils.iov_arrangement import inverse_lblb
+lblb = fetch_iovs("LBLB", runs=int(runname[4:]))
+lbtime = inverse_lblb(lblb)
+#print list(lbtime)
+iovs_acct = fetch_iovs('COOLOFL_TRIGGER::/TRIGGER/OFLLUMI/LumiAccounting', lbtime.first.since, lbtime.last.until, tag=args.tag)
+if args.useofficial:
+    iovs_lum = fetch_iovs('COOLOFL_TRIGGER::%s' % args.lumifolder, lblb.first.since, lblb.last.until, tag=args.lumitag, channels=[0])
+    #print list(iovs_lum)
+lb_start_end = {}
+lb_lhcfill = {}
+for iov in lblb:
+    lb_start_end[iov.since & 0xffffffff] = (iov.StartTime/1e9, iov.EndTime/1e9)
+
+for iov in iovs_acct:
+    if not lbmin < iov.LumiBlock < lbmax:
+        continue
+    lb_lhcfill[iov.LumiBlock] = iov.FillNumber
+    if args.dblivetime:
+        livetime.Fill(iov.LumiBlock, iov.LiveFraction)
+    #print iov.InstLumi, iovs_lum[iov.LumiBlock-1].LBAvInstLumi
+    if not args.useofficial:
+        official_lum_zero.Fill(iov.LumiBlock, iov.InstLumi/1e3)
+        official_lum.Fill(iov.LumiBlock, iov.InstLumi*iov.LBTime*iov.LiveFraction/1e3)
+        official_mu.Fill(iov.LumiBlock, iov.AvEvtsPerBX)
+    else:
+        offlumiov = [_ for _ in iovs_lum if _.since.lumi==iov.LumiBlock]
+        if len(offlumiov) != 1: 
+            print 'MAJOR PROBLEM, LUMI IOV MISMATCH'
+            print len(offlumiov)
+            continue
+        offlumiov = offlumiov[0]
+        official_lum_zero.Fill(iov.LumiBlock, offlumiov.LBAvInstLumi/1e3)
+        official_lum.Fill(iov.LumiBlock, offlumiov.LBAvInstLumi*iov.LBTime*iov.LiveFraction/1e3)
+        official_mu.Fill(iov.LumiBlock, offlumiov.LBAvEvtsPerBX)
+
+divisor = lb_length.Clone('divisor').ProjectionX()
+px = livetime.ProjectionX()
+divisor.Multiply(px)
+
+nrebinned_bins = ((lbmax-lbmin) // BINWIDTH) + 1
+
+if runmode == 'Zee':
+    lumititle = 'Lumi, Z->ee (Run %s)' % runname[4:]
+    efftitle = 'eff #sigma, Z->ee'
+    lumirawtitle = 'Lumi, Z->ee per LB'
+if runmode == 'Zmumu':
+    lumititle = 'Lumi, Z->#mu#mu (Run %s)' % runname[4:]
+    efftitle = 'eff #sigma, Z->#mu#mu'
+    lumirawtitle = 'Lumi, Z->#mu#mu per LB'
+
+
+lumiplot_m = ROOT.TH1F('lumiplot_m', lumititle % runname[4:], 
+                       int(nrebinned_bins),
+                       lbmin, lbmin+BINWIDTH*nrebinned_bins)
+lumiplot_m_ratio = ROOT.TH1F('lumiplot_m_ratio', 'Z/official lumi ratio (Run %s)' % runname[4:], 
+                       int(nrebinned_bins),
+                       lbmin, lbmin+BINWIDTH*nrebinned_bins)
+lumiplot_m.SetXTitle('LB')
+lumiplot_m.SetYTitle('Luminosity (x 10^{33} cm^{-2} s^{-1})')
+xsec_m = ROOT.TH1F('xsec_m', efftitle, int(nrebinned_bins),
+                       lbmin, lbmin+BINWIDTH*nrebinned_bins)
+lumiplot_raw_m =  ROOT.TH1F('lumiplot_raw_m', lumirawtitle, 
+                           int(lbmax-lbmin),
+                           lbmin, lbmax)
+
+num_m, lum, denom, weighted_mu = 0, 0, 0, 0
+tot_num_m, tot_denom, tot_lum = 0, 0, 0
+for ibin in xrange(1, int(lbmax-lbmin)+1):
+    profileflag=True
+    try:
+        z_m[ibin]
+    except IndexError, e:
+        logging.error('Something unfortunate has happened; LB %d missing from Z count' % (ibin + lbmin - 1))
+        profileflag=False
+    if args.mudep:
+        l_zatimesc = mu_dep_eff(official_mu[ibin])
+    else:
+        l_zatimesc = ZATIMESC
+    if grl and not DQUtils.grl.grl_contains_run_lb(grl, (int(runname[4:]), int(lumiplot_raw_m.GetBinCenter(ibin)))):
+        o_passgrl[0]=0
+    else:
+        o_passgrl[0]=1
+    if divisor[ibin] > 0 and profileflag:
+        lumiplot_raw_m.SetBinContent(ibin, z_m[ibin]/divisor[ibin]*ZPURITYFACTOR/l_zatimesc/ZXSEC)
+        lumiplot_raw_m.SetBinError(ibin, z_m[ibin]**.5/divisor[ibin]*ZPURITYFACTOR/l_zatimesc/ZXSEC)
+    o_mu[0] = official_mu[ibin]
+    if o_passgrl[0]:
+        if profileflag:
+            num_m += z_m[ibin]; tot_num_m += z_m[ibin]
+        denom += divisor[ibin]; tot_denom += divisor[ibin]
+        lum += official_lum[ibin]; tot_lum += official_lum[ibin]
+        weighted_mu += o_mu[0]*divisor[ibin]
+    
+
+    # fill tree
+    if t:
+        #print ibin, lumiplot_raw_m.GetBinCenter(ibin)
+        o_lb[0] = int(lumiplot_raw_m.GetBinCenter(ibin))
+        o_lbwhen[0] = lb_start_end[o_lb[0]][0]
+        o_lbwhen[1] = lb_start_end[o_lb[0]][1]
+        o_zraw[0] = z_m[ibin] if profileflag else 0
+        o_zrawstat[0] = z_m.GetBinError(ibin) if profileflag else 0
+        o_zlumi[0] = lumiplot_raw_m[ibin]
+        o_zlumistat[0] = lumiplot_raw_m.GetBinError(ibin)
+        o_offlumi[0] = official_lum_zero[ibin]
+        o_lblive[0] = divisor[ibin]
+        o_lhcfill[0] = lb_lhcfill[o_lb[0]]
+        t.Fill()
+
+    if (ibin % BINWIDTH) == 0:
+        ribin = int(ibin // BINWIDTH) 
+        o_mu_rb[0] = weighted_mu/denom if denom > 0 else 0
+        if args.mudep:
+            l_zatimesc = mu_dep_eff(o_mu_rb[0])
+        else:
+            l_zatimesc = ZATIMESC
+        if denom > 0:
+            lumiplot_m.SetBinContent(ribin, num_m/denom*ZPURITYFACTOR/l_zatimesc/ZXSEC)
+            lumiplot_m.SetBinError(ribin, num_m**.5/denom*ZPURITYFACTOR/l_zatimesc/ZXSEC)
+        if lum > 0:
+            xsec_m.SetBinContent(ribin, num_m/lum*ZPURITYFACTOR/l_zatimesc)
+            xsec_m.SetBinError(ribin, num_m**.5/lum*ZPURITYFACTOR/l_zatimesc)
+        if denom > 0:
+            o_zlumi_rb[0] = num_m/denom*ZPURITYFACTOR/l_zatimesc/ZXSEC
+            o_zlumistat_rb[0] = num_m**.5/denom*ZPURITYFACTOR/l_zatimesc/ZXSEC
+            o_offlumi_rb[0] = lum/denom
+            if o_offlumi_rb[0] > 0:
+                lumiplot_m_ratio.SetBinContent(ribin, o_zlumi_rb[0]/o_offlumi_rb[0])
+                lumiplot_m_ratio.SetBinError(ribin, o_zlumistat_rb[0]/o_offlumi_rb[0])
+        else:
+            o_zlumi_rb[0] = 0.
+            o_zlumistat_rb[0] = 0.
+            o_offlumi_rb[0] = 0.
+            o_mu_rb[0] = 0.
+        o_lb_rb[1] = int(lumiplot_raw_m.GetBinCenter(ibin))
+        o_lb_rb[0] = int(lumiplot_raw_m.GetBinCenter(ibin)-BINWIDTH+1)
+        o_lbwhen_rb[0] = lb_start_end[o_lb_rb[0]][0]
+        o_lbwhen_rb[1] = lb_start_end[o_lb_rb[1]][1]
+        o_lblive_rb[0] = denom
+        if t:
+            t_rb.Fill()
+        
+        num_m, lum, denom, weighted_mu = 0, 0, 0, 0
+        
+if fout:
+    fout.cd()
+    t.Write()
+    t_rb.Write()
+
+    if tot_lum > 0:
+        tge = ROOT.TGraphErrors(1)
+        tge.SetPoint(0, int(runname[4:]), tot_num_m*ZPURITYFACTOR/ZATIMESC/ZXSEC/tot_lum)
+        tge.SetPointError(0, 0, tot_num_m**.5*ZPURITYFACTOR/ZATIMESC/ZXSEC/tot_lum)
+        tge.SetName('lum_ratio')
+        tge.Write()
+    fout.Close()
+
+c1 = ROOT.TCanvas()
+c1.SetTickx()
+c1.SetTicky()
+leg = ROOT.TLegend(0.6, 0.75, 0.89, 0.88)
+lumiplot_m.Draw()
+official_lum_zero.SetLineColor(ROOT.kRed)
+official_lum_zero.Draw('SAME,HIST')
+leg.AddEntry(lumiplot_m, 'Z luminosity')
+leg.AddEntry(official_lum_zero, 'ATLAS preferred lumi', 'L')
+leg.SetBorderSize(0)
+leg.Draw()
+c1.Print(os.path.join(args.plotdir, '%s_lumi.eps' % runname[4:]))
+c1.Print(os.path.join(args.plotdir, '%s_lumi.png' % runname[4:]))
+
+c1.Clear()
+lumiplot_m_ratio.Draw()
+c1.Print(os.path.join(args.plotdir, '%s_lumi_ratio.eps' % runname[4:]))
+c1.Print(os.path.join(args.plotdir, '%s_lumi_ratio.png' % runname[4:]))
diff --git a/DataQuality/ZLumiScripts/scripts/dqt_zlumi_display_z_rate.py b/DataQuality/ZLumiScripts/scripts/dqt_zlumi_display_z_rate.py
new file mode 100755
index 0000000000000000000000000000000000000000..ca5211c06ebd044fa9a31fc440533a053d4355ef
--- /dev/null
+++ b/DataQuality/ZLumiScripts/scripts/dqt_zlumi_display_z_rate.py
@@ -0,0 +1,107 @@
+#!/usr/bin/env python
+# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration                  
+
+import ROOT
+import sys, os
+import array
+import argparse
+import time
+
+parser = argparse.ArgumentParser()
+parser.add_argument('infile', type=str, help='input HIST file')
+parser.add_argument('--indir', type=str, help='Directory with input file',
+                    default='')
+parser.add_argument('--plotdir', type=str, help='Directory to dump plots',
+                    default='plots')
+args = parser.parse_args()
+
+# runnum = sys.argv[1].split('_')[0]
+runnum = args.infile.split('_')[0]
+# f = ROOT.TFile.Open(sys.argv[1], 'UPDATE')
+f = ROOT.TFile.Open(os.path.join(args.indir, args.infile), 'UPDATE')
+c1 = ROOT.TCanvas()
+lumitree = f.lumitree
+#get range
+runs=[0,1]; fills=[0,1]
+lumitree.Draw("run:lhcfill", "", "goff")
+if lumitree.GetSelectedRows() > 0:
+    runs = list(lumitree.GetV1()[_] for _ in xrange(lumitree.GetSelectedRows()))
+    fills = list(lumitree.GetV2()[_] for _ in xrange(lumitree.GetSelectedRows()))
+titlestr = ''
+if min(fills)==max(fills):
+    titlestr += 'Fill %d' % min(fills)
+if min(runs) == max(runs):
+    titlestr += ' Run %d' % min(runs)
+
+lumitree.Draw("zrate:lb+10:zratestat", "", "goff")
+print 'Selected rows', lumitree.GetSelectedRows()
+if lumitree.GetSelectedRows() > 0: 
+    gr = ROOT.TGraphErrors(lumitree.GetSelectedRows(), lumitree.GetV2(), lumitree.GetV1(), ROOT.nullptr, lumitree.GetV3())
+    gr.Draw("ap")
+    gr.GetHistogram().SetXTitle('LB')
+    gr.GetHistogram().SetYTitle('Fiducial Z yield/second')
+    gr.SetMarkerStyle(20)
+    gr.SetTitle('')
+    f.WriteTObject(gr, 'fid_z_rate')
+    c1.Update()
+    c1.Print(os.path.join(args.plotdir, '%s_fidyield.eps' % runnum))
+
+# dump CSV
+csvout = open(os.path.join(args.plotdir, '%s_zrate.csv' % runnum), 'w')
+lumitree.Draw("zrate:lbwhen[0]:lbwhen[1]:lhcfill:lblive:offlumi", "", "goff,para")
+timeformat = '%y/%m/%d %H:%M:%S'
+#timeformat = '%m/%d %H:%M:%S'
+for i in xrange(lumitree.GetSelectedRows()):
+    zrate = lumitree.GetV1()[i]
+    instlumi = lumitree.GetVal(5)[i]
+    livetime = lumitree.GetVal(4)[i]
+    print >>csvout, '%d, %s, %s, %6f, %6f, %4f, %6f' % (lumitree.GetV4()[i],
+                                                    time.strftime(timeformat, time.gmtime(lumitree.GetV2()[i])), 
+                                                    time.strftime(timeformat, time.gmtime(lumitree.GetV3()[i])), 
+                                                    lumitree.GetV1()[i],
+                                                    instlumi/1e3,
+                                                    instlumi*livetime/1e3,
+                                                    lumitree.GetV1()[i]*livetime
+                                                    )
+csvout.close()
+
+lumitree.Draw("zlumi:lb+10:zlumistat", "", "goff")
+if lumitree.GetSelectedRows() > 0:
+    gr = ROOT.TGraphErrors(lumitree.GetSelectedRows(), lumitree.GetV2(), lumitree.GetV1(), ROOT.nullptr, lumitree.GetV3())
+    zlumi = list(lumitree.GetV1()[_] for _ in xrange(lumitree.GetSelectedRows())); 
+    zlumierr = list(lumitree.GetV3()[_] for _ in xrange(lumitree.GetSelectedRows()))
+    gr.Draw("ap")
+    gr.GetHistogram().SetXTitle('LB')
+    gr.GetHistogram().SetYTitle('Luminosity (x10^{33})')
+    gr.SetMarkerStyle(20)
+    gr.SetTitle(titlestr)
+    f.WriteTObject(gr, 'z_lumi')
+    lumitree.Draw("offlumi:lb+10", "", "goff")
+    gr2 = ROOT.TGraphErrors(lumitree.GetSelectedRows(), lumitree.GetV2(), lumitree.GetV1())
+    offlumi = list(lumitree.GetV1()[_] for _ in xrange(lumitree.GetSelectedRows()))
+    gr2.SetMarkerStyle(21)
+    gr2.SetMarkerSize(0.5)
+    gr2.SetMarkerColor(ROOT.kRed)
+    gr2.SetLineColor(ROOT.kRed)
+    gr2.Draw('same,l')
+    f.WriteTObject(gr2, 'official_lumi')
+    leg = ROOT.TLegend(0.65, 0.7, 0.89, 0.89)
+    leg.SetBorderSize(0)
+    leg.AddEntry(gr, 'Z luminosity', 'pl')
+    leg.AddEntry(gr2, 'Official', 'l')
+    leg.Draw()
+    c1.Update()
+    c1.Print(os.path.join(args.plotdir, '%s_lumicomp.eps' % runnum))
+    f.WriteTObject(c1, 'lumicomp_canvas')
+    zlumirat = array.array('d', [_[0]/_[1] for _ in zip(zlumi, offlumi)])
+    zlumiraterr = array.array('d', [_[0]/_[1] for _ in zip(zlumierr, offlumi)])
+    gr3 = ROOT.TGraphErrors(lumitree.GetSelectedRows(), lumitree.GetV2(), zlumirat, ROOT.nullptr, zlumiraterr)
+    c1.Clear()
+    gr3.SetMarkerStyle(20)
+    gr3.Draw('ap')
+    gr3.SetTitle(titlestr)
+    gr3.GetHistogram().SetXTitle('LB')
+    gr3.GetHistogram().SetYTitle('Z Counting/Official Lumi')
+    c1.Print(os.path.join(args.plotdir, '%s_lumicompratio.eps' % runnum))
+    f.WriteTObject(c1, 'lumicompratio_canvas')
+    
diff --git a/DataQuality/dqm_algorithms/src/GatherData.cxx b/DataQuality/dqm_algorithms/src/GatherData.cxx
index 2e5f058fc480a090396bd4e74a1209189a01ad87..af65fdf705f74d5450aa8d139308facc66cb6154 100644
--- a/DataQuality/dqm_algorithms/src/GatherData.cxx
+++ b/DataQuality/dqm_algorithms/src/GatherData.cxx
@@ -14,6 +14,7 @@
 
 #include <TH1.h>
 #include <TGraph.h>
+#include <TEfficiency.h>
 
 #include "dqm_core/exceptions.h"
 #include "dqm_core/AlgorithmManager.h"
@@ -60,8 +61,9 @@ execute( const std::string& name, const TObject& data, const dqm_core::Algorithm
   // Cast to the type of TObject to assess
   const TH1* h = dynamic_cast<const TH1*>( &data );
   const TGraph* g = dynamic_cast<const TGraph*>( &data );
-  if( h == 0 && g == 0 ) {
-    throw dqm_core::BadConfig( ERS_HERE, name, "Cannot cast data to type TH1" );
+  const TEfficiency* e = dynamic_cast<const TEfficiency*>( &data );
+  if( h == 0 && g == 0 && e==0 ) {
+    throw dqm_core::BadConfig( ERS_HERE, name, "Cannot cast data to type TH1, TGraph, or TEfficiency" );
   }
   
   std::map<std::string,double> tags;
@@ -78,6 +80,13 @@ execute( const std::string& name, const TObject& data, const dqm_core::Algorithm
     tags["XRMS"]  = g->GetRMS(1);
     tags["YRMS"]  = g->GetRMS(2);
   }
+
+  if ( e != 0 ) {
+    tags["Mean"] = e->GetCopyPassedHisto()->GetMean();
+    tags["MeanError"] = e->GetCopyPassedHisto()->GetMeanError();
+    tags["RMS"] = e->GetCopyPassedHisto()->GetRMS();
+    tags["RMSError"] = e->GetCopyPassedHisto()->GetRMSError();
+  }
   
   dqm_core::Result* result = new dqm_core::Result( status );
   result->tags_ = tags;
diff --git a/DataQuality/dqm_algorithms/src/MDTTDCOfflineSpectrum.cxx b/DataQuality/dqm_algorithms/src/MDTTDCOfflineSpectrum.cxx
index 29a4fd1ec2a77e8dc21200aa0ca20380e3233b26..e93a39b52c392e086afe42bf600af179b5ee7064 100644
--- a/DataQuality/dqm_algorithms/src/MDTTDCOfflineSpectrum.cxx
+++ b/DataQuality/dqm_algorithms/src/MDTTDCOfflineSpectrum.cxx
@@ -52,6 +52,10 @@ dqm_algorithms::MDTTDCOfflineSpectrum::execute(	const std::string &  name,
   }
 
   const double minstat = dqm_algorithms::tools::GetFirstFromMap( "MinStat", config.getParameters(), -1);
+  /*
+  const bool publish = (bool) dqm_algorithms::tools::GetFirstFromMap( "PublishBins", config.getParameters(), 0); 
+  const int maxpublish = (int) dqm_algorithms::tools::GetFirstFromMap( "MaxPublish", config.getParameters(), 20); 
+  */
   
   if (histogram->GetEntries() < minstat ) {
     dqm_core::Result *result = new dqm_core::Result(dqm_core::Result::Undefined);
diff --git a/DataQuality/dqm_algorithms/tools/AlgorithmHelper.cxx b/DataQuality/dqm_algorithms/tools/AlgorithmHelper.cxx
index 29e2dd00105f733c69ed3cc43ffaf729d83a27bc..c4ee85c941160747686b86d09945250378b5771c 100644
--- a/DataQuality/dqm_algorithms/tools/AlgorithmHelper.cxx
+++ b/DataQuality/dqm_algorithms/tools/AlgorithmHelper.cxx
@@ -379,10 +379,17 @@ std::vector<int> dqm_algorithms::tools::GetBinRange(const TH1 *h, const std::map
   const double xmax = dqm_algorithms::tools::GetFirstFromMap("xmax", params, notFound);
   const double ymin = dqm_algorithms::tools::GetFirstFromMap("ymin", params, notFound);
   const double ymax = dqm_algorithms::tools::GetFirstFromMap("ymax", params, notFound);
+
+  /**The nested ternaries do the following. 
+   * Suppose xmax (or ymax) happen to be a value that corresponds to the boundary of a bin. 
+   * TAxis::FindBin then returns the bin for which the xmax is the lower edge of the bin.
+   * The nested ternaries prevent this happening by decrementing the bin number returned by TAxis::FindBin by 1.
+   */
   const int xlow    = (xmin == notFound) ? 1                 : xAxis->FindBin(xmin);
-  const int xhigh   = (xmax == notFound) ? xAxis->GetNbins() : xAxis->FindBin(xmax);
+  const int xhigh   = (xmax == notFound) ? xAxis->GetNbins() : (xAxis->GetBinLowEdge(xAxis->FindBin(xmax))== xmax) ? (xAxis->FindBin(xmax)-1) : xAxis->FindBin(xmax);
   const int ylow    = (ymin == notFound) ? 1                 : yAxis->FindBin(ymin);
-  const int yhigh   = (ymax == notFound) ? yAxis->GetNbins() : yAxis->FindBin(ymax);
+  const int yhigh   = (ymax == notFound) ? yAxis->GetNbins() : (yAxis->GetBinLowEdge(yAxis->FindBin(ymax))== ymax) ? (yAxis->FindBin(ymax)-1) : yAxis->FindBin(ymax);
+
                                                                                                                                                              
   if (xlow>xhigh) {
     char temp[128];
diff --git a/Database/AthenaPOOL/AthenaPoolCnvSvc/src/AthenaPoolConverter.cxx b/Database/AthenaPOOL/AthenaPoolCnvSvc/src/AthenaPoolConverter.cxx
index e70b2c8c90ab6adb063df6e0c3167caa4c7c66fd..fd8f470585dd46d747a099851c6df5cb503e48ab 100644
--- a/Database/AthenaPOOL/AthenaPoolCnvSvc/src/AthenaPoolConverter.cxx
+++ b/Database/AthenaPOOL/AthenaPoolCnvSvc/src/AthenaPoolConverter.cxx
@@ -55,7 +55,7 @@ long AthenaPoolConverter::repSvcType() const {
 StatusCode AthenaPoolConverter::createObj(IOpaqueAddress* pAddr, DataObject*& pObj) {
    std::lock_guard<CallMutex> lock(m_conv_mut);
    TokenAddress* tokAddr = dynamic_cast<TokenAddress*>(pAddr);
-bool ownTokAddr = false;
+   bool ownTokAddr = false;
    if (tokAddr == nullptr || tokAddr->getToken() == nullptr) {
       ownTokAddr = true;
       Token* token = new Token;
@@ -160,9 +160,12 @@ void AthenaPoolConverter::setPlacementWithType(const std::string& tname, const s
    }
    m_placement->setTechnology(m_athenaPoolCnvSvc->technologyType(containerName).type());
    //  Remove Technology from containerName
-   std::size_t colonPos = containerName.find(":");
-   if (colonPos != std::string::npos) {
-      containerName.erase(0, colonPos + 1);
+   if (containerName.find("ROOTKEY:") == 0) {
+      containerName.erase(0, 8);
+   } else if (containerName.find("ROOTTREE:") == 0) {
+      containerName.erase(0, 9);
+   } else if (containerName.find("ROOTTREEINDEX:") == 0) {
+      containerName.erase(0, 13);
    }
    m_placement->setContainerName(containerName);
 }
diff --git a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_Concat.ref b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_Concat.ref
index a46f29dd1f3a64327661cf1f01fadea9869f8d8a..19b2cd536bfa72b06a64360c37e0c2d05cb43eac 100644
--- a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_Concat.ref
+++ b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_Concat.ref
@@ -77,7 +77,7 @@ Stream1             DEBUG Registering all Tools in ToolHandleArray HelperTools
 Stream1             DEBUG Adding private ToolHandle tool Stream1.Stream1_MakeEventStreamInfo (MakeEventStreamInfo) from ToolHandleArray HelperTools
 Stream1             DEBUG Adding private ToolHandle tool Stream1.Stream1Tool (AthenaOutputStreamTool)
 Stream1             DEBUG Data Deps for Stream1
-  + INPUT IGNORED  ( 'AthenaAttributeList' , '' ) 
+  + INPUT IGNORED  ( 'AthenaAttributeList' , '' )
 MakeInputDataHe...   INFO Initializing MakeInputDataHeader - package version OutputStreamAthenaPool-00-00-00
 MakeInputDataHe...   INFO Name of Stream to be made Input: Stream1
 ReWriteData         DEBUG Property update for OutputLevel : new value = 2
@@ -111,7 +111,7 @@ Stream2             DEBUG Registering all Tools in ToolHandleArray HelperTools
 Stream2             DEBUG Adding private ToolHandle tool Stream2.Stream2_MakeEventStreamInfo (MakeEventStreamInfo) from ToolHandleArray HelperTools
 Stream2             DEBUG Adding private ToolHandle tool Stream2.Stream2Tool (AthenaOutputStreamTool)
 Stream2             DEBUG Data Deps for Stream2
-  + INPUT IGNORED  ( 'AthenaAttributeList' , '' ) 
+  + INPUT IGNORED  ( 'AthenaAttributeList' , '' )
 HistogramPersis...WARNING Histograms saving not required.
 EventSelector        INFO  Enter McEventSelector Initialization 
 AthenaEventLoopMgr   INFO Setup EventSelector service EventSelector
diff --git a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_Copy.ref b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_Copy.ref
index 4e6287a612e6ea198822d4d217005fc0031acdfc..7042739a63875cfaa87dfcb80690c0f33baf3c77 100644
--- a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_Copy.ref
+++ b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_Copy.ref
@@ -149,7 +149,7 @@ Stream1             DEBUG Registering all Tools in ToolHandleArray HelperTools
 Stream1             DEBUG Adding private ToolHandle tool Stream1.Stream1_MakeEventStreamInfo (MakeEventStreamInfo) from ToolHandleArray HelperTools
 Stream1             DEBUG Adding private ToolHandle tool Stream1.Stream1Tool (AthenaOutputStreamTool)
 Stream1             DEBUG Data Deps for Stream1
-  + INPUT IGNORED  ( 'AthenaAttributeList' , '' ) 
+  + INPUT IGNORED  ( 'AthenaAttributeList' , '' )
 HistogramPersis...WARNING Histograms saving not required.
 AthenaEventLoopMgr   INFO Setup EventSelector service EventSelector
 ApplicationMgr       INFO Application Manager Initialized successfully
diff --git a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_Filter.ref b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_Filter.ref
index 528a8eafa92fca43b7e9bdc7f89e04f86bd46bf0..e41ef8c4a3549c6f5f173ab8f8ec4f7d670f3e6d 100644
--- a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_Filter.ref
+++ b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_Filter.ref
@@ -164,7 +164,7 @@ Stream1             DEBUG Registering all Tools in ToolHandleArray HelperTools
 Stream1             DEBUG Adding private ToolHandle tool Stream1.Stream1_MakeEventStreamInfo (MakeEventStreamInfo) from ToolHandleArray HelperTools
 Stream1             DEBUG Adding private ToolHandle tool Stream1.Stream1Tool (AthenaOutputStreamTool)
 Stream1             DEBUG Data Deps for Stream1
-  + INPUT IGNORED  ( 'AthenaAttributeList' , '' ) 
+  + INPUT IGNORED  ( 'AthenaAttributeList' , '' )
 WriteTag             INFO in initialize()
 RegStream1          DEBUG Property update for OutputLevel : new value = 2
 RegStream1.RegS...  DEBUG Property update for OutputLevel : new value = 2
diff --git a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_ReWrite.ref b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_ReWrite.ref
index 16902ec87322b582328d55718036c04825b12462..d5b6f177bf49ddf043982b81e3c1ed26aa6cf3e5 100644
--- a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_ReWrite.ref
+++ b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_ReWrite.ref
@@ -170,7 +170,7 @@ Stream1             DEBUG Registering all Tools in ToolHandleArray HelperTools
 Stream1             DEBUG Adding private ToolHandle tool Stream1.Stream1_MakeEventStreamInfo (MakeEventStreamInfo) from ToolHandleArray HelperTools
 Stream1             DEBUG Adding private ToolHandle tool Stream1.Stream1Tool (AthenaOutputStreamTool)
 Stream1             DEBUG Data Deps for Stream1
-  + INPUT   ( 'AthenaAttributeList' , 'StoreGateSvc+MagicTag' ) 
+  + INPUT   ( 'AthenaAttributeList' , 'StoreGateSvc+MagicTag' )
 RegStream1          DEBUG Property update for OutputLevel : new value = 2
 RegStream1.RegS...  DEBUG Property update for OutputLevel : new value = 2
 ClassIDSvc           INFO  getRegistryEntries: read 337 CLIDRegistry entries for module ALL
diff --git a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_ReWriteAgain.ref b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_ReWriteAgain.ref
index 6f672495b7a8650c7ee06cb0c3819e759fa1d072..c4bb4e660790e2a58afc7d8f6ecfb974ba9a7afe 100644
--- a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_ReWriteAgain.ref
+++ b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_ReWriteAgain.ref
@@ -164,7 +164,7 @@ Stream1             DEBUG Registering all Tools in ToolHandleArray HelperTools
 Stream1             DEBUG Adding private ToolHandle tool Stream1.Stream1_MakeEventStreamInfo (MakeEventStreamInfo) from ToolHandleArray HelperTools
 Stream1             DEBUG Adding private ToolHandle tool Stream1.Stream1Tool (AthenaOutputStreamTool)
 Stream1             DEBUG Data Deps for Stream1
-  + INPUT   ( 'AthenaAttributeList' , 'StoreGateSvc+MagicTag' ) 
+  + INPUT   ( 'AthenaAttributeList' , 'StoreGateSvc+MagicTag' )
 RegStream1          DEBUG Property update for OutputLevel : new value = 2
 RegStream1.RegS...  DEBUG Property update for OutputLevel : new value = 2
 ClassIDSvc           INFO  getRegistryEntries: read 337 CLIDRegistry entries for module ALL
diff --git a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_ReWriteNext.ref b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_ReWriteNext.ref
index ed44d8ae1628538c3e20b9fa6bdb48b89d0a7a74..15dca7c5fc1d59833296c2c158cb9ea190422a54 100644
--- a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_ReWriteNext.ref
+++ b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_ReWriteNext.ref
@@ -170,7 +170,7 @@ Stream1             DEBUG Registering all Tools in ToolHandleArray HelperTools
 Stream1             DEBUG Adding private ToolHandle tool Stream1.Stream1_MakeEventStreamInfo (MakeEventStreamInfo) from ToolHandleArray HelperTools
 Stream1             DEBUG Adding private ToolHandle tool Stream1.Stream1Tool (AthenaOutputStreamTool)
 Stream1             DEBUG Data Deps for Stream1
-  + INPUT   ( 'AthenaAttributeList' , 'StoreGateSvc+MagicTag' ) 
+  + INPUT   ( 'AthenaAttributeList' , 'StoreGateSvc+MagicTag' )
 RegStream1          DEBUG Property update for OutputLevel : new value = 2
 RegStream1.RegS...  DEBUG Property update for OutputLevel : new value = 2
 ClassIDSvc           INFO  getRegistryEntries: read 337 CLIDRegistry entries for module ALL
diff --git a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_WMeta.ref b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_WMeta.ref
index e7e8af748b582b8a7357d28a0ed552573fbf9464..bc21750f141446177a41e5b292b989b218c42e0e 100644
--- a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_WMeta.ref
+++ b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_WMeta.ref
@@ -77,7 +77,7 @@ Stream1             DEBUG Registering all Tools in ToolHandleArray HelperTools
 Stream1             DEBUG Adding private ToolHandle tool Stream1.Stream1_MakeEventStreamInfo (MakeEventStreamInfo) from ToolHandleArray HelperTools
 Stream1             DEBUG Adding private ToolHandle tool Stream1.Stream1Tool (AthenaOutputStreamTool)
 Stream1             DEBUG Data Deps for Stream1
-  + INPUT IGNORED  ( 'AthenaAttributeList' , '' ) 
+  + INPUT IGNORED  ( 'AthenaAttributeList' , '' )
 HistogramPersis...WARNING Histograms saving not required.
 EventSelector        INFO  Enter McEventSelector Initialization 
 AthenaEventLoopMgr   INFO Setup EventSelector service EventSelector
diff --git a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_Write.ref b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_Write.ref
index 2e7173b25c49476d550481bb885cc1846b33b44c..0b430d985d21c868999a17d770043e1687a0e737 100644
--- a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_Write.ref
+++ b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_Write.ref
@@ -78,7 +78,7 @@ Stream1             DEBUG Registering all Tools in ToolHandleArray HelperTools
 Stream1             DEBUG Adding private ToolHandle tool Stream1.Stream1_MakeEventStreamInfo (MakeEventStreamInfo) from ToolHandleArray HelperTools
 Stream1             DEBUG Adding private ToolHandle tool Stream1.Stream1Tool (AthenaOutputStreamTool)
 Stream1             DEBUG Data Deps for Stream1
-  + INPUT   ( 'AthenaAttributeList' , 'StoreGateSvc+MagicTag' ) 
+  + INPUT   ( 'AthenaAttributeList' , 'StoreGateSvc+MagicTag' )
 ClassIDSvc           INFO  getRegistryEntries: read 337 CLIDRegistry entries for module ALL
 Stream2             DEBUG Property update for OutputLevel : new value = 2
 Stream2.Stream2...  DEBUG Property update for OutputLevel : new value = 2
@@ -104,7 +104,7 @@ Stream2             DEBUG Registering all Tools in ToolHandleArray HelperTools
 Stream2             DEBUG Adding private ToolHandle tool Stream2.Stream2_MakeEventStreamInfo (MakeEventStreamInfo) from ToolHandleArray HelperTools
 Stream2             DEBUG Adding private ToolHandle tool Stream2.Stream2Tool (AthenaOutputStreamTool)
 Stream2             DEBUG Data Deps for Stream2
-  + INPUT   ( 'AthenaAttributeList' , 'StoreGateSvc+RunEventTag' ) 
+  + INPUT   ( 'AthenaAttributeList' , 'StoreGateSvc+RunEventTag' )
 DecisionSvc          INFO Inserting stream: Stream3 with no Algs
 Stream3.Stream3...   INFO Initializing Stream3.Stream3Tool - package version AthenaServices-00-00-00
 Stream3.Stream3...   INFO Initializing Stream3.Stream3_MakeEventStreamInfo - package version OutputStreamAthenaPool-00-00-00
diff --git a/Database/AthenaPOOL/PoolSvc/src/PoolSvc.cxx b/Database/AthenaPOOL/PoolSvc/src/PoolSvc.cxx
index 743e32375a81cafb0205726f29b123bdb5bf0d30..ae6e4bfd112242471740b0157eea51433c43d33c 100644
--- a/Database/AthenaPOOL/PoolSvc/src/PoolSvc.cxx
+++ b/Database/AthenaPOOL/PoolSvc/src/PoolSvc.cxx
@@ -222,8 +222,7 @@ StatusCode PoolSvc::setupPersistencySvc() {
 //__________________________________________________________________________
 StatusCode PoolSvc::start() {
    // Switiching on ROOT implicit multi threading for AthenaMT
-   if (Gaudi::Concurrency::ConcurrencyFlags::numThreads() > 1) {
-
+   if (m_useROOTIMT && Gaudi::Concurrency::ConcurrencyFlags::numThreads() > 1) {
       if (!m_persistencySvcVec[IPoolSvc::kInputStream]->session().technologySpecificAttributes(pool::ROOT_StorageType.type()).setAttribute<int>("ENABLE_IMPLICITMT", Gaudi::Concurrency::ConcurrencyFlags::numThreads() - 1)) {
          ATH_MSG_FATAL("Failed to enable implicit multithreading in ROOT via PersistencySvc.");
          return(StatusCode::FAILURE);
@@ -979,6 +978,7 @@ PoolSvc::PoolSvc(const std::string& name, ISvcLocator* pSvcLocator) :
 	m_guidLists() {
    declareProperty("WriteCatalog", m_writeCatalog = "xmlcatalog_file:PoolFileCatalog.xml");
    declareProperty("ReadCatalog", m_readCatalog);
+   declareProperty("UseROOTImplicitMT", m_useROOTIMT = true);
    declareProperty("AttemptCatalogPatch", m_attemptCatalogPatch = true);
    declareProperty("ConnectionRetrialPeriod", m_retrialPeriod = 300);
    declareProperty("ConnectionRetrialTimeOut", m_retrialTimeOut = 3600);
diff --git a/Database/AthenaPOOL/PoolSvc/src/PoolSvc.h b/Database/AthenaPOOL/PoolSvc/src/PoolSvc.h
index 55cc9e9a3d23abd40b4813a896ebdf0bed00fe46..15aed6cd8ad4507e9b847ff40b2ec8c1cf439a8d 100644
--- a/Database/AthenaPOOL/PoolSvc/src/PoolSvc.h
+++ b/Database/AthenaPOOL/PoolSvc/src/PoolSvc.h
@@ -203,6 +203,8 @@ private: // properties
    StringProperty m_writeCatalog;
    /// ReadCatalog, the list of additional POOL input file catalogs to consult: default = empty vector.
    StringArrayProperty m_readCatalog;
+   /// Use ROOT Implicit MultiThreading, default = true.
+   BooleanProperty m_useROOTIMT;
    /// AttemptCatalogPatch, option to create catalog: default = false.
    BooleanProperty m_attemptCatalogPatch;
    /// ConnectionRetrialPeriod, retry period for CORAL Connection Service: default = 30 seconds
diff --git a/Event/EventBookkeeperTools/src/EventCounterAlg.cxx b/Event/EventBookkeeperTools/src/EventCounterAlg.cxx
index 6483fbc951ed000c9f18a3da03529c1103c6723e..f9709885509a55117cb26d131b24ddce039684c4 100644
--- a/Event/EventBookkeeperTools/src/EventCounterAlg.cxx
+++ b/Event/EventBookkeeperTools/src/EventCounterAlg.cxx
@@ -1,7 +1,7 @@
 ///////////////////////// -*- C++ -*- /////////////////////////////
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 // EventCounterAlg.cxx
@@ -21,6 +21,7 @@
 // EDM includes
 #include "xAODCutFlow/CutBookkeeper.h"
 #include "xAODEventInfo/EventInfo.h"
+#include "StoreGate/ReadHandle.h"
 
 
 
@@ -64,6 +65,7 @@ StatusCode EventCounterAlg::initialize()
                                    xAOD::CutBookkeeper::CutLogic::ALLEVENTSPROCESSED,
                                    "AllStreams");
 
+  ATH_CHECK( m_eventInfoKey.initialize() );
   return StatusCode::SUCCESS;
 }
 
@@ -79,6 +81,7 @@ StatusCode EventCounterAlg::finalize()
 
 StatusCode EventCounterAlg::execute()
 {
+  const EventContext& ctx = Gaudi::Hive::currentContext();
   ATH_MSG_VERBOSE ("Executing " << this->name() << "...");
 
   setFilterPassed(true);
@@ -86,8 +89,7 @@ StatusCode EventCounterAlg::execute()
   // Update also the other counters for the non-nominal MC weights
   if (m_trackOtherMCWeights) {
     // Get the EventInfo object
-    const xAOD::EventInfo* evtInfo = 0;
-    ATH_CHECK( evtStore()->retrieve(evtInfo) );
+    SG::ReadHandle<xAOD::EventInfo> evtInfo (m_eventInfoKey, ctx);
     // Only try to access the mcEventWeight is we are running on Monte Carlo, duhhh!
     if ( !(evtInfo->eventType(xAOD::EventInfo::IS_SIMULATION)) ) {
       ATH_MSG_DEBUG("We are not running on simulation and thus, nothing to be done here");
diff --git a/Event/EventBookkeeperTools/src/EventCounterAlg.h b/Event/EventBookkeeperTools/src/EventCounterAlg.h
index 6b9fe87f1ab69392fe96ab07957d3f581b8136a6..20feee5020172cfdc9d293e3962c0af4a764b30a 100644
--- a/Event/EventBookkeeperTools/src/EventCounterAlg.h
+++ b/Event/EventBookkeeperTools/src/EventCounterAlg.h
@@ -1,7 +1,7 @@
 ///////////////////////// -*- C++ -*- /////////////////////////////
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 // EventCounterAlg.h
@@ -17,6 +17,8 @@
 
 // FrameWork includes
 #include "AthenaBaseComps/AthFilterAlgorithm.h"
+#include "StoreGate/ReadHandleKey.h"
+#include "xAODEventInfo/EventInfo.h"
 
 
 class EventCounterAlg
@@ -40,9 +42,9 @@ class EventCounterAlg
   //EventCounterAlg &operator=(const EventCounterAlg &alg);
 
   // Athena algorithm's Hooks
-  virtual StatusCode  initialize();
-  virtual StatusCode  execute();
-  virtual StatusCode  finalize();
+  virtual StatusCode  initialize() override;
+  virtual StatusCode  execute() override;
+  virtual StatusCode  finalize() override;
 
   ///////////////////////////////////////////////////////////////////
   // Const methods:
@@ -69,6 +71,8 @@ class EventCounterAlg
   /// Keep a vector of all cutIDs for the non-nominal MC event weights
   std::vector<CutIdentifier> m_mcCutIDs;
 
+  SG::ReadHandleKey<xAOD::EventInfo> m_eventInfoKey
+  { this, "EventInfoKey", "EventInfo", "" };
 };
 
 // I/O operators
diff --git a/Event/EventOverlay/EventOverlayJobTransforms/share/CaloOverlay_jobOptions.py b/Event/EventOverlay/EventOverlayJobTransforms/share/CaloOverlay_jobOptions.py
index e58aa30bd89e097bb48f62e796759d2ea005e8b3..02948ad6e3f864d0001c9ed3d9f753b43d757a84 100644
--- a/Event/EventOverlay/EventOverlayJobTransforms/share/CaloOverlay_jobOptions.py
+++ b/Event/EventOverlay/EventOverlayJobTransforms/share/CaloOverlay_jobOptions.py
@@ -70,6 +70,8 @@ if DetFlags.overlay.Tile_on():
        ServiceMgr.ByteStreamAddressProviderSvc.TypeNames += [ "TileDigitsContainer/TileDigitsCnt"]
        ServiceMgr.ByteStreamAddressProviderSvc.TypeNames += [ "TileL2Container/TileL2Cnt"]
        ServiceMgr.ByteStreamAddressProviderSvc.TypeNames += [ "TileLaserObject/TileLaserObj"]
+       ServiceMgr.ByteStreamAddressProviderSvc.TypeNames += [ "TileRawChannelContainer/MuRcvRawChCnt"]
+       ServiceMgr.ByteStreamAddressProviderSvc.TypeNames += [ "TileDigitsContainer/MuRcvDigitsCnt"]
 
     from TileRecUtils.TileDQstatusAlgDefault import TileDQstatusAlgDefault
     dqstatus = TileDQstatusAlgDefault()
diff --git a/Event/PyDumper/python/SgDumpLib.py b/Event/PyDumper/python/SgDumpLib.py
index 1365d31a5e17171aef9e5c4821c62d208492901e..695a0caba28188e1506e0a13cc249242182bfdc5 100644
--- a/Event/PyDumper/python/SgDumpLib.py
+++ b/Event/PyDumper/python/SgDumpLib.py
@@ -73,6 +73,7 @@ def _gen_jobo(dct):
                      'doAOD',
                      'doDPD',
                      'doEgamma',  # avoid dict clash
+                     'doCaloRinger', # avoid loading Ath libs too early
                      ):
             getattr (rec, item).set_Value_and_Lock(False)
 
diff --git a/Event/xAOD/xAODBase/CMakeLists.txt b/Event/xAOD/xAODBase/CMakeLists.txt
index 19ad43af8518959680f5eb3f391fda39103e4eab..070d24a61b750c16409e345bb3e3bd06082c23fc 100644
--- a/Event/xAOD/xAODBase/CMakeLists.txt
+++ b/Event/xAOD/xAODBase/CMakeLists.txt
@@ -38,8 +38,7 @@ atlas_add_dictionary( xAODBaseDict
 
 atlas_add_dictionary( xAODBaseObjectTypeDict
    xAODBase/xAODBaseObjectTypeDict.h
-   xAODBase/selection-ObjectType.xml
-   LINK_LIBRARIES xAODBase )
+   xAODBase/selection-ObjectType.xml)
 
 # Test(s) in the package:
 atlas_add_test( ut_xAODObjectType_test
diff --git a/Event/xAOD/xAODBase/Root/IParticleHelpers.cxx b/Event/xAOD/xAODBase/Root/IParticleHelpers.cxx
index 1350ca88bb59ed6d4de2d8993edd7ea3ea645aa5..fc1e915bce00677e74afc722f101746bdb3bf221 100644
--- a/Event/xAOD/xAODBase/Root/IParticleHelpers.cxx
+++ b/Event/xAOD/xAODBase/Root/IParticleHelpers.cxx
@@ -16,7 +16,7 @@
 namespace xAOD {
 
    /// Object used for setting/getting the dynamic decoration in question
-   static SG::AuxElement::Accessor< ElementLink< IParticleContainer > >
+   static const SG::AuxElement::Accessor< ElementLink< IParticleContainer > >
       acc( "originalObjectLink" );
 
    /// This function should be used by CP tools when they make a deep copy
diff --git a/Event/xAOD/xAODBase/xAODBase/ATLAS_CHECK_THREAD_SAFETY b/Event/xAOD/xAODBase/xAODBase/ATLAS_CHECK_THREAD_SAFETY
new file mode 100644
index 0000000000000000000000000000000000000000..78b65e6b1544e6c2bec6053be213b31cd579fb2a
--- /dev/null
+++ b/Event/xAOD/xAODBase/xAODBase/ATLAS_CHECK_THREAD_SAFETY
@@ -0,0 +1 @@
+Event/xAOD/xAODBase
diff --git a/Event/xAOD/xAODCaloEvent/Root/CaloClusterAccessors_v1.cxx b/Event/xAOD/xAODCaloEvent/Root/CaloClusterAccessors_v1.cxx
index 1761b0fd24f9489009a625039361b128b0441a62..3a8d455d0c3bd6d2e228f74db0e6033442bf03d7 100644
--- a/Event/xAOD/xAODCaloEvent/Root/CaloClusterAccessors_v1.cxx
+++ b/Event/xAOD/xAODCaloEvent/Root/CaloClusterAccessors_v1.cxx
@@ -14,13 +14,13 @@
 #define DEFINE_ACCESSOR( NAME )                                   \
    case xAOD::CaloCluster_v1::NAME:                               \
    {                                                              \
-      static SG::AuxElement::Accessor< float > a( #NAME );        \
+      static const SG::AuxElement::Accessor< float > a( #NAME );        \
       return &a;                                                  \
    }                                                              \
    break
 namespace xAOD {
 
-   SG::AuxElement::Accessor< float >*
+   const SG::AuxElement::Accessor< float >*
    momentAccessorV1( xAOD::CaloCluster_v1::MomentType moment ) {
 
       switch( moment ) {
@@ -65,14 +65,14 @@ namespace xAOD {
          DEFINE_ACCESSOR( OOC_WEIGHT );
          DEFINE_ACCESSOR( DM_WEIGHT );
          DEFINE_ACCESSOR( TILE_CONFIDENCE_LEVEL );
-	 DEFINE_ACCESSOR( VERTEX_FRACTION );
-	 DEFINE_ACCESSOR( NVERTEX_FRACTION );
+         DEFINE_ACCESSOR( VERTEX_FRACTION );
+         DEFINE_ACCESSOR( NVERTEX_FRACTION );
          DEFINE_ACCESSOR( ETACALOFRAME );
          DEFINE_ACCESSOR( PHICALOFRAME ); 
-	 DEFINE_ACCESSOR( ETA1CALOFRAME );
-	 DEFINE_ACCESSOR( PHI1CALOFRAME );
-	 DEFINE_ACCESSOR( ETA2CALOFRAME );
-	 DEFINE_ACCESSOR( PHI2CALOFRAME );
+         DEFINE_ACCESSOR( ETA1CALOFRAME );
+         DEFINE_ACCESSOR( PHI1CALOFRAME );
+         DEFINE_ACCESSOR( ETA2CALOFRAME );
+         DEFINE_ACCESSOR( PHI2CALOFRAME );
          DEFINE_ACCESSOR( ENG_CALIB_TOT );
          DEFINE_ACCESSOR( ENG_CALIB_OUT_L );
          DEFINE_ACCESSOR( ENG_CALIB_OUT_M );
diff --git a/Event/xAOD/xAODCaloEvent/Root/CaloClusterAccessors_v1.h b/Event/xAOD/xAODCaloEvent/Root/CaloClusterAccessors_v1.h
index 668964ec81f38fbe8c920b206c1ccd19834ff056..0103e956a81c217e6df059cf0d7c283e920ab8a0 100644
--- a/Event/xAOD/xAODCaloEvent/Root/CaloClusterAccessors_v1.h
+++ b/Event/xAOD/xAODCaloEvent/Root/CaloClusterAccessors_v1.h
@@ -21,7 +21,7 @@ namespace xAOD {
    /// @param moment The cluster moment for which an Accessor should be returned
    /// @returns A pointer to an Accessor if successful, <code>0</code> if not
    ///
-   SG::AuxElement::Accessor< float >*
+   const SG::AuxElement::Accessor< float >*
    momentAccessorV1( xAOD::CaloCluster_v1::MomentType moment );
 
 } // namespace xAOD
diff --git a/Event/xAOD/xAODCaloEvent/Root/CaloCluster_v1.cxx b/Event/xAOD/xAODCaloEvent/Root/CaloCluster_v1.cxx
index 5cb6d4cda360bbd3bf3b7d2304e5cd914f030eab..726723fbc38e6d731adc426266b1ab148aeab1a5 100644
--- a/Event/xAOD/xAODCaloEvent/Root/CaloCluster_v1.cxx
+++ b/Event/xAOD/xAODCaloEvent/Root/CaloCluster_v1.cxx
@@ -791,7 +791,7 @@ namespace xAOD {
   bool CaloCluster_v1::retrieveMoment( MomentType type, double& value ) const {
 
       // Get the moment accessor:
-      Accessor< float >* acc = momentAccessorV1( type );
+      const Accessor< float >* acc = momentAccessorV1( type );
       if( ! acc ) return false;
       // Check if the moment is available:
       if( ! acc->isAvailable( *this ) ) {
diff --git a/Event/xAOD/xAODCaloEvent/Root/CaloTower_v1.cxx b/Event/xAOD/xAODCaloEvent/Root/CaloTower_v1.cxx
index 7000eb830e85374062a54135831f6b94ead9f264..a064b45521155854e630c4dd457364227f1a1eed 100644
--- a/Event/xAOD/xAODCaloEvent/Root/CaloTower_v1.cxx
+++ b/Event/xAOD/xAODCaloEvent/Root/CaloTower_v1.cxx
@@ -1,15 +1,15 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 
 #include "xAODCaloEvent/versions/CaloTower_v1.h"
 #include "xAODCaloEvent/versions/CaloTowerContainer_v1.h"
-
-
 #include <cmath>
 
-double xAOD::CaloTower_v1::m_towerMass = 0.;
+namespace{
+const double s_towerMass{0.};
+}
 
 xAOD::CaloTower_v1::CaloTower_v1() 
   : IParticle() 
@@ -47,7 +47,7 @@ double xAOD::CaloTower_v1::phi()      const {
   return pTowCont->phi(index());
 }
 
-double xAOD::CaloTower_v1::m()        const { return m_towerMass; }
+double xAOD::CaloTower_v1::m()        const { return s_towerMass; }
 double xAOD::CaloTower_v1::rapidity() const { return eta(); }
 double xAOD::CaloTower_v1::pt()       const { return genvecP4().Pt(); } 
 
diff --git a/Event/xAOD/xAODCaloEvent/xAODCaloEvent/ATLAS_CHECK_THREAD_SAFETY b/Event/xAOD/xAODCaloEvent/xAODCaloEvent/ATLAS_CHECK_THREAD_SAFETY
new file mode 100644
index 0000000000000000000000000000000000000000..9c95d1d136cc070b8894bfd18a681e6ad3f55294
--- /dev/null
+++ b/Event/xAOD/xAODCaloEvent/xAODCaloEvent/ATLAS_CHECK_THREAD_SAFETY
@@ -0,0 +1 @@
+Event/xAOD/xAODCaloEvent
diff --git a/Event/xAOD/xAODCaloEvent/xAODCaloEvent/versions/CaloTower_v1.h b/Event/xAOD/xAODCaloEvent/xAODCaloEvent/versions/CaloTower_v1.h
index cc7523c92adf43ea21549a5fd4ee17c1261acf2f..0131656b4d0852e4ef7f76d76cb272d4ec6694db 100644
--- a/Event/xAOD/xAODCaloEvent/xAODCaloEvent/versions/CaloTower_v1.h
+++ b/Event/xAOD/xAODCaloEvent/xAODCaloEvent/versions/CaloTower_v1.h
@@ -1,7 +1,7 @@
 // -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef CALOEVENT_CALOTOWER_V1_H
@@ -81,16 +81,12 @@ namespace xAOD {
     float f_val_e()    const;   ///< @brief Accessor for energy 
     /// @}
 
-    /// @name Transient four-momentum store
-    /// @{
-    static  double m_towerMass;              ///> @brief Convention @f$ m_{\mathrm{tower}} = 0 @f$.
-    /// @}
   };
 }
 
-inline float& xAOD::CaloTower_v1::f_ref_e()    { static Accessor<float> acc("towerE");      return acc(*this); }
+inline float& xAOD::CaloTower_v1::f_ref_e()    { static const Accessor<float> acc("towerE"); return acc(*this); }
 
-inline float xAOD::CaloTower_v1::f_val_e()    const { static ConstAccessor<float> acc("towerE");      return acc(*this); }
+inline float xAOD::CaloTower_v1::f_val_e()    const { static const ConstAccessor<float> acc("towerE");  return acc(*this); }
 
 ///! @class xAOD::CaloTower_v1
 ///
diff --git a/Event/xAOD/xAODCaloRings/xAODCaloRings/CaloRingsContainer.h b/Event/xAOD/xAODCaloRings/xAODCaloRings/CaloRingsContainer.h
index d5726ae6690f493ad0c0b95b7de3a121d8cb45ee..af428f334e07a478dd3e272ab0becea05ae8fe52 100644
--- a/Event/xAOD/xAODCaloRings/xAODCaloRings/CaloRingsContainer.h
+++ b/Event/xAOD/xAODCaloRings/xAODCaloRings/CaloRingsContainer.h
@@ -1,8 +1,7 @@
+// Dear emacs, this is -*- c++ -*-
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
-
-// $Id: CaloRingsContainer.h 707323 2015-11-12 02:45:01Z wsfreund $
 #ifndef XAODCALORINGS_CALORINGSCONTAINER_H
 #define XAODCALORINGS_CALORINGSCONTAINER_H
 
@@ -11,8 +10,10 @@
 
 // Core include(s):
 #include "AthLinks/ElementLink.h"
-#include "StoreGate/ReadDecorHandle.h"
-#include "StoreGate/WriteDecorHandle.h"
+#ifndef XAOD_STANDALONE
+#   include "StoreGate/ReadDecorHandle.h"
+#   include "StoreGate/WriteDecorHandle.h"
+#endif // XAOD_STANDALONE
 
 // Local include(s):
 #include "xAODCaloRings/CaloRings.h"
@@ -27,10 +28,12 @@ typedef std::vector< ElementLink< CaloRingsContainer > > CaloRingsLinks;
 typedef SG::AuxElement::Decorator< xAOD::CaloRingsLinks > caloRingsDeco_t;
 /// The CaloRings element links reader type:
 typedef SG::AuxElement::ConstAccessor< xAOD::CaloRingsLinks > caloRingsReader_t;
+#ifndef XAOD_STANDALONE
 /// The CaloRings element links write decorator type:
 template<typename T> using caloRingsDecoH_t = SG::WriteDecorHandle<T, CaloRingsLinks>;
 /// The CaloRings element links write decorator type:
 template<typename T> using caloRingsReaderH_t = SG::ReadDecorHandle<T, CaloRingsLinks>;
+#endif // XAOD_STANDALONE
 } // namespace xAOD
 
 // Set up a CLID for the container:
diff --git a/Event/xAOD/xAODEgamma/xAODEgamma/ATLAS_CHECK_THREAD_SAFETY b/Event/xAOD/xAODEgamma/xAODEgamma/ATLAS_CHECK_THREAD_SAFETY
new file mode 100644
index 0000000000000000000000000000000000000000..5951f2dad9abb6a0f53e7cad1c4f714f5661787a
--- /dev/null
+++ b/Event/xAOD/xAODEgamma/xAODEgamma/ATLAS_CHECK_THREAD_SAFETY
@@ -0,0 +1 @@
+Event/xAOD/xAODEgamma
diff --git a/Event/xAOD/xAODEventInfo/Root/EventInfo_v1.cxx b/Event/xAOD/xAODEventInfo/Root/EventInfo_v1.cxx
index 3e38d8e32490e7f81c061f43a7f0c425dd12aa9d..44fcbaefaa87a357e4ed29dd893569182c118e8e 100644
--- a/Event/xAOD/xAODEventInfo/Root/EventInfo_v1.cxx
+++ b/Event/xAOD/xAODEventInfo/Root/EventInfo_v1.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2017, 2019 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: EventInfo_v1.cxx 729717 2016-03-14 18:52:01Z ssnyder $
@@ -54,14 +54,14 @@ namespace xAOD {
    using xAODEventInfoPrivate::operator<<;
 
    EventInfo_v1::EventInfo_v1()
-      : SG::AuxElement(), m_streamTags(), m_updateStreamTags( false ),
-        m_subEvents(), m_updateSubEvents( false ), m_evtStore( 0 ) {
+      : SG::AuxElement(), m_streamTags(),
+        m_subEvents(), m_evtStore( 0 ) {
 
    }
 
    EventInfo_v1::EventInfo_v1( const EventInfo_v1& parent )
       : SG::AuxElement(), m_streamTags(),
-        m_updateStreamTags( true ), m_subEvents(), m_updateSubEvents( true ),
+        m_subEvents(),
         m_evtStore( parent.m_evtStore ) {
 
       makePrivateStore( parent );
@@ -71,8 +71,10 @@ namespace xAOD {
 
       if (&rhs != this) {
         // Clear out the caches:
-        m_streamTags.clear(); m_updateStreamTags = true;
-        m_subEvents.clear(); m_updateSubEvents = true;
+        m_streamTags.store (std::vector< StreamTag >());
+        m_streamTags.reset();
+        m_subEvents.store (std::vector< SubEvent >());
+        m_subEvents.reset();
 
         // Copy the event store pointer:
         m_evtStore = rhs.m_evtStore;
@@ -240,24 +242,24 @@ namespace xAOD {
    //
    // Accessor objects for the stream properties:
    //
-   static EventInfo_v1::Accessor< std::vector< std::string > >
+   static const EventInfo_v1::Accessor< std::vector< std::string > >
       names( "streamTagNames" );
-   static EventInfo_v1::Accessor< std::vector< std::string > >
+   static const EventInfo_v1::Accessor< std::vector< std::string > >
       types( "streamTagTypes" );
-   static EventInfo_v1::Accessor< std::vector< char > >
+   static const EventInfo_v1::Accessor< std::vector< char > >
       olb( "streamTagObeysLumiblock" );
-   static EventInfo_v1::Accessor< std::vector< std::set< uint32_t > > >
+   static const EventInfo_v1::Accessor< std::vector< std::set< uint32_t > > >
       robsets( "streamTagRobs" );
-   static EventInfo_v1::Accessor< std::vector< std::set< uint32_t > > >
+   static const EventInfo_v1::Accessor< std::vector< std::set< uint32_t > > >
       detsets( "streamTagDets" );
 
    const std::vector< EventInfo_v1::StreamTag >&
    EventInfo_v1::streamTags() const {
 
       // Cache the new information if necessary:
-      if( m_updateStreamTags ) {
-         // The cache will be up to date after this:
-         m_updateStreamTags = false;
+      if( !m_streamTags.isValid() ) {
+         std::vector< StreamTag > tags;
+
          // A little sanity check:
          if( ( names( *this ).size() != types( *this ).size() ) ||
              ( names( *this ).size() != olb( *this ).size() ) ||
@@ -285,33 +287,36 @@ namespace xAOD {
             } else {
                std::cerr << detsets( *this ) << std::endl;
             }
-            return m_streamTags;
          }
-         // Clear the current cache:
-         m_streamTags.clear();
-         // Fill up the cache:
-         for( size_t i = 0; i < names( *this ).size(); ++i ) {
-            static const std::set< uint32_t > dummySet;
-            m_streamTags.push_back( StreamTag( names( *this )[ i ],
-                                               types( *this )[ i ],
-                                               olb( *this )[ i ],
-                                               ( robsets.isAvailable( *this ) ?
-                                                 robsets( *this )[ i ] :
-                                                 dummySet ),
-                                               ( detsets.isAvailable( *this ) ?
-                                                 detsets( *this )[ i ] :
-                                                 dummySet ) ) );
+
+         else {
+           // Fill the tags.
+           for( size_t i = 0; i < names( *this ).size(); ++i ) {
+             static const std::set< uint32_t > dummySet;
+             tags.emplace_back( names( *this )[ i ],
+                                types( *this )[ i ],
+                                olb( *this )[ i ],
+                                ( robsets.isAvailable( *this ) ?
+                                  robsets( *this )[ i ] :
+                                  dummySet ),
+                                ( detsets.isAvailable( *this ) ?
+                                  detsets( *this )[ i ] :
+                                  dummySet ) );
+           }
          }
+
+         // Set the cache.
+         m_streamTags.set (std::move (tags));
       }
 
       // Return the cached object:
-      return m_streamTags;
+      return *m_streamTags.ptr();
    }
 
    void EventInfo_v1::setStreamTags( const std::vector< StreamTag >& value ) {
 
       // Update the cached information:
-      m_streamTags = value;
+      m_streamTags.store (value);
 
       // Clear the persistent information:
       names( *this ).clear(); types( *this ).clear(); olb( *this ).clear();
@@ -328,9 +333,6 @@ namespace xAOD {
          detsets( *this ).push_back( itr->dets() );
       }
 
-      // The cache is now up to date:
-      m_updateStreamTags = false;
-
       return;
    }
 
@@ -416,97 +418,104 @@ namespace xAOD {
    //
    // Accessor objects for the sub-event properties:
    //
-   static SG::AuxElement::Accessor< std::vector< int16_t > >
+   static const SG::AuxElement::Accessor< std::vector< int16_t > >
       timeAcc( "subEventTime" );
-   static SG::AuxElement::Accessor< std::vector< uint16_t > >
+   static const SG::AuxElement::Accessor< std::vector< uint16_t > >
       indexAcc( "subEventIndex" );
-   static SG::AuxElement::Accessor< std::vector< ElementLink< EventInfoContainer_v1 > > >
+   static const SG::AuxElement::Accessor< std::vector< ElementLink< EventInfoContainer_v1 > > >
       linkAcc( "subEventLink" );
-   static SG::AuxElement::Accessor< std::vector< uint16_t > >
+   static const SG::AuxElement::Accessor< std::vector< uint16_t > >
       typeAcc( "subEventType" );
 
+   std::vector< EventInfo_v1::SubEvent >
+   EventInfo_v1::makeSubEvents() const
+   {
+     std::vector< SubEvent > subEvents;
+
+     // Check if any of the information is available:
+     if( ( ! timeAcc.isAvailable( *this ) ) &&
+         ( ! indexAcc.isAvailable( *this ) ) &&
+         ( ! linkAcc.isAvailable( *this ) ) &&
+         ( ! typeAcc.isAvailable( *this ) ) )
+     {
+       // If not, return right away:
+       return subEvents;
+     }
+     // A little sanity check:
+     size_t size = 0;
+     if( timeAcc.isAvailable( *this ) ) {
+       size = timeAcc( *this ).size();
+     } else if( indexAcc.isAvailable( *this ) ) {
+       size = indexAcc( *this ).size();
+     } else if( linkAcc.isAvailable( *this ) ) {
+       size = linkAcc( *this ).size();
+     } else if( typeAcc.isAvailable( *this ) ) {
+       size = typeAcc( *this ).size();
+     } else {
+       std::cerr << "xAOD::EventInfo_v1 ERROR Logic error in subEvents()"
+                 << std::endl;
+       return subEvents;
+     }
+     if( ( timeAcc.isAvailable( *this ) &&
+           ( size != timeAcc( *this ).size() ) ) ||
+         ( indexAcc.isAvailable( *this ) &&
+           ( size != indexAcc( *this ).size() ) ) ||
+         ( linkAcc.isAvailable( *this ) &&
+           ( size != linkAcc( *this ).size() ) ) ||
+         ( typeAcc.isAvailable( *this ) &&
+           ( size != typeAcc( *this ).size() ) ) ) {
+       std::cerr << "xAOD::EventInfo_v1 ERROR Data corruption found in "
+                 << "the sub-event information" << std::endl;
+       std::cerr << "subEventTime  = "
+                 << ( timeAcc.isAvailable( *this ) ? timeAcc( *this ) :
+                      std::vector< int16_t >() ) << std::endl;
+       std::cerr << "subEventIndex  = "
+                 << ( indexAcc.isAvailable( *this ) ? indexAcc( *this ) :
+                      std::vector< uint16_t >() ) << std::endl;
+       std::cerr << "subEventLink = "
+                 << ( linkAcc.isAvailable( *this ) ? linkAcc( *this ) :
+                      std::vector< ElementLink< EventInfoContainer_v1 > >() )
+                 << std::endl;
+       std::cerr << "subEventType  = "
+                 << ( typeAcc.isAvailable( *this ) ? typeAcc( *this ) :
+                      std::vector< uint16_t >() ) << std::endl;
+       return subEvents;
+     }
+     // Fill up the cache:
+     for( size_t i = 0; i < size; ++i ) {
+       const int16_t time =
+         timeAcc.isAvailable( *this ) ? timeAcc( *this )[ i ] : 0;
+       const uint16_t index =
+         indexAcc.isAvailable( *this ) ? indexAcc( *this )[ i ] : 0;
+       const ElementLink< EventInfoContainer_v1 > link =
+         linkAcc.isAvailable( *this ) ? linkAcc( *this )[ i ] :
+         ElementLink< EventInfoContainer_v1 >();
+       const PileUpType type =
+         ( typeAcc.isAvailable( *this ) ?
+           static_cast< PileUpType >( typeAcc( *this )[ i ] ) :
+           Unknown );
+       subEvents.emplace_back( time, index, type, link );
+     }
+
+     return subEvents;
+   }
+
    const std::vector< EventInfo_v1::SubEvent >&
    EventInfo_v1::subEvents() const {
 
       // Cache the new information if necessary:
-      if( m_updateSubEvents ) {
-         // The cache will be up to date after this:
-         m_updateSubEvents = false;
-         // Clear the current cache:
-         m_subEvents.clear();
-         // Check if any of the information is available:
-         if( ( ! timeAcc.isAvailable( *this ) ) &&
-             ( ! indexAcc.isAvailable( *this ) ) &&
-             ( ! linkAcc.isAvailable( *this ) ) &&
-             ( ! typeAcc.isAvailable( *this ) ) ) {
-            // If not, return right away:
-            return m_subEvents;
-         }
-         // A little sanity check:
-         size_t size = 0;
-         if( timeAcc.isAvailable( *this ) ) {
-            size = timeAcc( *this ).size();
-         } else if( indexAcc.isAvailable( *this ) ) {
-            size = indexAcc( *this ).size();
-         } else if( linkAcc.isAvailable( *this ) ) {
-            size = linkAcc( *this ).size();
-         } else if( typeAcc.isAvailable( *this ) ) {
-            size = typeAcc( *this ).size();
-         } else {
-            std::cerr << "xAOD::EventInfo_v1 ERROR Logic error in subEvents()"
-                      << std::endl;
-            return m_subEvents;
-         }
-         if( ( timeAcc.isAvailable( *this ) &&
-               ( size != timeAcc( *this ).size() ) ) ||
-             ( indexAcc.isAvailable( *this ) &&
-               ( size != indexAcc( *this ).size() ) ) ||
-             ( linkAcc.isAvailable( *this ) &&
-               ( size != linkAcc( *this ).size() ) ) ||
-             ( typeAcc.isAvailable( *this ) &&
-               ( size != typeAcc( *this ).size() ) ) ) {
-            std::cerr << "xAOD::EventInfo_v1 ERROR Data corruption found in "
-                      << "the sub-event information" << std::endl;
-            std::cerr << "subEventTime  = "
-                      << ( timeAcc.isAvailable( *this ) ? timeAcc( *this ) :
-                           std::vector< int16_t >() ) << std::endl;
-            std::cerr << "subEventIndex  = "
-                      << ( indexAcc.isAvailable( *this ) ? indexAcc( *this ) :
-                           std::vector< uint16_t >() ) << std::endl;
-            std::cerr << "subEventLink = "
-                      << ( linkAcc.isAvailable( *this ) ? linkAcc( *this ) :
-                           std::vector< ElementLink< EventInfoContainer_v1 > >() )
-                      << std::endl;
-            std::cerr << "subEventType  = "
-                      << ( typeAcc.isAvailable( *this ) ? typeAcc( *this ) :
-                           std::vector< uint16_t >() ) << std::endl;
-            return m_subEvents;
-         }
-         // Fill up the cache:
-         for( size_t i = 0; i < size; ++i ) {
-            const int16_t time =
-               timeAcc.isAvailable( *this ) ? timeAcc( *this )[ i ] : 0;
-            const uint16_t index =
-               indexAcc.isAvailable( *this ) ? indexAcc( *this )[ i ] : 0;
-            const ElementLink< EventInfoContainer_v1 > link =
-               linkAcc.isAvailable( *this ) ? linkAcc( *this )[ i ] :
-               ElementLink< EventInfoContainer_v1 >();
-            const PileUpType type =
-               ( typeAcc.isAvailable( *this ) ?
-                 static_cast< PileUpType >( typeAcc( *this )[ i ] ) :
-                 Unknown );
-            m_subEvents.push_back( SubEvent( time, index, type, link ) );
-         }
+      if( !m_subEvents.isValid() ) {
+        m_subEvents.set (makeSubEvents());
       }
 
       // Return the cached vector:
-      return m_subEvents;
+      return *m_subEvents.ptr();
    }
 
    void EventInfo_v1::setSubEvents( const std::vector< SubEvent >& value ) {
 
       // Update the cached information:
-      m_subEvents = value;
+      m_subEvents.store (value);
 
       // Clear the persistent information:
       timeAcc( *this ).clear(); indexAcc( *this ).clear();
@@ -522,9 +531,6 @@ namespace xAOD {
          linkAcc( *this ).push_back( itr->link() );
       }
 
-      // The cache is now up to date:
-      m_updateSubEvents = false;
-
       return;
    }
 
@@ -535,7 +541,9 @@ namespace xAOD {
       subEvents();
 
       // Now, add the new sub-event:
-      m_subEvents.push_back( subEvent );
+      std::vector<SubEvent> subEvents = *m_subEvents.ptr();
+      subEvents.push_back( subEvent );
+      m_subEvents.store (std::move (subEvents));
       timeAcc( *this ).push_back( subEvent.time() );
       indexAcc( *this ).push_back( subEvent.index() );
       typeAcc( *this ).push_back( static_cast< uint16_t >( subEvent.type() ) );
@@ -547,13 +555,11 @@ namespace xAOD {
    void EventInfo_v1::clearSubEvents() {
 
       // Clear both the transient and persistent variables:
-      m_subEvents.clear();
+      m_subEvents.store (std::vector<SubEvent>());
+      m_subEvents.reset();
       timeAcc( *this ).clear(); indexAcc( *this ).clear();
       typeAcc( *this ).clear(); linkAcc( *this ).clear();
 
-      // Things are definitely in sync right now:
-      m_updateSubEvents = false;
-
       return;
    }
    
@@ -799,9 +805,9 @@ namespace xAOD {
    void EventInfo_v1::setBeamPos( float x, float y, float z ) {
 
       // The accessor objects:
-      static Accessor< float > accX( "beamPosX" );
-      static Accessor< float > accY( "beamPosY" );
-      static Accessor< float > accZ( "beamPosZ" );
+      static const Accessor< float > accX( "beamPosX" );
+      static const Accessor< float > accY( "beamPosY" );
+      static const Accessor< float > accZ( "beamPosZ" );
 
       // Set the variables:
       accX( *this ) = x;
@@ -818,9 +824,9 @@ namespace xAOD {
    void EventInfo_v1::setBeamPosSigma( float x, float y, float z ) {
 
       // The accessor objects:
-      static Accessor< float > accX( "beamPosSigmaX" );
-      static Accessor< float > accY( "beamPosSigmaY" );
-      static Accessor< float > accZ( "beamPosSigmaZ" );
+      static const Accessor< float > accX( "beamPosSigmaX" );
+      static const Accessor< float > accY( "beamPosSigmaY" );
+      static const Accessor< float > accZ( "beamPosSigmaZ" );
 
       // Set the variables:
       accX( *this ) = x;
@@ -879,8 +885,8 @@ namespace xAOD {
    ///
    void EventInfo_v1::toTransient() {
 
-      m_updateStreamTags = true;
-      m_updateSubEvents = true;
+      m_streamTags.reset();
+      m_subEvents.reset();
       m_evtStore = 0;
 
       if( usingStandaloneStore() ) {
diff --git a/Event/xAOD/xAODEventInfo/test/ut_xaodeventinfo_evtstore_test.cxx b/Event/xAOD/xAODEventInfo/test/ut_xaodeventinfo_evtstore_test.cxx
index 0c1b9419d7ffd15d29b37b2695dfc296a27d2f94..7695803a6a05c588dd998fa7131dc415ddc611d3 100644
--- a/Event/xAOD/xAODEventInfo/test/ut_xaodeventinfo_evtstore_test.cxx
+++ b/Event/xAOD/xAODEventInfo/test/ut_xaodeventinfo_evtstore_test.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: ut_xaodeventinfo_evtstore_test.cxx 727083 2016-03-01 15:20:50Z krasznaa $
@@ -7,6 +7,7 @@
 // System include(s):
 #include <memory>
 #include <iostream>
+#include <unistd.h>
 
 // ROOT include(s):
 #include <TFile.h>
@@ -162,7 +163,7 @@ int main() {
 
    // Close and delete the file:
    ifile->Close();
-   SIMPLE_ASSERT( gSystem->Unlink( "eiTest.root" ) == 0 );
+   SIMPLE_ASSERT( unlink( "eiTest.root" ) == 0 );
 
    // Return gracefully:
    return 0;
diff --git a/Event/xAOD/xAODEventInfo/xAODEventInfo/ATLAS_CHECK_THREAD_SAFETY b/Event/xAOD/xAODEventInfo/xAODEventInfo/ATLAS_CHECK_THREAD_SAFETY
new file mode 100644
index 0000000000000000000000000000000000000000..15feeb732f849b1d84a9200abaaaa9781a211084
--- /dev/null
+++ b/Event/xAOD/xAODEventInfo/xAODEventInfo/ATLAS_CHECK_THREAD_SAFETY
@@ -0,0 +1 @@
+Event/xAOD/xAODEventInfo
diff --git a/Event/xAOD/xAODEventInfo/xAODEventInfo/versions/EventInfo_v1.h b/Event/xAOD/xAODEventInfo/xAODEventInfo/versions/EventInfo_v1.h
index cf83678bed3cd40f891cd337aac6fb858d7c049a..d8ee33a9f99a555bcade0cb4d8ba1bd73e8b12bf 100644
--- a/Event/xAOD/xAODEventInfo/xAODEventInfo/versions/EventInfo_v1.h
+++ b/Event/xAOD/xAODEventInfo/xAODEventInfo/versions/EventInfo_v1.h
@@ -21,6 +21,8 @@ extern "C" {
 #include "AthContainers/AuxElement.h"
 #include "AthContainers/DataVector.h"
 #include "AthLinks/ElementLink.h"
+#include "CxxUtils/CachedValue.h"
+#include "CxxUtils/checker_macros.h"
 
 // Forward declaration(s):
 class StoreGateSvc;
@@ -467,7 +469,7 @@ namespace xAOD {
 
 #if not defined(__GCCXML__) and not defined(__ROOTCLING__)
       /// Get the pointer to the event store associated with this event
-      StoreGateSvc* evtStore() const;
+      StoreGateSvc* evtStore ATLAS_NOT_CONST_THREAD_SAFE () const;
       /// Set the pointer to the event store associated with this event
       void setEvtStore( StoreGateSvc* svc ) const;
 #endif // not genreflex or rootcint/rootcling
@@ -480,14 +482,12 @@ namespace xAOD {
       void toTransient();
 
    private:
+      std::vector< EventInfo_v1::SubEvent > makeSubEvents() const;
+
       /// Cached stream tag objects
-      mutable std::vector< StreamTag > m_streamTags;
-      /// Flag for updating the cached stream tags if necessary
-      mutable bool m_updateStreamTags;
+      CxxUtils::CachedValue<std::vector< StreamTag > > m_streamTags;
       /// Cached sub-event objects
-      mutable std::vector< SubEvent > m_subEvents;
-      /// Flag for updating the cached sub-events if necessary
-      mutable bool m_updateSubEvents;
+      CxxUtils::CachedValue<std::vector< SubEvent>  > m_subEvents;
 
 #ifndef __GCCXML__
       /// Transient pointer to the StoreGateSvc instance associated with the
diff --git a/Event/xAOD/xAODMuon/Root/MuonAccessors_v1.h b/Event/xAOD/xAODMuon/Root/MuonAccessors_v1.h
index 50113dea52a385f3b2ea7be2b8894bf2e4ea2770..377a51af2db7fa6a903d791bcf16c570530294e5 100644
--- a/Event/xAOD/xAODMuon/Root/MuonAccessors_v1.h
+++ b/Event/xAOD/xAODMuon/Root/MuonAccessors_v1.h
@@ -1,10 +1,9 @@
 // Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
-// $Id: MuonAccessors_v1.h 647346 2015-02-17 10:24:03Z emoyse $
 #ifndef XAODMUON_MUONACCESSORS_V1_H
 #define XAODMUON_MUONACCESSORS_V1_H
 
@@ -22,7 +21,7 @@ namespace xAOD {
    /// Muon_v1 object at runtime to get/set parameter values on themselves.
    ///
    template <class T>
-   SG::AuxElement::Accessor< T >*
+   const SG::AuxElement::Accessor< T >*
    parameterAccessorV1( Muon_v1::ParamDef type );
    
 } // namespace xAOD
diff --git a/Event/xAOD/xAODMuon/Root/MuonAccessors_v1.icc b/Event/xAOD/xAODMuon/Root/MuonAccessors_v1.icc
index 3e68c495ab7ddba86e2307b34dcb503f0c0f1ffd..abfac21bec19bf3b90544300d19103cbbf89c780 100644
--- a/Event/xAOD/xAODMuon/Root/MuonAccessors_v1.icc
+++ b/Event/xAOD/xAODMuon/Root/MuonAccessors_v1.icc
@@ -1,10 +1,9 @@
 // Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
-// $Id: MuonAccessors_v1.icc 745098 2016-05-05 15:47:04Z wleight $
 
 // System include(s):
 #include <iostream>
@@ -13,7 +12,7 @@
 #define DEFINE_ACCESSOR(TYPE, NAME )                               \
    case xAOD::Muon_v1::NAME:                                                \
    {                                                               \
-      static SG::AuxElement::Accessor< TYPE > a( #NAME );          \
+      static const SG::AuxElement::Accessor< TYPE > a( #NAME );          \
       return &a;                                                   \
    }                                                               \
    break;
@@ -22,12 +21,12 @@ namespace xAOD {
 
   // Generic case. Maybe return warning?
   template<class T>
-   SG::AuxElement::Accessor< T >*
+   const SG::AuxElement::Accessor< T >*
    parameterAccessorV1( Muon_v1::ParamDef /*type*/ )
    {}
    
   template<>
-   SG::AuxElement::Accessor< float >*
+   const SG::AuxElement::Accessor< float >*
    parameterAccessorV1<float>( Muon_v1::ParamDef type ) {
       switch( type ) {
         DEFINE_ACCESSOR( float, spectrometerFieldIntegral        );
@@ -45,11 +44,8 @@ namespace xAOD {
         DEFINE_ACCESSOR( float, midAngle                         );
         DEFINE_ACCESSOR( float, msInnerMatchChi2                 );
         DEFINE_ACCESSOR( float, msOuterMatchChi2                 );
-        // DEFINE_ACCESSOR( float, msInnerMatchDOF                  ); These ParamDefs are INT and defined below.
-        // DEFINE_ACCESSOR( float, msOuterMatchDOF                  );
         DEFINE_ACCESSOR( float, meanDeltaADCCountsMDT            );		
         DEFINE_ACCESSOR( float, CaloLRLikelihood                 );		
-        // DEFINE_ACCESSOR( float, CaloMuonIDTag                    ); INT
         DEFINE_ACCESSOR( float, FSR_CandidateEnergy              );		
         DEFINE_ACCESSOR( float, EnergyLoss                       );		
         DEFINE_ACCESSOR( float, ParamEnergyLoss                  );		
@@ -58,13 +54,7 @@ namespace xAOD {
         DEFINE_ACCESSOR( float, ParamEnergyLossSigmaPlus         );		
         DEFINE_ACCESSOR( float, ParamEnergyLossSigmaMinus        );		
         DEFINE_ACCESSOR( float, MeasEnergyLossSigma              );		
-	//DEFINE_ACCESSOR( float, d0_sa                            );
-	//DEFINE_ACCESSOR( float, z0_sa                            );
-	//DEFINE_ACCESSOR( float, phi0_sa                          );
-	//DEFINE_ACCESSOR( float, theta_sa                         );
-	//DEFINE_ACCESSOR( float, qOverP_sa                        );
-	//DEFINE_ACCESSOR( float, Eloss_sa                         );
-      default:                  
+    default:                  
          std::cerr << "xAOD::Muon::parameterAccessorV1 ERROR Unknown float ParamDef ("
                    << type << ") requested.";
          if (type == Muon_v1::msInnerMatchDOF || type == Muon_v1::msOuterMatchDOF || type == Muon_v1::CaloMuonIDTag) 
@@ -75,7 +65,7 @@ namespace xAOD {
    }
    
    template<>
-    SG::AuxElement::Accessor< int >*
+    const SG::AuxElement::Accessor< int >*
     parameterAccessorV1<int>( Muon_v1::ParamDef type ) {
        switch( type ) {
          DEFINE_ACCESSOR( int,   msInnerMatchDOF                  );
diff --git a/Event/xAOD/xAODMuon/Root/MuonSegment_v1.cxx b/Event/xAOD/xAODMuon/Root/MuonSegment_v1.cxx
index 8654645844c17301c8af84daf553a429ad39f663..b87274d5b88fd4303504da80fbb71c6112190372 100644
--- a/Event/xAOD/xAODMuon/Root/MuonSegment_v1.cxx
+++ b/Event/xAOD/xAODMuon/Root/MuonSegment_v1.cxx
@@ -1,8 +1,7 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
-// $Id: MuonSegment_v1.cxx 612402 2014-08-19 07:28:08Z htorres $
 
 // EDM include(s):
 #include "xAODCore/AuxStoreAccessorMacros.h"
@@ -21,11 +20,11 @@ namespace xAOD {
   AUXSTORE_PRIMITIVE_GETTER( MuonSegment_v1, float, z )
 
   void MuonSegment_v1::setPosition(float x, float y, float z) {
-    static Accessor< float > acc1( "x" );
+    static const Accessor< float > acc1( "x" );
     acc1( *this ) = x;
-    static Accessor< float > acc2( "y" );
+    static const Accessor< float > acc2( "y" );
     acc2( *this ) = y;
-    static Accessor< float > acc3( "z" );
+    static const Accessor< float > acc3( "z" );
     acc3( *this ) = z;
   }
   
@@ -34,11 +33,11 @@ namespace xAOD {
   AUXSTORE_PRIMITIVE_GETTER( MuonSegment_v1, float, pz )
 
   void MuonSegment_v1::setDirection(float px, float py, float pz) {
-    static Accessor< float > acc1( "px" );
+    static const Accessor< float > acc1( "px" );
     acc1( *this ) = px;
-    static Accessor< float > acc2( "py" );
+    static const Accessor< float > acc2( "py" );
     acc2( *this ) = py;
-    static Accessor< float > acc3( "pz" );
+    static const Accessor< float > acc3( "pz" );
     acc3( *this ) = pz;
   }
 
@@ -46,9 +45,9 @@ namespace xAOD {
   AUXSTORE_PRIMITIVE_GETTER( MuonSegment_v1, float, t0error )
 
   void MuonSegment_v1::setT0Error(float t0, float t0error) {
-    static Accessor< float > acc1( "t0" );
+    static const Accessor< float > acc1( "t0" );
     acc1( *this ) = t0;  
-    static Accessor< float > acc2( "t0error" );
+    static const Accessor< float > acc2( "t0error" );
     acc2( *this ) = t0error;   
   }
 
@@ -56,9 +55,9 @@ namespace xAOD {
   AUXSTORE_PRIMITIVE_GETTER( MuonSegment_v1, float, numberDoF  )
 
   void MuonSegment_v1::setFitQuality(float chiSquared, float numberDoF) {
-    static Accessor< float > acc1( "chiSquared" );
+    static const Accessor< float > acc1( "chiSquared" );
     acc1( *this ) = chiSquared;  
-    static Accessor< float > acc2( "numberDoF" );
+    static const Accessor< float > acc2( "numberDoF" );
     acc2( *this ) = numberDoF;   
   }
 
@@ -68,13 +67,13 @@ namespace xAOD {
   AUXSTORE_PRIMITIVE_GETTER_WITH_CAST( MuonSegment_v1, int, Muon::MuonStationIndex::TechnologyIndex, technology )
 
   void MuonSegment_v1::setIdentifier(int sector, Muon::MuonStationIndex::ChIndex chamberIndex, int etaIndex, Muon::MuonStationIndex::TechnologyIndex technology) {
-    static Accessor< int   > acc1( "sector" );
+    static const Accessor< int   > acc1( "sector" );
     acc1( *this ) = sector;
-    static Accessor< int   > acc2( "chamberIndex" );
+    static const Accessor< int   > acc2( "chamberIndex" );
     acc2( *this ) = static_cast<int>(chamberIndex);
-    static Accessor< int   > acc3( "etaIndex" );
+    static const Accessor< int   > acc3( "etaIndex" );
     acc3( *this ) = etaIndex;
-    static Accessor< int   > acc4( "technology" );
+    static const Accessor< int   > acc4( "technology" );
     acc4( *this ) = static_cast<int>(technology);
   }
 
@@ -83,11 +82,11 @@ namespace xAOD {
   AUXSTORE_PRIMITIVE_GETTER( MuonSegment_v1, int  , nTrigEtaLayers )
 
   void MuonSegment_v1::setNHits(int nPrecisionHits, int nPhiLayers, int nTrigEtaLayers) {
-    static Accessor< int   > acc1( "nPrecisionHits" );
+    static const Accessor< int   > acc1( "nPrecisionHits" );
     acc1( *this ) = nPrecisionHits;
-    static Accessor< int   > acc2( "nPhiLayers" );
+    static const Accessor< int   > acc2( "nPhiLayers" );
     acc2( *this ) = nPhiLayers;
-    static Accessor< int   > acc3( "nTrigEtaLayers" );
+    static const Accessor< int   > acc3( "nTrigEtaLayers" );
     acc3( *this ) = nTrigEtaLayers;
   }
 
diff --git a/Event/xAOD/xAODMuon/Root/MuonTrackSummaryAccessors_v1.cxx b/Event/xAOD/xAODMuon/Root/MuonTrackSummaryAccessors_v1.cxx
index 5b356d7a414d76371cb5b11cf4ed37a887df1104..0da68c9354b5ab6c2e6fddd69accb075a806b42c 100644
--- a/Event/xAOD/xAODMuon/Root/MuonTrackSummaryAccessors_v1.cxx
+++ b/Event/xAOD/xAODMuon/Root/MuonTrackSummaryAccessors_v1.cxx
@@ -14,14 +14,14 @@
 #define DEFINE_ACCESSOR(TYPE, NAME )                               \
    case xAOD::NAME:                                                \
    {                                                               \
-      static SG::AuxElement::Accessor< TYPE > a( #NAME );          \
+      static const SG::AuxElement::Accessor< TYPE > a( #NAME );          \
       return &a;                                                   \
    }                                                               \
    break;
 
 namespace xAOD {
 
-   SG::AuxElement::Accessor< uint8_t >*
+   const SG::AuxElement::Accessor< uint8_t >*
    muonTrackSummaryAccessorV1( xAOD::MuonSummaryType type ) {
 
       switch( type ) {
@@ -105,23 +105,23 @@ namespace xAOD {
         DEFINE_ACCESSOR( uint8_t, etaLayer3TGCHoles );
         DEFINE_ACCESSOR( uint8_t, etaLayer4TGCHoles );
 
-	DEFINE_ACCESSOR( uint8_t, innerClosePrecisionHits );
-	DEFINE_ACCESSOR( uint8_t, middleClosePrecisionHits );
-	DEFINE_ACCESSOR( uint8_t, outerClosePrecisionHits );
-	DEFINE_ACCESSOR( uint8_t, extendedClosePrecisionHits );
+        DEFINE_ACCESSOR( uint8_t, innerClosePrecisionHits );
+        DEFINE_ACCESSOR( uint8_t, middleClosePrecisionHits );
+        DEFINE_ACCESSOR( uint8_t, outerClosePrecisionHits );
+        DEFINE_ACCESSOR( uint8_t, extendedClosePrecisionHits );
 
-	DEFINE_ACCESSOR( uint8_t, innerOutBoundsPrecisionHits );
+        DEFINE_ACCESSOR( uint8_t, innerOutBoundsPrecisionHits );
         DEFINE_ACCESSOR( uint8_t, middleOutBoundsPrecisionHits );
-	DEFINE_ACCESSOR( uint8_t, outerOutBoundsPrecisionHits );
+        DEFINE_ACCESSOR( uint8_t, outerOutBoundsPrecisionHits );
         DEFINE_ACCESSOR( uint8_t, extendedOutBoundsPrecisionHits );
 
-	DEFINE_ACCESSOR( uint8_t, combinedTrackOutBoundsPrecisionHits );
+        DEFINE_ACCESSOR( uint8_t, combinedTrackOutBoundsPrecisionHits );
 
-	DEFINE_ACCESSOR( uint8_t, isEndcapGoodLayers );
-	DEFINE_ACCESSOR( uint8_t, isSmallGoodSectors );
+        DEFINE_ACCESSOR( uint8_t, isEndcapGoodLayers );
+        DEFINE_ACCESSOR( uint8_t, isSmallGoodSectors );
 
-	DEFINE_ACCESSOR( uint8_t, cscEtaHits );
-	DEFINE_ACCESSOR( uint8_t, cscUnspoiledEtaHits );
+        DEFINE_ACCESSOR( uint8_t, cscEtaHits );
+        DEFINE_ACCESSOR( uint8_t, cscUnspoiledEtaHits );
 
       default:                  
          std::cerr << "xAOD::MuonTrackParticle_v1 ERROR Unknown MuonSummaryType ("
diff --git a/Event/xAOD/xAODMuon/Root/MuonTrackSummaryAccessors_v1.h b/Event/xAOD/xAODMuon/Root/MuonTrackSummaryAccessors_v1.h
index a5a6c6c4c762add6e08e8e4de1857b7729c030de..520d0d371855cf026063732a31facae753d1413a 100644
--- a/Event/xAOD/xAODMuon/Root/MuonTrackSummaryAccessors_v1.h
+++ b/Event/xAOD/xAODMuon/Root/MuonTrackSummaryAccessors_v1.h
@@ -21,7 +21,7 @@ namespace xAOD {
    /// This function holds on to Accessor objects that can be used by each
    /// TrackParticle_v1 object at runtime to get/set summary values on themselves.
    ///
-   SG::AuxElement::Accessor< uint8_t >*
+   const SG::AuxElement::Accessor< uint8_t >*
    muonTrackSummaryAccessorV1( xAOD::MuonSummaryType type );
 
 } // namespace xAOD
diff --git a/Event/xAOD/xAODMuon/Root/Muon_v1.cxx b/Event/xAOD/xAODMuon/Root/Muon_v1.cxx
index aeccee57b20eb6fbf411bbcb2aa8beadb25aab2a..b0f77f4218bbbfd90e4b57fae10ac33e00180605 100644
--- a/Event/xAOD/xAODMuon/Root/Muon_v1.cxx
+++ b/Event/xAOD/xAODMuon/Root/Muon_v1.cxx
@@ -1,8 +1,7 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
-// $Id: Muon_v1.cxx 792230 2017-01-15 06:03:39Z ssnyder $
 // Misc includes
 #include <vector>
 
@@ -67,9 +66,9 @@ namespace xAOD {
   }
 
   void Muon_v1::setP4(double pt, double eta, double phi)  {
-    static Accessor< float > acc1( "pt" );
-    static Accessor< float > acc2( "eta" );
-    static Accessor< float > acc3( "phi" );
+    static const Accessor< float > acc1( "pt" );
+    static const Accessor< float > acc2( "eta" );
+    static const Accessor< float > acc3( "phi" );
     acc1( *this )=pt;
     acc2( *this )=eta;
     acc3( *this )=phi;
@@ -107,12 +106,12 @@ namespace xAOD {
 
 
   void Muon_v1::addAllAuthor ( const Author author ){
-    static Accessor< uint16_t > acc( "allAuthors" );
+    static const Accessor< uint16_t > acc( "allAuthors" );
     acc(*this) |= 1<<static_cast<unsigned int>(author);
   }
 
   bool Muon_v1::isAuthor ( const Author author ) const{
-    static Accessor< uint16_t > acc( "allAuthors" );
+    static const Accessor< uint16_t > acc( "allAuthors" );
     return (acc(*this)& (1<<static_cast<unsigned int>(author)));
   }
 
@@ -124,7 +123,7 @@ namespace xAOD {
     // @todo ?Could further optimise the below, to see first if the SummaryType value is one of the ones we write to Muons?
     // @todo ?Is there a better way than catching the exception?
     try {
-      Muon_v1::Accessor< uint8_t >* acc = trackSummaryAccessorV1<uint8_t>( information ); 
+      const Muon_v1::Accessor< uint8_t >* acc = trackSummaryAccessorV1<uint8_t>( information ); 
       value = ( *acc )( *this );
       return true;
     } catch ( SG::ExcBadAuxVar& ) {}
@@ -136,7 +135,7 @@ namespace xAOD {
   }  
 
   void Muon_v1::setSummaryValue( uint8_t  value, const SummaryType 	information ) {
-    Muon_v1::Accessor< uint8_t >* acc = trackSummaryAccessorV1<uint8_t>( information ); ///FIXME!
+    const Muon_v1::Accessor< uint8_t >* acc = trackSummaryAccessorV1<uint8_t>( information ); ///FIXME!
     // Set the value:
     ( *acc )( *this ) = value;
   }
@@ -150,17 +149,17 @@ namespace xAOD {
   }  
   
   float Muon_v1::floatSummaryValue(const SummaryType information) const {
-    Muon_v1::Accessor< float >* acc = trackSummaryAccessorV1< float >( information );
+    const Muon_v1::Accessor< float >* acc = trackSummaryAccessorV1< float >( information );
   	return ( *acc )( *this );
   }
 
   uint8_t Muon_v1::uint8SummaryValue(const SummaryType information) const{
-    Muon_v1::Accessor< uint8_t >* acc = trackSummaryAccessorV1< uint8_t >( information );
+    const Muon_v1::Accessor< uint8_t >* acc = trackSummaryAccessorV1< uint8_t >( information );
     return ( *acc )( *this );  	
   }
   
   bool Muon_v1::summaryValue(uint8_t& value, const MuonSummaryType information)  const {
-    Muon_v1::Accessor< uint8_t >* acc = muonTrackSummaryAccessorV1( information );
+    const Muon_v1::Accessor< uint8_t >* acc = muonTrackSummaryAccessorV1( information );
     if( ! acc ) return false;
     if( ! acc->isAvailable( *this ) ) return false;
     
@@ -170,19 +169,19 @@ namespace xAOD {
   }
   
   float Muon_v1::uint8MuonSummaryValue(const MuonSummaryType information) const{
-	  Muon_v1::Accessor< uint8_t >* acc = muonTrackSummaryAccessorV1( information );
+	  const Muon_v1::Accessor< uint8_t >* acc = muonTrackSummaryAccessorV1( information );
 	  return ( *acc )( *this );
   }
   
 
   void Muon_v1::setSummaryValue(uint8_t value, const MuonSummaryType information) {
-    Muon_v1::Accessor< uint8_t >* acc = muonTrackSummaryAccessorV1( information );
+    const Muon_v1::Accessor< uint8_t >* acc = muonTrackSummaryAccessorV1( information );
     // Set the value:
     ( *acc )( *this ) =  value;
   }
   
   bool Muon_v1::parameter(float& value, const Muon_v1::ParamDef information)  const {
-    xAOD::Muon_v1::Accessor< float >* acc = parameterAccessorV1<float>( information );
+    const xAOD::Muon_v1::Accessor< float >* acc = parameterAccessorV1<float>( information );
     if( ! acc ) return false;
     if( ! acc->isAvailable( *this ) ) return false;
     
@@ -192,12 +191,12 @@ namespace xAOD {
   }
 	
   float xAOD::Muon_v1::floatParameter(xAOD::Muon_v1::ParamDef information) const{
-    xAOD::Muon_v1::Accessor< float >* acc = parameterAccessorV1<float>( information );
+    const xAOD::Muon_v1::Accessor< float >* acc = parameterAccessorV1<float>( information );
     return ( *acc )( *this );
   }
 
   void Muon_v1::setParameter(float value, const Muon_v1::ParamDef information){
-    xAOD::Muon_v1::Accessor< float >* acc = parameterAccessorV1<float>( information );
+    const xAOD::Muon_v1::Accessor< float >* acc = parameterAccessorV1<float>( information );
     if( ! acc ) throw std::runtime_error("Muon_v1::setParameter - no float accessor for paramdef number: "+std::to_string(information));
     
     // Set the value:
@@ -205,7 +204,7 @@ namespace xAOD {
   }
   
   bool Muon_v1::parameter(int& value, const Muon_v1::ParamDef information)  const {
-    xAOD::Muon_v1::Accessor< int >* acc = parameterAccessorV1<int>( information );
+    const xAOD::Muon_v1::Accessor< int >* acc = parameterAccessorV1<int>( information );
     if( ! acc ) return false;
     if( ! acc->isAvailable( *this ) ) return false;
     
@@ -215,12 +214,12 @@ namespace xAOD {
   }
 	
   int xAOD::Muon_v1::intParameter(xAOD::Muon_v1::ParamDef information) const{
-    xAOD::Muon_v1::Accessor< int >* acc = parameterAccessorV1<int>( information );
+    const xAOD::Muon_v1::Accessor< int >* acc = parameterAccessorV1<int>( information );
     return ( *acc )( *this );
   }
 
   void Muon_v1::setParameter(int value, const Muon_v1::ParamDef information){
-    xAOD::Muon_v1::Accessor< int >* acc = parameterAccessorV1<int>( information );
+    const xAOD::Muon_v1::Accessor< int >* acc = parameterAccessorV1<int>( information );
     if( ! acc ) throw std::runtime_error("Muon_v1::setParameter - no int accessor for paramdef number: "+std::to_string(information));
     
     // Set the value:
@@ -228,13 +227,13 @@ namespace xAOD {
   }
 
   xAOD::Muon_v1::Quality Muon_v1::quality() const {
-    static Accessor< uint8_t > acc( "quality" );
+    static const Accessor< uint8_t > acc( "quality" );
     uint8_t temp =  acc( *this );
     return static_cast<Quality>(temp&3);     
   }
   
   void Muon_v1::setQuality(xAOD::Muon_v1::Quality value) {
-    static Accessor< uint8_t > acc( "quality" );
+    static const Accessor< uint8_t > acc( "quality" );
     uint8_t temp = static_cast< uint8_t >(value);
     acc( *this ) = acc( *this ) & ~(0x7); // Reset the first 3 bits.
     acc( *this ) |= temp;
@@ -242,14 +241,14 @@ namespace xAOD {
   }
   
   bool Muon_v1::passesIDCuts() const {
-    static Accessor< uint8_t > acc( "quality" );
+    static const Accessor< uint8_t > acc( "quality" );
     uint8_t temp =  acc( *this );
     // We use 4th bit for 'passesIDCuts'
     return temp&8;     
   }
   
   void Muon_v1::setPassesIDCuts(bool value) {
-    static Accessor< uint8_t > acc( "quality" );
+    static const Accessor< uint8_t > acc( "quality" );
     // We use 4th bit for 'passesIDCuts'
     if (value) acc( *this ) |= 8;
     else       acc( *this ) &= 247;
@@ -257,14 +256,14 @@ namespace xAOD {
   }
   
   bool Muon_v1::passesHighPtCuts() const {
-    static Accessor< uint8_t > acc( "quality" );
+    static const Accessor< uint8_t > acc( "quality" );
     uint8_t temp =  acc( *this );
     // We use 5th bit for 'passesHighPtCuts'
     return temp&16;    
   }
   
   void Muon_v1::setPassesHighPtCuts(bool value) {
-    static Accessor< uint8_t > acc( "quality" );
+    static const Accessor< uint8_t > acc( "quality" );
     // We use 5th bit for 'passesHighPtCuts'
     if (value) acc( *this ) |= 16;
     else       acc( *this ) &= 239;
@@ -394,17 +393,17 @@ bool Muon_v1::isolationCaloCorrection(  float& value, const Iso::IsolationFlavou
           // Not checking if links are valid here - this is the job of the client (as per the cases above).
           // But we DO check that the link is available, so we can check for both types of links.
           
-          static Accessor< ElementLink< TrackParticleContainer > > acc1( "extrapolatedMuonSpectrometerTrackParticleLink" );
+          static const Accessor< ElementLink< TrackParticleContainer > > acc1( "extrapolatedMuonSpectrometerTrackParticleLink" );
           if ( acc1.isAvailable( *this ) && acc1( *this ).isValid() ) {
             return acc1( *this );
           }
 
-          static Accessor< ElementLink< TrackParticleContainer > > acc2( "msOnlyExtrapolatedMuonSpectrometerTrackParticleLink" );
+          static const Accessor< ElementLink< TrackParticleContainer > > acc2( "msOnlyExtrapolatedMuonSpectrometerTrackParticleLink" );
           if ( acc2.isAvailable( *this ) && acc2( *this ).isValid() ) {
             return acc2( *this );
           }
           
-          static Accessor< ElementLink< TrackParticleContainer > > acc3( "muonSpectrometerTrackParticleLink" );
+          static const Accessor< ElementLink< TrackParticleContainer > > acc3( "muonSpectrometerTrackParticleLink" );
           if ( acc3.isAvailable( *this ) && acc3( *this ).isValid()) {            
             return acc3( *this );
           }
@@ -425,7 +424,7 @@ bool Muon_v1::isolationCaloCorrection(  float& value, const Iso::IsolationFlavou
       case Combined:
       case SiliconAssociatedForwardMuon :
          {
-            static Accessor< ElementLink< TrackParticleContainer > > acc( "combinedTrackParticleLink" );
+            static const Accessor< ElementLink< TrackParticleContainer > > acc( "combinedTrackParticleLink" );
             if( ! acc.isAvailable( *this ) ) return 0;
           
             const ElementLink< TrackParticleContainer >& link = acc( *this );
@@ -436,7 +435,7 @@ bool Muon_v1::isolationCaloCorrection(  float& value, const Iso::IsolationFlavou
       case SegmentTagged:
       case CaloTagged :
         {
-           static Accessor< ElementLink< TrackParticleContainer > > acc( "inDetTrackParticleLink" );
+           static const Accessor< ElementLink< TrackParticleContainer > > acc( "inDetTrackParticleLink" );
            if( ! acc.isAvailable( *this ) ) return 0;
            
            const ElementLink< TrackParticleContainer >& link = acc( *this );
@@ -447,21 +446,21 @@ bool Muon_v1::isolationCaloCorrection(  float& value, const Iso::IsolationFlavou
       case MuonStandAlone :
         {
           // Want to return link to extrapolated MS track particle if possible.
-          static Accessor< ElementLink< TrackParticleContainer > > acc1( "extrapolatedMuonSpectrometerTrackParticleLink" );
+          static const Accessor< ElementLink< TrackParticleContainer > > acc1( "extrapolatedMuonSpectrometerTrackParticleLink" );
           if ( acc1.isAvailable( *this ) ) {            
             const ElementLink< TrackParticleContainer >& link = acc1( *this );
             if ( link.isValid() ) return *link;
           }
 
 	  //if no, maybe the MS-only extrapolated track particle?
-          static Accessor< ElementLink< TrackParticleContainer > > acc2( "msOnlyExtrapolatedMuonSpectrometerTrackParticleLink" );
+          static const Accessor< ElementLink< TrackParticleContainer > > acc2( "msOnlyExtrapolatedMuonSpectrometerTrackParticleLink" );
           if ( acc2.isAvailable( *this ) ) {
             const ElementLink< TrackParticleContainer >& link = acc2( *this );
             if ( link.isValid() ) return *link;
           }
           
           // Try fallback (non-extrapolated MS track particle)...
-          static Accessor< ElementLink< TrackParticleContainer > > acc3( "muonSpectrometerTrackParticleLink" );
+          static const Accessor< ElementLink< TrackParticleContainer > > acc3( "muonSpectrometerTrackParticleLink" );
           if ( acc3.isAvailable( *this ) ) {            
             const ElementLink< TrackParticleContainer >& link = acc3( *this );
             if ( link.isValid() ) return *link;
@@ -526,23 +525,23 @@ bool Muon_v1::isolationCaloCorrection(  float& value, const Iso::IsolationFlavou
   void Muon_v1::setTrackParticleLink(TrackParticleType type, const ElementLink< TrackParticleContainer >& link){
     switch ( type ) {
       case InnerDetectorTrackParticle :
-        static Accessor< ElementLink< TrackParticleContainer > > acc1( "inDetTrackParticleLink" );
+        static const Accessor< ElementLink< TrackParticleContainer > > acc1( "inDetTrackParticleLink" );
         acc1(*this)=link;
         break;
       case MuonSpectrometerTrackParticle :
-        static Accessor< ElementLink< TrackParticleContainer > > acc2( "muonSpectrometerTrackParticleLink" );
+        static const Accessor< ElementLink< TrackParticleContainer > > acc2( "muonSpectrometerTrackParticleLink" );
         acc2(*this)=link;
         break;
       case CombinedTrackParticle :
-        static Accessor< ElementLink< TrackParticleContainer > > acc3( "combinedTrackParticleLink" );
+        static const Accessor< ElementLink< TrackParticleContainer > > acc3( "combinedTrackParticleLink" );
         acc3(*this)=link;          
         break;
       case ExtrapolatedMuonSpectrometerTrackParticle :
-        static Accessor< ElementLink< TrackParticleContainer > > acc4( "extrapolatedMuonSpectrometerTrackParticleLink" );
+        static const Accessor< ElementLink< TrackParticleContainer > > acc4( "extrapolatedMuonSpectrometerTrackParticleLink" );
         acc4(*this)=link;
         break;
       case MSOnlyExtrapolatedMuonSpectrometerTrackParticle :
-	static Accessor< ElementLink< TrackParticleContainer > > acc5( "msOnlyExtrapolatedMuonSpectrometerTrackParticleLink" );
+        static const Accessor< ElementLink< TrackParticleContainer > > acc5( "msOnlyExtrapolatedMuonSpectrometerTrackParticleLink" );
 	acc5(*this)=link;
 	break;
       case Primary :
@@ -554,7 +553,7 @@ bool Muon_v1::isolationCaloCorrection(  float& value, const Iso::IsolationFlavou
   AUXSTORE_OBJECT_SETTER_AND_GETTER( Muon_v1, ElementLink<CaloClusterContainer>, clusterLink, setClusterLink)
   const CaloCluster* Muon_v1::cluster() const { 
     
-    static Accessor< ElementLink< TrackParticleContainer > > acc( "inDetTrackParticleLink" );
+    static const Accessor< ElementLink< TrackParticleContainer > > acc( "inDetTrackParticleLink" );
     if( ! acc.isAvailable( *this ) ) {
        return 0;
     }
@@ -580,7 +579,7 @@ bool Muon_v1::isolationCaloCorrection(  float& value, const Iso::IsolationFlavou
 
   AUXSTORE_OBJECT_SETTER_AND_GETTER( Muon_v1, std::vector< ElementLink< xAOD::MuonSegmentContainer > >, muonSegmentLinks, setMuonSegmentLinks)
 
-  static SG::AuxElement::Accessor< std::vector< ElementLink< MuonSegmentContainer > > > muonSegmentsAcc( "muonSegmentLinks" ); 
+  static const SG::AuxElement::Accessor< std::vector< ElementLink< MuonSegmentContainer > > > muonSegmentsAcc( "muonSegmentLinks" ); 
   size_t Muon_v1::nMuonSegments() const {
         // If a link was not set (yet), return zero.
     if( ! muonSegmentsAcc.isAvailable( *this ) ) {
diff --git a/Event/xAOD/xAODMuon/Root/SlowMuon_v1.cxx b/Event/xAOD/xAODMuon/Root/SlowMuon_v1.cxx
index 659b4540c21a64f4343ca33b2613000ff76353a9..89a6db2d18e62ad0f37ac3d5c0319ce7827cdb70 100644
--- a/Event/xAOD/xAODMuon/Root/SlowMuon_v1.cxx
+++ b/Event/xAOD/xAODMuon/Root/SlowMuon_v1.cxx
@@ -29,13 +29,13 @@ namespace xAOD {
   AUXSTORE_PRIMITIVE_GETTER( SlowMuon_v1, int, rpcBetaDof )
   
   void SlowMuon_v1::setRpcInfo(float rpcBetaAvg, float rpcBetaRms, float rpcBetaChi2, int rpcBetaDof) {
-    static Accessor< float > acc1( "rpcBetaAvg" );
+    static const Accessor< float > acc1( "rpcBetaAvg" );
     acc1( *this ) = rpcBetaAvg;
-    static Accessor< float > acc2( "rpcBetaRms" );
+    static const Accessor< float > acc2( "rpcBetaRms" );
     acc2( *this ) = rpcBetaRms;
-    static Accessor< float > acc3( "rpcBetaChi2" );
+    static const Accessor< float > acc3( "rpcBetaChi2" );
     acc3( *this ) = rpcBetaChi2;
-    static Accessor< int > acc4( "rpcBetaDof" );
+    static const Accessor< int > acc4( "rpcBetaDof" );
     acc4( *this ) = rpcBetaDof;
   }
 
@@ -45,13 +45,13 @@ namespace xAOD {
   AUXSTORE_PRIMITIVE_GETTER( SlowMuon_v1, int, mdtBetaDof )
   
   void SlowMuon_v1::setMdtInfo(float mdtBetaAvg, float mdtBetaRms, float mdtBetaChi2, int mdtBetaDof) {
-    static Accessor< float > acc1( "mdtBetaAvg" );
+    static const Accessor< float > acc1( "mdtBetaAvg" );
     acc1( *this ) = mdtBetaAvg;
-    static Accessor< float > acc2( "mdtBetaRms" );
+    static const Accessor< float > acc2( "mdtBetaRms" );
     acc2( *this ) = mdtBetaRms;
-    static Accessor< float > acc3( "mdtBetaChi2" );
+    static const Accessor< float > acc3( "mdtBetaChi2" );
     acc3( *this ) = mdtBetaChi2;
-    static Accessor< int > acc4( "mdtBetaDof" );
+    static const Accessor< int > acc4( "mdtBetaDof" );
     acc4( *this ) = mdtBetaDof;
   }
 
@@ -61,13 +61,13 @@ namespace xAOD {
   AUXSTORE_PRIMITIVE_GETTER( SlowMuon_v1, int, caloBetaDof )
   
   void SlowMuon_v1::setCaloInfo(float caloBetaAvg, float caloBetaRms, float caloBetaChi2, int caloBetaDof) {
-    static Accessor< float > acc1( "caloBetaAvg" );
+    static const Accessor< float > acc1( "caloBetaAvg" );
     acc1( *this ) = caloBetaAvg;
-    static Accessor< float > acc2( "caloBetaRms" );
+    static const Accessor< float > acc2( "caloBetaRms" );
     acc2( *this ) = caloBetaRms;
-    static Accessor< float > acc3( "caloBetaChi2" );
+    static const Accessor< float > acc3( "caloBetaChi2" );
     acc3( *this ) = caloBetaChi2;
-    static Accessor< int > acc4( "caloBetaDof" );
+    static const Accessor< int > acc4( "caloBetaDof" );
     acc4( *this ) = caloBetaDof;
   }
 
diff --git a/Event/xAOD/xAODPrimitives/Root/getIsolationAccessor.cxx b/Event/xAOD/xAODPrimitives/Root/getIsolationAccessor.cxx
index 80ffccbf541594ad5f55a8f7431317977b201e0e..be60b1b14af8f40e4339995f49916cbd956c4273 100644
--- a/Event/xAOD/xAODPrimitives/Root/getIsolationAccessor.cxx
+++ b/Event/xAOD/xAODPrimitives/Root/getIsolationAccessor.cxx
@@ -5,6 +5,9 @@
 // Local include(s):
 #include "xAODPrimitives/tools/getIsolationAccessor.h"
 
+// System include(s):
+#include <iostream>
+
 /// Helper macro for Accessor objects
 #define DEFINE_ACCESSOR(TYPE)                                 \
   case xAOD::Iso::TYPE:                                       \
diff --git a/Event/xAOD/xAODPrimitives/Root/getIsolationDecorator.cxx b/Event/xAOD/xAODPrimitives/Root/getIsolationDecorator.cxx
index 1db8e53a9f58f2e0dede9a41aa8775138036abb3..44a015b6202a43ad77b806afd981f13f9519f9cb 100644
--- a/Event/xAOD/xAODPrimitives/Root/getIsolationDecorator.cxx
+++ b/Event/xAOD/xAODPrimitives/Root/getIsolationDecorator.cxx
@@ -1,10 +1,13 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // Local include(s):
 #include "xAODPrimitives/tools/getIsolationDecorator.h"
 
+// System include(s):
+#include <iostream>
+
 /// Helper macro for Accessor objects
 #define DEFINE_DECORATOR(TYPE)                                 \
   case xAOD::Iso::TYPE:                                       \
diff --git a/Event/xAOD/xAODPrimitives/xAODPrimitives/ATLAS_CHECK_THREAD_SAFETY b/Event/xAOD/xAODPrimitives/xAODPrimitives/ATLAS_CHECK_THREAD_SAFETY
new file mode 100644
index 0000000000000000000000000000000000000000..1757f513373037ac7d0b7f1697bfcdf3f0b5ff28
--- /dev/null
+++ b/Event/xAOD/xAODPrimitives/xAODPrimitives/ATLAS_CHECK_THREAD_SAFETY
@@ -0,0 +1 @@
+Event/xAOD/xAODPrimitives
diff --git a/Event/xAOD/xAODTracking/Root/NeutralParticle_v1.cxx b/Event/xAOD/xAODTracking/Root/NeutralParticle_v1.cxx
index 5fb47630ee6497d21b4c0b82c7897e3036f206c6..8ee39d1a8cd33469b5e9feed65ced9fa32dba96d 100644
--- a/Event/xAOD/xAODTracking/Root/NeutralParticle_v1.cxx
+++ b/Event/xAOD/xAODTracking/Root/NeutralParticle_v1.cxx
@@ -1,8 +1,7 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
-// $Id: NeutralParticle_v1.cxx 573493 2013-12-03 13:05:51Z emoyse $
 // Misc includes
 #include <bitset>
 #include <vector>
@@ -73,7 +72,6 @@ namespace xAOD {
 
   NeutralParticle_v1::GenVecFourMom_t NeutralParticle_v1::genvecP4() const {
     using namespace std;
-    // Check if we need to reset the cached object:
     float p = 1/fabs(oneOverP());
     float thetaT = theta();
     float phiT = phi();
@@ -87,7 +85,6 @@ namespace xAOD {
   NeutralParticle_v1::FourMom_t NeutralParticle_v1::p4() const {
     using namespace std;
     FourMom_t p4;
-    // Check if we need to reset the cached object:
     float p = 1/fabs(oneOverP());
     float thetaT = theta();
     float phiT = phi();
@@ -112,10 +109,10 @@ namespace xAOD {
   AUXSTORE_PRIMITIVE_GETTER(NeutralParticle_v1, float, theta)
   AUXSTORE_PRIMITIVE_GETTER(NeutralParticle_v1, float, oneOverP)
 
-  const DefiningParameters_t& NeutralParticle_v1::definingParameters() const{
-    static DefiningParameters_t tmp;
-    tmp << d0(),z0(),phi0(),theta(),oneOverP();
-    return tmp;
+  const DefiningParameters_t NeutralParticle_v1::definingParameters() const{
+      DefiningParameters_t tmp;
+      tmp << d0(),z0(),phi0(),theta(),oneOverP();
+      return tmp;
   }
 
   void NeutralParticle_v1::setDefiningParameters(float d0, float z0, float phi0, float theta, float oneOverP) {
@@ -124,19 +121,19 @@ namespace xAOD {
     delete m_perigeeParameters;
     m_perigeeParameters=0;
     #endif // not XAOD_STANDALONE and not XAOD_MANACORE
-    static Accessor< float > acc1( "d0" );
+    static const Accessor< float > acc1( "d0" );
     acc1( *this ) = d0;
 
-    static Accessor< float > acc2( "z0" );
+    static const Accessor< float > acc2( "z0" );
     acc2( *this ) = z0;
 
-    static Accessor< float > acc3( "phi" );
+    static const Accessor< float > acc3( "phi" );
     acc3( *this ) = phi0;
 
-    static Accessor< float > acc4( "theta" );
+    static const Accessor< float > acc4( "theta" );
     acc4( *this ) = theta;
 
-    static Accessor< float > acc5( "oneOverP" );
+    static const Accessor< float > acc5( "oneOverP" );
     acc5( *this ) = oneOverP;
 
     return;
@@ -149,7 +146,7 @@ namespace xAOD {
     m_perigeeParameters=0;
     #endif // not XAOD_STANDALONE and not XAOD_MANACORE
     
-    static Accessor< std::vector<float> > acc( "definingParametersCovMatrix" );
+    static const Accessor< std::vector<float> > acc( "definingParametersCovMatrix" );
     std::vector<float>& v = acc(*this);
     v.reserve(15);
     for (size_t irow = 0; irow<5; ++irow)
@@ -157,11 +154,12 @@ namespace xAOD {
             v.push_back(cov(icol,irow));
   }
 
-  const xAOD::ParametersCovMatrix_t& NeutralParticle_v1::definingParametersCovMatrix() const {
-    static Accessor< std::vector<float> > acc( "definingParametersCovMatrix" );
+  const xAOD::ParametersCovMatrix_t NeutralParticle_v1::definingParametersCovMatrix() const {
+    static const Accessor< std::vector<float> > acc( "definingParametersCovMatrix" );
     std::vector<float> v = acc(*this);
     std::vector<float>::const_iterator it = v.begin();
-    static xAOD::ParametersCovMatrix_t cov; cov.setZero();
+    xAOD::ParametersCovMatrix_t cov; 
+    cov.setZero();
     for (size_t irow = 0; irow<5; ++irow)
         for (size_t icol =0; icol<=irow; ++icol)
             cov.fillSymmetric(icol,irow, *it++);
@@ -169,12 +167,12 @@ namespace xAOD {
   }
 
   const std::vector<float>& NeutralParticle_v1::definingParametersCovMatrixVec() const {
-    static Accessor< std::vector<float> > acc( "definingParametersCovMatrix" );
+    static const Accessor< std::vector<float> > acc( "definingParametersCovMatrix" );
     return acc(*this);
   }
 
   void NeutralParticle_v1::setDefiningParametersCovMatrixVec(const std::vector<float>& cov){
-    static Accessor< std::vector<float> > acc( "definingParametersCovMatrix" );
+    static const Accessor< std::vector<float> > acc( "definingParametersCovMatrix" );
     acc(*this)=cov;
   }
 
@@ -183,25 +181,25 @@ namespace xAOD {
   AUXSTORE_PRIMITIVE_GETTER(NeutralParticle_v1, float, vz)
 
   void NeutralParticle_v1::setParametersOrigin(float x, float y, float z){
-    static Accessor< float > acc1( "vx" );
+    static const Accessor< float > acc1( "vx" );
     acc1( *this ) = x;
 
-    static Accessor< float > acc2( "vy" );
+    static const Accessor< float > acc2( "vy" );
     acc2( *this ) = y;
 
-    static Accessor< float > acc3( "vz" );
+    static const Accessor< float > acc3( "vz" );
     acc3( *this ) = z;
   }
 
 #if ( ! defined(XAOD_STANDALONE) ) && ( ! defined(XAOD_MANACORE) )
   const Trk::NeutralPerigee& NeutralParticle_v1::perigeeParameters() const {
     
-    static Accessor< float > acc1( "d0" );
-    static Accessor< float > acc2( "z0" );
-    static Accessor< float > acc3( "phi" );
-    static Accessor< float > acc4( "theta" );
-    static Accessor< float > acc5( "oneOverP" );
-    static Accessor< std::vector<float> > acc6( "definingParametersCovMatrix" );
+    static const Accessor< float > acc1( "d0" );
+    static const Accessor< float > acc2( "z0" );
+    static const Accessor< float > acc3( "phi" );
+    static const Accessor< float > acc4( "theta" );
+    static const Accessor< float > acc5( "oneOverP" );
+    static const Accessor< std::vector<float> > acc6( "definingParametersCovMatrix" );
     ParametersCovMatrix_t* cov = new ParametersCovMatrix_t;
     cov->setZero();
     auto it= acc6(*this).begin();
diff --git a/Event/xAOD/xAODTracking/Root/SCTRawHitValidation_v1.cxx b/Event/xAOD/xAODTracking/Root/SCTRawHitValidation_v1.cxx
index 0bff0cc2dfc045e294857dc4a623e260402c40d2..b77313167b24d5d599f387b3977cb8f2ef83a0f8 100644
--- a/Event/xAOD/xAODTracking/Root/SCTRawHitValidation_v1.cxx
+++ b/Event/xAOD/xAODTracking/Root/SCTRawHitValidation_v1.cxx
@@ -12,7 +12,7 @@ namespace xAOD {
 
   AUXSTORE_PRIMITIVE_SETTER_AND_GETTER(SCTRawHitValidation_v1, uint64_t, identifier, setIdentifier)
 
-  static SG::AuxElement::Accessor<uint32_t> word_acc("dataword");
+  static const SG::AuxElement::Accessor<uint32_t> word_acc("dataword");
   void SCTRawHitValidation_v1::setWord(uint32_t new_word) {
     word_acc(*this) = new_word;
   }
diff --git a/Event/xAOD/xAODTracking/Root/TrackMeasurementValidation_v1.cxx b/Event/xAOD/xAODTracking/Root/TrackMeasurementValidation_v1.cxx
index ad72b31b0440acda554c5672406f0517bc7625dd..e32d4038eb133b40f7aba328052249c1f4a9a44d 100644
--- a/Event/xAOD/xAODTracking/Root/TrackMeasurementValidation_v1.cxx
+++ b/Event/xAOD/xAODTracking/Root/TrackMeasurementValidation_v1.cxx
@@ -28,18 +28,18 @@ namespace xAOD {
   AUXSTORE_PRIMITIVE_GETTER( TrackMeasurementValidation_v1, float, localXYCorrelation )
   
   void TrackMeasurementValidation_v1::setLocalPosition(float localX, float localY) {
-    static Accessor< float > acc1( "localX" );
+    static const Accessor< float > acc1( "localX" );
     acc1( *this ) = localX;
-    static Accessor< float > acc2( "localY" );
+    static const Accessor< float > acc2( "localY" );
     acc2( *this ) = localY;
   }
 
   void TrackMeasurementValidation_v1::setLocalPositionError(float localXError, float localYError, float localXYCorrelation) {
-    static Accessor< float > acc1( "localXError" );
+    static const Accessor< float > acc1( "localXError" );
     acc1( *this ) = localXError;
-    static Accessor< float > acc2( "localYError" );
+    static const Accessor< float > acc2( "localYError" );
     acc2( *this ) = localYError;
-    static Accessor< float > acc3( "localXYCorrelation" );
+    static const Accessor< float > acc3( "localXYCorrelation" );
     acc3( *this ) = localXYCorrelation;
   }
 
@@ -48,11 +48,11 @@ namespace xAOD {
   AUXSTORE_PRIMITIVE_GETTER( TrackMeasurementValidation_v1, float, globalZ )
   
   void TrackMeasurementValidation_v1::setGlobalPosition(float globalX, float globalY, float globalZ) {
-    static Accessor< float > acc1( "globalX" );
+    static const Accessor< float > acc1( "globalX" );
     acc1( *this ) = globalX;
-    static Accessor< float > acc2( "globalY" );
+    static const Accessor< float > acc2( "globalY" );
     acc2( *this ) = globalY;
-    static Accessor< float > acc3( "globalZ" );
+    static const Accessor< float > acc3( "globalZ" );
     acc3( *this ) = globalZ;
   }
 
diff --git a/Event/xAOD/xAODTracking/Root/TrackParticle_v1.cxx b/Event/xAOD/xAODTracking/Root/TrackParticle_v1.cxx
index b650925380d85fc23dafc27cd8699017cd249c74..d2a35ad677c37a7eb6a6ccd584b1492519b290d7 100644
--- a/Event/xAOD/xAODTracking/Root/TrackParticle_v1.cxx
+++ b/Event/xAOD/xAODTracking/Root/TrackParticle_v1.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: TrackParticle_v1.cxx 576255 2013-12-19 12:54:41Z emoyse $
@@ -114,7 +114,7 @@ namespace xAOD {
 
   float TrackParticle_v1::phi0() const {
 
-     Accessor< float > acc( "phi" );
+     static  const Accessor< float > acc( "phi" );
      return acc( *this );
   }
 
@@ -132,19 +132,19 @@ namespace xAOD {
     // reset perigee cache if existing
     if(m_perigeeParameters.isValid()) m_perigeeParameters.reset();
 #endif // not XAOD_STANDALONE and not XAOD_MANACORE
-    static Accessor< float > acc1( "d0" );
+    static const Accessor< float > acc1( "d0" );
     acc1( *this ) = d0;
 
-    static Accessor< float > acc2( "z0" );
+    static const Accessor< float > acc2( "z0" );
     acc2( *this ) = z0;
 
-    static Accessor< float > acc3( "phi" );
+    static const Accessor< float > acc3( "phi" );
     acc3( *this ) = phi0;
 
-    static Accessor< float > acc4( "theta" );
+    static const Accessor< float > acc4( "theta" );
     acc4( *this ) = theta;
 
-    static Accessor< float > acc5( "qOverP" );
+    static const Accessor< float > acc5( "qOverP" );
     acc5( *this ) = qOverP;
 
     return;
@@ -156,7 +156,7 @@ namespace xAOD {
     if(m_perigeeParameters.isValid()) m_perigeeParameters.reset();
 #endif // not XAOD_STANDALONE and not XAOD_MANACORE
 
-    static Accessor< std::vector<float> > acc( "definingParametersCovMatrix" );
+    static const Accessor< std::vector<float> > acc( "definingParametersCovMatrix" );
     Amg::compress(cov,acc(*this));
   }
 
@@ -170,13 +170,13 @@ namespace xAOD {
 
   const std::vector<float>& TrackParticle_v1::definingParametersCovMatrixVec() const {
   // Can't use AUXSTORE_PRIMITIVE_SETTER_AND_GETTER since I have to add Vec to the end of setDefiningParametersCovMatrix to avoid clash.
-    static Accessor< std::vector<float> > acc( "definingParametersCovMatrix" );
+    static const Accessor< std::vector<float> > acc( "definingParametersCovMatrix" );
     return acc(*this);
   }
 
   void TrackParticle_v1::setDefiningParametersCovMatrixVec(const std::vector<float>& cov){
   // Can't use AUXSTORE_PRIMITIVE_SETTER_AND_GETTER since I have to add Vec to the end of setDefiningParametersCovMatrix to avoid clash.
-    static Accessor< std::vector<float> > acc( "definingParametersCovMatrix" );
+    static const Accessor< std::vector<float> > acc( "definingParametersCovMatrix" );
     acc(*this)=cov;
   }
 
@@ -185,13 +185,13 @@ namespace xAOD {
   AUXSTORE_PRIMITIVE_GETTER(TrackParticle_v1, float, vz)
 
   void TrackParticle_v1::setParametersOrigin(float x, float y, float z){
-    static Accessor< float > acc1( "vx" );
+    static const Accessor< float > acc1( "vx" );
     acc1( *this ) = x;
 
-    static Accessor< float > acc2( "vy" );
+    static const Accessor< float > acc2( "vy" );
     acc2( *this ) = y;
 
-    static Accessor< float > acc3( "vz" );
+    static const Accessor< float > acc3( "vz" );
     acc3( *this ) = z;
   }
 
@@ -204,20 +204,20 @@ namespace xAOD {
 
     // Perigee needs to be calculated, and cached
 
-    static Accessor< float > acc1( "d0" );
-    static Accessor< float > acc2( "z0" );
-    static Accessor< float > acc3( "phi" );
-    static Accessor< float > acc4( "theta" );
-    static Accessor< float > acc5( "qOverP" );
-    static Accessor< std::vector<float> > acc6( "definingParametersCovMatrix" );
+    static const Accessor< float > acc1( "d0" );
+    static const Accessor< float > acc2( "z0" );
+    static const Accessor< float > acc3( "phi" );
+    static const Accessor< float > acc4( "theta" );
+    static const Accessor< float > acc5( "qOverP" );
+    static const Accessor< std::vector<float> > acc6( "definingParametersCovMatrix" );
     ParametersCovMatrix_t* cov = new ParametersCovMatrix_t(definingParametersCovMatrix());
     // cov->setZero();
     // auto it= acc6(*this).begin();
     // for (size_t irow = 0; irow<5; ++irow)
     //   for (size_t icol =0; icol<=irow; ++icol)
     //       cov->fillSymmetric(irow,icol,*it++) ;
-    static Accessor< float > acc7( "beamlineTiltX" );
-    static Accessor< float > acc8( "beamlineTiltY" );
+    static const Accessor< float > acc7( "beamlineTiltX" );
+    static const Accessor< float > acc8( "beamlineTiltY" );
     
     if(!acc7.isAvailable( *this ) || !acc8.isAvailable( *this )){
       Trk::Perigee tmpPerigeeParameters(acc1(*this),acc2(*this),acc3(*this),acc4(*this),acc5(*this),Trk::PerigeeSurface(Amg::Vector3D(vx(),vy(),vz())),cov);
@@ -241,9 +241,9 @@ namespace xAOD {
   AUXSTORE_PRIMITIVE_GETTER(TrackParticle_v1, float, numberDoF)
 
   void TrackParticle_v1::setFitQuality(float chiSquared, float numberDoF){
-    static Accessor< float > acc1( "chiSquared" );
+    static const Accessor< float > acc1( "chiSquared" );
     acc1( *this ) = chiSquared;  
-    static Accessor< float > acc2( "numberDoF" );
+    static const Accessor< float > acc2( "numberDoF" );
     acc2( *this ) = numberDoF;   
   }
 
@@ -261,7 +261,7 @@ namespace xAOD {
 
   size_t TrackParticle_v1::numberOfParameters() const{
     ///@todo - Can we do this in a better way? Not great to force retrieval of one specific parameter - any would do.
-    static Accessor< std::vector<float>  > acc( "parameterX" );
+    static const Accessor< std::vector<float>  > acc( "parameterX" );
     if(! acc.isAvailable( *this )) return 0;
     return acc(*this).size();
   }
@@ -274,14 +274,14 @@ namespace xAOD {
   }
 
   void TrackParticle_v1::setTrackParameters(std::vector<std::vector<float> >& parameters){
-    static Accessor< std::vector < float > > acc1( "parameterX" );
-    static Accessor< std::vector < float > > acc2( "parameterY" );
-    static Accessor< std::vector < float > > acc3( "parameterZ" );
-    static Accessor< std::vector < float > > acc4( "parameterPX" );
-    static Accessor< std::vector < float > > acc5( "parameterPY" );
-    static Accessor< std::vector < float > > acc6( "parameterPZ" );
+    static const Accessor< std::vector < float > > acc1( "parameterX" );
+    static const Accessor< std::vector < float > > acc2( "parameterY" );
+    static const Accessor< std::vector < float > > acc3( "parameterZ" );
+    static const Accessor< std::vector < float > > acc4( "parameterPX" );
+    static const Accessor< std::vector < float > > acc5( "parameterPY" );
+    static const Accessor< std::vector < float > > acc6( "parameterPZ" );
 
-    static Accessor< std::vector<uint8_t>  > acc7( "parameterPosition" );
+    static const Accessor< std::vector<uint8_t>  > acc7( "parameterPosition" );
 
     acc1(*this).resize(parameters.size());
     acc2(*this).resize(parameters.size());
@@ -308,38 +308,38 @@ namespace xAOD {
   }
 
   float TrackParticle_v1::parameterX(unsigned int index) const  {
-    static Accessor< std::vector<float>  > acc( "parameterX" );
+    static const Accessor< std::vector<float>  > acc( "parameterX" );
     return acc(*this).at(index);
   }
 
   float TrackParticle_v1::parameterY(unsigned int index) const  {
-    static Accessor< std::vector<float>  > acc( "parameterY" );
+    static const Accessor< std::vector<float>  > acc( "parameterY" );
     return acc(*this).at(index);
   }
 
   float TrackParticle_v1::parameterZ(unsigned int index) const  {
-    static Accessor< std::vector<float>  > acc( "parameterZ" );
+    static const Accessor< std::vector<float>  > acc( "parameterZ" );
     return acc(*this).at(index);
   }
 
   float TrackParticle_v1::parameterPX(unsigned int index) const {
-    static Accessor< std::vector<float>  > acc( "parameterPX" );
+    static const Accessor< std::vector<float>  > acc( "parameterPX" );
     return acc(*this).at(index);
   }
 
   float TrackParticle_v1::parameterPY(unsigned int index) const {
-    static Accessor< std::vector<float>  > acc( "parameterPY" );
+    static const Accessor< std::vector<float>  > acc( "parameterPY" );
     return acc(*this).at(index);
   }
 
   float TrackParticle_v1::parameterPZ(unsigned int index) const {
-    static Accessor< std::vector<float>  > acc( "parameterPZ" );    
+    static const Accessor< std::vector<float>  > acc( "parameterPZ" );    
     return acc(*this).at(index);
   }
 
   xAOD::ParametersCovMatrix_t TrackParticle_v1::trackParameterCovarianceMatrix(unsigned int index) const
   {
-    static Accessor< std::vector<float>  > acc( "trackParameterCovarianceMatrices" );
+    static const Accessor< std::vector<float>  > acc( "trackParameterCovarianceMatrices" );
     unsigned int offset = index*15;
     // copy the correct values into the temp matrix
     xAOD::ParametersCovMatrix_t tmp;
@@ -351,7 +351,7 @@ namespace xAOD {
   void TrackParticle_v1::setTrackParameterCovarianceMatrix(unsigned int index, std::vector<float>& cov){
     assert(cov.size()==15);
     unsigned int offset = index*15;
-    static Accessor< std::vector < float > > acc( "trackParameterCovarianceMatrices" );
+    static const Accessor< std::vector < float > > acc( "trackParameterCovarianceMatrices" );
     std::vector<float>& v = acc(*this);
     v.resize(offset+15);
     std::copy(cov.begin(),cov.end(),v.begin()+offset );
@@ -359,7 +359,7 @@ namespace xAOD {
 
   xAOD::ParameterPosition TrackParticle_v1::parameterPosition(unsigned int index) const
   {
-    static Accessor< std::vector<uint8_t>  > acc( "parameterPosition" );
+    static const Accessor< std::vector<uint8_t>  > acc( "parameterPosition" );
     return static_cast<xAOD::ParameterPosition>(acc(*this).at(index));
   }
 
@@ -378,14 +378,14 @@ namespace xAOD {
   }
 
   void  TrackParticle_v1::setParameterPosition(unsigned int index, xAOD::ParameterPosition pos){
-    static Accessor< std::vector<uint8_t>  > acc( "parameterPosition" );
+    static const Accessor< std::vector<uint8_t>  > acc( "parameterPosition" );
     acc( *this ).at(index) = static_cast<uint8_t>(pos);
   }
 
 #if ( ! defined(XAOD_STANDALONE) ) && ( ! defined(XAOD_MANACORE) )
   const Trk::CurvilinearParameters TrackParticle_v1::curvilinearParameters(unsigned int index) const {    
 
-    static Accessor< std::vector<float>  > acc( "trackParameterCovarianceMatrices" );
+    static const Accessor< std::vector<float>  > acc( "trackParameterCovarianceMatrices" );
     unsigned int offset = index*15;
     // copy the correct values into the temp matrix
     ParametersCovMatrix_t* cov = new ParametersCovMatrix_t(); 
@@ -407,18 +407,18 @@ namespace xAOD {
   AUXSTORE_PRIMITIVE_SETTER_WITH_CAST(TrackParticle_v1, uint8_t, xAOD::TrackFitter,trackFitter, setTrackFitter)
 
   std::bitset<xAOD::NumberOfTrackRecoInfo>   TrackParticle_v1::patternRecoInfo() const {
-    static Accessor< uint64_t > acc( "patternRecoInfo" );
+    static const Accessor< uint64_t > acc( "patternRecoInfo" );
     std::bitset<xAOD::NumberOfTrackRecoInfo> tmp(acc(*this));
     return tmp;
   }
 
   void TrackParticle_v1::setPatternRecognitionInfo(uint64_t patternReco)  {
-    static Accessor< uint64_t > acc( "patternRecoInfo" );
+    static const Accessor< uint64_t > acc( "patternRecoInfo" );
     acc( *this ) = patternReco;
   }
 
   void TrackParticle_v1::setPatternRecognitionInfo(const std::bitset<xAOD::NumberOfTrackRecoInfo>& patternReco)  {
-    static Accessor< uint64_t > acc( "patternRecoInfo" );
+    static const Accessor< uint64_t > acc( "patternRecoInfo" );
   #if __cplusplus < 201100
     uint64_t value = 0;
     unsigned int i = 0;
@@ -436,7 +436,7 @@ namespace xAOD {
   AUXSTORE_PRIMITIVE_GETTER_WITH_CAST(TrackParticle_v1, uint8_t, xAOD::ParticleHypothesis, particleHypothesis)
 
   bool TrackParticle_v1::summaryValue(uint8_t& value, const SummaryType &information)  const {
-    xAOD::TrackParticle_v1::Accessor< uint8_t >* acc = trackSummaryAccessorV1<uint8_t>( information );
+    const xAOD::TrackParticle_v1::Accessor< uint8_t >* acc = trackSummaryAccessorV1<uint8_t>( information );
     if( ( ! acc ) || ( ! acc->isAvailable( *this ) ) ) return false;
   // Retrieve the value:
     value = ( *acc )( *this );
@@ -444,7 +444,7 @@ namespace xAOD {
   }
   
   bool TrackParticle_v1::summaryValue(float& value, const SummaryType &information)  const {
-    xAOD::TrackParticle_v1::Accessor< float >* acc = trackSummaryAccessorV1<float>( information );
+    const xAOD::TrackParticle_v1::Accessor< float >* acc = trackSummaryAccessorV1<float>( information );
     if( ( ! acc ) || ( ! acc->isAvailable( *this ) ) ) return false;
   // Retrieve the value:
     value = ( *acc )( *this );
@@ -452,13 +452,13 @@ namespace xAOD {
   }
   
   void TrackParticle_v1::setSummaryValue(uint8_t& value, const SummaryType &information){
-    xAOD::TrackParticle_v1::Accessor< uint8_t >* acc = trackSummaryAccessorV1<uint8_t>( information );
+    const xAOD::TrackParticle_v1::Accessor< uint8_t >* acc = trackSummaryAccessorV1<uint8_t>( information );
   // Set the value:
     ( *acc )( *this ) = value;
   }
 
   void TrackParticle_v1::setSummaryValue(float& value, const SummaryType &information){
-    xAOD::TrackParticle_v1::Accessor< float >* acc = trackSummaryAccessorV1<float>( information );
+    const xAOD::TrackParticle_v1::Accessor< float >* acc = trackSummaryAccessorV1<float>( information );
   // Set the value:
     ( *acc )( *this ) = value;
   }
@@ -474,7 +474,7 @@ namespace xAOD {
    const ElementLink< TrackCollection >& TrackParticle_v1::trackLink() const {
 
       // The accessor:
-      static ConstAccessor< ElementLink< TrackCollection > > acc( "trackLink" );
+      static const ConstAccessor< ElementLink< TrackCollection > > acc( "trackLink" );
 
       // Check if one of them is available:
       if( acc.isAvailable( *this ) ) {
@@ -490,7 +490,7 @@ namespace xAOD {
    setTrackLink( const ElementLink< TrackCollection >& el ) {
 
       // The accessor:
-      static Accessor< ElementLink< TrackCollection > > acc( "trackLink" );
+      static const Accessor< ElementLink< TrackCollection > > acc( "trackLink" );
 
       // Do the deed:
       acc( *this ) = el;
@@ -500,7 +500,7 @@ namespace xAOD {
    const Trk::Track* TrackParticle_v1::track() const{
 
       // The accessor:
-      static ConstAccessor< ElementLink< TrackCollection > > acc( "trackLink" );
+      static const ConstAccessor< ElementLink< TrackCollection > > acc( "trackLink" );
 
       if( ! acc.isAvailable( *this ) ) {
          return 0;
diff --git a/Event/xAOD/xAODTracking/Root/TrackParticlexAODHelpers.cxx b/Event/xAOD/xAODTracking/Root/TrackParticlexAODHelpers.cxx
index cbcd352045fcefa82ba2f2ef2a317b8e801588af..b0a50ce96a790ffa284ddfceb81462e6bea6d293 100644
--- a/Event/xAOD/xAODTracking/Root/TrackParticlexAODHelpers.cxx
+++ b/Event/xAOD/xAODTracking/Root/TrackParticlexAODHelpers.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "xAODTracking/TrackParticlexAODHelpers.h"
@@ -14,7 +14,7 @@ namespace xAOD {
     if (!tp) {
       throw std::runtime_error("Invalid TrackParticle pointer.");
     }
-    static SG::AuxElement::Accessor< std::vector<float> > acc( "definingParametersCovMatrix" );
+    static const SG::AuxElement::Accessor< std::vector<float> > acc( "definingParametersCovMatrix" );
     if( !acc.isAvailable( *tp ) ) {
       throw std::runtime_error("TrackParticle without covariance matrix for the defining parameters.");
     }
@@ -23,7 +23,7 @@ namespace xAOD {
 
   bool TrackingHelpers::hasValidCov(const xAOD::TrackParticle *tp) {
     if (!tp) return false;
-    static SG::AuxElement::Accessor< std::vector<float> > acc( "definingParametersCovMatrix" );
+    static const SG::AuxElement::Accessor< std::vector<float> > acc( "definingParametersCovMatrix" );
     if( !acc.isAvailable( *tp ) ) return false;
     return true;
   }
diff --git a/Event/xAOD/xAODTracking/Root/TrackStateValidation_v1.cxx b/Event/xAOD/xAODTracking/Root/TrackStateValidation_v1.cxx
index b2de1432252f751714f1ecd65df33d1dc3fc9f46..a7b27f3fd077eab990bc700806799dd26dc2b7bd 100644
--- a/Event/xAOD/xAODTracking/Root/TrackStateValidation_v1.cxx
+++ b/Event/xAOD/xAODTracking/Root/TrackStateValidation_v1.cxx
@@ -25,9 +25,9 @@ namespace xAOD {
   AUXSTORE_PRIMITIVE_GETTER( TrackStateValidation_v1, float, localY )
   
   void TrackStateValidation_v1::setLocalPosition(float localX, float localY) {
-    static Accessor< float > acc1( "localX" );
+    static const Accessor< float > acc1( "localX" );
     acc1( *this ) = localX;
-    static Accessor< float > acc2( "localY" );
+    static const Accessor< float > acc2( "localY" );
     acc2( *this ) = localY;
   }
 
@@ -35,9 +35,9 @@ namespace xAOD {
   AUXSTORE_PRIMITIVE_GETTER( TrackStateValidation_v1, float, localPhi )
 
   void TrackStateValidation_v1::setLocalAngles(float localTheta, float localPhi) {
-    static Accessor< float > acc1( "localTheta" );
+    static const Accessor< float > acc1( "localTheta" );
     acc1( *this ) = localTheta;
-    static Accessor< float > acc2( "localPhi" );
+    static const Accessor< float > acc2( "localPhi" );
     acc2( *this ) = localPhi;
   }
 
@@ -45,9 +45,9 @@ namespace xAOD {
   AUXSTORE_PRIMITIVE_GETTER( TrackStateValidation_v1, float, unbiasedResidualY )
 
   void TrackStateValidation_v1::setUnbiasedResidual(float unbiasedResidualX, float unbiasedResidualY) {
-    static Accessor< float > acc1( "unbiasedResidualX" );
+    static const Accessor< float > acc1( "unbiasedResidualX" );
     acc1( *this ) = unbiasedResidualX;
-    static Accessor< float > acc2( "unbiasedResidualY" );
+    static const Accessor< float > acc2( "unbiasedResidualY" );
     acc2( *this ) = unbiasedResidualY;
   }
 
@@ -55,9 +55,9 @@ namespace xAOD {
   AUXSTORE_PRIMITIVE_GETTER( TrackStateValidation_v1, float, unbiasedPullY )
 
   void TrackStateValidation_v1::setUnbiasedPull(float unbiasedPullX, float unbiasedPullY) {
-    static Accessor< float > acc1( "unbiasedPullX" );
+    static const Accessor< float > acc1( "unbiasedPullX" );
     acc1( *this ) = unbiasedPullX;
-    static Accessor< float > acc2( "unbiasedPullY" );
+    static const Accessor< float > acc2( "unbiasedPullY" );
     acc2( *this ) = unbiasedPullY;
   }
 
@@ -65,9 +65,9 @@ namespace xAOD {
   AUXSTORE_PRIMITIVE_GETTER( TrackStateValidation_v1, float, biasedResidualY )
 
   void TrackStateValidation_v1::setBiasedResidual(float biasedResidualX, float biasedResidualY) {
-    static Accessor< float > acc1( "biasedResidualX" );
+    static const Accessor< float > acc1( "biasedResidualX" );
     acc1( *this ) = biasedResidualX;
-    static Accessor< float > acc2( "biasedResidualY" );
+    static const Accessor< float > acc2( "biasedResidualY" );
     acc2( *this ) = biasedResidualY;
   }
 
@@ -75,9 +75,9 @@ namespace xAOD {
   AUXSTORE_PRIMITIVE_GETTER( TrackStateValidation_v1, float, biasedPullY )
 
   void TrackStateValidation_v1::setBiasedPull(float biasedPullX, float biasedPullY) {
-    static Accessor< float > acc1( "biasedPullX" );
+    static const Accessor< float > acc1( "biasedPullX" );
     acc1( *this ) = biasedPullX;
-    static Accessor< float > acc2( "biasedPullY" );
+    static const Accessor< float > acc2( "biasedPullY" );
     acc2( *this ) = biasedPullY;
   }
 
diff --git a/Event/xAOD/xAODTracking/Root/TrackSummaryAccessors_v1.cxx b/Event/xAOD/xAODTracking/Root/TrackSummaryAccessors_v1.cxx
index e21a165e0e8412ea0e535cfeb1b82f70982ef403..504724992f39f3c59d2d3febc555f834d3bfe557 100644
--- a/Event/xAOD/xAODTracking/Root/TrackSummaryAccessors_v1.cxx
+++ b/Event/xAOD/xAODTracking/Root/TrackSummaryAccessors_v1.cxx
@@ -17,7 +17,7 @@ extern "C" {
 #define DEFINE_ACCESSOR(TYPE, NAME )                               \
    case xAOD::NAME:                                                \
    {                                                               \
-      static SG::AuxElement::Accessor< TYPE > a( #NAME );          \
+      static const SG::AuxElement::Accessor< TYPE > a( #NAME );          \
       return &a;                                                   \
    }                                                               \
    break;
@@ -26,39 +26,39 @@ namespace xAOD {
 
   // Generic case. Maybe return warning?
   template<class T>
-   SG::AuxElement::Accessor< T >*
+   const SG::AuxElement::Accessor< T >*
    trackSummaryAccessorV1( xAOD::SummaryType /*type*/ )
    {}
 
   template<>
-   SG::AuxElement::Accessor< uint8_t >*
+   const SG::AuxElement::Accessor< uint8_t >*
    trackSummaryAccessorV1<uint8_t>( xAOD::SummaryType type ) {
 
       switch( type ) {
         DEFINE_ACCESSOR( uint8_t, numberOfContribPixelLayers        );
       case xAOD:: numberOfBLayerHits:                                                    { 
-	static SG::AuxElement::Accessor< uint8_t > a( "numberOfInnermostPixelLayerHits" ); 
-	return &a;								
+        static const SG::AuxElement::Accessor< uint8_t > a( "numberOfInnermostPixelLayerHits" ); 
+        return &a;								
       }								    
 	break;
       case xAOD:: numberOfBLayerOutliers:                                                    { 
-	static SG::AuxElement::Accessor< uint8_t > a( "numberOfInnermostPixelLayerOutliers" ); 
-	return &a;								
+        static const SG::AuxElement::Accessor< uint8_t > a( "numberOfInnermostPixelLayerOutliers" ); 
+        return &a;								
       }								    
 	break;
       case xAOD:: numberOfBLayerSharedHits:                                                    { 
-	static SG::AuxElement::Accessor< uint8_t > a( "numberOfInnermostPixelLayerSharedHits" ); 
-	return &a;								
+        static const SG::AuxElement::Accessor< uint8_t > a( "numberOfInnermostPixelLayerSharedHits" ); 
+        return &a;								
       }								    
 	break;
       case xAOD:: numberOfBLayerSplitHits:                                                    { 
-	static SG::AuxElement::Accessor< uint8_t > a( "numberOfInnermostPixelLayerSplitHits" ); 
+        static const SG::AuxElement::Accessor< uint8_t > a( "numberOfInnermostPixelLayerSplitHits" ); 
 	return &a;								
       }								    
 	break;	
       case xAOD:: expectBLayerHit:                                                    { 
-	static SG::AuxElement::Accessor< uint8_t > a( "expectInnermostPixelLayerHit" ); 
-	return &a;								
+        static const SG::AuxElement::Accessor< uint8_t > a( "expectInnermostPixelLayerHit" ); 
+        return &a;								
       }								    
 	break;	
         DEFINE_ACCESSOR( uint8_t, numberOfPixelHits                 );
@@ -66,21 +66,21 @@ namespace xAOD {
         DEFINE_ACCESSOR( uint8_t, numberOfPixelHoles                );
         DEFINE_ACCESSOR( uint8_t, numberOfPixelSharedHits           );	
         DEFINE_ACCESSOR( uint8_t, numberOfPixelSplitHits            );
-	DEFINE_ACCESSOR( uint8_t, numberOfInnermostPixelLayerHits                );
+        DEFINE_ACCESSOR( uint8_t, numberOfInnermostPixelLayerHits                );
         DEFINE_ACCESSOR( uint8_t, numberOfInnermostPixelLayerOutliers            );
         DEFINE_ACCESSOR( uint8_t, numberOfInnermostPixelLayerSharedHits          );
-	DEFINE_ACCESSOR( uint8_t, numberOfInnermostPixelLayerSplitHits          );
+        DEFINE_ACCESSOR( uint8_t, numberOfInnermostPixelLayerSplitHits          );
         DEFINE_ACCESSOR( uint8_t, expectInnermostPixelLayerHit                   );	
-	DEFINE_ACCESSOR( uint8_t, numberOfNextToInnermostPixelLayerHits                );
+        DEFINE_ACCESSOR( uint8_t, numberOfNextToInnermostPixelLayerHits                );
         DEFINE_ACCESSOR( uint8_t, numberOfNextToInnermostPixelLayerOutliers            );
         DEFINE_ACCESSOR( uint8_t, numberOfNextToInnermostPixelLayerSharedHits          );
-	DEFINE_ACCESSOR( uint8_t, numberOfNextToInnermostPixelLayerSplitHits          );
+        DEFINE_ACCESSOR( uint8_t, numberOfNextToInnermostPixelLayerSplitHits          );
         DEFINE_ACCESSOR( uint8_t, expectNextToInnermostPixelLayerHit                   );	
         DEFINE_ACCESSOR( uint8_t, numberOfGangedPixels              );
         DEFINE_ACCESSOR( uint8_t, numberOfGangedFlaggedFakes        );
         DEFINE_ACCESSOR( uint8_t, numberOfPixelDeadSensors          );
         DEFINE_ACCESSOR( uint8_t, numberOfPixelSpoiltHits           );
-	DEFINE_ACCESSOR( uint8_t, numberOfDBMHits                   );
+        DEFINE_ACCESSOR( uint8_t, numberOfDBMHits                   );
         DEFINE_ACCESSOR( uint8_t, numberOfSCTHits                   );
         DEFINE_ACCESSOR( uint8_t, numberOfSCTOutliers               );
         DEFINE_ACCESSOR( uint8_t, numberOfSCTHoles                  );
@@ -97,7 +97,7 @@ namespace xAOD {
         DEFINE_ACCESSOR( uint8_t, numberOfTRTDeadStraws             );
         DEFINE_ACCESSOR( uint8_t, numberOfTRTTubeHits               );
         DEFINE_ACCESSOR( uint8_t, numberOfTRTXenonHits              );
-	DEFINE_ACCESSOR( uint8_t, numberOfTRTSharedHits              );
+        DEFINE_ACCESSOR( uint8_t, numberOfTRTSharedHits              );
         DEFINE_ACCESSOR( uint8_t, numberOfPrecisionLayers );
         DEFINE_ACCESSOR( uint8_t, numberOfPrecisionHoleLayers );
         DEFINE_ACCESSOR( uint8_t, numberOfPhiLayers );
@@ -106,7 +106,7 @@ namespace xAOD {
         DEFINE_ACCESSOR( uint8_t, numberOfTriggerEtaHoleLayers );
         DEFINE_ACCESSOR( uint8_t, numberOfOutliersOnTrack           );
         DEFINE_ACCESSOR( uint8_t, standardDeviationOfChi2OS         );
-	DEFINE_ACCESSOR( uint8_t, numberOfGoodPrecisionLayers       );
+        DEFINE_ACCESSOR( uint8_t, numberOfGoodPrecisionLayers       );
       default:                  
          std::cerr << "xAOD::TrackParticle_v1 ERROR Unknown SummaryType ("
                    << type << ") requested" << std::endl;
@@ -115,14 +115,14 @@ namespace xAOD {
    }
    
    template<>
-    SG::AuxElement::Accessor< float >*
+    const SG::AuxElement::Accessor< float >*
     trackSummaryAccessorV1<float>( xAOD::SummaryType type ) {
       switch( type ) {
         DEFINE_ACCESSOR( float, eProbabilityComb       ); 
         DEFINE_ACCESSOR( float, eProbabilityHT       );   
         //        DEFINE_ACCESSOR( float, eProbabilityToT       );  
         //        DEFINE_ACCESSOR( float, eProbabilityBrem       ); 
-	DEFINE_ACCESSOR( float, pixeldEdx       ); 
+        DEFINE_ACCESSOR( float, pixeldEdx       ); 
       default:                  
          std::cerr << "xAOD::TrackParticle_v1 ERROR Unknown SummaryType ("
                    << type << ") requested" << std::endl;
diff --git a/Event/xAOD/xAODTracking/Root/Vertex_v1.cxx b/Event/xAOD/xAODTracking/Root/Vertex_v1.cxx
index 324ce8d2afc81730528cb4f6583467d27ab5bd2e..f81c836967167b74d92dc9576518a49b6f73ce38 100644
--- a/Event/xAOD/xAODTracking/Root/Vertex_v1.cxx
+++ b/Event/xAOD/xAODTracking/Root/Vertex_v1.cxx
@@ -1,8 +1,7 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
-// $Id: Vertex_v1.cxx 575751 2013-12-16 16:45:36Z krasznaa $
 
 // System include(s):
 #include <cmath>
@@ -19,18 +18,15 @@ namespace xAOD {
 
    Vertex_v1::Vertex_v1()
       : SG::AuxElement(),
-        m_position(), m_positionCached( false ),
-        m_covariance(), m_covarianceCached( false ) {
+        m_position(), 
+        m_covariance() {
 
    }
 
    Vertex_v1::Vertex_v1( const Vertex_v1& other ) 
       : SG::AuxElement(),
         m_position( other.m_position ),
-        m_positionCached( other.m_positionCached ),
-        m_covariance( other.m_covariance ),
-        m_covarianceCached( other.m_covarianceCached ) {
-
+        m_covariance( other.m_covariance ){
       //copy aux store content (only the stuffs already loaded in memory!)
       this->makePrivateStore( other );
    }
@@ -84,15 +80,16 @@ namespace xAOD {
    const Amg::Vector3D& Vertex_v1::position() const {
 
       // Cache the position if necessary:
-      if( ! m_positionCached ) {
-         m_position( 0 ) = x();
-         m_position( 1 ) = y();
-         m_position( 2 ) = z();
-         m_positionCached = true;
+      if( ! m_position.isValid() ) {
+         Amg::Vector3D tmpPosition;
+         tmpPosition( 0 ) = x();
+         tmpPosition( 1 ) = y();
+         tmpPosition( 2 ) = z();
+         m_position.set(tmpPosition);
       }
 
       // Return the object:
-      return m_position;
+      return *(m_position.ptr());
    }
 
    void Vertex_v1::setPosition( const Amg::Vector3D& position ) {
@@ -101,25 +98,22 @@ namespace xAOD {
       setX( position( 0 ) );
       setY( position( 1 ) );
       setZ( position( 2 ) );
-
-      // Update the cache:
-      m_position = position;
-      m_positionCached = true;
-
+      // Reset the cache
+      m_position.reset();
       return;
    }
 
    const AmgSymMatrix(3)& Vertex_v1::covariancePosition() const {
 
       // Cache the covariance matrix if necessary:
-      if( ! m_covarianceCached ) {
+      if( ! m_covariance.isValid() ) {
          // The matrix is now cached:
-	      Amg::expand(covariance().begin(),covariance().end(),m_covariance);
-	      m_covarianceCached = true;
+        AmgSymMatrix(3) tmpCovariance;
+	      Amg::expand(covariance().begin(),covariance().end(),tmpCovariance);
+	      m_covariance.set(tmpCovariance);
       }
-
       // Return the cached object:
-      return m_covariance;
+      return *(m_covariance.ptr());
    }
 
    void Vertex_v1::setCovariancePosition( const AmgSymMatrix(3)& cov ) {
@@ -130,11 +124,7 @@ namespace xAOD {
 
      // Set the persistent variable:
      setCovariance( vec );
-
-     // Cache the variable:
-     m_covariance = cov;
-     m_covarianceCached = true;
-
+     m_covariance.reset();
      return;
    }
 
@@ -151,8 +141,8 @@ namespace xAOD {
 
    void Vertex_v1::setFitQuality( float chiSquared, float numberDoF ) {
 
-      static Accessor< float > acc1( "chiSquared" );
-      static Accessor< float > acc2( "numberDoF" );
+      static const Accessor< float > acc1( "chiSquared" );
+      static const Accessor< float > acc2( "numberDoF" );
       acc1( *this ) = chiSquared;
       acc2( *this ) = numberDoF;
 
@@ -169,7 +159,7 @@ namespace xAOD {
 
 #if ( ! defined(XAOD_STANDALONE) ) && ( ! defined(XAOD_MANACORE) )
    /// Helper object for implementing the vxTrackAtVertex functions
-   static SG::AuxElement::Accessor< std::vector< Trk::VxTrackAtVertex > >
+   static const SG::AuxElement::Accessor< std::vector< Trk::VxTrackAtVertex > >
    vxVertAcc( "vxTrackAtVertex" );
 
    /// This function can be used to attach an Athena-only, reconstruction
@@ -220,17 +210,17 @@ namespace xAOD {
    //
 
    /// Accessor for the track links
-   static SG::AuxElement::Accessor< Vertex_v1::TrackParticleLinks_t >
+   static const SG::AuxElement::Accessor< Vertex_v1::TrackParticleLinks_t >
       trackAcc( "trackParticleLinks" );
    /// Accessor for the track weights
-   static SG::AuxElement::Accessor< std::vector< float > >
+   static const SG::AuxElement::Accessor< std::vector< float > >
       weightTrackAcc( "trackWeights" );
 
    /// Accessor for the neutral links
-   static SG::AuxElement::Accessor< Vertex_v1::NeutralParticleLinks_t >
+   static const SG::AuxElement::Accessor< Vertex_v1::NeutralParticleLinks_t >
       neutralAcc( "neutralParticleLinks" );
    /// Accessor for the neutral weights
-   static SG::AuxElement::Accessor< std::vector< float > >
+   static const SG::AuxElement::Accessor< std::vector< float > >
       weightNeutralAcc( "neutralWeights" );
 
    AUXSTORE_OBJECT_SETTER_AND_GETTER( Vertex_v1,
@@ -344,17 +334,12 @@ namespace xAOD {
       return;
    }
 
-   //
-   /////////////////////////////////////////////////////////////////////////////
-
-   /// This function is used by ROOT to reset the object after a new object
-   /// was read into an existing memory location.
-   ///
+   /*
+    * Reset the cache
+    */
    void Vertex_v1::resetCache() {
-
-      m_positionCached = false;
-      m_covarianceCached = false;
-
+      m_position.reset();
+      m_covariance.reset();
       return;
    }
 
diff --git a/Event/xAOD/xAODTracking/test/xAODTracking_TrackParticle_test.cxx b/Event/xAOD/xAODTracking/test/xAODTracking_TrackParticle_test.cxx
index 3127702708841d4805c5f7bc1976ec93569d29d8..d504ce03b47e8936b52a75192d0db9a203d48e10 100644
--- a/Event/xAOD/xAODTracking/test/xAODTracking_TrackParticle_test.cxx
+++ b/Event/xAOD/xAODTracking/test/xAODTracking_TrackParticle_test.cxx
@@ -1,8 +1,7 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
-// $Id: xAODTracking_TrackParticle_test.cxx 606456 2014-07-15 09:20:53Z emoyse $
 
 // System include(s):
 #include <iostream>
@@ -46,7 +45,7 @@ void fill( xAOD::TrackParticle& tp ) {
       { 0.0, 1.0, 2.0, 3.0, 4.0, 5.0 },
       { 6.0, 7.0, 8.0, 9.0, 10.0, 11.0 }
    };
-   static std::vector< std::vector< float > > parametersVec;
+   std::vector< std::vector< float > > parametersVec;
    if( ! parametersVec.size() ) {
       for( int i = 0; i < 2; ++i ) {
          std::vector< float > temp( parameters[ i ],
diff --git a/Event/xAOD/xAODTracking/xAODTracking/TrackSummaryAccessors_v1.h b/Event/xAOD/xAODTracking/xAODTracking/TrackSummaryAccessors_v1.h
index 390b4d94e443571a3153c88f843596644a24c7b4..fc08a249a11b1abd4b3aa5062ed55984a9d1d9ae 100644
--- a/Event/xAOD/xAODTracking/xAODTracking/TrackSummaryAccessors_v1.h
+++ b/Event/xAOD/xAODTracking/xAODTracking/TrackSummaryAccessors_v1.h
@@ -1,10 +1,9 @@
 // Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
-// $Id: TrackSummaryAccessors_v1.h 574227 2013-12-06 14:20:39Z emoyse $
 #ifndef XAOD_TRACKSUMMARYACCESSORS_V1_H
 #define XAOD_TRACKSUMMARYACCESSORS_V1_H
 
@@ -22,7 +21,7 @@ namespace xAOD {
    /// TrackParticle_v1 object at runtime to get/set summary values on themselves.
    ///
    template <class T>
-   SG::AuxElement::Accessor< T >*
+   const SG::AuxElement::Accessor< T >*
    trackSummaryAccessorV1( xAOD::SummaryType type );
 
 } // namespace xAOD
diff --git a/Event/xAOD/xAODTracking/xAODTracking/selection.xml b/Event/xAOD/xAODTracking/xAODTracking/selection.xml
index c4515742823ebc694d88ca1a247a7f34a7ba6183..71da7653240461ecef267d53c3c91e4df05acc10 100644
--- a/Event/xAOD/xAODTracking/xAODTracking/selection.xml
+++ b/Event/xAOD/xAODTracking/xAODTracking/selection.xml
@@ -4,9 +4,7 @@
   <!-- Vertex_v1 dictionaries: -->
   <class name="xAOD::Vertex_v1" >
     <field name="m_position" transient="true" />
-    <field name="m_positionCached" transient="true" />
     <field name="m_covariance" transient="true" />
-    <field name="m_covarianceCached" transient="true" />
   </class>
   <read sourceClass="xAOD::Vertex_v1" version="[1-]"
         targetClass="xAOD::Vertex_v1" source="" target="" >
diff --git a/Event/xAOD/xAODTracking/xAODTracking/versions/NeutralParticle_v1.h b/Event/xAOD/xAODTracking/xAODTracking/versions/NeutralParticle_v1.h
index 3b93bf959cab286b690c2565cc0b6c4be247d686..6ba2093461a7cd73ce6b6e3276c5a858e814181a 100644
--- a/Event/xAOD/xAODTracking/xAODTracking/versions/NeutralParticle_v1.h
+++ b/Event/xAOD/xAODTracking/xAODTracking/versions/NeutralParticle_v1.h
@@ -1,10 +1,9 @@
 // Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
-// $Id: NeutralParticle_v1.h 573493 2013-12-03 13:05:51Z emoyse $
 #ifndef XAODTRACKING_VERSIONS_NEUTRALPARTICLE_V1_H
 #define XAODTRACKING_VERSIONS_NEUTRALPARTICLE_V1_H
 
@@ -43,10 +42,10 @@ namespace xAOD {
       NeutralParticle_v1();
       /// Destructor
       ~NeutralParticle_v1();
-    /// Copy ctor. This involves copying the entire Auxilary store, and is a slow operation which should be used sparingly.
-    NeutralParticle_v1(const NeutralParticle_v1& o );
-    /// Assignment operator. This can involve creating and copying an Auxilary store, and so should be used sparingly.
-    NeutralParticle_v1& operator=(const NeutralParticle_v1& tp );
+      /// Copy ctor. This involves copying the entire Auxilary store, and is a slow operation which should be used sparingly.
+      NeutralParticle_v1(const NeutralParticle_v1& o );
+      /// Assignment operator. This can involve creating and copying an Auxilary store, and so should be used sparingly.
+      NeutralParticle_v1& operator=(const NeutralParticle_v1& tp );
       
       /// @name xAOD::IParticle functions
       /// @{
@@ -101,9 +100,9 @@ namespace xAOD {
       /// @brief Returns a SVector of the Perigee track parameters. 
       /// i.e. a vector of
       ///  \f$\left(\begin{array}{c}d_0\\z_0\\\phi_0\\\theta\\q/p\end{array}\right)\f$
-      const DefiningParameters_t& definingParameters() const;
+      const DefiningParameters_t definingParameters() const;
       /// Returns the 5x5 symmetric matrix containing the defining parameters covariance matrix.
-      const ParametersCovMatrix_t& definingParametersCovMatrix() const;  
+      const ParametersCovMatrix_t definingParametersCovMatrix() const;  
       /// Returns the vector of the covariance values - 15 elements
       const std::vector<float>& definingParametersCovMatrixVec() const;
       
diff --git a/Event/xAOD/xAODTracking/xAODTracking/versions/Vertex_v1.h b/Event/xAOD/xAODTracking/xAODTracking/versions/Vertex_v1.h
index 07d6e57721e20e342c5b318c08342e94117a2517..d3156ccf94ee6c9cd870d6f2c5f34850e902463e 100644
--- a/Event/xAOD/xAODTracking/xAODTracking/versions/Vertex_v1.h
+++ b/Event/xAOD/xAODTracking/xAODTracking/versions/Vertex_v1.h
@@ -1,197 +1,195 @@
-// Dear emacs, this is -*- c++ -*-
+// Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
-// $Id: Vertex_v1.h 575751 2013-12-16 16:45:36Z krasznaa $
-#ifndef XAODTRACKING_VERSIONS_VERTEX_V1_H
-#define XAODTRACKING_VERSIONS_VERTEX_V1_H
-
-// System include(s):
-#include <vector>
-
-// Core include(s):
-#include "AthContainers/AuxElement.h"
-#include "AthLinks/ElementLink.h"
-
-// EDM include(s):
-#include "EventPrimitives/EventPrimitives.h"
-#include "GeoPrimitives/GeoPrimitives.h"
-#ifndef XAOD_STANDALONE
-#ifndef XAOD_MANACORE
-#  include "VxVertex/VxTrackAtVertex.h"
-#endif // not XAOD_MANACORE
-#endif // not XAOD_STANDALONE
-
-// xAOD include(s):
-#include "xAODTracking/TrackingPrimitives.h"
-#include "xAODTracking/TrackParticleContainerFwd.h"
-#include "xAODTracking/NeutralParticleContainer.h"
-#include "xAODBase/ObjectType.h"
-
-// Local include(s):
-#include "xAODTracking/TrackingPrimitives.h"
-
-namespace xAOD {
-
-   /// Class describing a Vertex.
-   ///
-   /// @author Kirill Prokofiev <Kirill.Prokofev@cern.ch>
-   /// @author Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch>
-   /// @author Ruslan Mashinistov <Ruslan.Mashinistov@cern.ch>
-   /// @nosubgrouping
-   ///
-   class Vertex_v1 : public SG::AuxElement {
-
-   public:
-      /// Default constructor
-      Vertex_v1();
-
-      /// Copy constructor
-      Vertex_v1(const Vertex_v1& other);
-
-      /// Assignment operator. This can involve creating and copying an Auxilary store, and so should be used sparingly.
-      Vertex_v1& operator=(const Vertex_v1& tp );
-
-      /// A little helper function for identifying the type in template code
-      Type::ObjectType type() const;
-
-      /// Returns the x position
-      float x() const;
-      /// Sets the x position
-      void setX( float value );
-      /// Returns the y position
-      float y() const;
-      /// Sets the y position
-      void setY( float value );
-      /// Returns the z position
-      float z() const;
-      /// Sets the z position
-      void setZ( float value );
-
-      /// Returns the covariance matrix as a simple vector of values
-      const std::vector< float >& covariance() const;
-      /// Sets the covariance matrix as a simple vector of values
-      void setCovariance( const std::vector< float >& value );
-
-      /// Returns the 3-pos
-      const Amg::Vector3D& position() const;
-      /// Sets the 3-position
-      void setPosition( const Amg::Vector3D& position );
-
-      /// Returns the vertex covariance matrix
-      const AmgSymMatrix(3)& covariancePosition() const;
-      /// Sets the vertex covariance matrix
-      void setCovariancePosition( const AmgSymMatrix(3)& covariancePosition );
-
-      /// @name Fit quality functions
-      /// @{
-
-      /// Returns the @f$ \chi^2 @f$ of the vertex fit as float.
-      float chiSquared() const;
-      /// Returns the number of degrees of freedom of the vertex fit as float.
-      float numberDoF() const;   
-      /// Set the 'Fit Quality' information.
-      void setFitQuality( float chiSquared, float numberDoF );
-
-      /// @}
-
-      /// The type of the vertex
-      VxType::VertexType vertexType() const;
-      /// Set the type of the vertex
-      void setVertexType( VxType::VertexType vType );
-
-#if ( ! defined(XAOD_STANDALONE) ) && ( ! defined(XAOD_MANACORE) )
-      /// Non-const access to the VxTrackAtVertex vector
-      std::vector< Trk::VxTrackAtVertex >& vxTrackAtVertex();
-      /// Const access to the vector of tracks fitted to the vertex (may not exist!)
-      const std::vector< Trk::VxTrackAtVertex >& vxTrackAtVertex() const;
-      /// Check if VxTrackAtVertices are attached to the object
-      bool vxTrackAtVertexAvailable() const;
-#endif // not XAOD_STANDALONE and not XAOD_MANACORE
-
-      /// @name Track particle contents operations
-      /// @{
-
-      /// Type for the associated track particles
-      typedef std::vector< ElementLink< xAOD::TrackParticleContainer > >
-      TrackParticleLinks_t;
-      /// Get all the particles associated with the vertex
-      const TrackParticleLinks_t& trackParticleLinks() const;
-      /// Set all track particle links at once
-      void setTrackParticleLinks( const TrackParticleLinks_t& trackParticles );
-
-      /// Get all the track weights
-      const std::vector< float >& trackWeights() const;
-      /// Set all the track weights
-      void setTrackWeights( const std::vector< float >& weights );
-
-
-      /// Type for the associated neutral particles
-      typedef std::vector< ElementLink< xAOD::NeutralParticleContainer > > NeutralParticleLinks_t;
-      /// Get all the particles associated with the vertex
-      const NeutralParticleLinks_t& neutralParticleLinks() const;
-      /// Set all neutral particle links at once
-      void setNeutralParticleLinks( const NeutralParticleLinks_t& neutralParticles );
-
-      /// Get all the neutral weights
-      const std::vector< float >& neutralWeights() const;
-      /// Set all the neutral weights
-      void setNeutralWeights( const std::vector< float >& weights );
-
-
-      /// Get the pointer to a given track that was used in vertex reco.
-      const TrackParticle* trackParticle( size_t i ) const;
-      /// Get the weight of a given track in the vertex reconstruction
-      float trackWeight( size_t i ) const;
-      /// Get the number of tracks associated with this vertex
-      size_t nTrackParticles() const;
-
-
-      /// Get the pointer to a given neutral that was used in vertex reco.
-      const NeutralParticle* neutralParticle( size_t i ) const;
-      /// Get the weight of a given neutral in the vertex reconstruction
-      float neutralWeight( size_t i ) const;
-      /// Get the number of neutrals associated with this vertex
-      size_t nNeutralParticles() const;
-
-
-      /// Add a new track to the vertex
-      void addTrackAtVertex( const ElementLink< TrackParticleContainer >& tr,
-                             float weight = 1.0 );
-
-      /// Add a new neutral to the vertex
-      void addNeutralAtVertex( const ElementLink< NeutralParticleContainer >& tr,
-                             float weight = 1.0 );
-
-      /// Remove all tracks from the vertex
-      void clearTracks();
-
-      /// Remove all neutrals from the vertex
-      void clearNeutrals();
-
-
-      /// @}
-
-      /// Reset the internal cache of the object
-      void resetCache();
-
-   private:
-      /// Cached position of the vertex
-      mutable Amg::Vector3D m_position;
-      /// Cache status of the position object
-      mutable bool m_positionCached;
-      /// Cached covariance of the vertex
-      mutable AmgSymMatrix(3) m_covariance;
-      /// Cache status of the covariance object
-      mutable bool m_covarianceCached;
-
-   }; // end of the Vertex_v1 class definitions
-
-} // end of the xAOD namespace
-
-#include "xAODCore/BaseInfo.h"
-SG_BASE (xAOD::Vertex_v1, SG::AuxElement);
-
-#endif // XAODTRACKING_VERSIONS_VERTEX_V1_H
+#ifndef XAODTRACKING_VERSIONS_VERTEX_V1_H
+#define XAODTRACKING_VERSIONS_VERTEX_V1_H
+
+// System include(s):
+#include <vector>
+
+// Core include(s):
+#include "AthContainers/AuxElement.h"
+#include "AthLinks/ElementLink.h"
+
+// EDM include(s):
+#include "EventPrimitives/EventPrimitives.h"
+#include "GeoPrimitives/GeoPrimitives.h"
+#ifndef XAOD_STANDALONE
+#ifndef XAOD_MANACORE
+#  include "VxVertex/VxTrackAtVertex.h"
+#endif // not XAOD_MANACORE
+#endif // not XAOD_STANDALONE
+
+// xAOD include(s):
+#include "xAODTracking/TrackingPrimitives.h"
+#include "xAODTracking/TrackParticleContainerFwd.h"
+#include "xAODTracking/NeutralParticleContainer.h"
+#include "xAODBase/ObjectType.h"
+
+// Local include(s):
+#include "xAODTracking/TrackingPrimitives.h"
+
+//MT CachedValue
+#include "CxxUtils/CachedValue.h"
+
+namespace xAOD {
+
+   /// Class describing a Vertex.
+   ///
+   /// @author Kirill Prokofiev <Kirill.Prokofev@cern.ch>
+   /// @author Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch>
+   /// @author Ruslan Mashinistov <Ruslan.Mashinistov@cern.ch>
+   /// @nosubgrouping
+   ///
+   class Vertex_v1 : public SG::AuxElement {
+
+   public:
+      /// Default constructor
+      Vertex_v1();
+
+      /// Copy constructor
+      Vertex_v1(const Vertex_v1& other);
+
+      /// Assignment operator. This can involve creating and copying an Auxilary store, and so should be used sparingly.
+      Vertex_v1& operator=(const Vertex_v1& tp );
+
+      /// A little helper function for identifying the type in template code
+      Type::ObjectType type() const;
+
+      /// Returns the x position
+      float x() const;
+      /// Sets the x position
+      void setX( float value );
+      /// Returns the y position
+      float y() const;
+      /// Sets the y position
+      void setY( float value );
+      /// Returns the z position
+      float z() const;
+      /// Sets the z position
+      void setZ( float value );
+
+      /// Returns the covariance matrix as a simple vector of values
+      const std::vector< float >& covariance() const;
+      /// Sets the covariance matrix as a simple vector of values
+      void setCovariance( const std::vector< float >& value );
+
+      /// Returns the 3-pos
+      const Amg::Vector3D& position() const;
+      /// Sets the 3-position
+      void setPosition( const Amg::Vector3D& position );
+
+      /// Returns the vertex covariance matrix
+      const AmgSymMatrix(3)& covariancePosition() const;
+      /// Sets the vertex covariance matrix
+      void setCovariancePosition( const AmgSymMatrix(3)& covariancePosition );
+
+      /// @name Fit quality functions
+      /// @{
+
+      /// Returns the @f$ \chi^2 @f$ of the vertex fit as float.
+      float chiSquared() const;
+      /// Returns the number of degrees of freedom of the vertex fit as float.
+      float numberDoF() const;   
+      /// Set the 'Fit Quality' information.
+      void setFitQuality( float chiSquared, float numberDoF );
+
+      /// @}
+
+      /// The type of the vertex
+      VxType::VertexType vertexType() const;
+      /// Set the type of the vertex
+      void setVertexType( VxType::VertexType vType );
+
+#if ( ! defined(XAOD_STANDALONE) ) && ( ! defined(XAOD_MANACORE) )
+      /// Non-const access to the VxTrackAtVertex vector
+      std::vector< Trk::VxTrackAtVertex >& vxTrackAtVertex();
+      /// Const access to the vector of tracks fitted to the vertex (may not exist!)
+      const std::vector< Trk::VxTrackAtVertex >& vxTrackAtVertex() const;
+      /// Check if VxTrackAtVertices are attached to the object
+      bool vxTrackAtVertexAvailable() const;
+#endif // not XAOD_STANDALONE and not XAOD_MANACORE
+
+      /// @name Track particle contents operations
+      /// @{
+
+      /// Type for the associated track particles
+      typedef std::vector< ElementLink< xAOD::TrackParticleContainer > >
+      TrackParticleLinks_t;
+      /// Get all the particles associated with the vertex
+      const TrackParticleLinks_t& trackParticleLinks() const;
+      /// Set all track particle links at once
+      void setTrackParticleLinks( const TrackParticleLinks_t& trackParticles );
+
+      /// Get all the track weights
+      const std::vector< float >& trackWeights() const;
+      /// Set all the track weights
+      void setTrackWeights( const std::vector< float >& weights );
+
+
+      /// Type for the associated neutral particles
+      typedef std::vector< ElementLink< xAOD::NeutralParticleContainer > > NeutralParticleLinks_t;
+      /// Get all the particles associated with the vertex
+      const NeutralParticleLinks_t& neutralParticleLinks() const;
+      /// Set all neutral particle links at once
+      void setNeutralParticleLinks( const NeutralParticleLinks_t& neutralParticles );
+
+      /// Get all the neutral weights
+      const std::vector< float >& neutralWeights() const;
+      /// Set all the neutral weights
+      void setNeutralWeights( const std::vector< float >& weights );
+
+
+      /// Get the pointer to a given track that was used in vertex reco.
+      const TrackParticle* trackParticle( size_t i ) const;
+      /// Get the weight of a given track in the vertex reconstruction
+      float trackWeight( size_t i ) const;
+      /// Get the number of tracks associated with this vertex
+      size_t nTrackParticles() const;
+
+
+      /// Get the pointer to a given neutral that was used in vertex reco.
+      const NeutralParticle* neutralParticle( size_t i ) const;
+      /// Get the weight of a given neutral in the vertex reconstruction
+      float neutralWeight( size_t i ) const;
+      /// Get the number of neutrals associated with this vertex
+      size_t nNeutralParticles() const;
+
+
+      /// Add a new track to the vertex
+      void addTrackAtVertex( const ElementLink< TrackParticleContainer >& tr,
+                             float weight = 1.0 );
+
+      /// Add a new neutral to the vertex
+      void addNeutralAtVertex( const ElementLink< NeutralParticleContainer >& tr,
+                             float weight = 1.0 );
+
+      /// Remove all tracks from the vertex
+      void clearTracks();
+
+      /// Remove all neutrals from the vertex
+      void clearNeutrals();
+
+
+      /// @}
+
+      /// Reset the internal cache of the object
+      void resetCache();
+
+   private:
+      /// Cached position of the vertex
+      CxxUtils::CachedValue<Amg::Vector3D> m_position;
+      /// Cached covariance of the vertex
+      CxxUtils::CachedValue<AmgSymMatrix(3)> m_covariance;
+
+   }; // end of the Vertex_v1 class definitions
+
+} // end of the xAOD namespace
+
+#include "xAODCore/BaseInfo.h"
+SG_BASE (xAOD::Vertex_v1, SG::AuxElement);
+
+#endif // XAODTRACKING_VERSIONS_VERTEX_V1_H
diff --git a/Event/xAOD/xAODTrigMuon/Root/TrigMuonDefs.cxx b/Event/xAOD/xAODTrigMuon/Root/TrigMuonDefs.cxx
index c9f34230858e0049085ba76ac21eb53afd92705e..d98bf89e63df9c4fe305f6c7ba65aae4a3b331a7 100644
--- a/Event/xAOD/xAODTrigMuon/Root/TrigMuonDefs.cxx
+++ b/Event/xAOD/xAODTrigMuon/Root/TrigMuonDefs.cxx
@@ -1,9 +1,12 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
+
+// Local include(s).
 #include "xAODTrigMuon/TrigMuonDefs.h"
-#include <math.h>
-#include <iostream>
+
+// System include(s).
+#include <cmath>
 
 namespace xAOD{
 
@@ -13,19 +16,19 @@ namespace L2MuonParameters{
   ECRegions whichECRegion( const float eta, const float phi ){
       float absEta = fabs(eta);
       if( ( 1.3 <= absEta && absEta < 1.45) &&
-	  ( (0                 <= fabs(phi) && fabs(phi) < CLHEP::pi/48. )     ||
-	    (CLHEP::pi*11./48. <= fabs(phi) && fabs(phi) < CLHEP::pi*13./48. ) ||
-	    (CLHEP::pi*23./48. <= fabs(phi) && fabs(phi) < CLHEP::pi*25./48. ) ||
-	    (CLHEP::pi*35./48. <= fabs(phi) && fabs(phi) < CLHEP::pi*37./48. ) ||
-	    (CLHEP::pi*47./48. <= fabs(phi) && fabs(phi) < CLHEP::pi )
+	  ( (0                 <= fabs(phi) && fabs(phi) < M_PI/48. )     ||
+	    (M_PI*11./48. <= fabs(phi) && fabs(phi) < M_PI*13./48. ) ||
+	    (M_PI*23./48. <= fabs(phi) && fabs(phi) < M_PI*25./48. ) ||
+	    (M_PI*35./48. <= fabs(phi) && fabs(phi) < M_PI*37./48. ) ||
+	    (M_PI*47./48. <= fabs(phi) && fabs(phi) < M_PI )
 	    )
 	  ) return WeakBFieldA;
       
       else if( ( 1.5 <= absEta && absEta < 1.65 ) &&
-	       ( (CLHEP::pi*3./32.  <= fabs(phi) && fabs(phi) < CLHEP::pi*5./32. ) ||
-		 (CLHEP::pi*11./32. <= fabs(phi) && fabs(phi) < CLHEP::pi*13./32.) ||
-		 (CLHEP::pi*19./32. <= fabs(phi) && fabs(phi) < CLHEP::pi*21./32.) ||
-		 (CLHEP::pi*27./32. <= fabs(phi) && fabs(phi) < CLHEP::pi*29./32.)
+	       ( (M_PI*3./32.  <= fabs(phi) && fabs(phi) < M_PI*5./32. ) ||
+		 (M_PI*11./32. <= fabs(phi) && fabs(phi) < M_PI*13./32.) ||
+		 (M_PI*19./32. <= fabs(phi) && fabs(phi) < M_PI*21./32.) ||
+		 (M_PI*27./32. <= fabs(phi) && fabs(phi) < M_PI*29./32.)
 		 )
 	       ) return WeakBFieldB;
       
diff --git a/Event/xAOD/xAODTrigMuon/xAODTrigMuon/TrigMuonDefs.h b/Event/xAOD/xAODTrigMuon/xAODTrigMuon/TrigMuonDefs.h
index 434ab78233cdcdb014651a9147f408016b7515b8..564de979ed9787bc88329566b3dfc8e24ef9c26a 100644
--- a/Event/xAOD/xAODTrigMuon/xAODTrigMuon/TrigMuonDefs.h
+++ b/Event/xAOD/xAODTrigMuon/xAODTrigMuon/TrigMuonDefs.h
@@ -1,22 +1,17 @@
 // Dear emacs, this is -*- c++ -*-
-
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
-
-// $Id: TrigMuonDefs.h $
 #ifndef XAODTRIGMUON_TRIGMUONDEFS_H
 #define XAODTRIGMUON_TRIGMUONDEFS_H
 
-#include "CLHEP/Units/PhysicalConstants.h"
-
 /// Namespace holding all the xAOD EDM classes
 namespace xAOD {
 
 namespace L2MuonParameters
 {
 
-    /// Define chamber types and locations                                                                                            
+    /// Define chamber types and locations
     enum Chamber {
       BarrelInner  = 0, ///< Inner station in the barrel spectrometer
       BarrelMiddle = 1, ///< Middle station in the barrel spectrometer
@@ -32,17 +27,16 @@ namespace L2MuonParameters
       MaxChamber   = 11  ///< Number of measurement point definitions
     };
 
-    ///  Define algoriths ID                                                                                                          
+    ///  Define algoriths ID
 	 enum L2MuonAlgoId{GEV900ID=0,   MUONID=1,     HALOID=2,    COSMICID=3,
                       LOOSE_HM=10,  MEDIUM_HM=11, TIGHT_HM=12, LOOSE_LM=13,
                       MEDIUM_LM=14, TIGHT_LM=15,
                       NULLID=99999};
 
     enum ECRegions{ Bulk, WeakBFieldA, WeakBFieldB};
-  
+
     ECRegions whichECRegion( const float eta, const float phi );
 }
-  
 
 }
 
diff --git a/External/AtlasPyFwdBwdPorts/CMakeLists.txt b/External/AtlasPyFwdBwdPorts/CMakeLists.txt
index 12655407ce549e8e2ecef70acef6a3336c9f693c..0419f2337f4bc3589e1fadac064ce72862ec5c68 100644
--- a/External/AtlasPyFwdBwdPorts/CMakeLists.txt
+++ b/External/AtlasPyFwdBwdPorts/CMakeLists.txt
@@ -79,30 +79,6 @@ function( _setup_python_package name file md5 )
 
 endfunction( _setup_python_package )
 
-# Install Beaker:
-_setup_python_package( Beaker
-   ${CMAKE_CURRENT_SOURCE_DIR}/src/Beaker-1.5.4.tar.gz
-   de84e7511119dc0b8eb4ac177d3e2512
-   )
-
-# Install affinity:
-_setup_python_package( affinity
-   ${CMAKE_CURRENT_SOURCE_DIR}/src/affinity-0.1.0.tar.gz
-   cc610cdb05ca675b4089ce2f05796f57
-   )
-
-# Install bunch:
-_setup_python_package( bunch
-   ${CMAKE_CURRENT_SOURCE_DIR}/src/bunch-1.0.0.tar.gz
-   944d2e8f222ed032961daa34c5b5151c
-   )
-
-# Install datadiff:
-_setup_python_package( datadiff
-   ${CMAKE_CURRENT_SOURCE_DIR}/src/datadiff-1.1.1.tar.gz
-   48a2e9b85332b8252c8401205ff02756
-   )
-
 # Install extensions:
 _setup_python_package( extensions
    ${CMAKE_CURRENT_SOURCE_DIR}/src/extensions-0.4.tar.gz
@@ -115,30 +91,17 @@ _setup_python_package( futures
    a6fa247e3c5fe3d60d8e12f1b873cc88
    )
 
-# Install jsonpickle:
-_setup_python_package( jsonpickle
-   ${CMAKE_CURRENT_SOURCE_DIR}/src/jsonpickle-0.4.0.tar.gz
-   63916228294218ca6e53fd1b16b626fa
-   DEPENDS simplejson
-   SINGLE_VERSION )
-
 # Install pyflakes:
 _setup_python_package( pyflakes
-   ${CMAKE_CURRENT_SOURCE_DIR}/src/pyflakes-1.5.0.tar.gz
-   84a99f05e5409f8196325dda3f5a1b9a
+   ${CMAKE_CURRENT_SOURCE_DIR}/src/pyflakes-2.0.0.tar.gz
+   06310b7c7a288c6c8e8f955da5f985ca
    SINGLE_VERSION )
 
 # Install flake8:
 _setup_python_package( flake8
-   ${CMAKE_CURRENT_SOURCE_DIR}/src/flake8-3.3.0.tar.gz
-   3df622aac9bad27c04f34164609bbed8
-   DEPENDS pyflakes
-   SINGLE_VERSION )
-
-# Install configparser:
-_setup_python_package( configparser
-   ${CMAKE_CURRENT_SOURCE_DIR}/src/configparser-3.5.0.tar.gz
-   cfdd915a5b7a6c09917a64a573140538
+   ${CMAKE_CURRENT_SOURCE_DIR}/src/flake8-3.6.0.tar.gz
+   178485aed0799655d0cbf2e3bdcfaddc
+   DEPENDS pyflakes pycodestyle mccabe enum34
    SINGLE_VERSION )
 
 # Install enum34:
@@ -153,16 +116,10 @@ _setup_python_package( mccabe
    723df2f7b1737b8887475bac4c763e1e
    SINGLE_VERSION )
 
-# Install :
+# Install pycodestyle:
 _setup_python_package( pycodestyle 
-   ${CMAKE_CURRENT_SOURCE_DIR}/src/pycodestyle-2.3.1.tar.gz
-   240e342756af30cae0983b16303a2055
-   SINGLE_VERSION )
-
-# Install pyinotify:
-_setup_python_package( pyinotify
-   ${CMAKE_CURRENT_SOURCE_DIR}/src/pyinotify-0.9.1.tar.gz
-   bd06a9feac312414e57d92c781bda539
+   ${CMAKE_CURRENT_SOURCE_DIR}/src/pycodestyle-2.4.0.tar.gz
+   85bbebd2c90d2f833c1db467d4d0e9a3
    SINGLE_VERSION )
 
 # Install pyyaml:
@@ -172,18 +129,6 @@ _setup_python_package( pyyaml
    EXTRA_ARGS --without-libyaml
    SINGLE_VERSION )
 
-# Install simplejson:
-_setup_python_package( simplejson
-   ${CMAKE_CURRENT_SOURCE_DIR}/src/simplejson-2.1.6.tar.gz
-   2f8351f6e6fe7ef25744805dfa56c0d5
-   )
-
-# Install gcovr:
-_setup_python_package( gcovr
-   ${CMAKE_CURRENT_SOURCE_DIR}/src/gcovr-3.4.tar.gz
-   0e8aece2bd438530853e7e10968efd56
-   SINGLE_VERSION )
-
 # Install scandir:
 _setup_python_package( scandir
    ${CMAKE_CURRENT_SOURCE_DIR}/src/scandir-1.6.tar.gz
diff --git a/External/AtlasPyFwdBwdPorts/src/Beaker-1.5.4.tar.gz b/External/AtlasPyFwdBwdPorts/src/Beaker-1.5.4.tar.gz
deleted file mode 100644
index 958406f2cbe5d01f75a345515bee0159b9a60060..0000000000000000000000000000000000000000
Binary files a/External/AtlasPyFwdBwdPorts/src/Beaker-1.5.4.tar.gz and /dev/null differ
diff --git a/External/AtlasPyFwdBwdPorts/src/affinity-0.1.0.tar.gz b/External/AtlasPyFwdBwdPorts/src/affinity-0.1.0.tar.gz
deleted file mode 100644
index 5865a5fd41866f9a9a522763a6a00fe12ca8604c..0000000000000000000000000000000000000000
Binary files a/External/AtlasPyFwdBwdPorts/src/affinity-0.1.0.tar.gz and /dev/null differ
diff --git a/External/AtlasPyFwdBwdPorts/src/bunch-1.0.0.tar.gz b/External/AtlasPyFwdBwdPorts/src/bunch-1.0.0.tar.gz
deleted file mode 100644
index 02caf5284549c08a0d670ca73f56365188bceef8..0000000000000000000000000000000000000000
Binary files a/External/AtlasPyFwdBwdPorts/src/bunch-1.0.0.tar.gz and /dev/null differ
diff --git a/External/AtlasPyFwdBwdPorts/src/configparser-3.5.0.tar.gz b/External/AtlasPyFwdBwdPorts/src/configparser-3.5.0.tar.gz
deleted file mode 100644
index 7c9dc40781ce25c21596b8f9f2bcc96d94c37288..0000000000000000000000000000000000000000
Binary files a/External/AtlasPyFwdBwdPorts/src/configparser-3.5.0.tar.gz and /dev/null differ
diff --git a/External/AtlasPyFwdBwdPorts/src/datadiff-1.1.1.tar.gz b/External/AtlasPyFwdBwdPorts/src/datadiff-1.1.1.tar.gz
deleted file mode 100644
index 00c753f7f3e4b71fde07d6b1e46b5f50bd259e4b..0000000000000000000000000000000000000000
Binary files a/External/AtlasPyFwdBwdPorts/src/datadiff-1.1.1.tar.gz and /dev/null differ
diff --git a/External/AtlasPyFwdBwdPorts/src/flake8-3.3.0.tar.gz b/External/AtlasPyFwdBwdPorts/src/flake8-3.3.0.tar.gz
deleted file mode 100644
index 9b44bcb6c48d45608178a020f452f86b3b1f1c3b..0000000000000000000000000000000000000000
Binary files a/External/AtlasPyFwdBwdPorts/src/flake8-3.3.0.tar.gz and /dev/null differ
diff --git a/External/AtlasPyFwdBwdPorts/src/flake8-3.6.0.tar.gz b/External/AtlasPyFwdBwdPorts/src/flake8-3.6.0.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..8490781980b381b5ad119e8a585e6aa0c03977f0
Binary files /dev/null and b/External/AtlasPyFwdBwdPorts/src/flake8-3.6.0.tar.gz differ
diff --git a/External/AtlasPyFwdBwdPorts/src/gcovr-3.4.tar.gz b/External/AtlasPyFwdBwdPorts/src/gcovr-3.4.tar.gz
deleted file mode 100644
index fa9fafaa9881cc3c8d2d957fe59eb2c81b4c0f2a..0000000000000000000000000000000000000000
Binary files a/External/AtlasPyFwdBwdPorts/src/gcovr-3.4.tar.gz and /dev/null differ
diff --git a/External/AtlasPyFwdBwdPorts/src/jsonpickle-0.4.0.tar.gz b/External/AtlasPyFwdBwdPorts/src/jsonpickle-0.4.0.tar.gz
deleted file mode 100644
index 51690730bab0482f1fd360d6def57c66ed3453c4..0000000000000000000000000000000000000000
Binary files a/External/AtlasPyFwdBwdPorts/src/jsonpickle-0.4.0.tar.gz and /dev/null differ
diff --git a/External/AtlasPyFwdBwdPorts/src/pycodestyle-2.3.1.tar.gz b/External/AtlasPyFwdBwdPorts/src/pycodestyle-2.3.1.tar.gz
deleted file mode 100644
index 76de22256ccb0d2dc36056a734cf935405e2408d..0000000000000000000000000000000000000000
Binary files a/External/AtlasPyFwdBwdPorts/src/pycodestyle-2.3.1.tar.gz and /dev/null differ
diff --git a/External/AtlasPyFwdBwdPorts/src/pycodestyle-2.4.0.tar.gz b/External/AtlasPyFwdBwdPorts/src/pycodestyle-2.4.0.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..193aa08cb6c46769d5e8305ec89f8ea6e74b2e72
Binary files /dev/null and b/External/AtlasPyFwdBwdPorts/src/pycodestyle-2.4.0.tar.gz differ
diff --git a/External/AtlasPyFwdBwdPorts/src/pyflakes-1.5.0.tar.gz b/External/AtlasPyFwdBwdPorts/src/pyflakes-1.5.0.tar.gz
deleted file mode 100644
index 7815ed8a17df702d5e50163ee7596543c3ba6016..0000000000000000000000000000000000000000
Binary files a/External/AtlasPyFwdBwdPorts/src/pyflakes-1.5.0.tar.gz and /dev/null differ
diff --git a/External/AtlasPyFwdBwdPorts/src/pyflakes-2.0.0.tar.gz b/External/AtlasPyFwdBwdPorts/src/pyflakes-2.0.0.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..95d6d3e5d514d517dab6ff358ae26190e6aae9bf
Binary files /dev/null and b/External/AtlasPyFwdBwdPorts/src/pyflakes-2.0.0.tar.gz differ
diff --git a/External/AtlasPyFwdBwdPorts/src/pyinotify-0.9.1.tar.gz b/External/AtlasPyFwdBwdPorts/src/pyinotify-0.9.1.tar.gz
deleted file mode 100644
index 02ae73637de752d6202a7dd0e5080f72ef1c350c..0000000000000000000000000000000000000000
Binary files a/External/AtlasPyFwdBwdPorts/src/pyinotify-0.9.1.tar.gz and /dev/null differ
diff --git a/External/AtlasPyFwdBwdPorts/src/simplejson-2.1.6.tar.gz b/External/AtlasPyFwdBwdPorts/src/simplejson-2.1.6.tar.gz
deleted file mode 100644
index 8b371ffa28092d623c6de1d491ebd8efda5bfd9d..0000000000000000000000000000000000000000
Binary files a/External/AtlasPyFwdBwdPorts/src/simplejson-2.1.6.tar.gz and /dev/null differ
diff --git a/External/AtlasPyFwdBwdPorts/test/AtlasPyFwdBwdPorts.xml b/External/AtlasPyFwdBwdPorts/test/AtlasPyFwdBwdPorts.xml
deleted file mode 100644
index 775612b3604aea60c410e4e48e872ce097b0c835..0000000000000000000000000000000000000000
--- a/External/AtlasPyFwdBwdPorts/test/AtlasPyFwdBwdPorts.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0"?>
-<atn>
-
-<!--    <TEST name="py_simplejson" type="script" suite="py_fwdbwd_ports"> -->
-<!--       <package_atn>External/AtlasPyFwdBwdPorts</package_atn> -->
-<!--       <options_atn>python -c'from simplejson.tests import main;main()'</options_atn> -->
-<!--       <timelimit>10</timelimit> -->
-<!--       <author> Sebastien Binet </author> -->
-<!--       <mailto> binet@cern.ch </mailto> -->
-<!--       <expectations> -->
-<!--          <successMessage>OK</successMessage> -->
-<!--          <returnValue>0</returnValue> -->
-<!--       </expectations> -->
-<!--    </TEST> -->
-
-</atn>
diff --git a/External/Herwigpp/CMakeLists.txt b/External/Herwigpp/CMakeLists.txt
index 852c5999df685058d3e4acf16254722c8dd60030..079606b26bad210ed5fed5ca3084399726d76187 100644
--- a/External/Herwigpp/CMakeLists.txt
+++ b/External/Herwigpp/CMakeLists.txt
@@ -1,4 +1,3 @@
-# $Id: CMakeLists.txt 742924 2016-04-26 11:53:36Z krasznaa $
 #
 # Package installing files from the Herwig++ generator into the offline
 # release.
@@ -23,7 +22,7 @@ if( NOT HERWIG3_FOUND )
 endif()
 
 # Install files from the package:
-set( herwig_datadir "${HERWIG3_ROOT}/share/Herwig" )
+set( herwig_datadir "${HERWIG3_LCGROOT}/share/Herwig" )
 if( NOT IS_DIRECTORY ${herwig_datadir} )
    message( WARNING "Can't access directory ${herwig_datadir}" )
    return()
diff --git a/External/Pythia8/CMakeLists.txt b/External/Pythia8/CMakeLists.txt
index 169ef610a28b000b692310e5b6388e9df7c3a464..1b98a23260bee6df2d1b5fbf0d92adffe9fc082f 100644
--- a/External/Pythia8/CMakeLists.txt
+++ b/External/Pythia8/CMakeLists.txt
@@ -1,4 +1,3 @@
-# $Id: CMakeLists.txt 728071 2016-03-07 10:51:32Z krasznaa $
 #
 # Package setting up Pythia8 to be used in the ATLAS offline software.
 #
@@ -21,7 +20,7 @@ if( NOT PYTHIA8_FOUND )
 endif()
 
 # Install the files from the xmldoc directory into the offline release.
-set( xmldoc_dir "${PYTHIA8_ROOT}/share/Pythia8/xmldoc" )
+set( xmldoc_dir "${PYTHIA8_LCGROOT}/share/Pythia8/xmldoc" )
 if( NOT IS_DIRECTORY ${xmldoc_dir} )
    message( WARNING "Can't access ${xmldoc_dir}" )
    return()
diff --git a/ForwardDetectors/ForwardSimulation/ForwardRegionGeoModel/src/ForwardRegionGeoModelElements.cxx b/ForwardDetectors/ForwardSimulation/ForwardRegionGeoModel/src/ForwardRegionGeoModelElements.cxx
index 2e884a193a867e949c62efc3671766b2ffe17113..76149d365272a8e89d368e2ae3af0bc5e5fc37c1 100644
--- a/ForwardDetectors/ForwardSimulation/ForwardRegionGeoModel/src/ForwardRegionGeoModelElements.cxx
+++ b/ForwardDetectors/ForwardSimulation/ForwardRegionGeoModel/src/ForwardRegionGeoModelElements.cxx
@@ -18,11 +18,10 @@
 #include "GeoModelKernel/GeoTransform.h"
 #include "GeoModelKernel/GeoAlignableTransform.h"
 #include "GeoModelKernel/GeoDefinitions.h"
-#include "GeoModelKernel/Units.h"
 #include "GeoGenericFunctions/AbsFunction.h"
 #include "GeoGenericFunctions/Sin.h"
 #include "GeoGenericFunctions/Cos.h"
-
+#include "GaudiKernel/SystemOfUnits.h"
 
 GeoPhysVol* ForwardRegionGeoModelFactory::insertMagnetEnvelope(std::string name, double x, double y, double z, double rotationAngle, double diameter, double halfL, double dL, GeoPhysVol* fwrPhys)
 {
@@ -30,7 +29,7 @@ GeoPhysVol* ForwardRegionGeoModelFactory::insertMagnetEnvelope(std::string name,
 
     GeoTrf::Transform3D shift = GeoTrf::Translate3D(x,y,z);
     GeoTrf::Transform3D rotate = GeoTrf::RotateY3D(rotationAngle);
-//    Transform3D rotateX180 = GeoTrf::RotateX3D(180*GeoModelKernelUnits::deg);
+//    Transform3D rotateX180 = GeoTrf::RotateX3D(180*Gaudi::Units::deg);
 
     const GeoShapeShift& magTube0 = (*tube)<<rotate<<shift;
 //    const GeoShapeUnion& magTube = magTube0.add((*tube)<<rotate<<shift<<rotateX180);
@@ -49,7 +48,7 @@ GeoPhysVol* ForwardRegionGeoModelFactory::insertMagnetEnvelope(std::string name,
 
 void ForwardRegionGeoModelFactory::insertCircularElement(std::string name, double x, double y, double z, double rotationAngle, double xAperture, double yAperture, double halfL, double dL, double tubeThickness, GeoPhysVol* fwrPhys)
 {
-    double r0 = std::max(xAperture,yAperture)*GeoModelKernelUnits::mm/2;
+    double r0 = std::max(xAperture,yAperture)*Gaudi::Units::mm/2;
 
     const GeoTube     *ringTube  = new GeoTube(r0, r0+tubeThickness, halfL-dL);
 
@@ -69,7 +68,7 @@ void ForwardRegionGeoModelFactory::insertCircularElement(std::string name, doubl
     fwrPhys->add(ringPhys);
 
 //    // The other side of the forward region may be obtained by rotation
-//    GeoTransform *rotateX180  = new GeoTransform(GeoTrf::RotateX3D(180*GeoModelKernelUnits::deg));
+//    GeoTransform *rotateX180  = new GeoTransform(GeoTrf::RotateX3D(180*Gaudi::Units::deg));
 
 //    // the other side
 //    fwrPhys->add(rotateX180);
@@ -87,12 +86,12 @@ void ForwardRegionGeoModelFactory::insertEllipticalElement(std::string name, dou
 
     // GeoEllipticalTube causes VP1 to fall, so for visualization GeoBox is used
     if(!m_Config.vp1Compatibility) {
-        ringTube0  = new GeoEllipticalTube(xAperture*GeoModelKernelUnits::mm/2+tubeThickness, yAperture*GeoModelKernelUnits::mm/2+tubeThickness, halfL-dL);
-        ringTube2  = new GeoEllipticalTube(xAperture*GeoModelKernelUnits::mm/2, yAperture*GeoModelKernelUnits::mm/2, halfL-dL);
+        ringTube0  = new GeoEllipticalTube(xAperture*Gaudi::Units::mm/2+tubeThickness, yAperture*Gaudi::Units::mm/2+tubeThickness, halfL-dL);
+        ringTube2  = new GeoEllipticalTube(xAperture*Gaudi::Units::mm/2, yAperture*Gaudi::Units::mm/2, halfL-dL);
     }
     else {
-        ringTube0  = new GeoBox(xAperture*GeoModelKernelUnits::mm/2+tubeThickness, yAperture*GeoModelKernelUnits::mm/2+tubeThickness, halfL-dL);
-        ringTube2  = new GeoBox(xAperture*GeoModelKernelUnits::mm/2, yAperture*GeoModelKernelUnits::mm/2, halfL-dL);
+        ringTube0  = new GeoBox(xAperture*Gaudi::Units::mm/2+tubeThickness, yAperture*Gaudi::Units::mm/2+tubeThickness, halfL-dL);
+        ringTube2  = new GeoBox(xAperture*Gaudi::Units::mm/2, yAperture*Gaudi::Units::mm/2, halfL-dL);
     }
     GeoShapeSubtraction * ringTube = new GeoShapeSubtraction(ringTube0, ringTube2);
 
@@ -112,7 +111,7 @@ void ForwardRegionGeoModelFactory::insertEllipticalElement(std::string name, dou
     fwrPhys->add(ringPhys);
 
 //    // The other side of the forward region may be obtained by rotation
-//    GeoTransform *rotateX180  = new GeoTransform(GeoTrf::RotateX3D(180*GeoModelKernelUnits::deg));
+//    GeoTransform *rotateX180  = new GeoTransform(GeoTrf::RotateX3D(180*Gaudi::Units::deg));
 
 //    // the other side
 //    fwrPhys->add(rotateX180);
@@ -125,22 +124,22 @@ void ForwardRegionGeoModelFactory::insertEllipticalElement(std::string name, dou
 
 void ForwardRegionGeoModelFactory::insertXRecticircularElement(std::string name, double x, double y, double z, double rotationAngle, double xAperture, double yAperture, double halfL, double dL, double tubeThickness, GeoPhysVol* fwrPhys)
 {
-    double beamScreenSeparation = 1.5*GeoModelKernelUnits::mm;
-    double beamScreenCuThick = 0.05*GeoModelKernelUnits::mm;
-    double beamScreenSteelThick = 1*GeoModelKernelUnits::mm;
+    double beamScreenSeparation = 1.5*Gaudi::Units::mm;
+    double beamScreenCuThick = 0.05*Gaudi::Units::mm;
+    double beamScreenSteelThick = 1*Gaudi::Units::mm;
 
-    const GeoTube     *ringTube  = new GeoTube(yAperture*GeoModelKernelUnits::mm/2+beamScreenCuThick+beamScreenSteelThick+beamScreenSeparation, yAperture*GeoModelKernelUnits::mm/2+beamScreenCuThick+beamScreenSteelThick+beamScreenSeparation+tubeThickness, halfL-dL);
-    const GeoTube     *circ  = new GeoTube(0, yAperture*GeoModelKernelUnits::mm/2, halfL-dL);
-    const GeoBox      *rect  = new GeoBox(xAperture*GeoModelKernelUnits::mm/2, yAperture*GeoModelKernelUnits::mm/2, halfL-dL);
+    const GeoTube     *ringTube  = new GeoTube(yAperture*Gaudi::Units::mm/2+beamScreenCuThick+beamScreenSteelThick+beamScreenSeparation, yAperture*Gaudi::Units::mm/2+beamScreenCuThick+beamScreenSteelThick+beamScreenSeparation+tubeThickness, halfL-dL);
+    const GeoTube     *circ  = new GeoTube(0, yAperture*Gaudi::Units::mm/2, halfL-dL);
+    const GeoBox      *rect  = new GeoBox(xAperture*Gaudi::Units::mm/2, yAperture*Gaudi::Units::mm/2, halfL-dL);
     GeoShapeIntersection *innerVac = new GeoShapeIntersection(rect,circ);
 
-    const GeoTube     *circ2  = new GeoTube(0, yAperture*GeoModelKernelUnits::mm/2+beamScreenCuThick, halfL-dL);
-    const GeoBox      *rect2  = new GeoBox(xAperture*GeoModelKernelUnits::mm/2+beamScreenCuThick, yAperture*GeoModelKernelUnits::mm/2+beamScreenCuThick, halfL-dL);
+    const GeoTube     *circ2  = new GeoTube(0, yAperture*Gaudi::Units::mm/2+beamScreenCuThick, halfL-dL);
+    const GeoBox      *rect2  = new GeoBox(xAperture*Gaudi::Units::mm/2+beamScreenCuThick, yAperture*Gaudi::Units::mm/2+beamScreenCuThick, halfL-dL);
     GeoShapeIntersection *beamScreenCu0 = new GeoShapeIntersection(rect2,circ2);
     GeoShapeSubtraction *beamScreenCu = new GeoShapeSubtraction(beamScreenCu0, innerVac);
 
-    const GeoTube     *circ3  = new GeoTube(0, yAperture*GeoModelKernelUnits::mm/2+beamScreenCuThick+beamScreenSteelThick, halfL-dL);
-    const GeoBox      *rect3  = new GeoBox(xAperture*GeoModelKernelUnits::mm/2+beamScreenCuThick+beamScreenSteelThick, yAperture*GeoModelKernelUnits::mm/2+beamScreenCuThick+beamScreenSteelThick, halfL-dL);
+    const GeoTube     *circ3  = new GeoTube(0, yAperture*Gaudi::Units::mm/2+beamScreenCuThick+beamScreenSteelThick, halfL-dL);
+    const GeoBox      *rect3  = new GeoBox(xAperture*Gaudi::Units::mm/2+beamScreenCuThick+beamScreenSteelThick, yAperture*Gaudi::Units::mm/2+beamScreenCuThick+beamScreenSteelThick, halfL-dL);
     GeoShapeIntersection *beamScreenSteel01 = new GeoShapeIntersection(rect3,circ3);
     GeoShapeSubtraction *beamScreenSteel02 = new GeoShapeSubtraction(beamScreenSteel01, innerVac);
     GeoShapeSubtraction *beamScreenSteel = new GeoShapeSubtraction(beamScreenSteel02, beamScreenCu);
@@ -179,7 +178,7 @@ void ForwardRegionGeoModelFactory::insertXRecticircularElement(std::string name,
 
 
 //    // The other side of the forward region may be obtain by rotation
-//    GeoTransform *rotateX180  = new GeoTransform(GeoTrf::RotateX3D(180*GeoModelKernelUnits::deg));
+//    GeoTransform *rotateX180  = new GeoTransform(GeoTrf::RotateX3D(180*Gaudi::Units::deg));
 
 //    // the other side
 //    fwrPhys->add(rotateX180);
@@ -206,22 +205,22 @@ void ForwardRegionGeoModelFactory::insertXRecticircularElement(std::string name,
 
 void ForwardRegionGeoModelFactory::insertYRecticircularElement(std::string name, double x, double y, double z, double rotationAngle, double xAperture, double yAperture, double halfL, double dL, double tubeThickness, GeoPhysVol* fwrPhys)
 {
-    double beamScreenSeparation = 1.5*GeoModelKernelUnits::mm;
-    double beamScreenCuThick = 0.05*GeoModelKernelUnits::mm;
-    double beamScreenSteelThick = 1*GeoModelKernelUnits::mm;
+    double beamScreenSeparation = 1.5*Gaudi::Units::mm;
+    double beamScreenCuThick = 0.05*Gaudi::Units::mm;
+    double beamScreenSteelThick = 1*Gaudi::Units::mm;
 
-    const GeoTube     *ringTube  = new GeoTube(xAperture*GeoModelKernelUnits::mm/2+beamScreenCuThick+beamScreenSteelThick+beamScreenSeparation, xAperture*GeoModelKernelUnits::mm/2+beamScreenCuThick+beamScreenSteelThick+beamScreenSeparation+tubeThickness, halfL-dL);
-    const GeoTube     *circ  = new GeoTube(0, xAperture*GeoModelKernelUnits::mm/2, halfL-dL);
-    const GeoBox      *rect  = new GeoBox(xAperture*GeoModelKernelUnits::mm/2, yAperture*GeoModelKernelUnits::mm/2, halfL-dL);
+    const GeoTube     *ringTube  = new GeoTube(xAperture*Gaudi::Units::mm/2+beamScreenCuThick+beamScreenSteelThick+beamScreenSeparation, xAperture*Gaudi::Units::mm/2+beamScreenCuThick+beamScreenSteelThick+beamScreenSeparation+tubeThickness, halfL-dL);
+    const GeoTube     *circ  = new GeoTube(0, xAperture*Gaudi::Units::mm/2, halfL-dL);
+    const GeoBox      *rect  = new GeoBox(xAperture*Gaudi::Units::mm/2, yAperture*Gaudi::Units::mm/2, halfL-dL);
     GeoShapeIntersection *innerVac = new GeoShapeIntersection(rect,circ);
 
-    const GeoTube     *circ2  = new GeoTube(0, xAperture*GeoModelKernelUnits::mm/2+beamScreenCuThick, halfL-dL);
-    const GeoBox      *rect2  = new GeoBox(xAperture*GeoModelKernelUnits::mm/2+beamScreenCuThick, yAperture*GeoModelKernelUnits::mm/2+beamScreenCuThick, halfL-dL);
+    const GeoTube     *circ2  = new GeoTube(0, xAperture*Gaudi::Units::mm/2+beamScreenCuThick, halfL-dL);
+    const GeoBox      *rect2  = new GeoBox(xAperture*Gaudi::Units::mm/2+beamScreenCuThick, yAperture*Gaudi::Units::mm/2+beamScreenCuThick, halfL-dL);
     GeoShapeIntersection *beamScreenCu0 = new GeoShapeIntersection(rect2,circ2);
     GeoShapeSubtraction *beamScreenCu = new GeoShapeSubtraction(beamScreenCu0, innerVac);
 
-    const GeoTube     *circ3  = new GeoTube(0, xAperture*GeoModelKernelUnits::mm/2+beamScreenCuThick+beamScreenSteelThick, halfL-dL);
-    const GeoBox      *rect3  = new GeoBox(xAperture*GeoModelKernelUnits::mm/2+beamScreenCuThick+beamScreenSteelThick, yAperture*GeoModelKernelUnits::mm/2+beamScreenCuThick+beamScreenSteelThick, halfL-dL);
+    const GeoTube     *circ3  = new GeoTube(0, xAperture*Gaudi::Units::mm/2+beamScreenCuThick+beamScreenSteelThick, halfL-dL);
+    const GeoBox      *rect3  = new GeoBox(xAperture*Gaudi::Units::mm/2+beamScreenCuThick+beamScreenSteelThick, yAperture*Gaudi::Units::mm/2+beamScreenCuThick+beamScreenSteelThick, halfL-dL);
     GeoShapeIntersection *beamScreenSteel01 = new GeoShapeIntersection(rect3,circ3);
     GeoShapeSubtraction *beamScreenSteel02 = new GeoShapeSubtraction(beamScreenSteel01, innerVac);
     GeoShapeSubtraction *beamScreenSteel = new GeoShapeSubtraction(beamScreenSteel02, beamScreenCu);
@@ -258,7 +257,7 @@ void ForwardRegionGeoModelFactory::insertYRecticircularElement(std::string name,
     fwrPhys->add(ringPhysSteel);
 
 //    // The other side of the forward region may be obtain by rotation
-//    GeoTransform *rotateX180  = new GeoTransform(GeoTrf::RotateX3D(180*GeoModelKernelUnits::deg));
+//    GeoTransform *rotateX180  = new GeoTransform(GeoTrf::RotateX3D(180*Gaudi::Units::deg));
 
 //    // the other side
 //    fwrPhys->add(rotateX180);
@@ -290,13 +289,13 @@ void ForwardRegionGeoModelFactory::insertTrousersElement(std::string name, doubl
 
     // CONSTANTS
     double TAN_A, TAN_B, TAN_C, TAN_Dsmall, TAN_Dbig, TAN_thick1, TAN_xseparation;
-    TAN_A = 700*GeoModelKernelUnits::mm;
-    TAN_B = 500*GeoModelKernelUnits::mm;
-    TAN_C = 3700*GeoModelKernelUnits::mm;
-    TAN_Dsmall = 52*GeoModelKernelUnits::mm;
-    TAN_Dbig = 212*GeoModelKernelUnits::mm;
-    TAN_thick1 = 4.5*GeoModelKernelUnits::mm;
-    TAN_xseparation = 80*GeoModelKernelUnits::mm;
+    TAN_A = 700*Gaudi::Units::mm;
+    TAN_B = 500*Gaudi::Units::mm;
+    TAN_C = 3700*Gaudi::Units::mm;
+    TAN_Dsmall = 52*Gaudi::Units::mm;
+    TAN_Dbig = 212*Gaudi::Units::mm;
+    TAN_thick1 = 4.5*Gaudi::Units::mm;
+    TAN_xseparation = 80*Gaudi::Units::mm;
 
     // Derived constants
     double TAN_Rsmall, TAN_Rbig, TAN_coneZh, TAN_coneR, TAN_coneXh;//, TAN_halflength;
@@ -310,12 +309,12 @@ void ForwardRegionGeoModelFactory::insertTrousersElement(std::string name, doubl
     // volume construction
 
     // inner part
-    GeoPcon *TANi_cone0 = new GeoPcon(0,360*GeoModelKernelUnits::deg);
+    GeoPcon *TANi_cone0 = new GeoPcon(0,360*Gaudi::Units::deg);
     TANi_cone0->addPlane(2*TAN_coneZh, TAN_Rsmall, 2*TAN_Rbig);
     TANi_cone0->addPlane(TAN_coneZh, TAN_Rsmall, 2*TAN_Rbig);
     TANi_cone0->addPlane(-TAN_coneZh, TAN_coneR, 2*TAN_Rbig);
     GeoTrf::Transform3D TAN_moveCone = GeoTrf::Translate3D(TAN_coneXh,0,0.5*(TAN_A-TAN_B));
-    GeoTrf::Transform3D TAN_rotateCone = GeoTrf::RotateY3D(5*GeoModelKernelUnits::deg);
+    GeoTrf::Transform3D TAN_rotateCone = GeoTrf::RotateY3D(5*Gaudi::Units::deg);
     const GeoShapeShift& TANi_cone = (*TANi_cone0)<<TAN_rotateCone<<TAN_moveCone;
 
     const GeoBox *TAN_box0 = new GeoBox(2*TAN_Rbig,2*TAN_Rbig,TAN_A+TAN_B);
@@ -328,13 +327,13 @@ void ForwardRegionGeoModelFactory::insertTrousersElement(std::string name, doubl
 
     GeoShapeSubtraction *TANi_h = new GeoShapeSubtraction(TANi_hcyl, &TANi_cone);
     GeoTrf::Transform3D TAN_moveH = GeoTrf::Translate3D(0,0,-0.5*TAN_C);
-    GeoTrf::Transform3D TAN_rotateH = GeoTrf::RotateZ3D(180*GeoModelKernelUnits::deg);
+    GeoTrf::Transform3D TAN_rotateH = GeoTrf::RotateZ3D(180*Gaudi::Units::deg);
 
     GeoTrf::Transform3D TAN_moveTube1 = GeoTrf::Translate3D(TAN_xseparation,0,0.5*(TAN_A+TAN_B));
     GeoTrf::Transform3D TAN_moveTube2 = GeoTrf::Translate3D(-TAN_xseparation,0,0.5*(TAN_A+TAN_B));
 
     // outer part
-    GeoPcon *TANo_cone0 = new GeoPcon(0,360*GeoModelKernelUnits::deg);
+    GeoPcon *TANo_cone0 = new GeoPcon(0,360*Gaudi::Units::deg);
     TANo_cone0->addPlane(2*TAN_coneZh, TAN_Rsmall+TAN_thick1, 2*TAN_Rbig);
     TANo_cone0->addPlane(TAN_coneZh, TAN_Rsmall+TAN_thick1, 2*TAN_Rbig);
     TANo_cone0->addPlane(-TAN_coneZh, TAN_coneR+TAN_thick1, 2*TAN_Rbig);
@@ -355,7 +354,7 @@ void ForwardRegionGeoModelFactory::insertTrousersElement(std::string name, doubl
     const GeoShapeShift& TAN_shape1 = (*TAN_shape)<<TAN_moveH;
     const GeoShapeShift& TAN_shape2 = (*TAN_shape)<<TAN_moveH<<TAN_rotateH;
 
-    const GeoTube *TANo_ftube = new GeoTube(TAN_Rsmall,TAN_Rsmall+TAN_thick1,0.5*TAN_C-0.1*GeoModelKernelUnits::mm);
+    const GeoTube *TANo_ftube = new GeoTube(TAN_Rsmall,TAN_Rsmall+TAN_thick1,0.5*TAN_C-0.1*Gaudi::Units::mm);
     const GeoShapeShift& TANo_ftube1 = (*TANo_ftube)<<TAN_moveTube1;
     const GeoShapeShift& TANo_ftube2 = (*TANo_ftube)<<TAN_moveTube2;
 
@@ -380,7 +379,7 @@ void ForwardRegionGeoModelFactory::insertTrousersElement(std::string name, doubl
     fwrPhys->add(ringPhys);
 
 //    // The other side of the forward region may be obtained by rotation
-//    GeoTransform *rotateX180  = new GeoTransform(GeoTrf::RotateX3D(180*GeoModelKernelUnits::deg));
+//    GeoTransform *rotateX180  = new GeoTransform(GeoTrf::RotateX3D(180*Gaudi::Units::deg));
 
 //    // the other side
 //    fwrPhys->add(rotateX180);
@@ -395,43 +394,43 @@ void ForwardRegionGeoModelFactory::insertTCLElement(std::string name, double x,
 {
     // Constants
     double TCL_BOX_halflength, TCL_BOX_halfwidth, TCL_BOX_halfheight, TCL_BOX_sideThickness, TCL_BOX_topBottomThickness, TCL_BOX_endThickness, TCL_TUBE_halflength, TCL_TUBE_halfapperture, TCL_TUBE_thickness;
-    TCL_BOX_sideThickness = 6*GeoModelKernelUnits::mm;
-    TCL_BOX_topBottomThickness = 18*GeoModelKernelUnits::mm;
-    TCL_BOX_endThickness = 18*GeoModelKernelUnits::mm;
+    TCL_BOX_sideThickness = 6*Gaudi::Units::mm;
+    TCL_BOX_topBottomThickness = 18*Gaudi::Units::mm;
+    TCL_BOX_endThickness = 18*Gaudi::Units::mm;
 
-    TCL_BOX_halflength = 621*GeoModelKernelUnits::mm;
-    TCL_BOX_halfwidth = 132*GeoModelKernelUnits::mm;
+    TCL_BOX_halflength = 621*Gaudi::Units::mm;
+    TCL_BOX_halfwidth = 132*Gaudi::Units::mm;
     TCL_BOX_halfheight = 60+TCL_BOX_topBottomThickness;
 
-    TCL_TUBE_halflength = 59.5*GeoModelKernelUnits::mm;
-    TCL_TUBE_halfapperture = 53*GeoModelKernelUnits::mm;
-    TCL_TUBE_thickness = 2*GeoModelKernelUnits::mm;
+    TCL_TUBE_halflength = 59.5*Gaudi::Units::mm;
+    TCL_TUBE_halfapperture = 53*Gaudi::Units::mm;
+    TCL_TUBE_thickness = 2*Gaudi::Units::mm;
 
     double TCL_CuBlock_halflength, TCL_CuBlock_halfwidth, TCL_CuBlock_halfheight, TCL_CuBlockCylCut_zDepth, TCL_CuBlockCylCut_angle, TCL_CuBlockCylCut_cylR, TCL_CuBlockCylCut_cylHalflength, TCL_CuBlockCylCut_xDepth, TCL_CuBlockCylCut_xShift;
-    TCL_CuBlock_halflength = 597*GeoModelKernelUnits::mm;
-    TCL_CuBlock_halfwidth = 14.5*GeoModelKernelUnits::mm;
-    TCL_CuBlock_halfheight = 40*GeoModelKernelUnits::mm;
+    TCL_CuBlock_halflength = 597*Gaudi::Units::mm;
+    TCL_CuBlock_halfwidth = 14.5*Gaudi::Units::mm;
+    TCL_CuBlock_halfheight = 40*Gaudi::Units::mm;
 
-    TCL_CuBlockCylCut_zDepth = 90*GeoModelKernelUnits::mm;
-    TCL_CuBlockCylCut_angle = 12*GeoModelKernelUnits::deg;
-    TCL_CuBlockCylCut_cylR = 40*GeoModelKernelUnits::mm;
+    TCL_CuBlockCylCut_zDepth = 90*Gaudi::Units::mm;
+    TCL_CuBlockCylCut_angle = 12*Gaudi::Units::deg;
+    TCL_CuBlockCylCut_cylR = 40*Gaudi::Units::mm;
 
     TCL_CuBlockCylCut_cylHalflength = TCL_CuBlockCylCut_zDepth/cos(TCL_CuBlockCylCut_angle);
     TCL_CuBlockCylCut_xDepth = TCL_CuBlockCylCut_zDepth*tan(TCL_CuBlockCylCut_angle);
     TCL_CuBlockCylCut_xShift = -TCL_CuBlock_halfwidth-TCL_CuBlockCylCut_cylR/cos(TCL_CuBlockCylCut_angle)+TCL_CuBlockCylCut_xDepth;
 
     double TCL_CuBeam_halflength, TCL_CuBeam_halfwidth, TCL_CuBeam_halfheight, TCL_Cooling_width;
-    TCL_CuBeam_halflength = 530*GeoModelKernelUnits::mm;
-    TCL_CuBeam_halfwidth = 15*GeoModelKernelUnits::mm;
-    TCL_CuBeam_halfheight = 40*GeoModelKernelUnits::mm;
+    TCL_CuBeam_halflength = 530*Gaudi::Units::mm;
+    TCL_CuBeam_halfwidth = 15*Gaudi::Units::mm;
+    TCL_CuBeam_halfheight = 40*Gaudi::Units::mm;
 
-    TCL_Cooling_width = 9*GeoModelKernelUnits::mm;
+    TCL_Cooling_width = 9*Gaudi::Units::mm;
 
 
 
     // rotate by 180 deg around X and Y
-    GeoTrf::Transform3D rotateX180 = GeoTrf::RotateX3D(180*GeoModelKernelUnits::deg);
-    GeoTrf::Transform3D rotateY180 = GeoTrf::RotateY3D(180*GeoModelKernelUnits::deg);
+    GeoTrf::Transform3D rotateX180 = GeoTrf::RotateX3D(180*Gaudi::Units::deg);
+    GeoTrf::Transform3D rotateY180 = GeoTrf::RotateY3D(180*Gaudi::Units::deg);
 
     // inner vacuum volume solid
     const GeoBox * boxIn = new GeoBox(TCL_BOX_halfwidth-TCL_BOX_sideThickness, TCL_BOX_halfheight-TCL_BOX_topBottomThickness, TCL_BOX_halflength-TCL_BOX_endThickness);
diff --git a/ForwardDetectors/ForwardSimulation/ForwardRegionGeoModel/src/ForwardRegionGeoModelFactory.cxx b/ForwardDetectors/ForwardSimulation/ForwardRegionGeoModel/src/ForwardRegionGeoModelFactory.cxx
index 8108bb3b019bc050fff09e535d62979735f69f34..f15e5106eb89c2181086c778bc792b6f1c1c05c9 100755
--- a/ForwardDetectors/ForwardSimulation/ForwardRegionGeoModel/src/ForwardRegionGeoModelFactory.cxx
+++ b/ForwardDetectors/ForwardSimulation/ForwardRegionGeoModel/src/ForwardRegionGeoModelFactory.cxx
@@ -24,7 +24,7 @@
 #include "GeoGenericFunctions/Cos.h"
 #include "CLHEP/Geometry/Point3D.h"
 #include "StoreGate/StoreGateSvc.h"
-#include "CLHEP/Units/SystemOfUnits.h"
+#include "GaudiKernel/SystemOfUnits.h"
 
 #include "GeoModelInterfaces/StoredMaterialManager.h"
 
@@ -46,28 +46,28 @@
 
 void FWD_CONFIGURATION::clear()
 {
-    TCL4JawDistB1I = 57*GeoModelKernelUnits::mm;
-    TCL5JawDistB1I = 57*GeoModelKernelUnits::mm;
-    TCL6JawDistB1I = 57*GeoModelKernelUnits::mm;
-    TCL4JawDistB2I = 57*GeoModelKernelUnits::mm;
-    TCL5JawDistB2I = 57*GeoModelKernelUnits::mm;
-    TCL6JawDistB2I = 57*GeoModelKernelUnits::mm;
-    TCL4JawDistB1O = 57*GeoModelKernelUnits::mm;
-    TCL5JawDistB1O = 57*GeoModelKernelUnits::mm;
-    TCL6JawDistB1O = 57*GeoModelKernelUnits::mm;
-    TCL4JawDistB2O = 57*GeoModelKernelUnits::mm;
-    TCL5JawDistB2O = 57*GeoModelKernelUnits::mm;
-    TCL6JawDistB2O = 57*GeoModelKernelUnits::mm;
+    TCL4JawDistB1I = 57*Gaudi::Units::mm;
+    TCL5JawDistB1I = 57*Gaudi::Units::mm;
+    TCL6JawDistB1I = 57*Gaudi::Units::mm;
+    TCL4JawDistB2I = 57*Gaudi::Units::mm;
+    TCL5JawDistB2I = 57*Gaudi::Units::mm;
+    TCL6JawDistB2I = 57*Gaudi::Units::mm;
+    TCL4JawDistB1O = 57*Gaudi::Units::mm;
+    TCL5JawDistB1O = 57*Gaudi::Units::mm;
+    TCL6JawDistB1O = 57*Gaudi::Units::mm;
+    TCL4JawDistB2O = 57*Gaudi::Units::mm;
+    TCL5JawDistB2O = 57*Gaudi::Units::mm;
+    TCL6JawDistB2O = 57*Gaudi::Units::mm;
     vp1Compatibility = false;
     buildTCL4 = false;
     buildTCL6 = false;
     ALFAInNewPosition = false;
-    newPosB7L1 = 245656.77*GeoModelKernelUnits::mm;
-    newPosB7R1 = -245656.11*GeoModelKernelUnits::mm;
-    posAFPL1 = 204500*GeoModelKernelUnits::mm;
-    posAFPL2 = 212675*GeoModelKernelUnits::mm;
-    posAFPR1 = -204500*GeoModelKernelUnits::mm;
-    posAFPL2 = -212675*GeoModelKernelUnits::mm;
+    newPosB7L1 = 245656.77*Gaudi::Units::mm;
+    newPosB7R1 = -245656.11*Gaudi::Units::mm;
+    posAFPL1 = 204500*Gaudi::Units::mm;
+    posAFPL2 = 212675*Gaudi::Units::mm;
+    posAFPR1 = -204500*Gaudi::Units::mm;
+    posAFPL2 = -212675*Gaudi::Units::mm;
 }
 
 
@@ -116,7 +116,7 @@ void ForwardRegionGeoModelFactory::DefineMaterials()
 
     // water
     matName = "water";
-    GeoMaterial *water = new GeoMaterial("H20", 1.0*GeoModelKernelUnits::gram/GeoModelKernelUnits::cm3);
+    GeoMaterial *water = new GeoMaterial("H20", 1.0*GeoModelKernelUnits::gram/Gaudi::Units::cm3);
     GeoElement *hydrogen = new GeoElement("Hydrogen","H",1.0, 1.010);
     GeoElement *oxygen   = new GeoElement("Oxygen",  "O", 8.0, 16.0);
     water->add(hydrogen,0.11);
@@ -144,7 +144,7 @@ void ForwardRegionGeoModelFactory::DefineMaterials()
 
     // Copper for beam screens
     matName = "Copper";
-    GeoMaterial *copper = new GeoMaterial("Copper", 8.94*GeoModelKernelUnits::g/GeoModelKernelUnits::cm3);
+    GeoMaterial *copper = new GeoMaterial("Copper", 8.94*GeoModelKernelUnits::g/Gaudi::Units::cm3);
     copper->add(const_cast<GeoElement*> (Cu),1.0);
     copper->lock();
     m_MapMaterials.insert(std::pair<std::string,GeoMaterial*>(matName,copper));
@@ -152,7 +152,7 @@ void ForwardRegionGeoModelFactory::DefineMaterials()
     // Tungsten for TCL6
     matName = "Tungsten";
     const GeoElement* W = materialManager->getElement("Wolfram");
-    GeoMaterial *tungsten = new GeoMaterial("Tungsten", 19.25*GeoModelKernelUnits::g/GeoModelKernelUnits::cm3);
+    GeoMaterial *tungsten = new GeoMaterial("Tungsten", 19.25*GeoModelKernelUnits::g/Gaudi::Units::cm3);
     tungsten->add(const_cast<GeoElement*> (W),1.0);
     tungsten->lock();
     m_MapMaterials.insert(std::pair<std::string,GeoMaterial*>(matName,tungsten));
@@ -160,14 +160,14 @@ void ForwardRegionGeoModelFactory::DefineMaterials()
     // GlidCop AL15 copper -- aproximate composition (trace impurities (< 0.01 wt. %) not included)
     // source: http://www-ferp.ucsd.edu/LIB/PROPS/compcu15.html
     matName = "GlidCopAL15";
-    GeoMaterial *glidcop=new GeoMaterial("GlidCopAL15", 8.90*GeoModelKernelUnits::g/GeoModelKernelUnits::cm3);
+    GeoMaterial *glidcop=new GeoMaterial("GlidCopAL15", 8.90*GeoModelKernelUnits::g/Gaudi::Units::cm3);
 
     double aCu, aAl, aO, aB, aTot;
 
-    aCu=99.7*Cu->getA()/(GeoModelKernelUnits::g/GeoModelKernelUnits::mole);
-    aAl=0.15*Al->getA()/(GeoModelKernelUnits::g/GeoModelKernelUnits::mole);
-    aO=0.13*O->getA()/(GeoModelKernelUnits::g/GeoModelKernelUnits::mole);
-    aB=0.02*B->getA()/(GeoModelKernelUnits::g/GeoModelKernelUnits::mole);
+    aCu=99.7*Cu->getA()/(GeoModelKernelUnits::g/Gaudi::Units::mole);
+    aAl=0.15*Al->getA()/(GeoModelKernelUnits::g/Gaudi::Units::mole);
+    aO=0.13*O->getA()/(GeoModelKernelUnits::g/Gaudi::Units::mole);
+    aB=0.02*B->getA()/(GeoModelKernelUnits::g/Gaudi::Units::mole);
     aTot=aCu+aAl+aO+aB;
 
     glidcop->add(const_cast<GeoElement*> (Cu), aCu/aTot);
@@ -179,20 +179,20 @@ void ForwardRegionGeoModelFactory::DefineMaterials()
 
     // Steel Grade 316L (Roman Pot)
     matName = "Steel";
-    GeoMaterial *steel=new GeoMaterial("Steel", 8*GeoModelKernelUnits::g/GeoModelKernelUnits::cm3);
+    GeoMaterial *steel=new GeoMaterial("Steel", 8*GeoModelKernelUnits::g/Gaudi::Units::cm3);
 
     double aC,aN,aSi,aP,aS,aCr,aMn,aFe,aNi,aMo,Atot;
 
-    aFe=62.045*Fe->getA()/(GeoModelKernelUnits::g/GeoModelKernelUnits::mole);
-    aC =0.03*C ->getA()/(GeoModelKernelUnits::g/GeoModelKernelUnits::mole);
-    aMn=2.0*Mn ->getA()/(GeoModelKernelUnits::g/GeoModelKernelUnits::mole);
-    aSi=0.75*Si->getA()/(GeoModelKernelUnits::g/GeoModelKernelUnits::mole);
-    aP =0.045*P->getA()/(GeoModelKernelUnits::g/GeoModelKernelUnits::mole);
-    aS =0.03*S ->getA()/(GeoModelKernelUnits::g/GeoModelKernelUnits::mole);
-    aCr=18.0*Cr->getA()/(GeoModelKernelUnits::g/GeoModelKernelUnits::mole);
-    aMo=3.0*Mo ->getA()/(GeoModelKernelUnits::g/GeoModelKernelUnits::mole);
-    aNi=14.0*Ni->getA()/(GeoModelKernelUnits::g/GeoModelKernelUnits::mole);
-    aN =0.10*N ->getA()/(GeoModelKernelUnits::g/GeoModelKernelUnits::mole);
+    aFe=62.045*Fe->getA()/(GeoModelKernelUnits::g/Gaudi::Units::mole);
+    aC =0.03*C ->getA()/(GeoModelKernelUnits::g/Gaudi::Units::mole);
+    aMn=2.0*Mn ->getA()/(GeoModelKernelUnits::g/Gaudi::Units::mole);
+    aSi=0.75*Si->getA()/(GeoModelKernelUnits::g/Gaudi::Units::mole);
+    aP =0.045*P->getA()/(GeoModelKernelUnits::g/Gaudi::Units::mole);
+    aS =0.03*S ->getA()/(GeoModelKernelUnits::g/Gaudi::Units::mole);
+    aCr=18.0*Cr->getA()/(GeoModelKernelUnits::g/Gaudi::Units::mole);
+    aMo=3.0*Mo ->getA()/(GeoModelKernelUnits::g/Gaudi::Units::mole);
+    aNi=14.0*Ni->getA()/(GeoModelKernelUnits::g/Gaudi::Units::mole);
+    aN =0.10*N ->getA()/(GeoModelKernelUnits::g/Gaudi::Units::mole);
     Atot=aFe+aC+aMn+aSi+aP+aS+aCr+aMo+aNi+aN;
 
     steel->add(const_cast<GeoElement*> (Fe),aFe/Atot);
@@ -262,8 +262,8 @@ void ForwardRegionGeoModelFactory::constructElements(GeoPhysVol *fwrPhys,std::ve
             double startX = pointMagStart[0];
             double endX   = pointMagEnd[0];
             double rotationAngle = atan2(endX - startX,endZ - startZ);
-            double r = atof(loadedDataFile[i][xAperture].c_str())*GeoModelKernelUnits::mm/2;
-            double dL = abs(r*tan(rotationAngle))+0.2*GeoModelKernelUnits::mm;
+            double r = atof(loadedDataFile[i][xAperture].c_str())*Gaudi::Units::mm/2;
+            double dL = abs(r*tan(rotationAngle))+0.2*Gaudi::Units::mm;
 
 
             // move start and end points of the magnet element and neighbour elemens accordingly
@@ -288,12 +288,12 @@ void ForwardRegionGeoModelFactory::constructElements(GeoPhysVol *fwrPhys,std::ve
     // --------------- elements cycle -----------------
     for(int i=0; i < lDFSize; i++)
     {
-        startZ = atof(loadedDataFile[i][zStart].c_str())*GeoModelKernelUnits::m;
-        endZ   = atof(loadedDataFile[i][zEnd].c_str())*GeoModelKernelUnits::m;
-        startX = atof(loadedDataFile[i][xStart].c_str())*GeoModelKernelUnits::m;
-        endX   = atof(loadedDataFile[i][xEnd].c_str())*GeoModelKernelUnits::m;
-        startY = atof(loadedDataFile[i][yStart].c_str())*GeoModelKernelUnits::m;
-        endY   = atof(loadedDataFile[i][yEnd].c_str())*GeoModelKernelUnits::m;
+        startZ = atof(loadedDataFile[i][zStart].c_str())*Gaudi::Units::m;
+        endZ   = atof(loadedDataFile[i][zEnd].c_str())*Gaudi::Units::m;
+        startX = atof(loadedDataFile[i][xStart].c_str())*Gaudi::Units::m;
+        endX   = atof(loadedDataFile[i][xEnd].c_str())*Gaudi::Units::m;
+        startY = atof(loadedDataFile[i][yStart].c_str())*Gaudi::Units::m;
+        endY   = atof(loadedDataFile[i][yEnd].c_str())*Gaudi::Units::m;
 
         // translation of element
         x = (startX + endX)/2;
@@ -307,10 +307,10 @@ void ForwardRegionGeoModelFactory::constructElements(GeoPhysVol *fwrPhys,std::ve
         // half-length of element
         halfL = sqrt((endX - startX)*(endX - startX) + (endZ - startZ)*(endZ - startZ))/2;
 
-        r = atof(loadedDataFile[i][xAperture].c_str())*GeoModelKernelUnits::mm/2;
+        r = atof(loadedDataFile[i][xAperture].c_str())*Gaudi::Units::mm/2;
 
         // overlap correction
-        dL = abs(r*tan(rotationAngle))+0.2*GeoModelKernelUnits::mm;
+        dL = abs(r*tan(rotationAngle))+0.2*Gaudi::Units::mm;
 
         // do not shorten magnetic volumes
         if(loadedDataFile[i][name].find("Mag") != std::string::npos)
@@ -322,7 +322,7 @@ void ForwardRegionGeoModelFactory::constructElements(GeoPhysVol *fwrPhys,std::ve
         if(atoi(loadedDataFile[i][type].c_str()) == 0){
             // envelope to allow tracking with G4TrackAction
             if(loadedDataFile[i][name] == "VCDBP.7R1.B"){
-                GeoPhysVol* trackEnv = insertMagnetEnvelope(loadedDataFile[i][name], x, y, z, rotationAngle, 100*GeoModelKernelUnits::mm, halfL, dL, fwrPhys);
+                GeoPhysVol* trackEnv = insertMagnetEnvelope(loadedDataFile[i][name], x, y, z, rotationAngle, 100*Gaudi::Units::mm, halfL, dL, fwrPhys);
                 insertCircularElement(loadedDataFile[i][name], x, y, z, rotationAngle, atof(loadedDataFile[i][xAperture].c_str()), atof(loadedDataFile[i][yAperture].c_str()), halfL, dL, atof(loadedDataFile[i][tubeThickness].c_str()), trackEnv);
             }
             else
@@ -349,20 +349,20 @@ void ForwardRegionGeoModelFactory::constructElements(GeoPhysVol *fwrPhys,std::ve
 
         // elliptical aperture
         if(atoi(loadedDataFile[i][type].c_str()) == 1) {
-            magEnv = insertMagnetEnvelope(loadedDataFile[i][name], x, y, z, rotationAngle, 20*GeoModelKernelUnits::cm, halfL, dL, fwrPhys);
+            magEnv = insertMagnetEnvelope(loadedDataFile[i][name], x, y, z, rotationAngle, 20*Gaudi::Units::cm, halfL, dL, fwrPhys);
             insertEllipticalElement(loadedDataFile[i][name], x, y, z, rotationAngle, atof(loadedDataFile[i][xAperture].c_str()), atof(loadedDataFile[i][yAperture].c_str()), halfL, dL, atof(loadedDataFile[i][tubeThickness].c_str()), magEnv);
         }
 
 
-        double magDiam = 19.4*GeoModelKernelUnits::cm;
+        double magDiam = 19.4*Gaudi::Units::cm;
         if(loadedDataFile[i][name].find("Mag") != std::string::npos)
-            magDiam= 19.4*GeoModelKernelUnits::cm;
+            magDiam= 19.4*Gaudi::Units::cm;
         if(loadedDataFile[i][name] == "LQXAA.1R1MagQ1" || loadedDataFile[i][name] == "LQXAG.3R1MagQ3")
-            magDiam = 48*GeoModelKernelUnits::cm;
+            magDiam = 48*Gaudi::Units::cm;
         if(loadedDataFile[i][name] == "LQXBA.2R1MagQ2a" || loadedDataFile[i][name] == "LQXBA.2R1MagQ2b")
-            magDiam = 52*GeoModelKernelUnits::cm;
+            magDiam = 52*Gaudi::Units::cm;
         //else magDiam = std::max(atof(loadedDataFile[i][xAperture].c_str()), atof(loadedDataFile[i][yAperture].c_str()))+2*atof(loadedDataFile[i][tubeThickness].c_str());
-        //else magDiam = 19.4*GeoModelKernelUnits::cm;
+        //else magDiam = 19.4*Gaudi::Units::cm;
 
         // rectcircular aperture with flats in x
         if(atoi(loadedDataFile[i][type].c_str()) == 2) {
@@ -396,16 +396,16 @@ void ForwardRegionGeoModelFactory::create(GeoPhysVol *world)
 
   double startZ,endZ;
 
-  if(m_Config.vp1Compatibility) startZ = 19.0*GeoModelKernelUnits::m;
-  else startZ = 22.0*GeoModelKernelUnits::m;
-  endZ = 268.904*GeoModelKernelUnits::m;
+  if(m_Config.vp1Compatibility) startZ = 19.0*Gaudi::Units::m;
+  else startZ = 22.0*Gaudi::Units::m;
+  endZ = 268.904*Gaudi::Units::m;
 
   //rotationAngle_old = 0;
 
   // mother volume -- union of tubes, one for each side
-  //const GeoBox      *fwrBox    = new GeoBox(2*GeoModelKernelUnits::m,0.5*GeoModelKernelUnits::m,(endZ-startZ)/2);
-  const GeoTube     *fwrTubeL    = new GeoTube(0,2*GeoModelKernelUnits::m,(endZ-startZ)/2);
-  GeoTube     *fwrTubeR    = new GeoTube(0,2*GeoModelKernelUnits::m,(endZ-startZ)/2);
+  //const GeoBox      *fwrBox    = new GeoBox(2*Gaudi::Units::m,0.5*Gaudi::Units::m,(endZ-startZ)/2);
+  const GeoTube     *fwrTubeL    = new GeoTube(0,2*Gaudi::Units::m,(endZ-startZ)/2);
+  GeoTube     *fwrTubeR    = new GeoTube(0,2*Gaudi::Units::m,(endZ-startZ)/2);
   GeoTrf::Transform3D shiftL = GeoTrf::Translate3D(0,0,(endZ+startZ)/2);
   GeoTrf::Transform3D shiftR = GeoTrf::Translate3D(0,0,-(endZ+startZ)/2);
 
@@ -413,16 +413,16 @@ void ForwardRegionGeoModelFactory::create(GeoPhysVol *world)
   const GeoShapeUnion& fwrTube1 = fwrTube0.add((*fwrTubeR)<<shiftR);
 
   // cut out slots for ALFA
-  const GeoTube     *alfa    = new GeoTube(0, 2*GeoModelKernelUnits::m, 500*GeoModelKernelUnits::mm);
-  GeoTrf::Transform3D shiftAlfaL1 = GeoTrf::Translate3D(0,0,237388*GeoModelKernelUnits::mm);
-  GeoTrf::Transform3D shiftAlfaR1 = GeoTrf::Translate3D(0,0,-237408*GeoModelKernelUnits::mm);
-  GeoTrf::Transform3D shiftAlfaL2 = GeoTrf::Translate3D(0,0,(m_Config.ALFAInNewPosition ? m_Config.newPosB7L1 : 241528*GeoModelKernelUnits::mm));
-  GeoTrf::Transform3D shiftAlfaR2 = GeoTrf::Translate3D(0,0,(m_Config.ALFAInNewPosition ? m_Config.newPosB7R1 :-241548*GeoModelKernelUnits::mm));
+  const GeoTube     *alfa    = new GeoTube(0, 2*Gaudi::Units::m, 500*Gaudi::Units::mm);
+  GeoTrf::Transform3D shiftAlfaL1 = GeoTrf::Translate3D(0,0,237388*Gaudi::Units::mm);
+  GeoTrf::Transform3D shiftAlfaR1 = GeoTrf::Translate3D(0,0,-237408*Gaudi::Units::mm);
+  GeoTrf::Transform3D shiftAlfaL2 = GeoTrf::Translate3D(0,0,(m_Config.ALFAInNewPosition ? m_Config.newPosB7L1 : 241528*Gaudi::Units::mm));
+  GeoTrf::Transform3D shiftAlfaR2 = GeoTrf::Translate3D(0,0,(m_Config.ALFAInNewPosition ? m_Config.newPosB7R1 :-241548*Gaudi::Units::mm));
   const GeoShapeSubtraction& fwrTube2 = fwrTube1.subtract((*alfa)<<shiftAlfaL1).subtract((*alfa)<<shiftAlfaL2).subtract((*alfa)<<shiftAlfaR1).subtract((*alfa)<<shiftAlfaR2);
 
   // cut out slots for AFP
-  const GeoTube     *afp    = new GeoTube(0, 2.5*GeoModelKernelUnits::m, 280*GeoModelKernelUnits::mm);
-  const GeoTube     *afp2    = new GeoTube(0, 2.5*GeoModelKernelUnits::m, 580*GeoModelKernelUnits::mm);
+  const GeoTube     *afp    = new GeoTube(0, 2.5*Gaudi::Units::m, 280*Gaudi::Units::mm);
+  const GeoTube     *afp2    = new GeoTube(0, 2.5*Gaudi::Units::m, 580*Gaudi::Units::mm);
   GeoTrf::Transform3D shiftAfpL1 = GeoTrf::Translate3D(0,0,m_Config.posAFPL1);
   GeoTrf::Transform3D shiftAfpR1 = GeoTrf::Translate3D(0,0,m_Config.posAFPR1);
   GeoTrf::Transform3D shiftAfpL2 = GeoTrf::Translate3D(0,0,m_Config.posAFPL2);
diff --git a/ForwardDetectors/ForwardSimulation/ForwardRegionGeoModel/src/ForwardRegionGeoModelTool.cxx b/ForwardDetectors/ForwardSimulation/ForwardRegionGeoModel/src/ForwardRegionGeoModelTool.cxx
index b30c4f3aa758abf683be95410ac2d00329e623a0..3817b0114a79f43b848a612600ef322b58d0422d 100755
--- a/ForwardDetectors/ForwardSimulation/ForwardRegionGeoModel/src/ForwardRegionGeoModelTool.cxx
+++ b/ForwardDetectors/ForwardSimulation/ForwardRegionGeoModel/src/ForwardRegionGeoModelTool.cxx
@@ -9,8 +9,8 @@
 #include "GaudiKernel/IService.h"
 #include "GaudiKernel/ISvcLocator.h"
 #include "GaudiKernel/MsgStream.h"
+#include "GaudiKernel/SystemOfUnits.h"
 #include "StoreGate/StoreGateSvc.h"
-#include "GeoModelKernel/Units.h"
 
 /**
  ** Constructor(s)
@@ -19,28 +19,28 @@ ForwardRegionGeoModelTool::ForwardRegionGeoModelTool( const std::string& type, c
 : GeoModelTool( type, name, parent )
 {
     m_Config.clear();
-    declareProperty("TCL4JawDistB1I",m_Config.TCL4JawDistB1I=57*GeoModelKernelUnits::mm);
-    declareProperty("TCL4JawDistB2I",m_Config.TCL4JawDistB2I=57*GeoModelKernelUnits::mm);
-    declareProperty("TCL5JawDistB1I",m_Config.TCL5JawDistB1I=57*GeoModelKernelUnits::mm);
-    declareProperty("TCL5JawDistB2I",m_Config.TCL5JawDistB2I=57*GeoModelKernelUnits::mm);
-    declareProperty("TCL6JawDistB1I",m_Config.TCL6JawDistB1I=57*GeoModelKernelUnits::mm);
-    declareProperty("TCL6JawDistB2I",m_Config.TCL6JawDistB2I=57*GeoModelKernelUnits::mm);
-    declareProperty("TCL4JawDistB1O",m_Config.TCL4JawDistB1O=57*GeoModelKernelUnits::mm);
-    declareProperty("TCL4JawDistB2O",m_Config.TCL4JawDistB2O=57*GeoModelKernelUnits::mm);
-    declareProperty("TCL5JawDistB1O",m_Config.TCL5JawDistB1O=57*GeoModelKernelUnits::mm);
-    declareProperty("TCL5JawDistB2O",m_Config.TCL5JawDistB2O=57*GeoModelKernelUnits::mm);
-    declareProperty("TCL6JawDistB1O",m_Config.TCL6JawDistB1O=57*GeoModelKernelUnits::mm);
-    declareProperty("TCL6JawDistB2O",m_Config.TCL6JawDistB2O=57*GeoModelKernelUnits::mm);
+    declareProperty("TCL4JawDistB1I",m_Config.TCL4JawDistB1I=57*Gaudi::Units::mm);
+    declareProperty("TCL4JawDistB2I",m_Config.TCL4JawDistB2I=57*Gaudi::Units::mm);
+    declareProperty("TCL5JawDistB1I",m_Config.TCL5JawDistB1I=57*Gaudi::Units::mm);
+    declareProperty("TCL5JawDistB2I",m_Config.TCL5JawDistB2I=57*Gaudi::Units::mm);
+    declareProperty("TCL6JawDistB1I",m_Config.TCL6JawDistB1I=57*Gaudi::Units::mm);
+    declareProperty("TCL6JawDistB2I",m_Config.TCL6JawDistB2I=57*Gaudi::Units::mm);
+    declareProperty("TCL4JawDistB1O",m_Config.TCL4JawDistB1O=57*Gaudi::Units::mm);
+    declareProperty("TCL4JawDistB2O",m_Config.TCL4JawDistB2O=57*Gaudi::Units::mm);
+    declareProperty("TCL5JawDistB1O",m_Config.TCL5JawDistB1O=57*Gaudi::Units::mm);
+    declareProperty("TCL5JawDistB2O",m_Config.TCL5JawDistB2O=57*Gaudi::Units::mm);
+    declareProperty("TCL6JawDistB1O",m_Config.TCL6JawDistB1O=57*Gaudi::Units::mm);
+    declareProperty("TCL6JawDistB2O",m_Config.TCL6JawDistB2O=57*Gaudi::Units::mm);
     declareProperty("vp1Compatibility", m_Config.vp1Compatibility=false);
     declareProperty("buildTCL4",m_Config.buildTCL4=false);
     declareProperty("buildTCL6",m_Config.buildTCL6=false);
     declareProperty("ALFAInNewPosition",m_Config.ALFAInNewPosition=false);
-    declareProperty("newPosB7L1",m_Config.newPosB7L1=245656.77*GeoModelKernelUnits::mm);
-    declareProperty("newPosB7R1",m_Config.newPosB7R1=-245656.11*GeoModelKernelUnits::mm);
-    declareProperty("posAFPL1",m_Config.posAFPL1=204500*GeoModelKernelUnits::mm);
-    declareProperty("posAFPR1",m_Config.posAFPR1=-204500*GeoModelKernelUnits::mm);
-    declareProperty("posAFPL2",m_Config.posAFPL2=212675*GeoModelKernelUnits::mm);
-    declareProperty("posAFPR2",m_Config.posAFPR2=-212675*GeoModelKernelUnits::mm);
+    declareProperty("newPosB7L1",m_Config.newPosB7L1=245656.77*Gaudi::Units::mm);
+    declareProperty("newPosB7R1",m_Config.newPosB7R1=-245656.11*Gaudi::Units::mm);
+    declareProperty("posAFPL1",m_Config.posAFPL1=204500*Gaudi::Units::mm);
+    declareProperty("posAFPR1",m_Config.posAFPR1=-204500*Gaudi::Units::mm);
+    declareProperty("posAFPL2",m_Config.posAFPL2=212675*Gaudi::Units::mm);
+    declareProperty("posAFPR2",m_Config.posAFPR2=-212675*Gaudi::Units::mm);
 }
 
 /**
diff --git a/ForwardDetectors/LUCID/LUCID_GeoModel/src/GetRefIndex.cxx b/ForwardDetectors/LUCID/LUCID_GeoModel/src/GetRefIndex.cxx
index 518c44509c22c2582198e089bd5bf5d17fdb1e67..632835ea871e12bf94831d7514c701b99f789d70 100644
--- a/ForwardDetectors/LUCID/LUCID_GeoModel/src/GetRefIndex.cxx
+++ b/ForwardDetectors/LUCID/LUCID_GeoModel/src/GetRefIndex.cxx
@@ -7,16 +7,13 @@
 #include <iomanip>
 #include <math.h>
 
-//#include "CLHEP/Units/PhysicalConstants.h"
-//#include "CLHEP/Units/SystemOfUnits.h"
-
 #include "LUCID_DetectorFactory.h"
 #include "GetRefIndex.h"
-#include "GeoModelKernel/Units.h"
+#include "GaudiKernel/PhysicalConstants.h"
 
 double GetRefIndexGas(double lambda, double pressure, double temperature) {
     
-  double e  = 2.*M_PI*GeoModelKernelUnits::hbarc/(GeoModelKernelUnits::eV*GeoModelKernelUnits::nm)/lambda;
+  double e  = 2.*M_PI*Gaudi::Units::hbarc/(Gaudi::Units::eV*Gaudi::Units::nm)/lambda;
   double e0 = 17;
   double k  = 0.25938;
   double x  = k*pressure/temperature/(1 - pow(e/e0, 2));
@@ -29,7 +26,7 @@ double GetRefIndexQuartz(double lambda) {
   double const SellCoeu[] = {46.41,  228.71, 0.014};
   double const SellCoed[] = {10.666, 18.125, 0.125};
   
-  double e = 2.*M_PI*GeoModelKernelUnits::hbarc/(GeoModelKernelUnits::eV*GeoModelKernelUnits::nm)/lambda;
+  double e = 2.*M_PI*Gaudi::Units::hbarc/(Gaudi::Units::eV*Gaudi::Units::nm)/lambda;
   double r = 1.;
   
   for(int i=0; i<3; i++) r += SellCoeu[i]/(SellCoed[i]*SellCoed[i] - e*e);
diff --git a/ForwardDetectors/LUCID/LUCID_GeoModel/src/LUCID_DetectorFactory.cxx b/ForwardDetectors/LUCID/LUCID_GeoModel/src/LUCID_DetectorFactory.cxx
index eaae2ee41532ee4af5d0838273a99618fa8263c8..45ce8be3bb3e728a971b3570ac289d07c8173b97 100755
--- a/ForwardDetectors/LUCID/LUCID_GeoModel/src/LUCID_DetectorFactory.cxx
+++ b/ForwardDetectors/LUCID/LUCID_GeoModel/src/LUCID_DetectorFactory.cxx
@@ -25,6 +25,7 @@
 
 #include "StoreGate/StoreGateSvc.h"
 #include "GaudiKernel/MsgStream.h"
+#include "GaudiKernel/SystemOfUnits.h"
 #include "AthenaKernel/getMessageSvc.h"
 #include "RDBAccessSvc/IRDBAccessSvc.h"
 
@@ -80,7 +81,7 @@ void LUCID_DetectorFactory::create(GeoPhysVol* world) {
   
   log << MSG::DEBUG << " Build LUCID side A " << endmsg;
 
-  GeoPcon* aShape = new GeoPcon(0, 360*GeoModelKernelUnits::deg); 
+  GeoPcon* aShape = new GeoPcon(0, 360*Gaudi::Units::deg); 
   
   aShape->addPlane(                 0, m_lp->coolingRadius, m_lp->VJconeRadiusFront);
   aShape->addPlane(m_lp->VJconelength, m_lp->coolingRadius, m_lp->VJconeRadiusBack);
@@ -102,7 +103,7 @@ void LUCID_DetectorFactory::create(GeoPhysVol* world) {
   
   GeoFullPhysVol* phyVolC = phyVolA->clone();
     
-  world->add(new GeoAlignableTransform(GeoTrf::Translate3D(0, 0, -m_lp->VJdistanceToIP )*GeoTrf::RotateY3D(180*GeoModelKernelUnits::degree)*GeoTrf::RotateZ3D(180*GeoModelKernelUnits::degree)));
+  world->add(new GeoAlignableTransform(GeoTrf::Translate3D(0, 0, -m_lp->VJdistanceToIP )*GeoTrf::RotateY3D(180*Gaudi::Units::degree)*GeoTrf::RotateZ3D(180*Gaudi::Units::degree)));
   world->add(new GeoNameTag("LucidSideC"));
   world->add(phyVolC);
   
@@ -123,7 +124,7 @@ void LUCID_DetectorFactory::buildMaterials()  {
 
   m_alu = m_materialManager->getMaterial("std::Aluminium");
   
-  log << MSG::DEBUG << " Aluminium density[g/cm3]: " << m_alu->getDensity()/(GeoModelKernelUnits::g/GeoModelKernelUnits::cm3) << endmsg;
+  log << MSG::DEBUG << " Aluminium density[g/cm3]: " << m_alu->getDensity()/(GeoModelKernelUnits::g/Gaudi::Units::cm3) << endmsg;
 
   log << MSG::DEBUG << " Build Cherenkov Gas " << endmsg;
   
@@ -136,9 +137,9 @@ void LUCID_DetectorFactory::buildMaterials()  {
   m_gas->add(const_cast<GeoElement*>(fluorine), 10*fluorine->getA()/(4*carbon->getA() + 10*fluorine->getA()));
   
   log << MSG::DEBUG << " gasState              : " << m_gas->getState()              << endmsg;
-  log << MSG::DEBUG << " gasTemperature[kelvin]: " << m_gas->getTemperature()/GeoModelKernelUnits::kelvin << endmsg;
-  log << MSG::DEBUG << " gasPressure      [bar]: " << m_gas->getPressure()/GeoModelKernelUnits::bar       << endmsg;
-  log << MSG::DEBUG << " gasDensity     [g/cm3]: " << m_gas->getDensity()/(GeoModelKernelUnits::g/GeoModelKernelUnits::cm3)    << endmsg;
+  log << MSG::DEBUG << " gasTemperature[kelvin]: " << m_gas->getTemperature()/Gaudi::Units::kelvin << endmsg;
+  log << MSG::DEBUG << " gasPressure      [bar]: " << m_gas->getPressure()/Gaudi::Units::bar       << endmsg;
+  log << MSG::DEBUG << " gasDensity     [g/cm3]: " << m_gas->getDensity()/(GeoModelKernelUnits::g/Gaudi::Units::cm3)    << endmsg;
 
   log << MSG::DEBUG << " Wavelength dependent properties " << endmsg;
   
@@ -151,16 +152,16 @@ void LUCID_DetectorFactory::buildMaterials()  {
   double* gasAbsLength     = new double[waveLengthNum];
   double* tubeReflectivity = new double[waveLengthNum];
   
-  double absLengthScale = (m_lp->gasPressure) ? (m_lp->gasPressure/GeoModelKernelUnits::bar) : 1;
+  double absLengthScale = (m_lp->gasPressure) ? (m_lp->gasPressure/Gaudi::Units::bar) : 1;
   
   for(int i=0; i<waveLengthNum; i++) {
     
-    photonWaveLength[i] = (m_lp->waveLengthMin + i*m_lp->waveLengthStep)*GeoModelKernelUnits::nm;
-    photonEnergy    [i] = 2.*M_PI*(GeoModelKernelUnits::hbarc/(GeoModelKernelUnits::eV*GeoModelKernelUnits::nm))/(photonWaveLength[i]/GeoModelKernelUnits::nm)*GeoModelKernelUnits::eV;
-    quartzRefIndex  [i] = GetRefIndexQuartz (photonWaveLength[i]/GeoModelKernelUnits::nm);
-    gasRefIndex     [i] = GetRefIndexGas    (photonWaveLength[i]/GeoModelKernelUnits::nm, m_lp->gasPressure/GeoModelKernelUnits::bar, m_lp->gasTemperature/GeoModelKernelUnits::kelvin);
-    gasAbsLength    [i] = GetAbsLengthGas   (photonWaveLength[i]/GeoModelKernelUnits::nm)*GeoModelKernelUnits::m/absLengthScale;
-    tubeReflectivity[i] = GetReflectivity   (photonWaveLength[i]/GeoModelKernelUnits::nm);
+    photonWaveLength[i] = (m_lp->waveLengthMin + i*m_lp->waveLengthStep)*Gaudi::Units::nm;
+    photonEnergy    [i] = 2.*M_PI*(Gaudi::Units::hbarc/(Gaudi::Units::eV*Gaudi::Units::nm))/(photonWaveLength[i]/Gaudi::Units::nm)*Gaudi::Units::eV;
+    quartzRefIndex  [i] = GetRefIndexQuartz (photonWaveLength[i]/Gaudi::Units::nm);
+    gasRefIndex     [i] = GetRefIndexGas    (photonWaveLength[i]/Gaudi::Units::nm, m_lp->gasPressure/Gaudi::Units::bar, m_lp->gasTemperature/Gaudi::Units::kelvin);
+    gasAbsLength    [i] = GetAbsLengthGas   (photonWaveLength[i]/Gaudi::Units::nm)*Gaudi::Units::m/absLengthScale;
+    tubeReflectivity[i] = GetReflectivity   (photonWaveLength[i]/Gaudi::Units::nm);
   }
   
   log << MSG::DEBUG << " **************************************************************************************************** " << endmsg;
@@ -169,11 +170,11 @@ void LUCID_DetectorFactory::buildMaterials()  {
   for(int i=0; i<waveLengthNum; i++) {
     
     log << MSG::DEBUG 
-	<< std::setw(11) << photonWaveLength[i]/GeoModelKernelUnits::nm
-	<< std::setw(11) << photonEnergy    [i]/GeoModelKernelUnits::eV
+	<< std::setw(11) << photonWaveLength[i]/Gaudi::Units::nm
+	<< std::setw(11) << photonEnergy    [i]/Gaudi::Units::eV
 	<< std::setw(13) << quartzRefIndex  [i]
 	<< std::setw(10) << gasRefIndex     [i]
-	<< std::setw(16) << gasAbsLength    [i]/GeoModelKernelUnits::m
+	<< std::setw(16) << gasAbsLength    [i]/Gaudi::Units::m
 	<< std::setw(17) << tubeReflectivity[i]
 	<< endmsg;
   }
@@ -192,7 +193,7 @@ void LUCID_DetectorFactory::buildMaterials()  {
   
   log << MSG::DEBUG << " Build Quartz for PMT windows" << endmsg; 
   
-  m_quartz = new GeoExtendedMaterial("SiO2", m_lp->quartzDensity, stateSolid, GeoModelKernelUnits::STP_Temperature);
+  m_quartz = new GeoExtendedMaterial("SiO2", m_lp->quartzDensity, stateSolid, Gaudi::Units::STP_Temperature);
   
   const GeoElement* oxygen  = m_materialManager->getElement("Oxygen");
   const GeoElement* silicon = m_materialManager->getElement("Silicon");
@@ -213,7 +214,7 @@ void LUCID_DetectorFactory::buildMaterials()  {
   
   m_cop = m_materialManager->getMaterial("std::Copper");
   
-  log << MSG::DEBUG << " Copper density[g/cm3]: " << m_cop->getDensity()/(GeoModelKernelUnits::g/GeoModelKernelUnits::cm3) << endmsg;
+  log << MSG::DEBUG << " Copper density[g/cm3]: " << m_cop->getDensity()/(GeoModelKernelUnits::g/Gaudi::Units::cm3) << endmsg;
     
   log << MSG::DEBUG << " Build Reflective Tube Optical Surfaces " << endmsg; 
   
@@ -251,17 +252,17 @@ void LUCID_DetectorFactory::calcTubeParams() {
   
   for (int i=0; i<nLayers; i++) {
     
-    m_tubeTheta  [i] = atan(layerRadius[i]/m_lp->distanceToIP)*GeoModelKernelUnits::rad;
-    tubePhiOffset[i] = (i==0)*M_PI/8*GeoModelKernelUnits::rad;
+    m_tubeTheta  [i] = atan(layerRadius[i]/m_lp->distanceToIP)*Gaudi::Units::rad;
+    tubePhiOffset[i] = (i==0)*M_PI/8*Gaudi::Units::rad;
     
     for (int j=0; j<nPmtTubesPerLayer; j++) {
       
-      tubePhiAngle[i][j] = 2*M_PI*j/nPmtTubesPerLayer*GeoModelKernelUnits::rad + tubePhiOffset[i];
+      tubePhiAngle[i][j] = 2*M_PI*j/nPmtTubesPerLayer*Gaudi::Units::rad + tubePhiOffset[i];
       
-      double tubeDistance = layerRadius[i] + m_lp->tubeLength/2*sin(m_tubeTheta[i]/GeoModelKernelUnits::rad);
+      double tubeDistance = layerRadius[i] + m_lp->tubeLength/2*sin(m_tubeTheta[i]/Gaudi::Units::rad);
       
-      m_tubePosition[i][j][0] = tubeDistance*cos(tubePhiAngle[i][j]/GeoModelKernelUnits::rad); if (fabs(m_tubePosition[i][j][0]) < 1e-10) m_tubePosition[i][j][0] = 0;
-      m_tubePosition[i][j][1] = tubeDistance*sin(tubePhiAngle[i][j]/GeoModelKernelUnits::rad); if (fabs(m_tubePosition[i][j][1]) < 1e-10) m_tubePosition[i][j][1] = 0;
+      m_tubePosition[i][j][0] = tubeDistance*cos(tubePhiAngle[i][j]/Gaudi::Units::rad); if (fabs(m_tubePosition[i][j][0]) < 1e-10) m_tubePosition[i][j][0] = 0;
+      m_tubePosition[i][j][1] = tubeDistance*sin(tubePhiAngle[i][j]/Gaudi::Units::rad); if (fabs(m_tubePosition[i][j][1]) < 1e-10) m_tubePosition[i][j][1] = 0;
     }
   }
   
@@ -276,13 +277,13 @@ void LUCID_DetectorFactory::calcTubeParams() {
       log << MSG::DEBUG << setiosflags(std::ios::right)
 	  << std::setw( 6) << lay
 	  << std::setw( 5) << tub
-	  << std::setw(11) << m_lp->tubeRadius/GeoModelKernelUnits::mm
-	  << std::setw(16) << layerRadius   [lay]/GeoModelKernelUnits::mm
-	  << std::setw(14) << m_tubeTheta   [lay]/GeoModelKernelUnits::degree
-	  << std::setw(19) << tubePhiOffset [lay]/GeoModelKernelUnits::degree
-	  << std::setw(18) << tubePhiAngle  [lay][tub]/GeoModelKernelUnits::degree
-	  << std::setw(19) << m_tubePosition[lay][tub][0]/GeoModelKernelUnits::mm
-	  << std::setw(18) << m_tubePosition[lay][tub][1]/GeoModelKernelUnits::mm
+	  << std::setw(11) << m_lp->tubeRadius/Gaudi::Units::mm
+	  << std::setw(16) << layerRadius   [lay]/Gaudi::Units::mm
+	  << std::setw(14) << m_tubeTheta   [lay]/Gaudi::Units::degree
+	  << std::setw(19) << tubePhiOffset [lay]/Gaudi::Units::degree
+	  << std::setw(18) << tubePhiAngle  [lay][tub]/Gaudi::Units::degree
+	  << std::setw(19) << m_tubePosition[lay][tub][0]/Gaudi::Units::mm
+	  << std::setw(18) << m_tubePosition[lay][tub][1]/Gaudi::Units::mm
 	  << endmsg;
   
   log << MSG::DEBUG << " ********************************************************************************************************************************* " << endmsg;
@@ -298,7 +299,7 @@ void LUCID_DetectorFactory::addVJcone(GeoFullPhysVol* parent) {
 				     m_lp->VJconeRadiusBack  - m_lp->VJconeThickness,
 				     m_lp->VJconeRadiusFront, 
 				     m_lp->VJconeRadiusBack, 
-				     (m_lp->VJconelength - (m_lp->VJconeFrontRingLength - m_lp->VJconeFrontRingOverlap))/2, 0*GeoModelKernelUnits::deg,360*GeoModelKernelUnits::deg);
+				     (m_lp->VJconelength - (m_lp->VJconeFrontRingLength - m_lp->VJconeFrontRingOverlap))/2, 0*Gaudi::Units::deg,360*Gaudi::Units::deg);
   
   GeoLogVol*  logVol0 = new GeoLogVol("lvVJcone", aShape0, m_alu);
   GeoPhysVol* phyVol0 = new GeoPhysVol(logVol0); 
@@ -338,7 +339,7 @@ void LUCID_DetectorFactory::addVessel(GeoFullPhysVol* parent) {
   MsgStream log(Athena::getMessageSvc(), "LUCID_DetectorFactory::addVessel");
   log << MSG::INFO << " LUCID_DetectorFactory::addVessel " << endmsg;
   
-  GeoPcon* aShape = new GeoPcon(0, 360*GeoModelKernelUnits::deg); 
+  GeoPcon* aShape = new GeoPcon(0, 360*Gaudi::Units::deg); 
   aShape->addPlane(                 0, m_lp->vesselInnerRadius, m_lp->vesselOuterRadMin + m_lp->vesselOuterThickness);
   aShape->addPlane(m_lp->vesselLength, m_lp->vesselInnerRadius, m_lp->vesselOuterRadMax + m_lp->vesselOuterThickness);
   
@@ -360,7 +361,7 @@ void LUCID_DetectorFactory::addVesselGas(GeoPhysVol* parent) {
 
   log << MSG::INFO << " LUCID_DetectorFactory::addVesselGas " << endmsg;
   
-  GeoPcon* aShape = new GeoPcon(0, 360*GeoModelKernelUnits::deg); 
+  GeoPcon* aShape = new GeoPcon(0, 360*Gaudi::Units::deg); 
   aShape->addPlane(                 0, m_lp->vesselInnerRadius + m_lp->vesselInnerThickness, m_lp->vesselOuterRadMin);
   aShape->addPlane(m_lp->vesselLength, m_lp->vesselInnerRadius + m_lp->vesselInnerThickness, m_lp->vesselOuterRadMax);
 
diff --git a/ForwardDetectors/LUCID/LUCID_GeoModel/src/LUCID_RDBAaccess.cxx b/ForwardDetectors/LUCID/LUCID_GeoModel/src/LUCID_RDBAaccess.cxx
index f301f728917299e459d18fb1f494a54d1e88e4ad..77eb30005aa8ce733c9f417e9094950fdf12e87f 100755
--- a/ForwardDetectors/LUCID/LUCID_GeoModel/src/LUCID_RDBAaccess.cxx
+++ b/ForwardDetectors/LUCID/LUCID_GeoModel/src/LUCID_RDBAaccess.cxx
@@ -4,7 +4,6 @@
 
 #include "LUCID_RDBAaccess.h"
 
-//#include "CLHEP/Units/SystemOfUnits.h"
 #include "GeoModelKernel/Units.h"
 
 #include "GeoModelUtilities/DecodeVersionKey.h"
@@ -15,6 +14,7 @@
 #include "GaudiKernel/MsgStream.h"
 #include "GaudiKernel/GaudiException.h"
 #include "GaudiKernel/Bootstrap.h"
+#include "GaudiKernel/SystemOfUnits.h"
 
 #include "AthenaKernel/getMessageSvc.h"
 
@@ -73,34 +73,34 @@ void LUCID_RDBAccess::SetParameters() {
   
   for(AccessSvc_iter = m_lucidParams->begin(); AccessSvc_iter != m_lucidParams->end(); AccessSvc_iter++) {
     
-    distanceToIP                  = (*AccessSvc_iter)->getDouble("DISTANCETOIP")*GeoModelKernelUnits::mm;
-    VJdistanceToIP                = (*AccessSvc_iter)->getDouble("VJDISTANCETOIP")*GeoModelKernelUnits::mm;
-    VJconelength                  = (*AccessSvc_iter)->getDouble("VJCONELENGTH")*GeoModelKernelUnits::mm;
-    VJconeRadiusFront             = (*AccessSvc_iter)->getDouble("VJCONERADIUSFRONT")*GeoModelKernelUnits::mm;
-    VJconeRadiusBack              = (*AccessSvc_iter)->getDouble("VJCONERADIUSBACK")*GeoModelKernelUnits::mm;
-    VJconeThickness               = (*AccessSvc_iter)->getDouble("VJCONETHICKNESS")*GeoModelKernelUnits::mm;
-    VJconeFrontRingThickness      = (*AccessSvc_iter)->getDouble("VJCONEFRONTRINGTHICKNESS")*GeoModelKernelUnits::mm;
-    VJconeFrontRingLength         = (*AccessSvc_iter)->getDouble("VJCONEFRONTRINGLENGTH")*GeoModelKernelUnits::mm;
-    VJconeFrontRingOverlap        = (*AccessSvc_iter)->getDouble("VJCONEFRONTRINGOVERLAP")*GeoModelKernelUnits::mm;
-    vesselInnerRadius             = (*AccessSvc_iter)->getDouble("VESSELINNERRADIUS")*GeoModelKernelUnits::mm;
-    vesselInnerThickness          = (*AccessSvc_iter)->getDouble("VESSELINNERTHICKNESS")*GeoModelKernelUnits::mm;
-    vesselOuterRadMin             = (*AccessSvc_iter)->getDouble("VESSELOUTERRADMIN")*GeoModelKernelUnits::mm + 3*GeoModelKernelUnits::mm;
-    vesselOuterRadMax             = (*AccessSvc_iter)->getDouble("VESSELOUTERRADMAX")*GeoModelKernelUnits::mm + 3*GeoModelKernelUnits::mm;
-    vesselOuterThickness          = (*AccessSvc_iter)->getDouble("VESSELOUTERTHICKNESS")*GeoModelKernelUnits::mm;
-    vesselLength                  = (*AccessSvc_iter)->getDouble("VESSELLENGTH")*GeoModelKernelUnits::mm;
-    bulkheadThickness             = (*AccessSvc_iter)->getDouble("BULKHEADTHICKNESS")*GeoModelKernelUnits::mm;
-    coolingRadius                 = (*AccessSvc_iter)->getDouble("COOLINGRADIUS")*GeoModelKernelUnits::mm;
-    coolingThickness              = (*AccessSvc_iter)->getDouble("COOLINGTHICKNESS")*GeoModelKernelUnits::mm;
-    layerRadius1                  = (*AccessSvc_iter)->getDouble("LAYERRADIUS1")*GeoModelKernelUnits::mm;
-    layerRadius2                  = (*AccessSvc_iter)->getDouble("LAYERRADIUS2")*GeoModelKernelUnits::mm;
-    tubeRadius                    = (*AccessSvc_iter)->getDouble("TUBERADIUS")*GeoModelKernelUnits::mm;
-    tubeThickness                 = (*AccessSvc_iter)->getDouble("TUBETHICKNESS")*GeoModelKernelUnits::mm;
-    tubeLength                    = (*AccessSvc_iter)->getDouble("TUBELENGTH")*GeoModelKernelUnits::mm;
-    pmtThickness                  = (*AccessSvc_iter)->getDouble("PMTTHICKNESS")*GeoModelKernelUnits::mm;
-    gasPressure                   = (*AccessSvc_iter)->getDouble("GASPRESSURE")*GeoModelKernelUnits::bar;
-    gasDensity                    = (*AccessSvc_iter)->getDouble("GASDENSITY")*GeoModelKernelUnits::gram/GeoModelKernelUnits::cm3;
-    gasTemperature                = (*AccessSvc_iter)->getDouble("GASTEMPERATURE")*GeoModelKernelUnits::kelvin;
-    quartzDensity                 = (*AccessSvc_iter)->getDouble("QUARTZDENSITY")*GeoModelKernelUnits::gram/GeoModelKernelUnits::cm3;
+    distanceToIP                  = (*AccessSvc_iter)->getDouble("DISTANCETOIP")*Gaudi::Units::mm;
+    VJdistanceToIP                = (*AccessSvc_iter)->getDouble("VJDISTANCETOIP")*Gaudi::Units::mm;
+    VJconelength                  = (*AccessSvc_iter)->getDouble("VJCONELENGTH")*Gaudi::Units::mm;
+    VJconeRadiusFront             = (*AccessSvc_iter)->getDouble("VJCONERADIUSFRONT")*Gaudi::Units::mm;
+    VJconeRadiusBack              = (*AccessSvc_iter)->getDouble("VJCONERADIUSBACK")*Gaudi::Units::mm;
+    VJconeThickness               = (*AccessSvc_iter)->getDouble("VJCONETHICKNESS")*Gaudi::Units::mm;
+    VJconeFrontRingThickness      = (*AccessSvc_iter)->getDouble("VJCONEFRONTRINGTHICKNESS")*Gaudi::Units::mm;
+    VJconeFrontRingLength         = (*AccessSvc_iter)->getDouble("VJCONEFRONTRINGLENGTH")*Gaudi::Units::mm;
+    VJconeFrontRingOverlap        = (*AccessSvc_iter)->getDouble("VJCONEFRONTRINGOVERLAP")*Gaudi::Units::mm;
+    vesselInnerRadius             = (*AccessSvc_iter)->getDouble("VESSELINNERRADIUS")*Gaudi::Units::mm;
+    vesselInnerThickness          = (*AccessSvc_iter)->getDouble("VESSELINNERTHICKNESS")*Gaudi::Units::mm;
+    vesselOuterRadMin             = (*AccessSvc_iter)->getDouble("VESSELOUTERRADMIN")*Gaudi::Units::mm + 3*Gaudi::Units::mm;
+    vesselOuterRadMax             = (*AccessSvc_iter)->getDouble("VESSELOUTERRADMAX")*Gaudi::Units::mm + 3*Gaudi::Units::mm;
+    vesselOuterThickness          = (*AccessSvc_iter)->getDouble("VESSELOUTERTHICKNESS")*Gaudi::Units::mm;
+    vesselLength                  = (*AccessSvc_iter)->getDouble("VESSELLENGTH")*Gaudi::Units::mm;
+    bulkheadThickness             = (*AccessSvc_iter)->getDouble("BULKHEADTHICKNESS")*Gaudi::Units::mm;
+    coolingRadius                 = (*AccessSvc_iter)->getDouble("COOLINGRADIUS")*Gaudi::Units::mm;
+    coolingThickness              = (*AccessSvc_iter)->getDouble("COOLINGTHICKNESS")*Gaudi::Units::mm;
+    layerRadius1                  = (*AccessSvc_iter)->getDouble("LAYERRADIUS1")*Gaudi::Units::mm;
+    layerRadius2                  = (*AccessSvc_iter)->getDouble("LAYERRADIUS2")*Gaudi::Units::mm;
+    tubeRadius                    = (*AccessSvc_iter)->getDouble("TUBERADIUS")*Gaudi::Units::mm;
+    tubeThickness                 = (*AccessSvc_iter)->getDouble("TUBETHICKNESS")*Gaudi::Units::mm;
+    tubeLength                    = (*AccessSvc_iter)->getDouble("TUBELENGTH")*Gaudi::Units::mm;
+    pmtThickness                  = (*AccessSvc_iter)->getDouble("PMTTHICKNESS")*Gaudi::Units::mm;
+    gasPressure                   = (*AccessSvc_iter)->getDouble("GASPRESSURE")*Gaudi::Units::bar;
+    gasDensity                    = (*AccessSvc_iter)->getDouble("GASDENSITY")*GeoModelKernelUnits::gram/Gaudi::Units::cm3;
+    gasTemperature                = (*AccessSvc_iter)->getDouble("GASTEMPERATURE")*Gaudi::Units::kelvin;
+    quartzDensity                 = (*AccessSvc_iter)->getDouble("QUARTZDENSITY")*GeoModelKernelUnits::gram/Gaudi::Units::cm3;
     tubePolish                    = (*AccessSvc_iter)->getDouble("TUBEPOLISH");
     waveLengthStep                = (*AccessSvc_iter)->getDouble("WAVELENGTHSTEP");
     waveLengthMin                 = (*AccessSvc_iter)->getDouble("WAVELENGTHMIN");
@@ -112,26 +112,26 @@ void LUCID_RDBAccess::Print() {
   
   MsgStream log(Athena::getMessageSvc(), "LUCID_GeoModel::LUCID_RDBAaccess");
 
-  log << MSG::DEBUG << " distanceToIP         [mm]: " << distanceToIP/GeoModelKernelUnits::mm           << endmsg;
-  log << MSG::DEBUG << " vesselInnerRadius    [mm]: " << vesselInnerRadius/GeoModelKernelUnits::mm      << endmsg;
-  log << MSG::DEBUG << " vesselInnerThickness [mm]: " << vesselInnerThickness/GeoModelKernelUnits::mm   << endmsg;
-  log << MSG::DEBUG << " vesselOuterRadMin    [mm]: " << vesselOuterRadMin /GeoModelKernelUnits::mm     << endmsg;
-  log << MSG::DEBUG << " vesselOuterRadMax    [mm]: " << vesselOuterRadMax/GeoModelKernelUnits::mm      << endmsg;
-  log << MSG::DEBUG << " vesselOuterThickness [mm]: " << vesselOuterThickness/GeoModelKernelUnits::mm   << endmsg;
-  log << MSG::DEBUG << " vesselLength         [mm]: " << vesselLength /GeoModelKernelUnits::mm          << endmsg;
-  log << MSG::DEBUG << " bulkheadThickness    [mm]: " << bulkheadThickness/GeoModelKernelUnits::mm      << endmsg;
-  log << MSG::DEBUG << " coolingRadius        [mm]: " << coolingRadius/GeoModelKernelUnits::mm          << endmsg;
-  log << MSG::DEBUG << " coolingThickness     [mm]: " << coolingThickness/GeoModelKernelUnits::mm       << endmsg;
-  log << MSG::DEBUG << " layerRadius1         [mm]: " << layerRadius1/GeoModelKernelUnits::mm           << endmsg;
-  log << MSG::DEBUG << " layerRadius2         [mm]: " << layerRadius2/GeoModelKernelUnits::mm           << endmsg;
-  log << MSG::DEBUG << " tubeRadius           [mm]: " << tubeRadius/GeoModelKernelUnits::mm             << endmsg;
-  log << MSG::DEBUG << " tubeThickness        [mm]: " << tubeThickness/GeoModelKernelUnits::mm          << endmsg;
-  log << MSG::DEBUG << " tubeLength           [mm]: " << tubeLength/GeoModelKernelUnits::mm             << endmsg;
-  log << MSG::DEBUG << " pmtThickness         [mm]: " << pmtThickness/GeoModelKernelUnits::mm           << endmsg;
-  log << MSG::DEBUG << " gasPressure         [bar]: " << gasPressure/GeoModelKernelUnits::bar           << endmsg;
-  log << MSG::DEBUG << " gasDensity        [g/cm3]: " << gasDensity/(GeoModelKernelUnits::gram/GeoModelKernelUnits::cm3)     << endmsg;
-  log << MSG::DEBUG << " gasTempearture   [kelvin]: " << gasTemperature/GeoModelKernelUnits::kelvin     << endmsg;
-  log << MSG::DEBUG << " quartzDensity     [g/cm3]: " << quartzDensity/(GeoModelKernelUnits::gram/GeoModelKernelUnits::cm3)  << endmsg;  
+  log << MSG::DEBUG << " distanceToIP         [mm]: " << distanceToIP/Gaudi::Units::mm           << endmsg;
+  log << MSG::DEBUG << " vesselInnerRadius    [mm]: " << vesselInnerRadius/Gaudi::Units::mm      << endmsg;
+  log << MSG::DEBUG << " vesselInnerThickness [mm]: " << vesselInnerThickness/Gaudi::Units::mm   << endmsg;
+  log << MSG::DEBUG << " vesselOuterRadMin    [mm]: " << vesselOuterRadMin /Gaudi::Units::mm     << endmsg;
+  log << MSG::DEBUG << " vesselOuterRadMax    [mm]: " << vesselOuterRadMax/Gaudi::Units::mm      << endmsg;
+  log << MSG::DEBUG << " vesselOuterThickness [mm]: " << vesselOuterThickness/Gaudi::Units::mm   << endmsg;
+  log << MSG::DEBUG << " vesselLength         [mm]: " << vesselLength /Gaudi::Units::mm          << endmsg;
+  log << MSG::DEBUG << " bulkheadThickness    [mm]: " << bulkheadThickness/Gaudi::Units::mm      << endmsg;
+  log << MSG::DEBUG << " coolingRadius        [mm]: " << coolingRadius/Gaudi::Units::mm          << endmsg;
+  log << MSG::DEBUG << " coolingThickness     [mm]: " << coolingThickness/Gaudi::Units::mm       << endmsg;
+  log << MSG::DEBUG << " layerRadius1         [mm]: " << layerRadius1/Gaudi::Units::mm           << endmsg;
+  log << MSG::DEBUG << " layerRadius2         [mm]: " << layerRadius2/Gaudi::Units::mm           << endmsg;
+  log << MSG::DEBUG << " tubeRadius           [mm]: " << tubeRadius/Gaudi::Units::mm             << endmsg;
+  log << MSG::DEBUG << " tubeThickness        [mm]: " << tubeThickness/Gaudi::Units::mm          << endmsg;
+  log << MSG::DEBUG << " tubeLength           [mm]: " << tubeLength/Gaudi::Units::mm             << endmsg;
+  log << MSG::DEBUG << " pmtThickness         [mm]: " << pmtThickness/Gaudi::Units::mm           << endmsg;
+  log << MSG::DEBUG << " gasPressure         [bar]: " << gasPressure/Gaudi::Units::bar           << endmsg;
+  log << MSG::DEBUG << " gasDensity        [g/cm3]: " << gasDensity/(GeoModelKernelUnits::gram/Gaudi::Units::cm3)     << endmsg;
+  log << MSG::DEBUG << " gasTempearture   [kelvin]: " << gasTemperature/Gaudi::Units::kelvin     << endmsg;
+  log << MSG::DEBUG << " quartzDensity     [g/cm3]: " << quartzDensity/(GeoModelKernelUnits::gram/Gaudi::Units::cm3)  << endmsg;  
   log << MSG::DEBUG << " tubePolish               : " << tubePolish                << endmsg;
   log << MSG::DEBUG << " waveLengthStep           : " << waveLengthStep            << endmsg;
   log << MSG::DEBUG << " waveLengthMin            : " << waveLengthMin             << endmsg;
diff --git a/ForwardDetectors/ZDC/ZDC_GeoM/src/ZDC_DetFactory.cxx b/ForwardDetectors/ZDC/ZDC_GeoM/src/ZDC_DetFactory.cxx
index 89a9a75de05c2371e2503ee76198ebc0c441e128..ad61d075284779fcc25a2659591cc2f35a0351a3 100644
--- a/ForwardDetectors/ZDC/ZDC_GeoM/src/ZDC_DetFactory.cxx
+++ b/ForwardDetectors/ZDC/ZDC_GeoM/src/ZDC_DetFactory.cxx
@@ -21,6 +21,7 @@
 #include "GeoModelKernel/GeoDefinitions.h"
 #include "GeoModelKernel/Units.h"
 #include "StoreGate/StoreGateSvc.h"
+#include "GaudiKernel/SystemOfUnits.h"
 
 #include "GeoModelInterfaces/StoredMaterialManager.h"
 
@@ -55,27 +56,27 @@ void ZDC_DetFactory::create(GeoPhysVol* world)
 
   const GeoMaterial* air = materialManager->getMaterial("std::Air");
 
-  GeoElement*  Oxygen   = new GeoElement ("Oxygen"  ,"O"  ,  8.0 ,  16.0*GeoModelKernelUnits::g/GeoModelKernelUnits::mole);
-  GeoElement*  Sillicon = new GeoElement ("Sillicon","Si" , 14.0 ,  28.085*GeoModelKernelUnits::g/GeoModelKernelUnits::mole);
-  GeoElement*  Tung     = new GeoElement ("Tungsten","W"  , 74.0 , 183.84*GeoModelKernelUnits::g/GeoModelKernelUnits::mole);
-  GeoElement*  Iron     = new GeoElement ("Iron"    ,"Fe" , 26.0 ,  55.845 *GeoModelKernelUnits::g/GeoModelKernelUnits::mole);
-  GeoElement*  Carbon   = new GeoElement ("Carbon"  ,"C"  ,  6.0 ,  12.0107*GeoModelKernelUnits::g/GeoModelKernelUnits::mole);
-  GeoElement*  Nickel   = new GeoElement ("Nickel"  ,"Ni" , 28.0 ,  58.6934*GeoModelKernelUnits::g/GeoModelKernelUnits::mole);
+  GeoElement*  Oxygen   = new GeoElement ("Oxygen"  ,"O"  ,  8.0 ,  16.0*GeoModelKernelUnits::g/Gaudi::Units::mole);
+  GeoElement*  Sillicon = new GeoElement ("Sillicon","Si" , 14.0 ,  28.085*GeoModelKernelUnits::g/Gaudi::Units::mole);
+  GeoElement*  Tung     = new GeoElement ("Tungsten","W"  , 74.0 , 183.84*GeoModelKernelUnits::g/Gaudi::Units::mole);
+  GeoElement*  Iron     = new GeoElement ("Iron"    ,"Fe" , 26.0 ,  55.845 *GeoModelKernelUnits::g/Gaudi::Units::mole);
+  GeoElement*  Carbon   = new GeoElement ("Carbon"  ,"C"  ,  6.0 ,  12.0107*GeoModelKernelUnits::g/Gaudi::Units::mole);
+  GeoElement*  Nickel   = new GeoElement ("Nickel"  ,"Ni" , 28.0 ,  58.6934*GeoModelKernelUnits::g/Gaudi::Units::mole);
 
 
-  GeoMaterial* Quartz   = new GeoMaterial("Quartz",2.20*GeoModelKernelUnits::gram/GeoModelKernelUnits::cm3);
+  GeoMaterial* Quartz   = new GeoMaterial("Quartz",2.20*GeoModelKernelUnits::gram/Gaudi::Units::cm3);
   Quartz->add(Sillicon,0.467);
   Quartz->add(Oxygen,0.533);
   Quartz->lock();
   
   // Absorber composition:  savannah.cern.ch/task/download.php?file_id=22925
-  GeoMaterial* Tungsten = new GeoMaterial("Tungsten",18.155*GeoModelKernelUnits::g/GeoModelKernelUnits::cm3);
+  GeoMaterial* Tungsten = new GeoMaterial("Tungsten",18.155*GeoModelKernelUnits::g/Gaudi::Units::cm3);
   Tungsten->add(Tung,   0.948);
   Tungsten->add(Nickel, 0.037);
   Tungsten->add(Iron,   0.015);
   Tungsten->lock();
 
-  GeoMaterial* Steel  = new GeoMaterial("Steel", 7.9*GeoModelKernelUnits::gram/GeoModelKernelUnits::cm3);
+  GeoMaterial* Steel  = new GeoMaterial("Steel", 7.9*GeoModelKernelUnits::gram/Gaudi::Units::cm3);
   Steel->add(Iron  , 0.98);
   Steel->add(Carbon, 0.02);
   Steel->lock();
@@ -84,11 +85,11 @@ void ZDC_DetFactory::create(GeoPhysVol* world)
   //List of shapes and logical volumes
   //https://atlasop.cern.ch/atlas-point1/twiki/pub/Main/ZDCOperationManualShifter/zdc_layout.png
 
-  GeoBox*  Envelope_Box    = new GeoBox (10.0*GeoModelKernelUnits::cm/2.0 ,20.0*GeoModelKernelUnits::cm/2.0  ,100.0*GeoModelKernelUnits::cm/2.0);
-  GeoBox*  Module_Box      = new GeoBox ( 9.0*GeoModelKernelUnits::cm/2.0 ,18.0*GeoModelKernelUnits::cm/2.0  , 13.4*GeoModelKernelUnits::cm/2.0);
-  GeoBox*  Steel_Plate_Box = new GeoBox ( 9.0*GeoModelKernelUnits::cm/2.0 ,18.0*GeoModelKernelUnits::cm/2.0  ,  1.0*GeoModelKernelUnits::cm/2.0); 
-  GeoTube* Pixel_Tube      = new GeoTube( 0.0*GeoModelKernelUnits::mm     , 1.0*GeoModelKernelUnits::mm/2.0  , 13.4*GeoModelKernelUnits::cm/2.0);
-  GeoTube* Strip_Tube      = new GeoTube( 0.0*GeoModelKernelUnits::mm     , 1.5*GeoModelKernelUnits::mm/2.0  , 18.0*GeoModelKernelUnits::cm/2.0);
+  GeoBox*  Envelope_Box    = new GeoBox (10.0*Gaudi::Units::cm/2.0 ,20.0*Gaudi::Units::cm/2.0  ,100.0*Gaudi::Units::cm/2.0);
+  GeoBox*  Module_Box      = new GeoBox ( 9.0*Gaudi::Units::cm/2.0 ,18.0*Gaudi::Units::cm/2.0  , 13.4*Gaudi::Units::cm/2.0);
+  GeoBox*  Steel_Plate_Box = new GeoBox ( 9.0*Gaudi::Units::cm/2.0 ,18.0*Gaudi::Units::cm/2.0  ,  1.0*Gaudi::Units::cm/2.0); 
+  GeoTube* Pixel_Tube      = new GeoTube( 0.0*Gaudi::Units::mm     , 1.0*Gaudi::Units::mm/2.0  , 13.4*Gaudi::Units::cm/2.0);
+  GeoTube* Strip_Tube      = new GeoTube( 0.0*Gaudi::Units::mm     , 1.5*Gaudi::Units::mm/2.0  , 18.0*Gaudi::Units::cm/2.0);
 
   GeoLogVol* Envelope_Logical    = new GeoLogVol("Envelope_Logical"   ,Envelope_Box    ,air);
   GeoLogVol* Steel_Plate_Logical = new GeoLogVol("Steel_Plate_Logical",Steel_Plate_Box ,Steel);
@@ -124,8 +125,8 @@ void ZDC_DetFactory::create(GeoPhysVol* world)
     GeoIdentifierTag* Pixel_ID       = new GeoIdentifierTag( 11000+L1*8+K1);  
     GeoFullPhysVol*   Pixel_Physical = new GeoFullPhysVol(Pixel_Logical);
 
-    ShiftX = new GeoAlignableTransform(GeoTrf::TranslateX3D((4.5-K)*GeoModelKernelUnits::cm));
-    ShiftY = new GeoAlignableTransform(GeoTrf::TranslateY3D((4.5-L)*GeoModelKernelUnits::cm));
+    ShiftX = new GeoAlignableTransform(GeoTrf::TranslateX3D((4.5-K)*Gaudi::Units::cm));
+    ShiftY = new GeoAlignableTransform(GeoTrf::TranslateY3D((4.5-L)*Gaudi::Units::cm));
 	
     Module_Physical[0][0]->add(Pixel_ID);
     Module_Physical[0][0]->add(ShiftX);
@@ -151,8 +152,8 @@ void ZDC_DetFactory::create(GeoPhysVol* world)
 	GeoIdentifierTag* Pixel_ID       = new GeoIdentifierTag( I*10000+2000+ Pix_id);
 	GeoFullPhysVol*   Pixel_Physical = new GeoFullPhysVol(Pixel_Logical);
 
-	ShiftX = new GeoAlignableTransform(GeoTrf::TranslateX3D( (4.5-K)*GeoModelKernelUnits::cm ));
-	ShiftY = new GeoAlignableTransform(GeoTrf::TranslateY3D( (5.5-L)*GeoModelKernelUnits::cm ));
+	ShiftX = new GeoAlignableTransform(GeoTrf::TranslateX3D( (4.5-K)*Gaudi::Units::cm ));
+	ShiftY = new GeoAlignableTransform(GeoTrf::TranslateY3D( (5.5-L)*Gaudi::Units::cm ));
 	
 	Module_Physical[I-1][1]->add(Pixel_ID);
 	Module_Physical[I-1][1]->add(ShiftX);
@@ -171,9 +172,9 @@ void ZDC_DetFactory::create(GeoPhysVol* world)
 	    GeoFullPhysVol*   Strip_Physical = new GeoFullPhysVol  (Strip_Logical);
 	    GeoIdentifierTag* Strip_ID       = new GeoIdentifierTag(I*10000+J*1000+K*12+L*10+M);
 	    
-	    RotateX = new GeoAlignableTransform(GeoTrf::RotateX3D   (90*GeoModelKernelUnits::deg));
-	    ShiftX  = new GeoAlignableTransform(GeoTrf::TranslateX3D((L-5.5)*GeoModelKernelUnits::cm + (M-0.75)*1.5*GeoModelKernelUnits::mm +0.75*GeoModelKernelUnits::mm));
-	    ShiftZ  = new GeoAlignableTransform(GeoTrf::TranslateZ3D((K*1.2 - 7.8)*GeoModelKernelUnits::cm));
+	    RotateX = new GeoAlignableTransform(GeoTrf::RotateX3D   (90*Gaudi::Units::deg));
+	    ShiftX  = new GeoAlignableTransform(GeoTrf::TranslateX3D((L-5.5)*Gaudi::Units::cm + (M-0.75)*1.5*Gaudi::Units::mm +0.75*Gaudi::Units::mm));
+	    ShiftZ  = new GeoAlignableTransform(GeoTrf::TranslateZ3D((K*1.2 - 7.8)*Gaudi::Units::cm));
 	
 	    Module_Physical[I-1][J-1]->add(Strip_ID);
 	    Module_Physical[I-1][J-1]->add(ShiftZ);
@@ -196,9 +197,9 @@ void ZDC_DetFactory::create(GeoPhysVol* world)
 	    GeoFullPhysVol*   Strip_Physical = new GeoFullPhysVol(Strip_Logical);
 	    GeoIdentifierTag* Strip_ID       = new GeoIdentifierTag(I*10000 + J*1000 + K*12 + L*10 + M);
 
-	    RotateX = new GeoAlignableTransform(GeoTrf::RotateX3D   (90*GeoModelKernelUnits::deg));
-	    ShiftX  = new GeoAlignableTransform(GeoTrf::TranslateX3D((L-5.5)*GeoModelKernelUnits::cm + (M-0.75)*1.5*GeoModelKernelUnits::mm + 0.75*GeoModelKernelUnits::mm));
-	    ShiftZ  = new GeoAlignableTransform(GeoTrf::TranslateZ3D((K*1.2-7.8)*GeoModelKernelUnits::cm ));
+	    RotateX = new GeoAlignableTransform(GeoTrf::RotateX3D   (90*Gaudi::Units::deg));
+	    ShiftX  = new GeoAlignableTransform(GeoTrf::TranslateX3D((L-5.5)*Gaudi::Units::cm + (M-0.75)*1.5*Gaudi::Units::mm + 0.75*Gaudi::Units::mm));
+	    ShiftZ  = new GeoAlignableTransform(GeoTrf::TranslateZ3D((K*1.2-7.8)*Gaudi::Units::cm ));
 	
 	    Module_Physical[I-1][J-1]->add(Strip_ID);
 	    Module_Physical[I-1][J-1]->add(ShiftZ);
@@ -228,13 +229,13 @@ void ZDC_DetFactory::create(GeoPhysVol* world)
     Envelope_Physical[I] = new GeoFullPhysVol(Envelope_Logical);
     Steel_Plate_Physical = new GeoFullPhysVol(Steel_Plate_Logical);
 
-    ShiftZ  = new GeoAlignableTransform(GeoTrf::TranslateZ3D((-47.2 + 0.5)*GeoModelKernelUnits::cm*sgn));
+    ShiftZ  = new GeoAlignableTransform(GeoTrf::TranslateZ3D((-47.2 + 0.5)*Gaudi::Units::cm*sgn));
     Envelope_Physical[I]->add(ShiftZ);
     Envelope_Physical[I]->add(Steel_Plate_Physical);
 
     Vol_Name = "EM_XY"; Vol_Name = Vol_Name + Vol_Name_append;
 
-    ShiftZ = new GeoAlignableTransform(GeoTrf::TranslateZ3D ((-47.2 + 1 + 6.7)*GeoModelKernelUnits::cm*sgn));
+    ShiftZ = new GeoAlignableTransform(GeoTrf::TranslateZ3D ((-47.2 + 1 + 6.7)*Gaudi::Units::cm*sgn));
 
     tag = new GeoNameTag(Vol_Name.c_str());
     Envelope_Physical[I]->add(tag);
@@ -242,58 +243,58 @@ void ZDC_DetFactory::create(GeoPhysVol* world)
     Envelope_Physical[I]->add(Module_Physical[I][0]);
 
     Steel_Plate_Physical = new GeoFullPhysVol(Steel_Plate_Logical);
-    ShiftZ = new GeoAlignableTransform(GeoTrf::TranslateZ3D((-47.2 + 1 + 13.4 +.5)*GeoModelKernelUnits::cm*sgn));
+    ShiftZ = new GeoAlignableTransform(GeoTrf::TranslateZ3D((-47.2 + 1 + 13.4 +.5)*Gaudi::Units::cm*sgn));
     Envelope_Physical[I]->add(ShiftZ);
     Envelope_Physical[I]->add(Steel_Plate_Physical);
   
     Steel_Plate_Physical = new GeoFullPhysVol(Steel_Plate_Logical);
-    ShiftZ = new GeoAlignableTransform(GeoTrf::TranslateZ3D((-47.2 + 1 + 13.4 + 1 + 6 + 10 + .5)*GeoModelKernelUnits::cm*sgn));
+    ShiftZ = new GeoAlignableTransform(GeoTrf::TranslateZ3D((-47.2 + 1 + 13.4 + 1 + 6 + 10 + .5)*Gaudi::Units::cm*sgn));
     Envelope_Physical[I]->add(ShiftZ);
     Envelope_Physical[I]->add(Steel_Plate_Physical);
 
     Vol_Name = "HM_XY"; Vol_Name = Vol_Name + Vol_Name_append;
-    ShiftZ = new GeoAlignableTransform(GeoTrf::TranslateZ3D((-47.2 + 1 + 13.4 + 1 + 6 + 10 + 1 + 6.7)*GeoModelKernelUnits::cm*sgn));
+    ShiftZ = new GeoAlignableTransform(GeoTrf::TranslateZ3D((-47.2 + 1 + 13.4 + 1 + 6 + 10 + 1 + 6.7)*Gaudi::Units::cm*sgn));
     tag = new GeoNameTag(Vol_Name.c_str());
     Envelope_Physical[I]->add(tag);
     Envelope_Physical[I]->add(ShiftZ);
     Envelope_Physical[I]->add(Module_Physical[I][1]);
   
     Steel_Plate_Physical = new GeoFullPhysVol(Steel_Plate_Logical);
-    ShiftZ = new GeoAlignableTransform(GeoTrf::TranslateZ3D((-47.2 + 1 + 13.4 + 1 + 6 + 10 + 1 + 13.4 + .5)*GeoModelKernelUnits::cm*sgn));
+    ShiftZ = new GeoAlignableTransform(GeoTrf::TranslateZ3D((-47.2 + 1 + 13.4 + 1 + 6 + 10 + 1 + 13.4 + .5)*Gaudi::Units::cm*sgn));
     Envelope_Physical[I]->add(ShiftZ);
     Envelope_Physical[I]->add(Steel_Plate_Physical);
  
     Steel_Plate_Physical = new GeoFullPhysVol(Steel_Plate_Logical);
-    ShiftZ = new GeoAlignableTransform(GeoTrf::TranslateZ3D((-47.2 + 1 + 13.4 + 1 + 6 + 10 + 1 + 13.4 + 1 + 3 +.5)*GeoModelKernelUnits::cm*sgn));
+    ShiftZ = new GeoAlignableTransform(GeoTrf::TranslateZ3D((-47.2 + 1 + 13.4 + 1 + 6 + 10 + 1 + 13.4 + 1 + 3 +.5)*Gaudi::Units::cm*sgn));
     Envelope_Physical[I]->add(ShiftZ);
     Envelope_Physical[I]->add(Steel_Plate_Physical);
 
     Vol_Name = "HM_01"; Vol_Name = Vol_Name + Vol_Name_append;
-    ShiftZ = new GeoAlignableTransform(GeoTrf::TranslateZ3D((-47.2 + 1 + 13.4 + 1 + 6 + 10 + 1 + 13.4 + 1 + 3 + 1 + 6.7)*GeoModelKernelUnits::cm*sgn ));
+    ShiftZ = new GeoAlignableTransform(GeoTrf::TranslateZ3D((-47.2 + 1 + 13.4 + 1 + 6 + 10 + 1 + 13.4 + 1 + 3 + 1 + 6.7)*Gaudi::Units::cm*sgn ));
     tag = new GeoNameTag(Vol_Name.c_str());
     Envelope_Physical[I]->add(tag);
     Envelope_Physical[I]->add(ShiftZ);
     Envelope_Physical[I]->add(Module_Physical[I][2]);
   
     Steel_Plate_Physical = new GeoFullPhysVol(Steel_Plate_Logical);
-    ShiftZ = new GeoAlignableTransform(GeoTrf::TranslateZ3D((-47.2 + 1 + 13.4 + 1 + 6 + 10 + 1 + 13.4 + 1 + 3 + 1 + 13.4 + .5)*GeoModelKernelUnits::cm*sgn));
+    ShiftZ = new GeoAlignableTransform(GeoTrf::TranslateZ3D((-47.2 + 1 + 13.4 + 1 + 6 + 10 + 1 + 13.4 + 1 + 3 + 1 + 13.4 + .5)*Gaudi::Units::cm*sgn));
     Envelope_Physical[I]->add(ShiftZ);
     Envelope_Physical[I]->add(Steel_Plate_Physical);
 
     Steel_Plate_Physical = new GeoFullPhysVol(Steel_Plate_Logical);
-    ShiftZ = new GeoAlignableTransform(GeoTrf::TranslateZ3D((-47.2 + 1 + 13.4 + 1 + 6 + 10 + 1 + 13.4 + 1 + 3 + 1 + 13.4 + 1 + .5)*GeoModelKernelUnits::cm*sgn));
+    ShiftZ = new GeoAlignableTransform(GeoTrf::TranslateZ3D((-47.2 + 1 + 13.4 + 1 + 6 + 10 + 1 + 13.4 + 1 + 3 + 1 + 13.4 + 1 + .5)*Gaudi::Units::cm*sgn));
     Envelope_Physical[I]->add(ShiftZ);
     Envelope_Physical[I]->add(Steel_Plate_Physical);
 
     Vol_Name = "HM_02"; Vol_Name = Vol_Name + Vol_Name_append;
-    ShiftZ = new GeoAlignableTransform(GeoTrf::TranslateZ3D((-47.2 + 1 + 13.4 + 1 + 6 + 10 + 1 + 13.4 + 1 + 3 + 1 + 13.4 + 1 + 1 + 6.7)*GeoModelKernelUnits::cm*sgn ));
+    ShiftZ = new GeoAlignableTransform(GeoTrf::TranslateZ3D((-47.2 + 1 + 13.4 + 1 + 6 + 10 + 1 + 13.4 + 1 + 3 + 1 + 13.4 + 1 + 1 + 6.7)*Gaudi::Units::cm*sgn ));
     tag = new GeoNameTag(Vol_Name.c_str());
     Envelope_Physical[I]->add(tag);
     Envelope_Physical[I]->add(ShiftZ);
     Envelope_Physical[I]->add(Module_Physical[I][3]);
   
     Steel_Plate_Physical = new GeoFullPhysVol(Steel_Plate_Logical);
-    ShiftZ = new GeoAlignableTransform(GeoTrf::TranslateZ3D((-47.2 + 1 + 13.4 + 1 + 6 + 10 + 1 + 13.4 + 1 + 3 + 1 + 13.4 + 1 + 1 + 13.4 + .5)*GeoModelKernelUnits::cm*sgn));
+    ShiftZ = new GeoAlignableTransform(GeoTrf::TranslateZ3D((-47.2 + 1 + 13.4 + 1 + 6 + 10 + 1 + 13.4 + 1 + 3 + 1 + 13.4 + 1 + 1 + 13.4 + .5)*Gaudi::Units::cm*sgn));
     Envelope_Physical[I]->add(ShiftZ);
     Envelope_Physical[I]->add(Steel_Plate_Physical);
   }
@@ -305,7 +306,7 @@ void ZDC_DetFactory::create(GeoPhysVol* world)
 
   world->add(tag);
 
-  ShiftZ = new GeoAlignableTransform(GeoTrf::TranslateZ3D(-141.580*GeoModelKernelUnits::m));
+  ShiftZ = new GeoAlignableTransform(GeoTrf::TranslateZ3D(-141.580*Gaudi::Units::m));
 
   world->add(ShiftZ);
   world->add(Envelope_Physical[0]);
@@ -320,7 +321,7 @@ void ZDC_DetFactory::create(GeoPhysVol* world)
   
   world->add(tag);
   
-  ShiftZ = new GeoAlignableTransform(GeoTrf::TranslateZ3D(141.580 *GeoModelKernelUnits::m));
+  ShiftZ = new GeoAlignableTransform(GeoTrf::TranslateZ3D(141.580 *Gaudi::Units::m));
 
   world->add(ShiftZ);
   world->add(Envelope_Physical[1]);
diff --git a/ForwardDetectors/ZDC/ZdcAnalysis/Root/ZdcAnalysisTool.cxx b/ForwardDetectors/ZDC/ZdcAnalysis/Root/ZdcAnalysisTool.cxx
index f3480cb92fe22aa13c5dae6b0634b1424a3c79ef..52ab89e72fef4e277670ba862a81fa5e42c71aa3 100644
--- a/ForwardDetectors/ZDC/ZdcAnalysis/Root/ZdcAnalysisTool.cxx
+++ b/ForwardDetectors/ZDC/ZdcAnalysis/Root/ZdcAnalysisTool.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "ZdcAnalysis/ZdcAnalysisTool.h"
@@ -28,7 +28,6 @@ namespace ZDC
    declareInterface<IZdcAnalysisTool>(this);
 #endif
 
-  declareProperty("ZdcModuleContainerName",m_zdcModuleContainerName="ZdcModules","Location of ZDC processed data");
   declareProperty("EventInfoKey",          m_eventInfoKey,          "Location of the event info.");
   declareProperty("ZdcModuleWriteKey",     m_ZdcModuleWriteKey,     "Output location of ZDC reprocessed data");
   declareProperty("Configuration", m_configuration = "PbPb2015");
@@ -586,7 +585,6 @@ StatusCode ZdcAnalysisTool::initializeTool()
   ATH_MSG_INFO("ChisqRatioCut: "<<m_ChisqRatioCut);
 
   ATH_CHECK( m_eventInfoKey.initialize());
-  ATH_CHECK( m_zdcModuleContainerName.initialize());
   ATH_CHECK( m_ZdcModuleWriteKey.initialize() );
 
   return StatusCode::SUCCESS;
@@ -918,16 +916,6 @@ void ZdcAnalysisTool::setTimeCalibrations(unsigned int runNumber)
   fCalib->Close();
 }
 
-StatusCode ZdcAnalysisTool::reprocessZdc()
-{
-  SG::ReadHandle<xAOD::ZdcModuleContainer> zdc_modules(m_zdcModuleContainerName);
-  if (!zdc_modules.isValid()) return StatusCode::FAILURE;
-
-  ATH_CHECK(recoZdcModules(*zdc_modules));
-
-  return StatusCode::SUCCESS;
-}
-
   bool ZdcAnalysisTool::sigprocMaxFinder(const std::vector<unsigned short>& adc, float deltaT, float& amp, float& time, float& qual)
   {
     size_t nsamp = adc.size();
diff --git a/ForwardDetectors/ZDC/ZdcAnalysis/ZdcAnalysis/IZdcAnalysisTool.h b/ForwardDetectors/ZDC/ZdcAnalysis/ZdcAnalysis/IZdcAnalysisTool.h
index c4a9e9bdeb9f4d55012c9d48d84e682edb9cafb6..81de4ccc68998fd7f7c404f71983972c58644dcc 100644
--- a/ForwardDetectors/ZDC/ZdcAnalysis/ZdcAnalysis/IZdcAnalysisTool.h
+++ b/ForwardDetectors/ZDC/ZdcAnalysis/ZdcAnalysis/IZdcAnalysisTool.h
@@ -1,9 +1,9 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
-#ifndef __IZDCRECTOOL_H__
-#define __IZDCRECTOOL_H__
+#ifndef ZDCANALYSIS_IZDCRECTOOL_H
+#define ZDCANALYSIS_IZDCRECTOOL_H
 
 #include "AsgTools/IAsgTool.h"
 #include "xAODForward/ZdcModuleContainer.h"
@@ -21,7 +21,6 @@ class IZdcAnalysisTool : virtual public asg::IAsgTool
   virtual StatusCode initializeTool() = 0;
   virtual StatusCode recoZdcModule(const xAOD::ZdcModule& module) = 0;
   virtual StatusCode recoZdcModules(const xAOD::ZdcModuleContainer& moduleContainer) = 0;
-  virtual StatusCode reprocessZdc() = 0;
 };
 
 }
diff --git a/ForwardDetectors/ZDC/ZdcAnalysis/ZdcAnalysis/ZdcAnalysisTool.h b/ForwardDetectors/ZDC/ZdcAnalysis/ZdcAnalysis/ZdcAnalysisTool.h
index 3b401b9b571ccdbe251cec448e43b1796b81909b..8d944608d957e26b6610344dd86b447c87f78132 100644
--- a/ForwardDetectors/ZDC/ZdcAnalysis/ZdcAnalysis/ZdcAnalysisTool.h
+++ b/ForwardDetectors/ZDC/ZdcAnalysis/ZdcAnalysis/ZdcAnalysisTool.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef ZDCANALYSIS_ZDCANALYSISTOOL_H
@@ -30,15 +30,14 @@ class ZdcAnalysisTool : public virtual IZdcAnalysisTool, public asg::AsgTool
   virtual ~ZdcAnalysisTool();
 
   //interface from AsgTool
-  StatusCode initializeTool();
-  StatusCode initialize() {return initializeTool();}
+  virtual StatusCode initializeTool() override;
+  virtual StatusCode initialize() override {return initializeTool();}
   void initialize80MHz();
   void initialize40MHz();
   void initializeTriggerEffs(unsigned int runNumber);
 
-  StatusCode recoZdcModule(const xAOD::ZdcModule& module);
-  StatusCode recoZdcModules(const xAOD::ZdcModuleContainer& moduleContainer);
-  StatusCode reprocessZdc();
+  virtual StatusCode recoZdcModule(const xAOD::ZdcModule& module) override;
+  virtual StatusCode recoZdcModules(const xAOD::ZdcModuleContainer& moduleContainer) override;
 
   // methods for processing, used for decoration
   bool sigprocMaxFinder(const std::vector<unsigned short>& adc, float deltaT, float& amp, float& time, float& qual);
@@ -95,7 +94,6 @@ class ZdcAnalysisTool : public virtual IZdcAnalysisTool, public asg::AsgTool
   TF1* m_tf1SincInterp;
 
   SG::ReadHandleKey<xAOD::EventInfo>           m_eventInfoKey;
-  SG::ReadHandleKey<xAOD::ZdcModuleContainer>  m_zdcModuleContainerName;
   SG::WriteHandleKey<xAOD::ZdcModuleContainer> m_ZdcModuleWriteKey;
   bool m_flipEMDelay;
   bool m_lowGainOnly;
diff --git a/ForwardDetectors/ZDC/ZdcRec/ZdcRec/ZdcRecChannelToolV2.h b/ForwardDetectors/ZDC/ZdcRec/ZdcRec/ZdcRecChannelToolV2.h
index 54c276804cceeb4e16ee26882e9095421e5aba82..4c6f7ec8b47d418eba1dcf67a66b212792b018c6 100644
--- a/ForwardDetectors/ZDC/ZdcRec/ZdcRec/ZdcRecChannelToolV2.h
+++ b/ForwardDetectors/ZDC/ZdcRec/ZdcRec/ZdcRecChannelToolV2.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 /*
@@ -42,15 +42,15 @@ class ZdcRecChannelToolV2: public asg::AsgTool, virtual public IIncidentListener
   ZdcRecChannelToolV2(const std::string& name);
   virtual ~ZdcRecChannelToolV2() {};
   
-  virtual StatusCode initialize();
-  virtual StatusCode finalize();
-  virtual void handle( const Incident& );
-
-  int convertTT2ZM(const xAOD::TriggerTowerContainer* ttCollection, xAOD::ZdcModuleContainer* zdcModules);
-  int makeRawFromDigits(xAOD::ZdcModuleContainer& zdcModules); // NOT const -- we're going to modify the objects to add signal processing
-  int makeWaveformFromDigits(xAOD::ZdcModule& module);
-  int splitWaveform(std::map<int,float>& waveform, std::vector<float>& times, std::vector<float>& adcs);
-  int getPeakProperties(std::vector<float>& times, std::vector<float>& adcs, float& time, float& amp, float& qual, float& presamp);
+  virtual StatusCode initialize() override;
+  virtual StatusCode finalize() override;
+  virtual void handle( const Incident& ) override;
+
+  int convertTT2ZM(const xAOD::TriggerTowerContainer* ttCollection, xAOD::ZdcModuleContainer* zdcModules) const;
+  int makeRawFromDigits(xAOD::ZdcModuleContainer& zdcModules) const; // NOT const -- we're going to modify the objects to add signal processing
+  int makeWaveformFromDigits(xAOD::ZdcModule& module) const;
+  int splitWaveform(std::map<int,float>& waveform, std::vector<float>& times, std::vector<float>& adcs) const;
+  int getPeakProperties(std::vector<float>& times, std::vector<float>& adcs, float& time, float& amp, float& qual, float& presamp) const;
 
 private:
 
diff --git a/ForwardDetectors/ZDC/ZdcRec/ZdcRec/ZdcRecV3.h b/ForwardDetectors/ZDC/ZdcRec/ZdcRec/ZdcRecV3.h
index 9862c24b6e650b7424af3a8ca8942b75fe9e799e..e6294d6d1c8455a6418adab7588dc21df0401419 100755
--- a/ForwardDetectors/ZDC/ZdcRec/ZdcRec/ZdcRecV3.h
+++ b/ForwardDetectors/ZDC/ZdcRec/ZdcRec/ZdcRecV3.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 ///////////////////////////////////////////////////////////////////
@@ -16,6 +16,8 @@
 
 //which one ???
 #include "AthenaBaseComps/AthAlgorithm.h"
+#include "StoreGate/WriteHandleKey.h"
+#include "StoreGate/ReadHandleKey.h"
 //#include "GaudiKernel/Algorithm.h"
 #include "GaudiKernel/ToolHandle.h"
 #include "GaudiKernel/ServiceHandle.h"
@@ -51,44 +53,29 @@ class ZdcRecV3 : public AthAlgorithm
 public:
 
 	ZdcRecV3(const std::string& name, ISvcLocator* pSvcLocator);
-	~ZdcRecV3();
+	virtual ~ZdcRecV3();
 
-	StatusCode initialize();
-	StatusCode execute();
-	StatusCode finalize();
+	virtual StatusCode initialize() override;
+	virtual StatusCode execute() override;
+	virtual StatusCode finalize() override;
 
 private:
-
-  /** class member version of retrieving StoreGate */
-	//StoreGateSvc* m_storeGate;
-	 ServiceHandle<StoreGateSvc> m_storeGate;
-
-
-	/** Does the collection own it's objects ? **/
-	int m_ownPolicy;
-
-
 	/** Digits data container name */
-	std::string m_ttContainerName;
+        SG::ReadHandleKey<xAOD::TriggerTowerContainer> m_ttContainerName
+        { this, "DigitsContainerName", "ZdcTriggerTowers", "" };
 
 	/** Raw data object name */
-	std::string m_zdcModuleContainerName;
-	std::string m_zdcModuleAuxContainerName;
-
+        SG::WriteHandleKey<xAOD::ZdcModuleContainer> m_zdcModuleContainerName
+        { this, "ZdcModuleContainerName", "ZdcModules", "" };
 
-	/** Pointer to Zdc input "digits" data */
-	const xAOD::TriggerTowerContainer* m_ttContainer;
-
-	int m_eventCount;
-	bool m_complainContain;
-	bool m_complainRetrieve;
 
 	//Include here all tools to do the job. They will be called by the algorithm execute method
 	//Another option is to use ToolHandleArray<IZdcRecTool>, where IZdcRecTool is the factory for
 	//the tools
-	ToolHandle<ZdcRecChannelToolV2> m_ChannelTool;
-	ToolHandle<ZDC::IZdcAnalysisTool> m_zdcTool;
-
+	ToolHandle<ZdcRecChannelToolV2> m_ChannelTool
+        { this, "ChannelTool", "ZdcRecChannelToolV2", "" };
+	ToolHandle<ZDC::IZdcAnalysisTool> m_zdcTool
+        { this, "ZdcAnalysisTool", "ZDC::ZdcAnalysisTool/ZdcAnalysisTool", "" };
 };
 
 #endif
diff --git a/ForwardDetectors/ZDC/ZdcRec/python/ZdcModuleGetter.py b/ForwardDetectors/ZDC/ZdcRec/python/ZdcModuleGetter.py
index d5545e751dd6dee87c6574f19769fc6fbd8d3833..e7dbc4cbce16be892d51c5deddde7454f4b2608e 100644
--- a/ForwardDetectors/ZDC/ZdcRec/python/ZdcModuleGetter.py
+++ b/ForwardDetectors/ZDC/ZdcRec/python/ZdcModuleGetter.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 
 # specifies egamma"standard"
 from AthenaCommon.Logging import logging
@@ -53,23 +53,24 @@ class ZdcModuleGetter ( Configured ) :
 
         from AthenaCommon.AppMgr import ToolSvc
         from AthenaCommon import CfgMgr
-        mlog.info("adding ZDC::ZdcAnalysisTool to ToolSvc with default parameters, and no calibrations enabled");
+        #mlog.info("adding ZDC::ZdcAnalysisTool to ToolSvc with default parameters, and no calibrations enabled");
         #ToolSvc += CfgMgr.ZDC__ZdcAnalysisTool("ZdcAnalysisTool",DoCalib=False,Configuration="default")   
-        ToolSvc += CfgMgr.ZDC__ZdcAnalysisTool("ZdcAnalysisTool",DoCalib=False,Configuration="pPb2016")   
+        zdcAnalysisTool = CfgMgr.ZDC__ZdcAnalysisTool("ZdcAnalysisTool",DoCalib=False,Configuration="pPb2016")   
         
-        ToolSvc.ZdcAnalysisTool.FixTau1=True
-        ToolSvc.ZdcAnalysisTool.FixTau2=True
-        ToolSvc.ZdcAnalysisTool.Tau1=5
-        ToolSvc.ZdcAnalysisTool.Tau2=21
-        ToolSvc.ZdcAnalysisTool.Peak2ndDerivThresh=15
+        zdcAnalysisTool.FixTau1=True
+        zdcAnalysisTool.FixTau2=True
+        zdcAnalysisTool.Tau1=5
+        zdcAnalysisTool.Tau2=21
+        zdcAnalysisTool.Peak2ndDerivThresh=15
 
         try:
             from ZdcRec.ZdcRecConf import ZdcRecV3
             mlog.info("got ZdcRecV2")
-            self._zdcRecHandle = ZdcRecV3()
+            self._zdcRecHandle = ZdcRecV3(ZdcAnalysisTool = zdcAnalysisTool)
         except Exception:
             mlog.error("could not get handle to ZdcRecV3")
-            print traceback.format_exc()
+            import traceback
+            traceback.print_exc()
             return False
 
 
diff --git a/ForwardDetectors/ZDC/ZdcRec/src/ZdcRecChannelToolV2.cxx b/ForwardDetectors/ZDC/ZdcRec/src/ZdcRecChannelToolV2.cxx
index 9d6073f16364564abc5ff6b6e2665676dfc422ca..cbae6914fb23b906694e3999fc9d3821d0de1338 100644
--- a/ForwardDetectors/ZDC/ZdcRec/src/ZdcRecChannelToolV2.cxx
+++ b/ForwardDetectors/ZDC/ZdcRec/src/ZdcRecChannelToolV2.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 /*
@@ -113,7 +113,7 @@ StatusCode ZdcRecChannelToolV2::finalize()
 }
 //==================================================================================================
 
-int ZdcRecChannelToolV2::convertTT2ZM(const xAOD::TriggerTowerContainer* ttCollection, xAOD::ZdcModuleContainer* zdcModules )
+int ZdcRecChannelToolV2::convertTT2ZM(const xAOD::TriggerTowerContainer* ttCollection, xAOD::ZdcModuleContainer* zdcModules ) const
 {
 
   //typedef std::map<uint64_t,xAOD::ZdcModule*> hashmapType;
@@ -200,7 +200,7 @@ int ZdcRecChannelToolV2::convertTT2ZM(const xAOD::TriggerTowerContainer* ttColle
 
 }
 
-int ZdcRecChannelToolV2::makeWaveformFromDigits(xAOD::ZdcModule& module)
+int ZdcRecChannelToolV2::makeWaveformFromDigits(xAOD::ZdcModule& module) const
 {
   
   size_t nsamp = 0;
@@ -335,7 +335,7 @@ int ZdcRecChannelToolV2::makeWaveformFromDigits(xAOD::ZdcModule& module)
 
 //Returns a pointer to a RawChannel Collection with energy and time
 //==================================================================================================
-int  ZdcRecChannelToolV2::makeRawFromDigits(xAOD::ZdcModuleContainer&  ChannelCollection)
+int  ZdcRecChannelToolV2::makeRawFromDigits(xAOD::ZdcModuleContainer&  ChannelCollection) const
 {
 
 	Identifier id;
@@ -345,7 +345,7 @@ int  ZdcRecChannelToolV2::makeRawFromDigits(xAOD::ZdcModuleContainer&  ChannelCo
 	return 0;
 }
 
-int ZdcRecChannelToolV2::splitWaveform(std::map<int,float>& waveform, std::vector<float>& times, std::vector<float>& adcs)
+int ZdcRecChannelToolV2::splitWaveform(std::map<int,float>& waveform, std::vector<float>& times, std::vector<float>& adcs) const
 {
   times.clear();
   adcs.clear();
@@ -360,7 +360,7 @@ int ZdcRecChannelToolV2::splitWaveform(std::map<int,float>& waveform, std::vecto
   return 1;
 }
 
-int ZdcRecChannelToolV2::getPeakProperties(std::vector<float>& times, std::vector<float>& adcs, float& time, float& amp, float& qual, float& presamp)
+int ZdcRecChannelToolV2::getPeakProperties(std::vector<float>& times, std::vector<float>& adcs, float& time, float& amp, float& qual, float& presamp) const
 {
 
   if (times.size() != adcs.size()) 
diff --git a/ForwardDetectors/ZDC/ZdcRec/src/ZdcRecV3.cxx b/ForwardDetectors/ZDC/ZdcRec/src/ZdcRecV3.cxx
index 4ce47705129deeebed661303496940493dad6065..81df40dbfa130f0f2c39101b6ed3e4cf736b36f2 100644
--- a/ForwardDetectors/ZDC/ZdcRec/src/ZdcRecV3.cxx
+++ b/ForwardDetectors/ZDC/ZdcRec/src/ZdcRecV3.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 /*
@@ -16,6 +16,8 @@
 #include "GaudiKernel/MsgStream.h"
 #include "GaudiKernel/StatusCode.h"
 #include "StoreGate/StoreGateSvc.h"
+#include "StoreGate/WriteHandle.h"
+#include "StoreGate/ReadHandle.h"
 //#include "Identifier/Identifier.h"
 
 #include "xAODForward/ZdcModuleAuxContainer.h"
@@ -29,24 +31,8 @@
 //==================================================================================================
 ZdcRecV3::ZdcRecV3(const std::string& name, ISvcLocator* pSvcLocator) :
 
-	AthAlgorithm(name, pSvcLocator),
-	m_storeGate("StoreGateSvc", name),
-	m_ownPolicy(static_cast<int> (SG::OWN_ELEMENTS)),
-	m_ttContainerName("ZdcTriggerTowers"),
-	m_zdcModuleContainerName("ZdcModules"),
-	m_zdcModuleAuxContainerName("ZdcModulesAux."),
-	m_ttContainer(0),
-	m_eventCount(0),
-	m_complainContain(1),
-	m_complainRetrieve(1),
-        m_ChannelTool("ZdcRecChannelToolV2"),
-	m_zdcTool("ZDC::ZdcAnalysisTool/ZdcAnalysisTool")
+	AthAlgorithm(name, pSvcLocator)
 {
-	declareProperty("OwnPolicy",m_ownPolicy) ;
-
-	declareProperty("DigitsContainerName", m_ttContainerName, "ZdcTriggerTowers");
-	declareProperty("ZdcModuleContainerName",    m_zdcModuleContainerName,    "ZdcModules");
-	declareProperty("ZdcModuleAuxContainerName",    m_zdcModuleAuxContainerName,    "ZdcModulesAux.");
 }
 //==================================================================================================
 
@@ -57,93 +43,38 @@ ZdcRecV3::~ZdcRecV3() {}
 //==================================================================================================
 StatusCode ZdcRecV3::initialize()
 {
-	MsgStream mLog(msgSvc(), name());
-
-	// Look up the Storegate service
-	StatusCode sc = m_storeGate.retrieve();
-	if (sc.isFailure())
-	{
-		mLog << MSG::FATAL << "--> ZDC: Unable to retrieve pointer to StoreGateSvc" << endmsg;
-		return sc;
-	}
-
+  ATH_CHECK( m_ChannelTool.retrieve() );
+  ATH_CHECK( m_zdcTool.retrieve() );
 
-	// Reconstruction Tool
-	StatusCode scTool = m_ChannelTool.retrieve();
-	if (scTool.isFailure())
-	{
-		mLog << MSG::WARNING << "--> ZDC: Could not retrieve " << m_ChannelTool << endmsg;
-		return StatusCode::FAILURE;
-	}
-	mLog << MSG::DEBUG << "--> ZDC: SUCCESS retrieving " << m_ChannelTool << endmsg;
-
-	// Reconstruction Tool
-	StatusCode zdcTool = m_zdcTool.retrieve();
-	if (zdcTool.isFailure())
-	{
-		mLog << MSG::WARNING << "--> ZDC: Could not retrieve " << m_zdcTool << endmsg;
-		return StatusCode::FAILURE;
-	}
-	mLog << MSG::DEBUG << "--> ZDC: SUCCESS retrieving " << m_zdcTool << endmsg;
+  // Container output name
+  //TODO: change MESSAGE !!
+  ATH_MSG_DEBUG( " Output Container Name " << m_zdcModuleContainerName );
 
-	// Container output name
-	//TODO: change MESSAGE !!
-	mLog << MSG::DEBUG << " Output Container Name " << m_zdcModuleContainerName << endmsg;
-	if (m_ownPolicy == SG::OWN_ELEMENTS)
-		mLog << MSG::DEBUG << "...will OWN its cells." << endmsg;
-	else
-		mLog << MSG::DEBUG << "...will VIEW its cells." << endmsg;
+  ATH_CHECK( m_zdcModuleContainerName.initialize() );
+  ATH_CHECK( m_ttContainerName.initialize(SG::AllowEmpty) );
 
+  ATH_MSG_DEBUG( "--> ZDC: ZdcRecV3 initialization complete" );
 
-	mLog << MSG::DEBUG << "--> ZDC: ZdcRecV3 initialization complete" << endmsg;
-
-	return StatusCode::SUCCESS;
+  return StatusCode::SUCCESS;
 }
 //==================================================================================================
 
 //==================================================================================================
 StatusCode ZdcRecV3::execute()
 {
-
-  MsgStream mLog(msgSvc(), name());
-	mLog << MSG::DEBUG
-	     << "--> ZDC: ZdcRecV3 execute starting on "
-	     << m_eventCount
-	     << "th event"
-		 << endmsg;
-
-	m_eventCount++;
+  const EventContext& ctx = Gaudi::Hive::currentContext();
+  ATH_MSG_DEBUG ("--> ZDC: ZdcRecV3 execute starting on "
+                 << ctx.evt()
+                 << "th event");
 
 	//Look for the container presence
-	bool dg = m_storeGate->contains<xAOD::TriggerTowerContainer>( m_ttContainerName);
-	if (!dg) {
-	  if (m_complainContain) mLog << MSG::WARNING << "--> ZDC: StoreGate does not contain " << m_ttContainerName << endmsg;
-	  m_complainContain = 0;
+        if (m_ttContainerName.empty()) {
 	  return StatusCode::SUCCESS;
 	}
 
 	// Look up the Digits "TriggerTowerContainer" in Storegate
-	StatusCode digitsLookupSC = m_storeGate->retrieve(m_ttContainer, m_ttContainerName);
-	if (digitsLookupSC.isFailure())
-	{
-	  if (m_complainRetrieve)
-	    mLog << MSG::WARNING
-		 << "--> ZDC: Could not retrieve "
-		 << m_ttContainerName
-		 << " from StoreGate"
-		 << endmsg;
-	  m_complainRetrieve = 0;
-	  return StatusCode::SUCCESS;
-	}
-
-	if (digitsLookupSC.isSuccess() && !m_ttContainer)
-	{
-		mLog << MSG::ERROR
-			 << "--> ZDC: Storegate returned zero pointer for "
-			 << m_ttContainerName
-			 << endmsg;
-		return StatusCode::SUCCESS;
-	}
+        SG::ReadHandle<xAOD::TriggerTowerContainer> ttContainer
+          (m_ttContainerName, ctx);
 
     	//Create the containers to hold the reconstructed information (you just pass the pointer and the converter does the work)	
 	std::unique_ptr<xAOD::ZdcModuleContainer> moduleContainer( new xAOD::ZdcModuleContainer());
@@ -151,17 +82,19 @@ StatusCode ZdcRecV3::execute()
 	moduleContainer->setStore( moduleAuxContainer.get() );
 
 	// rearrange ZDC channels and perform fast reco on all channels (including non-big tubes)
-	int ncha = m_ChannelTool->convertTT2ZM(m_ttContainer, moduleContainer.get() );
+	int ncha = m_ChannelTool->convertTT2ZM(ttContainer.get(), moduleContainer.get() );
 	
 	msg( MSG::DEBUG ) << "Channel tool returns " << ncha << endmsg;
 	msg( MSG::DEBUG ) << ZdcModuleToString(*moduleContainer) << endmsg;
 
 	// re-reconstruct big tubes
- 
-	ATH_CHECK( evtStore()->record( std::move(moduleContainer), m_zdcModuleContainerName) );
-	ATH_CHECK( evtStore()->record( std::move(moduleAuxContainer), m_zdcModuleAuxContainerName) );
 
-	ATH_CHECK( m_zdcTool->reprocessZdc() ); // pulls the modules out of the event store
+	ATH_CHECK( m_zdcTool->recoZdcModules(*moduleContainer) );
+
+        SG::WriteHandle<xAOD::ZdcModuleContainer> moduleContainerH
+          (m_zdcModuleContainerName, ctx);
+        ATH_CHECK( moduleContainerH.record (std::move(moduleContainer),
+                                            std::move(moduleAuxContainer)) );
 
 	return StatusCode::SUCCESS;
 
@@ -171,13 +104,7 @@ StatusCode ZdcRecV3::execute()
 //==================================================================================================
 StatusCode ZdcRecV3::finalize()
 {
-
-  MsgStream mLog(msgSvc(),name());
-
-  mLog << MSG::DEBUG
-		  << "--> ZDC: ZdcRecV3 finalize complete"
-		  << endmsg;
-
+  ATH_MSG_DEBUG( "--> ZDC: ZdcRecV3 finalize complete" );
   return StatusCode::SUCCESS;
 
 }
diff --git a/Generators/Epos_i/CMakeLists.txt b/Generators/Epos_i/CMakeLists.txt
index f03ffae0526ca692057303a9a23a9b3630cbc2e5..bb317817567b6c2d099cef7a98d98072def5e7f4 100644
--- a/Generators/Epos_i/CMakeLists.txt
+++ b/Generators/Epos_i/CMakeLists.txt
@@ -41,6 +41,7 @@ atlas_add_component( Epos_i
 
 # Install files from the package:
 atlas_install_joboptions( share/*.py )
-atlas_install_runtime( share/epos_crmc.param ${CRMC_ROOT}/tabs/epos.inics ${CRMC_ROOT}/tabs/epos.inidi.lhc ${CRMC_ROOT}/tabs/epos.inirj.lhc ${CRMC_ROOT}/tabs/epos.inirj ${CRMC_ROOT}/tabs/epos.iniev ${CRMC_ROOT}/tabs/epos.initl ${CRMC_ROOT}/tabs/dpmjet.dat )
-
-
+atlas_install_runtime( share/epos_crmc.param ${CRMC_LCGROOT}/tabs/epos.inics
+   ${CRMC_LCGROOT}/tabs/epos.inidi.lhc ${CRMC_LCGROOT}/tabs/epos.inirj.lhc
+   ${CRMC_LCGROOT}/tabs/epos.inirj ${CRMC_LCGROOT}/tabs/epos.iniev
+   ${CRMC_LCGROOT}/tabs/epos.initl ${CRMC_LCGROOT}/tabs/dpmjet.dat )
diff --git a/Generators/QGSJet_i/CMakeLists.txt b/Generators/QGSJet_i/CMakeLists.txt
index 540566b49f6d62c2ac305688dcf6cda39cb99351..5c4bbd5e2f08214617db26319eb75619c37552b5 100644
--- a/Generators/QGSJet_i/CMakeLists.txt
+++ b/Generators/QGSJet_i/CMakeLists.txt
@@ -42,4 +42,5 @@ atlas_add_component( QGSJet_i
 # Install files from the package:
 atlas_install_runtime( share/qgsjet_crmc.param )
 
-atlas_install_runtime( ${CRMC_ROOT}/tabs/sectnu-II-04 ${CRMC_ROOT}/tabs/qgsdat-II-04.lzma)
+atlas_install_runtime( ${CRMC_LCGROOT}/tabs/sectnu-II-04
+   ${CRMC_LCGROOT}/tabs/qgsdat-II-04.lzma )
diff --git a/HLT/Trigger/TrigControl/TrigCommon/bin/athenaHLT.py b/HLT/Trigger/TrigControl/TrigCommon/bin/athenaHLT.py
index 1a8e7bb85926709e063828dc35d2a0678218d79c..e2618adc6dd883dda5a7ad9fd4d45e67508f6bef 100755
--- a/HLT/Trigger/TrigControl/TrigCommon/bin/athenaHLT.py
+++ b/HLT/Trigger/TrigControl/TrigCommon/bin/athenaHLT.py
@@ -76,7 +76,7 @@ def arg_ros2rob(s):
       if type(ros2robdict) is not dict:
          raise(ValueError)
       return ros2robdict
-   except:
+   except Exception:
       sys.stderr.write("ERROR! ros2rob cannot be evaluated as it is not a proper python dictionary: {}\n".format(s))
       sys.stderr.write("Using empty ros2rob dictionary instead\n")
       return {}
diff --git a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/SCT_CalibAlgs/SCTCalib.h b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/SCT_CalibAlgs/SCTCalib.h
index b840b0e6d07888a74160b48aa72f900607f7da4a..c353f51b28e530676acf183347f534e63bb21205 100644
--- a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/SCT_CalibAlgs/SCTCalib.h
+++ b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/SCT_CalibAlgs/SCTCalib.h
@@ -299,7 +299,7 @@ class SCTCalib : public AthAlgorithm {
       StatusCode
       writeModuleListToCool( const std::map< Identifier, std::set<Identifier> >& moduleListAll,
                              const std::map< Identifier, std::set<Identifier> >& moduleListNew,
-                             const std::map< Identifier, std::set<Identifier> >& moduleListRef ) const;
+                             const std::map< Identifier, std::set<Identifier> >& moduleListRef );
       std::string
       getStripList( const std::set<Identifier>& stripIdList ) const;
 
diff --git a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCTCalib.cxx b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCTCalib.cxx
index bd76a2fc46165a40c53282b6e056c4b814128cc5..a1b99d0424b4b45d533f50f40f569d333bd11109 100644
--- a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCTCalib.cxx
+++ b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCTCalib.cxx
@@ -2709,7 +2709,7 @@ SCTCalib::addStripsToList( Identifier& waferId, std::set<Identifier>& stripIdLis
 StatusCode
 SCTCalib::writeModuleListToCool( const std::map< Identifier, std::set<Identifier> >& moduleListAll,
                                  const std::map< Identifier, std::set<Identifier> >& moduleListNew,
-                                 const std::map< Identifier, std::set<Identifier> >& moduleListRef ) const {
+                                 const std::map< Identifier, std::set<Identifier> >& moduleListRef ) {
    //--- Write out strips
    float noisyStripThr = m_noisyStripThrDef?(m_noisyStripThrOffline):(m_noisyStripThrOnline);
    int nDefects = 0;
diff --git a/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/TRT_CalibAlgs/TRT_StrawStatus.h b/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/TRT_CalibAlgs/TRT_StrawStatus.h
index e275dc23583a6a7e708f84b41dca59ea5dd6e240..2bf037d4f85aee7adac85eb74ca60541b683735d 100644
--- a/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/TRT_CalibAlgs/TRT_StrawStatus.h
+++ b/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/TRT_CalibAlgs/TRT_StrawStatus.h
@@ -26,6 +26,7 @@
 #include <cstdlib>
 #include <string>
 #include <vector>
+#include <array>
 
 class AtlasDetectorID;
 class Identifier;
@@ -82,28 +83,13 @@ namespace InDet
 		  number boards 0-9 barrel, 0-19 endcap (first 12 on A wheels, ordering from smaller to larger |z|)
 		  number chips 0-103 barrel, 0-239 endcap
 		  number pads: chips x 2 */
-		  
-      int m_nBarrelStraws; // 1642
-      int m_nEndcapStraws; // 3840
-      int m_nAllStraws; // 1642+3840=5484
-	  
-      int m_nBarrelBoards; // 9
-      int m_nEndcapBoards; // 20
-      int m_nAllBoards; // 29
-
-      int m_nBarrelChips; // 104
-      int m_nEndcapChips; // 240
-      int m_nAllChips; // 344
-
-      int m_nBarrelPads; // 2 x N of chips
-      int m_nEndcapPads; 
-      int m_nAllPads; 
-	  
+		  	  
       int m_nEvents; // count N of processed events, needed for normalization
       int m_runNumber;
- 
+
       /** accumulate hits, last index: 0 - all hits, 1 - hits on track, 2 - all HT (TR) hits, 3 - HT (TR) hits on track */	 
-      int m_accumulateHits[2][32][5482][6];
+      typedef std::array<std::array<std::array<std::array<int,6>,5482>,32>,2> ACCHITS_t;
+      ACCHITS_t *m_accumulateHits;
 
       const TRT_ID *m_TRTHelper;
 
diff --git a/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/src/TRT_StrawStatus.cxx b/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/src/TRT_StrawStatus.cxx
index 662fc15f4aad74accf61fc3ecb182d0055c37e06..0fe5033c13741931115d1c694cc51bf04e729f44 100644
--- a/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/src/TRT_StrawStatus.cxx
+++ b/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/src/TRT_StrawStatus.cxx
@@ -37,16 +37,29 @@
 
 int last_lumiBlock0=-99;
 
+const size_t nBarrelStraws { 1642 };
+const size_t nEndcapStraws { 3840 };
+const size_t nAllStraws    { nBarrelStraws + nEndcapStraws };
+
+const size_t nBarrelBoards { 9 };
+const size_t nEndcapBoards { 20 };
+const size_t nAllBoards    { nBarrelBoards + nEndcapBoards };
+
+const size_t nBarrelChips  { 104 };
+const size_t nEndcapChips  { 240 };
+const size_t nAllChips     { nBarrelChips + nAllChips };
+
+const size_t nBarrelPads   { 2 * nBarrelChips };
+const size_t nEndcapPads   { 2 * nEndcapChips }; 
+const size_t nAllPads      { 2 * nAllChips }; 
+
 //================ Constructor =================================================
 
 InDet::TRT_StrawStatus::TRT_StrawStatus(const std::string& name, ISvcLocator* pSvcLocator)
 :
 AthAlgorithm(name,pSvcLocator),
-m_nBarrelStraws(1642), m_nEndcapStraws(3840), m_nAllStraws(5482),
-m_nBarrelBoards(9), m_nEndcapBoards(20), m_nAllBoards(29),
-m_nBarrelChips(104), m_nEndcapChips(240), m_nAllChips(344),
-m_nBarrelPads(208), m_nEndcapPads(480), m_nAllPads(688),
 m_nEvents(0), m_runNumber(0),
+m_accumulateHits(0),
 m_TRTHelper(0),
 m_mapSvc("TRT_HWMappingSvc",name),
 m_DCSSvc("TRT_DCS_ConditionsSvc",name),
@@ -64,8 +77,8 @@ m_printDetailedInformation(0) // print the information on mapping as well as whi
     declareProperty("HWMapSvc", m_mapSvc);
     declareProperty("InDetTRT_DCS_ConditionsSvc",m_DCSSvc);
     declareProperty("locR_cut",                 m_locR_cut );
-    declareProperty("printDetailedInformation", m_printDetailedInformation); 
-    clear();  
+    declareProperty("printDetailedInformation", m_printDetailedInformation);
+
 }
 
 //================ Destructor =================================================
@@ -78,6 +91,11 @@ InDet::TRT_StrawStatus::~TRT_StrawStatus()
 
 StatusCode InDet::TRT_StrawStatus::initialize()
 {
+
+  m_accumulateHits = new ACCHITS_t;
+  assert( (*m_accumulateHits)[0][0].size() == nAllStraws );
+  clear();
+  
   // Code entered here will be executed once at program start.
   // Initialize ReadHandleKey
   ATH_CHECK(m_eventInfoKey.initialize());
@@ -100,6 +118,7 @@ StatusCode InDet::TRT_StrawStatus::finalize(){
     reportResults();
     if (m_printDetailedInformation) printDetailedInformation();
     // Code entered here will be executed once at the end of the program run.
+    delete m_accumulateHits;
     return StatusCode::SUCCESS;
 }
 
@@ -218,8 +237,8 @@ StatusCode InDet::TRT_StrawStatus::execute(){
             
             Identifier id = driftCircle->identify();
             int index[6]; myStrawIndex(id, index); // side, layer, phi, straw_layer, straw_within_layer, straw_index
-            m_accumulateHits[(index[0]>0)?0:1][index[2]][index[5]][1]++; // accumulate hits on track
-            if (driftCircle->highLevel()) m_accumulateHits[(index[0]>0)?0:1][index[2]][index[5]][3]++; // accumulate hits on track
+            (*m_accumulateHits)[(index[0]>0)?0:1][index[2]][index[5]][1]++; // accumulate hits on track
+            if (driftCircle->highLevel()) (*m_accumulateHits)[(index[0]>0)?0:1][index[2]][index[5]][3]++; // accumulate hits on track
             
         } // end trackStatesIt loop
         
@@ -255,8 +274,8 @@ StatusCode InDet::TRT_StrawStatus::execute(){
         for (DataVector<TRT_RDORawData>::const_iterator trtIt = TRTCollection->begin(); trtIt != TRTCollection->end(); trtIt++) {
             Identifier id = (*trtIt)->identify();
             int index[6]; myStrawIndex(id, index); // side, layer, phi, straw_layer, straw_within_layer, straw_index
-            m_accumulateHits[(index[0]>0)?0:1][index[2]][index[5]][0]++; // accumulate all hits 
-            if ((*trtIt)->highLevel()) m_accumulateHits[(index[0]>0)?0:1][index[2]][index[5]][2]++; // accumulate TR hits
+            (*m_accumulateHits)[(index[0]>0)?0:1][index[2]][index[5]][0]++; // accumulate all hits 
+            if ((*trtIt)->highLevel()) (*m_accumulateHits)[(index[0]>0)?0:1][index[2]][index[5]][2]++; // accumulate TR hits
             
             if (std::find(holeIdentifiers.begin(), holeIdentifiers.end(), id) != holeIdentifiers.end())  // a hole was found on the same straw, but hits is there
                 holeIdentifiersWithHits.push_back( id );            
@@ -273,10 +292,10 @@ StatusCode InDet::TRT_StrawStatus::execute(){
 
         int index[6]; myStrawIndex(id, index); // side, layer, phi, straw_layer, straw_within_layer, straw_index
         
-        m_accumulateHits[(index[0]>0)?0:1][index[2]][index[5]][4]++;
+        (*m_accumulateHits)[(index[0]>0)?0:1][index[2]][index[5]][4]++;
         
         if (std::find(holeIdentifiersWithHits.begin(), holeIdentifiersWithHits.end(), id) != holeIdentifiersWithHits.end())
-            m_accumulateHits[(index[0]>0)?0:1][index[2]][index[5]][5]++;
+          (*m_accumulateHits)[(index[0]>0)?0:1][index[2]][index[5]][5]++;
     }
     
     //================ End loop over all hits 
@@ -317,8 +336,7 @@ StatusCode InDet::TRT_StrawStatus::execute(){
 
 void InDet::TRT_StrawStatus::clear() {
     m_nEvents = 0;
-    for (int i=0; i<2; i++) for (int j=0; j<32; j++) for (int k=0; k<m_nAllStraws; k++) for (int m=0; m<6; m++)
-        m_accumulateHits[i][j][k][m] = 0;
+    *m_accumulateHits = {};
     return;
 }
 
@@ -328,11 +346,11 @@ void InDet::TRT_StrawStatus::reportResults() {
     snprintf(fileName, 299,"%s.%07d_newFormat.txt", m_fileName.c_str(), m_runNumber);
     FILE *f = fopen(fileName, "w");
     fprintf(f, "%d %d %d %d %d %d %d %d %d \n", 0, 0, 0, 0, 0, 0, 0, 0, m_nEvents);
-    for (int i=0; i<2; i++) for (int j=0; j<32; j++) for (int k=0; k<m_nAllStraws; k++) {
+    for (size_t i=0; i<2; i++) for (size_t j=0; j<32; j++) for (size_t k=0; k<nAllStraws; k++) {
         int side = (i>0)?-1:1;
         if (k>=1642) side *= 2;
-        fprintf(f, "%d %d %d", side, j, k);
-        for (int m=0; m<6; m++) fprintf(f, " %d", m_accumulateHits[i][j][k][m]);
+        fprintf(f, "%d %zu %zu", side, j, k);
+        for (int m=0; m<6; m++) fprintf(f, " %d", (*m_accumulateHits)[i][j][k][m]);
         fprintf(f, "\n");   
     }
     fclose(f);
diff --git a/InnerDetector/InDetConditions/InDetConditionsSummaryService/InDetConditionsSummaryService/ISiliconConditionsSvc.h b/InnerDetector/InDetConditions/InDetConditionsSummaryService/InDetConditionsSummaryService/ISiliconConditionsSvc.h
deleted file mode 100644
index 6a611702298888cb56b7cb602519a3bd68e9fc6c..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetConditions/InDetConditionsSummaryService/InDetConditionsSummaryService/ISiliconConditionsSvc.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-/**
- * @file ISiliconConditionsSvc.h
- * @author shaun.roe@cern.ch
-**/
-#ifndef ISiliconConditionsSvc_h
-#define ISiliconConditionsSvc_h
-//Gaudi Includes
-#include "GaudiKernel/IInterface.h"
-// STL includes
-#include <list>
-#include <string>
-
-//forward declarations
-class Identifier;
-class IdentifierHash;
-/**
- * @class ISiliconConditionsSvc
- * Interface class for service providing basic silicon parameters
-**/
-class ISiliconConditionsSvc: virtual public IInterface{
-public:
-  virtual ~ISiliconConditionsSvc(){}
-  static const InterfaceID & interfaceID(); //!< reimplemented from IInterface
-  //@name methods taking the detector identifier
-  //@{
-  virtual  float temperature(const Identifier & detectorElement)=0;
-  virtual  float biasVoltage(const Identifier & detectorElement)=0;
-  virtual  float depletionVoltage(const Identifier & detectorElement)=0;
-  //@}
-  //@name methods taking the detector hash identifier
-  //@{
-  virtual  float temperature(const IdentifierHash & detectorElement)=0;
-  virtual  float biasVoltage(const IdentifierHash & detectorElement)=0;
-  virtual  float depletionVoltage(const IdentifierHash & detectorElement)=0;
-  //@}
-
-  /// IOV CallBack
-  virtual StatusCode callBack(int&, std::list<std::string>&) = 0;
-  /// Query whether a CallBack has been registered.
-  virtual bool hasCallBack() = 0;
-
-};
-
-inline const InterfaceID & ISiliconConditionsSvc::interfaceID(){
-  static const InterfaceID IID_ISiliconConditionsSvc("ISiliconConditionsSvc",1,0);
-  return IID_ISiliconConditionsSvc;
-}
-#endif
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ConditionsParameterCondAlg.cxx b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ConditionsParameterCondAlg.cxx
index 22c4372db017c3a2297a52672697aeff3bebd790..5ff4dcbc25d82ea7bb2ac993c2bf759a569b6268 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ConditionsParameterCondAlg.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ConditionsParameterCondAlg.cxx
@@ -137,7 +137,7 @@ StatusCode SCT_ConditionsParameterCondAlg::execute(const EventContext& ctx) cons
   for (; modItr != modEnd; modItr += nChipsPerModule) {
     // Get SN and identifiers (the channel number is serial number+1)
     const unsigned int truncatedSerialNumber{modItr->first - 1};
-    const IdentifierHash& moduleHash{m_cablingTool->getHashFromSerialNumber(truncatedSerialNumber)};
+    const IdentifierHash& moduleHash{m_cablingTool->getHashFromSerialNumber(truncatedSerialNumber, ctx)};
     if (not moduleHash.is_valid()) continue;
     // Loop over chips within module
    
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ConditionsSummaryTestAlg.cxx b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ConditionsSummaryTestAlg.cxx
index febb7241ef5d355bfd25e527bc5dc3c07a7c96f2..a27ba4ea7ae344531cb4bb507796c704f6c436f7 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ConditionsSummaryTestAlg.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ConditionsSummaryTestAlg.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 /**
@@ -21,7 +21,7 @@
 
 SCT_ConditionsSummaryTestAlg::SCT_ConditionsSummaryTestAlg(const std::string& name,
                                                            ISvcLocator* pSvcLocator) :
-  AthAlgorithm(name, pSvcLocator) {
+  AthReentrantAlgorithm(name, pSvcLocator) {
   //nop
 }
 
@@ -35,7 +35,7 @@ SCT_ConditionsSummaryTestAlg::initialize() {
 
 //Execute
 StatusCode 
-SCT_ConditionsSummaryTestAlg::execute() {
+SCT_ConditionsSummaryTestAlg::execute(const EventContext& /*ctx*/) const {
   //This method is only used to test the summary service, and only used within this package,
   // so the INFO level messages have no impact on performance of these services when used by clients
   ATH_MSG_INFO("Calling execute");
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ConditionsSummaryTestAlg.h b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ConditionsSummaryTestAlg.h
index 5eedecd35d71979c22814ebb3874a96a97baaac3..1e4a6178a265d5733d5c83a09c0f66fafc7e0c27 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ConditionsSummaryTestAlg.h
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ConditionsSummaryTestAlg.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 /**
@@ -15,7 +15,7 @@
 #define SCT_ConditionsSummaryTestAlg_H 
 
 //Athena
-#include "AthenaBaseComps/AthAlgorithm.h"
+#include "AthenaBaseComps/AthReentrantAlgorithm.h"
 
 #include "InDetConditionsSummaryService/IInDetConditionsTool.h"
 
@@ -26,13 +26,13 @@
 #include <string>
 
 ///Example class to show calling the SCT_ConditionsSummaryTool
-class SCT_ConditionsSummaryTestAlg : public AthAlgorithm {
+class SCT_ConditionsSummaryTestAlg : public AthReentrantAlgorithm {
  public:
   SCT_ConditionsSummaryTestAlg(const std::string &name,ISvcLocator *pSvcLocator) ;
   virtual ~SCT_ConditionsSummaryTestAlg() = default;
 
   StatusCode initialize() override;
-  StatusCode execute() override;
+  StatusCode execute(const EventContext& ctx) const override;
   StatusCode finalize() override;
    
  private:
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ConfigurationCondAlg.cxx b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ConfigurationCondAlg.cxx
index aa37ee1ed8135e2fa4fab7dedbd6a5a666f1881c..99e0ea5313e1268835f72e9d47ba4b1c1f3ff4b1 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ConfigurationCondAlg.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ConfigurationCondAlg.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "SCT_ConfigurationCondAlg.h"
@@ -28,7 +28,7 @@ const std::string SCT_ConfigurationCondAlg::s_coolModuleFolderName2{"/SCT/DAQ/Co
 const std::string SCT_ConfigurationCondAlg::s_coolMurFolderName2{"/SCT/DAQ/Config/MUR"};
 
 SCT_ConfigurationCondAlg::SCT_ConfigurationCondAlg(const std::string& name, ISvcLocator* pSvcLocator)
-  : ::AthAlgorithm(name, pSvcLocator)
+  : ::AthReentrantAlgorithm(name, pSvcLocator)
   , m_condSvc{"CondSvc", name}
   , m_pHelper{nullptr}
 {
@@ -77,11 +77,11 @@ StatusCode SCT_ConfigurationCondAlg::initialize() {
   return StatusCode::SUCCESS;
 }
 
-StatusCode SCT_ConfigurationCondAlg::execute() {
+StatusCode SCT_ConfigurationCondAlg::execute(const EventContext& ctx) const {
   ATH_MSG_DEBUG("execute " << name());
 
   // Write Cond Handle
-  SG::WriteCondHandle<SCT_ConfigurationCondData> writeHandle{m_writeKey};
+  SG::WriteCondHandle<SCT_ConfigurationCondData> writeHandle{m_writeKey, ctx};
   // Do we have a valid Write Cond Handle for current time?
   if (writeHandle.isValid()) {
     ATH_MSG_DEBUG("CondHandle " << writeHandle.fullKey() << " is already valid."
@@ -97,7 +97,7 @@ StatusCode SCT_ConfigurationCondAlg::execute() {
 
   // Fill module data
   EventIDRange rangeModule;
-  if (fillModuleData(writeCdo.get(), rangeModule).isFailure()) {
+  if (fillModuleData(writeCdo.get(), rangeModule, ctx).isFailure()) {
     return StatusCode::FAILURE;
   }
 
@@ -105,7 +105,7 @@ StatusCode SCT_ConfigurationCondAlg::execute() {
   EventIDRange rangeChannel;
   EventIDRange rangeMur;
   EventIDRange rangeDetEle;
-  if (fillChannelData(writeCdo.get(), rangeChannel, rangeMur, rangeDetEle).isFailure()) {
+  if (fillChannelData(writeCdo.get(), rangeChannel, rangeMur, rangeDetEle, ctx).isFailure()) {
     return StatusCode::FAILURE;
   }
 
@@ -128,7 +128,7 @@ StatusCode SCT_ConfigurationCondAlg::execute() {
 }
 
 // Fill bad strip, chip and link info
-StatusCode SCT_ConfigurationCondAlg::fillChannelData(SCT_ConfigurationCondData* writeCdo, EventIDRange& rangeChannel, EventIDRange& rangeMur, EventIDRange& rangeDetEle) {
+StatusCode SCT_ConfigurationCondAlg::fillChannelData(SCT_ConfigurationCondData* writeCdo, EventIDRange& rangeChannel, EventIDRange& rangeMur, EventIDRange& rangeDetEle, const EventContext& ctx) const {
   // Check if the pointer of derived conditions object is valid.
   if (writeCdo==nullptr) {
     ATH_MSG_FATAL("Pointer of derived conditions object is null");
@@ -165,10 +165,10 @@ StatusCode SCT_ConfigurationCondAlg::fillChannelData(SCT_ConfigurationCondData*
   writeCdo->clearBadStripIds();
   writeCdo->clearBadChips();
   // Fill link status
-  if (fillLinkStatus(writeCdo, rangeMur).isFailure()) return StatusCode::FAILURE;
+  if (fillLinkStatus(writeCdo, rangeMur, ctx).isFailure()) return StatusCode::FAILURE;
 
   // Get channel folder for link info 
-  SG::ReadCondHandle<CondAttrListVec> readHandle{m_readKeyChannel};
+  SG::ReadCondHandle<CondAttrListVec> readHandle{m_readKeyChannel, ctx};
   const CondAttrListVec* readCdo{*readHandle};
   if (readCdo==nullptr) {
     ATH_MSG_FATAL("Could not find MUR configuration data: " << m_readKeyChannel.key());
@@ -183,7 +183,7 @@ StatusCode SCT_ConfigurationCondAlg::fillChannelData(SCT_ConfigurationCondData*
   }
 
   // Get SCT_DetectorElementCollection
-  SG::ReadCondHandle<InDetDD::SiDetectorElementCollection> sctDetEle(m_SCTDetEleCollKey);
+  SG::ReadCondHandle<InDetDD::SiDetectorElementCollection> sctDetEle{m_SCTDetEleCollKey, ctx};
   const InDetDD::SiDetectorElementCollection* elements(sctDetEle.retrieve());
   if (elements==nullptr) {
     ATH_MSG_FATAL(m_SCTDetEleCollKey.fullKey() << " could not be retrieved");
@@ -203,7 +203,7 @@ StatusCode SCT_ConfigurationCondAlg::fillChannelData(SCT_ConfigurationCondData*
     // Get SN and identifiers (the channel number is serial number+1 for the CoraCool folders but =serial number 
     // for Cool Vector Payload ; i.e. Run 1 and Run 2 resp.)
     const unsigned int truncatedSerialNumber{run1 ? (itr->first-1) : (itr->first)};
-    const IdentifierHash& hash{m_cablingTool->getHashFromSerialNumber(truncatedSerialNumber)};
+    const IdentifierHash& hash{m_cablingTool->getHashFromSerialNumber(truncatedSerialNumber, ctx)};
     if (not hash.is_valid()) continue;
     const Identifier waferId{m_pHelper->wafer_id(hash)};
     const Identifier moduleId{m_pHelper->module_id(waferId)};
@@ -255,7 +255,7 @@ StatusCode SCT_ConfigurationCondAlg::fillChannelData(SCT_ConfigurationCondData*
         thisChip->appendBadStripsToVector(badStripsVec);
         // Loop over bad strips and insert strip ID into set
         for (const auto& thisBadStrip:badStripsVec) {
-          const Identifier stripId{getStripId(truncatedSerialNumber, thisChip->id(), thisBadStrip, elements)};
+          const Identifier stripId{getStripId(truncatedSerialNumber, thisChip->id(), thisBadStrip, elements, ctx)};
           // If in rough order, may be better to call with itr of previous insertion as a suggestion    
           if (stripId.is_valid()) writeCdo->setBadStripId(stripId, // strip Identifier
                                                           thisChip->id()<6 ? hash : oppWaferHash, // wafer IdentifierHash
@@ -293,7 +293,7 @@ StatusCode SCT_ConfigurationCondAlg::fillChannelData(SCT_ConfigurationCondData*
 }
 
 // Fill bad module info
-StatusCode SCT_ConfigurationCondAlg::fillModuleData(SCT_ConfigurationCondData* writeCdo, EventIDRange& rangeModule) {
+StatusCode SCT_ConfigurationCondAlg::fillModuleData(SCT_ConfigurationCondData* writeCdo, EventIDRange& rangeModule, const EventContext& ctx) const {
   // Check if the pointer of derived conditions object is valid.
   if (writeCdo==nullptr) {
     ATH_MSG_FATAL("Pointer of derived conditions object is null");
@@ -310,7 +310,7 @@ StatusCode SCT_ConfigurationCondAlg::fillModuleData(SCT_ConfigurationCondData* w
   writeCdo->clearBadWaferIds();
 
   // Get Module folder
-  SG::ReadCondHandle<CondAttrListVec> readHandle{m_readKeyModule};
+  SG::ReadCondHandle<CondAttrListVec> readHandle{m_readKeyModule, ctx};
   const CondAttrListVec* readCdo{*readHandle};
   if (readCdo==nullptr) {
     ATH_MSG_FATAL("Could not find MUR configuration data: " << m_readKeyModule.key());
@@ -336,14 +336,14 @@ StatusCode SCT_ConfigurationCondAlg::fillModuleData(SCT_ConfigurationCondData* w
     // Get SN and identifiers (the channel number is serial number+1 for the CoraCool folders but =serial number 
     //  for Cool Vector Payload ; i.e. Run 1 and Run 2 resp.)
     const unsigned int truncatedSerialNumber{run1 ? (itr->first-1) : (itr->first)};
-    const IdentifierHash& hash{m_cablingTool->getHashFromSerialNumber(truncatedSerialNumber)};
+    const IdentifierHash& hash{m_cablingTool->getHashFromSerialNumber(truncatedSerialNumber, ctx)};
     ++totalNumberOfModules;
     if (not hash.is_valid()) continue;
 
     Identifier waferId{m_pHelper->wafer_id(hash)};
     ++totalNumberOfValidModules;
     IdentifierHash oppWaferHash;
-    m_pHelper->get_other_side(m_cablingTool->getHashFromSerialNumber(truncatedSerialNumber), oppWaferHash);
+    m_pHelper->get_other_side(m_cablingTool->getHashFromSerialNumber(truncatedSerialNumber, ctx), oppWaferHash);
     const Identifier oppWaferId{m_pHelper->wafer_id(oppWaferHash)};
     const Identifier moduleId{m_pHelper->module_id(waferId)};
     // Get AttributeList from second (see https://svnweb.cern.ch/trac/lcgcoral/browser/coral/trunk/src/CoralBase/CoralBase/AttributeList.h )
@@ -366,7 +366,7 @@ StatusCode SCT_ConfigurationCondAlg::fillModuleData(SCT_ConfigurationCondData* w
 }
 
 // Fill link info
-StatusCode SCT_ConfigurationCondAlg::fillLinkStatus(SCT_ConfigurationCondData* writeCdo, EventIDRange& rangeMur) {
+StatusCode SCT_ConfigurationCondAlg::fillLinkStatus(SCT_ConfigurationCondData* writeCdo, EventIDRange& rangeMur, const EventContext& ctx) const {
   // Check if the pointer of derived conditions object is valid.
   if (writeCdo==nullptr) {
     ATH_MSG_FATAL("Pointer of derived conditions object is null");
@@ -380,7 +380,7 @@ StatusCode SCT_ConfigurationCondAlg::fillLinkStatus(SCT_ConfigurationCondData* w
   writeCdo->clearBadLinks();
 
   // Get MUR folder for link info 
-  SG::ReadCondHandle<CondAttrListVec> readHandle{m_readKeyMur};
+  SG::ReadCondHandle<CondAttrListVec> readHandle{m_readKeyMur, ctx};
   const CondAttrListVec* readCdo{*readHandle};
   if (readCdo==nullptr) {
     ATH_MSG_FATAL("Could not find MUR configuration data: " << m_readKeyMur.key());
@@ -412,7 +412,7 @@ StatusCode SCT_ConfigurationCondAlg::fillLinkStatus(SCT_ConfigurationCondData* w
     const SCT_SerialNumber serialNumber{ullSerialNumber};
     if (not serialNumber.is_valid()) continue;
     // Check module hash
-    const IdentifierHash& hash{m_cablingTool->getHashFromSerialNumber(serialNumber.to_uint())};
+    const IdentifierHash& hash{m_cablingTool->getHashFromSerialNumber(serialNumber.to_uint(), ctx)};
     if (not hash.is_valid()) continue;
 
     int link0{run1 ? (itr->second[link0Index].data<int>()) : static_cast<int>(itr->second[link0Index].data<unsigned char>())};
@@ -430,7 +430,7 @@ StatusCode SCT_ConfigurationCondAlg::fillLinkStatus(SCT_ConfigurationCondData* w
 // Construct the strip ID from the module SN, chip number and strip number
 Identifier 
 SCT_ConfigurationCondAlg::getStripId(const unsigned int truncatedSerialNumber, const unsigned int chipNumber, const unsigned int stripNumber,
-                                     const InDetDD::SiDetectorElementCollection* elements) const {
+                                     const InDetDD::SiDetectorElementCollection* elements, const EventContext& ctx) const {
   Identifier waferId;
   const Identifier invalidIdentifier; //initialiser creates invalid Id
   unsigned int strip{0};
@@ -443,11 +443,11 @@ SCT_ConfigurationCondAlg::getStripId(const unsigned int truncatedSerialNumber, c
   // returns the side 0 hash, so we use the helper for side 1
 
   if (chipNumber<6) {
-    waferHash = m_cablingTool->getHashFromSerialNumber(truncatedSerialNumber);
+    waferHash = m_cablingTool->getHashFromSerialNumber(truncatedSerialNumber, ctx);
     strip = chipNumber * stripsPerChip + stripNumber;
     if (waferHash.is_valid()) waferId = m_pHelper->wafer_id(waferHash);
   } else {
-    m_pHelper->get_other_side(m_cablingTool->getHashFromSerialNumber(truncatedSerialNumber), waferHash);
+    m_pHelper->get_other_side(m_cablingTool->getHashFromSerialNumber(truncatedSerialNumber, ctx), waferHash);
     strip = (chipNumber - 6) * stripsPerChip + stripNumber;
     if (waferHash.is_valid()) waferId = m_pHelper->wafer_id(waferHash);
   }
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ConfigurationCondAlg.h b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ConfigurationCondAlg.h
index e38ca85968bbb5d7015720e4ea01b6d413edbc69..d7c558be391256451ad91a2679d74b799b960c78 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ConfigurationCondAlg.h
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ConfigurationCondAlg.h
@@ -1,11 +1,11 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */ 
 
 #ifndef SCT_CONFIGURATIONCONDALG
 #define SCT_CONFIGURATIONCONDALG
 
-#include "AthenaBaseComps/AthAlgorithm.h"
+#include "AthenaBaseComps/AthReentrantAlgorithm.h"
 
 #include "AthenaPoolUtilities/CondAttrListVec.h"
 #include "Identifier/Identifier.h"
@@ -25,24 +25,24 @@
 class EventIDRange;
 class SCT_ID;
 
-class SCT_ConfigurationCondAlg : public AthAlgorithm 
+class SCT_ConfigurationCondAlg : public AthReentrantAlgorithm 
 {  
  public:
   SCT_ConfigurationCondAlg(const std::string& name, ISvcLocator* pSvcLocator);
   virtual ~SCT_ConfigurationCondAlg() = default;
   StatusCode initialize() override;
-  StatusCode execute() override;
+  StatusCode execute(const EventContext& ctx) const override;
   StatusCode finalize() override;
 
  private:
   /** enum for constants*/
   enum {badLink=255, stripsPerChip=128, lastStrip=767};
 
-  StatusCode fillChannelData(SCT_ConfigurationCondData* writeCdo, EventIDRange& rangeChannel, EventIDRange& rangeMur, EventIDRange& rangeDetEle);
-  StatusCode fillModuleData(SCT_ConfigurationCondData* writeCdo, EventIDRange& rangeModule);
-  StatusCode fillLinkStatus(SCT_ConfigurationCondData* writeCdo, EventIDRange& rangeMur);
+  StatusCode fillChannelData(SCT_ConfigurationCondData* writeCdo, EventIDRange& rangeChannel, EventIDRange& rangeMur, EventIDRange& rangeDetEle, const EventContext& ctx) const;
+  StatusCode fillModuleData(SCT_ConfigurationCondData* writeCdo, EventIDRange& rangeModule, const EventContext& ctx) const;
+  StatusCode fillLinkStatus(SCT_ConfigurationCondData* writeCdo, EventIDRange& rangeMur, const EventContext& ctx) const;
   Identifier getStripId(const unsigned int truncatedSerialNumber, const unsigned int chipNumber, const unsigned int stripNumber,
-                        const InDetDD::SiDetectorElementCollection* elements) const;
+                        const InDetDD::SiDetectorElementCollection* elements, const EventContext& ctx) const;
 
   static const std::string s_coolChannelFolderName;
   static const std::string s_coolChannelFolderName2;
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ConfigurationConditionsTestAlg.cxx b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ConfigurationConditionsTestAlg.cxx
index e271bfd2b15bcf6674ad082c47c3886f1ec1998b..b5f5886a5264a939409c4701f85df0e811ea42d8 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ConfigurationConditionsTestAlg.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ConfigurationConditionsTestAlg.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 /** @file Test class for SCT_ConfigurationConditionsSvc
@@ -14,7 +14,7 @@
 #include "InDetIdentifier/SCT_ID.h"
 
 SCT_ConfigurationConditionsTestAlg::SCT_ConfigurationConditionsTestAlg(const std::string& name, ISvcLocator* pSvcLocator) : 
-  AthAlgorithm(name, pSvcLocator),
+  AthReentrantAlgorithm(name, pSvcLocator),
   m_sctId{nullptr}
 {
 }
@@ -29,7 +29,7 @@ StatusCode SCT_ConfigurationConditionsTestAlg::initialize() {
   return StatusCode::SUCCESS;
 } 
 
-StatusCode SCT_ConfigurationConditionsTestAlg::execute() {
+StatusCode SCT_ConfigurationConditionsTestAlg::execute(const EventContext& /*ctx*/) const {
   ATH_MSG_INFO("in execute()");
 
   // Bad modules
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ConfigurationConditionsTestAlg.h b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ConfigurationConditionsTestAlg.h
index f5b54ddf1a8bd4877af81281520ba0266022b886..714a7edd501d0b53cbbb0754f21dac8dfd1ca115 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ConfigurationConditionsTestAlg.h
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ConfigurationConditionsTestAlg.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 /** 
@@ -11,7 +11,7 @@
 #define SCT_TestConfigConditions_H
 
 // Athena includes
-#include "AthenaBaseComps/AthAlgorithm.h"
+#include "AthenaBaseComps/AthReentrantAlgorithm.h"
 #include "SCT_ConditionsTools/ISCT_ConfigurationConditionsTool.h"
 
 // Gaudi includes
@@ -27,7 +27,7 @@ class SCT_ID;
  * This class acts as a test/sample client for the SCT_ConfigurationSConditionsSvc class. 
  */
 
-class SCT_ConfigurationConditionsTestAlg : public AthAlgorithm {
+class SCT_ConfigurationConditionsTestAlg : public AthReentrantAlgorithm {
  public:
   // Structors
   SCT_ConfigurationConditionsTestAlg (const std::string& name, ISvcLocator* pSvcLocator); 
@@ -35,7 +35,7 @@ class SCT_ConfigurationConditionsTestAlg : public AthAlgorithm {
   
   // Standard Gaudi functions
   StatusCode initialize() override;
-  StatusCode execute() override;
+  StatusCode execute(const EventContext& ctx) const override;
   StatusCode finalize() override;
   
  private:
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_DCSConditionsHVCondAlg.cxx b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_DCSConditionsHVCondAlg.cxx
index 0111d797a0e85fd8fdc0be5e780da31915e6025c..b1570fbe82da872bf1dcd509388acd5a6e60f99c 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_DCSConditionsHVCondAlg.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_DCSConditionsHVCondAlg.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "SCT_DCSConditionsHVCondAlg.h"
@@ -11,7 +11,7 @@
 #include <memory>
 
 SCT_DCSConditionsHVCondAlg::SCT_DCSConditionsHVCondAlg(const std::string& name, ISvcLocator* pSvcLocator)
-  : ::AthAlgorithm(name, pSvcLocator)
+  : ::AthReentrantAlgorithm(name, pSvcLocator)
   , m_condSvc{"CondSvc", name}
 {
 }
@@ -36,7 +36,7 @@ StatusCode SCT_DCSConditionsHVCondAlg::initialize() {
   return StatusCode::SUCCESS;
 }
 
-StatusCode SCT_DCSConditionsHVCondAlg::execute() {
+StatusCode SCT_DCSConditionsHVCondAlg::execute(const EventContext& ctx) const {
   ATH_MSG_DEBUG("execute " << name());
 
   if (not m_returnHVTemp.value()) {
@@ -44,7 +44,7 @@ StatusCode SCT_DCSConditionsHVCondAlg::execute() {
   }
 
   // Write Cond Handle
-  SG::WriteCondHandle<SCT_DCSFloatCondData> writeHandle{m_writeKey};
+  SG::WriteCondHandle<SCT_DCSFloatCondData> writeHandle{m_writeKey, ctx};
   // Do we have a valid Write Cond Handle for current time?
   if (writeHandle.isValid()) {
     ATH_MSG_DEBUG("CondHandle " << writeHandle.fullKey() << " is already valid."
@@ -54,7 +54,7 @@ StatusCode SCT_DCSConditionsHVCondAlg::execute() {
   }
 
   // Read Cond Handle
-  SG::ReadCondHandle<CondAttrListCollection> readHandle{m_readKey};
+  SG::ReadCondHandle<CondAttrListCollection> readHandle{m_readKey, ctx};
   const CondAttrListCollection* readCdo{*readHandle}; 
   if (readCdo==nullptr) {
     ATH_MSG_FATAL("Null pointer to the read conditions object");
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_DCSConditionsHVCondAlg.h b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_DCSConditionsHVCondAlg.h
index 523b3684ef4ff3750010f25e94781df786126906..b7e88f4f9500d6354b4ad0be820c736b416ff885 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_DCSConditionsHVCondAlg.h
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_DCSConditionsHVCondAlg.h
@@ -1,11 +1,11 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */ 
 
 #ifndef SCT_DCSCONDITIONSHVCONDALG
 #define SCT_DCSCONDITIONSHVCONDALG
 
-#include "AthenaBaseComps/AthAlgorithm.h"
+#include "AthenaBaseComps/AthReentrantAlgorithm.h"
 
 #include "AthenaPoolUtilities/CondAttrListCollection.h"
 #include "SCT_ConditionsData/SCT_DCSFloatCondData.h"
@@ -15,13 +15,13 @@
 #include "GaudiKernel/ICondSvc.h"
 #include "GaudiKernel/Property.h"
 
-class SCT_DCSConditionsHVCondAlg : public AthAlgorithm 
+class SCT_DCSConditionsHVCondAlg : public AthReentrantAlgorithm 
 {  
  public:
   SCT_DCSConditionsHVCondAlg(const std::string& name, ISvcLocator* pSvcLocator);
   virtual ~SCT_DCSConditionsHVCondAlg() = default;
   StatusCode initialize() override;
-  StatusCode execute() override;
+  StatusCode execute(const EventContext& ctx) const override;
   StatusCode finalize() override;
 
  private:
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_DCSConditionsStatCondAlg.cxx b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_DCSConditionsStatCondAlg.cxx
index ec27d6f0eb22a10869fb48f699fb0f2837812af9..bcadec7c1ccfd2e500770ea6a6ec6a66caab0833 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_DCSConditionsStatCondAlg.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_DCSConditionsStatCondAlg.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "SCT_DCSConditionsStatCondAlg.h"
@@ -11,7 +11,7 @@
 #include <memory>
 
 SCT_DCSConditionsStatCondAlg::SCT_DCSConditionsStatCondAlg(const std::string& name, ISvcLocator* pSvcLocator)
-  : ::AthAlgorithm(name, pSvcLocator)
+  : ::AthReentrantAlgorithm(name, pSvcLocator)
   , m_condSvc{"CondSvc", name}
   , m_doState{true}
 {
@@ -53,7 +53,7 @@ StatusCode SCT_DCSConditionsStatCondAlg::initialize() {
   return StatusCode::SUCCESS;
 }
 
-StatusCode SCT_DCSConditionsStatCondAlg::execute() {
+StatusCode SCT_DCSConditionsStatCondAlg::execute(const EventContext& ctx) const {
   ATH_MSG_DEBUG("execute " << name());
 
   if (not m_doState) {
@@ -61,7 +61,7 @@ StatusCode SCT_DCSConditionsStatCondAlg::execute() {
   }
 
   // Write Cond Handle (state)
-  SG::WriteCondHandle<SCT_DCSStatCondData> writeHandle{m_writeKeyState};
+  SG::WriteCondHandle<SCT_DCSStatCondData> writeHandle{m_writeKeyState, ctx};
   // Do we have a valid Write Cond Handle for current time?
   if (writeHandle.isValid()) {
     ATH_MSG_DEBUG("CondHandle " << writeHandle.fullKey() << " is already valid."
@@ -71,7 +71,7 @@ StatusCode SCT_DCSConditionsStatCondAlg::execute() {
   }
 
   // Read Cond Handle (state)
-  SG::ReadCondHandle<CondAttrListCollection> readHandleState{m_readKeyState};
+  SG::ReadCondHandle<CondAttrListCollection> readHandleState{m_readKeyState, ctx};
   const CondAttrListCollection* readCdoState{*readHandleState}; 
   if (readCdoState==nullptr) {
     ATH_MSG_FATAL("Null pointer to the read conditions object (state)");
@@ -116,7 +116,7 @@ StatusCode SCT_DCSConditionsStatCondAlg::execute() {
 
   if (m_returnHVTemp.value()) {
     // Read Cond Handle 
-    SG::ReadCondHandle<CondAttrListCollection> readHandleHV{m_readKeyHV};
+    SG::ReadCondHandle<CondAttrListCollection> readHandleHV{m_readKeyHV, ctx};
     const CondAttrListCollection* readCdoHV{*readHandleHV};
     if (readCdoHV==nullptr) {
       ATH_MSG_FATAL("Null pointer to the read conditions object (HV)");
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_DCSConditionsStatCondAlg.h b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_DCSConditionsStatCondAlg.h
index d5e768158518283e2c104dd776e080fb0a42d367..28e69d6e05bbf43fb5f0835e67cc1e3348ba0f66 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_DCSConditionsStatCondAlg.h
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_DCSConditionsStatCondAlg.h
@@ -1,11 +1,11 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */ 
 
 #ifndef SCT_DCSCONDITIONSSTATCONDALG
 #define SCT_DCSCONDITIONSSTATCONDALG
 
-#include "AthenaBaseComps/AthAlgorithm.h"
+#include "AthenaBaseComps/AthReentrantAlgorithm.h"
 
 #include "StoreGate/ReadCondHandleKey.h"
 #include "AthenaPoolUtilities/CondAttrListCollection.h"
@@ -16,13 +16,13 @@
 #include "GaudiKernel/ICondSvc.h"
 #include "GaudiKernel/Property.h"
 
-class SCT_DCSConditionsStatCondAlg : public AthAlgorithm 
+class SCT_DCSConditionsStatCondAlg : public AthReentrantAlgorithm 
 {  
  public:
   SCT_DCSConditionsStatCondAlg(const std::string& name, ISvcLocator* pSvcLocator);
   virtual ~SCT_DCSConditionsStatCondAlg() = default;
   StatusCode initialize() override;
-  StatusCode execute() override;
+  StatusCode execute(const EventContext& ctx) const override;
   StatusCode finalize() override;
 
  private:
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_DCSConditionsTempCondAlg.cxx b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_DCSConditionsTempCondAlg.cxx
index 4b15949415a1fd136b902ba03ae14f12e426cce1..e43f76a5ae0fba60f8ecdf61e9cece5950e8ee46 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_DCSConditionsTempCondAlg.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_DCSConditionsTempCondAlg.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "SCT_DCSConditionsTempCondAlg.h"
@@ -11,7 +11,7 @@
 #include <memory>
 
 SCT_DCSConditionsTempCondAlg::SCT_DCSConditionsTempCondAlg(const std::string& name, ISvcLocator* pSvcLocator)
-  : ::AthAlgorithm(name, pSvcLocator)
+  : ::AthReentrantAlgorithm(name, pSvcLocator)
   , m_condSvc{"CondSvc", name}
 {
 }
@@ -36,7 +36,7 @@ StatusCode SCT_DCSConditionsTempCondAlg::initialize() {
   return StatusCode::SUCCESS;
 }
 
-StatusCode SCT_DCSConditionsTempCondAlg::execute() {
+StatusCode SCT_DCSConditionsTempCondAlg::execute(const EventContext& ctx) const {
   ATH_MSG_DEBUG("execute " << name());
 
   if (not m_returnHVTemp.value()) {
@@ -44,17 +44,17 @@ StatusCode SCT_DCSConditionsTempCondAlg::execute() {
   }
 
   // Write Cond Handle
-  SG::WriteCondHandle<SCT_DCSFloatCondData> writeHandle{m_writeKey};
+  SG::WriteCondHandle<SCT_DCSFloatCondData> writeHandle{m_writeKey, ctx};
   // Do we have a valid Write Cond Handle for current time?
   if (writeHandle.isValid()) {
     ATH_MSG_DEBUG("CondHandle " << writeHandle.fullKey() << " is already valid."
                   << ". In theory this should not be called, but may happen"
                   << " if multiple concurrent events are being processed out of order.");
-    return StatusCode::SUCCESS; 
+    return StatusCode::SUCCESS;
   }
 
   // Read Cond Handle
-  SG::ReadCondHandle<CondAttrListCollection> readHandle{m_readKey};
+  SG::ReadCondHandle<CondAttrListCollection> readHandle{m_readKey, ctx};
   const CondAttrListCollection* readCdo{*readHandle}; 
   if (readCdo==nullptr) {
     ATH_MSG_FATAL("Null pointer to the read conditions object");
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_DCSConditionsTempCondAlg.h b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_DCSConditionsTempCondAlg.h
index 78d58dc812e89b1634532f64026c5ba1048d1f61..f610ed525273c3e2fe363253a9c0dee3d1850673 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_DCSConditionsTempCondAlg.h
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_DCSConditionsTempCondAlg.h
@@ -1,11 +1,11 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */ 
 
 #ifndef SCT_DCSCONDITIONSTEMPCONDALG
 #define SCT_DCSCONDITIONSTEMPCONDALG
 
-#include "AthenaBaseComps/AthAlgorithm.h"
+#include "AthenaBaseComps/AthReentrantAlgorithm.h"
 
 #include "AthenaPoolUtilities/CondAttrListCollection.h"
 #include "SCT_ConditionsData/SCT_DCSFloatCondData.h"
@@ -15,13 +15,13 @@
 #include "GaudiKernel/ICondSvc.h"
 #include "GaudiKernel/Property.h"
 
-class SCT_DCSConditionsTempCondAlg : public AthAlgorithm 
+class SCT_DCSConditionsTempCondAlg : public AthReentrantAlgorithm 
 {  
  public:
   SCT_DCSConditionsTempCondAlg(const std::string& name, ISvcLocator* pSvcLocator);
   virtual ~SCT_DCSConditionsTempCondAlg() = default;
   StatusCode initialize() override;
-  StatusCode execute() override;
+  StatusCode execute(const EventContext& ctx) const override;
   StatusCode finalize() override;
 
  private:
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_DCSConditionsTestAlg.cxx b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_DCSConditionsTestAlg.cxx
index 07f51b9d6e89b67e97f0b5ebc1983554a99cfcce..a45ecf9beba4bf67f15e3b1a0f0a1525096e4a37 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_DCSConditionsTestAlg.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_DCSConditionsTestAlg.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 /** @file TestDCSConditions.cxx  Implementation file for TestDCSConditions class.
@@ -14,7 +14,7 @@
 
 SCT_DCSConditionsTestAlg::SCT_DCSConditionsTestAlg(const std::string& name, 
                                                    ISvcLocator* pSvcLocator) : 
-  AthAlgorithm(name, pSvcLocator)
+  AthReentrantAlgorithm(name, pSvcLocator)
 { //nop
 }
 
@@ -28,7 +28,7 @@ StatusCode SCT_DCSConditionsTestAlg::initialize() {
 } // SCT_DCSConditionsTestAlg::execute()
 
 //----------------------------------------------------------------------
-StatusCode SCT_DCSConditionsTestAlg::execute() {
+StatusCode SCT_DCSConditionsTestAlg::execute(const EventContext& ctx) const {
   //This method is only used to test the summary service, and only used within this package,
   // so the INFO level messages have no impact on performance of these services when used by clients
   ATH_MSG_DEBUG("in execute()");
@@ -42,7 +42,7 @@ StatusCode SCT_DCSConditionsTestAlg::execute() {
   
   try {
     gettempworks = (m_DCSConditionsTool->sensorTemperature(Identifier{141015041}, InDetConditions::SCT_STRIP));
-    isgoodworks =(m_DCSConditionsTool->isGood(Identifier{208584704}, InDetConditions::SCT_SIDE));
+    isgoodworks =(m_DCSConditionsTool->isGood(Identifier{208584704}, ctx, InDetConditions::SCT_SIDE));
     module = (m_DCSConditionsTool->canReportAbout(InDetConditions::SCT_MODULE));
     strip = (m_DCSConditionsTool->canReportAbout(InDetConditions::SCT_STRIP));
   } catch(...) {
@@ -65,8 +65,8 @@ StatusCode SCT_DCSConditionsTestAlg::execute() {
   ATH_MSG_INFO("gethv(141015041,Strip) " << (m_DCSConditionsTool->modHV(Identifier{141015041}, InDetConditions::SCT_STRIP)));
 
   try {
-    isgoodworks = (m_DCSConditionsTool->isGood(Identifier{208584704}, InDetConditions::SCT_SIDE));
-    isgoodworks = (m_DCSConditionsTool->isGood(Identifier{141015041}, InDetConditions::SCT_STRIP));
+    isgoodworks = (m_DCSConditionsTool->isGood(Identifier{208584704}, ctx, InDetConditions::SCT_SIDE));
+    isgoodworks = (m_DCSConditionsTool->isGood(Identifier{141015041}, ctx, InDetConditions::SCT_STRIP));
   } catch(...) {
     ATH_MSG_FATAL("Exception caught while trying to the isGood method");
     return StatusCode::FAILURE;
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_DCSConditionsTestAlg.h b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_DCSConditionsTestAlg.h
index a7f5546923345e74128bc699e3ba91940706734c..e353a04ab3e2ee2b53b28afa894b5ee062dbeb56 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_DCSConditionsTestAlg.h
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_DCSConditionsTestAlg.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 /** @file TestDCSConditions.h  Header file for TestDCSConditions class.
@@ -11,7 +11,7 @@
 #define SCT_TestDCSConditions_H
 
 // Include Athena stuff
-#include "AthenaBaseComps/AthAlgorithm.h"
+#include "AthenaBaseComps/AthReentrantAlgorithm.h"
 #include "SCT_ConditionsTools/ISCT_DCSConditionsTool.h"
 
 // Include Gaudi stuff
@@ -22,15 +22,15 @@
 
 /** This class acts as a test/sample client the DCSConditions class. 
  */
-class SCT_DCSConditionsTestAlg : public AthAlgorithm {
+class SCT_DCSConditionsTestAlg : public AthReentrantAlgorithm {
  public:
   // Structors
-  SCT_DCSConditionsTestAlg (const std::string& name, ISvcLocator* pSvcLocator); 
+  SCT_DCSConditionsTestAlg(const std::string& name, ISvcLocator* pSvcLocator); 
   virtual ~SCT_DCSConditionsTestAlg() = default;
     
   // Standard Gaudi functions
   StatusCode initialize() override; //!< Gaudi initialiser
-  StatusCode execute() override;    //!< Gaudi executer
+  StatusCode execute(const EventContext& ctx) const override;    //!< Gaudi executer
   StatusCode finalize() override;   //!< Gaudi finaliser
     
  private:
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_DetectorElementCondAlg.cxx b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_DetectorElementCondAlg.cxx
index 50341442031a0805758723525ee2ec3da5a9f0c4..0b7b74c562cde13366fd5ebb0f5ee3b361718c72 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_DetectorElementCondAlg.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_DetectorElementCondAlg.cxx
@@ -12,7 +12,7 @@
 #include <map>
 
 SCT_DetectorElementCondAlg::SCT_DetectorElementCondAlg(const std::string& name, ISvcLocator* pSvcLocator)
-  : ::AthAlgorithm(name, pSvcLocator)
+  : ::AthReentrantAlgorithm(name, pSvcLocator)
   , m_readKey{"SCTAlignmentStore", "SCTAlignmentStore"}
   , m_condSvc{"CondSvc", name}
   , m_detManager{nullptr}
@@ -39,12 +39,12 @@ StatusCode SCT_DetectorElementCondAlg::initialize()
   return StatusCode::SUCCESS;
 }
 
-StatusCode SCT_DetectorElementCondAlg::execute()
+StatusCode SCT_DetectorElementCondAlg::execute(const EventContext& ctx) const
 {
   ATH_MSG_DEBUG("execute " << name());
 
   // ____________ Construct Write Cond Handle and check its validity ____________
-  SG::WriteCondHandle<InDetDD::SiDetectorElementCollection> writeHandle{m_writeKey};
+  SG::WriteCondHandle<InDetDD::SiDetectorElementCollection> writeHandle{m_writeKey, ctx};
 
   // Do we have a valid Write Cond Handle for current time?
   if (writeHandle.isValid()) {
@@ -65,7 +65,7 @@ StatusCode SCT_DetectorElementCondAlg::execute()
   EventIDRange rangeW;
 
   // ____________ Get Read Cond Object ____________
-  SG::ReadCondHandle<GeoAlignmentStore> readHandle{m_readKey};
+  SG::ReadCondHandle<GeoAlignmentStore> readHandle{m_readKey, ctx};
   const GeoAlignmentStore* readCdo{*readHandle};
   if (readCdo==nullptr) {
     ATH_MSG_FATAL("Null pointer to the read conditions object of " << m_readKey.key());
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_DetectorElementCondAlg.h b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_DetectorElementCondAlg.h
index 1cae060980f53bf28a90e1b19481f4e0f7329af0..a24a5f1db3272582a64e3630e43ad19d7418d0b7 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_DetectorElementCondAlg.h
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_DetectorElementCondAlg.h
@@ -5,7 +5,7 @@
 #ifndef SCT_CONDITIONSALGORITHMS_SCT_DETECTORELEMENTCONDALG_H
 #define SCT_CONDITIONSALGORITHMS_SCT_DETECTORELEMENTCONDALG_H
 
-#include "AthenaBaseComps/AthAlgorithm.h"
+#include "AthenaBaseComps/AthReentrantAlgorithm.h"
 
 #include "GeoPrimitives/GeoPrimitives.h"
 #include "GeoModelUtilities/GeoAlignmentStore.h"
@@ -19,14 +19,14 @@ namespace InDetDD {
   class SCT_DetectorManager;
 }
 
-class SCT_DetectorElementCondAlg : public AthAlgorithm
+class SCT_DetectorElementCondAlg : public AthReentrantAlgorithm
 {
  public:
   SCT_DetectorElementCondAlg(const std::string& name, ISvcLocator* pSvcLocator);
   virtual ~SCT_DetectorElementCondAlg() override = default;
 
   virtual StatusCode initialize() override;
-  virtual StatusCode execute() override;
+  virtual StatusCode execute(const EventContext& ctx) const override;
   virtual StatusCode finalize() override;
 
  private:
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_LinkMaskingTestAlg.cxx b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_LinkMaskingTestAlg.cxx
index d9e286809456b8c886a16eec7e7f26025c3ecf7e..a070214774f46190708a9f43aa300c8ffc11065e 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_LinkMaskingTestAlg.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_LinkMaskingTestAlg.cxx
@@ -34,12 +34,12 @@ StatusCode SCT_LinkMaskingTestAlg::initialize() {
 }
 
 //Execute
-StatusCode SCT_LinkMaskingTestAlg::execute(const EventContext& /*ctx*/) const {
+StatusCode SCT_LinkMaskingTestAlg::execute(const EventContext& ctx) const {
 
-  ATH_MSG_INFO("Wafer 167772160 is " << (m_linkMaskingTool->isGood(Identifier{167772160}) ? "not masked" : "masked"));
-  ATH_MSG_INFO("Wafer 167773184 is " << (m_linkMaskingTool->isGood(Identifier{167773184}) ? "not masked" : "masked"));
-  ATH_MSG_INFO("Wafer 167786496 is " << (m_linkMaskingTool->isGood(Identifier{167786496}) ? "not masked" : "masked"));
-  ATH_MSG_INFO("Wafer 167787520 is " << (m_linkMaskingTool->isGood(Identifier{167787520}) ? "not masked" : "masked"));
+  ATH_MSG_INFO("Wafer 167772160 is " << (m_linkMaskingTool->isGood(Identifier{167772160}, ctx) ? "not masked" : "masked"));
+  ATH_MSG_INFO("Wafer 167773184 is " << (m_linkMaskingTool->isGood(Identifier{167773184}, ctx) ? "not masked" : "masked"));
+  ATH_MSG_INFO("Wafer 167786496 is " << (m_linkMaskingTool->isGood(Identifier{167786496}, ctx) ? "not masked" : "masked"));
+  ATH_MSG_INFO("Wafer 167787520 is " << (m_linkMaskingTool->isGood(Identifier{167787520}, ctx) ? "not masked" : "masked"));
 
   return StatusCode::SUCCESS;
 }
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_MajorityCondAlg.cxx b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_MajorityCondAlg.cxx
index cb4f4bfa7ad2fa2a4f05a4de98ad8407e09a0814..97fd225e2a5f99a463cd4f94c097f008551c048a 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_MajorityCondAlg.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_MajorityCondAlg.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "SCT_MajorityCondAlg.h"
@@ -11,7 +11,7 @@
 #include <memory>
 
 SCT_MajorityCondAlg::SCT_MajorityCondAlg(const std::string& name, ISvcLocator* pSvcLocator)
-  : ::AthAlgorithm(name, pSvcLocator)
+  : ::AthReentrantAlgorithm(name, pSvcLocator)
   , m_condSvc{"CondSvc", name}
 {
 }
@@ -37,12 +37,12 @@ StatusCode SCT_MajorityCondAlg::initialize()
   return StatusCode::SUCCESS;
 }
 
-StatusCode SCT_MajorityCondAlg::execute()
+StatusCode SCT_MajorityCondAlg::execute(const EventContext& ctx) const
 {
   ATH_MSG_DEBUG("execute " << name());
 
   // Write Cond Handle
-  SG::WriteCondHandle<SCT_MajorityCondData> writeHandle{m_writeKey};
+  SG::WriteCondHandle<SCT_MajorityCondData> writeHandle{m_writeKey, ctx};
 
   // Do we have a valid Write Cond Handle for current time?
   if (writeHandle.isValid()) {
@@ -53,7 +53,7 @@ StatusCode SCT_MajorityCondAlg::execute()
   }
 
   // Read Cond Handle 
-  SG::ReadCondHandle<CondAttrListCollection> readHandle{m_readKey};
+  SG::ReadCondHandle<CondAttrListCollection> readHandle{m_readKey, ctx};
   const CondAttrListCollection* readCdo{*readHandle}; 
   if (readCdo==nullptr) {
     ATH_MSG_FATAL("Null pointer to the read conditions object");
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_MajorityCondAlg.h b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_MajorityCondAlg.h
index 2732419e5fb1218e27ac6cc78324880c0ad2a710..f84a2ad015650b5aa7ccb43800cfeefe15d286ac 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_MajorityCondAlg.h
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_MajorityCondAlg.h
@@ -1,11 +1,11 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */ 
 
 #ifndef SCT_MAJORITYCONDALG
 #define SCT_MAJORITYCONDALG
 
-#include "AthenaBaseComps/AthAlgorithm.h"
+#include "AthenaBaseComps/AthReentrantAlgorithm.h"
 
 #include "AthenaPoolUtilities/CondAttrListCollection.h"
 #include "SCT_ConditionsData/SCT_MajorityCondData.h"
@@ -14,13 +14,13 @@
 
 #include "GaudiKernel/ICondSvc.h"
 
-class SCT_MajorityCondAlg : public AthAlgorithm 
+class SCT_MajorityCondAlg : public AthReentrantAlgorithm
 {  
  public:
   SCT_MajorityCondAlg(const std::string& name, ISvcLocator* pSvcLocator);
   virtual ~SCT_MajorityCondAlg() = default;
   StatusCode initialize() override;
-  StatusCode execute() override;
+  StatusCode execute(const EventContext& ctx) const override;
   StatusCode finalize() override;
 
  private:
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_MajorityConditionsTestAlg.cxx b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_MajorityConditionsTestAlg.cxx
index b4c443608bac4af2e1e6486733a9edc8392ea32f..b411f802944f8336026df82fc4e9f466c49fec1d 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_MajorityConditionsTestAlg.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_MajorityConditionsTestAlg.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 /**
@@ -17,7 +17,7 @@
 #include "Identifier/Identifier.h"
 
 SCT_MajorityConditionsTestAlg::SCT_MajorityConditionsTestAlg(const std::string& name, ISvcLocator* pSvcLocator) : 
-  AthAlgorithm(name, pSvcLocator)
+  AthReentrantAlgorithm(name, pSvcLocator)
 {
 }
 
@@ -32,7 +32,7 @@ StatusCode SCT_MajorityConditionsTestAlg::initialize() {
 }
 
 //Execute
-StatusCode SCT_MajorityConditionsTestAlg::execute() {
+StatusCode SCT_MajorityConditionsTestAlg::execute(const EventContext& /*ctx*/) const {
   ATH_MSG_INFO("Calling execute");
 
   ATH_MSG_INFO("Detector is " << (m_majorityTool->isGood()   ? "GOOD" : "BAD"));
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_MajorityConditionsTestAlg.h b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_MajorityConditionsTestAlg.h
index fb6aff526ff0cd0864f59b4cddcb5cf69591d4cb..186e4421f6a781e9ba3dfc42ea84607595c5fd89 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_MajorityConditionsTestAlg.h
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_MajorityConditionsTestAlg.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 /**
@@ -15,7 +15,7 @@
 #define SCT_MajorityConditionsTestAlg_H 
 
 //Athena
-#include "AthenaBaseComps/AthAlgorithm.h"
+#include "AthenaBaseComps/AthReentrantAlgorithm.h"
 #include "SCT_ConditionsTools/ISCT_DetectorLevelConditionsTool.h"
 
 //Gaudi
@@ -25,13 +25,13 @@
 #include <string>
 
 ///Example class to show calling the SCT_MajorityConditionsSvc
-class SCT_MajorityConditionsTestAlg : public AthAlgorithm {
+class SCT_MajorityConditionsTestAlg : public AthReentrantAlgorithm {
  public:
   SCT_MajorityConditionsTestAlg(const std::string& name,ISvcLocator* pSvcLocator);
   virtual ~SCT_MajorityConditionsTestAlg() = default;
 
   StatusCode initialize() override;
-  StatusCode execute() override;
+  StatusCode execute(const EventContext& ctx) const override;
   StatusCode finalize() override;
    
  private:
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ModuleVetoTestAlg.cxx b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ModuleVetoTestAlg.cxx
index db144080dc4dd0deb1e3d23e0d4405e107b52d82..f33d969402b7dd735691a73fca4500dbe7bb9599 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ModuleVetoTestAlg.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ModuleVetoTestAlg.cxx
@@ -32,34 +32,34 @@ SCT_ModuleVetoTestAlg::initialize() {
 
 //Execute
 StatusCode 
-SCT_ModuleVetoTestAlg::execute(const EventContext& /*ctx*/) const {
+SCT_ModuleVetoTestAlg::execute(const EventContext& ctx) const {
   //This method is only used to test the summary service, and only used within this package,
   // so the INFO level messages have no impact on performance of these services when used by clients
 
   ATH_MSG_INFO("Calling execute");
 
   ATH_MSG_INFO("Dummy call to module id 0: module is ");
-  bool result{m_pModuleVetoTool->isGood(Identifier{0})};
+  bool result{m_pModuleVetoTool->isGood(Identifier{0}, ctx)};
   ATH_MSG_INFO((result ? "good" : "bad"));
 
   ATH_MSG_INFO("Dummy call to module id 1:  module is ");
-  result=m_pModuleVetoTool->isGood(Identifier{1});
+  result=m_pModuleVetoTool->isGood(Identifier{1}, ctx);
   ATH_MSG_INFO((result ? "good" : "bad"));
 
   ATH_MSG_INFO("Dummy call to module id 2:  module is ");
-  result=m_pModuleVetoTool->isGood(Identifier{2});
+  result=m_pModuleVetoTool->isGood(Identifier{2}, ctx);
   ATH_MSG_INFO((result ? "good" : "bad"));
 
   ATH_MSG_INFO("Dummy call to module id 3:  module is ");
-  result=m_pModuleVetoTool->isGood(Identifier{3});
+  result=m_pModuleVetoTool->isGood(Identifier{3}, ctx);
   ATH_MSG_INFO((result ? "good" : "bad"));
 
   ATH_MSG_INFO("Dummy call to module id 151040000:  module is ");
-  result=m_pModuleVetoTool->isGood(Identifier{151040000});
+  result=m_pModuleVetoTool->isGood(Identifier{151040000}, ctx);
   ATH_MSG_INFO((result ? "good" : "bad"));
 
   ATH_MSG_INFO("Using Identifier Hash method:  with number 2137 ");
-  result=m_pModuleVetoTool->isGood(IdentifierHash{2137});
+  result=m_pModuleVetoTool->isGood(IdentifierHash{2137}, ctx);
   ATH_MSG_INFO((result ? "good" : "bad"));
 
   return StatusCode::SUCCESS;
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_MonitorCondAlg.cxx b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_MonitorCondAlg.cxx
index b5fe4834fe1042de6c2aa4c05eadac297383e093..95e22d5ce70a17753308eaf6f3780d661b07ce4f 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_MonitorCondAlg.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_MonitorCondAlg.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "SCT_MonitorCondAlg.h"
@@ -11,7 +11,7 @@
 #include <memory>
 
 SCT_MonitorCondAlg::SCT_MonitorCondAlg(const std::string& name, ISvcLocator* pSvcLocator)
-  : ::AthAlgorithm(name, pSvcLocator)
+  : ::AthReentrantAlgorithm(name, pSvcLocator)
   , m_helper{nullptr}
   , m_condSvc{"CondSvc", name}
 {
@@ -40,12 +40,12 @@ StatusCode SCT_MonitorCondAlg::initialize()
   return StatusCode::SUCCESS;
 }
 
-StatusCode SCT_MonitorCondAlg::execute()
+StatusCode SCT_MonitorCondAlg::execute(const EventContext& ctx) const
 {
   ATH_MSG_DEBUG("execute " << name());
 
   // Write Cond Handle
-  SG::WriteCondHandle<SCT_MonitorCondData> writeHandle{m_writeKey};
+  SG::WriteCondHandle<SCT_MonitorCondData> writeHandle{m_writeKey, ctx};
 
   // Do we have a valid Write Cond Handle for current time?
   if (writeHandle.isValid()) {
@@ -56,7 +56,7 @@ StatusCode SCT_MonitorCondAlg::execute()
   }
 
   // Read Cond Handle
-  SG::ReadCondHandle<CondAttrListCollection> readHandle{m_readKey};
+  SG::ReadCondHandle<CondAttrListCollection> readHandle{m_readKey, ctx};
   const CondAttrListCollection* readCdo{*readHandle};
   if (readCdo==nullptr) {
     ATH_MSG_FATAL("Null pointer to the read conditions object");
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_MonitorCondAlg.h b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_MonitorCondAlg.h
index ce62c02635f681deb8f6b2f706f8347448596629..5c2bd522cad0fe55ff5c899a0322df73861a51fb 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_MonitorCondAlg.h
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_MonitorCondAlg.h
@@ -1,11 +1,11 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */ 
 
 #ifndef SCT_MONITORCONDALG
 #define SCT_MONITORCONDALG
 
-#include "AthenaBaseComps/AthAlgorithm.h"
+#include "AthenaBaseComps/AthReentrantAlgorithm.h"
 #include "StoreGate/ReadCondHandleKey.h"
 #include "AthenaPoolUtilities/CondAttrListCollection.h"
 #include "StoreGate/WriteCondHandleKey.h"
@@ -14,13 +14,13 @@
 
 class SCT_ID;
 
-class SCT_MonitorCondAlg : public AthAlgorithm 
-{  
+class SCT_MonitorCondAlg : public AthReentrantAlgorithm 
+{
  public:
   SCT_MonitorCondAlg(const std::string& name, ISvcLocator* pSvcLocator);
   virtual ~SCT_MonitorCondAlg() = default;
   StatusCode initialize() override;
-  StatusCode execute() override;
+  StatusCode execute(const EventContext& ctx) const override;
   StatusCode finalize() override;
 
  private:
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_MonitorConditionsTestAlg.cxx b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_MonitorConditionsTestAlg.cxx
index 0b6d4f155b11ad8af85e4a628d078dc680ab769e..4b9b4a2c615eede4dc5780e5d4343d818a060935 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_MonitorConditionsTestAlg.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_MonitorConditionsTestAlg.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 /**
@@ -19,7 +19,7 @@
 #include "StoreGate/ReadHandle.h"
 
 SCT_MonitorConditionsTestAlg::SCT_MonitorConditionsTestAlg(const std::string& name, ISvcLocator* pSvcLocator) : 
-  AthAlgorithm(name, pSvcLocator), 
+  AthReentrantAlgorithm(name, pSvcLocator),
   m_sctId{nullptr}
 {
 }
@@ -42,7 +42,7 @@ StatusCode SCT_MonitorConditionsTestAlg::initialize()
 
 }
 
-StatusCode SCT_MonitorConditionsTestAlg::execute()
+StatusCode SCT_MonitorConditionsTestAlg::execute(const EventContext& ctx) const
 {
   //This method is only used to test the summary service, and only used within this package,
   // so the INFO level messages have no impact on performance of these services when used by clients
@@ -56,7 +56,7 @@ StatusCode SCT_MonitorConditionsTestAlg::execute()
 
   ATH_MSG_DEBUG(" in execute()");
 
-  SG::ReadHandle<xAOD::EventInfo> evt{m_evtKey};
+  SG::ReadHandle<xAOD::EventInfo> evt{m_evtKey, ctx};
   if (not evt.isValid()) {
     ATH_MSG_FATAL("could not get event info ");
     return StatusCode::FAILURE;
@@ -83,7 +83,7 @@ StatusCode SCT_MonitorConditionsTestAlg::execute()
     Identifier waferId{*waferItr};
     for (int i{0}; i<768; i++){
       Identifier stripId{m_sctId->strip_id(waferId, i)};
-      if (not (m_pMonitorConditionsTool->isGood(stripId, InDetConditions::SCT_STRIP)))
+      if (not (m_pMonitorConditionsTool->isGood(stripId, ctx, InDetConditions::SCT_STRIP)))
 	n_bad++;
     }
   }
@@ -97,7 +97,7 @@ StatusCode SCT_MonitorConditionsTestAlg::execute()
   ATH_MSG_DEBUG("(MonitorTest): moduleid = " << moduleid1);
   //    SCT_ComponentIdentifier compid = SCT_ComponentIdentifier(stripid1,"STRIP");
   //    SCT_Conditions::SCT_ComponentIdentifier compid(stripid1,"STRIP");
-  bool isthisGood{m_pMonitorConditionsTool->isGood(stripid1, InDetConditions::SCT_STRIP)};
+  bool isthisGood{m_pMonitorConditionsTool->isGood(stripid1, ctx, InDetConditions::SCT_STRIP)};
   if (isthisGood) {
     ATH_MSG_INFO("isGood(): strip(0,3,41,-4,1,703) is not noisy ");
   } else {
@@ -108,7 +108,7 @@ StatusCode SCT_MonitorConditionsTestAlg::execute()
   waferid1 = m_sctId->wafer_id(stripid1);
   moduleid1 = m_sctId->module_id(waferid1);
   //    compid = SCT_Conditions::SCT_ComponentIdentifier(stripid1,"STRIP");
-  isthisGood = m_pMonitorConditionsTool->isGood(stripid1, InDetConditions::SCT_STRIP);
+  isthisGood = m_pMonitorConditionsTool->isGood(stripid1, ctx, InDetConditions::SCT_STRIP);
   if (isthisGood) {
     ATH_MSG_INFO("isGood(): strip(0,3,41,-4,0,703) is not noisy ");
   } else {
@@ -121,7 +121,7 @@ StatusCode SCT_MonitorConditionsTestAlg::execute()
   moduleid1 = m_sctId->module_id(waferid1);
   ATH_MSG_DEBUG("(MonitorTest): stripid  = " << stripid1);
   ATH_MSG_DEBUG("(MonitorTest): moduleid = " << moduleid1);
-  isthisGood = m_pMonitorConditionsTool->isGood(stripid1, InDetConditions::SCT_STRIP);
+  isthisGood = m_pMonitorConditionsTool->isGood(stripid1, ctx, InDetConditions::SCT_STRIP);
   if (isthisGood) {
     ATH_MSG_INFO("isGood(): strip(0,2,39,-1,0,397) is not noisy ");
   } else {
@@ -133,7 +133,7 @@ StatusCode SCT_MonitorConditionsTestAlg::execute()
   moduleid1 = m_sctId->module_id(waferid1);
   ATH_MSG_DEBUG("(MonitorTest): stripid  = " << stripid1);
   ATH_MSG_DEBUG("(MonitorTest): moduleid = " << moduleid1);
-  isthisGood = m_pMonitorConditionsTool->isGood(stripid1, InDetConditions::SCT_STRIP);
+  isthisGood = m_pMonitorConditionsTool->isGood(stripid1, ctx, InDetConditions::SCT_STRIP);
   if (isthisGood) {
     ATH_MSG_INFO("isGood(): strip(0,2,39,-1,0,396) is not noisy ");
   } else {
@@ -145,7 +145,7 @@ StatusCode SCT_MonitorConditionsTestAlg::execute()
   moduleid1 = m_sctId->module_id(waferid1);
   ATH_MSG_DEBUG("(MonitorTest): stripid  = " << stripid1);
   ATH_MSG_DEBUG("(MonitorTest): moduleid = " << moduleid1);
-  isthisGood = m_pMonitorConditionsTool->isGood(stripid1, InDetConditions::SCT_STRIP);
+  isthisGood = m_pMonitorConditionsTool->isGood(stripid1, ctx, InDetConditions::SCT_STRIP);
   if (isthisGood) {
     ATH_MSG_INFO("isGood(): strip(0,2,39,-1,0,398) is not noisy ");
   } else {
@@ -154,7 +154,7 @@ StatusCode SCT_MonitorConditionsTestAlg::execute()
   
   stripid1 = m_sctId->strip_id(0, 3, 13, -3, 0, 567);
   //    compid = SCT_Conditions::SCT_ComponentIdentifier(stripid1,"STRIP");
-  isthisGood = m_pMonitorConditionsTool->isGood(stripid1, InDetConditions::SCT_STRIP);
+  isthisGood = m_pMonitorConditionsTool->isGood(stripid1, ctx, InDetConditions::SCT_STRIP);
   if (isthisGood) {
     ATH_MSG_INFO("isGood(): strip(0,3,13,-3,0,567) is not noisy ");
   } else {
@@ -163,7 +163,7 @@ StatusCode SCT_MonitorConditionsTestAlg::execute()
   
   stripid1 = m_sctId->strip_id(0, 3, 13, -3, 0, 566);
   //    compid = SCT_Conditions::SCT_ComponentIdentifier(stripid1,"STRIP");
-  isthisGood = m_pMonitorConditionsTool->isGood(stripid1, InDetConditions::SCT_STRIP);
+  isthisGood = m_pMonitorConditionsTool->isGood(stripid1, ctx, InDetConditions::SCT_STRIP);
   if (isthisGood) {
     ATH_MSG_INFO("isGood(): strip(0,3,13,-3,0,566) is not noisy ");
   } else {
@@ -172,7 +172,7 @@ StatusCode SCT_MonitorConditionsTestAlg::execute()
   
   stripid1 = m_sctId->strip_id(0, 3, 13, -3, 1, 567);
   //    compid = SCT_Conditions::SCT_ComponentIdentifier(stripid1,"STRIP");
-  isthisGood = m_pMonitorConditionsTool->isGood(stripid1, InDetConditions::SCT_STRIP);
+  isthisGood = m_pMonitorConditionsTool->isGood(stripid1, ctx, InDetConditions::SCT_STRIP);
   if (isthisGood) {
     ATH_MSG_INFO("isGood(): strip(0,3,13,-3,1,567) is not noisy ");
   } else {
@@ -181,7 +181,7 @@ StatusCode SCT_MonitorConditionsTestAlg::execute()
 
   stripid1 = m_sctId->strip_id(0, 0, 7, 2, 0, 700);
   //    compid = SCT_Conditions::SCT_ComponentIdentifier(stripid1,"STRIP");
-  isthisGood = m_pMonitorConditionsTool->isGood(stripid1, InDetConditions::SCT_STRIP);
+  isthisGood = m_pMonitorConditionsTool->isGood(stripid1, ctx, InDetConditions::SCT_STRIP);
   if (isthisGood) {
     ATH_MSG_INFO("isGood(): strip(0,0,7,2,0,700) is not noisy ");
   } else {
@@ -190,7 +190,7 @@ StatusCode SCT_MonitorConditionsTestAlg::execute()
   
   stripid1 = m_sctId->strip_id(0, 0, 7, 2, 1, 700);
   //    compid = SCT_Conditions::SCT_ComponentIdentifier(stripid1,"STRIP");
-  isthisGood = m_pMonitorConditionsTool->isGood(stripid1, InDetConditions::SCT_STRIP);
+  isthisGood = m_pMonitorConditionsTool->isGood(stripid1, ctx, InDetConditions::SCT_STRIP);
   if (isthisGood) {
     ATH_MSG_INFO("isGood(): strip(0,0,7,2,1,700) is not noisy ");
   } else {
@@ -200,7 +200,7 @@ StatusCode SCT_MonitorConditionsTestAlg::execute()
   // check if chip is noisy
   stripid1 = m_sctId->strip_id(0, 0, 8, -4, 0, 100);
   //    compid = SCT_Conditions::SCT_ComponentIdentifier(stripid1,"CHIP");
-  isthisGood = m_pMonitorConditionsTool->isGood(stripid1, InDetConditions::SCT_CHIP);
+  isthisGood = m_pMonitorConditionsTool->isGood(stripid1, ctx, InDetConditions::SCT_CHIP);
   if (isthisGood) {
     ATH_MSG_INFO("isGood(): chip(0,0,8,-4,0,100) is not noisy ");
   } else {
@@ -209,7 +209,7 @@ StatusCode SCT_MonitorConditionsTestAlg::execute()
   
   stripid1 = m_sctId->strip_id(0, 3, 13, -3, 0, 567);
   //    compid = SCT_Conditions::SCT_ComponentIdentifier(stripid1,"CHIP");
-  isthisGood = m_pMonitorConditionsTool->isGood(stripid1, InDetConditions::SCT_CHIP);
+  isthisGood = m_pMonitorConditionsTool->isGood(stripid1, ctx, InDetConditions::SCT_CHIP);
   if (isthisGood) {
     ATH_MSG_INFO("isGood(): chip(0,3,13,-3,0,567) is not noisy ");
   } else {
@@ -219,7 +219,7 @@ StatusCode SCT_MonitorConditionsTestAlg::execute()
   // check if wafer is noisy
   stripid1 = m_sctId->strip_id(0, 0, 8, -4, 0, 100);
   //    compid = SCT_Conditions::SCT_ComponentIdentifier(stripid1,"WAFER");
-  isthisGood = m_pMonitorConditionsTool->isGood(stripid1, InDetConditions::SCT_SIDE);
+  isthisGood = m_pMonitorConditionsTool->isGood(stripid1, ctx, InDetConditions::SCT_SIDE);
   if (isthisGood) {
     ATH_MSG_INFO("isGood(): wafer(0,0,8,-4,0,100) is not noisy ");
   } else {
@@ -229,7 +229,7 @@ StatusCode SCT_MonitorConditionsTestAlg::execute()
   // check if module is noisy
   stripid1 = m_sctId->strip_id(0, 0, 8, -4, 0, 100);
   //    compid = SCT_Conditions::SCT_ComponentIdentifier(stripid1,"MODULE");
-  isthisGood = m_pMonitorConditionsTool->isGood(stripid1, InDetConditions::SCT_MODULE);
+  isthisGood = m_pMonitorConditionsTool->isGood(stripid1, ctx, InDetConditions::SCT_MODULE);
   if (isthisGood) {
     ATH_MSG_INFO("isGood(): module(0,0,8,-4,0,100) is not noisy ");
   } else {
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_MonitorConditionsTestAlg.h b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_MonitorConditionsTestAlg.h
index 421e447706ea2c969bc1641e111126da035db4f4..95542ed9128dd493d05aea96223bd87fdfdbd3c7 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_MonitorConditionsTestAlg.h
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_MonitorConditionsTestAlg.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 /**
@@ -15,7 +15,7 @@
 #define SCT_MonitorConditionsTestAlg_H
 
 // Athena
-#include "AthenaBaseComps/AthAlgorithm.h"
+#include "AthenaBaseComps/AthReentrantAlgorithm.h"
 
 #include "SCT_ConditionsTools/ISCT_MonitorConditionsTool.h"
 
@@ -31,13 +31,13 @@
 class SCT_ID;
 
 ///Example class to show calling the SCT_MonitorConditions
-class SCT_MonitorConditionsTestAlg : public AthAlgorithm {
+class SCT_MonitorConditionsTestAlg : public AthReentrantAlgorithm {
  public:
   SCT_MonitorConditionsTestAlg(const std::string &name,ISvcLocator *pSvcLocator) ;
   virtual ~SCT_MonitorConditionsTestAlg() = default;
 
   StatusCode initialize() override;
-  StatusCode execute() override;
+  StatusCode execute(const EventContext& ctx) const override;
   StatusCode finalize() override;
    
  private:
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_RODVetoCondAlg.cxx b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_RODVetoCondAlg.cxx
index 5ead997314e2c73fd10359103361745f62c959be..4ad57d62af880b60d59cf1a153d25492e9d8d721 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_RODVetoCondAlg.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_RODVetoCondAlg.cxx
@@ -38,7 +38,7 @@ StatusCode SCT_RODVetoCondAlg::execute(const EventContext& ctx) const {
   ATH_MSG_INFO(m_badRODElementsInput.value().size() <<" RODs were declared bad");
 
   std::vector<unsigned int> allRods;
-  m_cabling->getAllRods(allRods);
+  m_cabling->getAllRods(allRods, ctx);
   
   SG::WriteHandle<IdentifierSet> badIds{m_badIds, ctx};
   ATH_CHECK(badIds.record(std::make_unique<IdentifierSet>()));
@@ -53,7 +53,7 @@ StatusCode SCT_RODVetoCondAlg::execute(const EventContext& ctx) const {
     }
 
     std::vector<IdentifierHash> listOfHashes;
-    m_cabling->getHashesForRod(listOfHashes, thisRod);
+    m_cabling->getHashesForRod(listOfHashes, thisRod, ctx);
     // Two consecutive hashes may produce the same module id, since they will be two sides
     // of the same module. We avoid invalid inserts by guarding against this.
     Identifier previousId; //constructor produces an invalid one
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_RODVetoTestAlg.cxx b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_RODVetoTestAlg.cxx
index 4fd95db28a844f574053f9d9d7f3dcf548820554..4cc0d352938fce3e60f1ef665170728855d75fc2 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_RODVetoTestAlg.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_RODVetoTestAlg.cxx
@@ -32,12 +32,12 @@ SCT_RODVetoTestAlg::initialize() {
 
 //Execute
 StatusCode 
-SCT_RODVetoTestAlg::execute(const EventContext& /*ctx*/) const {
+SCT_RODVetoTestAlg::execute(const EventContext& ctx) const {
   //This method is only used to test the summary service, and only used within this package,
   // so the INFO level messages have no impact on performance of these services when used by clients
   ATH_MSG_INFO("Calling execute");
   for (unsigned int hash{0}; hash<8176; hash+=2) {
-    bool result{m_pRODVetoTool->isGood(IdentifierHash(hash))};//invented, no idea what this is
+    bool result{m_pRODVetoTool->isGood(IdentifierHash{hash}, ctx)};//invented, no idea what this is
     ATH_MSG_INFO("Call to module in ROD : Module (hash=" << hash << ") is " << (result?"good":"bad"));
   }
 
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadCalibChipDataTestAlg.cxx b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadCalibChipDataTestAlg.cxx
index 585fa2af6a2b6c3fa8d20b44442ebd297b9d1b3d..a223f3d4f544cb8b9b354332280ca6aba8c955ff 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadCalibChipDataTestAlg.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadCalibChipDataTestAlg.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 /** @file SCT_ReadCalibChipDataTestAlg.cxx Implementation file for SCT_ReadCalibChipDataTestAlg class
@@ -21,7 +21,7 @@
 
 //----------------------------------------------------------------------
 SCT_ReadCalibChipDataTestAlg::SCT_ReadCalibChipDataTestAlg(const std::string& name, ISvcLocator* pSvcLocator) :
-  AthAlgorithm(name, pSvcLocator),
+  AthReentrantAlgorithm(name, pSvcLocator),
   m_id_sct{nullptr},
   m_moduleId{0},
   m_waferId{0},
@@ -89,7 +89,7 @@ StatusCode SCT_ReadCalibChipDataTestAlg::processProperties()
 } // SCT_ReadCalibChipDataTestAlg::processProperties()
 
 //----------------------------------------------------------------------
-StatusCode SCT_ReadCalibChipDataTestAlg::execute() {
+StatusCode SCT_ReadCalibChipDataTestAlg::execute(const EventContext& ctx) const {
   //This method is only used to test the summary service, and only used within this package,
   // so the INFO level messages have no impact on performance of these services when used by clients
 
@@ -97,7 +97,7 @@ StatusCode SCT_ReadCalibChipDataTestAlg::execute() {
   ATH_MSG_DEBUG("in execute()");
 
   // Get the current event
-  SG::ReadHandle<xAOD::EventInfo> currentEvent{m_currentEventKey};
+  SG::ReadHandle<xAOD::EventInfo> currentEvent{m_currentEventKey, ctx};
   if (not currentEvent.isValid()) {
     ATH_MSG_FATAL("Could not get event info");
     return StatusCode::FAILURE;
@@ -113,7 +113,7 @@ StatusCode SCT_ReadCalibChipDataTestAlg::execute() {
     // Test summmary, ask status of strip in module
     Identifier IdM{m_moduleId};
     Identifier IdS{m_waferId};
-    bool Sok{m_ReadCalibChipDataTool->isGood(IdS, InDetConditions::SCT_SIDE)};
+    bool Sok{m_ReadCalibChipDataTool->isGood(IdS, ctx, InDetConditions::SCT_SIDE)};
     ATH_MSG_INFO("Side " << IdS << " on module " << IdM << " is " << (Sok ? "good" : "bad"));
   }
 
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadCalibChipDataTestAlg.h b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadCalibChipDataTestAlg.h
index d6c698d637d3d845c64ed1a3fc8c9db96aefcf18..18258542ffd91c98362c59c411ae1980807307fa 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadCalibChipDataTestAlg.h
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadCalibChipDataTestAlg.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 /** @file SCT_ReadCalibDataTestAlg.h Header file for SCT_ReadCalibDataTestAlg.
@@ -12,7 +12,7 @@
 #define SCT_READ_CALIB_CHIP_DATA_TEST_ALG
 
 // Include Athena stuff
-#include "AthenaBaseComps/AthAlgorithm.h"
+#include "AthenaBaseComps/AthReentrantAlgorithm.h"
 
 #include "Identifier/Identifier.h"
 #include "SCT_ConditionsTools/ISCT_ReadCalibChipDataTool.h"
@@ -28,7 +28,7 @@
 class SCT_ID;
 
 /** This class acts as a test/sample client to the SCT_ReadSCalibChipDataSvc class.*/
-class SCT_ReadCalibChipDataTestAlg : public AthAlgorithm 
+class SCT_ReadCalibChipDataTestAlg : public AthReentrantAlgorithm 
 {
  public:
   //----------Public Member Functions----------//
@@ -38,7 +38,7 @@ class SCT_ReadCalibChipDataTestAlg : public AthAlgorithm
   
   // Standard Gaudi functions
   StatusCode initialize() override; //!< Gaudi initialiser
-  StatusCode execute() override;    //!< Gaudi executer
+  StatusCode execute(const EventContext& ctx) const override;    //!< Gaudi executer
   StatusCode finalize() override;   //!< Gaudi finaliser
   
  private:
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadCalibChipGainCondAlg.cxx b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadCalibChipGainCondAlg.cxx
index cbacdf24d72ff613f8ebe5626b5f145b7c6eb16a..8de6b2a015ac402158fe61789fedc1e048db6a3d 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadCalibChipGainCondAlg.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadCalibChipGainCondAlg.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "SCT_ReadCalibChipGainCondAlg.h"
@@ -17,7 +17,7 @@ using namespace SCT_ConditionsData;
 using namespace SCT_ReadCalibChipUtilities;
 
 SCT_ReadCalibChipGainCondAlg::SCT_ReadCalibChipGainCondAlg(const std::string& name, ISvcLocator* pSvcLocator)
-  : ::AthAlgorithm(name, pSvcLocator)
+  : ::AthReentrantAlgorithm(name, pSvcLocator)
   , m_condSvc{"CondSvc", name}
   , m_id_sct{nullptr}
 {
@@ -44,21 +44,21 @@ StatusCode SCT_ReadCalibChipGainCondAlg::initialize() {
   return StatusCode::SUCCESS;
 }
 
-StatusCode SCT_ReadCalibChipGainCondAlg::execute() {
+StatusCode SCT_ReadCalibChipGainCondAlg::execute(const EventContext& ctx) const {
   ATH_MSG_DEBUG("execute " << name());
 
   // Write Cond Handle
-  SG::WriteCondHandle<SCT_GainCalibData> writeHandle{m_writeKey};
+  SG::WriteCondHandle<SCT_GainCalibData> writeHandle{m_writeKey, ctx};
   // Do we have a valid Write Cond Handle for current time?
   if (writeHandle.isValid()) {
     ATH_MSG_DEBUG("CondHandle " << writeHandle.fullKey() << " is already valid."
                   << ". In theory this should not be called, but may happen"
                   << " if multiple concurrent events are being processed out of order.");
-    return StatusCode::SUCCESS; 
+    return StatusCode::SUCCESS;
   }
 
   // Read Cond Handle
-  SG::ReadCondHandle<CondAttrListCollection> readHandle{m_readKey};
+  SG::ReadCondHandle<CondAttrListCollection> readHandle{m_readKey, ctx};
   const CondAttrListCollection* readCdo{*readHandle}; 
   if (readCdo==nullptr) {
     ATH_MSG_FATAL("Null pointer to the read conditions object");
@@ -120,7 +120,7 @@ StatusCode SCT_ReadCalibChipGainCondAlg::finalize() {
 }
 
 void 
-SCT_ReadCalibChipGainCondAlg::insertNptGainFolderData(SCT_ModuleGainCalibData& theseCalibData, const coral::AttributeList& folderData) {
+SCT_ReadCalibChipGainCondAlg::insertNptGainFolderData(SCT_ModuleGainCalibData& theseCalibData, const coral::AttributeList& folderData) const {
   for (int i{0}; i!=N_NPTGAIN; ++i) {
     SCT_ModuleCalibParameter& datavec{theseCalibData[i]};
     const std::string &dbData{((folderData)[nPtGainDbParameterNames[i]]).data<std::string>()};
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadCalibChipGainCondAlg.h b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadCalibChipGainCondAlg.h
index 7ea2debae03d34fb1472c4f7b8e47a6c86f61449..544503f5732406dca71011c8362e73e92d71a0f5 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadCalibChipGainCondAlg.h
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadCalibChipGainCondAlg.h
@@ -1,12 +1,12 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */ 
 
 #ifndef SCT_ReadCalibChipGainCondAlg_h
 #define SCT_ReadCalibChipGainCondAlg_h
 
 // Include parent class
-#include "AthenaBaseComps/AthAlgorithm.h"
+#include "AthenaBaseComps/AthReentrantAlgorithm.h"
 
 // Include Gaudi classes
 #include "GaudiKernel/ICondSvc.h"
@@ -25,17 +25,17 @@
 // Forward declarations
 class SCT_ID;
 
-class SCT_ReadCalibChipGainCondAlg : public AthAlgorithm 
+class SCT_ReadCalibChipGainCondAlg : public AthReentrantAlgorithm 
 {  
  public:
   SCT_ReadCalibChipGainCondAlg(const std::string& name, ISvcLocator* pSvcLocator);
   virtual ~SCT_ReadCalibChipGainCondAlg() = default;
   StatusCode initialize() override;
-  StatusCode execute() override;
+  StatusCode execute(const EventContext& ctx) const override;
   StatusCode finalize() override;
 
  private:
-  void insertNptGainFolderData(SCT_ModuleGainCalibData& theseCalibData, const coral::AttributeList& folderData);
+  void insertNptGainFolderData(SCT_ModuleGainCalibData& theseCalibData, const coral::AttributeList& folderData) const;
 
   SG::ReadCondHandleKey<CondAttrListCollection> m_readKey{this, "ReadKey", "/SCT/DAQ/Calibration/ChipGain", "Key of input (raw) gain conditions folder"};
   SG::WriteCondHandleKey<SCT_GainCalibData> m_writeKey{this, "WriteKey", "SCT_GainCalibData", "Key of output (derived) gain conditions data"};
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadCalibChipNoiseCondAlg.cxx b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadCalibChipNoiseCondAlg.cxx
index b5bcdaf08f49fc3c62f059e1a988279a12b6ec0f..b4a3bb84dd14e84c72558636cc06cd46af5d62cc 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadCalibChipNoiseCondAlg.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadCalibChipNoiseCondAlg.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "SCT_ReadCalibChipNoiseCondAlg.h"
@@ -18,7 +18,7 @@ using namespace SCT_ConditionsData;
 using namespace SCT_ReadCalibChipUtilities;
 
 SCT_ReadCalibChipNoiseCondAlg::SCT_ReadCalibChipNoiseCondAlg(const std::string& name, ISvcLocator* pSvcLocator)
-  : ::AthAlgorithm(name, pSvcLocator)
+  : ::AthReentrantAlgorithm(name, pSvcLocator)
   , m_condSvc{"CondSvc", name}
   , m_id_sct{nullptr}
 {
@@ -45,11 +45,11 @@ StatusCode SCT_ReadCalibChipNoiseCondAlg::initialize() {
   return StatusCode::SUCCESS;
 }
 
-StatusCode SCT_ReadCalibChipNoiseCondAlg::execute() {
+StatusCode SCT_ReadCalibChipNoiseCondAlg::execute(const EventContext& ctx) const {
   ATH_MSG_DEBUG("execute " << name());
 
   // Write Cond Handle
-  SG::WriteCondHandle<SCT_NoiseCalibData> writeHandle{m_writeKey};
+  SG::WriteCondHandle<SCT_NoiseCalibData> writeHandle{m_writeKey, ctx};
   // Do we have a valid Write Cond Handle for current time?
   if (writeHandle.isValid()) {
     ATH_MSG_DEBUG("CondHandle " << writeHandle.fullKey() << " is already valid."
@@ -59,7 +59,7 @@ StatusCode SCT_ReadCalibChipNoiseCondAlg::execute() {
   }
 
   // Read Cond Handle
-  SG::ReadCondHandle<CondAttrListCollection> readHandle{m_readKey};
+  SG::ReadCondHandle<CondAttrListCollection> readHandle{m_readKey, ctx};
   const CondAttrListCollection* readCdo{*readHandle};
   if (readCdo==nullptr) {
     ATH_MSG_FATAL("Null pointer to the read conditions object");
@@ -121,7 +121,7 @@ StatusCode SCT_ReadCalibChipNoiseCondAlg::finalize() {
 }
 
 void 
-SCT_ReadCalibChipNoiseCondAlg::insertNoiseOccFolderData(SCT_ModuleNoiseCalibData& theseCalibData, const coral::AttributeList& folderData) {
+SCT_ReadCalibChipNoiseCondAlg::insertNoiseOccFolderData(SCT_ModuleNoiseCalibData& theseCalibData, const coral::AttributeList& folderData) const {
   for (int i{0}; i!=N_NOISEOCC; ++i) {
     SCT_ModuleCalibParameter& datavec{theseCalibData[i]};
     std::string dbData{((folderData)[noiseOccDbParameterNames[i]]).data<std::string>()};
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadCalibChipNoiseCondAlg.h b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadCalibChipNoiseCondAlg.h
index 44ec1e2a468fb1504d4d19cf2ffdfdf3f96cd177..a55f6dfc629b5071421c546ecb68ba44b23b28a7 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadCalibChipNoiseCondAlg.h
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadCalibChipNoiseCondAlg.h
@@ -1,12 +1,12 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */ 
 
 #ifndef SCT_ReadCalibChipNoiseCondAlg_h
 #define SCT_ReadCalibChipNoiseCondAlg_h
 
 // Include parent class
-#include "AthenaBaseComps/AthAlgorithm.h"
+#include "AthenaBaseComps/AthReentrantAlgorithm.h"
 
 // Include Athena classes
 #include "AthenaPoolUtilities/CondAttrListCollection.h"
@@ -25,17 +25,17 @@
 // Forward declarations
 class SCT_ID;
 
-class SCT_ReadCalibChipNoiseCondAlg : public AthAlgorithm 
+class SCT_ReadCalibChipNoiseCondAlg : public AthReentrantAlgorithm 
 {  
  public:
   SCT_ReadCalibChipNoiseCondAlg(const std::string& name, ISvcLocator* pSvcLocator);
   virtual ~SCT_ReadCalibChipNoiseCondAlg() = default;
   StatusCode initialize() override;
-  StatusCode execute() override;
+  StatusCode execute(const EventContext& ctx) const override;
   StatusCode finalize() override;
 
  private:
-  void insertNoiseOccFolderData(SCT_ModuleNoiseCalibData& theseCalibData, const coral::AttributeList& folderData);
+  void insertNoiseOccFolderData(SCT_ModuleNoiseCalibData& theseCalibData, const coral::AttributeList& folderData) const;
 
   SG::ReadCondHandleKey<CondAttrListCollection> m_readKey{this, "ReadKey", "/SCT/DAQ/Calibration/ChipNoise", "Key of input (raw) noise conditions folder"};
   SG::WriteCondHandleKey<SCT_NoiseCalibData> m_writeKey{this, "WriteKey", "SCT_NoiseCalibData", "Key of output (derived) noise conditions data"};
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadCalibDataCondAlg.cxx b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadCalibDataCondAlg.cxx
index 47b2bfacad92af3656067e00163877d81df5e4d3..e79a3eed4e2640a1854b1812cc25b6a2d16385e5 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadCalibDataCondAlg.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadCalibDataCondAlg.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "SCT_ReadCalibDataCondAlg.h"
@@ -49,7 +49,7 @@ namespace {
 }
 
 SCT_ReadCalibDataCondAlg::SCT_ReadCalibDataCondAlg(const std::string& name, ISvcLocator* pSvcLocator)
-  : ::AthAlgorithm(name, pSvcLocator)
+  : ::AthReentrantAlgorithm(name, pSvcLocator)
   , m_defectMapIntToString{}
   , m_condSvc{"CondSvc", name}
   , m_id_sct{nullptr}
@@ -130,13 +130,13 @@ StatusCode SCT_ReadCalibDataCondAlg::initialize() {
   return StatusCode::SUCCESS;
 }
 
-StatusCode SCT_ReadCalibDataCondAlg::execute() {
+StatusCode SCT_ReadCalibDataCondAlg::execute(const EventContext& ctx) const {
   ATH_MSG_DEBUG("execute " << name());
 
   // Write Cond Handle
   bool validWriteCondHandle{true};
   // Do we have a valid Write Cond Handle for current time?
-  SG::WriteCondHandle<SCT_CalibDefectData> writeHandleData[NFEATURES]{m_writeKeyGain, m_writeKeyNoise};
+  SG::WriteCondHandle<SCT_CalibDefectData> writeHandleData[NFEATURES]{{m_writeKeyGain, ctx}, {m_writeKeyNoise, ctx}};
   for (unsigned int i{GAIN}; i<NFEATURES; i++) {
     if (writeHandleData[i].isValid()) {
       ATH_MSG_DEBUG("CondHandle " << writeHandleData[i].fullKey() << " is already valid."
@@ -146,7 +146,7 @@ StatusCode SCT_ReadCalibDataCondAlg::execute() {
       validWriteCondHandle = false;
     }
   }
-  SG::WriteCondHandle<SCT_AllGoodStripInfo> writeHandleInfo{m_writeKeyInfo};
+  SG::WriteCondHandle<SCT_AllGoodStripInfo> writeHandleInfo{m_writeKeyInfo, ctx};
   if (writeHandleInfo.isValid()) {
     ATH_MSG_DEBUG("CondHandle " << writeHandleInfo.fullKey() << " is already valid."
                   << ". In theory this should not be called, but may happen"
@@ -157,7 +157,7 @@ StatusCode SCT_ReadCalibDataCondAlg::execute() {
   if (validWriteCondHandle) return StatusCode::SUCCESS;
 
   // Read Cond Handle
-  SG::ReadCondHandle<CondAttrListCollection> readHandle[NFEATURES]{m_readKeyGain, m_readKeyNoise};
+  SG::ReadCondHandle<CondAttrListCollection> readHandle[NFEATURES]{{m_readKeyGain, ctx}, {m_readKeyNoise, ctx}};
   const CondAttrListCollection* readCdo[NFEATURES]{*readHandle[GAIN], *readHandle[NOISE]};
   EventIDRange rangeR[NFEATURES];
   for (unsigned int i{GAIN}; i<NFEATURES; i++) {
@@ -175,8 +175,8 @@ StatusCode SCT_ReadCalibDataCondAlg::execute() {
   }
 
   // Get SCT_DetectorElementCollection
-  SG::ReadCondHandle<InDetDD::SiDetectorElementCollection> sctDetEle(m_SCTDetEleCollKey);
-  const InDetDD::SiDetectorElementCollection* elements(sctDetEle.retrieve());
+  SG::ReadCondHandle<InDetDD::SiDetectorElementCollection> sctDetEle{m_SCTDetEleCollKey, ctx};
+  const InDetDD::SiDetectorElementCollection* elements{sctDetEle.retrieve()};
   if (elements==nullptr) {
     ATH_MSG_FATAL(m_SCTDetEleCollKey.fullKey() << " could not be retrieved");
     return StatusCode::FAILURE;
@@ -258,7 +258,7 @@ StatusCode SCT_ReadCalibDataCondAlg::execute() {
       for (long unsigned int i{0}; i<gainvec_size; ++i) {
         theseDefects.begDefects.push_back(gaindefectbvec[i]);
         theseDefects.endDefects.push_back(gaindefectevec[i]);
-        theseDefects.typeOfDefect.push_back(m_defectMapIntToString[defectTypevec[i]]);
+        theseDefects.typeOfDefect.push_back(m_defectMapIntToString.at(defectTypevec[i]));
         theseDefects.parValue.push_back(coerceToFloatRange(parValuevec[i]));
       }
       // Fill the isGoodWaferArray
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadCalibDataCondAlg.h b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadCalibDataCondAlg.h
index 2961f769459255942027566fe83ae26fa7a003d8..9fc8f85317d53c0e3c4f7950bf4628708c49d829 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadCalibDataCondAlg.h
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadCalibDataCondAlg.h
@@ -1,11 +1,11 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */ 
 
 #ifndef SCT_ReadCalibDataCondAlg_h
 #define SCT_ReadCalibDataCondAlg_h
 
-#include "AthenaBaseComps/AthAlgorithm.h"
+#include "AthenaBaseComps/AthReentrantAlgorithm.h"
 
 #include "StoreGate/ReadCondHandleKey.h"
 #include "AthenaPoolUtilities/CondAttrListCollection.h"
@@ -24,13 +24,13 @@
 // Forward declarations
 class SCT_ID;
 
-class SCT_ReadCalibDataCondAlg : public AthAlgorithm 
+class SCT_ReadCalibDataCondAlg : public AthReentrantAlgorithm
 {  
  public:
   SCT_ReadCalibDataCondAlg(const std::string& name, ISvcLocator* pSvcLocator);
   virtual ~SCT_ReadCalibDataCondAlg() = default;
   StatusCode initialize() override;
-  StatusCode execute() override;
+  StatusCode execute(const EventContext& ctx) const override;
   StatusCode finalize() override;
 
  private:
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadCalibDataTestAlg.cxx b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadCalibDataTestAlg.cxx
index bc7bdbd58dfd628f650072e9f3c11be0a153bba2..2c8a153790d991c0e4589079635ba12a263c3e96 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadCalibDataTestAlg.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadCalibDataTestAlg.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 /** @file SCT_ReadCalibDataTestAlg.cxx Implementation file for SCT_ReadCalibDataTestAlg class
@@ -22,7 +22,7 @@
 
 //----------------------------------------------------------------------
 SCT_ReadCalibDataTestAlg::SCT_ReadCalibDataTestAlg(const std::string& name, ISvcLocator* pSvcLocator) :
-  AthAlgorithm(name, pSvcLocator),
+  AthReentrantAlgorithm(name, pSvcLocator),
   m_id_sct{nullptr},
   m_moduleId{0},
   m_waferId{0},
@@ -91,7 +91,7 @@ StatusCode SCT_ReadCalibDataTestAlg::processProperties()
 } // SCT_ReadCalibDataTestAlg::processProperties()
 
 //----------------------------------------------------------------------
-StatusCode SCT_ReadCalibDataTestAlg::execute()
+StatusCode SCT_ReadCalibDataTestAlg::execute(const EventContext& ctx) const
 {
   //This method is only used to test the summary service, and only used within this package,
   // so the INFO level messages have no impact on performance of these services when used by clients
@@ -104,7 +104,7 @@ StatusCode SCT_ReadCalibDataTestAlg::execute()
     // Test summmary, ask status of strip in module
     Identifier IdM{m_moduleId};
     Identifier IdS{m_stripId};
-    bool Sok{m_ReadCalibDataTool->isGood(IdS, InDetConditions::SCT_STRIP)};
+    bool Sok{m_ReadCalibDataTool->isGood(IdS, ctx, InDetConditions::SCT_STRIP)};
     ATH_MSG_INFO("Strip " << IdS << " on module " << IdM << " is " << (Sok?"good":"bad"));
   }
 
@@ -114,12 +114,12 @@ StatusCode SCT_ReadCalibDataTestAlg::execute()
     int nbad{0};
     //Loop over all wafers using hashIds from the cabling service
     std::vector<boost::uint32_t> listOfRODs;
-    m_cabling->getAllRods(listOfRODs);
+    m_cabling->getAllRods(listOfRODs, ctx);
     std::vector<boost::uint32_t>::iterator rodIter{listOfRODs.begin()};
     std::vector<boost::uint32_t>::iterator rodEnd{listOfRODs.end()};
     for (; rodIter != rodEnd; ++rodIter) {
       std::vector<IdentifierHash> listOfHashes;
-      m_cabling->getHashesForRod(listOfHashes, *rodIter);
+      m_cabling->getHashesForRod(listOfHashes, *rodIter, ctx);
       std::vector<IdentifierHash>::iterator hashIt{listOfHashes.begin()};
       std::vector<IdentifierHash>::iterator hashEnd{listOfHashes.end()};
       for (; hashIt != hashEnd; ++hashIt) {
@@ -129,7 +129,7 @@ StatusCode SCT_ReadCalibDataTestAlg::execute()
           Identifier IdS{m_id_sct->strip_id(waferId,stripIndex)};
           const int stripId{m_id_sct->strip(IdS)};
           const int side{m_id_sct->side(IdS)};
-          const bool stripOk{m_ReadCalibDataTool->isGood(IdS, InDetConditions::SCT_STRIP)};
+          const bool stripOk{m_ReadCalibDataTool->isGood(IdS, ctx, InDetConditions::SCT_STRIP)};
           if (stripOk) ++ngood;
 	  else ++nbad; 
           if (not stripOk) { // Print info on all bad strips
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadCalibDataTestAlg.h b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadCalibDataTestAlg.h
index 87eacd288a2251b13341e9fe97970b843d0fba16..a54548823933d1f52dd74d5e5e33a593cafeddbb 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadCalibDataTestAlg.h
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadCalibDataTestAlg.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 /** @file SCT_ReadCalibDataTestAlg.h Header file for SCT_ReadCalibDataTestAlg.
@@ -15,7 +15,7 @@
 #include "SCT_ConditionsTools/ISCT_ReadCalibDataTool.h"
 
 // Include Athena stuff
-#include "AthenaBaseComps/AthAlgorithm.h"
+#include "AthenaBaseComps/AthReentrantAlgorithm.h"
 #include "Identifier/Identifier.h"
 #include "SCT_Cabling/ISCT_CablingTool.h"
 
@@ -30,7 +30,7 @@ class ISvcLocator;
 class SCT_ID;
 
 /** This class acts as a test/sample client to the SCT_ReadSCalibDataSvc class.*/
-class SCT_ReadCalibDataTestAlg:public AthAlgorithm 
+class SCT_ReadCalibDataTestAlg:public AthReentrantAlgorithm
 {
  public:
   //----------Public Member Functions----------//
@@ -40,7 +40,7 @@ class SCT_ReadCalibDataTestAlg:public AthAlgorithm
   
   // Standard Gaudi functions
   StatusCode initialize() override; //!< Gaudi initialiser
-  StatusCode execute() override;    //!< Gaudi executer
+  StatusCode execute(const EventContext& ctx) const override;    //!< Gaudi executer
   StatusCode finalize() override;   //!< Gaudi finaliser
   
  private:
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_SiliconConditionsTestAlg.cxx b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_SiliconConditionsTestAlg.cxx
index 5a640cc02b8a05b87af4784ff81f9b57ae4efdbb..de3a7909cc3cc7e782e8428e4dff4ecc1fac563e 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_SiliconConditionsTestAlg.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_SiliconConditionsTestAlg.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 /**
@@ -18,7 +18,7 @@
 #include "Identifier/IdentifierHash.h"
 
 SCT_SiliconConditionsTestAlg::SCT_SiliconConditionsTestAlg(const std::string& name, ISvcLocator* pSvcLocator) : 
-  AthAlgorithm(name, pSvcLocator)
+  AthReentrantAlgorithm(name, pSvcLocator)
 {
   //nop
 }
@@ -31,7 +31,7 @@ StatusCode SCT_SiliconConditionsTestAlg::initialize() {
 }
 
 //Execute
-StatusCode SCT_SiliconConditionsTestAlg::execute() {
+StatusCode SCT_SiliconConditionsTestAlg::execute(const EventContext& /*ctx*/) const {
   //This method is only used to test the summary service, and only used within this package,
   // so the INFO level messages have no impact on performance of these services when used by clients
   
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_SiliconConditionsTestAlg.h b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_SiliconConditionsTestAlg.h
index 81da94f63505322f7b0df1e3f59468aad41f0c0b..d2107c19e67df1a647382dd30a9701d7a39350e3 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_SiliconConditionsTestAlg.h
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_SiliconConditionsTestAlg.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 /**
@@ -14,21 +14,21 @@
 #ifndef SCT_SiliconConditionsTestAlg_H
 #define SCT_SiliconConditionsTestAlg_H 
 
-#include "AthenaBaseComps/AthAlgorithm.h"
+#include "AthenaBaseComps/AthReentrantAlgorithm.h"
 
 #include "InDetConditionsSummaryService/ISiliconConditionsTool.h"
 
 //Gaudi
 #include "GaudiKernel/ToolHandle.h"
 
-///Example class to show calling the SCT_SiliconConditionsSvc
-class SCT_SiliconConditionsTestAlg : public AthAlgorithm {
+///Example class to show calling the SCT_SiliconConditionsTool
+class SCT_SiliconConditionsTestAlg : public AthReentrantAlgorithm {
  public:
   SCT_SiliconConditionsTestAlg(const std::string& name,ISvcLocator* pSvcLocator);
   virtual ~SCT_SiliconConditionsTestAlg() = default;
 
   StatusCode initialize() override;
-  StatusCode execute() override;
+  StatusCode execute(const EventContext& ctx) const override;
   StatusCode finalize() override;
    
  private:
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_SiliconHVCondAlg.cxx b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_SiliconHVCondAlg.cxx
index ee364b6bedf05673a5cd214f7c217a7852757ef6..6c1ab5f66c027eec5540f9cafbdb1a616aa6c13b 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_SiliconHVCondAlg.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_SiliconHVCondAlg.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "SCT_SiliconHVCondAlg.h"
@@ -12,7 +12,7 @@
 #include <memory>
 
 SCT_SiliconHVCondAlg::SCT_SiliconHVCondAlg(const std::string& name, ISvcLocator* pSvcLocator)
-  : ::AthAlgorithm(name, pSvcLocator)
+  : ::AthReentrantAlgorithm(name, pSvcLocator)
   , m_condSvc{"CondSvc", name}
   , m_pHelper{nullptr}
 {
@@ -43,11 +43,11 @@ StatusCode SCT_SiliconHVCondAlg::initialize() {
   return StatusCode::SUCCESS;
 }
 
-StatusCode SCT_SiliconHVCondAlg::execute() {
+StatusCode SCT_SiliconHVCondAlg::execute(const EventContext& ctx) const {
   ATH_MSG_DEBUG("execute " << name());
 
   // Write Cond Handle
-  SG::WriteCondHandle<SCT_DCSFloatCondData> writeHandle{m_writeKey};
+  SG::WriteCondHandle<SCT_DCSFloatCondData> writeHandle{m_writeKey, ctx};
   // Do we have a valid Write Cond Handle for current time?
   if (writeHandle.isValid()) {
     ATH_MSG_DEBUG("CondHandle " << writeHandle.fullKey() << " is already valid."
@@ -57,7 +57,7 @@ StatusCode SCT_SiliconHVCondAlg::execute() {
   }
 
   // Read Cond Handle (HV)
-  SG::ReadCondHandle<SCT_DCSFloatCondData> readHandleHV{m_readKeyHV};
+  SG::ReadCondHandle<SCT_DCSFloatCondData> readHandleHV{m_readKeyHV, ctx};
   const SCT_DCSFloatCondData* readCdoHV{*readHandleHV};
   if (readCdoHV==nullptr) {
     ATH_MSG_FATAL("Null pointer to the read conditions object");
@@ -74,7 +74,7 @@ StatusCode SCT_SiliconHVCondAlg::execute() {
 
   if (m_useState.value()) {
     // Read Cond Handle (state)
-    SG::ReadCondHandle<SCT_DCSStatCondData> readHandleState{m_readKeyState};
+    SG::ReadCondHandle<SCT_DCSStatCondData> readHandleState{m_readKeyState, ctx};
     const SCT_DCSStatCondData* readCdoState{*readHandleState};
     if (readCdoState==nullptr) {
       ATH_MSG_FATAL("Null pointer to the read conditions object");
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_SiliconHVCondAlg.h b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_SiliconHVCondAlg.h
index b7849d34378e9663b4852133bf7e40411d55e1b6..0ad9e131c0ceaf232437bc17383b5e05396dfa33 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_SiliconHVCondAlg.h
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_SiliconHVCondAlg.h
@@ -1,11 +1,11 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */ 
 
 #ifndef SCT_SILICONHVCONDALG
 #define SCT_SILICONHVCONDALG
 
-#include "AthenaBaseComps/AthAlgorithm.h"
+#include "AthenaBaseComps/AthReentrantAlgorithm.h"
 
 #include "StoreGate/ReadCondHandleKey.h"
 #include "StoreGate/WriteCondHandleKey.h"
@@ -17,13 +17,13 @@
 
 class SCT_ID;
 
-class SCT_SiliconHVCondAlg : public AthAlgorithm 
+class SCT_SiliconHVCondAlg : public AthReentrantAlgorithm
 {  
  public:
   SCT_SiliconHVCondAlg(const std::string& name, ISvcLocator* pSvcLocator);
   virtual ~SCT_SiliconHVCondAlg() = default;
   StatusCode initialize() override;
-  StatusCode execute() override;
+  StatusCode execute(const EventContext& ctx) const override;
   StatusCode finalize() override;
 
  private:
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_SiliconTempCondAlg.cxx b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_SiliconTempCondAlg.cxx
index ebaa2fbd8e7c3990970ea2cf8d1d713884515003..3b7fd66f69b519eaf7ceeb2a391605164251fa1d 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_SiliconTempCondAlg.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_SiliconTempCondAlg.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "SCT_SiliconTempCondAlg.h"
@@ -12,7 +12,7 @@
 #include <memory>
 
 SCT_SiliconTempCondAlg::SCT_SiliconTempCondAlg(const std::string& name, ISvcLocator* pSvcLocator)
-  : ::AthAlgorithm(name, pSvcLocator)
+  : ::AthReentrantAlgorithm(name, pSvcLocator)
   , m_condSvc{"CondSvc", name}
   , m_pHelper{nullptr}
 {
@@ -43,11 +43,11 @@ StatusCode SCT_SiliconTempCondAlg::initialize() {
   return StatusCode::SUCCESS;
 }
 
-StatusCode SCT_SiliconTempCondAlg::execute() {
+StatusCode SCT_SiliconTempCondAlg::execute(const EventContext& ctx) const {
   ATH_MSG_DEBUG("execute " << name());
 
   // Write Cond Handle
-  SG::WriteCondHandle<SCT_DCSFloatCondData> writeHandle{m_writeKey};
+  SG::WriteCondHandle<SCT_DCSFloatCondData> writeHandle{m_writeKey, ctx};
   // Do we have a valid Write Cond Handle for current time?
   if (writeHandle.isValid()) {
     ATH_MSG_DEBUG("CondHandle " << writeHandle.fullKey() << " is already valid."
@@ -57,7 +57,7 @@ StatusCode SCT_SiliconTempCondAlg::execute() {
   }
 
   // Read Cond Handle (temperature)
-  SG::ReadCondHandle<SCT_DCSFloatCondData> readHandleTemp0{m_readKeyTemp0};
+  SG::ReadCondHandle<SCT_DCSFloatCondData> readHandleTemp0{m_readKeyTemp0, ctx};
   const SCT_DCSFloatCondData* readCdoTemp0{*readHandleTemp0};
   if (readCdoTemp0==nullptr) {
     ATH_MSG_FATAL("Null pointer to the read conditions object");
@@ -74,7 +74,7 @@ StatusCode SCT_SiliconTempCondAlg::execute() {
 
   if (m_useState.value()) {
     // Read Cond Handle (state)
-    SG::ReadCondHandle<SCT_DCSStatCondData> readHandleState{m_readKeyState};
+    SG::ReadCondHandle<SCT_DCSStatCondData> readHandleState{m_readKeyState, ctx};
     const SCT_DCSStatCondData* readCdoState{*readHandleState};
     if (readCdoState==nullptr) {
       ATH_MSG_FATAL("Null pointer to the read conditions object");
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_SiliconTempCondAlg.h b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_SiliconTempCondAlg.h
index 82b7e6a3e56506df71464f2ab8cff1e4e421d6c2..d62884401a982ff82fd911bcdb9eafa850e22b66 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_SiliconTempCondAlg.h
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_SiliconTempCondAlg.h
@@ -1,11 +1,11 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */ 
 
 #ifndef SCT_SILICONTEMPCONDALG
 #define SCT_SILICONTEMPCONDALG
 
-#include "AthenaBaseComps/AthAlgorithm.h"
+#include "AthenaBaseComps/AthReentrantAlgorithm.h"
 
 #include "SCT_ConditionsData/SCT_DCSStatCondData.h"
 #include "SCT_ConditionsData/SCT_DCSFloatCondData.h"
@@ -17,13 +17,13 @@
 
 class SCT_ID;
 
-class SCT_SiliconTempCondAlg : public AthAlgorithm 
+class SCT_SiliconTempCondAlg : public AthReentrantAlgorithm
 {  
  public:
   SCT_SiliconTempCondAlg(const std::string& name, ISvcLocator* pSvcLocator);
   virtual ~SCT_SiliconTempCondAlg() = default;
   StatusCode initialize() override;
-  StatusCode execute() override;
+  StatusCode execute(const EventContext& ctx) const override;
   StatusCode finalize() override;
 
  private:
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_StripVetoTestAlg.cxx b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_StripVetoTestAlg.cxx
index 93a2ba5bbc8726944dce1d58ea1e0551ff08c68d..506814d5a4ee560ddc961738464680d5b5377349 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_StripVetoTestAlg.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_StripVetoTestAlg.cxx
@@ -36,7 +36,7 @@ StatusCode SCT_StripVetoTestAlg::initialize() {
 }
 
 //Execute
-StatusCode SCT_StripVetoTestAlg::execute(const EventContext& /*ctx*/) const {
+StatusCode SCT_StripVetoTestAlg::execute(const EventContext& ctx) const {
   std::vector<Identifier::value_type> stripIds{576522359582752768ULL,
                                                576522475009998848ULL,
                                                576522475278434304ULL,
@@ -45,7 +45,7 @@ StatusCode SCT_StripVetoTestAlg::execute(const EventContext& /*ctx*/) const {
                                                576522475815305216ULL};
 
   for (Identifier::value_type stripId : stripIds) {
-    ATH_MSG_INFO("Strip " << stripId << " " << (m_stripVetoTool->isGood(Identifier{stripId}, InDetConditions::SCT_STRIP) ? "not vetoed" : "vetoed"));
+    ATH_MSG_INFO("Strip " << stripId << " " << (m_stripVetoTool->isGood(Identifier{stripId}, ctx, InDetConditions::SCT_STRIP) ? "not vetoed" : "vetoed"));
   }
 
   return StatusCode::SUCCESS;
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_TdaqEnabledCondAlg.cxx b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_TdaqEnabledCondAlg.cxx
index 876d4a8c903fcd8bc2bf5fd427f48c822dca3ea1..688fd86c97af68006949521fcccaea52a934d2c2 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_TdaqEnabledCondAlg.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_TdaqEnabledCondAlg.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "SCT_TdaqEnabledCondAlg.h"
@@ -13,7 +13,7 @@
 #include <memory>
 
 SCT_TdaqEnabledCondAlg::SCT_TdaqEnabledCondAlg(const std::string& name, ISvcLocator* pSvcLocator)
-  : ::AthAlgorithm(name, pSvcLocator)
+  : ::AthReentrantAlgorithm(name, pSvcLocator)
   , m_condSvc{"CondSvc", name}
 {
 }
@@ -44,12 +44,12 @@ StatusCode SCT_TdaqEnabledCondAlg::initialize()
   return StatusCode::SUCCESS;
 }
 
-StatusCode SCT_TdaqEnabledCondAlg::execute()
+StatusCode SCT_TdaqEnabledCondAlg::execute(const EventContext& ctx) const
 {
   ATH_MSG_DEBUG("execute " << name());
 
   // Write Cond Handle
-  SG::WriteCondHandle<SCT_TdaqEnabledCondData> writeHandle{m_writeKey};
+  SG::WriteCondHandle<SCT_TdaqEnabledCondData> writeHandle{m_writeKey, ctx};
 
   // Do we have a valid Write Cond Handle for current time?
   if (writeHandle.isValid()) {
@@ -68,7 +68,7 @@ StatusCode SCT_TdaqEnabledCondAlg::execute()
   EventIDRange rangeW;
 
   // check whether we expect valid data at this time
-  if (unfilledRun()) {
+  if (unfilledRun(ctx)) {
     EventIDBase unfilledStart{0, 0, 0, 0}; // run 0, event 0, timestamp 0, timestamp_ns 0
     EventIDBase unfilledStop{s_earliestRunForFolder, 0, s_earliestTimeStampForFolder, 0}; // run 119253, event 0, timestamp 1245064619, timestamp_ns 0
     EventIDRange unfilledRange{unfilledStart, unfilledStop};
@@ -77,7 +77,7 @@ StatusCode SCT_TdaqEnabledCondAlg::execute()
     writeCdo->setFilled(true);
   } else {
     // Read Cond Handle 
-    SG::ReadCondHandle<CondAttrListCollection> readHandle{m_readKey};
+    SG::ReadCondHandle<CondAttrListCollection> readHandle{m_readKey, ctx};
     const CondAttrListCollection* readCdo{*readHandle}; 
     if (readCdo==nullptr) {
       ATH_MSG_FATAL("Null pointer to the read conditions object");
@@ -128,7 +128,7 @@ StatusCode SCT_TdaqEnabledCondAlg::execute()
       tmpIdVec.reserve(s_modulesPerRod);
       for (const auto& thisRod : writeCdo->getGoodRods()) {
         tmpIdVec.clear();
-        m_cablingTool->getHashesForRod(tmpIdVec, thisRod);
+        m_cablingTool->getHashesForRod(tmpIdVec, thisRod, ctx);
         writeCdo->setGoodModules(tmpIdVec);
       }
       writeCdo->setFilled(true);
@@ -157,8 +157,8 @@ StatusCode SCT_TdaqEnabledCondAlg::finalize()
   return StatusCode::SUCCESS;
 }
 
-bool SCT_TdaqEnabledCondAlg::unfilledRun() const {
-  SG::ReadHandle<EventInfo> event{m_eventInfoKey};
+bool SCT_TdaqEnabledCondAlg::unfilledRun(const EventContext& ctx) const {
+  SG::ReadHandle<EventInfo> event{m_eventInfoKey, ctx};
   if (event.isValid()) {
     const unsigned int runNumber{event->event_ID()->run_number()};
     const bool noDataExpected{runNumber < s_earliestRunForFolder};
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_TdaqEnabledCondAlg.h b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_TdaqEnabledCondAlg.h
index a867908b25a2fa1d8c5f88fda08c10221613078c..fe44a73c1c2b732d38252f23fa1ff558cca62890 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_TdaqEnabledCondAlg.h
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_TdaqEnabledCondAlg.h
@@ -1,11 +1,11 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */ 
 
 #ifndef SCT_TDAQENABLEDCONDALG
 #define SCT_TDAQENABLEDCONDALG
 
-#include "AthenaBaseComps/AthAlgorithm.h"
+#include "AthenaBaseComps/AthReentrantAlgorithm.h"
 
 #include "AthenaPoolUtilities/CondAttrListCollection.h"
 #include "EventInfo/EventInfo.h"
@@ -17,17 +17,17 @@
 
 #include "GaudiKernel/ICondSvc.h"
 
-class SCT_TdaqEnabledCondAlg : public AthAlgorithm 
+class SCT_TdaqEnabledCondAlg : public AthReentrantAlgorithm 
 {  
  public:
   SCT_TdaqEnabledCondAlg(const std::string& name, ISvcLocator* pSvcLocator);
   virtual ~SCT_TdaqEnabledCondAlg() = default;
   StatusCode initialize() override;
-  StatusCode execute() override;
+  StatusCode execute(const EventContext& ctx) const override;
   StatusCode finalize() override;
 
  private:
-  bool unfilledRun() const;
+  bool unfilledRun(const EventContext& ctx) const;
 
   unsigned int parseChannelName(const std::string &chanNameString) const;
   std::string inWords(const unsigned int aNumber) const;
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_TdaqEnabledTestAlg.cxx b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_TdaqEnabledTestAlg.cxx
index b46bc826748ceb6bfdff7d3e899397d4fd6eecd2..adcd9e1959fd2e296a4812dfc2ac4b36778ad7e3 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_TdaqEnabledTestAlg.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_TdaqEnabledTestAlg.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 /**
@@ -20,7 +20,7 @@
 #include "Identifier/Identifier.h"
 
 SCT_TdaqEnabledTestAlg::SCT_TdaqEnabledTestAlg(const std::string& name, ISvcLocator* pSvcLocator) : 
-  AthAlgorithm(name, pSvcLocator)
+  AthReentrantAlgorithm(name, pSvcLocator)
 {
   //nop
 }
@@ -35,31 +35,31 @@ SCT_TdaqEnabledTestAlg::initialize() {
 
 //Execute
 StatusCode 
-SCT_TdaqEnabledTestAlg::execute() {
+SCT_TdaqEnabledTestAlg::execute(const EventContext& ctx) const {
   //This method is only used to test the summary service, and only used within this package,
   // so the INFO level messages have no impact on performance of these services when used by clients
   ATH_MSG_INFO("Calling execute");
   ATH_MSG_INFO("Dummy call to module idHash 0: module is ");
-  bool result{m_pTdaqEnabledTool->isGood(IdentifierHash{0})};
+  bool result{m_pTdaqEnabledTool->isGood(IdentifierHash{0}, ctx)};
   ATH_MSG_INFO((result ? "good" : "bad"));
   ATH_MSG_INFO("Dummy call to module Identifier 1: module is ");
-  result=m_pTdaqEnabledTool->isGood(Identifier{1});
+  result=m_pTdaqEnabledTool->isGood(Identifier{1}, ctx);
   ATH_MSG_INFO((result ? "good" : "bad"));
   ATH_MSG_INFO("Using Identifier Hash method: with number 2137 ");
-  result=m_pTdaqEnabledTool->isGood(IdentifierHash{2137});
+  result=m_pTdaqEnabledTool->isGood(IdentifierHash{2137}, ctx);
   ATH_MSG_INFO((result ? "good" : "bad"));
   ATH_MSG_INFO("Dummy call to module idHash 3: module is ");
-  result=m_pTdaqEnabledTool->isGood(IdentifierHash{3});
+  result=m_pTdaqEnabledTool->isGood(IdentifierHash{3}, ctx);
   ATH_MSG_INFO((result ? "good" : "bad"));
   unsigned int printNbad{10}, printNgood{10};
   ATH_MSG_INFO("Printing the first " << printNbad << " bad modules, and the first " << printNgood << " good modules.");
   for (unsigned int i{0}; i<8176; ++i) {
     IdentifierHash idh{i};
-    if (printNbad and (not m_pTdaqEnabledTool->isGood(idh))) {
+    if (printNbad and (not m_pTdaqEnabledTool->isGood(idh, ctx))) {
       ATH_MSG_INFO(i << " is bad.");
       --printNbad;
     }
-    if (printNgood and m_pTdaqEnabledTool->isGood(idh)) {
+    if (printNgood and m_pTdaqEnabledTool->isGood(idh, ctx)) {
       ATH_MSG_INFO(i << " is good.");
       --printNgood;
     }
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_TdaqEnabledTestAlg.h b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_TdaqEnabledTestAlg.h
index 859c32686f90c8abdd4683da2f9b25640b12b031..8264dc23f50f1af0aa59509e692f4798760cf003 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_TdaqEnabledTestAlg.h
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_TdaqEnabledTestAlg.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 /**
@@ -14,7 +14,7 @@
 #define SCT_TdaqEnabledTestAlg_H 
 
 //Athena
-#include "AthenaBaseComps/AthAlgorithm.h"
+#include "AthenaBaseComps/AthReentrantAlgorithm.h"
 #include "SCT_ConditionsTools/ISCT_ConditionsTool.h"
 
 //Gaudi
@@ -24,13 +24,13 @@
 #include <string>
 
 ///Example algorithm to show calling the SCT_ModuleVeto to exclude bad components
-class SCT_TdaqEnabledTestAlg : public AthAlgorithm {
+class SCT_TdaqEnabledTestAlg : public AthReentrantAlgorithm {
  public:
   SCT_TdaqEnabledTestAlg(const std::string& name, ISvcLocator *pSvcLocator);
   virtual ~SCT_TdaqEnabledTestAlg() = default;
 
   StatusCode initialize() override;
-  StatusCode execute() override;
+  StatusCode execute(const EventContext& ctx) const override;
   StatusCode finalize() override;
    
  private:
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsTools/SCT_ConditionsTools/ISCT_ByteStreamErrorsTool.h b/InnerDetector/InDetConditions/SCT_ConditionsTools/SCT_ConditionsTools/ISCT_ByteStreamErrorsTool.h
index a229b5f9db6a81607c2561ce84046fbe51ec99d1..0350b90af779d2a6f4d0b800e6cd06cc13e52ce5 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsTools/SCT_ConditionsTools/ISCT_ByteStreamErrorsTool.h
+++ b/InnerDetector/InDetConditions/SCT_ConditionsTools/SCT_ConditionsTools/ISCT_ByteStreamErrorsTool.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 /**
@@ -11,12 +11,14 @@
 #ifndef ISCT_ByteStreamErrorsTool_h
 #define ISCT_ByteStreamErrorsTool_h
 
-#include <set>
-
 #include "InDetConditionsSummaryService/InDetHierarchy.h"
 #include "SCT_ConditionsTools/ISCT_ConditionsTool.h"
 #include "SCT_ConditionsData/SCT_ByteStreamErrors.h"
 
+#include "GaudiKernel/EventContext.h"
+
+#include <set>
+
 class Identifier;
 class IdentifierHash;
 
@@ -38,6 +40,7 @@ class ISCT_ByteStreamErrorsTool: virtual public ISCT_ConditionsTool {
   //@}
   
   virtual const std::set<IdentifierHash>* getErrorSet(int errorType) const =0;
+  virtual const std::set<IdentifierHash>* getErrorSet(int errorType, const EventContext& ctx) const =0;
 
   virtual bool isRODSimulatedData() const =0;
   virtual bool isRODSimulatedData(const IdentifierHash& elementIdHash) const =0;
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsTools/SCT_ConditionsTools/ISCT_ConditionsTool.h b/InnerDetector/InDetConditions/SCT_ConditionsTools/SCT_ConditionsTools/ISCT_ConditionsTool.h
index a662ef58a294b9e692c9ee0dc23058215b458a7a..4e3370836f668867f63f1d7ff7bfd21e64d00eb7 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsTools/SCT_ConditionsTools/ISCT_ConditionsTool.h
+++ b/InnerDetector/InDetConditions/SCT_ConditionsTools/SCT_ConditionsTools/ISCT_ConditionsTool.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 /**
@@ -11,14 +11,15 @@
 #ifndef ISCT_ConditionsTool_h
 #define ISCT_ConditionsTool_h
 
-//Gaudi Includes
-#include "GaudiKernel/IAlgTool.h"
-
 //Athena includes
 #include "Identifier/Identifier.h"
 #include "Identifier/IdentifierHash.h"
 #include "InDetConditionsSummaryService/InDetHierarchy.h"
 
+//Gaudi Includes
+#include "GaudiKernel/IAlgTool.h"
+#include "GaudiKernel/EventContext.h"
+
 /**
  * @class ISCT_ConditionsTool
  * Base class for SCT conditions tools so they can be used in the summary tool
@@ -35,9 +36,11 @@ class ISCT_ConditionsTool: virtual public IAlgTool {
   
   ///Summarise the result from the service as good/bad
   virtual bool isGood(const Identifier& elementId, InDetConditions::Hierarchy h=InDetConditions::DEFAULT) const =0;
+  virtual bool isGood(const Identifier& elementId, const EventContext& ctx, InDetConditions::Hierarchy h=InDetConditions::DEFAULT) const =0;
   
   //@todo introduce hash identifier method
   virtual bool isGood(const IdentifierHash& hashId) const =0;
+  virtual bool isGood(const IdentifierHash& hashId, const EventContext& ctx) const =0;
 };
 
 #endif // ISCT_ConditionsTool_h
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ByteStreamErrorsTool.cxx b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ByteStreamErrorsTool.cxx
index 44330c086328e4ddfbafc9b14d21448f1bddd109..a66025bc224e57cd1ff6400127486a6987d75af2 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ByteStreamErrorsTool.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ByteStreamErrorsTool.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 /**
@@ -103,16 +103,14 @@ SCT_ByteStreamErrorsTool::canReportAbout(InDetConditions::Hierarchy h) const {
  * result in bad hits or no hits for that event */
  
 bool 
-SCT_ByteStreamErrorsTool::isGood(const IdentifierHash& elementIdHash) const {
-  const EventContext& ctx{Gaudi::Hive::currentContext()};
-  
+SCT_ByteStreamErrorsTool::isGood(const IdentifierHash& elementIdHash, const EventContext& ctx) const {
   if (m_checkRODSimulatedData and isRODSimulatedData(elementIdHash)) return false;
   
   bool result{true};
 
   for (SCT_ByteStreamErrors::errorTypes badError: SCT_ByteStreamErrors::BadErrors) {
-    const std::set<IdentifierHash>& errorSet{getErrorSet(badError, ctx)};
-    result = (errorSet.count(elementIdHash)==0);
+    const std::set<IdentifierHash>* errorSet{getErrorSet(badError, ctx)};
+    result = (errorSet->count(elementIdHash)==0);
     if (not result) return result;
   }
   
@@ -137,13 +135,20 @@ SCT_ByteStreamErrorsTool::isGood(const IdentifierHash& elementIdHash) const {
   return result;
 }
 
+bool
+SCT_ByteStreamErrorsTool::isGood(const IdentifierHash& elementIdHash) const {
+  const EventContext& ctx{Gaudi::Hive::currentContext()};
+
+  return isGood(elementIdHash, ctx);
+}
+
 bool 
-SCT_ByteStreamErrorsTool::isGood(const Identifier& elementId, InDetConditions::Hierarchy h) const {
+SCT_ByteStreamErrorsTool::isGood(const Identifier& elementId, const EventContext& ctx, InDetConditions::Hierarchy h) const {
   if (not canReportAbout(h)) return true;
   
   if (h==InDetConditions::SCT_SIDE) {
     const IdentifierHash elementIdHash{m_sct_id->wafer_hash(elementId)};
-    return isGood(elementIdHash);
+    return isGood(elementIdHash, ctx);
   }
   if (h==InDetConditions::SCT_CHIP) {
     return isGoodChip(elementId);
@@ -152,6 +157,13 @@ SCT_ByteStreamErrorsTool::isGood(const Identifier& elementId, InDetConditions::H
   return true;
 }
 
+bool
+SCT_ByteStreamErrorsTool::isGood(const Identifier& elementId, InDetConditions::Hierarchy h) const {
+  const EventContext& ctx{Gaudi::Hive::currentContext()};
+
+  return isGood(elementId, ctx, h);
+}
+
 bool
 SCT_ByteStreamErrorsTool::isGoodChip(const Identifier& stripId) const {
   // This check assumes present SCT.
@@ -265,9 +277,9 @@ const std::set<IdentifierHash>*
 SCT_ByteStreamErrorsTool::getErrorSet(int errorType) const {
   const EventContext& ctx{Gaudi::Hive::currentContext()};
   if (errorType>=0 and errorType<SCT_ByteStreamErrors::NUM_ERROR_TYPES) {
-    return &getErrorSet(static_cast<SCT_ByteStreamErrors::errorTypes>(errorType), ctx);
+    return getErrorSet(errorType, ctx);
   }
-  return 0;
+  return nullptr;
 }
 
 ////////////////////////////////////////////////////////////////////////
@@ -383,8 +395,8 @@ SCT_ByteStreamErrorsTool::isRODSimulatedData() const {
 bool
 SCT_ByteStreamErrorsTool::isRODSimulatedData(const IdentifierHash& elementIdHash) const {
   const EventContext& ctx{Gaudi::Hive::currentContext()};
-  const std::set<IdentifierHash>& errorSet{getErrorSet(SCT_ByteStreamErrors::RODSimulatedData, ctx)};
-  return (errorSet.count(elementIdHash)!=0);
+  const std::set<IdentifierHash>* errorSet{getErrorSet(SCT_ByteStreamErrors::RODSimulatedData, ctx)};
+  return (errorSet->count(elementIdHash)!=0);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -436,13 +448,13 @@ const InDetDD::SiDetectorElement* SCT_ByteStreamErrorsTool::getDetectorElement(c
   return m_detectorElements->getDetectorElement(waferHash);
 }
 
-const std::set<IdentifierHash>& SCT_ByteStreamErrorsTool::getErrorSet(SCT_ByteStreamErrors::errorTypes errorType, const EventContext& ctx) const {
+const std::set<IdentifierHash>* SCT_ByteStreamErrorsTool::getErrorSet(int errorType, const EventContext& ctx) const {
   StatusCode sc{fillData(ctx)};
   if (sc.isFailure()) {
     ATH_MSG_ERROR("fillData in getErrorSet fails");
   }
 
-  return m_bsErrors[errorType][ctx.slot()];
+  return &m_bsErrors[errorType][ctx.slot()];
 }
 
 const std::map<Identifier, unsigned int>& SCT_ByteStreamErrorsTool::getTempMaskedChips(const EventContext& ctx) const { 
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ByteStreamErrorsTool.h b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ByteStreamErrorsTool.h
index b4c37254fb88f32a2afecf78a6abb91e48da1694..7a612ce579d8b3e6e001d695df878fcaabc37bc5 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ByteStreamErrorsTool.h
+++ b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ByteStreamErrorsTool.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 /**
@@ -59,9 +59,12 @@ public:
   
   ///Is the detector element good?
   virtual bool isGood(const Identifier& elementId, InDetConditions::Hierarchy h=InDetConditions::DEFAULT) const override;
+  virtual bool isGood(const Identifier& elementId, const EventContext& ctx, InDetConditions::Hierarchy h=InDetConditions::DEFAULT) const override;
   virtual bool isGood(const IdentifierHash& elementIdHash) const override;
+  virtual bool isGood(const IdentifierHash& elementIdHash, const EventContext& ctx) const override;
   
   const std::set<IdentifierHash>* getErrorSet(int errorType) const override; // Used by SCTRawDataProviderTool and others
+  const std::set<IdentifierHash>* getErrorSet(int errorType, const EventContext& ctx) const override; // Used by SCTRawDataProviderTool and others
 
   virtual unsigned int tempMaskedChips(const Identifier& moduleId) const override; // Internally used
   virtual unsigned int abcdErrorChips(const Identifier& moduleId) const override; // Internally used
@@ -111,7 +114,6 @@ private:
   const SCT_ByteStreamFractionContainer* getFracData() const;
   const InDetDD::SiDetectorElement* getDetectorElement(const IdentifierHash& waferHash) const;
 
-  const std::set<IdentifierHash>& getErrorSet(SCT_ByteStreamErrors::errorTypes errorType, const EventContext& ctx) const;
   const std::map<Identifier, unsigned int>& getTempMaskedChips(const EventContext& ctx) const;
   const std::map<Identifier, unsigned int>& getAbcdErrorChips(const EventContext& ctx) const;
 };
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ConditionsSummaryTool.cxx b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ConditionsSummaryTool.cxx
index d2bcf1ea07e39f6406f99b4a137895a53fcb72fa..f4805fd3dca1d54cc82f00a07aac0b5c4063a61a 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ConditionsSummaryTool.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ConditionsSummaryTool.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 /**
@@ -11,6 +11,8 @@
 #include "SCT_ConditionsSummaryTool.h"
 #include "SCT_ConditionsTools/ISCT_ConditionsTool.h"
 
+#include "GaudiKernel/EventContext.h"
+
 using namespace std;
 
 // Constructor
@@ -64,8 +66,9 @@ SCT_ConditionsSummaryTool::activeFraction(const IdentifierHash& elementHash, con
 bool
 SCT_ConditionsSummaryTool::isGood(const Identifier& elementId, const InDetConditions::Hierarchy h) const {
   if (not m_noReports) {
+    const EventContext& ctx{Gaudi::Hive::currentContext()};
     for (const ToolHandle<ISCT_ConditionsTool>& tool: m_toolHandles) {
-      if (tool->canReportAbout(h) and (not tool->isGood(elementId, h))) return false;
+      if (tool->canReportAbout(h) and (not tool->isGood(elementId, ctx, h))) return false;
     }
   }
   return true;
@@ -74,8 +77,9 @@ SCT_ConditionsSummaryTool::isGood(const Identifier& elementId, const InDetCondit
 bool
 SCT_ConditionsSummaryTool::isGood(const IdentifierHash& elementHash) const {
   if (not m_noReports) {
+    const EventContext& ctx{Gaudi::Hive::currentContext()};
     for (const ToolHandle<ISCT_ConditionsTool>& tool: m_toolHandles) {
-      if (tool->canReportAbout(InDetConditions::SCT_SIDE) and (not tool->isGood(elementHash))) return false;
+      if (tool->canReportAbout(InDetConditions::SCT_SIDE) and (not tool->isGood(elementHash, ctx))) return false;
     }    
   }
   return true;
@@ -84,8 +88,9 @@ SCT_ConditionsSummaryTool::isGood(const IdentifierHash& elementHash) const {
 bool
 SCT_ConditionsSummaryTool::isGood(const IdentifierHash& /*elementHash*/, const Identifier& elementId) const {
   if (not m_noReports) {
+    const EventContext& ctx{Gaudi::Hive::currentContext()};
     for (const ToolHandle<ISCT_ConditionsTool>& tool: m_toolHandles) {
-      if (tool->canReportAbout(InDetConditions::SCT_STRIP) and (not tool->isGood(elementId))) return false;
+      if (tool->canReportAbout(InDetConditions::SCT_STRIP) and (not tool->isGood(elementId, ctx))) return false;
     } 
   }
   return true;
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ConfigurationConditionsTool.cxx b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ConfigurationConditionsTool.cxx
index cbce7855b989ff31e8e34f612795609f0021385e..d141efb67a106dd40e072e3e4da0c8c0f25d1382 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ConfigurationConditionsTool.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ConfigurationConditionsTool.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "SCT_ConfigurationConditionsTool.h"
@@ -53,10 +53,9 @@ bool SCT_ConfigurationConditionsTool::canReportAbout(InDetConditions::Hierarchy
 }
 
 // Is an element with this Identifier and hierachy good?
-bool SCT_ConfigurationConditionsTool::isGood(const Identifier& elementId, InDetConditions::Hierarchy h) const {
+bool SCT_ConfigurationConditionsTool::isGood(const Identifier& elementId, const EventContext& ctx, InDetConditions::Hierarchy h) const {
   if (not canReportAbout(h)) return true;
 
-  const EventContext& ctx{Gaudi::Hive::currentContext()};
   const SCT_ConfigurationCondData* condData{getCondData(ctx)};
   if (condData==nullptr) {
     ATH_MSG_ERROR("In isGood, SCT_ConfigurationCondData pointer cannot be retrieved");
@@ -79,10 +78,22 @@ bool SCT_ConfigurationConditionsTool::isGood(const Identifier& elementId, InDetC
   return result;
 }
 
+bool SCT_ConfigurationConditionsTool::isGood(const Identifier& elementId, InDetConditions::Hierarchy h) const {
+  const EventContext& ctx{Gaudi::Hive::currentContext()};
+
+  return isGood(elementId, ctx, h);
+}
+
 // Is a wafer with this IdentifierHash good?
-bool SCT_ConfigurationConditionsTool::isGood(const IdentifierHash& hashId) const {
+bool SCT_ConfigurationConditionsTool::isGood(const IdentifierHash& hashId, const EventContext& ctx) const {
   const Identifier elementId{m_pHelper->wafer_id(hashId)};
-  return isGood(elementId);
+  return isGood(elementId, ctx);
+}
+
+bool SCT_ConfigurationConditionsTool::isGood(const IdentifierHash& hashId) const {
+  const EventContext& ctx{Gaudi::Hive::currentContext()};
+
+  return isGood(hashId, ctx);
 }
 
 // Is a chip with this Identifier good?
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ConfigurationConditionsTool.h b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ConfigurationConditionsTool.h
index 3c62d34d62b1137e4c61a22b23a314de91ccf590..f688f55a0d39fe19016bfcb106474dced5cc583c 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ConfigurationConditionsTool.h
+++ b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ConfigurationConditionsTool.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 /**
@@ -53,9 +53,11 @@ class SCT_ConfigurationConditionsTool: public extends<AthAlgTool, ISCT_Configura
   
   /**Is the detector element good?*/
   virtual bool                          isGood(const Identifier& elementId, InDetConditions::Hierarchy h=InDetConditions::DEFAULT) const override;
+  virtual bool                          isGood(const Identifier& elementId, const EventContext& ctx, InDetConditions::Hierarchy h=InDetConditions::DEFAULT) const override;
   
   /**Is it good?, using wafer hash*/
   virtual bool                          isGood(const IdentifierHash& hashId) const override;
+  virtual bool                          isGood(const IdentifierHash& hashId, const EventContext& ctx) const override;
 
   /**List of bad modules*/
   virtual const std::set<Identifier>*   badModules() const override;
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_DCSConditionsTool.cxx b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_DCSConditionsTool.cxx
index 6a8f83d3324be91f6239f8c3900e731457c48a04..d4ee921748556eb63a0fc148094458598537fa02 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_DCSConditionsTool.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_DCSConditionsTool.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 // New SCT_DCSConditions Tool, based on existing tool in SCT_ConditionsAlgs
@@ -86,12 +86,11 @@ Identifier SCT_DCSConditionsTool::getModuleID(const Identifier& elementId, InDet
 }
 
 //Returns if element Id is good or bad
-bool SCT_DCSConditionsTool::isGood(const Identifier& elementId, InDetConditions::Hierarchy h) const {
+bool SCT_DCSConditionsTool::isGood(const Identifier& elementId, const EventContext& ctx, InDetConditions::Hierarchy h) const {
   Identifier moduleId=getModuleID(elementId, h);
   if (not moduleId.is_valid()) return true; // not canreportabout
 
   if ((m_readAllDBFolders and m_returnHVTemp) or (not m_readAllDBFolders and not m_returnHVTemp)) {
-    const EventContext& ctx{Gaudi::Hive::currentContext()};
     const SCT_DCSStatCondData* condDataState{getCondDataState(ctx)};
     if (!condDataState) return false; // no cond data
     else if (condDataState->output(castId(moduleId))==0) return true; //No params are listed as bad
@@ -101,11 +100,23 @@ bool SCT_DCSConditionsTool::isGood(const Identifier& elementId, InDetConditions:
   }
 }
 
+bool SCT_DCSConditionsTool::isGood(const Identifier& elementId, InDetConditions::Hierarchy h) const {
+  const EventContext& ctx{Gaudi::Hive::currentContext()};
+
+  return isGood(elementId, ctx, h);
+}
+
 //Does the same for hashIds
+bool SCT_DCSConditionsTool::isGood(const IdentifierHash& hashId, const EventContext& ctx) const {
+  Identifier waferId{m_pHelper->wafer_id(hashId)};
+  Identifier moduleId{m_pHelper->module_id(waferId)};
+  return isGood(moduleId, ctx, InDetConditions::SCT_MODULE);
+}
+
 bool SCT_DCSConditionsTool::isGood(const IdentifierHash& hashId) const {
-  Identifier waferId = m_pHelper->wafer_id(hashId);
-  Identifier moduleId = m_pHelper->module_id(waferId);
-  return isGood(moduleId, InDetConditions::SCT_MODULE);
+  const EventContext& ctx{Gaudi::Hive::currentContext()};
+
+  return isGood(hashId, ctx);
 }
 
 /////////////////////////////////// 
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_DCSConditionsTool.h b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_DCSConditionsTool.h
index 563d492305eb8c934c350ed53d18fa82434424a7..6ba11daf85ae9e8117bbf17804a3fdc508b4eee1 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_DCSConditionsTool.h
+++ b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_DCSConditionsTool.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef SCT_DCSConditionsTool_h
@@ -52,8 +52,10 @@ public:
   virtual Identifier getModuleID(const Identifier& elementId, InDetConditions::Hierarchy h) const;
   ///Summarise the result from the service as good/bad
   virtual bool isGood(const Identifier& elementId, InDetConditions::Hierarchy h=InDetConditions::DEFAULT) const override;
+  virtual bool isGood(const Identifier& elementId, const EventContext& ctx, InDetConditions::Hierarchy h=InDetConditions::DEFAULT) const override;
   ///is it good?, using wafer hash
   virtual bool isGood(const IdentifierHash& hashId) const override;
+  virtual bool isGood(const IdentifierHash& hashId, const EventContext& ctx) const override;
   //Returns HV (0 if there is no information)
   virtual float modHV(const Identifier& elementId, InDetConditions::Hierarchy h=InDetConditions::DEFAULT) const override;
   //Does the same for hashIds
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_FlaggedConditionTool.cxx b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_FlaggedConditionTool.cxx
index d37936efcdbd3c806198a15ace99f04295cee2ea..2d2fcabbf71cbcc91d8a847a01f1ddbaaa962b96 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_FlaggedConditionTool.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_FlaggedConditionTool.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "SCT_FlaggedConditionTool.h"
@@ -53,15 +53,21 @@ bool SCT_FlaggedConditionTool::canReportAbout(InDetConditions::Hierarchy h) cons
 }
 
 // Is this element good (by Identifier)?
-bool SCT_FlaggedConditionTool::isGood(const Identifier& elementId, InDetConditions::Hierarchy h) const {
+bool SCT_FlaggedConditionTool::isGood(const Identifier& elementId, const EventContext& ctx, InDetConditions::Hierarchy h) const {
   if (not canReportAbout(h)) return true;
-  const IdentifierHash hashId = m_sctID->wafer_hash(elementId);
-  return isGood(hashId);
+  const IdentifierHash hashId{m_sctID->wafer_hash(elementId)};
+  return isGood(hashId, ctx);
+}
+
+bool SCT_FlaggedConditionTool::isGood(const Identifier& elementId, InDetConditions::Hierarchy h) const {
+  const EventContext& ctx{Gaudi::Hive::currentContext()};
+
+  return isGood(elementId, ctx, h);
 }
 
 // Is this element good (by IdentifierHash)?
-bool SCT_FlaggedConditionTool::isGood(const IdentifierHash& hashId) const {
-  const SCT_FlaggedCondData* badIds{getCondData()};
+bool SCT_FlaggedConditionTool::isGood(const IdentifierHash& hashId, const EventContext& ctx) const {
+  const SCT_FlaggedCondData* badIds{getCondData(ctx)};
   if (badIds==nullptr) {
     ATH_MSG_ERROR("SCT_FlaggedCondData cannot be retrieved. (isGood)");
     return false;
@@ -70,12 +76,20 @@ bool SCT_FlaggedConditionTool::isGood(const IdentifierHash& hashId) const {
   return (badIds->find(hashId) == badIds->end());
 }
 
+bool SCT_FlaggedConditionTool::isGood(const IdentifierHash& hashId) const {
+  const EventContext& ctx{Gaudi::Hive::currentContext()};
+
+  return isGood(hashId, ctx);
+}
+
 // Retrieve the reason why the wafer is flagged as bad (by IdentifierHash)
 // If wafer is not found return a null string
 const std::string& SCT_FlaggedConditionTool::details(const IdentifierHash& hashId) const {
   static const std::string nullString;
 
-  const SCT_FlaggedCondData* badIds{getCondData()};
+  const EventContext& ctx{Gaudi::Hive::currentContext()};
+
+  const SCT_FlaggedCondData* badIds{getCondData(ctx)};
   if (badIds==nullptr) {
     ATH_MSG_ERROR("SCT_FlaggedCondData cannot be retrieved. (details)");
     return nullString;
@@ -93,7 +107,9 @@ const std::string& SCT_FlaggedConditionTool::details(const Identifier& Id) const
 }
 
 int SCT_FlaggedConditionTool::numBadIds() const {
-  const SCT_FlaggedCondData* badIds{getCondData()};
+  const EventContext& ctx{Gaudi::Hive::currentContext()};
+
+  const SCT_FlaggedCondData* badIds{getCondData(ctx)};
   if (badIds==nullptr) {
     ATH_MSG_ERROR("SCT_FlaggedCondData cannot be retrieved. (numBadIds)");
     return -1;
@@ -103,11 +119,13 @@ int SCT_FlaggedConditionTool::numBadIds() const {
 }
 
 const SCT_FlaggedCondData* SCT_FlaggedConditionTool::getBadIds() const {
-  return getCondData();
+  const EventContext& ctx{Gaudi::Hive::currentContext()};
+
+  return getCondData(ctx);
 }
 
-const SCT_FlaggedCondData* SCT_FlaggedConditionTool::getCondData() const {
-  SG::ReadHandle<SCT_FlaggedCondData> condData{m_badIds};
+const SCT_FlaggedCondData* SCT_FlaggedConditionTool::getCondData(const EventContext& ctx) const {
+  SG::ReadHandle<SCT_FlaggedCondData> condData{m_badIds, ctx};
   if (not condData.isValid()) {
     ATH_MSG_ERROR("Failed to get " << m_badIds.key());
     return nullptr;
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_FlaggedConditionTool.h b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_FlaggedConditionTool.h
index c897170673638f4716062fd6e597037895335a5a..b3ee3a21bcd3ecca4f8a145c37bf03f877c76b47 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_FlaggedConditionTool.h
+++ b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_FlaggedConditionTool.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 /*
@@ -43,7 +43,9 @@ public:
   
   /**Is the detector element good?*/
   virtual bool isGood(const Identifier& elementId, InDetConditions::Hierarchy h=InDetConditions::DEFAULT) const override;
+  virtual bool isGood(const Identifier& elementId, const EventContext& ctx, InDetConditions::Hierarchy h=InDetConditions::DEFAULT) const override;
   virtual bool isGood(const IdentifierHash& hashId) const override;
+  virtual bool isGood(const IdentifierHash& hashId, const EventContext& ctx) const override;
 
   /**Get the reason why the wafer is bad (by Identifier)*/ 
   virtual const std::string& details(const Identifier& id) const override;
@@ -61,7 +63,7 @@ public:
 
   const SCT_ID* m_sctID; //!< ID helper for SCT
 
-  const SCT_FlaggedCondData* getCondData() const;
+  const SCT_FlaggedCondData* getCondData(const EventContext& ctx) const;
 };
 
 #endif // SCT_FlaggedConditionTool_h
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_LinkMaskingTool.cxx b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_LinkMaskingTool.cxx
index 82103b7472a598d608a5dce85bb62ee7843c4237..b4860fcbad85a27fa4d11c25a34c91b75cd36fe5 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_LinkMaskingTool.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_LinkMaskingTool.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "SCT_LinkMaskingTool.h"
@@ -45,10 +45,9 @@ bool SCT_LinkMaskingTool::canReportAbout(InDetConditions::Hierarchy h) const {
 }
 
 // Is an element with this Identifier and hierachy good?
-bool SCT_LinkMaskingTool::isGood(const Identifier& elementId, InDetConditions::Hierarchy h) const {
+bool SCT_LinkMaskingTool::isGood(const Identifier& elementId, const EventContext& ctx, InDetConditions::Hierarchy h) const {
   if (not canReportAbout(h)) return true;
 
-  const EventContext& ctx{Gaudi::Hive::currentContext()};
   const SCT_ModuleVetoCondData* condData{getCondData(ctx)};
   // If database cannot be retrieved, all wafer IDs are good.
   if (condData==nullptr) return true;
@@ -57,10 +56,22 @@ bool SCT_LinkMaskingTool::isGood(const Identifier& elementId, InDetConditions::H
   return (not condData->isBadWaferId(elementId));
 }
 
+bool SCT_LinkMaskingTool::isGood(const Identifier& elementId, InDetConditions::Hierarchy h) const {
+  const EventContext& ctx{Gaudi::Hive::currentContext()};
+
+  return isGood(elementId, ctx, h);
+}
+
 // Is a wafer with this IdentifierHash good?
-bool SCT_LinkMaskingTool::isGood(const IdentifierHash& hashId) const {
+bool SCT_LinkMaskingTool::isGood(const IdentifierHash& hashId, const EventContext& ctx) const {
   Identifier elementId{m_sctHelper->wafer_id(hashId)};
-  return isGood(elementId);
+  return isGood(elementId, ctx);
+}
+
+bool SCT_LinkMaskingTool::isGood(const IdentifierHash& hashId) const {
+  const EventContext& ctx{Gaudi::Hive::currentContext()};
+
+  return isGood(hashId, ctx);
 }
 
 const SCT_ModuleVetoCondData*
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_LinkMaskingTool.h b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_LinkMaskingTool.h
index a81b4076b77bbee7bf1fc36914fcb6575a954e90..ed863c0badca53d50cefe10857378f80b690a4a6 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_LinkMaskingTool.h
+++ b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_LinkMaskingTool.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 /**
@@ -49,9 +49,11 @@ public:
   
   /**Is the detector element good?*/
   virtual bool isGood(const Identifier& elementId, InDetConditions::Hierarchy h=InDetConditions::DEFAULT) const override;
+  virtual bool isGood(const Identifier& elementId, const EventContext& ctx, InDetConditions::Hierarchy h=InDetConditions::DEFAULT) const override;
   
   /**Is it good?, using wafer hash*/
   virtual bool isGood(const IdentifierHash& hashId) const override;
+  virtual bool isGood(const IdentifierHash& hashId, const EventContext& ctx) const override;
 
 private:
   const SCT_ID* m_sctHelper; //!< ID helper for SCT
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ModuleVetoTool.cxx b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ModuleVetoTool.cxx
index d5fc6dc7ba3be0a79712ede025b6da97d12c9894..6578442221349aad978b115f293bbadd3bd6c08c 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ModuleVetoTool.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ModuleVetoTool.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 /**
@@ -99,7 +99,7 @@ SCT_ModuleVetoTool::canReportAbout(InDetConditions::Hierarchy h) const {
 }
 
 bool 
-SCT_ModuleVetoTool::isGood(const Identifier& elementId, InDetConditions::Hierarchy h) const {
+SCT_ModuleVetoTool::isGood(const Identifier& elementId, const EventContext& ctx, InDetConditions::Hierarchy h) const {
   if (not canReportAbout(h)) return true;
 
   // Bad wafer in properties
@@ -107,7 +107,6 @@ SCT_ModuleVetoTool::isGood(const Identifier& elementId, InDetConditions::Hierarc
   // If database is not used, all wafer IDs here should be good.
   if (not m_useDatabase) return true;
 
-  const EventContext& ctx{Gaudi::Hive::currentContext()};
   const SCT_ModuleVetoCondData* condData{getCondData(ctx)};
   // If database cannot be retrieved, all wafer IDs are good.
   if (condData==nullptr) return true;
@@ -117,9 +116,23 @@ SCT_ModuleVetoTool::isGood(const Identifier& elementId, InDetConditions::Hierarc
 }
 
 bool 
-SCT_ModuleVetoTool::isGood(const IdentifierHash& hashId) const {
+SCT_ModuleVetoTool::isGood(const Identifier& elementId, InDetConditions::Hierarchy h) const {
+  const EventContext& ctx{Gaudi::Hive::currentContext()};
+
+  return isGood(elementId, ctx, h);
+}
+
+bool 
+SCT_ModuleVetoTool::isGood(const IdentifierHash& hashId, const EventContext& ctx) const {
   Identifier elementId{m_pHelper->wafer_id(hashId)};
-  return isGood(elementId);
+  return isGood(elementId, ctx);
+}
+
+bool
+SCT_ModuleVetoTool::isGood(const IdentifierHash& hashId) const {
+  const EventContext& ctx{Gaudi::Hive::currentContext()};
+
+  return isGood(hashId, ctx);
 }
 
 StatusCode 
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ModuleVetoTool.h b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ModuleVetoTool.h
index 7e06a86f76623b7cc0ed53ef7c6fc4eeec2e19b1..cca07e4a6f425959e97fc4453304abd78b7e2169 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ModuleVetoTool.h
+++ b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ModuleVetoTool.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 /**
@@ -50,9 +50,11 @@ class SCT_ModuleVetoTool: public extends<AthAlgTool, ISCT_ConditionsTool> {
   
   ///Is the detector element good?
   virtual bool isGood(const Identifier& elementId, InDetConditions::Hierarchy h=InDetConditions::DEFAULT) const override;
+  virtual bool isGood(const Identifier& elementId, const EventContext& ctx, InDetConditions::Hierarchy h=InDetConditions::DEFAULT) const override;
   
   ///is it good?, using wafer hash
   virtual bool isGood(const IdentifierHash& hashId) const override;
+  virtual bool isGood(const IdentifierHash& hashId, const EventContext& ctx) const override;
 
  private:
   StringArrayProperty m_badElements; //list of bad detector elements (= module sides)
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_MonitorConditionsTool.cxx b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_MonitorConditionsTool.cxx
index 9ccec0acf2a863b2786485edcf2a0b9e5f15038b..91fdba0a24d6285f830c04fb08ff501b869066d2 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_MonitorConditionsTool.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_MonitorConditionsTool.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 /**
@@ -81,11 +81,11 @@ SCT_MonitorConditionsTool::canReportAbout(InDetConditions::Hierarchy h) const {
 ///////////////////////////////////////////////////////////////////////////////////
 
 bool
-SCT_MonitorConditionsTool::isGood(const Identifier& elementId, InDetConditions::Hierarchy h) const {
+SCT_MonitorConditionsTool::isGood(const Identifier& elementId, const EventContext& ctx, InDetConditions::Hierarchy h) const {
   Identifier waferid{m_pHelper->wafer_id(elementId)};
   Identifier iimodule{m_pHelper->module_id(waferid)};
   // defectlist is based on each module
-  std::string defectlist{getList(iimodule)};
+  std::string defectlist{getList(iimodule, ctx)};
 
   if (not defectlist.empty()) {
     switch (h) {
@@ -107,11 +107,28 @@ SCT_MonitorConditionsTool::isGood(const Identifier& elementId, InDetConditions::
 
 ///////////////////////////////////////////////////////////////////////////////////
 
+bool
+SCT_MonitorConditionsTool::isGood(const Identifier& elementId, InDetConditions::Hierarchy h) const {
+  const EventContext& ctx{Gaudi::Hive::currentContext()};
+
+  return isGood(elementId, ctx, h);
+}
+
+///////////////////////////////////////////////////////////////////////////////////
+
 bool 
-SCT_MonitorConditionsTool::isGood(const IdentifierHash& hashId) const {
-  //bool result(true);
+SCT_MonitorConditionsTool::isGood(const IdentifierHash& hashId, const EventContext& ctx) const {
   Identifier elementId{m_pHelper->wafer_id(hashId)};
-  return isGood(elementId);
+  return isGood(elementId, ctx);
+}
+
+//////////////////////////////////////////////////////////////////////////////////////////
+
+bool
+SCT_MonitorConditionsTool::isGood(const IdentifierHash& hashId) const {
+  const EventContext& ctx{Gaudi::Hive::currentContext()};
+
+  return isGood(hashId, ctx);
 }
 
 //////////////////////////////////////////////////////////////////////////////////////////
@@ -132,9 +149,11 @@ SCT_MonitorConditionsTool::badStrips(std::set<Identifier>& strips) const {
 
 void
 SCT_MonitorConditionsTool::badStrips(const Identifier& moduleId, std::set<Identifier>& strips) const {
+  const EventContext& ctx{Gaudi::Hive::currentContext()};
+
   // Set of bad strip Identifers for a given module
   // Get defect string and check it is sensible, i.e. non-empty and contains numbers
-  std::string defectStr{getList(moduleId)};
+  std::string defectStr{getList(moduleId, ctx)};
   if (doesNotHaveNumbers(defectStr)) return;
 
   // Expand the string
@@ -163,7 +182,9 @@ SCT_MonitorConditionsTool::badStrips(const Identifier& moduleId, std::set<Identi
 
 std::string 
 SCT_MonitorConditionsTool::badStripsAsString(const Identifier& moduleId) const {
-   return getList(moduleId);
+  const EventContext& ctx{Gaudi::Hive::currentContext()};
+
+  return getList(moduleId, ctx);
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////
@@ -171,9 +192,8 @@ SCT_MonitorConditionsTool::badStripsAsString(const Identifier& moduleId) const {
 //////////////////////////////////////////////////////////////////////////////////////////
 
 std::string
-SCT_MonitorConditionsTool::getList(const Identifier& moduleId) const {
+SCT_MonitorConditionsTool::getList(const Identifier& moduleId, const EventContext& ctx) const {
   string currentDefectList{""};
-  const EventContext& ctx{Gaudi::Hive::currentContext()};
   const SCT_MonitorCondData* condData{getCondData(ctx)};
   if (condData) {
     const IdentifierHash moduleHash{m_pHelper->wafer_hash(moduleId)};
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_MonitorConditionsTool.h b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_MonitorConditionsTool.h
index c821150c5aafee7ec51d19a6f8f34d769cfee687..a8f97efd874165a24a5fe1e7f7e531b8e96eaef3 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_MonitorConditionsTool.h
+++ b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_MonitorConditionsTool.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef SCT_MONITORCONDITIONSTOOL_SCT_MONITORCONDITIONSTOOL_H
@@ -48,9 +48,11 @@ public:
 
   ///Is the detector element good?
   virtual bool isGood(const Identifier& elementId, InDetConditions::Hierarchy h=InDetConditions::DEFAULT) const override;
+  virtual bool isGood(const Identifier& elementId, const EventContext& ctx, InDetConditions::Hierarchy h=InDetConditions::DEFAULT) const override;
 
   ///is it good?, using wafer hash
   virtual bool isGood(const IdentifierHash& hashId) const override;
+  virtual bool isGood(const IdentifierHash& hashId, const EventContext& ctx) const override;
 
   /// List of bad strip Identifiers
   virtual void badStrips(std::set<Identifier>& strips) const override;
@@ -65,7 +67,7 @@ private:
   // ------------------------------------------------------------------------------------
   // local stuff 
   // ------------------------------------------------------------------------------------
-  std::string getList(const Identifier& imodule) const;
+  std::string getList(const Identifier& imodule, const EventContext& ctx) const;
 
   bool stripIsNoisy(const int strip, const std::string& defectList) const;
 
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_RODVetoTool.cxx b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_RODVetoTool.cxx
index 5465e58e78c020515923c0f7cb382b66b6e423b6..0868cfe8ca543712eb6c4c287b52134a30623671 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_RODVetoTool.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_RODVetoTool.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 /**
@@ -56,9 +56,9 @@ SCT_RODVetoTool::canReportAbout(InDetConditions::Hierarchy h) const {
 }
 
 bool 
-SCT_RODVetoTool::isGood(const Identifier& elementId, InDetConditions::Hierarchy h) const {
+SCT_RODVetoTool::isGood(const Identifier& elementId, const EventContext& ctx, InDetConditions::Hierarchy h) const {
   if (not canReportAbout(h)) return true;
-  const IdentifierSet* badIds{getCondData()};
+  const IdentifierSet* badIds{getCondData(ctx)};
   if (badIds==nullptr) {
     ATH_MSG_ERROR("IdentifierSet cannot be retrieved in isGood. true is returned.");
     return true;
@@ -68,15 +68,29 @@ SCT_RODVetoTool::isGood(const Identifier& elementId, InDetConditions::Hierarchy
 }
 
 bool 
-SCT_RODVetoTool::isGood(const IdentifierHash& hashId) const {
+SCT_RODVetoTool::isGood(const Identifier& elementId, InDetConditions::Hierarchy h) const {
+  const EventContext& ctx{Gaudi::Hive::currentContext()};
+
+  return isGood(elementId, ctx, h);
+}
+
+bool 
+SCT_RODVetoTool::isGood(const IdentifierHash& hashId, const EventContext& ctx) const {
   Identifier elementId{m_pHelper->wafer_id(hashId)};
   Identifier moduleId{m_pHelper->module_id(elementId)};
-  return isGood(moduleId);
+  return isGood(moduleId, ctx);
+}
+
+bool 
+SCT_RODVetoTool::isGood(const IdentifierHash& hashId) const {
+  const EventContext& ctx{Gaudi::Hive::currentContext()};
+
+  return isGood(hashId, ctx);
 }
 
 const IdentifierSet*
-SCT_RODVetoTool::getCondData() const {
-  SG::ReadHandle<IdentifierSet> condData{m_badModuleIds};
+SCT_RODVetoTool::getCondData(const EventContext& ctx) const {
+  SG::ReadHandle<IdentifierSet> condData{m_badModuleIds, ctx};
   if (not condData.isValid()) {
     ATH_MSG_ERROR("Failed to get " << m_badModuleIds.key());
     return nullptr;
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_RODVetoTool.h b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_RODVetoTool.h
index 627c50b4880066e2937a98a4880056b849d0d376..6eef5e8fb8ca8d62b9e9021960dfcd38547d1ad5 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_RODVetoTool.h
+++ b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_RODVetoTool.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 /**
@@ -51,13 +51,15 @@ public:
   
   ///Is the detector element good?
   virtual bool isGood(const Identifier& elementId, InDetConditions::Hierarchy h=InDetConditions::DEFAULT) const override;
+  virtual bool isGood(const Identifier& elementId, const EventContext& ctx, InDetConditions::Hierarchy h=InDetConditions::DEFAULT) const override;
   
   ///is it good?, using wafer hash
   virtual bool isGood(const IdentifierHash& hashId) const override;
+  virtual bool isGood(const IdentifierHash& hashId, const EventContext& ctx) const override;
 
 private:
 
-  const IdentifierSet* getCondData() const;
+  const IdentifierSet* getCondData(const EventContext& ctx) const;
 
   // The vector of bad rods should be kept in a threadsafe way so it can 
   // be called and read safely.
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ReadCalibChipDataTool.cxx b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ReadCalibChipDataTool.cxx
index a3be15a7211d074185f314de8859bb70dcc07e8a..778c507e99434bbbd6fb1eab57f8b5950512d44c 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ReadCalibChipDataTool.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ReadCalibChipDataTool.cxx
@@ -1,5 +1,5 @@
- /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+/*
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 /** @file SCT_ReadCalibChipDataTool.cxx Implementation file for SCT_ReadCalibChipDataTool.
@@ -62,9 +62,8 @@ SCT_ReadCalibChipDataTool::canReportAbout(InDetConditions::Hierarchy h) const {
 //----------------------------------------------------------------------
 // Returns a bool summary of the data
 bool
-SCT_ReadCalibChipDataTool::isGood(const IdentifierHash& elementHashId) const {
+SCT_ReadCalibChipDataTool::isGood(const IdentifierHash& elementHashId, const EventContext& ctx) const {
   // Retrieve SCT_NoiseCalibData pointer
-  const EventContext& ctx{Gaudi::Hive::currentContext()};
   const SCT_NoiseCalibData* condDataNoise{getCondDataNoise(ctx)};
   if (condDataNoise==nullptr) {
     ATH_MSG_ERROR("In isGood, SCT_NoiseCalibData cannot be retrieved");
@@ -103,13 +102,20 @@ SCT_ReadCalibChipDataTool::isGood(const IdentifierHash& elementHashId) const {
   return (meanNoiseValue < m_noiseLevel);
 } //SCT_ReadCalibChipDataTool::summary()
 
+bool
+SCT_ReadCalibChipDataTool::isGood(const IdentifierHash& elementHashId) const {
+  const EventContext& ctx{Gaudi::Hive::currentContext()};
+
+  return isGood(elementHashId, ctx);
+}
+
 //----------------------------------------------------------------------
 // Returns a bool summary of the data
 bool
-SCT_ReadCalibChipDataTool::isGood(const Identifier& elementId, InDetConditions::Hierarchy h) const {
+SCT_ReadCalibChipDataTool::isGood(const Identifier& elementId, const EventContext& ctx, InDetConditions::Hierarchy h) const {
   if (h==InDetConditions::SCT_SIDE) { //Could do by chip too
     const IdentifierHash elementIdHash{m_id_sct->wafer_hash(elementId)};
-    return isGood(elementIdHash);
+    return isGood(elementIdHash, ctx);
   } else{
     // Not applicable for Calibration data
     ATH_MSG_WARNING("summary(): " << h << "good/bad is not applicable for Calibration data");
@@ -117,6 +123,13 @@ SCT_ReadCalibChipDataTool::isGood(const Identifier& elementId, InDetConditions::
   }
 }
 
+bool
+SCT_ReadCalibChipDataTool::isGood(const Identifier& elementId, InDetConditions::Hierarchy h) const {
+  const EventContext& ctx{Gaudi::Hive::currentContext()};
+
+  return isGood(elementId, ctx, h);
+}
+
 //----------------------------------------------------------------------
 std::vector<float> 
 SCT_ReadCalibChipDataTool::getNPtGainData(const Identifier& moduleId, const int side, const std::string& datatype) const {
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ReadCalibChipDataTool.h b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ReadCalibChipDataTool.h
index 142897aed12280d6226d164e6331f8ad7509415c..29d53f8921b11bef95e77db10c919f18b60a8513 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ReadCalibChipDataTool.h
+++ b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ReadCalibChipDataTool.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 /** @file SCT_ReadCalibChipDataTool.h Header file for SCT_ReadCalibChipDataTool.
@@ -50,8 +50,10 @@ class SCT_ReadCalibChipDataTool: public extends<AthAlgTool, ISCT_ReadCalibChipDa
   virtual bool canReportAbout(InDetConditions::Hierarchy h) const override;
   ///Summarise the result from the service as good/bad
   virtual bool isGood(const Identifier& elementId, InDetConditions::Hierarchy h=InDetConditions::DEFAULT) const override;
+  virtual bool isGood(const Identifier& elementId, const EventContext& ctx, InDetConditions::Hierarchy h=InDetConditions::DEFAULT) const override;
   ///same thing with id hash, introduced by shaun with dummy method for now
   virtual bool isGood(const IdentifierHash& hashId) const override;
+  virtual bool isGood(const IdentifierHash& hashId, const EventContext& ctx) const override;
   //@}
   
   // Methods to return calibration data
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ReadCalibDataTool.cxx b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ReadCalibDataTool.cxx
index f17e40e1b21954e36f2108ca7b4b3a04849c7068..d617bd637be5ba659850421b6e383a3b308e56ed 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ReadCalibDataTool.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ReadCalibDataTool.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 /** @file SCT_ReadCalibDataTool.cxx Implementation file for SCT_ReadCalibDataTool.
@@ -58,7 +58,7 @@ bool SCT_ReadCalibDataTool::canReportAbout(InDetConditions::Hierarchy h) const {
 
 //----------------------------------------------------------------------
 // Returns a bool summary of the data
-bool SCT_ReadCalibDataTool::isGood(const Identifier& elementId, InDetConditions::Hierarchy h) const {
+bool SCT_ReadCalibDataTool::isGood(const Identifier& elementId, const EventContext& ctx, InDetConditions::Hierarchy h) const {
   // Status of the compId
   bool status{true};
   // Extract the moduleId from the comp identifier
@@ -94,7 +94,6 @@ bool SCT_ReadCalibDataTool::isGood(const Identifier& elementId, InDetConditions:
       int strip{m_id_sct->strip(elementId)};
       // Retrieve isGood Wafer data
 
-      const EventContext& ctx{Gaudi::Hive::currentContext()};
       const SCT_AllGoodStripInfo* condDataInfo{getCondDataInfo(ctx)};
       if (condDataInfo==nullptr) {
         ATH_MSG_ERROR("In isGood, SCT_AllGoodStripInfo cannot be retrieved");
@@ -115,6 +114,11 @@ bool SCT_ReadCalibDataTool::isGood(const Identifier& elementId, InDetConditions:
   return status;
 } //SCT_ReadCalibDataTool::summary()
 
+bool SCT_ReadCalibDataTool::isGood(const Identifier& elementId, InDetConditions::Hierarchy h) const {
+  const EventContext& ctx{Gaudi::Hive::currentContext()};
+
+  return isGood(elementId, ctx, h);
+}
 
 //----------------------------------------------------------------------
 // Returns a defect summary of a defect strip, scan, type and value
@@ -291,12 +295,12 @@ std::list<Identifier> SCT_ReadCalibDataTool::defectList(const std::string& defec
   
   //Loop over all wafers using hashIds from the cabling service
   std::vector<boost::uint32_t> listOfRODs;
-  m_cabling->getAllRods(listOfRODs);
+  m_cabling->getAllRods(listOfRODs, ctx);
   std::vector<boost::uint32_t>::iterator rodIter{listOfRODs.begin()};
   std::vector<boost::uint32_t>::iterator rodEnd{listOfRODs.end()};
   for (; rodIter!=rodEnd; ++rodIter) {
     std::vector<IdentifierHash> listOfHashes;
-    m_cabling->getHashesForRod(listOfHashes, *rodIter);
+    m_cabling->getHashesForRod(listOfHashes, *rodIter, ctx);
     std::vector<IdentifierHash>::iterator hashIt{listOfHashes.begin()};
     std::vector<IdentifierHash>::iterator hashEnd{listOfHashes.end()};
     for (; hashIt != hashEnd; ++hashIt) {
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ReadCalibDataTool.h b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ReadCalibDataTool.h
index fad58d5ab698cc3c62f8beeb947361c71adabea6..41ce81b292581f58b3d23a9e5138dfbcd0db18e0 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ReadCalibDataTool.h
+++ b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ReadCalibDataTool.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 /** @file SCT_ReadCalibDataTool.h Header file for SCT_ReadCalibDataTool.
@@ -56,9 +56,11 @@ class SCT_ReadCalibDataTool: public extends<AthAlgTool, ISCT_ReadCalibDataTool>
   ///Return whether this tool can report on the hierarchy level (e.g. module, chip...)
   virtual bool canReportAbout(InDetConditions::Hierarchy h) const override;
   ///Summarise the result from the tool as good/bad
-  virtual bool isGood(const Identifier& elementId,InDetConditions::Hierarchy h=InDetConditions::DEFAULT) const override;
+  virtual bool isGood(const Identifier& elementId, InDetConditions::Hierarchy h=InDetConditions::DEFAULT) const override;
+  virtual bool isGood(const Identifier& elementId, const EventContext& ctx, InDetConditions::Hierarchy h=InDetConditions::DEFAULT) const override;
   ///same thing with id hash, introduced by shaun with dummy method for now
   virtual bool isGood(const IdentifierHash& /*hashId*/) const override { return true; }
+  virtual bool isGood(const IdentifierHash& hashId, const EventContext& /*ctx*/) const override { return isGood(hashId); }
   //@}
   
   // Methods to return calibration defect type and summary
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_StripVetoTool.cxx b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_StripVetoTool.cxx
index 61f1a0f0e43af5a08551a0d37dc1e2a62cb4b6b9..8189cce824f4336550bee8a76235fba12d00c3e6 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_StripVetoTool.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_StripVetoTool.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 /**
@@ -59,11 +59,21 @@ SCT_StripVetoTool::isGood(const Identifier& elementId, InDetConditions::Hierarch
   return (m_badIds.find(elementId) == m_badIds.end());
 }
 
+bool 
+SCT_StripVetoTool::isGood(const Identifier& elementId, const EventContext& /*ctx*/, InDetConditions::Hierarchy h) const {
+  return isGood(elementId, h);
+}
+
 bool 
 SCT_StripVetoTool::isGood(const IdentifierHash& /*hashId*/) const { //comment out unused parameter to prevent compiler warning
   return true; //cant answer questions about the module side
 }
 
+bool 
+SCT_StripVetoTool::isGood(const IdentifierHash& hashId, const EventContext& /*ctx*/) const {
+  return isGood(hashId);
+}
+
 StatusCode 
 SCT_StripVetoTool::fillData() {
   if (m_badElements.value().empty()) ATH_MSG_INFO("No bad strips.");
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_StripVetoTool.h b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_StripVetoTool.h
index 6b0e8000621093c9f951c0cc7b5522c4b0462e82..f5b27c2ce4c9c80b6f697e9bbe1e49bd5145c847 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_StripVetoTool.h
+++ b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_StripVetoTool.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 /**
@@ -10,8 +10,6 @@
 
 #ifndef SCT_StripVetoTool_h
 #define SCT_StripVetoTool_h
-//STL includes
-#include <set>
 
 //Gaudi includes
 #include "AthenaBaseComps/AthAlgTool.h"
@@ -20,6 +18,9 @@
 #include "InDetConditionsSummaryService/InDetHierarchy.h"
 #include "SCT_ConditionsTools/ISCT_ConditionsTool.h"
 
+//STL includes
+#include <set>
+
 //forward declarations
 class IdentifierHash;
 class SCT_ID;
@@ -43,9 +44,11 @@ public:
   
   ///Is the detector element good?
   virtual bool isGood(const Identifier& elementId, InDetConditions::Hierarchy h=InDetConditions::SCT_STRIP) const override;
+  virtual bool isGood(const Identifier& elementId, const EventContext& ctx, InDetConditions::Hierarchy h=InDetConditions::SCT_STRIP) const override;
   
   ///is it good?, using wafer hash
   virtual bool isGood(const IdentifierHash& hashId) const override;
+  virtual bool isGood(const IdentifierHash& hashId, const EventContext& ctx) const override;
 
 private:
   StatusCode fillData();
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_TdaqEnabledTool.cxx b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_TdaqEnabledTool.cxx
index 1128a81daca5d5c22bd8c907f3d509f4ba494ae4..250b755a541b6ae542df37e17aa0c2df8d895030 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_TdaqEnabledTool.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_TdaqEnabledTool.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 /**
@@ -59,21 +59,34 @@ SCT_TdaqEnabledTool::canReportAbout(InDetConditions::Hierarchy h) const {
 }
 
 bool 
-SCT_TdaqEnabledTool::isGood(const Identifier& elementId, InDetConditions::Hierarchy h) const {
+SCT_TdaqEnabledTool::isGood(const Identifier& elementId, const EventContext& ctx, InDetConditions::Hierarchy h) const {
   if (not canReportAbout(h)) return true;
   //turn to hash, given the identifier
   const IdentifierHash hashId{m_pHelper->wafer_hash(elementId)};
-  return isGood(hashId);
+  return isGood(hashId, ctx);
 }
 
 bool 
-SCT_TdaqEnabledTool::isGood(const IdentifierHash& hashId) const {
+SCT_TdaqEnabledTool::isGood(const Identifier& elementId, InDetConditions::Hierarchy h) const {
   const EventContext& ctx{Gaudi::Hive::currentContext()};
+
+  return isGood(elementId, ctx, h);
+}
+
+bool
+SCT_TdaqEnabledTool::isGood(const IdentifierHash& hashId, const EventContext& ctx) const {
   const SCT_TdaqEnabledCondData* condData{getCondData(ctx)};
   if (!condData) return false;
   return condData->isGood(hashId);
 }
 
+bool
+SCT_TdaqEnabledTool::isGood(const IdentifierHash& hashId) const {
+  const EventContext& ctx{Gaudi::Hive::currentContext()};
+
+  return isGood(hashId, ctx);
+}
+
 const SCT_TdaqEnabledCondData*
 SCT_TdaqEnabledTool::getCondData(const EventContext& ctx) const {
   static const EventContext::ContextEvt_t invalidValue{EventContext::INVALID_CONTEXT_EVT};
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_TdaqEnabledTool.h b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_TdaqEnabledTool.h
index a0a52d8c7c57480dac7385059eff5b4fc92c0df3..62b8a07dc5969a20f890f25164da76b92b61d40b 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_TdaqEnabledTool.h
+++ b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_TdaqEnabledTool.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 /**
@@ -52,9 +52,11 @@ public:
 
   ///Is the detector element good?
   virtual bool isGood(const Identifier& elementId, InDetConditions::Hierarchy h=InDetConditions::DEFAULT) const override;
+  virtual bool isGood(const Identifier& elementId, const EventContext& ctx, InDetConditions::Hierarchy h=InDetConditions::DEFAULT) const override;
 
   ///is it good?, using wafer hash
   virtual bool isGood(const IdentifierHash& hashId) const override;
+  virtual bool isGood(const IdentifierHash& hashId, const EventContext& ctx) const override;
 
  private:
   // Mutex to protect the contents.
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsTools/test/SCT_RODVetoTool_test.cxx b/InnerDetector/InDetConditions/SCT_ConditionsTools/test/SCT_RODVetoTool_test.cxx
index 014135b01427ea573fc4beafb35e6a092c0e1757..9a49473b5fb3291f2d6db23ab05c854369571645 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsTools/test/SCT_RODVetoTool_test.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsTools/test/SCT_RODVetoTool_test.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 /**
@@ -23,16 +23,20 @@
 //Gaudi includes
 #include "GaudiKernel/IAppMgrUI.h"
 #include "GaudiKernel/SmartIF.h"
+#include "GaudiKernel/IEvtSelector.h"
 #include "GaudiKernel/IToolSvc.h"
 #include "GaudiKernel/ISvcLocator.h"
 #include "GaudiKernel/IProperty.h"
+#include "GaudiKernel/EventContext.h"
 
 // Tested AthAlgTool
 #include "../src/SCT_RODVetoTool.h"
 
 // ATLAS C++
+#include "AthenaKernel/ExtendedEventContext.h"
 #include "SCT_ConditionsTools/ISCT_ConditionsTool.h"
 #include "InDetIdentifier/SCT_ID.h"
+#include "StoreGate/StoreGateSvc.h"
 
 namespace SCT_test {
 
@@ -58,9 +62,15 @@ protected:
     m_svcMgr = m_appMgr;
     ASSERT_TRUE( m_svcMgr.isValid() );
 
+    m_sg = nullptr;
+    ASSERT_TRUE( m_svcLoc->service ("StoreGateSvc", m_sg).isSuccess() );
+
+    m_evtSel = m_svcLoc->service("EventSelector");
+    ASSERT_TRUE( m_evtSel.isValid() );
+
     m_propMgr = m_appMgr;
     ASSERT_TRUE( m_propMgr.isValid() );
-    ASSERT_TRUE( m_propMgr->setProperty("EvtSel", "NONE").isSuccess() );
+    ASSERT_TRUE( m_propMgr->setProperty("EvtSel", "EventSelector").isSuccess() );
     ASSERT_TRUE( m_propMgr->setProperty("JobOptionsType", "NONE").isSuccess() );
 
     m_toolSvc = m_svcLoc->service("ToolSvc");
@@ -99,7 +109,9 @@ protected:
   SmartIF<ISvcLocator> m_svcLoc;
   SmartIF<ISvcManager> m_svcMgr;
   SmartIF<IToolSvc> m_toolSvc;
+  SmartIF<IEvtSelector> m_evtSel;
   SmartIF<IProperty> m_propMgr;
+  StoreGateSvc* m_sg{nullptr};
 };
 
 class SCT_RODVetoTool_test: public ::testing::Test, public GaudiFixture {
@@ -159,7 +171,9 @@ TEST_F(SCT_RODVetoTool_test, isGood_Hash) {
 TEST_F(SCT_RODVetoTool_test, isGood_Id) {
   m_tool->initialize(); 
   const Identifier elementId{0};
-  ASSERT_TRUE( m_tool->isGood(elementId, InDetConditions::DEFAULT) );
+  EventContext ctx{0, 0};
+  ctx.setExtension( Atlas::ExtendedEventContext( m_sg, 0 ) );
+  ASSERT_TRUE( m_tool->isGood(elementId, ctx, InDetConditions::DEFAULT) );
 }
 
 } // namespace SCT_test
diff --git a/InnerDetector/InDetConditions/TRT_ConditionsServices/src/TRT_StrawStatusSummarySvc.h b/InnerDetector/InDetConditions/TRT_ConditionsServices/src/TRT_StrawStatusSummarySvc.h
index 3f2404b37678bd403db9cabd0b4c9110e188447f..0742555c7e1712d5aab4caf69e5d5482b69c3a93 100755
--- a/InnerDetector/InDetConditions/TRT_ConditionsServices/src/TRT_StrawStatusSummarySvc.h
+++ b/InnerDetector/InDetConditions/TRT_ConditionsServices/src/TRT_StrawStatusSummarySvc.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TRT_STRAWSTATUSSUMMARYSVC_H
@@ -191,7 +191,7 @@ inline void TRT_StrawStatusSummarySvc::setStatus( const TRTCond::ExpandedIdentif
 
 inline const TRT_StrawStatusSummarySvc::StrawStatusContainer* TRT_StrawStatusSummarySvc::getStrawStatusContainer() {
   if(m_isGEANT4) {
-    return &(*m_strawstatusG4);
+    return m_strawstatusG4.cptr();
   }
   const EventContext& event_context=Gaudi::Hive::currentContext();
   EventContext::ContextID_t slot=event_context.slot();
@@ -214,7 +214,7 @@ inline const TRT_StrawStatusSummarySvc::StrawStatusContainer* TRT_StrawStatusSum
 inline const TRT_StrawStatusSummarySvc::StrawStatusContainer* TRT_StrawStatusSummarySvc::getStrawStatusPermanentContainer() {
 
   if(m_isGEANT4) {
-    return &(*m_strawstatuspermanentG4);
+    return m_strawstatuspermanentG4.cptr();
   }
   const EventContext& event_context=Gaudi::Hive::currentContext();
   EventContext::ContextID_t slot=event_context.slot();
@@ -237,7 +237,7 @@ inline const TRT_StrawStatusSummarySvc::StrawStatusContainer* TRT_StrawStatusSum
 inline const TRT_StrawStatusSummarySvc::StrawStatusContainer* TRT_StrawStatusSummarySvc::getStrawStatusHTContainer() {
 
   if(m_isGEANT4) {
-    return &(*m_strawstatusHTG4);
+    return m_strawstatusHTG4.cptr();
   }
   const EventContext& event_context=Gaudi::Hive::currentContext();
   EventContext::ContextID_t slot=event_context.slot();
diff --git a/InnerDetector/InDetDetDescr/BCM_GeoModel/src/BCM_Builder.cxx b/InnerDetector/InDetDetDescr/BCM_GeoModel/src/BCM_Builder.cxx
index 79e8b6c9197f772d381929aace14e2fc86679d83..98be47f59a3f3851d4236e71b276609abd03128e 100755
--- a/InnerDetector/InDetDetDescr/BCM_GeoModel/src/BCM_Builder.cxx
+++ b/InnerDetector/InDetDetDescr/BCM_GeoModel/src/BCM_Builder.cxx
@@ -19,6 +19,8 @@
 #include "RDBAccessSvc/IRDBRecordset.h"
 #include "RDBAccessSvc/IRDBRecord.h"
 
+#include "GaudiKernel/SystemOfUnits.h"
+
 //================ Constructor =================================================
 
 InDetDD::BCM_Builder::BCM_Builder(const std::string& t,
@@ -232,11 +234,11 @@ StatusCode InDetDD::BCM_Builder::build(GeoVPhysVol* pv)
       
       //setting transformation
       GeoTrf::Translation3D pos(parameters->Position_X(), parameters->Position_Y(), parameters->Position_Z());
-      GeoTrf::Transform3D rm = GeoTrf::RotateZ3D(parameters->Rotation_Z()*GeoModelKernelUnits::deg)
-	* GeoTrf::RotateY3D(parameters->Rotation_Y()*GeoModelKernelUnits::deg)
-	* GeoTrf::RotateX3D(parameters->Rotation_X()*GeoModelKernelUnits::deg)
-	* GeoTrf::RotateZ3D(-90.*GeoModelKernelUnits::deg)
-	* GeoTrf::RotateY3D(-90.*GeoModelKernelUnits::deg);
+      GeoTrf::Transform3D rm = GeoTrf::RotateZ3D(parameters->Rotation_Z()*Gaudi::Units::deg)
+	* GeoTrf::RotateY3D(parameters->Rotation_Y()*Gaudi::Units::deg)
+	* GeoTrf::RotateX3D(parameters->Rotation_X()*Gaudi::Units::deg)
+	* GeoTrf::RotateZ3D(-90.*Gaudi::Units::deg)
+	* GeoTrf::RotateY3D(-90.*Gaudi::Units::deg);
       GeoTransform* xform = new GeoTransform(GeoTrf::Transform3D(pos*rm));
       xform->ref();
       ATH_MSG_DEBUG(" --> Module " << i << " build!");
diff --git a/InnerDetector/InDetDetDescr/BCM_GeoModel/src/BCM_Module.cxx b/InnerDetector/InDetDetDescr/BCM_GeoModel/src/BCM_Module.cxx
index 28ba6043a842d80a786f7e053d317705e62c63ab..b06e3b3ad9d816fff558cbca9d5e791ec0c558b5 100755
--- a/InnerDetector/InDetDetDescr/BCM_GeoModel/src/BCM_Module.cxx
+++ b/InnerDetector/InDetDetDescr/BCM_GeoModel/src/BCM_Module.cxx
@@ -13,6 +13,8 @@
 #include "GeoModelKernel/GeoIdentifierTag.h"
 #include "GeoModelKernel/GeoSimplePolygonBrep.h" 
 
+#include "GaudiKernel/SystemOfUnits.h"
+
 GeoPhysVol* BCM_Module::Build(const AbsMaterialManager* mat_mgr, const BCM_ModuleParameters* parameters, MsgStream* /*msg*/)
 {
   //module outside dimensions
@@ -110,7 +112,7 @@ GeoPhysVol* BCM_Module::Build(const AbsMaterialManager* mat_mgr, const BCM_Modul
   GeoPhysVol* WallC = wall.Build(ModLength/2, ReducedModWidth/2, G10Thick, CuThick, g10, copper, mat_mgr);
 		
   GeoTrf::Translation3D WallCPos(ModHeight/2 - WallThick/2, 0, 0);
-  GeoTrf::RotateY3D rmC(90.*GeoModelKernelUnits::deg);
+  GeoTrf::RotateY3D rmC(90.*Gaudi::Units::deg);
   GeoTransform* xform = new GeoTransform(GeoTrf::Transform3D(WallCPos*rmC));
   GeoNameTag* tag = new GeoNameTag("Wall C");
   env_bcmModPhys->add(tag);
@@ -236,7 +238,7 @@ GeoPhysVol* BCM_Module::Build(const AbsMaterialManager* mat_mgr, const BCM_Modul
   GeoPhysVol* WallA = wall.Build(ModTailHeight/2, (ModLength - ModHeadLength)/2, CuThick, G10Thick, copper, g10, mat_mgr);
   
   GeoTrf::Translation3D WallAPos((ModHeight - ModTailHeight)/2 , (ReducedModWidth + WallThick)/2, -ModHeadLength/2);
-  GeoTrf::RotateX3D rmA(90.*GeoModelKernelUnits::deg);
+  GeoTrf::RotateX3D rmA(90.*Gaudi::Units::deg);
   xform = new GeoTransform(GeoTrf::Transform3D(WallAPos*rmA));
   tag = new GeoNameTag("Wall A");
   env_bcmModPhys->add(tag);
@@ -278,7 +280,7 @@ GeoPhysVol* BCM_Module::Build(const AbsMaterialManager* mat_mgr, const BCM_Modul
   // Add the BCM envelop inside the new complex encompassing volume
   // --------------------------------------------------------------------------------------
 
-  GeoTrf::Transform3D rmEnv = GeoTrf::RotateY3D(90.*GeoModelKernelUnits::deg)*GeoTrf::RotateZ3D(90.*GeoModelKernelUnits::deg);
+  GeoTrf::Transform3D rmEnv = GeoTrf::RotateY3D(90.*Gaudi::Units::deg)*GeoTrf::RotateZ3D(90.*Gaudi::Units::deg);
   xform = new GeoTransform(rmEnv);
   tag = new GeoNameTag("EnvBcmWallLog");
   bcmModPhys->add(tag);
diff --git a/InnerDetector/InDetDetDescr/BLM_GeoModel/src/BLM_Builder.cxx b/InnerDetector/InDetDetDescr/BLM_GeoModel/src/BLM_Builder.cxx
index 12c308b8d30797e99383936189daad6ac7382644..96c4d38c10398491ebdf896a3d68ac2e139fe628 100644
--- a/InnerDetector/InDetDetDescr/BLM_GeoModel/src/BLM_Builder.cxx
+++ b/InnerDetector/InDetDetDescr/BLM_GeoModel/src/BLM_Builder.cxx
@@ -20,6 +20,8 @@
 #include "RDBAccessSvc/IRDBRecord.h"
 #include "RDBAccessSvc/IRDBRecordset.h"
 
+#include "GaudiKernel/SystemOfUnits.h"
+
 //================ Constructor =================================================
 
 InDetDD::BLM_Builder::BLM_Builder(const std::string& t,
@@ -240,10 +242,10 @@ StatusCode InDetDD::BLM_Builder::build(GeoVPhysVol* pv)
       BLM_ModuleParameters* parameters = manager->Module(i);
 
       //setting transformation
-      GeoTrf::Translation3D pos(parameters->R()*cos(parameters->Phi()*GeoModelKernelUnits::deg), parameters->R()*sin(parameters->Phi()*GeoModelKernelUnits::deg), parameters->Z());
-      GeoTrf::Transform3D rm = GeoTrf::RotateZ3D(parameters->Rotation_Z()*GeoModelKernelUnits::deg)
-	* GeoTrf::RotateY3D(parameters->Rotation_Y()*GeoModelKernelUnits::deg)
-	* GeoTrf::RotateX3D(parameters->Rotation_X()*GeoModelKernelUnits::deg);
+      GeoTrf::Translation3D pos(parameters->R()*cos(parameters->Phi()*Gaudi::Units::deg), parameters->R()*sin(parameters->Phi()*Gaudi::Units::deg), parameters->Z());
+      GeoTrf::Transform3D rm = GeoTrf::RotateZ3D(parameters->Rotation_Z()*Gaudi::Units::deg)
+	* GeoTrf::RotateY3D(parameters->Rotation_Y()*Gaudi::Units::deg)
+	* GeoTrf::RotateX3D(parameters->Rotation_X()*Gaudi::Units::deg);
       GeoTransform* xform = new GeoTransform(GeoTrf::Transform3D(pos*rm));
       xform->ref();
       //building module
diff --git a/InnerDetector/InDetDetDescr/BLM_GeoModel/src/BLM_Module.cxx b/InnerDetector/InDetDetDescr/BLM_GeoModel/src/BLM_Module.cxx
index 5b5e88207f4ee8ed6a2ea5ee4f3569ebc9569f08..c16ec7a1be8f433a425a91a90bee7ece2db03f34 100755
--- a/InnerDetector/InDetDetDescr/BLM_GeoModel/src/BLM_Module.cxx
+++ b/InnerDetector/InDetDetDescr/BLM_GeoModel/src/BLM_Module.cxx
@@ -12,6 +12,9 @@
 #include "GeoModelKernel/GeoNameTag.h"
 #include "GeoModelKernel/GeoIdentifierTag.h"
 
+#include "GeoModelKernel/Units.h"
+#include "GaudiKernel/SystemOfUnits.h"
+
 GeoPhysVol* BLM_Module::Build(const AbsMaterialManager* mat_mgr, const BLM_ModuleParameters* parameters, MsgStream* msg)
 {
   double CuThick = 0.015;
@@ -47,7 +50,7 @@ GeoPhysVol* BLM_Module::Build(const AbsMaterialManager* mat_mgr, const BLM_Modul
   {     
   	if(msg)
   		(*msg) << "BLM _ PEEK _ MISSING." << endmsg;
-	GeoMaterial* peektmp = new GeoMaterial("PEEK", 1.3*GeoModelKernelUnits::gram/GeoModelKernelUnits::cm3);
+	GeoMaterial* peektmp = new GeoMaterial("PEEK", 1.3*GeoModelKernelUnits::gram/Gaudi::Units::cm3);
 	GeoElement* hydrogen = new GeoElement("Hydrogen", "H", 1.0, 1.010);
 	GeoElement* oxygen = new GeoElement("Oxygen", "O", 8.0, 16.000);
 	GeoElement* carbon = new GeoElement("Carbon", "C", 6.0, 12.010);
@@ -200,8 +203,8 @@ GeoPhysVol* BLM_Module::Build(const AbsMaterialManager* mat_mgr, const BLM_Modul
   GeoPhysVol* screw6 = wall.BuildScrew(10, stainless_steel);
   GeoPhysVol* screw7 = wall.BuildScrew(BLM_Wall::s_holder_thickness, stainless_steel);
   GeoPhysVol* screw8 = wall.BuildScrew(BLM_Wall::s_holder_thickness, stainless_steel);
-  GeoTrf::RotateX3D screwRot(90.*GeoModelKernelUnits::deg);
-  GeoTrf::RotateX3D screwRot1(180.*GeoModelKernelUnits::deg);  
+  GeoTrf::RotateX3D screwRot(90.*Gaudi::Units::deg);
+  GeoTrf::RotateX3D screwRot1(180.*Gaudi::Units::deg);  
   GeoTrf::Translation3D screwPos1(ModWidth/2-BLM_Wall::s_hole_position, BLM_Wall::s_holder_height-ModHeight/2+10*CuThick+2*LamelThick15+3*LamelThick234+1, ModLength/2-BLM_Wall::s_hole_position);
   GeoTrf::Translation3D screwPos2(BLM_Wall::s_hole_position-ModWidth/2, BLM_Wall::s_holder_height-ModHeight/2+10*CuThick+2*LamelThick15+3*LamelThick234+1, ModLength/2-BLM_Wall::s_hole_position);
   GeoTrf::Translation3D screwPos3(ModWidth/2-BLM_Wall::s_hole_position, BLM_Wall::s_holder_height-ModHeight/2+10*CuThick+2*LamelThick15+3*LamelThick234+1, ModLength/2-BLM_Wall::s_length+BLM_Wall::s_hole_position);
diff --git a/InnerDetector/InDetDetDescr/BLM_GeoModel/src/BLM_Wall.cxx b/InnerDetector/InDetDetDescr/BLM_GeoModel/src/BLM_Wall.cxx
index e2983ec4d48a299d8d54f48dad7fd3d59ebfefe9..516183bcb523411044cae5d7240c4ccd96b1378c 100755
--- a/InnerDetector/InDetDetDescr/BLM_GeoModel/src/BLM_Wall.cxx
+++ b/InnerDetector/InDetDetDescr/BLM_GeoModel/src/BLM_Wall.cxx
@@ -10,6 +10,7 @@
 #include "GeoModelKernel/GeoBox.h"
 #include "GeoModelKernel/GeoTube.h"
 #include "GeoModelKernel/GeoLogVol.h"
+#include "GaudiKernel/SystemOfUnits.h"
 
 double BLM_Wall::s_width = 18;
 double BLM_Wall::s_length = 22;
@@ -29,7 +30,7 @@ GeoPhysVol* BLM_Wall::BuildClamp(const GeoMaterial* material)
   const GeoBox* blmWallBox = new GeoBox(s_width/2, s_clamp_thickness/2, s_clamp_length/2);
   const GeoTube* blmWallHole = new GeoTube(0, s_hole_r, s_clamp_thickness);
   //rotations
-  GeoTrf::RotateX3D rm(90.*GeoModelKernelUnits::deg);
+  GeoTrf::RotateX3D rm(90.*Gaudi::Units::deg);
   //position of holes
   GeoTrf::Translation3D pos1(s_width/2-s_hole_position, 0, s_clamp_length/2-2.5);
   GeoTrf::Translation3D pos2(s_hole_position-s_width/2, 0, s_clamp_length/2-2.5);
@@ -76,7 +77,7 @@ GeoPhysVol* BLM_Wall::BuildHolder(const GeoMaterial* material)
   const GeoTube* blmWallHole = new GeoTube(0, s_hole_r, s_holder_thickness);
   const GeoBox* blmWallHole1 = new GeoBox(s_holder_spacing/2, s_holder_height, (s_holder_spacing_length+s_holder_thickness)/2+1);
   //rotations
-  GeoTrf::RotateX3D rm(90.*GeoModelKernelUnits::deg);
+  GeoTrf::RotateX3D rm(90.*Gaudi::Units::deg);
   //position of holes
   GeoTrf::Translation3D pos1(s_width/2-s_hole_position, 0, s_holder_length/2-s_hole_position);
   GeoTrf::Translation3D pos2(s_hole_position-s_width/2, 0, s_holder_length/2-s_hole_position);
@@ -124,8 +125,8 @@ GeoPhysVol* BLM_Wall::BuildLayerI(double thick, const GeoMaterial* material, boo
       const GeoShape* blmWallHole1 = new GeoBox(s_width/2-3.5, thick, 5.9);
       const GeoShape* blmWallHole2 = new GeoBox(s_width/2-6.1, thick, 4);
       const GeoShape* blmWallHole3 = new GeoBox(3.89, thick, 3.89);
-      GeoTrf::RotateX3D rm(90.*GeoModelKernelUnits::deg);
-      GeoTrf::RotateY3D rm1(45.*GeoModelKernelUnits::deg);
+      GeoTrf::RotateX3D rm(90.*Gaudi::Units::deg);
+      GeoTrf::RotateY3D rm1(45.*Gaudi::Units::deg);
       GeoTrf::Translation3D pos1(s_width/2-s_hole_position, 0, s_extended_length/2-s_hole_position);
       GeoTrf::Translation3D pos2(s_hole_position-s_width/2, 0, s_extended_length/2-s_hole_position);
       GeoTrf::Translation3D pos3(s_width/2-s_hole_position, 0, s_extended_length/2-s_length+s_hole_position);
@@ -162,7 +163,7 @@ GeoPhysVol* BLM_Wall::BuildLayerI(double thick, const GeoMaterial* material, boo
     {
       const GeoShape* blmWallBox = new GeoBox(s_width/2, thick/2, s_extended_length/2);
       const GeoShape* blmWallHole = new GeoTube(0, s_hole_r, thick);
-      GeoTrf::RotateX3D rm(90.*GeoModelKernelUnits::deg);
+      GeoTrf::RotateX3D rm(90.*Gaudi::Units::deg);
       GeoTrf::Translation3D pos1(s_width/2-s_hole_position, 0, s_extended_length/2-s_hole_position);
       GeoTrf::Translation3D pos2(s_hole_position-s_width/2, 0, s_extended_length/2-s_hole_position);
       GeoTrf::Translation3D pos3(s_width/2-s_hole_position, 0, s_extended_length/2-s_length+s_hole_position);
@@ -197,8 +198,8 @@ GeoPhysVol* BLM_Wall::BuildLayerII(double thick, const GeoMaterial* material)
   const GeoShape* blmWallHole2 = new GeoBox(s_width/2-6.1, thick, 4);
   //const GeoShape* blmWallHole3 = new GeoBox(1.76777, thick, 1.76777);
   const GeoShape* blmWallHole3 = new GeoBox(3.9, thick, 3.9);
-  GeoTrf::RotateX3D rm(90.*GeoModelKernelUnits::deg);
-  GeoTrf::RotateY3D rm1(45.*GeoModelKernelUnits::deg);
+  GeoTrf::RotateX3D rm(90.*Gaudi::Units::deg);
+  GeoTrf::RotateY3D rm1(45.*Gaudi::Units::deg);
   GeoTrf::Translation3D pos1(s_width/2-s_hole_position, 0, s_length/2-s_hole_position);
   GeoTrf::Translation3D pos2(s_hole_position-s_width/2, 0, s_length/2-s_hole_position);
   GeoTrf::Translation3D pos3(s_width/2-s_hole_position, 0, s_hole_position-s_length/2);
@@ -235,7 +236,7 @@ GeoPhysVol* BLM_Wall::BuildLayerIII(double thick, const GeoMaterial* material)
   const GeoShape* blmWallBox = new GeoBox(s_width/2, thick/2, s_length/2);
   const GeoShape* blmWallHole = new GeoTube(0, s_hole_r, thick);
   const GeoShape* blmWallHole1 = new GeoBox(s_width/2-3.5, thick, 5.425);
-  GeoTrf::RotateX3D rm(90.*GeoModelKernelUnits::deg);
+  GeoTrf::RotateX3D rm(90.*Gaudi::Units::deg);
   GeoTrf::Translation3D pos1(s_width/2-s_hole_position, 0, s_length/2-s_hole_position);
   GeoTrf::Translation3D pos2(s_hole_position-s_width/2, 0, s_length/2-s_hole_position);
   GeoTrf::Translation3D pos3(s_width/2-s_hole_position, 0, s_hole_position-s_length/2);
@@ -263,7 +264,7 @@ GeoPhysVol* BLM_Wall::BuildLayerIV(double thick, const GeoMaterial* material)
   const GeoShape* blmWallHole = new GeoTube(0, s_hole_r, thick);
   const GeoShape* blmWallHole1 = new GeoBox(s_width/2-3.5, thick, 5.425);
   const GeoShape* blmWallHole2 = new GeoBox(s_width/2-8.1, thick, 4);
-  GeoTrf::RotateX3D rm(90.*GeoModelKernelUnits::deg);
+  GeoTrf::RotateX3D rm(90.*Gaudi::Units::deg);
   GeoTrf::Translation3D pos1(s_width/2-s_hole_position, 0, s_length/2-s_hole_position);
   GeoTrf::Translation3D pos2(s_hole_position-s_width/2, 0, s_length/2-s_hole_position);
   GeoTrf::Translation3D pos3(s_width/2-s_hole_position, 0, s_hole_position-s_length/2);
@@ -291,7 +292,7 @@ GeoPhysVol* BLM_Wall::BuildLayerV(double thick, const GeoMaterial* material)
 {
   const GeoShape* blmWallBox = new GeoBox(s_width/2, thick/2, s_length/2);
   const GeoShape* blmWallHole = new GeoTube(0, s_hole_r, thick);
-  GeoTrf::RotateX3D rm(90.*GeoModelKernelUnits::deg);
+  GeoTrf::RotateX3D rm(90.*Gaudi::Units::deg);
   GeoTrf::Translation3D pos1(s_width/2-s_hole_position, 0, s_length/2-s_hole_position);
   GeoTrf::Translation3D pos2(s_hole_position-s_width/2, 0, s_length/2-s_hole_position);
   GeoTrf::Translation3D pos3(s_width/2-s_hole_position, 0, s_hole_position-s_length/2);
diff --git a/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/EndPlateFactory.cxx b/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/EndPlateFactory.cxx
index 98dfcadc27160a3671e96499e91d21c4835b3ffc..c70c11f806131524002d2f47c01fe1581796b9c6 100755
--- a/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/EndPlateFactory.cxx
+++ b/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/EndPlateFactory.cxx
@@ -23,6 +23,8 @@
 #include "GeoModelInterfaces/IGeoDbTagSvc.h"
 #include "GeoModelUtilities/DecodeVersionKey.h"
 
+#include "GaudiKernel/SystemOfUnits.h"
+
 #include <iostream>
 
 
@@ -48,29 +50,29 @@ void EndPlateFactory::create(GeoPhysVol *mother)
 //----------------------------------------------------------------------------------
 //    std::string matName =  mat[(int) (*pbfi)[ii]->getFloat("MAT")];
 //    const GeoMaterial* cylMat = materialManager()->getMaterial(matName);
-//    double rmin = (*pbfi)[ii]->getFloat("RIN")*GeoModelKernelUnits::cm;
+//    double rmin = (*pbfi)[ii]->getFloat("RIN")*Gaudi::Units::cm;
 //----------------------------------------------------------------------------------
-    double safety = 0.01*GeoModelKernelUnits::mm;
-    double maxRofEP = 1075.0*GeoModelKernelUnits::mm - safety; // Interfere with TRT PatchPanel1
-    double RibConnection = 550.0*GeoModelKernelUnits::mm;
+    double safety = 0.01*Gaudi::Units::mm;
+    double maxRofEP = 1075.0*Gaudi::Units::mm - safety; // Interfere with TRT PatchPanel1
+    double RibConnection = 550.0*Gaudi::Units::mm;
 
-    maxRofEP      = (*shell)[0]->getDouble("EPMAXR")*GeoModelKernelUnits::mm - safety; 
-    RibConnection = (*ribs)[0]->getDouble("RIBCONNECTION")*GeoModelKernelUnits::mm; 
+    maxRofEP      = (*shell)[0]->getDouble("EPMAXR")*Gaudi::Units::mm - safety; 
+    RibConnection = (*ribs)[0]->getDouble("RIBCONNECTION")*Gaudi::Units::mm; 
 //
 //     Internal shell. Default (initial) values
 //
-    double rminInt = 425.*GeoModelKernelUnits::mm;
-    double rmaxInt = 1040.*GeoModelKernelUnits::mm;
-    double thickShell = 3.*GeoModelKernelUnits::mm;
-    double thick2     = 10.*GeoModelKernelUnits::mm;
-    double zposEP     = 3370.*GeoModelKernelUnits::mm;
-    double zleng      = 42.*GeoModelKernelUnits::mm;
-    rminInt    = (*shell)[0]->getDouble("RMININT")*GeoModelKernelUnits::mm; 
-    rmaxInt    = (*shell)[0]->getDouble("RMAXINT")*GeoModelKernelUnits::mm;
-    thickShell = (*shell)[0]->getDouble("THICKSHELL")*GeoModelKernelUnits::mm;
-    thick2     = (*shell)[0]->getDouble("THICKADD")*GeoModelKernelUnits::mm;
-    zposEP     = (*shell)[0]->getDouble("ZSTART")*GeoModelKernelUnits::mm;
-    zleng      = (*shell)[0]->getDouble("ZSHIFT")*GeoModelKernelUnits::mm;
+    double rminInt = 425.*Gaudi::Units::mm;
+    double rmaxInt = 1040.*Gaudi::Units::mm;
+    double thickShell = 3.*Gaudi::Units::mm;
+    double thick2     = 10.*Gaudi::Units::mm;
+    double zposEP     = 3370.*Gaudi::Units::mm;
+    double zleng      = 42.*Gaudi::Units::mm;
+    rminInt    = (*shell)[0]->getDouble("RMININT")*Gaudi::Units::mm; 
+    rmaxInt    = (*shell)[0]->getDouble("RMAXINT")*Gaudi::Units::mm;
+    thickShell = (*shell)[0]->getDouble("THICKSHELL")*Gaudi::Units::mm;
+    thick2     = (*shell)[0]->getDouble("THICKADD")*Gaudi::Units::mm;
+    zposEP     = (*shell)[0]->getDouble("ZSTART")*Gaudi::Units::mm;
+    zleng      = (*shell)[0]->getDouble("ZSHIFT")*Gaudi::Units::mm;
  
  
     GeoPcon* shellInt = new GeoPcon(0.,2*M_PI);
@@ -101,12 +103,12 @@ void EndPlateFactory::create(GeoPhysVol *mother)
 //
 //     External shell (default/initial values)
 
-    double zgap     = 50.*GeoModelKernelUnits::mm;
-    double rminExt  = 250.*GeoModelKernelUnits::mm;
+    double zgap     = 50.*Gaudi::Units::mm;
+    double rminExt  = 250.*Gaudi::Units::mm;
     double rmaxExt  = maxRofEP;
     
-    zgap    = (*shell)[0]->getDouble("ZGAP")*GeoModelKernelUnits::mm;
-    rminExt = (*shell)[0]->getDouble("RMINEXT")*GeoModelKernelUnits::mm;
+    zgap    = (*shell)[0]->getDouble("ZGAP")*Gaudi::Units::mm;
+    rminExt = (*shell)[0]->getDouble("RMINEXT")*Gaudi::Units::mm;
 
 
     const GeoTube*   shellExt    = new GeoTube(rminExt,rmaxExt,thickShell/2.);
@@ -127,19 +129,19 @@ void EndPlateFactory::create(GeoPhysVol *mother)
 //
 //     Insert - default (initial) values
 
-    double zthick  = 16.0*GeoModelKernelUnits::mm;
-    double zinsert = 3018.*GeoModelKernelUnits::mm-zthick;
-    double rminins = 252.*GeoModelKernelUnits::mm;
-    double rmaxins = 435.*GeoModelKernelUnits::mm;
-    double rthick  = 5.*GeoModelKernelUnits::mm;
-    double zlengi   = 410.*GeoModelKernelUnits::mm;
+    double zthick  = 16.0*Gaudi::Units::mm;
+    double zinsert = 3018.*Gaudi::Units::mm-zthick;
+    double rminins = 252.*Gaudi::Units::mm;
+    double rmaxins = 435.*Gaudi::Units::mm;
+    double rthick  = 5.*Gaudi::Units::mm;
+    double zlengi   = 410.*Gaudi::Units::mm;
 
-    zthick  = (*insert)[0]->getDouble("ZTHICK")*GeoModelKernelUnits::mm;
-    zinsert = (*insert)[0]->getDouble("ZINSERT")*GeoModelKernelUnits::mm;
-    rminins = (*insert)[0]->getDouble("RMININS")*GeoModelKernelUnits::mm;
-    rmaxins = (*insert)[0]->getDouble("RMAXINS")*GeoModelKernelUnits::mm;
-    rthick  = (*insert)[0]->getDouble("RTHICK")*GeoModelKernelUnits::mm;
-    zlengi  = (*insert)[0]->getDouble("ZLENGINS")*GeoModelKernelUnits::mm;
+    zthick  = (*insert)[0]->getDouble("ZTHICK")*Gaudi::Units::mm;
+    zinsert = (*insert)[0]->getDouble("ZINSERT")*Gaudi::Units::mm;
+    rminins = (*insert)[0]->getDouble("RMININS")*Gaudi::Units::mm;
+    rmaxins = (*insert)[0]->getDouble("RMAXINS")*Gaudi::Units::mm;
+    rthick  = (*insert)[0]->getDouble("RTHICK")*Gaudi::Units::mm;
+    zlengi  = (*insert)[0]->getDouble("ZLENGINS")*Gaudi::Units::mm;
 
     GeoPcon* Insert = new GeoPcon(0.,2*M_PI);
     Insert->addPlane(0.              , rminins, rmaxins+rthick);
@@ -169,15 +171,15 @@ void EndPlateFactory::create(GeoPhysVol *mother)
 //     Short ribs - default (initial) values
 //     Initial position is along X axis then move and rotate
 //
-    double ribY   = 12.0*GeoModelKernelUnits::mm;
+    double ribY   = 12.0*Gaudi::Units::mm;
     double ribZ   = zgap - safety;
-    double ribX   = 380.0*GeoModelKernelUnits::mm;
-    double posX   = 550.0*GeoModelKernelUnits::mm+ribX/2.;
+    double ribX   = 380.0*Gaudi::Units::mm;
+    double posX   = 550.0*Gaudi::Units::mm+ribX/2.;
 
-    ribY   = (*ribs)[0]->getDouble("SHORTWID")*GeoModelKernelUnits::mm;
+    ribY   = (*ribs)[0]->getDouble("SHORTWID")*Gaudi::Units::mm;
     ribZ   = zgap - safety;
-    ribX   = (*ribs)[0]->getDouble("SHORTLENG")*GeoModelKernelUnits::mm;
-    posX   = (*ribs)[0]->getDouble("SHORTRSTART")*GeoModelKernelUnits::mm + ribX/2.;
+    ribX   = (*ribs)[0]->getDouble("SHORTLENG")*Gaudi::Units::mm;
+    posX   = (*ribs)[0]->getDouble("SHORTRSTART")*Gaudi::Units::mm + ribX/2.;
 
     const GeoBox* ribShort = new GeoBox(ribX/2., ribY/2., ribZ/2.);
 
@@ -207,22 +209,22 @@ void EndPlateFactory::create(GeoPhysVol *mother)
 //---------------------------------------------------------------------------------
 //     Long ribs (initial position is along X axis then move and rotate)
 //
-    double ribY1   = 20.0*GeoModelKernelUnits::mm;
+    double ribY1   = 20.0*Gaudi::Units::mm;
     double ribZ1   = zgap - safety;
-    double ribX1   = RibConnection-250.*GeoModelKernelUnits::mm;
-    double posX1   = 250.*GeoModelKernelUnits::mm+ribX1/2.;
+    double ribX1   = RibConnection-250.*Gaudi::Units::mm;
+    double posX1   = 250.*Gaudi::Units::mm+ribX1/2.;
 
-    double ribY2   = 30.0*GeoModelKernelUnits::mm;
+    double ribY2   = 30.0*Gaudi::Units::mm;
     double ribZ2   = zgap - safety;
     double ribX2   = maxRofEP - RibConnection;
     double posX2   = RibConnection+ribX2/2.;
 
-    ribY1   = (*ribs)[0]->getDouble("LONGWID1")*GeoModelKernelUnits::mm;
+    ribY1   = (*ribs)[0]->getDouble("LONGWID1")*Gaudi::Units::mm;
     ribZ1   = zgap - safety;
-    ribX1   = RibConnection - (*ribs)[0]->getDouble("LONGLENG1")*GeoModelKernelUnits::mm;  // LONGLENG1 is a RMIN of ribs
-    posX1   = (*ribs)[0]->getDouble("LONGLENG1")*GeoModelKernelUnits::mm + ribX1/2.;       // It's determined by Pixel volume -> so 250.0!!!
+    ribX1   = RibConnection - (*ribs)[0]->getDouble("LONGLENG1")*Gaudi::Units::mm;  // LONGLENG1 is a RMIN of ribs
+    posX1   = (*ribs)[0]->getDouble("LONGLENG1")*Gaudi::Units::mm + ribX1/2.;       // It's determined by Pixel volume -> so 250.0!!!
  
-    ribY2   = (*ribs)[0]->getDouble("LONGWID2")*GeoModelKernelUnits::mm;
+    ribY2   = (*ribs)[0]->getDouble("LONGWID2")*Gaudi::Units::mm;
     ribZ2   = zgap - safety;
     ribX2   = maxRofEP - RibConnection;
     posX2   = RibConnection+ribX2/2.;
diff --git a/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/EndPlateFactoryFS.cxx b/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/EndPlateFactoryFS.cxx
index 508d487c5d1776fba304551d1f0969eac3871311..56518c48da1133d46551056f255c1f80f195dc11 100755
--- a/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/EndPlateFactoryFS.cxx
+++ b/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/EndPlateFactoryFS.cxx
@@ -24,6 +24,7 @@
 #include "GeoModelUtilities/DecodeVersionKey.h"
 #include "GaudiKernel/Bootstrap.h"
 
+#include "GaudiKernel/SystemOfUnits.h"
 
 #include <iostream>
 
@@ -64,29 +65,29 @@ void EndPlateFactoryFS::create(GeoPhysVol *motherP, GeoPhysVol *motherM)
 //----------------------------------------------------------------------------------
 //    std::string matName =  mat[(int) (*pbfi)[ii]->getFloat("MAT")];
 //    const GeoMaterial* cylMat = materialManager->getMaterial(matName);
-//    double rmin = (*pbfi)[ii]->getFloat("RIN")*GeoModelKernelUnits::cm;
+//    double rmin = (*pbfi)[ii]->getFloat("RIN")*Gaudi::Units::cm;
 //----------------------------------------------------------------------------------
-    double safety = 0.01*GeoModelKernelUnits::mm;
-    double maxRofEP = 1075.0*GeoModelKernelUnits::mm - safety; // Interfere with TRT PatchPanel1
-    double RibConnection = 550.0*GeoModelKernelUnits::mm;
+    double safety = 0.01*Gaudi::Units::mm;
+    double maxRofEP = 1075.0*Gaudi::Units::mm - safety; // Interfere with TRT PatchPanel1
+    double RibConnection = 550.0*Gaudi::Units::mm;
 
-    maxRofEP      = (*shell)[0]->getDouble("EPMAXR")*GeoModelKernelUnits::mm - safety; 
-    RibConnection = (*ribs)[0]->getDouble("RIBCONNECTION")*GeoModelKernelUnits::mm; 
+    maxRofEP      = (*shell)[0]->getDouble("EPMAXR")*Gaudi::Units::mm - safety; 
+    RibConnection = (*ribs)[0]->getDouble("RIBCONNECTION")*Gaudi::Units::mm; 
 //
 //     Internal shell. Default (initial) values
 //
-    double rminInt = 425.*GeoModelKernelUnits::mm;
-    double rmaxInt = 1040.*GeoModelKernelUnits::mm;
-    double thickShell = 3.*GeoModelKernelUnits::mm;
-    double thick2     = 10.*GeoModelKernelUnits::mm;
-    double zposEP     = 3370.*GeoModelKernelUnits::mm;
-    double zleng      = 42.*GeoModelKernelUnits::mm;
-    rminInt    = (*shell)[0]->getDouble("RMININT")*GeoModelKernelUnits::mm; 
-    rmaxInt    = (*shell)[0]->getDouble("RMAXINT")*GeoModelKernelUnits::mm;
-    thickShell = (*shell)[0]->getDouble("THICKSHELL")*GeoModelKernelUnits::mm;
-    thick2     = (*shell)[0]->getDouble("THICKADD")*GeoModelKernelUnits::mm;
-    zposEP     = (*shell)[0]->getDouble("ZSTART")*GeoModelKernelUnits::mm;
-    zleng      = (*shell)[0]->getDouble("ZSHIFT")*GeoModelKernelUnits::mm;
+    double rminInt = 425.*Gaudi::Units::mm;
+    double rmaxInt = 1040.*Gaudi::Units::mm;
+    double thickShell = 3.*Gaudi::Units::mm;
+    double thick2     = 10.*Gaudi::Units::mm;
+    double zposEP     = 3370.*Gaudi::Units::mm;
+    double zleng      = 42.*Gaudi::Units::mm;
+    rminInt    = (*shell)[0]->getDouble("RMININT")*Gaudi::Units::mm; 
+    rmaxInt    = (*shell)[0]->getDouble("RMAXINT")*Gaudi::Units::mm;
+    thickShell = (*shell)[0]->getDouble("THICKSHELL")*Gaudi::Units::mm;
+    thick2     = (*shell)[0]->getDouble("THICKADD")*Gaudi::Units::mm;
+    zposEP     = (*shell)[0]->getDouble("ZSTART")*Gaudi::Units::mm;
+    zleng      = (*shell)[0]->getDouble("ZSHIFT")*Gaudi::Units::mm;
  
     GeoTube* shellInt1 = new GeoTube(rminInt,rminInt+thick2,zleng*0.5);
     GeoTube* shellInt2 = new GeoTube(rminInt,rmaxInt,thickShell*0.5);
@@ -120,12 +121,12 @@ void EndPlateFactoryFS::create(GeoPhysVol *motherP, GeoPhysVol *motherM)
 //
 //     External shell (default/initial values)
 
-    double zgap     = 50.*GeoModelKernelUnits::mm;
-    double rminExt  = 250.*GeoModelKernelUnits::mm;
+    double zgap     = 50.*Gaudi::Units::mm;
+    double rminExt  = 250.*Gaudi::Units::mm;
     double rmaxExt  = maxRofEP;
     
-    zgap    = (*shell)[0]->getDouble("ZGAP")*GeoModelKernelUnits::mm;
-    rminExt = (*shell)[0]->getDouble("RMINEXT")*GeoModelKernelUnits::mm;
+    zgap    = (*shell)[0]->getDouble("ZGAP")*Gaudi::Units::mm;
+    rminExt = (*shell)[0]->getDouble("RMINEXT")*Gaudi::Units::mm;
 
 
     const GeoTube*   shellExt    = new GeoTube(rminExt,rmaxExt,thickShell/2.);
@@ -146,19 +147,19 @@ void EndPlateFactoryFS::create(GeoPhysVol *motherP, GeoPhysVol *motherM)
 //
 //     Insert - default (initial) values
 
-    double zthick  = 16.0*GeoModelKernelUnits::mm;
-    double zinsert = 3018.*GeoModelKernelUnits::mm-zthick;
-    double rminins = 252.*GeoModelKernelUnits::mm;
-    double rmaxins = 435.*GeoModelKernelUnits::mm;
-    double rthick  = 5.*GeoModelKernelUnits::mm;
-    double zlengi   = 410.*GeoModelKernelUnits::mm;
+    double zthick  = 16.0*Gaudi::Units::mm;
+    double zinsert = 3018.*Gaudi::Units::mm-zthick;
+    double rminins = 252.*Gaudi::Units::mm;
+    double rmaxins = 435.*Gaudi::Units::mm;
+    double rthick  = 5.*Gaudi::Units::mm;
+    double zlengi   = 410.*Gaudi::Units::mm;
 
-    zthick  = (*insert)[0]->getDouble("ZTHICK")*GeoModelKernelUnits::mm;
-    zinsert = (*insert)[0]->getDouble("ZINSERT")*GeoModelKernelUnits::mm;
-    rminins = (*insert)[0]->getDouble("RMININS")*GeoModelKernelUnits::mm;
-    rmaxins = (*insert)[0]->getDouble("RMAXINS")*GeoModelKernelUnits::mm;
-    rthick  = (*insert)[0]->getDouble("RTHICK")*GeoModelKernelUnits::mm;
-    zlengi  = (*insert)[0]->getDouble("ZLENGINS")*GeoModelKernelUnits::mm;
+    zthick  = (*insert)[0]->getDouble("ZTHICK")*Gaudi::Units::mm;
+    zinsert = (*insert)[0]->getDouble("ZINSERT")*Gaudi::Units::mm;
+    rminins = (*insert)[0]->getDouble("RMININS")*Gaudi::Units::mm;
+    rmaxins = (*insert)[0]->getDouble("RMAXINS")*Gaudi::Units::mm;
+    rthick  = (*insert)[0]->getDouble("RTHICK")*Gaudi::Units::mm;
+    zlengi  = (*insert)[0]->getDouble("ZLENGINS")*Gaudi::Units::mm;
 
     GeoTube* Insert1 = new GeoTube(rminins,rmaxins+rthick,zthick*0.5);
     GeoTube* Insert2 = new GeoTube(rmaxins,rmaxins+rthick,(zlengi-zthick)*0.5);
@@ -194,15 +195,15 @@ void EndPlateFactoryFS::create(GeoPhysVol *motherP, GeoPhysVol *motherM)
 //     Short ribs - default (initial) values
 //     Initial position is along X axis then move and rotate
 //
-    double ribY   = 12.0*GeoModelKernelUnits::mm;
+    double ribY   = 12.0*Gaudi::Units::mm;
     double ribZ   = zgap - safety;
-    double ribX   = 380.0*GeoModelKernelUnits::mm;
-    double posX   = 550.0*GeoModelKernelUnits::mm+ribX/2.;
+    double ribX   = 380.0*Gaudi::Units::mm;
+    double posX   = 550.0*Gaudi::Units::mm+ribX/2.;
 
-    ribY   = (*ribs)[0]->getDouble("SHORTWID")*GeoModelKernelUnits::mm;
+    ribY   = (*ribs)[0]->getDouble("SHORTWID")*Gaudi::Units::mm;
     ribZ   = zgap - safety;
-    ribX   = (*ribs)[0]->getDouble("SHORTLENG")*GeoModelKernelUnits::mm;
-    posX   = (*ribs)[0]->getDouble("SHORTRSTART")*GeoModelKernelUnits::mm + ribX/2.;
+    ribX   = (*ribs)[0]->getDouble("SHORTLENG")*Gaudi::Units::mm;
+    posX   = (*ribs)[0]->getDouble("SHORTRSTART")*Gaudi::Units::mm + ribX/2.;
 
     const GeoBox* ribShort = new GeoBox(ribX/2., ribY/2., ribZ/2.);
 
@@ -232,22 +233,22 @@ void EndPlateFactoryFS::create(GeoPhysVol *motherP, GeoPhysVol *motherM)
 //---------------------------------------------------------------------------------
 //     Long ribs (initial position is along X axis then move and rotate)
 //
-    double ribY1   = 20.0*GeoModelKernelUnits::mm;
+    double ribY1   = 20.0*Gaudi::Units::mm;
     double ribZ1   = zgap - safety;
-    double ribX1   = RibConnection-250.*GeoModelKernelUnits::mm;
-    double posX1   = 250.*GeoModelKernelUnits::mm+ribX1/2.;
+    double ribX1   = RibConnection-250.*Gaudi::Units::mm;
+    double posX1   = 250.*Gaudi::Units::mm+ribX1/2.;
 
-    double ribY2   = 30.0*GeoModelKernelUnits::mm;
+    double ribY2   = 30.0*Gaudi::Units::mm;
     double ribZ2   = zgap - safety;
     double ribX2   = maxRofEP - RibConnection;
     double posX2   = RibConnection+ribX2/2.;
 
-    ribY1   = (*ribs)[0]->getDouble("LONGWID1")*GeoModelKernelUnits::mm;
+    ribY1   = (*ribs)[0]->getDouble("LONGWID1")*Gaudi::Units::mm;
     ribZ1   = zgap - safety;
-    ribX1   = RibConnection - (*ribs)[0]->getDouble("LONGLENG1")*GeoModelKernelUnits::mm;  // LONGLENG1 is a RMIN of ribs
-    posX1   = (*ribs)[0]->getDouble("LONGLENG1")*GeoModelKernelUnits::mm + ribX1/2.;       // It's determined by Pixel volume -> so 250.0!!!
+    ribX1   = RibConnection - (*ribs)[0]->getDouble("LONGLENG1")*Gaudi::Units::mm;  // LONGLENG1 is a RMIN of ribs
+    posX1   = (*ribs)[0]->getDouble("LONGLENG1")*Gaudi::Units::mm + ribX1/2.;       // It's determined by Pixel volume -> so 250.0!!!
  
-    ribY2   = (*ribs)[0]->getDouble("LONGWID2")*GeoModelKernelUnits::mm;
+    ribY2   = (*ribs)[0]->getDouble("LONGWID2")*Gaudi::Units::mm;
     ribZ2   = zgap - safety;
     ribX2   = maxRofEP - RibConnection;
     posX2   = RibConnection+ribX2/2.;
diff --git a/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/InDetServMatBuilderToolSLHC.cxx b/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/InDetServMatBuilderToolSLHC.cxx
index 87365a42dd85dc963e4228da3e279fa02eceb063..c7e100403a0045865804892e6983ef0f522d31a7 100644
--- a/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/InDetServMatBuilderToolSLHC.cxx
+++ b/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/InDetServMatBuilderToolSLHC.cxx
@@ -13,6 +13,7 @@
 #include "RDBAccessSvc/IRDBAccessSvc.h"
 #include "InDetGeoModelUtils/InDetMaterialManager.h"
 #include "GeoModelKernel/Units.h"
+#include "GaudiKernel/SystemOfUnits.h"
 
 #include "InDetServMatGeoModel/ServicesTracker.h"
 #include "InDetServMatGeoModel/ServicesTrackerBuilder.h"
@@ -301,8 +302,8 @@ void InDetServMatBuilderToolSLHC::printNewVolume( const ServiceVolume& vol,
 		   << " zmin " << vol.zMin() 
 		   << " zmax " << vol.zMax() << endmsg;
  
-    msg(MSG::DEBUG) << "name " << vol.name() << " density " << dens * GeoModelKernelUnits::cm3 / GeoModelKernelUnits::g 
-		   << " [g/cm3] weight " << dens*param.volume()/GeoModelKernelUnits::kg  << " [kg]" << endmsg;
+    msg(MSG::DEBUG) << "name " << vol.name() << " density " << dens * Gaudi::Units::cm3 / GeoModelKernelUnits::g 
+		   << " [g/cm3] weight " << dens*param.volume()/Gaudi::Units::kg  << " [kg]" << endmsg;
   } 
   if (msgLvl(MSG::DEBUG)) {   // FIXME: change to VERBOSE when done!
     msg(MSG::DEBUG) << "Number of elements: " << mat.getNumElements() << endmsg;
diff --git a/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/InDetServMatFactory.cxx b/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/InDetServMatFactory.cxx
index 6854e139abd657c605da5f75252937e5758b93db..b69e6c15e7d06939a8d647190602fd9f4702e55f 100755
--- a/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/InDetServMatFactory.cxx
+++ b/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/InDetServMatFactory.cxx
@@ -35,8 +35,7 @@
 
 // StoreGate includes
 #include "StoreGate/StoreGateSvc.h"
-
-#include "GeoModelKernel/Units.h"
+#include "GaudiKernel/PhysicalConstants.h"
 
 #include <iostream>
 
@@ -90,26 +89,26 @@ void InDetServMatFactory::create(GeoPhysVol *world )
   InDetMaterialManager * materialManager = new InDetMaterialManager("InDetServMatMaterialManager", getAthenaComps());
   materialManager->addScalingTable(scalingTable);
 
-  double safety = 0.001 * GeoModelKernelUnits::mm;
-
-  double ZMaxBrlTRT =        envelopes->getDouble("ZMAXBRLTRT") * GeoModelKernelUnits::mm;
-  double ZMaxBrlSCT =        envelopes->getDouble("ZMAXBRLSCT") * GeoModelKernelUnits::mm;
-  double ZMinFwdSCTandTRT =  envelopes->getDouble("ZMINFWDSCTANDTRT") * GeoModelKernelUnits::mm;
-  double ZMinSCTServInTRT =  envelopes->getDouble("ZMINSCTSERVINTRT") * GeoModelKernelUnits::mm;
-  double ZMaxSCTServInTRT =  envelopes->getDouble("ZMAXSCTSERVINTRT") * GeoModelKernelUnits::mm;
-  double ZMinPixServ    =    envelopes->getDouble("ZMINPIXSERV") * GeoModelKernelUnits::mm;
-  double ZMaxFwdTRTC =       envelopes->getDouble("ZMAXFWDTRTC") * GeoModelKernelUnits::mm;
-  double ZMaxIDet =          (*atls)[0]->getDouble("IDETZMX") * GeoModelKernelUnits::cm + safety;  // 3470 mm
-
-  double RMinBrlSCT =        envelopes->getDouble("RMINBRLSCT") * GeoModelKernelUnits::mm;
-  double RMaxBrlTRT =        envelopes->getDouble("RMAXBRLTRT") * GeoModelKernelUnits::mm;
-  double RMinBrlTRT =        envelopes->getDouble("RMINBRLTRT") * GeoModelKernelUnits::mm;
-  double RMaxFwdTRT =        envelopes->getDouble("RMAXFWDTRT") * GeoModelKernelUnits::mm;
-  double RMaxFwdSCT =        envelopes->getDouble("RMAXFWDSCT") * GeoModelKernelUnits::mm;
-  double RMaxFwdTRTC =       envelopes->getDouble("RMAXFWDTRTC") * GeoModelKernelUnits::mm;
-  double RMinPixServ =       envelopes->getDouble("RMINPIXSERV") * GeoModelKernelUnits::mm;
-  double RMaxPixServ =       envelopes->getDouble("RMAXPIXSERV") * GeoModelKernelUnits::mm;
-  double RMaxIDet =          (*atls)[0]->getDouble("IDETOR") * GeoModelKernelUnits::cm + safety; // 1147 mm
+  double safety = 0.001 * Gaudi::Units::mm;
+
+  double ZMaxBrlTRT =        envelopes->getDouble("ZMAXBRLTRT") * Gaudi::Units::mm;
+  double ZMaxBrlSCT =        envelopes->getDouble("ZMAXBRLSCT") * Gaudi::Units::mm;
+  double ZMinFwdSCTandTRT =  envelopes->getDouble("ZMINFWDSCTANDTRT") * Gaudi::Units::mm;
+  double ZMinSCTServInTRT =  envelopes->getDouble("ZMINSCTSERVINTRT") * Gaudi::Units::mm;
+  double ZMaxSCTServInTRT =  envelopes->getDouble("ZMAXSCTSERVINTRT") * Gaudi::Units::mm;
+  double ZMinPixServ    =    envelopes->getDouble("ZMINPIXSERV") * Gaudi::Units::mm;
+  double ZMaxFwdTRTC =       envelopes->getDouble("ZMAXFWDTRTC") * Gaudi::Units::mm;
+  double ZMaxIDet =          (*atls)[0]->getDouble("IDETZMX") * Gaudi::Units::cm + safety;  // 3470 mm
+
+  double RMinBrlSCT =        envelopes->getDouble("RMINBRLSCT") * Gaudi::Units::mm;
+  double RMaxBrlTRT =        envelopes->getDouble("RMAXBRLTRT") * Gaudi::Units::mm;
+  double RMinBrlTRT =        envelopes->getDouble("RMINBRLTRT") * Gaudi::Units::mm;
+  double RMaxFwdTRT =        envelopes->getDouble("RMAXFWDTRT") * Gaudi::Units::mm;
+  double RMaxFwdSCT =        envelopes->getDouble("RMAXFWDSCT") * Gaudi::Units::mm;
+  double RMaxFwdTRTC =       envelopes->getDouble("RMAXFWDTRTC") * Gaudi::Units::mm;
+  double RMinPixServ =       envelopes->getDouble("RMINPIXSERV") * Gaudi::Units::mm;
+  double RMaxPixServ =       envelopes->getDouble("RMAXPIXSERV") * Gaudi::Units::mm;
+  double RMaxIDet =          (*atls)[0]->getDouble("IDETOR") * Gaudi::Units::cm + safety; // 1147 mm
 
   // Since the TRT Wheel C space is not used in some versions and is used by some 
   // other services we simplify the volume.
@@ -124,12 +123,12 @@ void InDetServMatFactory::create(GeoPhysVol *world )
   bool join1 = false; 
   bool join2 = false; 
 
-  if (std::abs(RMaxFwdTRTC - RMinPixServ) <= 1*GeoModelKernelUnits::mm){
+  if (std::abs(RMaxFwdTRTC - RMinPixServ) <= 1*Gaudi::Units::mm){
     join1 = true;
     join2 = true;
     RMaxFwdTRTC = RMinPixServ;
     RMaxPixServ = RMinPixServ;
-  } else if ((RMaxFwdTRTC - 1*GeoModelKernelUnits::mm) <=  RMaxPixServ) {
+  } else if ((RMaxFwdTRTC - 1*Gaudi::Units::mm) <=  RMaxPixServ) {
     join1 = true;
     RMaxPixServ = RMaxFwdTRTC;
   }
@@ -142,8 +141,8 @@ void InDetServMatFactory::create(GeoPhysVol *world )
   const GeoShapeUnion *ServVolAux = 0;
     
   if (!join1) { 
-    GeoPcon* pixServP = new GeoPcon(0.,2*GeoModelKernelUnits::pi);
-    GeoPcon* pixServM = new GeoPcon(0.,2*GeoModelKernelUnits::pi);
+    GeoPcon* pixServP = new GeoPcon(0.,2*Gaudi::Units::pi);
+    GeoPcon* pixServM = new GeoPcon(0.,2*Gaudi::Units::pi);
     
     // Plane 1: Start at the end of the SCT endcap
     pixServP->addPlane(ZMinPixServ,  RMinPixServ, RMaxPixServ);
@@ -163,7 +162,7 @@ void InDetServMatFactory::create(GeoPhysVol *world )
   }
 
   // This is the volume for the TRT/SCT services
-  GeoPcon *sctTrtServ = new GeoPcon(0.,2*GeoModelKernelUnits::pi);
+  GeoPcon *sctTrtServ = new GeoPcon(0.,2*Gaudi::Units::pi);
   
   // Pixel Services
   if (join1) {
diff --git a/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/InDetServMatFactoryDC2.cxx b/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/InDetServMatFactoryDC2.cxx
index 43f828b400c740a4cca8498feed4e2da920dde00..a1d34bf14ff80dc8224648a4947be4ef700b5baf 100755
--- a/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/InDetServMatFactoryDC2.cxx
+++ b/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/InDetServMatFactoryDC2.cxx
@@ -24,7 +24,7 @@
 #include "RDBAccessSvc/IRDBRecordset.h"
 #include "RDBAccessSvc/IRDBAccessSvc.h"
 #include "GaudiKernel/Bootstrap.h"
-
+#include "GaudiKernel/SystemOfUnits.h"
 
 InDetServMatFactoryDC2::InDetServMatFactoryDC2(StoreGateSvc *detStore,ServiceHandle<IRDBAccessSvc> pRDBAccess) :
   m_detStore(detStore),
@@ -95,42 +95,42 @@ void InDetServMatFactoryDC2::create(GeoPhysVol *world)
 
 //  double epsilon = 0.001;
 
-  double endZOfBTRT =                (*trtb)[0]->getDouble("ZLEN")*GeoModelKernelUnits::cm;
-  double endZOfBSCT =                (*sctg)[0]->getDouble("HLEN")*GeoModelKernelUnits::cm;
-  double begZOfFSCT =                (*zscg)[0]->getDouble("ZLOEND")*GeoModelKernelUnits::cm;
-  double endZOfFSCT =                (*zscg)[0]->getDouble("ZHIEND")*GeoModelKernelUnits::cm;
+  double endZOfBTRT =                (*trtb)[0]->getDouble("ZLEN")*Gaudi::Units::cm;
+  double endZOfBSCT =                (*sctg)[0]->getDouble("HLEN")*Gaudi::Units::cm;
+  double begZOfFSCT =                (*zscg)[0]->getDouble("ZLOEND")*Gaudi::Units::cm;
+  double endZOfFSCT =                (*zscg)[0]->getDouble("ZHIEND")*Gaudi::Units::cm;
   double endZOfFTRT =                ((*trtb)[15]->getDouble("ZPOSA") +
 				      ((*trtb)[15]->getDouble("ZLEN")+(*trtb)[15]->getDouble("ZGAP"))/2.
 				      + ((*trtb)[2]->getDouble("ZPOSA")-(*trtb)[1]->getDouble("ZPOSA"))*3 
-				      + (*trtb)[1]->getDouble("ZLEN")/2.)*GeoModelKernelUnits::cm;
+				      + (*trtb)[1]->getDouble("ZLEN")/2.)*Gaudi::Units::cm;
  
-  double endZOfIDet =                (*atls)[0]->getDouble("IDETZMX")*GeoModelKernelUnits::cm;
+  double endZOfIDet =                (*atls)[0]->getDouble("IDETZMX")*Gaudi::Units::cm;
 
   // This is endOfEndCapVolumeAB 
   //double begZOfSCTServInTRT = ((trtb[7].zposa + (trtb[7].zlen + trtb[7].zgap)/2.) +
-  //			       (trtb[8].zposa - trtb[7].zposa)*7 + trtb[7].zlen/2.)*GeoModelKernelUnits::cm;
+  //			       (trtb[8].zposa - trtb[7].zposa)*7 + trtb[7].zlen/2.)*Gaudi::Units::cm;
 
   // This is beginningOfEndCapVolumeC 
   //  double endZOfSCTServInTRT = (trtb[15].zposa + (trtb[15].zlen + trtb[15].zgap)/2. - 
-  //			       trtb[1].zlen/2.)*GeoModelKernelUnits::cm;
+  //			       trtb[1].zlen/2.)*Gaudi::Units::cm;
 
-  // The SCT services go from 2755.306 to 2775.306 GeoModelKernelUnits::mm 
+  // The SCT services go from 2755.306 to 2775.306 Gaudi::Units::mm 
   // The TRT has a gap from 2712.25 to 2829.75 mm
   // We hard wire an envelope for these services instead.
-  double begZOfSCTServInTRT = 2755. * GeoModelKernelUnits::mm;
-  double endZOfSCTServInTRT = 2776. * GeoModelKernelUnits::mm;
+  double begZOfSCTServInTRT = 2755. * Gaudi::Units::mm;
+  double endZOfSCTServInTRT = 2776. * Gaudi::Units::mm;
 
   //std::cout << "Begin SCT services " << begZOfSCTServInTRT << std::endl;
   //std::cout << "End SCT services " << endZOfSCTServInTRT << std::endl;
 
 
-  double outROfPixel =               (*zscg)[0]->getDouble("RINEND")*GeoModelKernelUnits::cm;
-  double inROfFTRT  =                (*trtb)[15]->getDouble("RI")*GeoModelKernelUnits::cm;
-  double outROfFSCT =                (*zscg)[0]->getDouble("ROUEND")*GeoModelKernelUnits::cm;
-  double outROfBSCT =                (*sctg)[0]->getDouble("RMAX")*GeoModelKernelUnits::cm;
-  double outROfPixelCables =         (*pbfi)[0]->getFloat("ROUT")*GeoModelKernelUnits::cm;
-  double outROfIDet =                (*atls)[0]->getDouble("IDETOR")*GeoModelKernelUnits::cm;
-  double outROfTRT =                 (*trtg)[0]->getDouble("RMAX")*GeoModelKernelUnits::cm;
+  double outROfPixel =               (*zscg)[0]->getDouble("RINEND")*Gaudi::Units::cm;
+  double inROfFTRT  =                (*trtb)[15]->getDouble("RI")*Gaudi::Units::cm;
+  double outROfFSCT =                (*zscg)[0]->getDouble("ROUEND")*Gaudi::Units::cm;
+  double outROfBSCT =                (*sctg)[0]->getDouble("RMAX")*Gaudi::Units::cm;
+  double outROfPixelCables =         (*pbfi)[0]->getFloat("ROUT")*Gaudi::Units::cm;
+  double outROfIDet =                (*atls)[0]->getDouble("IDETOR")*Gaudi::Units::cm;
+  double outROfTRT =                 (*trtg)[0]->getDouble("RMAX")*Gaudi::Units::cm;
 
   //
   // Create the envelope for the Pixel Services:
diff --git a/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/InDetServMatFactoryDC3.cxx b/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/InDetServMatFactoryDC3.cxx
index 024b50ae510bc2d2cd4689a8267a038762539a68..010bd1058f32321f50d4df6e706acb79c7a65fd6 100755
--- a/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/InDetServMatFactoryDC3.cxx
+++ b/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/InDetServMatFactoryDC3.cxx
@@ -35,6 +35,7 @@
 #include "RDBAccessSvc/IRDBRecordset.h"
 #include "RDBAccessSvc/IRDBAccessSvc.h"
 
+#include "GaudiKernel/PhysicalConstants.h"
 #include <iostream>
 
 InDetServMatFactoryDC3::InDetServMatFactoryDC3(const InDetDD::AthenaComps * athenaComps)
@@ -87,24 +88,24 @@ void InDetServMatFactoryDC3::create(GeoPhysVol *world )
   InDetMaterialManager * materialManager = new InDetMaterialManager("InDetServMatMaterialManager", getAthenaComps());
 
 
-  double ZMaxBrlTRT =        envelopes->getDouble("ZMAXBRLTRT") * GeoModelKernelUnits::mm;
-  double ZMaxBrlSCT =        envelopes->getDouble("ZMAXBRLSCT") * GeoModelKernelUnits::mm;
-  double ZMinFwdSCTandTRT =  envelopes->getDouble("ZMINFWDSCTANDTRT") * GeoModelKernelUnits::mm;
-  double ZMinSCTServInTRT =  envelopes->getDouble("ZMINSCTSERVINTRT") * GeoModelKernelUnits::mm;
-  double ZMaxSCTServInTRT =  envelopes->getDouble("ZMAXSCTSERVINTRT") * GeoModelKernelUnits::mm;
-  double ZMinPixServ    =    envelopes->getDouble("ZMINPIXSERV") * GeoModelKernelUnits::mm;
-  double ZMaxFwdTRTC =       envelopes->getDouble("ZMAXFWDTRTC") * GeoModelKernelUnits::mm;
-  double ZMaxIDet =          (*atls)[0]->getDouble("IDETZMX") * GeoModelKernelUnits::cm;  // 3490 mm
+  double ZMaxBrlTRT =        envelopes->getDouble("ZMAXBRLTRT") * Gaudi::Units::mm;
+  double ZMaxBrlSCT =        envelopes->getDouble("ZMAXBRLSCT") * Gaudi::Units::mm;
+  double ZMinFwdSCTandTRT =  envelopes->getDouble("ZMINFWDSCTANDTRT") * Gaudi::Units::mm;
+  double ZMinSCTServInTRT =  envelopes->getDouble("ZMINSCTSERVINTRT") * Gaudi::Units::mm;
+  double ZMaxSCTServInTRT =  envelopes->getDouble("ZMAXSCTSERVINTRT") * Gaudi::Units::mm;
+  double ZMinPixServ    =    envelopes->getDouble("ZMINPIXSERV") * Gaudi::Units::mm;
+  double ZMaxFwdTRTC =       envelopes->getDouble("ZMAXFWDTRTC") * Gaudi::Units::mm;
+  double ZMaxIDet =          (*atls)[0]->getDouble("IDETZMX") * Gaudi::Units::cm;  // 3490 mm
 
-  double RMinBrlSCT =        envelopes->getDouble("RMINBRLSCT") * GeoModelKernelUnits::mm;
-  double RMaxBrlTRT =        envelopes->getDouble("RMAXBRLTRT") * GeoModelKernelUnits::mm;
-  double RMinBrlTRT =        envelopes->getDouble("RMINBRLTRT") * GeoModelKernelUnits::mm;
-  double RMaxFwdTRT =        envelopes->getDouble("RMAXFWDTRT") * GeoModelKernelUnits::mm;
-  double RMaxFwdSCT =        envelopes->getDouble("RMAXFWDSCT") * GeoModelKernelUnits::mm;
-  double RMaxFwdTRTC =       envelopes->getDouble("RMAXFWDTRTC") * GeoModelKernelUnits::mm;
-  double RMinPixServ =       envelopes->getDouble("RMINPIXSERV") * GeoModelKernelUnits::mm;
-  double RMaxPixServ =       envelopes->getDouble("RMAXPIXSERV") * GeoModelKernelUnits::mm;
-  double RMaxIDet =          (*atls)[0]->getDouble("IDETOR") * GeoModelKernelUnits::cm; // 1147 mm
+  double RMinBrlSCT =        envelopes->getDouble("RMINBRLSCT") * Gaudi::Units::mm;
+  double RMaxBrlTRT =        envelopes->getDouble("RMAXBRLTRT") * Gaudi::Units::mm;
+  double RMinBrlTRT =        envelopes->getDouble("RMINBRLTRT") * Gaudi::Units::mm;
+  double RMaxFwdTRT =        envelopes->getDouble("RMAXFWDTRT") * Gaudi::Units::mm;
+  double RMaxFwdSCT =        envelopes->getDouble("RMAXFWDSCT") * Gaudi::Units::mm;
+  double RMaxFwdTRTC =       envelopes->getDouble("RMAXFWDTRTC") * Gaudi::Units::mm;
+  double RMinPixServ =       envelopes->getDouble("RMINPIXSERV") * Gaudi::Units::mm;
+  double RMaxPixServ =       envelopes->getDouble("RMAXPIXSERV") * Gaudi::Units::mm;
+  double RMaxIDet =          (*atls)[0]->getDouble("IDETOR") * Gaudi::Units::cm; // 1147 mm
 
 
 
@@ -112,8 +113,8 @@ void InDetServMatFactoryDC3::create(GeoPhysVol *world )
   // Create the envelope for the Pixel Services:
   //
   const GeoMaterial* air = materialManager->getMaterial("std::Air");
-  GeoPcon* pixServP = new GeoPcon(0.,2*GeoModelKernelUnits::pi);
-  GeoPcon* pixServM = new GeoPcon(0.,2*GeoModelKernelUnits::pi);
+  GeoPcon* pixServP = new GeoPcon(0.,2*Gaudi::Units::pi);
+  GeoPcon* pixServM = new GeoPcon(0.,2*Gaudi::Units::pi);
 
   // Plane 1: Start at the end of the SCT endcap
   pixServP->addPlane(ZMinPixServ,  RMinPixServ, RMaxPixServ);
@@ -132,7 +133,7 @@ void InDetServMatFactoryDC3::create(GeoPhysVol *world )
   const GeoShapeUnion *ServVolAux = new GeoShapeUnion(pixServP, pixServM);
 
   // This is the volume for the TRT/SCT services
-  GeoPcon *sctTrtServ = new GeoPcon(0.,2*GeoModelKernelUnits::pi);
+  GeoPcon *sctTrtServ = new GeoPcon(0.,2*Gaudi::Units::pi);
   
   // THE BEGINNING
   sctTrtServ->addPlane(-ZMaxIDet, RMaxFwdTRTC, RMaxIDet);
diff --git a/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/InDetServMatFactoryFS.cxx b/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/InDetServMatFactoryFS.cxx
index 4da8a0e8df60f7c9b9b4dde3fcc0a7b0b509dc0e..82b6249ee5d8238807af18dcf80f25a96264a8d9 100755
--- a/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/InDetServMatFactoryFS.cxx
+++ b/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/InDetServMatFactoryFS.cxx
@@ -32,7 +32,7 @@
 #include "RDBAccessSvc/IRDBAccessSvc.h"
 #include "GaudiKernel/Bootstrap.h"
 
-#include "GeoModelKernel/Units.h"
+#include "GaudiKernel/PhysicalConstants.h"
 
 #include <iostream>
 
@@ -91,26 +91,26 @@ void InDetServMatFactoryFS::create(GeoPhysVol *world )
   const IRDBRecord *envelopes = (*servEnvelopeTable)[0];
 
 
-  double safety = 0.001 * GeoModelKernelUnits::mm;
+  double safety = 0.001 * Gaudi::Units::mm;
 
-  double ZMaxBrlTRT =        envelopes->getDouble("ZMAXBRLTRT") * GeoModelKernelUnits::mm;
-  double ZMaxBrlSCT =        envelopes->getDouble("ZMAXBRLSCT") * GeoModelKernelUnits::mm;
-  double ZMinFwdSCTandTRT =  envelopes->getDouble("ZMINFWDSCTANDTRT") * GeoModelKernelUnits::mm;
-  double ZMinSCTServInTRT =  envelopes->getDouble("ZMINSCTSERVINTRT") * GeoModelKernelUnits::mm;
-  double ZMaxSCTServInTRT =  envelopes->getDouble("ZMAXSCTSERVINTRT") * GeoModelKernelUnits::mm;
-  double ZMinPixServ    =    envelopes->getDouble("ZMINPIXSERV") * GeoModelKernelUnits::mm;
-  double ZMaxFwdTRTC =       envelopes->getDouble("ZMAXFWDTRTC") * GeoModelKernelUnits::mm;
-  double ZMaxIDet =          (*atls)[0]->getDouble("IDETZMX") * GeoModelKernelUnits::cm + safety;  // 3470 mm
+  double ZMaxBrlTRT =        envelopes->getDouble("ZMAXBRLTRT") * Gaudi::Units::mm;
+  double ZMaxBrlSCT =        envelopes->getDouble("ZMAXBRLSCT") * Gaudi::Units::mm;
+  double ZMinFwdSCTandTRT =  envelopes->getDouble("ZMINFWDSCTANDTRT") * Gaudi::Units::mm;
+  double ZMinSCTServInTRT =  envelopes->getDouble("ZMINSCTSERVINTRT") * Gaudi::Units::mm;
+  double ZMaxSCTServInTRT =  envelopes->getDouble("ZMAXSCTSERVINTRT") * Gaudi::Units::mm;
+  double ZMinPixServ    =    envelopes->getDouble("ZMINPIXSERV") * Gaudi::Units::mm;
+  double ZMaxFwdTRTC =       envelopes->getDouble("ZMAXFWDTRTC") * Gaudi::Units::mm;
+  double ZMaxIDet =          (*atls)[0]->getDouble("IDETZMX") * Gaudi::Units::cm + safety;  // 3470 mm
 
-  double RMinBrlSCT =        envelopes->getDouble("RMINBRLSCT") * GeoModelKernelUnits::mm;
-  double RMaxBrlTRT =        envelopes->getDouble("RMAXBRLTRT") * GeoModelKernelUnits::mm;
-  double RMinBrlTRT =        envelopes->getDouble("RMINBRLTRT") * GeoModelKernelUnits::mm;
-  double RMaxFwdTRT =        envelopes->getDouble("RMAXFWDTRT") * GeoModelKernelUnits::mm;
-  double RMaxFwdSCT =        envelopes->getDouble("RMAXFWDSCT") * GeoModelKernelUnits::mm;
-  double RMaxFwdTRTC =       envelopes->getDouble("RMAXFWDTRTC") * GeoModelKernelUnits::mm;
-  double RMinPixServ =       envelopes->getDouble("RMINPIXSERV") * GeoModelKernelUnits::mm;
-  double RMaxPixServ =       envelopes->getDouble("RMAXPIXSERV") * GeoModelKernelUnits::mm;
-  double RMaxIDet =          (*atls)[0]->getDouble("IDETOR") * GeoModelKernelUnits::cm + safety; // 1147 mm
+  double RMinBrlSCT =        envelopes->getDouble("RMINBRLSCT") * Gaudi::Units::mm;
+  double RMaxBrlTRT =        envelopes->getDouble("RMAXBRLTRT") * Gaudi::Units::mm;
+  double RMinBrlTRT =        envelopes->getDouble("RMINBRLTRT") * Gaudi::Units::mm;
+  double RMaxFwdTRT =        envelopes->getDouble("RMAXFWDTRT") * Gaudi::Units::mm;
+  double RMaxFwdSCT =        envelopes->getDouble("RMAXFWDSCT") * Gaudi::Units::mm;
+  double RMaxFwdTRTC =       envelopes->getDouble("RMAXFWDTRTC") * Gaudi::Units::mm;
+  double RMinPixServ =       envelopes->getDouble("RMINPIXSERV") * Gaudi::Units::mm;
+  double RMaxPixServ =       envelopes->getDouble("RMAXPIXSERV") * Gaudi::Units::mm;
+  double RMaxIDet =          (*atls)[0]->getDouble("IDETOR") * Gaudi::Units::cm + safety; // 1147 mm
 
   // Since the TRT Wheel C space is not used in some versions and is used by some 
   // other services we simplify the volume.
@@ -125,12 +125,12 @@ void InDetServMatFactoryFS::create(GeoPhysVol *world )
   bool join1 = false; 
   bool join2 = false; 
 
-  if (std::abs(RMaxFwdTRTC - RMinPixServ) <= 1*GeoModelKernelUnits::mm){
+  if (std::abs(RMaxFwdTRTC - RMinPixServ) <= 1*Gaudi::Units::mm){
     join1 = true;
     join2 = true;
     RMaxFwdTRTC = RMinPixServ;
     RMaxPixServ = RMinPixServ;
-  } else if ((RMaxFwdTRTC - 1*GeoModelKernelUnits::mm) <=  RMaxPixServ) {
+  } else if ((RMaxFwdTRTC - 1*Gaudi::Units::mm) <=  RMaxPixServ) {
     join1 = true;
     RMaxPixServ = RMaxFwdTRTC;
   }
@@ -144,8 +144,8 @@ void InDetServMatFactoryFS::create(GeoPhysVol *world )
   GeoPcon* pixServM = 0;
     
   if (!join1) { 
-    pixServP = new GeoPcon(0.,2*GeoModelKernelUnits::pi);
-    pixServM = new GeoPcon(0.,2*GeoModelKernelUnits::pi);
+    pixServP = new GeoPcon(0.,2*Gaudi::Units::pi);
+    pixServM = new GeoPcon(0.,2*Gaudi::Units::pi);
     
     // Plane 1: Start at the end of the SCT endcap
     pixServP->addPlane(ZMinPixServ,  RMinPixServ, RMaxPixServ);
@@ -163,8 +163,8 @@ void InDetServMatFactoryFS::create(GeoPhysVol *world )
   }
 
   // This is the volume for the TRT/SCT services
-  GeoPcon *sctTrtServP = new GeoPcon(0.,2*GeoModelKernelUnits::pi);
-  GeoPcon *sctTrtServM = new GeoPcon(0.,2*GeoModelKernelUnits::pi);
+  GeoPcon *sctTrtServP = new GeoPcon(0.,2*Gaudi::Units::pi);
+  GeoPcon *sctTrtServM = new GeoPcon(0.,2*Gaudi::Units::pi);
   
   // Pixel Services
   if (join1) {
diff --git a/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/InDetServMatFactorySLHC.cxx b/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/InDetServMatFactorySLHC.cxx
index 79bdc998f80467f07b538418186d3886b2f7c771..67ae46d9494bce622c6358242a1464aac240d672 100755
--- a/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/InDetServMatFactorySLHC.cxx
+++ b/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/InDetServMatFactorySLHC.cxx
@@ -35,7 +35,7 @@
 #include "RDBAccessSvc/IRDBRecordset.h"
 #include "RDBAccessSvc/IRDBAccessSvc.h"
 
-
+#include "GaudiKernel/PhysicalConstants.h"
 #include <iostream>
 
 InDetServMatFactorySLHC::InDetServMatFactorySLHC(const InDetServMatAthenaComps * athenaComps)
@@ -75,9 +75,9 @@ void InDetServMatFactorySLHC::create(GeoPhysVol *world )
     double cylLength;
     
     if (oldEnvelope()) {
-      innerRadius = geomDB()->getDouble("","SERVICESINNERRADIUS") * GeoModelKernelUnits::mm;
-      outerRadius = geomDB()->getDouble("","SERVICESOUTERRADIUS") * GeoModelKernelUnits::mm; 
-      cylLength   = geomDB()->getDouble("","SERVICESCYLLENGTH") * GeoModelKernelUnits::mm; 
+      innerRadius = geomDB()->getDouble("","SERVICESINNERRADIUS") * Gaudi::Units::mm;
+      outerRadius = geomDB()->getDouble("","SERVICESOUTERRADIUS") * Gaudi::Units::mm; 
+      cylLength   = geomDB()->getDouble("","SERVICESCYLLENGTH") * Gaudi::Units::mm; 
     } else {
       innerRadius = envelopeRMin();
       outerRadius = envelopeRMax();
@@ -86,7 +86,7 @@ void InDetServMatFactorySLHC::create(GeoPhysVol *world )
     envelopeShape = new GeoTube(innerRadius, outerRadius, 0.5*cylLength);
     zone = new InDetDD::TubeZone("InDetServMat", -0.5*cylLength, 0.5*cylLength, innerRadius, outerRadius);
   } else {
-    GeoPcon* envelopeShapeTmp  = new GeoPcon(0.,2*GeoModelKernelUnits::pi);
+    GeoPcon* envelopeShapeTmp  = new GeoPcon(0.,2*Gaudi::Units::pi);
     // table contains +ve z values only and envelope is assumed to be symmetric around z.
     int numPlanes = envelopeNumPlanes();
     for (int i = 0; i < numPlanes * 2; i++) {
@@ -183,7 +183,7 @@ InDetServMatFactorySLHC::envelopeNumPlanes() const
 double 
 InDetServMatFactorySLHC::envelopeZ(int i) const 
 {
-  double zmin =  geomDB()->getDouble(m_InDetServGenEnvelope,"Z",i) * GeoModelKernelUnits::mm;
+  double zmin =  geomDB()->getDouble(m_InDetServGenEnvelope,"Z",i) * Gaudi::Units::mm;
   if (zmin < 0) msg(MSG::ERROR) << "InDetServGenEnvelope table should only contain +ve z values" << endmsg;
   return std::abs(zmin);
 }
@@ -191,11 +191,11 @@ InDetServMatFactorySLHC::envelopeZ(int i) const
 double 
 InDetServMatFactorySLHC::envelopeRMin(int i) const 
 {
-  return geomDB()->getDouble(m_InDetServGenEnvelope,"RMIN",i) * GeoModelKernelUnits::mm;
+  return geomDB()->getDouble(m_InDetServGenEnvelope,"RMIN",i) * Gaudi::Units::mm;
 }
 
 double 
 InDetServMatFactorySLHC::envelopeRMax(int i) const
 {
-  return geomDB()->getDouble(m_InDetServGenEnvelope,"RMAX",i) * GeoModelKernelUnits::mm;
+  return geomDB()->getDouble(m_InDetServGenEnvelope,"RMAX",i) * Gaudi::Units::mm;
 }
diff --git a/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/InDetServMatGeometryManager.cxx b/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/InDetServMatGeometryManager.cxx
index b1b87b9cf5c43f51a83bceda48cf175722a8f7b1..774517d103b0bedd0a61c2069a3755ed0f5621d3 100644
--- a/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/InDetServMatGeometryManager.cxx
+++ b/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/InDetServMatGeometryManager.cxx
@@ -10,7 +10,7 @@
 #include "RDBAccessSvc/IRDBRecord.h"
 #include "RDBAccessSvc/IRDBRecordset.h"
 
-#include "GeoModelKernel/Units.h"
+#include "GaudiKernel/SystemOfUnits.h"
 
 InDetServMatGeometryManager::InDetServMatGeometryManager(const InDetDD::AthenaComps * athenaComps)   
   : m_athenaComps(athenaComps),
@@ -158,14 +158,14 @@ int InDetServMatGeometryManager::pixelNumLayers() const
 // layer radius 
 double InDetServMatGeometryManager::pixelLayerRadius(int layer) const
 {
-  return db()->getDouble(m_PixelLayer,"RLAYER",layer) * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_PixelLayer,"RLAYER",layer) * Gaudi::Units::mm;
 }
 
 // layer length
 double InDetServMatGeometryManager::pixelLayerLength(int layer) const
 {
   int staveIndex = db()->getInt(m_PixelLayer,"STAVEINDEX",layer);
-  return db()->getDouble(m_PixelStave,"ENVLENGTH",staveIndex) * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_PixelStave,"ENVLENGTH",staveIndex) * Gaudi::Units::mm;
 }
 
 // Number of staves/sectors per barrel layer 
@@ -264,7 +264,7 @@ int InDetServMatGeometryManager::pixelNumDisks() const
 // disk Z position
 double InDetServMatGeometryManager::pixelDiskZ(int disk) const 
 {
-  return db()->getDouble(m_PixelDisk,"ZDISK",disk) * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_PixelDisk,"ZDISK",disk) * Gaudi::Units::mm;
 }
 
 // disk min radius
@@ -272,10 +272,10 @@ double InDetServMatGeometryManager::pixelDiskRMin(int disk) const
 {
   std::string route = pixelDiskServiceRoute(disk);   
   if(route=="StdRoute")
-    return db()->getDouble(m_PixelDisk,"RMIN",disk) * GeoModelKernelUnits::mm - 11*GeoModelKernelUnits::mm;
+    return db()->getDouble(m_PixelDisk,"RMIN",disk) * Gaudi::Units::mm - 11*Gaudi::Units::mm;
 
   // support structures - SUP1RMIN is always closest to centre
-  return db()->getDouble(m_PixelDisk,"SUP1RMIN",disk) * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_PixelDisk,"SUP1RMIN",disk) * Gaudi::Units::mm;
 
 }
 
@@ -284,10 +284,10 @@ double InDetServMatGeometryManager::pixelDiskRMax(int disk) const
 {
   std::string route = pixelDiskServiceRoute(disk);   
   if(route=="StdRoute")
-    return db()->getDouble(m_PixelDisk,"RMAX",disk) * GeoModelKernelUnits::mm + 11*GeoModelKernelUnits::mm;
+    return db()->getDouble(m_PixelDisk,"RMAX",disk) * Gaudi::Units::mm + 11*Gaudi::Units::mm;
 
   // support structures - SUP3RMAX is always furthest from centre
-  return db()->getDouble(m_PixelDisk,"SUP3RMAX",disk) * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_PixelDisk,"SUP3RMAX",disk) * Gaudi::Units::mm;
 
 }
 
@@ -297,7 +297,7 @@ double InDetServMatGeometryManager::pixelDiskEOSZOffset(int disk) const
   if (!db()->testField(m_PixelSvcRoute, "EOSZOFFSET")) 
     return 0.0;
   else
-    return db()->getDouble(m_PixelSvcRoute,"EOSZOFFSET",disk) * GeoModelKernelUnits::mm;
+    return db()->getDouble(m_PixelSvcRoute,"EOSZOFFSET",disk) * Gaudi::Units::mm;
 }
 
 // return name of support tube where 
@@ -310,7 +310,7 @@ std::string InDetServMatGeometryManager::pixelDiskServiceRoute(int disk) const
 
 double InDetServMatGeometryManager::pixelEnvelopeRMax() const
 {
-  return db()->getDouble(m_PixelEnvelope,"RMAX") * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_PixelEnvelope,"RMAX") * Gaudi::Units::mm;
 }
 
 int InDetServMatGeometryManager::pixelBarrelModuleType( int layer) const 
@@ -351,13 +351,13 @@ int InDetServMatGeometryManager::sctNumLayers() const
 // layer radius 
 double InDetServMatGeometryManager::sctLayerRadius(int layer) const
 {
-  return db()->getDouble(m_SctBrlLayer,"RADIUS",layer) * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_SctBrlLayer,"RADIUS",layer) * Gaudi::Units::mm;
 }
 
 // layer length
 double InDetServMatGeometryManager::sctLayerLength(int layer) const
 {
-  return db()->getDouble(m_SctBrlLayer,"CYLLENGTH",layer) * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_SctBrlLayer,"CYLLENGTH",layer) * Gaudi::Units::mm;
 }
 
 // layer type. Long(0) or Short (1) strips. NEEDS CHECKING
@@ -395,17 +395,17 @@ int InDetServMatGeometryManager::sctNumDisks() const
 // disk Z position
 double InDetServMatGeometryManager::sctDiskZ(int disk) const 
 {
-  return db()->getDouble(m_SctFwdWheel,"ZPOSITION",disk) * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_SctFwdWheel,"ZPOSITION",disk) * Gaudi::Units::mm;
 }
 
 // disk Z position
 double InDetServMatGeometryManager::sctDiskRMax(int disk) const 
 {
-  return db()->getDouble(m_SctFwdDiscSupport,"OUTERRADIUS",disk) * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_SctFwdDiscSupport,"OUTERRADIUS",disk) * Gaudi::Units::mm;
 }
 
 double InDetServMatGeometryManager::sctInnerSupport() const 
 {
-  return db()->getDouble(m_SctBrlServPerLayer,"SUPPORTCYLINNERRAD",0) * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_SctBrlServPerLayer,"SUPPORTCYLINNERRAD",0) * Gaudi::Units::mm;
 }
 
diff --git a/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/PixelServMatFactoryDC2.cxx b/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/PixelServMatFactoryDC2.cxx
index ce929352dd2120423ce40cf6d764c5c4c20f4880..5d9dc131c24a532a52ff7f4214cfeb7f9e273d60 100755
--- a/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/PixelServMatFactoryDC2.cxx
+++ b/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/PixelServMatFactoryDC2.cxx
@@ -22,6 +22,7 @@
 #include "RDBAccessSvc/IRDBAccessSvc.h"
 #include "GeoModelUtilities/DecodeVersionKey.h"
 #include "GaudiKernel/Bootstrap.h"
+#include "GaudiKernel/SystemOfUnits.h"
 
 #define SKIPCYLINDER 3
 #define NUMBEROFCYLINDER 7
@@ -76,8 +77,8 @@ void PixelServMatFactoryDC2::create(GeoPhysVol *mother)
     std::string matName =  mat[(int) (*pbfi)[ii]->getFloat("MAT")];
 
     const GeoMaterial* cylMat = materialManager->getMaterial(matName);
-    double rmin = (*pbfi)[ii]->getFloat("RIN")*GeoModelKernelUnits::cm;
-    double rmax = (*pbfi)[ii]->getFloat("ROUT")*GeoModelKernelUnits::cm;
+    double rmin = (*pbfi)[ii]->getFloat("RIN")*Gaudi::Units::cm;
+    double rmax = (*pbfi)[ii]->getFloat("ROUT")*Gaudi::Units::cm;
     double zmin = (*pbfi)[ii]->getFloat("ZIN");
     double zmax = (*pbfi)[ii]->getFloat("ZOUT");
     // elaborate it 'a la G3...
@@ -86,9 +87,9 @@ void PixelServMatFactoryDC2::create(GeoPhysVol *mother)
       double rl = cylMat->getRadLength();
       halflength = fabs(zmax) * rl /200. ;
     } else {
-      halflength = fabs(zmax-zmin)*GeoModelKernelUnits::cm;
+      halflength = fabs(zmax-zmin)*Gaudi::Units::cm;
     }
-    double zpos = fabs(zmin*GeoModelKernelUnits::cm)+halflength+epsilon;
+    double zpos = fabs(zmin*Gaudi::Units::cm)+halflength+epsilon;
     // Build the Phys Vol
     std::ostringstream o;
     o << ii;
diff --git a/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/PixelServMatFactoryDC3.cxx b/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/PixelServMatFactoryDC3.cxx
index 84d66d298dc28f11f49e17189a4f163e54d753fa..0fe4bd0dc21bfa356235ff8c26c42bd030436a82 100755
--- a/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/PixelServMatFactoryDC3.cxx
+++ b/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/PixelServMatFactoryDC3.cxx
@@ -22,6 +22,8 @@
 #include "RDBAccessSvc/IRDBAccessSvc.h"
 #include "GeoModelInterfaces/IGeoDbTagSvc.h"
 #include "GeoModelUtilities/DecodeVersionKey.h"
+#include "GeoModelKernel/Units.h"
+#include "GaudiKernel/SystemOfUnits.h"
 #include <iostream>
 
 #define SKIPCYLINDER 3
@@ -74,14 +76,14 @@ void PixelServMatFactoryDC3::create(GeoPhysVol *mother)
   std::cout << "Test Material std::Copper density="<<testMat->getDensity()
       <<" Rad.length="<<testMat->getRadLength()<<" Int.length="<<testMat->getIntLength()<<'\n';
 
-      GeoMaterial* TIN = new GeoMaterial("Sn", 7.31*GeoModelKernelUnits::gram/GeoModelKernelUnits::cm3);
-//        GeoElement *testMat   = new GeoElement("Tin",  "Sn", 50.0, 118.69*GeoModelKernelUnits::amu_c2);
+      GeoMaterial* TIN = new GeoMaterial("Sn", 7.31*GeoModelKernelUnits::gram/Gaudi::Units::cm3);
+//        GeoElement *testMat   = new GeoElement("Tin",  "Sn", 50.0, 118.69*Gaudi::Units::amu_c2);
       const GeoElement *tin   = materialManager->getElement("Tin");
       TIN->add(const_cast<GeoElement *>(tin),1.);
       TIN->lock(); testMat=TIN;
   std::cout << "Test Material Tin density="<<testMat->getDensity()
       <<" Rad.length="<<testMat->getRadLength()<<" Int.length="<<testMat->getIntLength()<<'\n';
-  std::cout << "Atomic mass unit="<<GeoModelKernelUnits::amu_c2<<'\n';
+  std::cout << "Atomic mass unit="<<Gaudi::Units::amu_c2<<'\n';
   std::cout << "gram/cm3 ="<<gram/cm3<<'\n';
 */
  
@@ -101,8 +103,8 @@ void PixelServMatFactoryDC3::create(GeoPhysVol *mother)
 //      <<" Rad.length="<<cylMat->getRadLength()<<'\n';
 
 
-    double rmin = (*pbfi)[jj]->getFloat("RIN")*GeoModelKernelUnits::cm;
-    double rmax = (*pbfi)[jj]->getFloat("ROUT")*GeoModelKernelUnits::cm;
+    double rmin = (*pbfi)[jj]->getFloat("RIN")*Gaudi::Units::cm;
+    double rmax = (*pbfi)[jj]->getFloat("ROUT")*Gaudi::Units::cm;
     double zmin = (*pbfi)[jj]->getFloat("ZIN");
     double zmax = (*pbfi)[jj]->getFloat("ZOUT");
 
@@ -115,7 +117,7 @@ void PixelServMatFactoryDC3::create(GeoPhysVol *mother)
       double rl = cylMat->getRadLength();
       halflength = fabs(zmax) * rl /200. ;
     } else {
-      halflength = fabs(zmax-zmin)*GeoModelKernelUnits::cm;
+      halflength = fabs(zmax-zmin)*Gaudi::Units::cm;
     }
 
 //VK Temporary!!!  To bring thickness to nominal values
@@ -125,7 +127,7 @@ void PixelServMatFactoryDC3::create(GeoPhysVol *mother)
 //    if( ii == 0 ) zmin += 0.7;   // in cm!
 //std::cout << "New="<<halflength<<", "<<zmin<<", "<<ii<<'\n';
 
-    double zpos = fabs(zmin*GeoModelKernelUnits::cm)+halflength+epsilon;
+    double zpos = fabs(zmin*Gaudi::Units::cm)+halflength+epsilon;
     // Build the Phys Vol
     std::ostringstream o;
     o << ii;
diff --git a/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/PixelServMatFactoryFS.cxx b/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/PixelServMatFactoryFS.cxx
index e872b357bf66833acbce4df6aa0f5a260a3a67fa..0c8e91457035f2bf3b299976004441052a536ba2 100755
--- a/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/PixelServMatFactoryFS.cxx
+++ b/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/PixelServMatFactoryFS.cxx
@@ -28,6 +28,7 @@
 #include "RDBAccessSvc/IRDBAccessSvc.h"
 #include "GeoModelUtilities/DecodeVersionKey.h"
 #include "GaudiKernel/Bootstrap.h"
+#include "GaudiKernel/SystemOfUnits.h"
 #include <iostream>
 
 
@@ -105,7 +106,7 @@ void PixelServMatFactoryFS::create(GeoPhysVol *motherP, GeoPhysVol *motherM)
 				    servicePcon->getDPhi());
 
       GeoCons* cons = new GeoCons(servicePcon->getRMinPlane(2),servicePcon->getRMinPlane(3),
-				   servicePcon->getRMaxPlane(2),servicePcon->getRMaxPlane(3)+1E-9*GeoModelKernelUnits::mm,
+				   servicePcon->getRMaxPlane(2),servicePcon->getRMaxPlane(3)+1E-9*Gaudi::Units::mm,
 				   (servicePcon->getZPlane(3)-servicePcon->getZPlane(2))*0.5,
 				   servicePcon->getSPhi(),
 				   servicePcon->getDPhi());
diff --git a/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/SCT_ServMatFactory.cxx b/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/SCT_ServMatFactory.cxx
index 12d99004ab1d44fd93259e840c42dfd40af592f0..9c1001f08ea6a3b18aa5a24eb7e6e558f5242c49 100755
--- a/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/SCT_ServMatFactory.cxx
+++ b/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/SCT_ServMatFactory.cxx
@@ -25,6 +25,7 @@
 
 #include "GeoModelInterfaces/IGeoDbTagSvc.h"
 #include "GeoModelUtilities/DecodeVersionKey.h"
+#include "GaudiKernel/SystemOfUnits.h"
 
 #include <sstream>
 #include <iostream>
@@ -72,14 +73,14 @@ void SCT_ServMatFactory::create(GeoPhysVol *mother)
 
   //------------------------------------------
   //VK  10/09/2005 Construct a gap for rails
-  double outROfIDet =       (*atls)[0]->getDouble("IDETOR")*GeoModelKernelUnits::cm;
-  double endZOfIDet =       (*atls)[0]->getDouble("IDETZMX")*GeoModelKernelUnits::cm;
-  //  double minRofGap  =       1050.0*GeoModelKernelUnits::mm;
-  //  double minRofGap  =       1110.0*GeoModelKernelUnits::mm;
-  double minRofGap  =       1089.0*GeoModelKernelUnits::mm;
-  double phiWid=(70.*GeoModelKernelUnits::mm)/outROfIDet;   
+  double outROfIDet =       (*atls)[0]->getDouble("IDETOR")*Gaudi::Units::cm;
+  double endZOfIDet =       (*atls)[0]->getDouble("IDETZMX")*Gaudi::Units::cm;
+  //  double minRofGap  =       1050.0*Gaudi::Units::mm;
+  //  double minRofGap  =       1110.0*Gaudi::Units::mm;
+  double minRofGap  =       1089.0*Gaudi::Units::mm;
+  double phiWid=(70.*Gaudi::Units::mm)/outROfIDet;   
   //  std::cout << "Gap phiWid = " << phiWid << std::endl;
-  double safetyGap=1.*GeoModelKernelUnits::mm;
+  double safetyGap=1.*Gaudi::Units::mm;
 
   //created by Adam Agocs 
 
@@ -131,7 +132,7 @@ void SCT_ServMatFactory::create(GeoPhysVol *mother)
     double volumeCut = 0;
     const GeoShape* serviceTube = serviceTubeTmp;
     const GeoShape* serviceTube2 = serviceTubeTmp; //because of asymmetry
-    if( tubeHelper.volData().maxRadius() > minRofGap && tubeHelper.volData().phiStart()*GeoModelKernelUnits::radian < phiTop)  {
+    if( tubeHelper.volData().maxRadius() > minRofGap && tubeHelper.volData().phiStart()*Gaudi::Units::radian < phiTop)  {
       // Subtract RailGap out of services
       if (NameOfService == "PPB1EFEG" || NameOfService == "CableTrayEFEG")
       {
@@ -173,8 +174,8 @@ void SCT_ServMatFactory::create(GeoPhysVol *mother)
 
      GeoTransform * xform1    = new GeoTransform(trans);
      GeoTransform * xform1Neg = new GeoTransform(trans2);
-     GeoTransform * xform2    = new GeoTransform(GeoTrf::RotateZ3D(180*GeoModelKernelUnits::deg)*trans);
-     GeoTransform * xform2Neg = new GeoTransform(GeoTrf::RotateZ3D(180*GeoModelKernelUnits::deg)*trans2);
+     GeoTransform * xform2    = new GeoTransform(GeoTrf::RotateZ3D(180*Gaudi::Units::deg)*trans);
+     GeoTransform * xform2Neg = new GeoTransform(GeoTrf::RotateZ3D(180*Gaudi::Units::deg)*trans2);
     
 //     std::cerr << xform1 << std::endl << xform1Neg << std::endl << xform2 << std::endl << xform2Neg << std::endl;
      
@@ -204,12 +205,12 @@ void SCT_ServMatFactory::create(GeoPhysVol *mother)
 
     for (unsigned int ii =0; ii < sctsup->size(); ii++) {
       
-      RMinW          = (*sctsup)[ii]->getFloat("RMIN")*GeoModelKernelUnits::mm;
-      RMaxW          = (*sctsup)[ii]->getFloat("RMAX")*GeoModelKernelUnits::mm;
-      ZHalfLengthW   = (*sctsup)[ii]->getFloat("THICK")/2.*GeoModelKernelUnits::mm;
-      WidI           = (*sctsup)[ii]->getFloat("WIDTHINNER")*GeoModelKernelUnits::mm;
-      WidO           = (*sctsup)[ii]->getFloat("WIDTHOUTER")*GeoModelKernelUnits::mm;
-      ZStartW        = (*sctsup)[ii]->getFloat("ZSTART")*GeoModelKernelUnits::mm;
+      RMinW          = (*sctsup)[ii]->getFloat("RMIN")*Gaudi::Units::mm;
+      RMaxW          = (*sctsup)[ii]->getFloat("RMAX")*Gaudi::Units::mm;
+      ZHalfLengthW   = (*sctsup)[ii]->getFloat("THICK")/2.*Gaudi::Units::mm;
+      WidI           = (*sctsup)[ii]->getFloat("WIDTHINNER")*Gaudi::Units::mm;
+      WidO           = (*sctsup)[ii]->getFloat("WIDTHOUTER")*Gaudi::Units::mm;
+      ZStartW        = (*sctsup)[ii]->getFloat("ZSTART")*Gaudi::Units::mm;
       NameOfMaterial = (*sctsup)[ii]->getString("MATERIAL");
       DPhi = asin(WidI/2./RMinW);
       
@@ -293,14 +294,14 @@ void SCT_ServMatFactory::create(GeoPhysVol *mother)
 
   //------------------------------------------
   //VK  10/09/2005 Construct a gap for rails
-  double outROfIDet =       (*atls)[0]->getDouble("IDETOR")*GeoModelKernelUnits::cm;
-  double endZOfIDet =       (*atls)[0]->getDouble("IDETZMX")*GeoModelKernelUnits::cm;
-  //  double minRofGap  =       1050.0*GeoModelKernelUnits::mm;
-  //  double minRofGap  =       1110.0*GeoModelKernelUnits::mm;
-  double minRofGap  =       1089.0*GeoModelKernelUnits::mm;
-  double phiWid=(70.*GeoModelKernelUnits::mm)/outROfIDet;   
+  double outROfIDet =       (*atls)[0]->getDouble("IDETOR")*Gaudi::Units::cm;
+  double endZOfIDet =       (*atls)[0]->getDouble("IDETZMX")*Gaudi::Units::cm;
+  //  double minRofGap  =       1050.0*Gaudi::Units::mm;
+  //  double minRofGap  =       1110.0*Gaudi::Units::mm;
+  double minRofGap  =       1089.0*Gaudi::Units::mm;
+  double phiWid=(70.*Gaudi::Units::mm)/outROfIDet;   
   //  std::cout << "Gap phiWid = " << phiWid << std::endl;
-  double safetyGap=1.*GeoModelKernelUnits::mm;
+  double safetyGap=1.*Gaudi::Units::mm;
   const GeoShape* railGap1=new GeoTubs( minRofGap, outROfIDet+safetyGap ,endZOfIDet+safetyGap , 
 					-phiWid/2.,phiWid);
   const GeoShape* railGap2=new GeoTubs( minRofGap, outROfIDet+safetyGap ,endZOfIDet+safetyGap ,
@@ -367,12 +368,12 @@ void SCT_ServMatFactory::create(GeoPhysVol *mother)
 
     for (unsigned int ii =0; ii < sctsup->size(); ii++) {
       
-      RMinW        = (*sctsup)[ii]->getFloat("RMIN")*GeoModelKernelUnits::mm;
-      RMaxW        = (*sctsup)[ii]->getFloat("RMAX")*GeoModelKernelUnits::mm;
-      ZHalfLengthW = (*sctsup)[ii]->getFloat("THICK")/2.*GeoModelKernelUnits::mm;
-      WidI         = (*sctsup)[ii]->getFloat("WIDTHINNER")*GeoModelKernelUnits::mm;
-      WidO         = (*sctsup)[ii]->getFloat("WIDTHOUTER")*GeoModelKernelUnits::mm;
-      ZStartW      = (*sctsup)[ii]->getFloat("ZSTART")*GeoModelKernelUnits::mm;
+      RMinW        = (*sctsup)[ii]->getFloat("RMIN")*Gaudi::Units::mm;
+      RMaxW        = (*sctsup)[ii]->getFloat("RMAX")*Gaudi::Units::mm;
+      ZHalfLengthW = (*sctsup)[ii]->getFloat("THICK")/2.*Gaudi::Units::mm;
+      WidI         = (*sctsup)[ii]->getFloat("WIDTHINNER")*Gaudi::Units::mm;
+      WidO         = (*sctsup)[ii]->getFloat("WIDTHOUTER")*Gaudi::Units::mm;
+      ZStartW      = (*sctsup)[ii]->getFloat("ZSTART")*Gaudi::Units::mm;
       DPhi = asin(WidI/2./RMinW);
       
       const GeoShape* pTub1 = new GeoTubs(RMinW, RMaxW, ZHalfLengthW, 0.-DPhi, 2.*DPhi);  //Basic shape
diff --git a/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/SCT_ServMatFactoryDC2.cxx b/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/SCT_ServMatFactoryDC2.cxx
index 32ed55a0bbb3fed658f7c8d4416605e336972fd4..c2b741161e1914e72086f9ea6a77c1099349a453 100755
--- a/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/SCT_ServMatFactoryDC2.cxx
+++ b/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/SCT_ServMatFactoryDC2.cxx
@@ -27,6 +27,8 @@
 
 #include "GeoModelUtilities/DecodeVersionKey.h"
 #include "GaudiKernel/Bootstrap.h"
+#include "GeoModelKernel/Units.h"
+#include "GaudiKernel/PhysicalConstants.h"
 #include <stdexcept>
 #define TRTELEMENTSINEL 9
 #define SCTELEMENTSINEL 8
@@ -78,20 +80,20 @@ void SCT_ServMatFactoryDC2::create(GeoPhysVol *mother)
   // Build SCT services in Endcap.
   // (Code taken from TRT_GeoModel)
 
-  double innerRadiusOfSCTSupport = (*tsci)[0]->getDouble("RMIN")*GeoModelKernelUnits::cm + 2*epsilon;
-  double outerRadiusOfSCTSupport = (*tsci)[0]->getDouble("RMAX")*GeoModelKernelUnits::cm;
-  double lengthOfSCTSupport = ((*tsci)[0]->getDouble("ZMAX")-(*tsci)[0]->getDouble("ZMIN"))*GeoModelKernelUnits::cm - epsilon;
-  double positionOfSCTSupport= 0.5 * ((*tsci)[0]->getDouble("ZMAX")+(*tsci)[0]->getDouble("ZMIN"))*GeoModelKernelUnits::cm;
+  double innerRadiusOfSCTSupport = (*tsci)[0]->getDouble("RMIN")*Gaudi::Units::cm + 2*epsilon;
+  double outerRadiusOfSCTSupport = (*tsci)[0]->getDouble("RMAX")*Gaudi::Units::cm;
+  double lengthOfSCTSupport = ((*tsci)[0]->getDouble("ZMAX")-(*tsci)[0]->getDouble("ZMIN"))*Gaudi::Units::cm - epsilon;
+  double positionOfSCTSupport= 0.5 * ((*tsci)[0]->getDouble("ZMAX")+(*tsci)[0]->getDouble("ZMIN"))*Gaudi::Units::cm;
 
-  double innerRadiusOfSCTCables = (*tsci)[1]->getDouble("RMIN")*GeoModelKernelUnits::cm + 2*epsilon;
-  double outerRadiusOfSCTCables = (*tsci)[1]->getDouble("RMAX")*GeoModelKernelUnits::cm;
-  double lengthOfSCTCables = ((*tsci)[1]->getDouble("ZMAX")-(*tsci)[1]->getDouble("ZMIN"))*GeoModelKernelUnits::cm - epsilon;
-  double positionOfSCTCables = 0.5 * ((*tsci)[1]->getDouble("ZMAX")+(*tsci)[1]->getDouble("ZMIN"))*GeoModelKernelUnits::cm;
+  double innerRadiusOfSCTCables = (*tsci)[1]->getDouble("RMIN")*Gaudi::Units::cm + 2*epsilon;
+  double outerRadiusOfSCTCables = (*tsci)[1]->getDouble("RMAX")*Gaudi::Units::cm;
+  double lengthOfSCTCables = ((*tsci)[1]->getDouble("ZMAX")-(*tsci)[1]->getDouble("ZMIN"))*Gaudi::Units::cm - epsilon;
+  double positionOfSCTCables = 0.5 * ((*tsci)[1]->getDouble("ZMAX")+(*tsci)[1]->getDouble("ZMIN"))*Gaudi::Units::cm;
  
-  double innerRadiusOfSCTCooling = (*tsci)[2]->getDouble("RMIN")*GeoModelKernelUnits::cm + 2*epsilon;
-  double outerRadiusOfSCTCooling = (*tsci)[2]->getDouble("RMAX")*GeoModelKernelUnits::cm;
-  double lengthOfSCTCooling = ((*tsci)[2]->getDouble("ZMAX")-(*tsci)[2]->getDouble("ZMIN"))*GeoModelKernelUnits::cm - epsilon;
-  double positionOfSCTCooling = 0.5 * ((*tsci)[2]->getDouble("ZMAX")+(*tsci)[2]->getDouble("ZMIN"))*GeoModelKernelUnits::cm;
+  double innerRadiusOfSCTCooling = (*tsci)[2]->getDouble("RMIN")*Gaudi::Units::cm + 2*epsilon;
+  double outerRadiusOfSCTCooling = (*tsci)[2]->getDouble("RMAX")*Gaudi::Units::cm;
+  double lengthOfSCTCooling = ((*tsci)[2]->getDouble("ZMAX")-(*tsci)[2]->getDouble("ZMIN"))*Gaudi::Units::cm - epsilon;
+  double positionOfSCTCooling = 0.5 * ((*tsci)[2]->getDouble("ZMAX")+(*tsci)[2]->getDouble("ZMIN"))*Gaudi::Units::cm;
 
 
   // For new LMT we get name from SCT table ZSCG.
@@ -106,15 +108,15 @@ void SCT_ServMatFactoryDC2::create(GeoPhysVol *mother)
     // We define it here for now as a quick fix.
     
     // Thickness of CuK 896 tapes smeared in phi = 0.08575cm
-    double tapeCrossSection = (*zscg)[0]->getDouble("ALAREA")*GeoModelKernelUnits::cm2;
+    double tapeCrossSection = (*zscg)[0]->getDouble("ALAREA")*Gaudi::Units::cm2;
     double rave = 2*innerRadiusOfSCTCables*outerRadiusOfSCTCables/(innerRadiusOfSCTCables+outerRadiusOfSCTCables);
-    double thickness = 988*tapeCrossSection/(2*GeoModelKernelUnits::pi*rave);
+    double thickness = 988*tapeCrossSection/(2*Gaudi::Units::pi*rave);
     // We need to scale the density to fit in with space given.
-    //std::cout << "LMT thickness (GeoModelKernelUnits::mm) = " << thickness/GeoModelKernelUnits::mm << std::endl;
+    //std::cout << "LMT thickness (Gaudi::Units::mm) = " << thickness/Gaudi::Units::mm << std::endl;
     double densityfactor = thickness/lengthOfSCTCables;
     const GeoElement  *copper  = m_materialManager->getElement("Copper");
     const GeoMaterial *kapton  = m_materialManager->getMaterial("std::Kapton");
-    GeoMaterial * matCuKapton   = new GeoMaterial("CuKaptoninTRT",densityfactor * 2.94*GeoModelKernelUnits::gram/GeoModelKernelUnits::cm3);
+    GeoMaterial * matCuKapton   = new GeoMaterial("CuKaptoninTRT",densityfactor * 2.94*GeoModelKernelUnits::gram/Gaudi::Units::cm3);
     matCuKapton->add(const_cast<GeoElement*>(copper),  0.6142);
     matCuKapton->add(const_cast<GeoMaterial*>(kapton), 0.3858);
     matCuKapton->lock();
@@ -167,15 +169,15 @@ void SCT_ServMatFactoryDC2::create(GeoPhysVol *mother)
     std::ostringstream o;
     o << jj;
     std::string logName = "SctInel"+o.str();  
-    double halflength = ((*inel)[ii]->getFloat("ZMAX")-(*inel)[ii]->getFloat("ZMIN"))/2.*GeoModelKernelUnits::cm;
+    double halflength = ((*inel)[ii]->getFloat("ZMAX")-(*inel)[ii]->getFloat("ZMIN"))/2.*Gaudi::Units::cm;
     int volType = (int) (*inel)[ii]->getFloat("VOLTYP");
 
     const GeoShape* serviceTube = createShape(volType,
-					      (*inel)[ii]->getFloat("RMIN1")*GeoModelKernelUnits::cm,
-					      (*inel)[ii]->getFloat("RMAX1")*GeoModelKernelUnits::cm,
+					      (*inel)[ii]->getFloat("RMIN1")*Gaudi::Units::cm,
+					      (*inel)[ii]->getFloat("RMAX1")*Gaudi::Units::cm,
 					      halflength,
-					      (*inel)[ii]->getFloat("RMIN2")*GeoModelKernelUnits::cm,
-					      (*inel)[ii]->getFloat("RMAX2")*GeoModelKernelUnits::cm);
+					      (*inel)[ii]->getFloat("RMIN2")*Gaudi::Units::cm,
+					      (*inel)[ii]->getFloat("RMAX2")*Gaudi::Units::cm);
     
 
     // create the material...
@@ -194,16 +196,16 @@ void SCT_ServMatFactoryDC2::create(GeoPhysVol *mother)
       cylMat = createMaterial(nameStr.str(),
 			      volType,
 			      fractionRL,
-			      (*inel)[ii]->getFloat("RMIN1")*GeoModelKernelUnits::cm,
-			      (*inel)[ii]->getFloat("RMAX1")*GeoModelKernelUnits::cm,
+			      (*inel)[ii]->getFloat("RMIN1")*Gaudi::Units::cm,
+			      (*inel)[ii]->getFloat("RMAX1")*Gaudi::Units::cm,
 			      halflength,
-			      (*inel)[ii]->getFloat("RMIN2")*GeoModelKernelUnits::cm,
-			      (*inel)[ii]->getFloat("RMAX2")*GeoModelKernelUnits::cm); 
+			      (*inel)[ii]->getFloat("RMIN2")*Gaudi::Units::cm,
+			      (*inel)[ii]->getFloat("RMAX2")*Gaudi::Units::cm); 
     }
 
     const GeoLogVol* ServLog = new GeoLogVol(logName,serviceTube,cylMat);
     GeoVPhysVol* ServPhys = new GeoPhysVol(ServLog);
-    double zpos = ((*inel)[ii]->getFloat("ZMAX")+(*inel)[ii]->getFloat("ZMIN"))/2.*GeoModelKernelUnits::cm+epsilon;
+    double zpos = ((*inel)[ii]->getFloat("ZMAX")+(*inel)[ii]->getFloat("ZMIN"))/2.*Gaudi::Units::cm+epsilon;
     // place two
     GeoTrf::Translate3D servpos1(0.,0.,zpos);
     GeoTrf::Translate3D servpos2(0.,0.,-zpos);
@@ -227,7 +229,7 @@ const GeoShape* SCT_ServMatFactoryDC2::createShape(int volType,
 						double rmax2=0.) 
   
 {
-  const double epsilon = 0.001*GeoModelKernelUnits::mm;
+  const double epsilon = 0.001*Gaudi::Units::mm;
   enum VOLTYPE{Tube=1, Cone, ICone};
   const GeoShape* IDShape = 0;
   if(volType == Tube) {
diff --git a/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/SCT_ServMatFactoryDC3.cxx b/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/SCT_ServMatFactoryDC3.cxx
index 2f2ff0f25c4fe050710519fbe269aca9c43d3b46..cc7e4f88bdf54527f2e557bc9583d3440ad4c8bf 100755
--- a/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/SCT_ServMatFactoryDC3.cxx
+++ b/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/SCT_ServMatFactoryDC3.cxx
@@ -25,6 +25,8 @@
 
 #include "GeoModelInterfaces/IGeoDbTagSvc.h"
 #include "GeoModelUtilities/DecodeVersionKey.h"
+#include "GeoModelKernel/Units.h"
+#include "GaudiKernel/PhysicalConstants.h"
 
 #define TRTELEMENTSINEL 9
 #define SCTELEMENTSINEL 8
@@ -66,10 +68,10 @@ void SCT_ServMatFactoryDC3::create(GeoPhysVol *mother)
   //const IRDBRecordset* sctFwdServices = rdbAccessSvc()->getRecordset("SctFwdServices", sctVersionKey.tag(), sctVersionKey.node());
 
 //VVK  10/09/2005 Construct a gap for rails
-  double outROfIDet =       (*atls)[0]->getDouble("IDETOR")*GeoModelKernelUnits::cm;
-  double endZOfIDet =       (*atls)[0]->getDouble("IDETZMX")*GeoModelKernelUnits::cm;
-  double minRofGap  =       1050.0*GeoModelKernelUnits::mm;
-  double phiWid=(70.*GeoModelKernelUnits::mm)/outROfIDet;    double safetyGap=1.*GeoModelKernelUnits::mm;
+  double outROfIDet =       (*atls)[0]->getDouble("IDETOR")*Gaudi::Units::cm;
+  double endZOfIDet =       (*atls)[0]->getDouble("IDETZMX")*Gaudi::Units::cm;
+  double minRofGap  =       1050.0*Gaudi::Units::mm;
+  double phiWid=(70.*Gaudi::Units::mm)/outROfIDet;    double safetyGap=1.*Gaudi::Units::mm;
   const GeoShape* railGap1=new GeoTubs( minRofGap, outROfIDet+safetyGap ,endZOfIDet+safetyGap , 
 					-phiWid/2.,phiWid);
   const GeoShape* railGap2=new GeoTubs( minRofGap, outROfIDet+safetyGap ,endZOfIDet+safetyGap ,
@@ -82,25 +84,25 @@ void SCT_ServMatFactoryDC3::create(GeoPhysVol *mother)
   // (Code taken from TRT_GeoModel)
   
   // Hardwire min sct services for now. The database structures should be moved out of TRT anyway.
-  double rminSCTServ = 620*GeoModelKernelUnits::mm;
+  double rminSCTServ = 620*Gaudi::Units::mm;
 
-  //double innerRadiusOfSCTSupport = (*tsci)[0]->getDouble("RMIN")*GeoModelKernelUnits::cm + 2*epsilon;
+  //double innerRadiusOfSCTSupport = (*tsci)[0]->getDouble("RMIN")*Gaudi::Units::cm + 2*epsilon;
   double innerRadiusOfSCTSupport =  rminSCTServ + 2*epsilon;
-  double outerRadiusOfSCTSupport = (*tsci)[0]->getDouble("RMAX")*GeoModelKernelUnits::cm;
-  double lengthOfSCTSupport = ((*tsci)[0]->getDouble("ZMAX")-(*tsci)[0]->getDouble("ZMIN"))*GeoModelKernelUnits::cm - epsilon;
-  double positionOfSCTSupport= 0.5 * ((*tsci)[0]->getDouble("ZMAX")+(*tsci)[0]->getDouble("ZMIN"))*GeoModelKernelUnits::cm;
+  double outerRadiusOfSCTSupport = (*tsci)[0]->getDouble("RMAX")*Gaudi::Units::cm;
+  double lengthOfSCTSupport = ((*tsci)[0]->getDouble("ZMAX")-(*tsci)[0]->getDouble("ZMIN"))*Gaudi::Units::cm - epsilon;
+  double positionOfSCTSupport= 0.5 * ((*tsci)[0]->getDouble("ZMAX")+(*tsci)[0]->getDouble("ZMIN"))*Gaudi::Units::cm;
 
-  //double innerRadiusOfSCTCables = (*tsci)[1]->getDouble("RMIN")*GeoModelKernelUnits::cm + 2*epsilon;
+  //double innerRadiusOfSCTCables = (*tsci)[1]->getDouble("RMIN")*Gaudi::Units::cm + 2*epsilon;
   double innerRadiusOfSCTCables = rminSCTServ + 2*epsilon;
-  double outerRadiusOfSCTCables = (*tsci)[1]->getDouble("RMAX")*GeoModelKernelUnits::cm;
-  double lengthOfSCTCables = ((*tsci)[1]->getDouble("ZMAX")-(*tsci)[1]->getDouble("ZMIN"))*GeoModelKernelUnits::cm - epsilon;
-  double positionOfSCTCables = 0.5 * ((*tsci)[1]->getDouble("ZMAX")+(*tsci)[1]->getDouble("ZMIN"))*GeoModelKernelUnits::cm;
+  double outerRadiusOfSCTCables = (*tsci)[1]->getDouble("RMAX")*Gaudi::Units::cm;
+  double lengthOfSCTCables = ((*tsci)[1]->getDouble("ZMAX")-(*tsci)[1]->getDouble("ZMIN"))*Gaudi::Units::cm - epsilon;
+  double positionOfSCTCables = 0.5 * ((*tsci)[1]->getDouble("ZMAX")+(*tsci)[1]->getDouble("ZMIN"))*Gaudi::Units::cm;
  
-  //double innerRadiusOfSCTCooling = (*tsci)[2]->getDouble("RMIN")*GeoModelKernelUnits::cm + 2*epsilon;
+  //double innerRadiusOfSCTCooling = (*tsci)[2]->getDouble("RMIN")*Gaudi::Units::cm + 2*epsilon;
   double innerRadiusOfSCTCooling = rminSCTServ + 2*epsilon;
-  double outerRadiusOfSCTCooling = (*tsci)[2]->getDouble("RMAX")*GeoModelKernelUnits::cm;
-  double lengthOfSCTCooling = ((*tsci)[2]->getDouble("ZMAX")-(*tsci)[2]->getDouble("ZMIN"))*GeoModelKernelUnits::cm - epsilon;
-  double positionOfSCTCooling = 0.5 * ((*tsci)[2]->getDouble("ZMAX")+(*tsci)[2]->getDouble("ZMIN"))*GeoModelKernelUnits::cm;
+  double outerRadiusOfSCTCooling = (*tsci)[2]->getDouble("RMAX")*Gaudi::Units::cm;
+  double lengthOfSCTCooling = ((*tsci)[2]->getDouble("ZMAX")-(*tsci)[2]->getDouble("ZMIN"))*Gaudi::Units::cm - epsilon;
+  double positionOfSCTCooling = 0.5 * ((*tsci)[2]->getDouble("ZMAX")+(*tsci)[2]->getDouble("ZMIN"))*Gaudi::Units::cm;
 
 
   // For new LMT we get name from SCT table SctFwdServices.
@@ -115,15 +117,15 @@ void SCT_ServMatFactoryDC3::create(GeoPhysVol *mother)
     // We define it here for now as a quick fix.
     
     // Thickness of CuK 896 tapes smeared in phi = 0.08575cm
-    double tapeCrossSection = (*sctFwdServices)[0]->getDouble("POWERTAPECROSSSECT")*GeoModelKernelUnits::mm2;
+    double tapeCrossSection = (*sctFwdServices)[0]->getDouble("POWERTAPECROSSSECT")*Gaudi::Units::mm2;
     double rave = 2*innerRadiusOfSCTCables*outerRadiusOfSCTCables/(innerRadiusOfSCTCables+outerRadiusOfSCTCables);
-    double thickness = 988*tapeCrossSection/(2*GeoModelKernelUnits::pi*rave);
+    double thickness = 988*tapeCrossSection/(2*Gaudi::Units::pi*rave);
     // We need to scale the density to fit in with space given.
-    //std::cout << "LMT thickness (mm) = " << thickness/GeoModelKernelUnits::mm << std::endl;
+    //std::cout << "LMT thickness (mm) = " << thickness/Gaudi::Units::mm << std::endl;
     double densityfactor = thickness/lengthOfSCTCables;
     const GeoElement  *copper  = m_materialManager->getElement("Copper");
     const GeoMaterial *kapton  = m_materialManager->getMaterial("std::Kapton");
-    GeoMaterial * matCuKapton   = new GeoMaterial("CuKaptoninTRT",densityfactor * 2.94*GeoModelKernelUnits::gram/GeoModelKernelUnits::cm3);
+    GeoMaterial * matCuKapton   = new GeoMaterial("CuKaptoninTRT",densityfactor * 2.94*GeoModelKernelUnits::gram/Gaudi::Units::cm3);
     matCuKapton->add(const_cast<GeoElement*>(copper),  0.6142);
     matCuKapton->add(const_cast<GeoMaterial*>(kapton), 0.3858);
     matCuKapton->lock();
@@ -185,19 +187,19 @@ void SCT_ServMatFactoryDC3::create(GeoPhysVol *mother)
     std::ostringstream o;
     o << irecold++;
     std::string logName = "SctInel"+o.str();  
-    double halflength = ((*inel)[ii]->getFloat("ZMAX")-(*inel)[ii]->getFloat("ZMIN"))/2.*GeoModelKernelUnits::cm;
+    double halflength = ((*inel)[ii]->getFloat("ZMAX")-(*inel)[ii]->getFloat("ZMIN"))/2.*Gaudi::Units::cm;
     int volType = (int) (*inel)[ii]->getFloat("VOLTYP");
 
     const GeoShape* serviceTubeTmp1 = createShape(volType,
-					      (*inel)[ii]->getFloat("RMIN1")*GeoModelKernelUnits::cm,
-					      (*inel)[ii]->getFloat("RMAX1")*GeoModelKernelUnits::cm,
+					      (*inel)[ii]->getFloat("RMIN1")*Gaudi::Units::cm,
+					      (*inel)[ii]->getFloat("RMAX1")*Gaudi::Units::cm,
 					      halflength,
-					      (*inel)[ii]->getFloat("RMIN2")*GeoModelKernelUnits::cm,
-					      (*inel)[ii]->getFloat("RMAX2")*GeoModelKernelUnits::cm);
+					      (*inel)[ii]->getFloat("RMIN2")*Gaudi::Units::cm,
+					      (*inel)[ii]->getFloat("RMAX2")*Gaudi::Units::cm);
 
     const GeoShape* serviceTube = serviceTubeTmp1;
-    if( (*inel)[ii]->getFloat("RMAX1")*GeoModelKernelUnits::cm  > minRofGap   ||
-        (*inel)[ii]->getFloat("RMAX2")*GeoModelKernelUnits::cm  > minRofGap     )  {
+    if( (*inel)[ii]->getFloat("RMAX1")*Gaudi::Units::cm  > minRofGap   ||
+        (*inel)[ii]->getFloat("RMAX2")*Gaudi::Units::cm  > minRofGap     )  {
 //
 //VVK Subtract RailGap out of services
         const GeoShape* serviceTubeTmp2 = (GeoShape*) & (*serviceTubeTmp1).subtract(*railGap1);
@@ -223,16 +225,16 @@ void SCT_ServMatFactoryDC3::create(GeoPhysVol *mother)
       cylMat = createMaterial(nameStr.str(),
 			      volType,
 			      fractionRL,
-			      (*inel)[ii]->getFloat("RMIN1")*GeoModelKernelUnits::cm,
-			      (*inel)[ii]->getFloat("RMAX1")*GeoModelKernelUnits::cm,
+			      (*inel)[ii]->getFloat("RMIN1")*Gaudi::Units::cm,
+			      (*inel)[ii]->getFloat("RMAX1")*Gaudi::Units::cm,
 			      halflength,
-			      (*inel)[ii]->getFloat("RMIN2")*GeoModelKernelUnits::cm,
-			      (*inel)[ii]->getFloat("RMAX2")*GeoModelKernelUnits::cm); 
+			      (*inel)[ii]->getFloat("RMIN2")*Gaudi::Units::cm,
+			      (*inel)[ii]->getFloat("RMAX2")*Gaudi::Units::cm); 
     }
 
     const GeoLogVol* ServLog = new GeoLogVol(logName,serviceTube,cylMat);
     GeoVPhysVol* ServPhys = new GeoPhysVol(ServLog);
-    double zpos = ((*inel)[ii]->getFloat("ZMAX")+(*inel)[ii]->getFloat("ZMIN"))/2.*GeoModelKernelUnits::cm+epsilon;
+    double zpos = ((*inel)[ii]->getFloat("ZMAX")+(*inel)[ii]->getFloat("ZMIN"))/2.*Gaudi::Units::cm+epsilon;
     // place two
     GeoTrf::Translate3D servpos1(0.,0.,zpos);
     GeoTrf::Translate3D servpos2(0.,0.,-zpos);
@@ -257,7 +259,7 @@ const GeoShape* SCT_ServMatFactoryDC3::createShape(int volType,
 						double rmax2=0.) 
   
 {
-  const double epsilon = 0.001*GeoModelKernelUnits::mm;
+  const double epsilon = 0.001*Gaudi::Units::mm;
   enum VOLTYPE{Tube=1, Cone, ICone};
   const GeoShape* IDShape = 0;
   if(volType == Tube) {
diff --git a/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/SCT_ServMatFactoryFS.cxx b/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/SCT_ServMatFactoryFS.cxx
index a519849def8bf7714f02cfaa372b2a945bd293c1..6645fab3a90b72e90ad441f589c679e7b945f2dc 100755
--- a/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/SCT_ServMatFactoryFS.cxx
+++ b/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/SCT_ServMatFactoryFS.cxx
@@ -31,6 +31,7 @@
 
 #include "GeoModelUtilities/DecodeVersionKey.h"
 #include "GaudiKernel/Bootstrap.h"
+#include "GaudiKernel/SystemOfUnits.h"
 
 #include <sstream>
 #include <iostream>
@@ -74,11 +75,11 @@ void SCT_ServMatFactoryFS::create(GeoPhysVol *motherP,GeoPhysVol *motherM)
 
   //------------------------------------------
   //VK  10/09/2005 Construct a gap for rails
-  double outROfIDet =       (*atls)[0]->getDouble("IDETOR")*GeoModelKernelUnits::cm;
-  double endZOfIDet =       (*atls)[0]->getDouble("IDETZMX")*GeoModelKernelUnits::cm;
-  double minRofGap  =       1089.0*GeoModelKernelUnits::mm;
-  double phiWid=(70.*GeoModelKernelUnits::mm)/outROfIDet;   
-  double safetyGap=1.*GeoModelKernelUnits::mm;
+  double outROfIDet =       (*atls)[0]->getDouble("IDETOR")*Gaudi::Units::cm;
+  double endZOfIDet =       (*atls)[0]->getDouble("IDETZMX")*Gaudi::Units::cm;
+  double minRofGap  =       1089.0*Gaudi::Units::mm;
+  double phiWid=(70.*Gaudi::Units::mm)/outROfIDet;   
+  double safetyGap=1.*Gaudi::Units::mm;
   const GeoShape* railGap1=new GeoTubs( minRofGap, outROfIDet+safetyGap ,endZOfIDet+safetyGap , 
 					-phiWid/2.,phiWid);
   const GeoShape* railGap2=new GeoTubs( minRofGap, outROfIDet+safetyGap ,endZOfIDet+safetyGap ,
@@ -159,7 +160,7 @@ void SCT_ServMatFactoryFS::create(GeoPhysVol *motherP,GeoPhysVol *motherM)
 
 	// Shape 2. Cons component of the pcon
 	cons = new GeoCons(servicePcon->getRMinPlane(1),servicePcon->getRMinPlane(2),
-			   servicePcon->getRMaxPlane(1),servicePcon->getRMaxPlane(2)+1E-9*GeoModelKernelUnits::mm,
+			   servicePcon->getRMaxPlane(1),servicePcon->getRMaxPlane(2)+1E-9*Gaudi::Units::mm,
 			   (servicePcon->getZPlane(2)-servicePcon->getZPlane(1))*0.5,
 			   0,2*M_PI);
 
@@ -218,12 +219,12 @@ void SCT_ServMatFactoryFS::create(GeoPhysVol *motherP,GeoPhysVol *motherM)
 
     for (unsigned int ii =0; ii < sctsup->size(); ii++) {
       
-      RMinW        = (*sctsup)[ii]->getFloat("RMIN")*GeoModelKernelUnits::mm;
-      RMaxW        = (*sctsup)[ii]->getFloat("RMAX")*GeoModelKernelUnits::mm;
-      ZHalfLengthW = (*sctsup)[ii]->getFloat("THICK")/2.*GeoModelKernelUnits::mm;
-      WidI         = (*sctsup)[ii]->getFloat("WIDTHINNER")*GeoModelKernelUnits::mm;
-      WidO         = (*sctsup)[ii]->getFloat("WIDTHOUTER")*GeoModelKernelUnits::mm;
-      ZStartW      = (*sctsup)[ii]->getFloat("ZSTART")*GeoModelKernelUnits::mm;
+      RMinW        = (*sctsup)[ii]->getFloat("RMIN")*Gaudi::Units::mm;
+      RMaxW        = (*sctsup)[ii]->getFloat("RMAX")*Gaudi::Units::mm;
+      ZHalfLengthW = (*sctsup)[ii]->getFloat("THICK")/2.*Gaudi::Units::mm;
+      WidI         = (*sctsup)[ii]->getFloat("WIDTHINNER")*Gaudi::Units::mm;
+      WidO         = (*sctsup)[ii]->getFloat("WIDTHOUTER")*Gaudi::Units::mm;
+      ZStartW      = (*sctsup)[ii]->getFloat("ZSTART")*Gaudi::Units::mm;
       DPhi = asin(WidI/2./RMinW);
       
       const GeoShape* pTub1 = new GeoTubs(RMinW, RMaxW, ZHalfLengthW, 0.-DPhi, 2.*DPhi);  //Basic shape
diff --git a/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/SquirrelCageFactory.cxx b/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/SquirrelCageFactory.cxx
index 291fc8bde5358a70a6bf65c10690466a48ab20c0..5e82ef6e382fbe95af87c9aa93c3ddec321f4f5f 100755
--- a/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/SquirrelCageFactory.cxx
+++ b/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/SquirrelCageFactory.cxx
@@ -23,6 +23,7 @@
 #include "RDBAccessSvc/IRDBQuery.h"
 #include "GeoModelInterfaces/IGeoDbTagSvc.h"
 #include "GeoModelUtilities/DecodeVersionKey.h"
+#include "GaudiKernel/PhysicalConstants.h"
 
 #include <iostream>
 
@@ -70,37 +71,37 @@ void SquirrelCageFactory::create(GeoPhysVol *mother)
 //     Squirrel cage rings
 //  Default (initial) ring parameters
 //
-//     double rminInt    = 1074.0*GeoModelKernelUnits::mm;
-//     double ringThick  = 4.0*GeoModelKernelUnits::mm;
-//     double ringGap    = 20.*GeoModelKernelUnits::mm;
-//     double ringWid    = 40.*GeoModelKernelUnits::mm;
+//     double rminInt    = 1074.0*Gaudi::Units::mm;
+//     double ringThick  = 4.0*Gaudi::Units::mm;
+//     double ringGap    = 20.*Gaudi::Units::mm;
+//     double ringWid    = 40.*Gaudi::Units::mm;
 //
-    double rminInt    = (*cage)[0]->getDouble("RINGRMIN")*GeoModelKernelUnits::mm;
-    double ringThick  = (*cage)[0]->getDouble("RINGTHICK")*GeoModelKernelUnits::mm;
-    double ringGap    = (*cage)[0]->getDouble("RINGGAP")*GeoModelKernelUnits::mm;
-    double ringWid    = (*cage)[0]->getDouble("RINGWIDTH")*GeoModelKernelUnits::mm;
+    double rminInt    = (*cage)[0]->getDouble("RINGRMIN")*Gaudi::Units::mm;
+    double ringThick  = (*cage)[0]->getDouble("RINGTHICK")*Gaudi::Units::mm;
+    double ringGap    = (*cage)[0]->getDouble("RINGGAP")*Gaudi::Units::mm;
+    double ringWid    = (*cage)[0]->getDouble("RINGWIDTH")*Gaudi::Units::mm;
 //
 //--- Default (initial) z positions
-//     double zposFirstRing  = 805.0*GeoModelKernelUnits::mm+161.0*GeoModelKernelUnits::mm;
-//     double zposGap1  = 390.*GeoModelKernelUnits::mm;
-//     double zposGap2  = 402.*GeoModelKernelUnits::mm;
-//     double zposGap3  = 446.*GeoModelKernelUnits::mm;
-//     double zposGap4  = 331.*GeoModelKernelUnits::mm;
+//     double zposFirstRing  = 805.0*Gaudi::Units::mm+161.0*Gaudi::Units::mm;
+//     double zposGap1  = 390.*Gaudi::Units::mm;
+//     double zposGap2  = 402.*Gaudi::Units::mm;
+//     double zposGap3  = 446.*Gaudi::Units::mm;
+//     double zposGap4  = 331.*Gaudi::Units::mm;
 //
-    double zposFirstRing  = (*cage)[0]->getDouble("ZBASE")*GeoModelKernelUnits::mm;
-    double zposGap1  = (*cage)[0]->getDouble("ZGAP1")*GeoModelKernelUnits::mm;
-    double zposGap2  = (*cage)[0]->getDouble("ZGAP2")*GeoModelKernelUnits::mm;
-    double zposGap3  = (*cage)[0]->getDouble("ZGAP3")*GeoModelKernelUnits::mm;
-    double zposGap4  = (*cage)[0]->getDouble("ZGAP4")*GeoModelKernelUnits::mm;
+    double zposFirstRing  = (*cage)[0]->getDouble("ZBASE")*Gaudi::Units::mm;
+    double zposGap1  = (*cage)[0]->getDouble("ZGAP1")*Gaudi::Units::mm;
+    double zposGap2  = (*cage)[0]->getDouble("ZGAP2")*Gaudi::Units::mm;
+    double zposGap3  = (*cage)[0]->getDouble("ZGAP3")*Gaudi::Units::mm;
+    double zposGap4  = (*cage)[0]->getDouble("ZGAP4")*Gaudi::Units::mm;
 //
 // Now support ring
-//     double rminSup    = 830.0*GeoModelKernelUnits::mm;
-//     double supThick   = 90.0*GeoModelKernelUnits::mm;
-//     double supWid     = 12.0*GeoModelKernelUnits::mm;
+//     double rminSup    = 830.0*Gaudi::Units::mm;
+//     double supThick   = 90.0*Gaudi::Units::mm;
+//     double supWid     = 12.0*Gaudi::Units::mm;
 //
-    double rminSup    = (*cage)[0]->getDouble("SUPRMIN")*GeoModelKernelUnits::mm;
-    double supThick   = (*cage)[0]->getDouble("SUPTHICK")*GeoModelKernelUnits::mm;
-    double supWid     = (*cage)[0]->getDouble("SUPWIDTH")*GeoModelKernelUnits::mm;
+    double rminSup    = (*cage)[0]->getDouble("SUPRMIN")*Gaudi::Units::mm;
+    double supThick   = (*cage)[0]->getDouble("SUPTHICK")*Gaudi::Units::mm;
+    double supWid     = (*cage)[0]->getDouble("SUPWIDTH")*Gaudi::Units::mm;
 //
     double zposSupRing  = zposFirstRing+ringWid*5. + zposGap1 + zposGap2 + zposGap3 + zposGap4;
 
@@ -196,14 +197,14 @@ void SquirrelCageFactory::create(GeoPhysVol *mother)
 //Inner 
    
     double phiICRT = asin((yWidthUSP1/2. + yWidthUSP2 + coordY) / rminInt);
-    double DphiICRT = GeoModelKernelUnits::pi - 2*phiICRT;
+    double DphiICRT = Gaudi::Units::pi - 2*phiICRT;
  
     double phiICRB = asin((yWidthUSP1/2. + yWidthUSP2 - coordY) / rminInt);
-    double DphiICRB = GeoModelKernelUnits::pi - 2*phiICRB;
+    double DphiICRB = Gaudi::Units::pi - 2*phiICRB;
 
     GeoTubs* ICRT = new GeoTubs(rminInt, rminInt + ringThick, ringWid/2., phiICRT, DphiICRT);
   
-    GeoTubs* ICRB = new GeoTubs(rminInt, rminInt + ringThick, ringWid/2., GeoModelKernelUnits::pi + phiICRB, DphiICRB);
+    GeoTubs* ICRB = new GeoTubs(rminInt, rminInt + ringThick, ringWid/2., Gaudi::Units::pi + phiICRB, DphiICRB);
 
 
     const GeoLogVol* ICRTLog = new GeoLogVol("SQringIntTop", ICRT, ringMat);
@@ -215,10 +216,10 @@ void SquirrelCageFactory::create(GeoPhysVol *mother)
 //Outer
   
     double phiECRT = asin((yWidthUSP1/2. + yWidthUSP2 + coordY) / (rminInt+ringGap+ringThick));
-    double DphiECRT = GeoModelKernelUnits::pi - 2*phiECRT;
+    double DphiECRT = Gaudi::Units::pi - 2*phiECRT;
 
     double phiECRB = asin((yWidthUSP1/2. + yWidthUSP2 - coordY) / (rminInt+ringGap+ringThick));
-    double DphiECRB = GeoModelKernelUnits::pi - 2*phiECRB;
+    double DphiECRB = Gaudi::Units::pi - 2*phiECRB;
 
 //     std::cerr << "phiET: " << phiECRT << ", DphiET: " << DphiECRT << std::endl;
 //     std::cerr << "phiIT: " << phiICRT << ", DphiIT: " << DphiICRT << std::endl;
@@ -226,7 +227,7 @@ void SquirrelCageFactory::create(GeoPhysVol *mother)
 //     std::cerr << "phiIB: " << phiICRB << ", DphiIB: " << DphiICRB << std::endl;
 
     GeoTubs* ECRT = new GeoTubs(rminInt+ringGap+ringThick, rminInt+2.*ringThick+ringGap, ringWid/2., phiECRT, DphiECRT);
-    GeoTubs* ECRB = new GeoTubs(rminInt+ringGap+ringThick, rminInt+2.*ringThick+ringGap, ringWid/2., GeoModelKernelUnits::pi + phiECRB, DphiECRB);
+    GeoTubs* ECRB = new GeoTubs(rminInt+ringGap+ringThick, rminInt+2.*ringThick+ringGap, ringWid/2., Gaudi::Units::pi + phiECRB, DphiECRB);
 
     const GeoLogVol* ECRTLog = new GeoLogVol("SQringExtTop", ECRT, ringMat);
     GeoVPhysVol* ECRTPhys = new GeoPhysVol(ECRTLog);
@@ -366,46 +367,46 @@ void SquirrelCageFactory::create(GeoPhysVol *mother)
 //     Squirrel cage rings
 //  Default (initial) ring parameters
 //
-    double rminInt    = 1074.0*GeoModelKernelUnits::mm;
-    double ringThick  = 4.0*GeoModelKernelUnits::mm;
-    double ringGap    = 20.*GeoModelKernelUnits::mm;
-    double ringWid    = 40.*GeoModelKernelUnits::mm;
+    double rminInt    = 1074.0*Gaudi::Units::mm;
+    double ringThick  = 4.0*Gaudi::Units::mm;
+    double ringGap    = 20.*Gaudi::Units::mm;
+    double ringWid    = 40.*Gaudi::Units::mm;
 //
-    rminInt    = (*cage)[0]->getDouble("RINGRMIN")*GeoModelKernelUnits::mm;
-    ringThick  = (*cage)[0]->getDouble("RINGTHICK")*GeoModelKernelUnits::mm;
-    ringGap    = (*cage)[0]->getDouble("RINGGAP")*GeoModelKernelUnits::mm;
-    ringWid    = (*cage)[0]->getDouble("RINGWIDTH")*GeoModelKernelUnits::mm;
+    rminInt    = (*cage)[0]->getDouble("RINGRMIN")*Gaudi::Units::mm;
+    ringThick  = (*cage)[0]->getDouble("RINGTHICK")*Gaudi::Units::mm;
+    ringGap    = (*cage)[0]->getDouble("RINGGAP")*Gaudi::Units::mm;
+    ringWid    = (*cage)[0]->getDouble("RINGWIDTH")*Gaudi::Units::mm;
 //
 //--- Default (initial) z positions
-    double zposFirstRing  = 805.0*GeoModelKernelUnits::mm+161.0*GeoModelKernelUnits::mm;
-    double zposGap1  = 390.*GeoModelKernelUnits::mm;
-    double zposGap2  = 402.*GeoModelKernelUnits::mm;
-    double zposGap3  = 446.*GeoModelKernelUnits::mm;
-    double zposGap4  = 331.*GeoModelKernelUnits::mm;
+    double zposFirstRing  = 805.0*Gaudi::Units::mm+161.0*Gaudi::Units::mm;
+    double zposGap1  = 390.*Gaudi::Units::mm;
+    double zposGap2  = 402.*Gaudi::Units::mm;
+    double zposGap3  = 446.*Gaudi::Units::mm;
+    double zposGap4  = 331.*Gaudi::Units::mm;
 //
-    zposFirstRing  = (*cage)[0]->getDouble("ZBASE")*GeoModelKernelUnits::mm;
-    zposGap1  = (*cage)[0]->getDouble("ZGAP1")*GeoModelKernelUnits::mm;
-    zposGap2  = (*cage)[0]->getDouble("ZGAP2")*GeoModelKernelUnits::mm;
-    zposGap3  = (*cage)[0]->getDouble("ZGAP3")*GeoModelKernelUnits::mm;
-    zposGap4  = (*cage)[0]->getDouble("ZGAP4")*GeoModelKernelUnits::mm;
+    zposFirstRing  = (*cage)[0]->getDouble("ZBASE")*Gaudi::Units::mm;
+    zposGap1  = (*cage)[0]->getDouble("ZGAP1")*Gaudi::Units::mm;
+    zposGap2  = (*cage)[0]->getDouble("ZGAP2")*Gaudi::Units::mm;
+    zposGap3  = (*cage)[0]->getDouble("ZGAP3")*Gaudi::Units::mm;
+    zposGap4  = (*cage)[0]->getDouble("ZGAP4")*Gaudi::Units::mm;
 //
 // Now support ring
-    double rminSup    = 830.0*GeoModelKernelUnits::mm;
-    double supThick   = 90.0*GeoModelKernelUnits::mm;
-    double supWid     = 12.0*GeoModelKernelUnits::mm;
+    double rminSup    = 830.0*Gaudi::Units::mm;
+    double supThick   = 90.0*Gaudi::Units::mm;
+    double supWid     = 12.0*Gaudi::Units::mm;
 //
-    rminSup    = (*cage)[0]->getDouble("SUPRMIN")*GeoModelKernelUnits::mm;
-    supThick   = (*cage)[0]->getDouble("SUPTHICK")*GeoModelKernelUnits::mm;
-    supWid     = (*cage)[0]->getDouble("SUPWIDTH")*GeoModelKernelUnits::mm;
+    rminSup    = (*cage)[0]->getDouble("SUPRMIN")*Gaudi::Units::mm;
+    supThick   = (*cage)[0]->getDouble("SUPTHICK")*Gaudi::Units::mm;
+    supWid     = (*cage)[0]->getDouble("SUPWIDTH")*Gaudi::Units::mm;
 //
     double zposSupRing  = zposFirstRing+ringWid*5. + zposGap1 + zposGap2 + zposGap3 + zposGap4;
 //
 // Now support ribbon
-    double ribWid     = 68.0*GeoModelKernelUnits::mm ;
-    ribWid = (*cage)[0]->getDouble("RIBWIDTH")*GeoModelKernelUnits::mm;
+    double ribWid     = 68.0*Gaudi::Units::mm ;
+    ribWid = (*cage)[0]->getDouble("RIBWIDTH")*Gaudi::Units::mm;
     double ribLeng    = ringWid*5. + zposGap1 + zposGap2 + zposGap3 + zposGap4;
     double ribThick = 0; 
-    if (sqversion >= 3) ribThick = (*cage)[0]->getDouble("RIBTHICK")*GeoModelKernelUnits::mm;
+    if (sqversion >= 3) ribThick = (*cage)[0]->getDouble("RIBTHICK")*Gaudi::Units::mm;
     double safety =0.01;
     double ribThickMax = ringGap - 2*safety;
     if (ribThick == 0 || ribThick > ribThickMax) {
diff --git a/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/SquirrelCageFactoryFS.cxx b/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/SquirrelCageFactoryFS.cxx
index 5983eed14c9297b9d6baaada8ccce50e9aa59496..823f69cd0762607fc012720b8340751b5d6cfad5 100755
--- a/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/SquirrelCageFactoryFS.cxx
+++ b/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/SquirrelCageFactoryFS.cxx
@@ -23,7 +23,7 @@
 #include "RDBAccessSvc/IRDBAccessSvc.h"
 #include "GeoModelUtilities/DecodeVersionKey.h"
 #include "GaudiKernel/Bootstrap.h"
-
+#include "GaudiKernel/SystemOfUnits.h"
 
 #include <iostream>
 
@@ -74,46 +74,46 @@ void SquirrelCageFactoryFS::create(GeoPhysVol *motherP, GeoPhysVol *motherM)
 //     Squirrel cage rings
 //  Default (initial) ring parameters
 //
-    double rminInt    = 1074.0*GeoModelKernelUnits::mm;
-    double ringThick  = 4.0*GeoModelKernelUnits::mm;
-    double ringGap    = 20.*GeoModelKernelUnits::mm;
-    double ringWid    = 40.*GeoModelKernelUnits::mm;
+    double rminInt    = 1074.0*Gaudi::Units::mm;
+    double ringThick  = 4.0*Gaudi::Units::mm;
+    double ringGap    = 20.*Gaudi::Units::mm;
+    double ringWid    = 40.*Gaudi::Units::mm;
 //
-    rminInt    = (*cage)[0]->getDouble("RINGRMIN")*GeoModelKernelUnits::mm;
-    ringThick  = (*cage)[0]->getDouble("RINGTHICK")*GeoModelKernelUnits::mm;
-    ringGap    = (*cage)[0]->getDouble("RINGGAP")*GeoModelKernelUnits::mm;
-    ringWid    = (*cage)[0]->getDouble("RINGWIDTH")*GeoModelKernelUnits::mm;
+    rminInt    = (*cage)[0]->getDouble("RINGRMIN")*Gaudi::Units::mm;
+    ringThick  = (*cage)[0]->getDouble("RINGTHICK")*Gaudi::Units::mm;
+    ringGap    = (*cage)[0]->getDouble("RINGGAP")*Gaudi::Units::mm;
+    ringWid    = (*cage)[0]->getDouble("RINGWIDTH")*Gaudi::Units::mm;
 //
 //--- Default (initial) z positions
-    double zposFirstRing  = 805.0*GeoModelKernelUnits::mm+161.0*GeoModelKernelUnits::mm;
-    double zposGap1  = 390.*GeoModelKernelUnits::mm;
-    double zposGap2  = 402.*GeoModelKernelUnits::mm;
-    double zposGap3  = 446.*GeoModelKernelUnits::mm;
-    double zposGap4  = 331.*GeoModelKernelUnits::mm;
+    double zposFirstRing  = 805.0*Gaudi::Units::mm+161.0*Gaudi::Units::mm;
+    double zposGap1  = 390.*Gaudi::Units::mm;
+    double zposGap2  = 402.*Gaudi::Units::mm;
+    double zposGap3  = 446.*Gaudi::Units::mm;
+    double zposGap4  = 331.*Gaudi::Units::mm;
 //
-    zposFirstRing  = (*cage)[0]->getDouble("ZBASE")*GeoModelKernelUnits::mm;
-    zposGap1  = (*cage)[0]->getDouble("ZGAP1")*GeoModelKernelUnits::mm;
-    zposGap2  = (*cage)[0]->getDouble("ZGAP2")*GeoModelKernelUnits::mm;
-    zposGap3  = (*cage)[0]->getDouble("ZGAP3")*GeoModelKernelUnits::mm;
-    zposGap4  = (*cage)[0]->getDouble("ZGAP4")*GeoModelKernelUnits::mm;
+    zposFirstRing  = (*cage)[0]->getDouble("ZBASE")*Gaudi::Units::mm;
+    zposGap1  = (*cage)[0]->getDouble("ZGAP1")*Gaudi::Units::mm;
+    zposGap2  = (*cage)[0]->getDouble("ZGAP2")*Gaudi::Units::mm;
+    zposGap3  = (*cage)[0]->getDouble("ZGAP3")*Gaudi::Units::mm;
+    zposGap4  = (*cage)[0]->getDouble("ZGAP4")*Gaudi::Units::mm;
 //
 // Now support ring
-    double rminSup    = 830.0*GeoModelKernelUnits::mm;
-    double supThick   = 90.0*GeoModelKernelUnits::mm;
-    double supWid     = 12.0*GeoModelKernelUnits::mm;
+    double rminSup    = 830.0*Gaudi::Units::mm;
+    double supThick   = 90.0*Gaudi::Units::mm;
+    double supWid     = 12.0*Gaudi::Units::mm;
 //
-    rminSup    = (*cage)[0]->getDouble("SUPRMIN")*GeoModelKernelUnits::mm;
-    supThick   = (*cage)[0]->getDouble("SUPTHICK")*GeoModelKernelUnits::mm;
-    supWid     = (*cage)[0]->getDouble("SUPWIDTH")*GeoModelKernelUnits::mm;
+    rminSup    = (*cage)[0]->getDouble("SUPRMIN")*Gaudi::Units::mm;
+    supThick   = (*cage)[0]->getDouble("SUPTHICK")*Gaudi::Units::mm;
+    supWid     = (*cage)[0]->getDouble("SUPWIDTH")*Gaudi::Units::mm;
 //
     double zposSupRing  = zposFirstRing+ringWid*5. + zposGap1 + zposGap2 + zposGap3 + zposGap4;
 //
 // Now support ribbon
-    double ribWid     = 68.0*GeoModelKernelUnits::mm ;
-    ribWid = (*cage)[0]->getDouble("RIBWIDTH")*GeoModelKernelUnits::mm;
+    double ribWid     = 68.0*Gaudi::Units::mm ;
+    ribWid = (*cage)[0]->getDouble("RIBWIDTH")*Gaudi::Units::mm;
     double ribLeng    = ringWid*5. + zposGap1 + zposGap2 + zposGap3 + zposGap4;
     double ribThick = 0; 
-    if (sqversion >= 3) ribThick = (*cage)[0]->getDouble("RIBTHICK")*GeoModelKernelUnits::mm;
+    if (sqversion >= 3) ribThick = (*cage)[0]->getDouble("RIBTHICK")*Gaudi::Units::mm;
     double safety =0.01;
     double ribThickMax = ringGap - 2*safety;
     if (ribThick == 0 || ribThick > ribThickMax) {
diff --git a/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/SupportRailFactory.cxx b/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/SupportRailFactory.cxx
index f6ca11d8b999bf50dba164f854d74e4be2ff2771..1d4404b39b6eb8b885259abe4f3442681c503272 100755
--- a/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/SupportRailFactory.cxx
+++ b/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/SupportRailFactory.cxx
@@ -24,6 +24,7 @@
 #include "RDBAccessSvc/IRDBQuery.h"
 #include "GeoModelInterfaces/IGeoDbTagSvc.h"
 #include "GeoModelUtilities/DecodeVersionKey.h"
+#include "GaudiKernel/SystemOfUnits.h"
 
 #include <iostream>
 #include <math.h>
@@ -68,18 +69,18 @@ void SupportRailFactory::create(GeoPhysVol *mother)
 //
 // Default(initial) values
 //    
-    double RMAX_ID      = 1150.0*GeoModelKernelUnits::mm -1.0*GeoModelKernelUnits::mm;   //Some safety margin
-    double railLengthB  = 1600.0*GeoModelKernelUnits::mm;
-    double railWidthB   = 5.5*GeoModelKernelUnits::mm;
-    double railThickB   = 34.7*GeoModelKernelUnits::mm;
+    double RMAX_ID      = 1150.0*Gaudi::Units::mm -1.0*Gaudi::Units::mm;   //Some safety margin
+    double railLengthB  = 1600.0*Gaudi::Units::mm;
+    double railWidthB   = 5.5*Gaudi::Units::mm;
+    double railThickB   = 34.7*Gaudi::Units::mm;
 //
-    double railLengthE  = 2600.0*GeoModelKernelUnits::mm;
-//    double railWidthE   = 14.*GeoModelKernelUnits::mm;
-//    double railThickE   = 14.7*GeoModelKernelUnits::mm;
+    double railLengthE  = 2600.0*Gaudi::Units::mm;
+//    double railWidthE   = 14.*Gaudi::Units::mm;
+//    double railThickE   = 14.7*Gaudi::Units::mm;
 //
-    double suppLength   = 6800.0*GeoModelKernelUnits::mm;
-    double suppWidth    = 54.*GeoModelKernelUnits::mm;
-//    double suppThick    = 22.6*GeoModelKernelUnits::mm;
+    double suppLength   = 6800.0*Gaudi::Units::mm;
+    double suppWidth    = 54.*Gaudi::Units::mm;
+//    double suppThick    = 22.6*Gaudi::Units::mm;
 //
 //   Database 
 //
@@ -95,7 +96,7 @@ void SupportRailFactory::create(GeoPhysVol *mother)
     const GeoMaterial*  alum  = materialManager()->getMaterial((*railrec)[0]->getString("MATSUP"));
     
 //Radius of Squirrel cage
-    double rminInt = (*cage)[0]->getDouble("RINGRMIN")*GeoModelKernelUnits::mm;
+    double rminInt = (*cage)[0]->getDouble("RINGRMIN")*Gaudi::Units::mm;
 //Thick of U Shape Support
     std::unique_ptr<IRDBQuery> queryUSP = rdbAccessSvc()->getQuery("IDDetRailUSP",indetVersionKey.tag(), indetVersionKey.node());
     if(!queryUSP)
@@ -112,21 +113,21 @@ void SupportRailFactory::create(GeoPhysVol *mother)
 
     double epsilon = 0.01;  // +Some safety margin
  
-     RMAX_ID = (*atls)[0]->getDouble("IDETOR")*GeoModelKernelUnits::cm;  
-     //railLengthB = (*railrec)[0]->getDouble("LENGTHB")*GeoModelKernelUnits::mm; At database there is 34.7 but it could cause crash.
+     RMAX_ID = (*atls)[0]->getDouble("IDETOR")*Gaudi::Units::cm;  
+     //railLengthB = (*railrec)[0]->getDouble("LENGTHB")*Gaudi::Units::mm; At database there is 34.7 but it could cause crash.
 
-     railWidthB  = (*railrec)[0]->getDouble("WIDTHB")*GeoModelKernelUnits::mm;
-     railThickB  = (*railrec)[0]->getDouble("THICKB")*GeoModelKernelUnits::mm;
+     railWidthB  = (*railrec)[0]->getDouble("WIDTHB")*Gaudi::Units::mm;
+     railThickB  = (*railrec)[0]->getDouble("THICKB")*Gaudi::Units::mm;
   //------------ Limited by EP ExternalShell
-     railLengthE = (*endplate)[0]->getDouble("ZSTART")*GeoModelKernelUnits::mm  
-                  +(*endplate)[0]->getDouble("ZSHIFT")*GeoModelKernelUnits::mm
-                  +(*endplate)[0]->getDouble("ZGAP")*GeoModelKernelUnits::mm   - railLengthB/2.;
-//     railWidthE  = (*railrec)[0]->getDouble("WIDTHE")*GeoModelKernelUnits::mm;
-//     railThickE  = (*railrec)[0]->getDouble("THICKE")*GeoModelKernelUnits::mm;
+     railLengthE = (*endplate)[0]->getDouble("ZSTART")*Gaudi::Units::mm  
+                  +(*endplate)[0]->getDouble("ZSHIFT")*Gaudi::Units::mm
+                  +(*endplate)[0]->getDouble("ZGAP")*Gaudi::Units::mm   - railLengthB/2.;
+//     railWidthE  = (*railrec)[0]->getDouble("WIDTHE")*Gaudi::Units::mm;
+//     railThickE  = (*railrec)[0]->getDouble("THICKE")*Gaudi::Units::mm;
  
      suppLength = railLengthB + 2.*railLengthE;
-     suppWidth  = (*railrec)[0]->getDouble("WIDTHSUP")*GeoModelKernelUnits::mm;
-//     suppThick  = (*railrec)[0]->getDouble("THICKSUP")*GeoModelKernelUnits::mm;
+     suppWidth  = (*railrec)[0]->getDouble("WIDTHSUP")*Gaudi::Units::mm;
+//     suppThick  = (*railrec)[0]->getDouble("THICKSUP")*Gaudi::Units::mm;
 
      double zLengthB   =  (*idSupportRails)[0]->getDouble("ZLENGTH");
      double yWidthB    =  (*idSupportRails)[0]->getDouble("YWIDTH");
@@ -579,18 +580,18 @@ void SupportRailFactory::create(GeoPhysVol *mother)
 //
 // Default(initial) values
 //    
-    double RMAX_ID      = 1150.0*GeoModelKernelUnits::mm -1.0*GeoModelKernelUnits::mm;   //Some safety margin
-    double railLengthB  = 1600.0*GeoModelKernelUnits::mm;
-    double railWidthB   = 5.5*GeoModelKernelUnits::mm;
-    double railThickB   = 34.7*GeoModelKernelUnits::mm;
+    double RMAX_ID      = 1150.0*Gaudi::Units::mm -1.0*Gaudi::Units::mm;   //Some safety margin
+    double railLengthB  = 1600.0*Gaudi::Units::mm;
+    double railWidthB   = 5.5*Gaudi::Units::mm;
+    double railThickB   = 34.7*Gaudi::Units::mm;
 //
-    double railLengthE  = 2600.0*GeoModelKernelUnits::mm;
-    double railWidthE   = 14.*GeoModelKernelUnits::mm;
-    double railThickE   = 14.7*GeoModelKernelUnits::mm;
+    double railLengthE  = 2600.0*Gaudi::Units::mm;
+    double railWidthE   = 14.*Gaudi::Units::mm;
+    double railThickE   = 14.7*Gaudi::Units::mm;
 //
-    double suppLength   = 6800.0*GeoModelKernelUnits::mm;
-    double suppWidth    = 54.*GeoModelKernelUnits::mm;
-    double suppThick    = 22.6*GeoModelKernelUnits::mm;
+    double suppLength   = 6800.0*Gaudi::Units::mm;
+    double suppWidth    = 54.*Gaudi::Units::mm;
+    double suppThick    = 22.6*Gaudi::Units::mm;
 //
 //   Database 
 //
@@ -613,20 +614,20 @@ void SupportRailFactory::create(GeoPhysVol *mother)
     
     double epsilon = 0.01;  // +Some safety margin
  
-     RMAX_ID = (*atls)[0]->getDouble("IDETOR")*GeoModelKernelUnits::cm;  
-     railLengthB = (*railrec)[0]->getDouble("LENGTHB")*GeoModelKernelUnits::mm;
-     railWidthB  = (*railrec)[0]->getDouble("WIDTHB")*GeoModelKernelUnits::mm;
-     railThickB  = (*railrec)[0]->getDouble("THICKB")*GeoModelKernelUnits::mm;
+     RMAX_ID = (*atls)[0]->getDouble("IDETOR")*Gaudi::Units::cm;  
+     railLengthB = (*railrec)[0]->getDouble("LENGTHB")*Gaudi::Units::mm;
+     railWidthB  = (*railrec)[0]->getDouble("WIDTHB")*Gaudi::Units::mm;
+     railThickB  = (*railrec)[0]->getDouble("THICKB")*Gaudi::Units::mm;
   //------------ Limited by EP ExternalShell
-     railLengthE = (*endplate)[0]->getDouble("ZSTART")*GeoModelKernelUnits::mm  
-                  +(*endplate)[0]->getDouble("ZSHIFT")*GeoModelKernelUnits::mm
-                  +(*endplate)[0]->getDouble("ZGAP")*GeoModelKernelUnits::mm   - railLengthB/2.;
-     railWidthE  = (*railrec)[0]->getDouble("WIDTHE")*GeoModelKernelUnits::mm;
-     railThickE  = (*railrec)[0]->getDouble("THICKE")*GeoModelKernelUnits::mm;
+     railLengthE = (*endplate)[0]->getDouble("ZSTART")*Gaudi::Units::mm  
+                  +(*endplate)[0]->getDouble("ZSHIFT")*Gaudi::Units::mm
+                  +(*endplate)[0]->getDouble("ZGAP")*Gaudi::Units::mm   - railLengthB/2.;
+     railWidthE  = (*railrec)[0]->getDouble("WIDTHE")*Gaudi::Units::mm;
+     railThickE  = (*railrec)[0]->getDouble("THICKE")*Gaudi::Units::mm;
  
      suppLength = railLengthB + 2.*railLengthE;
-     suppWidth  = (*railrec)[0]->getDouble("WIDTHSUP")*GeoModelKernelUnits::mm;
-     suppThick  = (*railrec)[0]->getDouble("THICKSUP")*GeoModelKernelUnits::mm;
+     suppWidth  = (*railrec)[0]->getDouble("WIDTHSUP")*Gaudi::Units::mm;
+     suppThick  = (*railrec)[0]->getDouble("THICKSUP")*Gaudi::Units::mm;
 //
 // To avoid rail corner outside ID envelope
      RMAX_ID = sqrt(RMAX_ID*RMAX_ID-suppWidth*suppWidth/4.)-epsilon;  
diff --git a/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/SupportRailFactoryFS.cxx b/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/SupportRailFactoryFS.cxx
index 2b51616c3c2a2d1c387efd22b8eb23bbc5fb3540..7011b20cb5566ccaabbb19d6b3b8457e1632fcb1 100755
--- a/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/SupportRailFactoryFS.cxx
+++ b/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/SupportRailFactoryFS.cxx
@@ -24,7 +24,7 @@
 #include "RDBAccessSvc/IRDBAccessSvc.h"
 #include "GeoModelUtilities/DecodeVersionKey.h"
 #include "GaudiKernel/Bootstrap.h"
-
+#include "GaudiKernel/SystemOfUnits.h"
 
 #include <iostream>
 #include <math.h>
@@ -72,18 +72,18 @@ void SupportRailFactoryFS::create(GeoPhysVol *motherP,GeoPhysVol *motherM)
 //
 // Default(initial) values
 //    
-    double RMAX_ID      = 1150.0*GeoModelKernelUnits::mm -1.0*GeoModelKernelUnits::mm;   //Some safety margin
-    double railLengthB  = 1600.0*GeoModelKernelUnits::mm;
-    double railWidthB   = 5.5*GeoModelKernelUnits::mm;
-    double railThickB   = 34.7*GeoModelKernelUnits::mm;
+    double RMAX_ID      = 1150.0*Gaudi::Units::mm -1.0*Gaudi::Units::mm;   //Some safety margin
+    double railLengthB  = 1600.0*Gaudi::Units::mm;
+    double railWidthB   = 5.5*Gaudi::Units::mm;
+    double railThickB   = 34.7*Gaudi::Units::mm;
 //
-    double railLengthE  = 2600.0*GeoModelKernelUnits::mm;
-    double railWidthE   = 14.*GeoModelKernelUnits::mm;
-    double railThickE   = 14.7*GeoModelKernelUnits::mm;
+    double railLengthE  = 2600.0*Gaudi::Units::mm;
+    double railWidthE   = 14.*Gaudi::Units::mm;
+    double railThickE   = 14.7*Gaudi::Units::mm;
 //
-    double suppLength   = 6800.0*GeoModelKernelUnits::mm;
-    double suppWidth    = 54.*GeoModelKernelUnits::mm;
-    double suppThick    = 22.6*GeoModelKernelUnits::mm;
+    double suppLength   = 6800.0*Gaudi::Units::mm;
+    double suppWidth    = 54.*Gaudi::Units::mm;
+    double suppThick    = 22.6*Gaudi::Units::mm;
 //
 //   Database 
 //
@@ -106,20 +106,20 @@ void SupportRailFactoryFS::create(GeoPhysVol *motherP,GeoPhysVol *motherM)
     
     double epsilon = 0.01;  // +Some safety margin
  
-     RMAX_ID = (*atls)[0]->getDouble("IDETOR")*GeoModelKernelUnits::cm;  
-     railLengthB = (*railrec)[0]->getDouble("LENGTHB")*GeoModelKernelUnits::mm;
-     railWidthB  = (*railrec)[0]->getDouble("WIDTHB")*GeoModelKernelUnits::mm;
-     railThickB  = (*railrec)[0]->getDouble("THICKB")*GeoModelKernelUnits::mm;
+     RMAX_ID = (*atls)[0]->getDouble("IDETOR")*Gaudi::Units::cm;  
+     railLengthB = (*railrec)[0]->getDouble("LENGTHB")*Gaudi::Units::mm;
+     railWidthB  = (*railrec)[0]->getDouble("WIDTHB")*Gaudi::Units::mm;
+     railThickB  = (*railrec)[0]->getDouble("THICKB")*Gaudi::Units::mm;
   //------------ Limited by EP ExternalShell
-     railLengthE = (*endplate)[0]->getDouble("ZSTART")*GeoModelKernelUnits::mm  
-                  +(*endplate)[0]->getDouble("ZSHIFT")*GeoModelKernelUnits::mm
-                  +(*endplate)[0]->getDouble("ZGAP")*GeoModelKernelUnits::mm   - railLengthB*0.5;
-     railWidthE  = (*railrec)[0]->getDouble("WIDTHE")*GeoModelKernelUnits::mm;
-     railThickE  = (*railrec)[0]->getDouble("THICKE")*GeoModelKernelUnits::mm;
+     railLengthE = (*endplate)[0]->getDouble("ZSTART")*Gaudi::Units::mm  
+                  +(*endplate)[0]->getDouble("ZSHIFT")*Gaudi::Units::mm
+                  +(*endplate)[0]->getDouble("ZGAP")*Gaudi::Units::mm   - railLengthB*0.5;
+     railWidthE  = (*railrec)[0]->getDouble("WIDTHE")*Gaudi::Units::mm;
+     railThickE  = (*railrec)[0]->getDouble("THICKE")*Gaudi::Units::mm;
  
      suppLength = railLengthB + 2.*railLengthE;
-     suppWidth  = (*railrec)[0]->getDouble("WIDTHSUP")*GeoModelKernelUnits::mm;
-     suppThick  = (*railrec)[0]->getDouble("THICKSUP")*GeoModelKernelUnits::mm;
+     suppWidth  = (*railrec)[0]->getDouble("WIDTHSUP")*Gaudi::Units::mm;
+     suppThick  = (*railrec)[0]->getDouble("THICKSUP")*Gaudi::Units::mm;
 //
 // To avoid rail corner outside ID envelope
      RMAX_ID = sqrt(RMAX_ID*RMAX_ID-suppWidth*suppWidth/4.)-epsilon;  
diff --git a/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/TRT_ServMatFactory.cxx b/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/TRT_ServMatFactory.cxx
index f4738c0bd9b9c225c7b4bf6ea60b81f824288616..bd3fcd6a4efcda4b2da855c7a65e9c6175414977 100755
--- a/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/TRT_ServMatFactory.cxx
+++ b/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/TRT_ServMatFactory.cxx
@@ -26,8 +26,7 @@
 #include "RDBAccessSvc/IRDBAccessSvc.h"
 #include "GeoModelInterfaces/IGeoDbTagSvc.h"
 #include "GeoModelUtilities/DecodeVersionKey.h"
-
-
+#include "GaudiKernel/SystemOfUnits.h"
 
 #include <sstream>
 #include <iostream>
@@ -79,11 +78,11 @@ void TRT_ServMatFactory::create(GeoPhysVol *mother)
   m_materialManager->addScalingTable(scalingTable);
 
   //VK  10/09/2005 Construct a gap for rails
-  double outROfIDet =       (*atls)[0]->getDouble("IDETOR")*GeoModelKernelUnits::cm;
-  double endZOfIDet =       (*atls)[0]->getDouble("IDETZMX")*GeoModelKernelUnits::cm;
+  double outROfIDet =       (*atls)[0]->getDouble("IDETOR")*Gaudi::Units::cm;
+  double endZOfIDet =       (*atls)[0]->getDouble("IDETZMX")*Gaudi::Units::cm;
 
 //VK 26.03.2007  Construct a gap for SquirrelCage ribbon
-  double  rminInt    = (*cage)[0]->getDouble("RINGRMIN")*GeoModelKernelUnits::mm;
+  double  rminInt    = (*cage)[0]->getDouble("RINGRMIN")*Gaudi::Units::mm;
 
 //created by Adam Agocs 
   IRDBRecordset_ptr commonParameters = rdbAccessSvc()->getRecordsetPtr("IDDetRailCommon",indetVersionKey.tag(), indetVersionKey.node());
@@ -120,7 +119,7 @@ void TRT_ServMatFactory::create(GeoPhysVol *mother)
 
     const GeoShape* serviceTube = serviceTubeTmp;
     
-    if( tubeHelper.volData().maxRadius() > rminInt && tubeHelper.volData().phiDelta() > 359.9*GeoModelKernelUnits::degree)  
+    if( tubeHelper.volData().maxRadius() > rminInt && tubeHelper.volData().phiDelta() > 359.9*Gaudi::Units::degree)  
     {
       // Subtract RailGap out of services
       serviceTube  = (GeoShape*) & (*serviceTubeTmp).subtract(*railGap2).subtract(*railGap1);
@@ -165,8 +164,8 @@ void TRT_ServMatFactory::create(GeoPhysVol *mother)
   m_materialManager->addScalingTable(scalingTable);
 
   //VK  10/09/2005 Construct a gap for rails
-  double outROfIDet =       (*atls)[0]->getDouble("IDETOR")*GeoModelKernelUnits::cm;
-  double endZOfIDet =       (*atls)[0]->getDouble("IDETZMX")*GeoModelKernelUnits::cm;
+  double outROfIDet =       (*atls)[0]->getDouble("IDETOR")*Gaudi::Units::cm;
+  double endZOfIDet =       (*atls)[0]->getDouble("IDETZMX")*Gaudi::Units::cm;
   double minRofGap  =       1050.0;
   double phiWid=70./outROfIDet;    double safetyGap=1.;
   const GeoShape* railGap1=new GeoTubs( minRofGap, outROfIDet+safetyGap ,endZOfIDet+safetyGap , 
@@ -179,10 +178,10 @@ void TRT_ServMatFactory::create(GeoPhysVol *mother)
 
 
 //VK 26.03.2007  Construct a gap for SquirrelCage ribbon
-  double  rminInt    = (*cage)[0]->getDouble("RINGRMIN")*GeoModelKernelUnits::mm;
-  double  ringThick  = (*cage)[0]->getDouble("RINGTHICK")*GeoModelKernelUnits::mm;
-  double  ringGap    = (*cage)[0]->getDouble("RINGGAP")*GeoModelKernelUnits::mm;
-  double  ribWid = (*cage)[0]->getDouble("RIBWIDTH")*GeoModelKernelUnits::mm;
+  double  rminInt    = (*cage)[0]->getDouble("RINGRMIN")*Gaudi::Units::mm;
+  double  ringThick  = (*cage)[0]->getDouble("RINGTHICK")*Gaudi::Units::mm;
+  double  ringGap    = (*cage)[0]->getDouble("RINGGAP")*Gaudi::Units::mm;
+  double  ribWid = (*cage)[0]->getDouble("RIBWIDTH")*Gaudi::Units::mm;
   double phiWidSQ=ribWid/(rminInt+ringThick+ringGap/2.);
 
 
@@ -214,7 +213,7 @@ void TRT_ServMatFactory::create(GeoPhysVol *mother)
       const GeoShape*  ribSup2  = new GeoTubs( tubeHelper.volData().rmin(), tubeHelper.volData().rmax(), 0.5*tubeHelper.volData().length(), 
 					       -phiWidSQ/2.+M_PI, phiWidSQ);
       serviceTube  = (GeoShape*) & (*serviceTubeTmp).subtract(*ribSup1).subtract(*ribSup2);
-    } else if( tubeHelper.volData().maxRadius() > minRofGap && tubeHelper.volData().phiDelta() > 359.9*GeoModelKernelUnits::degree)  {
+    } else if( tubeHelper.volData().maxRadius() > minRofGap && tubeHelper.volData().phiDelta() > 359.9*Gaudi::Units::degree)  {
       // Subtract RailGap out of services
       serviceTube  = (GeoShape*) & (*serviceTubeTmp).subtract(*railGap2).subtract(*railGap1);
     }    
diff --git a/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/TRT_ServMatFactoryDC2.cxx b/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/TRT_ServMatFactoryDC2.cxx
index 51e16b5d09928e4b67c32487fecfb432764ee244..2cd5c03876ac9f47b28cdd37ce5cbaab9f8abdde 100755
--- a/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/TRT_ServMatFactoryDC2.cxx
+++ b/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/TRT_ServMatFactoryDC2.cxx
@@ -24,7 +24,7 @@
 #include "RDBAccessSvc/IRDBAccessSvc.h"
 #include "GeoModelUtilities/DecodeVersionKey.h"
 #include "GaudiKernel/Bootstrap.h"
-
+#include "GaudiKernel/SystemOfUnits.h"
 
 #define NUMBEROFPANEL 2
 #define TRTELEMENTSINEL 9
@@ -75,10 +75,10 @@ void TRT_ServMatFactoryDC2::create(GeoPhysVol *mother)
   
   for (int ii=0; ii<NUMBEROFPANEL; ii++) {
     const GeoMaterial* cylMat = m_materialManager->getMaterial("trt::PatchOut");
-    double rmin = (*ipan)[ii]->getFloat("RMIN")*GeoModelKernelUnits::cm;
-    double rmax = (*ipan)[ii]->getFloat("RMAX")*GeoModelKernelUnits::cm;
-    double zmin = (*ipan)[ii]->getFloat("ZMIN")*GeoModelKernelUnits::cm;
-    double zmax = (*ipan)[ii]->getFloat("ZMAX")*GeoModelKernelUnits::cm;
+    double rmin = (*ipan)[ii]->getFloat("RMIN")*Gaudi::Units::cm;
+    double rmax = (*ipan)[ii]->getFloat("RMAX")*Gaudi::Units::cm;
+    double zmin = (*ipan)[ii]->getFloat("ZMIN")*Gaudi::Units::cm;
+    double zmax = (*ipan)[ii]->getFloat("ZMAX")*Gaudi::Units::cm;
 
     double halflength = (zmax-zmin)/2.-2*epsilon;
     double zpos = zmin + halflength+2*epsilon;
@@ -107,15 +107,15 @@ void TRT_ServMatFactoryDC2::create(GeoPhysVol *mother)
     std::ostringstream o;
     o << ii;
     std::string logName = "TrtInel"+o.str();  
-    double halflength = ((*inel)[ii]->getFloat("ZMAX")-(*inel)[ii]->getFloat("ZMIN"))/2.*GeoModelKernelUnits::cm;
+    double halflength = ((*inel)[ii]->getFloat("ZMAX")-(*inel)[ii]->getFloat("ZMIN"))/2.*Gaudi::Units::cm;
     int volType = (int) (*inel)[ii]->getFloat("VOLTYP");
 
     const GeoShape* serviceTube = createShape(volType,
-					      (*inel)[ii]->getFloat("RMIN1")*GeoModelKernelUnits::cm,
-					      (*inel)[ii]->getFloat("RMAX1")*GeoModelKernelUnits::cm,
+					      (*inel)[ii]->getFloat("RMIN1")*Gaudi::Units::cm,
+					      (*inel)[ii]->getFloat("RMAX1")*Gaudi::Units::cm,
 					      halflength,
-					      (*inel)[ii]->getFloat("RMIN2")*GeoModelKernelUnits::cm,
-					      (*inel)[ii]->getFloat("RMAX2")*GeoModelKernelUnits::cm);
+					      (*inel)[ii]->getFloat("RMIN2")*Gaudi::Units::cm,
+					      (*inel)[ii]->getFloat("RMAX2")*Gaudi::Units::cm);
     // create the material...
     // In AGE the radiation length is specified and from that the density is
     // calculated assuming the material is C. I do the same here for now but
@@ -132,16 +132,16 @@ void TRT_ServMatFactoryDC2::create(GeoPhysVol *mother)
       cylMat = createMaterial(nameStr.str(),
 			      volType,
 			      fractionRL,
-			      (*inel)[ii]->getFloat("RMIN1")*GeoModelKernelUnits::cm,
-			      (*inel)[ii]->getFloat("RMAX1")*GeoModelKernelUnits::cm,
+			      (*inel)[ii]->getFloat("RMIN1")*Gaudi::Units::cm,
+			      (*inel)[ii]->getFloat("RMAX1")*Gaudi::Units::cm,
 			      halflength,
-			      (*inel)[ii]->getFloat("RMIN2")*GeoModelKernelUnits::cm,
-			      (*inel)[ii]->getFloat("RMAX2")*GeoModelKernelUnits::cm); 
+			      (*inel)[ii]->getFloat("RMIN2")*Gaudi::Units::cm,
+			      (*inel)[ii]->getFloat("RMAX2")*Gaudi::Units::cm); 
     }
 
     const GeoLogVol* ServLog = new GeoLogVol(logName,serviceTube,cylMat);
     GeoVPhysVol* ServPhys = new GeoPhysVol(ServLog);
-    double zpos = ((*inel)[ii]->getFloat("ZMAX")+(*inel)[ii]->getFloat("ZMIN"))/2.*GeoModelKernelUnits::cm+epsilon;
+    double zpos = ((*inel)[ii]->getFloat("ZMAX")+(*inel)[ii]->getFloat("ZMIN"))/2.*Gaudi::Units::cm+epsilon;
     // place two
     GeoTrf::Translate3D servpos1(0.,0.,zpos);
     GeoTrf::Translate3D servpos2(0.,0.,-zpos);
@@ -165,7 +165,7 @@ const GeoShape* TRT_ServMatFactoryDC2::createShape(int volType,
 						double rmax2=0.) 
   
 {
-  const double epsilon = 0.001*GeoModelKernelUnits::mm;
+  const double epsilon = 0.001*Gaudi::Units::mm;
   enum VOLTYPE{Tube=1, Cone, ICone};
   const GeoShape* IDShape = 0;
   if(volType == Tube) {
diff --git a/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/TRT_ServMatFactoryDC3.cxx b/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/TRT_ServMatFactoryDC3.cxx
index 8ea66da54eda33bea61eba76cdf592679b49967a..6975efb974844921e719cafcc8957b49aadef3fe 100755
--- a/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/TRT_ServMatFactoryDC3.cxx
+++ b/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/TRT_ServMatFactoryDC3.cxx
@@ -23,7 +23,7 @@
 #include "RDBAccessSvc/IRDBAccessSvc.h"
 #include "GeoModelInterfaces/IGeoModelSvc.h"
 #include "GeoModelUtilities/DecodeVersionKey.h"
-
+#include "GaudiKernel/SystemOfUnits.h"
 
 #define NUMBEROFPANEL 2
 #define TRTELEMENTSINEL 9  // VK - now number of record is determined automatically
@@ -63,8 +63,8 @@ void TRT_ServMatFactoryDC3::create(GeoPhysVol *mother)
 
 
 //VVK  10/09/2005 Construct a gap for rails
-    double outROfIDet =       (*atls)[0]->getDouble("IDETOR")*GeoModelKernelUnits::cm;
-    double endZOfIDet =       (*atls)[0]->getDouble("IDETZMX")*GeoModelKernelUnits::cm;
+    double outROfIDet =       (*atls)[0]->getDouble("IDETOR")*Gaudi::Units::cm;
+    double endZOfIDet =       (*atls)[0]->getDouble("IDETZMX")*Gaudi::Units::cm;
     double minRofGap  =       1050.0;
     double phiWid=70./outROfIDet;    double safetyGap=1.;
     const GeoShape* railGap1=new GeoTubs( minRofGap, outROfIDet+safetyGap ,endZOfIDet+safetyGap , 
@@ -78,10 +78,10 @@ void TRT_ServMatFactoryDC3::create(GeoPhysVol *mother)
   
   for (int ii=0; ii<NUMBEROFPANEL; ii++) {
     const GeoMaterial* cylMat = materialManager()->getMaterial("trt::PatchOut");
-    double rmin = (*ipan)[ii]->getFloat("RMIN")*GeoModelKernelUnits::cm;
-    double rmax = (*ipan)[ii]->getFloat("RMAX")*GeoModelKernelUnits::cm;
-    double zmin = (*ipan)[ii]->getFloat("ZMIN")*GeoModelKernelUnits::cm;
-    double zmax = (*ipan)[ii]->getFloat("ZMAX")*GeoModelKernelUnits::cm;
+    double rmin = (*ipan)[ii]->getFloat("RMIN")*Gaudi::Units::cm;
+    double rmax = (*ipan)[ii]->getFloat("RMAX")*Gaudi::Units::cm;
+    double zmin = (*ipan)[ii]->getFloat("ZMIN")*Gaudi::Units::cm;
+    double zmax = (*ipan)[ii]->getFloat("ZMAX")*Gaudi::Units::cm;
 
     double halflength = (zmax-zmin)/2.-2*epsilon;
     double zpos = zmin + halflength+2*epsilon;
@@ -133,12 +133,12 @@ void TRT_ServMatFactoryDC3::create(GeoPhysVol *mother)
     o << irecold++;
     std::string logName = "TrtInel"+o.str();  
     int volType = (int) (*inel)[ii]->getFloat("VOLTYP");
-    double RMIN1=(*inel)[ii]->getFloat("RMIN1")*GeoModelKernelUnits::cm;
-    double RMAX1=(*inel)[ii]->getFloat("RMAX1")*GeoModelKernelUnits::cm;
-    double RMIN2=(*inel)[ii]->getFloat("RMIN2")*GeoModelKernelUnits::cm;
-    double RMAX2=(*inel)[ii]->getFloat("RMAX2")*GeoModelKernelUnits::cm;
-    double ZMAX= (*inel)[ii]->getFloat("ZMAX")*GeoModelKernelUnits::cm;
-    double ZMIN= (*inel)[ii]->getFloat("ZMIN")*GeoModelKernelUnits::cm;
+    double RMIN1=(*inel)[ii]->getFloat("RMIN1")*Gaudi::Units::cm;
+    double RMAX1=(*inel)[ii]->getFloat("RMAX1")*Gaudi::Units::cm;
+    double RMIN2=(*inel)[ii]->getFloat("RMIN2")*Gaudi::Units::cm;
+    double RMAX2=(*inel)[ii]->getFloat("RMAX2")*Gaudi::Units::cm;
+    double ZMAX= (*inel)[ii]->getFloat("ZMAX")*Gaudi::Units::cm;
+    double ZMIN= (*inel)[ii]->getFloat("ZMIN")*Gaudi::Units::cm;
 
 //VK Change of TRT barrel cables definition
 //    if(ii == 3) { RMIN1 += 0; RMAX1=RMIN1+0.589; ZMIN=950.; ZMAX=3250;}
@@ -207,7 +207,7 @@ void TRT_ServMatFactoryDC3::create(GeoPhysVol *mother)
 						double rmax2=0.) 
   
 {
-  const double epsilon = 0.001*GeoModelKernelUnits::mm;
+  const double epsilon = 0.001*Gaudi::Units::mm;
   enum VOLTYPE{Tube=1, Cone, ICone};
   const GeoShape* IDShape = 0;
   if(volType == Tube) {
diff --git a/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/TRT_ServMatFactoryFS.cxx b/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/TRT_ServMatFactoryFS.cxx
index 342c02f44fde239444ce41f9aebfdaec1cddd9d6..2e3a3aa3c046184257cdfc84d03a71b3f163cd11 100755
--- a/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/TRT_ServMatFactoryFS.cxx
+++ b/InnerDetector/InDetDetDescr/InDetServMatGeoModel/src/TRT_ServMatFactoryFS.cxx
@@ -26,8 +26,7 @@
 #include "RDBAccessSvc/IRDBAccessSvc.h"
 #include "GeoModelUtilities/DecodeVersionKey.h"
 #include "GaudiKernel/Bootstrap.h"
-
-
+#include "GaudiKernel/SystemOfUnits.h"
 
 #include <sstream>
 #include <iostream>
@@ -75,8 +74,8 @@ void TRT_ServMatFactoryFS::create(GeoPhysVol *motherP, GeoPhysVol *motherM)
 
 
 //VK  10/09/2005 Construct a gap for rails
-  double outROfIDet =       (*atls)[0]->getDouble("IDETOR")*GeoModelKernelUnits::cm;
-  double endZOfIDet =       (*atls)[0]->getDouble("IDETZMX")*GeoModelKernelUnits::cm;
+  double outROfIDet =       (*atls)[0]->getDouble("IDETOR")*Gaudi::Units::cm;
+  double endZOfIDet =       (*atls)[0]->getDouble("IDETZMX")*Gaudi::Units::cm;
   double minRofGap  =       1050.0;
   double phiWid=70./outROfIDet;    double safetyGap=1.;
   const GeoShape* railGap1=new GeoTubs( minRofGap, outROfIDet+safetyGap ,endZOfIDet+safetyGap , 
@@ -89,10 +88,10 @@ void TRT_ServMatFactoryFS::create(GeoPhysVol *motherP, GeoPhysVol *motherM)
 
 
 //VK 26.03.2007  Construct a gap for SquirrelCage ribbon
-  double  rminInt    = (*cage)[0]->getDouble("RINGRMIN")*GeoModelKernelUnits::mm;
-  double  ringThick  = (*cage)[0]->getDouble("RINGTHICK")*GeoModelKernelUnits::mm;
-  double  ringGap    = (*cage)[0]->getDouble("RINGGAP")*GeoModelKernelUnits::mm;
-  double  ribWid = (*cage)[0]->getDouble("RIBWIDTH")*GeoModelKernelUnits::mm;
+  double  rminInt    = (*cage)[0]->getDouble("RINGRMIN")*Gaudi::Units::mm;
+  double  ringThick  = (*cage)[0]->getDouble("RINGTHICK")*Gaudi::Units::mm;
+  double  ringGap    = (*cage)[0]->getDouble("RINGGAP")*Gaudi::Units::mm;
+  double  ribWid = (*cage)[0]->getDouble("RIBWIDTH")*Gaudi::Units::mm;
   double phiWidSQ=ribWid/(rminInt+ringThick+ringGap/2.);
 
 
diff --git a/InnerDetector/InDetDetDescr/PixelGeoModel/src/DBM_Det.cxx b/InnerDetector/InDetDetDescr/PixelGeoModel/src/DBM_Det.cxx
index f75a38c352fcb30e0ceadde2c20b1112d209457a..a4cba5fd99db2a635cdbf03e01e6c664a4c4e37c 100644
--- a/InnerDetector/InDetDetDescr/PixelGeoModel/src/DBM_Det.cxx
+++ b/InnerDetector/InDetDetDescr/PixelGeoModel/src/DBM_Det.cxx
@@ -11,6 +11,7 @@
 #include "GeoModelKernel/GeoBox.h"
 #include "GeoModelKernel/GeoTrd.h"
 #include "GeoModelKernel/GeoTube.h"
+#include "GaudiKernel/SystemOfUnits.h"
 #include "InDetReadoutGeometry/PixelDetectorManager.h"
 
 #include <iostream>
@@ -21,7 +22,7 @@ DBM_Det::DBM_Det() {
   
   // Radius to beamline
   // Hardcoded, so if change then change in DBM_module too
-  double trans_rad = 46.678*GeoModelKernelUnits::mm + (m_gmt_mgr->DBMTelescopeY()) / 2.; // 10-GeoModelKernelUnits::degree version
+  double trans_rad = 46.678*Gaudi::Units::mm + (m_gmt_mgr->DBMTelescopeY()) / 2.; // 10-Gaudi::Units::degree version
 
   //                 TRANS_X                        TRANS_Y                        TRANS_Z                          ROT_X                       ROT_Y                      ROT_Z        
   m_module[0].push_back(trans_rad);   m_module[0].push_back(0);         m_module[0].push_back(Trans_Y);    m_module[0].push_back(0);     m_module[0].push_back(0);    m_module[0].push_back(270);  
@@ -36,9 +37,9 @@ GeoVPhysVol* DBM_Det::Build()
   double safety = 0.001;
 
   //create a cylinder 8mm smaller than the BPSS outer radius to place the 4 DBM telescopes
-  double rmin = 45.*GeoModelKernelUnits::mm;//41.0*GeoModelKernelUnits::mm;
-  double rmax = 150.*GeoModelKernelUnits::mm; //244.*GeoModelKernelUnits::mm;
-  double halflength = m_gmt_mgr->DBMTelescopeZ()/2.;//200.*GeoModelKernelUnits::mm
+  double rmin = 45.*Gaudi::Units::mm;//41.0*Gaudi::Units::mm;
+  double rmax = 150.*Gaudi::Units::mm; //244.*Gaudi::Units::mm;
+  double halflength = m_gmt_mgr->DBMTelescopeZ()/2.;//200.*Gaudi::Units::mm
   GeoTube * Shape = new GeoTube(rmin,rmax,halflength);
   const GeoMaterial* air = m_mat_mgr->getMaterial("std::Air");
   const GeoLogVol* Log = new GeoLogVol("OutsideDBM",Shape,air);
@@ -66,9 +67,9 @@ GeoVPhysVol* DBM_Det::Build()
       else if ((m_gmt_mgr->GetSide() < 0) && (i == 2)) m_gmt_mgr->SetPhi(0);
 
       //setting transformation
-      GeoTrf::Transform3D rm  = GeoTrf::RotateZ3D(m_module[i].at(5)*GeoModelKernelUnits::deg)
-	* GeoTrf::RotateY3D(m_module[i].at(4)*GeoModelKernelUnits::deg)
-	* GeoTrf::RotateX3D(m_module[i].at(3)*GeoModelKernelUnits::deg);
+      GeoTrf::Transform3D rm  = GeoTrf::RotateZ3D(m_module[i].at(5)*Gaudi::Units::deg)
+	* GeoTrf::RotateY3D(m_module[i].at(4)*Gaudi::Units::deg)
+	* GeoTrf::RotateX3D(m_module[i].at(3)*Gaudi::Units::deg);
       GeoTrf::Translation3D pos(m_module[i].at(0), m_module[i].at(1), m_module[i].at(2));
       GeoTransform* xform = new GeoTransform(GeoTrf::Transform3D(pos*rm));
 
diff --git a/InnerDetector/InDetDetDescr/PixelGeoModel/src/DBM_Module.cxx b/InnerDetector/InDetDetDescr/PixelGeoModel/src/DBM_Module.cxx
index d4bfe3ff3f60e478282e7d5df6f500199669ff69..f86aab047bf95e608d5957a750c0cfb1a77dfcd2 100644
--- a/InnerDetector/InDetDetDescr/PixelGeoModel/src/DBM_Module.cxx
+++ b/InnerDetector/InDetDetDescr/PixelGeoModel/src/DBM_Module.cxx
@@ -9,7 +9,7 @@
 #include "GeoModelKernel/GeoAlignableTransform.h"
 #include "GeoModelKernel/GeoNameTag.h"
 #include "GeoModelKernel/GeoBox.h"
-
+#include "GaudiKernel/SystemOfUnits.h"
 
 #include "Identifier/Identifier.h"
 #include "InDetIdentifier/PixelID.h"
@@ -64,7 +64,7 @@ GeoVPhysVol* DBM_Module::Build()
   GeoIdentifierTag* diamondTag = new GeoIdentifierTag(400);
 
 
-    double safety = 0.003*GeoModelKernelUnits::mm;
+    double safety = 0.003*Gaudi::Units::mm;
 
     //diamond dimension
     double diamond_X = m_gmt_mgr->DBMDiamondX();
@@ -84,8 +84,8 @@ GeoVPhysVol* DBM_Module::Build()
     
     //distances from bottom of the ceramic
     //Hardcoded!
-    double bot2Chip = 0.0*GeoModelKernelUnits::mm;
-    double bot2Diamond = 1.685*GeoModelKernelUnits::mm;
+    double bot2Chip = 0.0*Gaudi::Units::mm;
+    double bot2Diamond = 1.685*Gaudi::Units::mm;
 
 
     //---------------------------------------------
@@ -93,8 +93,8 @@ GeoVPhysVol* DBM_Module::Build()
   
     // Position of the corner closest to IP and beamline
     // Hardcoded, so if change then change in GeoPixelEnvelope and DBM_Det too
-    double ZToIP = 887.002*GeoModelKernelUnits::mm;
-    double RToBeam = 46.678*GeoModelKernelUnits::mm;
+    double ZToIP = 887.002*Gaudi::Units::mm;
+    double RToBeam = 46.678*Gaudi::Units::mm;
 
     // layer spacing
     double Zspacing = m_gmt_mgr->DBMSpacingZ();
@@ -146,7 +146,7 @@ GeoVPhysVol* DBM_Module::Build()
     const GeoLogVol* dbmModuleLog = new GeoLogVol("dbmModuleLog", dbmModuleBox, air);
     GeoPhysVol* dbmModulePhys = new GeoPhysVol(dbmModuleLog);
     
-    GeoTrf::Transform3D rm = GeoTrf::RotateZ3D(90.*GeoModelKernelUnits::deg)*GeoTrf::RotateY3D(270.*GeoModelKernelUnits::deg);
+    GeoTrf::Transform3D rm = GeoTrf::RotateZ3D(90.*Gaudi::Units::deg)*GeoTrf::RotateY3D(270.*Gaudi::Units::deg);
 
     //diamond
     const GeoBox* dbmDiamondBox = new GeoBox(diamond_Z/2.0, diamond_X/2.0, diamond_Y/2.0 );
@@ -224,7 +224,7 @@ GeoVPhysVol* DBM_Module::Build()
     double globPosZ = ZToIP + layerUnitPos_Z + (sensorPosInModuleCage_Z * cos(angle) - sensorPosInModuleCage_Y * sin(angle));
     double globPosY = RToBeam + layerUnitPos_Y + (sensorPosInModuleCage_Z * sin(angle) + sensorPosInModuleCage_Y * cos(angle));
 
-    GeoTrf::RotateX3D rmX10(-10.*GeoModelKernelUnits::deg);
+    GeoTrf::RotateX3D rmX10(-10.*Gaudi::Units::deg);
     GeoTrf::Translation3D alignTransformPos(0, globPosY, globPosZ);
     GeoAlignableTransform *xformAlign = new GeoAlignableTransform(GeoTrf::Transform3D(alignTransformPos*rmX10));
     m_DDmgr->addAlignableTransform(0, idwafer, xformAlign, dbmDiamondPhys);
diff --git a/InnerDetector/InDetDetDescr/PixelGeoModel/src/DBM_ModuleCage.cxx b/InnerDetector/InDetDetDescr/PixelGeoModel/src/DBM_ModuleCage.cxx
index 2f72f02edd60997b3a200e7079c3f3d575650936..1a9550c37dc3f62dbf03ebc26958b2ec78608df2 100644
--- a/InnerDetector/InDetDetDescr/PixelGeoModel/src/DBM_ModuleCage.cxx
+++ b/InnerDetector/InDetDetDescr/PixelGeoModel/src/DBM_ModuleCage.cxx
@@ -14,13 +14,14 @@
 #include "GeoModelKernel/GeoTube.h"
 
 #include "GeoModelKernel/GeoPhysVol.h"
+#include "GaudiKernel/SystemOfUnits.h"
 
 #include "InDetReadoutGeometry/PixelDetectorManager.h"
 
 GeoVPhysVol* DBM_ModuleCage::Build() {
 
   // safety, to make sure volumes don't overlap
-  double safety = 0.005*GeoModelKernelUnits::mm;
+  double safety = 0.005*Gaudi::Units::mm;
 
   // Telescope dimension
   double layerUnitY = m_gmt_mgr->DBMModuleCageY();
diff --git a/InnerDetector/InDetDetDescr/PixelGeoModel/src/DBM_Telescope.cxx b/InnerDetector/InDetDetDescr/PixelGeoModel/src/DBM_Telescope.cxx
index 35b64596c7ca4f54785b2e4b119f3e2f368a7542..b4440678f21b7d93f5ed58d691ab2e8b592f593e 100644
--- a/InnerDetector/InDetDetDescr/PixelGeoModel/src/DBM_Telescope.cxx
+++ b/InnerDetector/InDetDetDescr/PixelGeoModel/src/DBM_Telescope.cxx
@@ -18,12 +18,13 @@
 #include "GeoModelKernel/GeoShapeShift.h"
 #include "GeoModelKernel/GeoShapeSubtraction.h"
 #include "GeoModelKernel/GeoShapeUnion.h"
+#include "GaudiKernel/SystemOfUnits.h"
 
 #include "InDetGeoModelUtils/InDetMaterialManager.h"
 
 GeoVPhysVol* DBM_Telescope::Build() {
 
-  double safety = 0.005*GeoModelKernelUnits::mm;
+  double safety = 0.005*Gaudi::Units::mm;
 
   // telescope tilting angle in degree
   double angle = m_gmt_mgr->DBMAngle();
@@ -83,14 +84,14 @@ GeoVPhysVol* DBM_Telescope::Build() {
   const GeoLogVol* telescopeLog = new GeoLogVol("dbmTelescopeLog", telescopeBox, air);
   GeoPhysVol* telescopePhys = new GeoPhysVol(telescopeLog);
 
-  GeoTrf::RotateX3D rmX10(-10.*GeoModelKernelUnits::deg);
+  GeoTrf::RotateX3D rmX10(-10.*Gaudi::Units::deg);
 
   DBM_ModuleCage moduleCage;
   GeoVPhysVol* moduleCagePhys = moduleCage.Build();
 
   // parameters for rotating the 3-layer unit
   double lyRadius = sqrt(layerUnitY*layerUnitY/4 + layerUnitZ*layerUnitZ/4);
-  double lyAngle = atan(layerUnitY/layerUnitZ);//21.6444*GeoModelKernelUnits::deg; // arctan(DBM3LayersY / DBM3LayersZ)
+  double lyAngle = atan(layerUnitY/layerUnitZ);//21.6444*Gaudi::Units::deg; // arctan(DBM3LayersY / DBM3LayersZ)
   // position of bottom tip of the 3-layers unit, which is the rotation point
   double layerUnitPos_Y = (trapBackY/cos(angle) - coolingSidePlateY)*cos(angle);
   double layerUnitPos_Z = coolingSidePlateY*sin(angle) + trapBackShortZ + bracketZ - brcktLockZ; 
@@ -107,7 +108,7 @@ GeoVPhysVol* DBM_Telescope::Build() {
   
   // back trapezoid block with window, will be rotated by 90 degree along the x-axis
 
-  const GeoTrap* trapBack = new GeoTrap(trapBackY/2., trapBack_theta, 90.0*GeoModelKernelUnits::deg, trapBackShortZ/2., trapBackX/2., trapBackX/2, 0.0, (trapBackShortZ+trapBackY*tan(angle))/2., trapBackX/2., trapBackX/2., 0.0);
+  const GeoTrap* trapBack = new GeoTrap(trapBackY/2., trapBack_theta, 90.0*Gaudi::Units::deg, trapBackShortZ/2., trapBackX/2., trapBackX/2, 0.0, (trapBackShortZ+trapBackY*tan(angle))/2., trapBackX/2., trapBackX/2., 0.0);
 
   double brWindowPosY = brcktWindow_offset + brcktWindow_centerZ * tan(angle) + brcktWindowY/(2 * cos(angle));
   const GeoBox* brWindow = new GeoBox(brcktWindowX/2., trapBackShortZ, brcktWindowY/2.);
@@ -120,7 +121,7 @@ GeoVPhysVol* DBM_Telescope::Build() {
   const GeoLogVol* trapBackLog = new GeoLogVol("bracketLog", &trapBack1, dbmPeek4);
   GeoPhysVol* trapBackPhys = new GeoPhysVol(trapBackLog);
 
-  GeoTrf::RotateX3D rmX90(90.*GeoModelKernelUnits::deg);
+  GeoTrf::RotateX3D rmX90(90.*Gaudi::Units::deg);
   double trapBackPos_Z = -telescopeZ/2. + bracketZ - brcktLockZ + ( (trapBackShortZ+trapBackY*tan(angle))/2. + trapBackY/2.*sin(trapBack_theta) - trapBackY*tan(trapBack_theta) );
   GeoTrf::Translation3D trapBackPos(0.0, -telescopeY/2. + trapBackY/2. + safety, trapBackPos_Z + 3*safety);
   xform = new GeoTransform(GeoTrf::Transform3D(trapBackPos*rmX90));
@@ -182,7 +183,7 @@ GeoVPhysVol* DBM_Telescope::Build() {
   const GeoLogVol* sidePlateLog = new GeoLogVol("sidePlateLog", sidePlate, dbmAluminium2);
   GeoPhysVol* sidePlatePhys = new GeoPhysVol(sidePlateLog);
 
-  double spAngle = angle + 17.57126*GeoModelKernelUnits::deg;
+  double spAngle = angle + 17.57126*Gaudi::Units::deg;
   double spRadius = 1/2. * sqrt(coolingSidePlateZ*coolingSidePlateZ + coolingSidePlateY*coolingSidePlateY);
 
   GeoTrf::Translation3D sidePlatePos1( mainPlateX/2. + coolingSidePlateX/2. + 2*safety, - telescopeY/2. + spRadius * sin(spAngle), -telescopeZ/2. + layerUnitPos_Z - coolingSidePlatePos*cos(angle) + spRadius * cos(spAngle));
@@ -200,19 +201,19 @@ GeoVPhysVol* DBM_Telescope::Build() {
   telescopePhys->add(sidePlatePhys);
 
   //cooling plates next to the bracket unit
-  const GeoTrap* coolingFin = new GeoTrap(coolingFinHeight/2., trapBack_theta, 90.0*GeoModelKernelUnits::deg, (coolingFinLongZ - coolingFinHeight*tan(angle))/2., coolingFinThick/2., coolingFinThick/2, 0.0, coolingFinLongZ/2., coolingFinThick/2., coolingFinThick/2., 0.0);
+  const GeoTrap* coolingFin = new GeoTrap(coolingFinHeight/2., trapBack_theta, 90.0*Gaudi::Units::deg, (coolingFinLongZ - coolingFinHeight*tan(angle))/2., coolingFinThick/2., coolingFinThick/2, 0.0, coolingFinLongZ/2., coolingFinThick/2., coolingFinThick/2., 0.0);
   const GeoMaterial* dbmAluminium3 = m_mat_mgr->getMaterialForVolume("pix::DBMAluminium3", coolingFin->volume());
   const GeoLogVol* finLog = new GeoLogVol("finLog", coolingFin, dbmAluminium3);
   GeoPhysVol* coolingFinPhys = new GeoPhysVol(finLog);
 
-  GeoTrf::Translation3D finPos1( mainPlateX/2. - coolingFinThick/2. + safety, -telescopeY/2. +  coolingFinHeight/2. + 4*safety, -telescopeZ/2. + coolingFinPos + 0.05*GeoModelKernelUnits::mm);
+  GeoTrf::Translation3D finPos1( mainPlateX/2. - coolingFinThick/2. + safety, -telescopeY/2. +  coolingFinHeight/2. + 4*safety, -telescopeZ/2. + coolingFinPos + 0.05*Gaudi::Units::mm);
   xform = new GeoTransform(GeoTrf::Transform3D(finPos1*rmX90));
   tag = new GeoNameTag("finPlate");
   telescopePhys->add(tag);
   telescopePhys->add(xform);
   telescopePhys->add(coolingFinPhys);
 
-  GeoTrf::Translation3D finPos2( -mainPlateX/2. + coolingFinThick/2. - safety, -telescopeY/2. +  coolingFinHeight/2. + 4*safety, -telescopeZ/2. + coolingFinPos + 0.05*GeoModelKernelUnits::mm);
+  GeoTrf::Translation3D finPos2( -mainPlateX/2. + coolingFinThick/2. - safety, -telescopeY/2. +  coolingFinHeight/2. + 4*safety, -telescopeZ/2. + coolingFinPos + 0.05*Gaudi::Units::mm);
   xform = new GeoTransform(GeoTrf::Transform3D(finPos2*rmX90));
   tag = new GeoNameTag("finPlate");
   telescopePhys->add(tag);
diff --git a/InnerDetector/InDetDetDescr/PixelGeoModel/src/GeoPixelCable.cxx b/InnerDetector/InDetDetDescr/PixelGeoModel/src/GeoPixelCable.cxx
index a6c8e52e21abc5447440496c251d199949702454..3f38b500c7671a3da8f47574b1f1b87f57eb60d1 100644
--- a/InnerDetector/InDetDetDescr/PixelGeoModel/src/GeoPixelCable.cxx
+++ b/InnerDetector/InDetDetDescr/PixelGeoModel/src/GeoPixelCable.cxx
@@ -70,7 +70,7 @@ GeoVPhysVol* GeoPixelCable::Build() {
   std::ostringstream o;
   o << m_gmt_mgr->getLD_Label() << label;
   logName = logName+o.str();
-  //std::cout << logName << ": " << weight/GeoModelKernelUnits::g << " g, " << thickness << std::endl;
+  //std::cout << logName << ": " << weight/Gaudi::Units::g << " g, " << thickness << std::endl;
 
   GeoLogVol* theCable = new GeoLogVol(logName,cableBox,cableMat);
   GeoPhysVol* cablePhys = new GeoPhysVol(theCable);
diff --git a/InnerDetector/InDetDetDescr/PixelGeoModel/src/GeoPixelDetailedStaveSupport.cxx b/InnerDetector/InDetDetDescr/PixelGeoModel/src/GeoPixelDetailedStaveSupport.cxx
index 6b6b9382d6673da425c4bb3c00e1e97125fcd564..d9b40650778a579376f3792d46dc02fb22c8a659 100644
--- a/InnerDetector/InDetDetDescr/PixelGeoModel/src/GeoPixelDetailedStaveSupport.cxx
+++ b/InnerDetector/InDetDetDescr/PixelGeoModel/src/GeoPixelDetailedStaveSupport.cxx
@@ -21,6 +21,7 @@
 
 #include "GeoModelKernel/GeoTransform.h"
 #include "GeoModelKernel/GeoDefinitions.h"
+#include "GaudiKernel/PhysicalConstants.h"
 
 #include <algorithm>
 using std::max;
@@ -201,9 +202,9 @@ GeoVPhysVol* GeoPixelDetailedStaveSupport::Build() {
   double halfMecStaveWidth=MechanicalStaveWidth*0.5;
 
   // SafetyMargin
-  m_SafetyMargin=.001*GeoModelKernelUnits::mm;
+  m_SafetyMargin=.001*Gaudi::Units::mm;
   double xGblOffset=FacePlateThick+m_SafetyMargin;
-  double safetyMarginZ=.001*GeoModelKernelUnits::mm;
+  double safetyMarginZ=.001*Gaudi::Units::mm;
 
   // Compute approximated stave shape based on DB parameters
   ComputeStaveExternalShape();
@@ -450,7 +451,7 @@ GeoVPhysVol* GeoPixelDetailedStaveSupport::Build() {
 										 omegaVolume,
 										 omegaVolume,"pix::Omega_IBL",
 										 glueVolume,"pix::Stycast2850FT");
-      m_gmt_mgr->msg(MSG::INFO)<<"***> new material : "<<omega_material->getName()<<" "<<omega_material->getDensity()/(GeoModelKernelUnits::gram/GeoModelKernelUnits::cm3)<<endmsg;
+      m_gmt_mgr->msg(MSG::INFO)<<"***> new material : "<<omega_material->getName()<<" "<<omega_material->getDensity()/(GeoModelKernelUnits::gram/Gaudi::Units::cm3)<<endmsg;
       omega_logVol = new GeoLogVol("Omega",omega_shape,omega_material);
     }
 
@@ -459,7 +460,7 @@ GeoVPhysVol* GeoPixelDetailedStaveSupport::Build() {
 
   //       const GeoMaterial* omega_material = m_mat_mgr->getMaterial(m_gmt_mgr->getMaterialName("Omega",0,0));
   //       GeoNameTag* omega_tag = new GeoNameTag("Omega");
-  //       GeoTransform* omega_xform = new GeoTransform(GeoTrf::Transform3D(GeoModelKernelUnits::HepRotation(),GeoTrf::Vector3D()));
+  //       GeoTransform* omega_xform = new GeoTransform(GeoTrf::Transform3D(Gaudi::Units::HepRotation(),GeoTrf::Vector3D()));
   //      GeoLogVol * omega_logVol = new GeoLogVol("Omega",omega_shape,omega_material);
 
   GeoPhysVol * omega_logVolPV = new GeoPhysVol(omega_logVol);
@@ -500,7 +501,7 @@ GeoVPhysVol* GeoPixelDetailedStaveSupport::Build() {
 								  facePlateVolume,
 								  facePlateVolume,"pix::FacePlate_IBL",
 								  glueVolume,"pix::Stycast2850FT");
-      m_gmt_mgr->msg(MSG::INFO)<<"***> new material : "<<faceplate_material->getName()<<" "<<faceplate_material->getDensity()/(GeoModelKernelUnits::gram/GeoModelKernelUnits::cm3)<<endmsg;
+      m_gmt_mgr->msg(MSG::INFO)<<"***> new material : "<<faceplate_material->getName()<<" "<<faceplate_material->getDensity()/(GeoModelKernelUnits::gram/Gaudi::Units::cm3)<<endmsg;
     }
 
   // Create composite material made of faceplate + grease if a thickness of grease is defined is DB
@@ -525,7 +526,7 @@ GeoVPhysVol* GeoPixelDetailedStaveSupport::Build() {
 										     facePlateVolume,faceplateMatName,
 										     greaseVolume,"pix::ThermGrease_IBL");
       faceplate_logVol = new GeoLogVol("FacePlate",faceplate_shape,faceplate_material);
-      m_gmt_mgr->msg(MSG::INFO)<<"***> new material : "<<faceplate_material->getName()<<" "<<faceplate_material->getDensity()/(GeoModelKernelUnits::gram/GeoModelKernelUnits::cm3)<<endmsg;
+      m_gmt_mgr->msg(MSG::INFO)<<"***> new material : "<<faceplate_material->getName()<<" "<<faceplate_material->getDensity()/(GeoModelKernelUnits::gram/Gaudi::Units::cm3)<<endmsg;
     }
 
   //  const GeoMaterial* faceplate_material = m_mat_mgr->getMaterial(m_gmt_mgr->getMaterialName("FacePlate",0,0));
@@ -626,7 +627,7 @@ GeoVPhysVol* GeoPixelDetailedStaveSupport::Build() {
 
       // Add flex in 3D model : A component
       GeoTrf::Translation3D cableflex_pos((flex1x+flex2x+flex3x+flex4x)*0.25,(flex1y+flex2y+flex3y+flex4y)*0.25,ModulePosZ+flexGapZ*0.5);
-      //      GeoTransform* cableflex_xform = new GeoTransform(GeoTrf::Transform3D(GeoModelKernelUnits::HepRotation(0.0,0.0,-fabs(flex_angle)),cableflex_pos));
+      //      GeoTransform* cableflex_xform = new GeoTransform(GeoTrf::Transform3D(Gaudi::Units::HepRotation(0.0,0.0,-fabs(flex_angle)),cableflex_pos));
       GeoTransform* cableflex_xform = new GeoTransform(GeoTrf::Transform3D(cableflex_pos*GeoTrf::RotateZ3D(fabs(flex_angle))));
 
       GeoLogVol * cableflex_logVol = 0;
@@ -833,16 +834,16 @@ GeoVPhysVol* GeoPixelDetailedStaveSupport::Build() {
   else
     {
       m_gmt_mgr->msg(MSG::INFO)<<"** TUBE : with Stycast "<<TubeGlueThick<<"  diam "<<TubeOuterDiam*0.5<<" "<<TubeInnerDiam*0.5<<endmsg;
-      double glueVolume = (TubeOuterDiam*0.5+TubeGlueThick)*(TubeOuterDiam*0.5+TubeGlueThick)*GeoModelKernelUnits::pi*MiddleSectionLength;
-      double tubeOuterVolume = TubeOuterDiam*TubeOuterDiam*0.25*GeoModelKernelUnits::pi*MiddleSectionLength;
-      double tubeInnerVolume = TubeInnerDiam*TubeInnerDiam*0.25*GeoModelKernelUnits::pi*MiddleSectionLength;
+      double glueVolume = (TubeOuterDiam*0.5+TubeGlueThick)*(TubeOuterDiam*0.5+TubeGlueThick)*Gaudi::Units::pi*MiddleSectionLength;
+      double tubeOuterVolume = TubeOuterDiam*TubeOuterDiam*0.25*Gaudi::Units::pi*MiddleSectionLength;
+      double tubeInnerVolume = TubeInnerDiam*TubeInnerDiam*0.25*Gaudi::Units::pi*MiddleSectionLength;
 
       const std::string compMatName="CoolingPipeGlue_IBL";
       const GeoMaterial* cp_material = m_mat_mgr->getCompositeMaterialForVolume(compMatName,
 									      tubeOuterVolume-tubeInnerVolume,
 									      tubeOuterVolume-tubeInnerVolume,"pix::CoolingPipe_IBL",
 									      glueVolume-tubeOuterVolume,"pix::Stycast2850FT");
-      m_gmt_mgr->msg(MSG::INFO)<<"***> new material : "<<cp_material->getName()<<" "<<cp_material->getDensity()/(GeoModelKernelUnits::gram/GeoModelKernelUnits::cm3)<<endmsg;
+      m_gmt_mgr->msg(MSG::INFO)<<"***> new material : "<<cp_material->getName()<<" "<<cp_material->getDensity()/(GeoModelKernelUnits::gram/Gaudi::Units::cm3)<<endmsg;
       cp_logVol = new GeoLogVol("CoolingPipe",coolingPipe,cp_material);
     }
 
@@ -1050,7 +1051,7 @@ GeoVPhysVol* GeoPixelDetailedStaveSupport::Build() {
   
 //   GeoNameTag* cp_service_tag = new GeoNameTag("ServiceCoolingPipe");
 //   GeoTrf::Vector3D cp_service_pos(xGblOffset+TubeMiddlePos,0.0,0.0);
-//   GeoTransform* cp_service_xform = new GeoTransform(GeoTrf::Transform3D(GeoModelKernelUnits::HepRotation(),cp_service_pos));
+//   GeoTransform* cp_service_xform = new GeoTransform(GeoTrf::Transform3D(Gaudi::Units::HepRotation(),cp_service_pos));
 //   //       service_logVolPV->add(cp_service_tag);
 //   //       service_logVolPV->add(cp_service_xform);
 //   //       service_logVolPV->add(cp_service_logPV);
@@ -1311,7 +1312,7 @@ void GeoPixelDetailedStaveSupport::RemoveCoincidentAndColinearPointsFromShape(st
 	  int i2=(iPt+1)%(nbPoint);
 	  
 	  double zDist=fabs(sqrt((xPoint[i1]-xPoint[i2])*(xPoint[i1]-xPoint[i2])+(yPoint[i1]-yPoint[i2])*(yPoint[i1]-yPoint[i2])));
-	  if(zDist<0.01*GeoModelKernelUnits::mm){
+	  if(zDist<0.01*Gaudi::Units::mm){
 	      xPoint.erase(xPoint.begin()+i1);
 	      yPoint.erase(yPoint.begin()+i1);
 	      bRemovedPoint=true;
@@ -1514,11 +1515,11 @@ void GeoPixelDetailedStaveSupport::ComputeStaveExternalShape()
 
   GeoTrf::Vector3D midStaveCenter(m_gmt_mgr->IBLStaveOmegaMidCenterX(),0.0,0.0);
   double midStaveRadius=m_gmt_mgr->IBLStaveOmegaMidRadius();
-  double midStaveAngle=90.0*GeoModelKernelUnits::deg-m_gmt_mgr->IBLStaveOmegaMidAngle();
+  double midStaveAngle=90.0*Gaudi::Units::deg-m_gmt_mgr->IBLStaveOmegaMidAngle();
 
   GeoTrf::Vector3D endStaveCenter(m_gmt_mgr->IBLStaveOmegaEndCenterX(),m_gmt_mgr->IBLStaveOmegaEndCenterY(),0.0);
   double endStaveRadius=m_gmt_mgr->IBLStaveOmegaEndRadius();
-  double endStaveAngle=90.0*GeoModelKernelUnits::deg+m_gmt_mgr->IBLStaveOmegaEndAngle();
+  double endStaveAngle=90.0*Gaudi::Units::deg+m_gmt_mgr->IBLStaveOmegaEndAngle();
 
   double omegaThick = m_gmt_mgr->IBLStaveOmegaThickness();
   double omegaEndStavePointY = m_gmt_mgr->IBLStaveMechanicalStaveWidth()*0.5;
diff --git a/InnerDetector/InDetDetDescr/PixelGeoModel/src/GeoPixelDisk.cxx b/InnerDetector/InDetDetDescr/PixelGeoModel/src/GeoPixelDisk.cxx
index 3ba59bf0a3c4448ce070940906f03cf50a8ee5a4..b9c017461071c91075b871688adc500a0461b670 100644
--- a/InnerDetector/InDetDetDescr/PixelGeoModel/src/GeoPixelDisk.cxx
+++ b/InnerDetector/InDetDetDescr/PixelGeoModel/src/GeoPixelDisk.cxx
@@ -17,6 +17,7 @@
 #include "GeoModelKernel/GeoMaterial.h"
 #include "GeoModelKernel/GeoTransform.h"
 #include "GeoModelKernel/GeoAlignableTransform.h"
+#include "GaudiKernel/SystemOfUnits.h"
 
 #include "InDetReadoutGeometry/PixelDetectorManager.h"
 #include <sstream>
@@ -55,7 +56,7 @@ GeoVPhysVol* GeoPixelDisk::Build( ) {
   // Need to specify some eta. Assume all module the same
   GeoPixelModule psd(theSensor);
   double zpos = m_gmt_mgr->PixelECSiDz1()*0.5;
-  double deltaPhi = 360.*GeoModelKernelUnits::deg/ (float) nbECSector;
+  double deltaPhi = 360.*Gaudi::Units::deg/ (float) nbECSector;
   // This is the start angle of the even modules (3.75 deg):
   double startAngle = deltaPhi*0.25;
   // Start angle could eventually come from the database...
@@ -133,17 +134,17 @@ GeoVPhysVol* GeoPixelDisk::Build( ) {
     m_gmt_mgr->SetPhi(phiId);
 
     double angle = ii*0.5*deltaPhi+startAngle;
-    //if ( m_gmt_mgr->GetSide()<0 ) angle = 360*GeoModelKernelUnits::deg-(ii*deltaPhi+startAngle);
+    //if ( m_gmt_mgr->GetSide()<0 ) angle = 360*Gaudi::Units::deg-(ii*deltaPhi+startAngle);
     int diskSide = (ii%2) ? +1 : -1; // even: -1, odd +1
 
 
     GeoTrf::Transform3D rmX(GeoTrf::Transform3D::Identity());
     if (oldGeometry && m_gmt_mgr->GetSide()<0) {
-      if (diskSide > 0) rmX = GeoTrf::RotateX3D(180.*GeoModelKernelUnits::deg); // This is for compatibilty with older geomtries.
+      if (diskSide > 0) rmX = GeoTrf::RotateX3D(180.*Gaudi::Units::deg); // This is for compatibilty with older geomtries.
     } else {
-      if (diskSide < 0) rmX = GeoTrf::RotateX3D(180.*GeoModelKernelUnits::deg); // depth axis points towards disk.
+      if (diskSide < 0) rmX = GeoTrf::RotateX3D(180.*Gaudi::Units::deg); // depth axis points towards disk.
     } 
-    GeoTrf::Transform3D rm = GeoTrf::RotateZ3D(angle) * rmX * GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg);
+    GeoTrf::Transform3D rm = GeoTrf::RotateZ3D(angle) * rmX * GeoTrf::RotateY3D(90*Gaudi::Units::deg);
     GeoTrf::Vector3D pos(moduleRadius,0.,diskSide*zpos);
     pos = GeoTrf::RotateZ3D(angle)*pos;
     GeoAlignableTransform* xform = new GeoAlignableTransform(GeoTrf::Translate3D(pos.x(),pos.y(),pos.z())*rm);
@@ -208,11 +209,11 @@ double GeoPixelDisk::Thickness() {
   // 7-1 I switch to the minimum thickness possible as the cables are right
   // outside this volume.
   //
-  //  return 10*GeoModelKernelUnits::mm;
+  //  return 10*Gaudi::Units::mm;
   // GWG. It would be nice to get these numbers from the module itself to
   // ensure consistency.
-  double safety = 0.01* GeoModelKernelUnits::mm; // This is the safety added to the module.
-  double zClearance = 0.5 * GeoModelKernelUnits::mm; // Clearance for misalignments
+  double safety = 0.01* Gaudi::Units::mm; // This is the safety added to the module.
+  double zClearance = 0.5 * Gaudi::Units::mm; // Clearance for misalignments
   double tck = 2*(safety + 0.5*m_gmt_mgr->PixelBoardThickness()
                   + std::max(m_gmt_mgr->PixelHybridThickness(),
 			     m_gmt_mgr->PixelChipThickness()+m_gmt_mgr->PixelChipGap())
diff --git a/InnerDetector/InDetDetDescr/PixelGeoModel/src/GeoPixelEnvelope.cxx b/InnerDetector/InDetDetDescr/PixelGeoModel/src/GeoPixelEnvelope.cxx
index 0a19ebf30ecb225e9a89ac48438ed8ab495f2715..c936b78ada6120f71696e1e2fed348b57af77a25 100644
--- a/InnerDetector/InDetDetDescr/PixelGeoModel/src/GeoPixelEnvelope.cxx
+++ b/InnerDetector/InDetDetDescr/PixelGeoModel/src/GeoPixelEnvelope.cxx
@@ -11,6 +11,7 @@
 #include "GeoModelKernel/GeoFullPhysVol.h"
 #include "GeoModelKernel/GeoTransform.h"
 #include "GeoModelKernel/GeoMaterial.h"
+#include "GaudiKernel/PhysicalConstants.h"
 
 #include "GeoPixelBarrel.h"
 #include "GeoPixelEndCap.h"
@@ -59,7 +60,7 @@ GeoVPhysVol* GeoPixelEnvelope::Build( ) {
     envelopeShape = new GeoTube(rmin,rmax,halflength);
     pixZone = new InDetDD::TubeZone("Pixel",-halflength,halflength,rmin,rmax);
   } else {
-    GeoPcon* envelopeShapeTmp  = new GeoPcon(0.,2*GeoModelKernelUnits::pi);
+    GeoPcon* envelopeShapeTmp  = new GeoPcon(0.,2*Gaudi::Units::pi);
     // table contains +ve z values only and envelope is assumed to be symmetric around z.
     int numPlanes = m_gmt_mgr->PixelEnvelopeNumPlanes();
     for (int i = 0; i < numPlanes * 2; i++) {
@@ -135,7 +136,7 @@ GeoVPhysVol* GeoPixelEnvelope::Build( ) {
       
       m_gmt_mgr->SetEndcap();
       m_gmt_mgr->SetNeg();
-      GeoTransform* xform = new GeoTransform(endcapCTransform * GeoTrf::TranslateZ3D(-zpos) *  GeoTrf::RotateY3D(180*GeoModelKernelUnits::deg));
+      GeoTransform* xform = new GeoTransform(endcapCTransform * GeoTrf::TranslateZ3D(-zpos) *  GeoTrf::RotateY3D(180*Gaudi::Units::deg));
       GeoNameTag* tag  = new GeoNameTag("EndCapC");
       envelopePhys->add(tag);
       envelopePhys->add(new GeoIdentifierTag(-2));
@@ -237,7 +238,7 @@ GeoVPhysVol* GeoPixelEnvelope::Build( ) {
   // so if change then change in DBM_module too
 
   if (m_gmt_mgr->dbm()) {
-    GeoTrf::Translate3D dbmTransform1( 0, 0, 887.002*GeoModelKernelUnits::mm + ( m_gmt_mgr->DBMTelescopeZ() )/2.); //Add 0.002mm to 887mm for safety
+    GeoTrf::Translate3D dbmTransform1( 0, 0, 887.002*Gaudi::Units::mm + ( m_gmt_mgr->DBMTelescopeZ() )/2.); //Add 0.002mm to 887mm for safety
 
     //m_DDmgr->numerology().addEndcap(4);
     m_gmt_mgr->SetPartsDBM();
@@ -253,7 +254,7 @@ GeoVPhysVol* GeoPixelEnvelope::Build( ) {
     //m_DDmgr->numerology().addEndcap(-4);
     m_gmt_mgr->SetNeg();
     GeoNameTag* tag2 = new GeoNameTag("DBMC");
-    GeoTransform* dbmTransform2 = new GeoTransform(GeoTrf::TranslateZ3D(-887.002*GeoModelKernelUnits::mm - ( m_gmt_mgr->DBMTelescopeZ() )/2.) *  GeoTrf::RotateY3D(180*GeoModelKernelUnits::deg));
+    GeoTransform* dbmTransform2 = new GeoTransform(GeoTrf::TranslateZ3D(-887.002*Gaudi::Units::mm - ( m_gmt_mgr->DBMTelescopeZ() )/2.) *  GeoTrf::RotateY3D(180*Gaudi::Units::deg));
     envelopePhys->add(tag2);
     envelopePhys->add(new GeoIdentifierTag(-4));
     envelopePhys->add(dbmTransform2);
diff --git a/InnerDetector/InDetDetDescr/PixelGeoModel/src/GeoPixelFrame.cxx b/InnerDetector/InDetDetDescr/PixelGeoModel/src/GeoPixelFrame.cxx
index e626969c244f7d3ef7fc5cc2311a1480d80238a3..83975b7b728f19e3afcd78afb444dc1eed969c9b 100644
--- a/InnerDetector/InDetDetDescr/PixelGeoModel/src/GeoPixelFrame.cxx
+++ b/InnerDetector/InDetDetDescr/PixelGeoModel/src/GeoPixelFrame.cxx
@@ -15,7 +15,7 @@
 #include "GeoModelKernel/GeoPhysVol.h"
 #include "GeoModelKernel/GeoMaterial.h"
 #include "GeoModelKernel/GeoTransform.h"
-#include "GeoModelKernel/Units.h"
+#include "GaudiKernel/PhysicalConstants.h"
 #include <algorithm>
 
 GeoPixelFrame::GeoPixelFrame()
@@ -47,18 +47,18 @@ void GeoPixelFrame::BuildAndPlace(GeoFullPhysVol * parent, int section)
   ////////////////////////
   
   // Make envelope to hold the frame
-  //double safety = 0.001 * GeoModelKernelUnits::mm;
-  double epsilon = 0.00001 * GeoModelKernelUnits::mm;
+  //double safety = 0.001 * Gaudi::Units::mm;
+  double epsilon = 0.00001 * Gaudi::Units::mm;
   double halflength = 0.5*std::abs(zmax - zmin); 
 
-  double alpha = GeoModelKernelUnits::pi/numSides;
+  double alpha = Gaudi::Units::pi/numSides;
   double cosalpha = cos(alpha);
   double sinalpha = sin(alpha);
   
   /*
   double rminEnv = (rminSide-safety)/cosalpha;
   double rmaxEnv = (rmaxSide+safety)/cosalpha;
-  GeoPgon * frameEnvShape = new GeoPgon(phiLoc-alpha,2*GeoModelKernelUnits::pi,numSides);
+  GeoPgon * frameEnvShape = new GeoPgon(phiLoc-alpha,2*Gaudi::Units::pi,numSides);
   frameEnvShape->addPlane(zCenter-halflength-0.5*epsilon,rminEnv,rmaxEnv);
   frameEnvShape->addPlane(zCenter+halflength+0.5*epsilon,rminEnv,rmaxEnv);
 
@@ -172,7 +172,7 @@ void GeoPixelFrame::BuildAndPlace(GeoFullPhysVol * parent, int section)
 	double thetaPara = 0; 
 	double phiPara = 0;
 	sideElementShape = new GeoPara(0.5*std::abs(zMax1-zMin1),  0.5*sideWidth-epsilon, 0.5*sideThick, alphaPara, thetaPara, phiPara);
-	rotateShape = GeoTrf::RotateY3D(-90*GeoModelKernelUnits::deg);
+	rotateShape = GeoTrf::RotateY3D(-90*Gaudi::Units::deg);
 	shapeVolume =  std::abs(zMax1-zMin1) * (sideWidth-2*epsilon) * sideThick;
       } else {// 
 	      // other cases not implemented. Should not occur for the frame.
@@ -220,7 +220,7 @@ void GeoPixelFrame::BuildAndPlace(GeoFullPhysVol * parent, int section)
       double angleSide   = phiLoc + alpha * (2*iSide);
       GeoTrf::Transform3D oddEvenRotate(GeoTrf::Transform3D::Identity());
       if (iSide%2 && mirrorSides) {
-	      oddEvenRotate = GeoTrf::RotateZ3D(GeoModelKernelUnits::pi); // Every 2nd side we mirror the side. 
+	      oddEvenRotate = GeoTrf::RotateZ3D(Gaudi::Units::pi); // Every 2nd side we mirror the side. 
       }
       GeoTransform * sideTrans = new GeoTransform(GeoTrf::TranslateZ3D(zSideCenter)*GeoTrf::RotateZ3D(angleSide)
 						  *GeoTrf::TranslateX3D(midRadius)*oddEvenRotate);
diff --git a/InnerDetector/InDetDetDescr/PixelGeoModel/src/GeoPixelIBLFwdSvcCADModel.cxx b/InnerDetector/InDetDetDescr/PixelGeoModel/src/GeoPixelIBLFwdSvcCADModel.cxx
index 11643a2de6523f460452fef64f100be6a91ab5f8..c8418be6cb4e5e0c8d1bc360fee1514b2e6d7258 100644
--- a/InnerDetector/InDetDetDescr/PixelGeoModel/src/GeoPixelIBLFwdSvcCADModel.cxx
+++ b/InnerDetector/InDetDetDescr/PixelGeoModel/src/GeoPixelIBLFwdSvcCADModel.cxx
@@ -25,6 +25,7 @@
 #include "GeoModelKernel/GeoNameTag.h"
 
 #include "GeoModelKernel/GeoTransform.h"
+#include "GaudiKernel/PhysicalConstants.h"
 
 #include <algorithm>
 #include <iostream> 
@@ -53,7 +54,7 @@ GeoVPhysVol* GeoPixelIBLFwdSvcCADModel::Build()
 
   m_gmt_mgr->msg(MSG::INFO) <<"Build IBL fwd services - CAD tool design - Torus object is defined"<<endmsg;
 
-  //  double safety = 0.01*GeoModelKernelUnits::mm;
+  //  double safety = 0.01*Gaudi::Units::mm;
 
   // IBL layer shift ( 2mm shift issue )
   double layerZshift = m_gmt_mgr->PixelLayerGlobalShift();
@@ -63,7 +64,7 @@ GeoVPhysVol* GeoPixelIBLFwdSvcCADModel::Build()
 
   // check if sectors are properly defined
   if(nSectors==0) return 0;
-  double angle=360./(double)nSectors*GeoModelKernelUnits::deg;
+  double angle=360./(double)nSectors*Gaudi::Units::deg;
   
   // Defines the IBL_Fwd02 section in the IBL services area
   double innerRadius = 33.;
@@ -94,7 +95,7 @@ GeoVPhysVol* GeoPixelIBLFwdSvcCADModel::Build()
   double lgFwdSvc[4]={511., 561., 560., 706. };
   double devLgFwdSvc[4]={512., 562., 562., 707. };
   double devTotalLength = 2460.188;
-  double pi = GeoModelKernelUnits::pi;
+  double pi = Gaudi::Units::pi;
 
   // Cable bundle sizes
   double rminCable = 0.;
@@ -112,7 +113,7 @@ GeoVPhysVol* GeoPixelIBLFwdSvcCADModel::Build()
   double zposRing = 0.;
   double totalLength=0.;
   double hermJunction = .4;
-  double breakAngle = 11.*GeoModelKernelUnits::deg;
+  double breakAngle = 11.*Gaudi::Units::deg;
 
   //  Loop over the wavy shape sections to build a cable and a cooling pipe
   const GeoShape * gblShapeCableA = 0;
@@ -195,12 +196,12 @@ GeoVPhysVol* GeoPixelIBLFwdSvcCADModel::Build()
 
   // -------------- Alignement of the services with the previous services (Fwd01 area)
   double cooling_radius = 35.1;
-  double cooling_angle = -2.154*GeoModelKernelUnits::deg;
+  double cooling_angle = -2.154*Gaudi::Units::deg;
 
   if(m_gmt_mgr->PixelStaveAxe()==1)   
     {
       cooling_radius = 34.7 + layerRadius-33.25;
-      cooling_angle = -.1*GeoModelKernelUnits::deg;
+      cooling_angle = -.1*Gaudi::Units::deg;
     }
 
   double cable_radius = 36.501;
diff --git a/InnerDetector/InDetDetDescr/PixelGeoModel/src/GeoPixelIBLFwdSvcModel1.cxx b/InnerDetector/InDetDetDescr/PixelGeoModel/src/GeoPixelIBLFwdSvcModel1.cxx
index ae12b9fea422583e2a0595de332f33eeba4b5246..9722286a261a531483e4f2f328bb6780b04fabae 100644
--- a/InnerDetector/InDetDetDescr/PixelGeoModel/src/GeoPixelIBLFwdSvcModel1.cxx
+++ b/InnerDetector/InDetDetDescr/PixelGeoModel/src/GeoPixelIBLFwdSvcModel1.cxx
@@ -20,6 +20,7 @@
 #include "GeoModelKernel/GeoNameTag.h"
 
 #include "GeoModelKernel/GeoTransform.h"
+#include "GaudiKernel/SystemOfUnits.h"
 
 #include <algorithm>
 #include <iostream> 
@@ -39,7 +40,7 @@ GeoVPhysVol* GeoPixelIBLFwdSvcModel1::Build()
 
   m_gmt_mgr->msg(MSG::INFO) <<"Build IBL fwd services"<<endmsg;
 
-  //  double safety = 0.01*GeoModelKernelUnits::mm;
+  //  double safety = 0.01*Gaudi::Units::mm;
 
   // IBL layer shift ( 2mm shift issue )
   double layerZshift = m_gmt_mgr->PixelLayerGlobalShift();
@@ -49,7 +50,7 @@ GeoVPhysVol* GeoPixelIBLFwdSvcModel1::Build()
 
   // check if sectors are properly defined
   if(nSectors==0) return 0;
-  double angle=360./(double)nSectors*GeoModelKernelUnits::deg;
+  double angle=360./(double)nSectors*Gaudi::Units::deg;
   
   // Defines the IBL_Fwd02 section in the IBL services area
   double innerRadius = 33.;
@@ -98,15 +99,15 @@ GeoVPhysVol* GeoPixelIBLFwdSvcModel1::Build()
   //  double zposRing = 0.;
   double totalLength=0.;
   //  double hermJunction = .4;
-  double breakAngle = 11.*GeoModelKernelUnits::deg;
+  double breakAngle = 11.*Gaudi::Units::deg;
 
   double cooling_radius = 35.1;
-  double cooling_angle = -2.154*GeoModelKernelUnits::deg;
+  double cooling_angle = -2.154*Gaudi::Units::deg;
 
   if(m_gmt_mgr->PixelStaveAxe()==1)   
     {
       cooling_radius = 34.7 + layerRadius-33.25;
-      cooling_angle = -.1*GeoModelKernelUnits::deg;
+      cooling_angle = -.1*Gaudi::Units::deg;
     }
 
   double cable_radius = 36.501;
@@ -189,7 +190,7 @@ GeoVPhysVol* GeoPixelIBLFwdSvcModel1::Build()
 
 	// Cable
 	const GeoTube* cableShape = new GeoTube(rminCable, rmaxCable, zHalfLength);	
-	double angle = 0.; //11.*GeoModelKernelUnits::deg;
+	double angle = 0.; //11.*Gaudi::Units::deg;
 	GeoTrf::Transform3D trfA1 = GeoTrf::RotateZ3D(angle)*GeoTrf::TranslateZ3D(zpos-zMiddle);
 	gblShapeCableA = addShape(gblShapeCableA, cableShape, trfA1 );
 	GeoTrf::Transform3D trfC1 = GeoTrf::RotateZ3D(angle)*GeoTrf::TranslateZ3D(zMax-(zpos-zMin)-zMiddle);
diff --git a/InnerDetector/InDetDetDescr/PixelGeoModel/src/GeoPixelIFlexServices.cxx b/InnerDetector/InDetDetDescr/PixelGeoModel/src/GeoPixelIFlexServices.cxx
index 3463842e192ac70335d603eab8732c43d234d14c..136ae93f495104d888bc411b3b159da49b11bcf4 100644
--- a/InnerDetector/InDetDetDescr/PixelGeoModel/src/GeoPixelIFlexServices.cxx
+++ b/InnerDetector/InDetDetDescr/PixelGeoModel/src/GeoPixelIFlexServices.cxx
@@ -17,6 +17,7 @@
 #include "GeoModelKernel/GeoNameTag.h"
 
 #include "GeoModelKernel/GeoTransform.h"
+#include "GaudiKernel/SystemOfUnits.h"
 
 #include <algorithm>
 using std::max;
@@ -35,7 +36,7 @@ GeoVPhysVol* GeoPixelIFlexServices::Build()
 
   m_gmt_mgr->msg(MSG::INFO) <<"Build IBL I-Flex services"<<endmsg;
 
-  double safety = 0.01*GeoModelKernelUnits::mm;
+  double safety = 0.01*Gaudi::Units::mm;
 
   // IBL layer shift ( 2mm shift issue )
   double layerZshift = m_gmt_mgr->PixelLayerGlobalShift();
@@ -45,7 +46,7 @@ GeoVPhysVol* GeoPixelIFlexServices::Build()
 
   // check if sectors are properly defined
   if(nSectors==0) return 0;
-  double angle=360./(double)nSectors*GeoModelKernelUnits::deg;
+  double angle=360./(double)nSectors*Gaudi::Units::deg;
 
   double zmin=0., zmax=0.;
   double deltaLength = 0.;
@@ -108,12 +109,12 @@ GeoVPhysVol* GeoPixelIFlexServices::Build()
   double cooling_radius = 35.1;
   double TubeOuterDiam = m_gmt_mgr->IBLStaveTubeOuterDiameter();
   double TubeInnerDiam = m_gmt_mgr->IBLStaveTubeInnerDiameter();
-  double cooling_angle = -2.154*GeoModelKernelUnits::deg;
+  double cooling_angle = -2.154*Gaudi::Units::deg;
 
   if(m_gmt_mgr->PixelStaveAxe()==1)   
     {
       cooling_radius = 34.7 + layerRadius-33.25;
-      cooling_angle = -.1*GeoModelKernelUnits::deg;
+      cooling_angle = -.1*Gaudi::Units::deg;
     }
 
   const GeoTube* service_coolingPipeA = new GeoTube(0.0,TubeOuterDiam*0.5,halfLengthA);
@@ -145,9 +146,9 @@ GeoVPhysVol* GeoPixelIFlexServices::Build()
   GeoLogVol* flex_logVolA = 0;
   GeoLogVol* flex_logVolC = 0;
 
-  double flex_angle = -15.001*GeoModelKernelUnits::deg;
+  double flex_angle = -15.001*Gaudi::Units::deg;
   if(m_gmt_mgr->PixelStaveAxe()==1)   
-    flex_angle += 2.14*GeoModelKernelUnits::deg;
+    flex_angle += 2.14*Gaudi::Units::deg;
 
   double flex_rot=0.30265;
   flex_rot=-0.30265*.5;
@@ -244,12 +245,12 @@ GeoVPhysVol* GeoPixelIFlexServices::Build()
     if(m_section==2){
 
       // Intermediate flex
-      GeoTransform* xformA2 = new GeoTransform(GeoTrf::RotateZ3D(phiOfFlex)*GeoTrf::TranslateX3D(flexYmidPos)*GeoTrf::RotateZ3D(-90.*GeoModelKernelUnits::deg)*GeoTrf::RotateY3D(-90.*GeoModelKernelUnits::deg)*GeoTrf::RotateX3D(flex_rot));
+      GeoTransform* xformA2 = new GeoTransform(GeoTrf::RotateZ3D(phiOfFlex)*GeoTrf::TranslateX3D(flexYmidPos)*GeoTrf::RotateZ3D(-90.*Gaudi::Units::deg)*GeoTrf::RotateY3D(-90.*Gaudi::Units::deg)*GeoTrf::RotateX3D(flex_rot));
       m_supportPhysA->add(tag2);
       m_supportPhysA->add(xformA2);
       m_supportPhysA->add(flexPhysVolA);
 
-      GeoTransform* xformC2 = new GeoTransform(GeoTrf::RotateZ3D(phiOfFlex)*GeoTrf::TranslateX3D(flexYmidPos)*GeoTrf::RotateZ3D(-90.*GeoModelKernelUnits::deg)*GeoTrf::RotateY3D(90.*GeoModelKernelUnits::deg)*GeoTrf::RotateX3D(-flex_rot));
+      GeoTransform* xformC2 = new GeoTransform(GeoTrf::RotateZ3D(phiOfFlex)*GeoTrf::TranslateX3D(flexYmidPos)*GeoTrf::RotateZ3D(-90.*Gaudi::Units::deg)*GeoTrf::RotateY3D(90.*Gaudi::Units::deg)*GeoTrf::RotateX3D(-flex_rot));
       m_supportPhysC->add(tag2);
       m_supportPhysC->add(xformC2);
       m_supportPhysC->add(flexPhysVolC);
diff --git a/InnerDetector/InDetDetDescr/PixelGeoModel/src/GeoPixelLadder.cxx b/InnerDetector/InDetDetDescr/PixelGeoModel/src/GeoPixelLadder.cxx
index bcbc577a590b9c4df7b7792c4fb00159a00170cf..39c3e6ef0502d8bdff60b54a0a2888d216c88323 100644
--- a/InnerDetector/InDetDetDescr/PixelGeoModel/src/GeoPixelLadder.cxx
+++ b/InnerDetector/InDetDetDescr/PixelGeoModel/src/GeoPixelLadder.cxx
@@ -21,6 +21,8 @@
 #include "GeoModelKernel/GeoShapeShift.h"
 #include "GeoModelKernel/GeoShapeUnion.h"
 
+#include "GaudiKernel/PhysicalConstants.h"
+
 using std::max;
 
 GeoPixelLadder::GeoPixelLadder(GeoPixelSiCrystal& theSensor,
@@ -37,7 +39,7 @@ GeoPixelLadder::GeoPixelLadder(GeoPixelSiCrystal& theSensor,
   // Length of the ladder is in the db
   //
   double length = m_gmt_mgr->PixelLadderLength();
-  double safety = 0.01*GeoModelKernelUnits::mm; 
+  double safety = 0.01*Gaudi::Units::mm; 
 
   m_width = calcWidth();
   m_thicknessP = 0.5 * m_gmt_mgr->PixelLadderThickness();
@@ -58,7 +60,7 @@ GeoPixelLadder::GeoPixelLadder(GeoPixelSiCrystal& theSensor,
   const GeoShape * ladderShape = 0;
 
   // If upper and lower thicknesses are within 100 um. Make them the same.
-  if (std::abs(m_thicknessP - m_thicknessN) < 0.1*GeoModelKernelUnits::mm) {
+  if (std::abs(m_thicknessP - m_thicknessN) < 0.1*Gaudi::Units::mm) {
     m_thicknessP = std::max(m_thicknessP,m_thicknessN); 
     m_thicknessN = m_thicknessP;
     double halfThickness = m_thicknessP;
@@ -67,7 +69,7 @@ GeoPixelLadder::GeoPixelLadder(GeoPixelSiCrystal& theSensor,
   else if (m_gmt_mgr->PixelBentStaveNModule() != 0)
     {
       // Calculate thickness from bent stave part
-      double angle              = m_gmt_mgr->PixelLadderBentStaveAngle() * GeoModelKernelUnits::pi / 180.0;
+      double angle              = m_gmt_mgr->PixelLadderBentStaveAngle() * Gaudi::Units::pi / 180.0;
       double BentStaveThickness = double(m_gmt_mgr->PixelBentStaveNModule()) * m_gmt_mgr->PixelLadderModuleDeltaZ() * sin(angle);
       
       // Extend +ve or -ve ladder thickness according to stave angle
@@ -382,7 +384,7 @@ GeoVPhysVol* GeoPixelLadder::Build( ) {
       //      const GeoMaterial* materialSup = m_mat_mgr->getMaterialForVolume(matName,shapeSupBent->volume());
       const GeoMaterial* materialSup = m_mat_mgr->getMaterial("pix::StaveSupportBase");
       
-      double ang = m_gmt_mgr->PixelLadderBentStaveAngle() * GeoModelKernelUnits::pi / 180.0;
+      double ang = m_gmt_mgr->PixelLadderBentStaveAngle() * Gaudi::Units::pi / 180.0;
       double xst = xOffset - (bentStaveHalfLength * sin(ang)); 
       
       // Construct bent stave at negative z
@@ -415,7 +417,7 @@ double GeoPixelLadder::calcThickness() {
   // to avoid duplication of code
   //
 
-  const double safety = 0.01*GeoModelKernelUnits::mm; 
+  const double safety = 0.01*Gaudi::Units::mm; 
   double clearance = m_gmt_mgr->PixelLadderThicknessClearance();
   clearance = std::max(clearance, safety);
 
diff --git a/InnerDetector/InDetDetDescr/PixelGeoModel/src/GeoPixelLadderServices.cxx b/InnerDetector/InDetDetDescr/PixelGeoModel/src/GeoPixelLadderServices.cxx
index 1af721b80a5ef948804f08033688efc0e1a96bd4..517d424f197c7c2b45af3ae079f761a9c22ba315 100644
--- a/InnerDetector/InDetDetDescr/PixelGeoModel/src/GeoPixelLadderServices.cxx
+++ b/InnerDetector/InDetDetDescr/PixelGeoModel/src/GeoPixelLadderServices.cxx
@@ -18,6 +18,7 @@
 #include "GeoModelKernel/GeoTransform.h"
 #include "GeoModelKernel/GeoShapeShift.h"
 #include "GeoModelKernel/GeoShapeUnion.h"
+#include "GaudiKernel/PhysicalConstants.h"
 
 #include <cmath>
 #include <vector>
@@ -37,7 +38,7 @@ GeoPixelLadderServices::GeoPixelLadderServices(int ladderType)
   //
   //const GeoBox* ladderSvcBox = new GeoBox(thickness/2.,width/2.,halflength);
   // Quick fix - we hardwire the numbers. Need to work out a way to extract this from the database numbers.
-  double safety = 0.01*GeoModelKernelUnits::mm;
+  double safety = 0.01*Gaudi::Units::mm;
   double xBase = 0;
   
   // ConnA: Part to fit Connector
@@ -47,22 +48,22 @@ GeoPixelLadderServices::GeoPixelLadderServices(int ladderType)
   double xOffsetConnC = xOffsetConnA;
 
 
-  //double xMaxConnA = 1.250 * GeoModelKernelUnits::cm + xOffsetConnA + safety;
-  // double xMaxConnC = 1.6575 * GeoModelKernelUnits::cm + xOffsetConnC + safety;
+  //double xMaxConnA = 1.250 * Gaudi::Units::cm + xOffsetConnA + safety;
+  // double xMaxConnC = 1.6575 * Gaudi::Units::cm + xOffsetConnC + safety;
   // max offset is 12.5mm + 1/2 thickness of cables
-  //  double xMaxConnA = 1.5075 * GeoModelKernelUnits::cm + 0.5* 0.15*GeoModelKernelUnits::cm + xOffsetConnA + safety;
+  //  double xMaxConnA = 1.5075 * Gaudi::Units::cm + 0.5* 0.15*Gaudi::Units::cm + xOffsetConnA + safety;
   double xMaxConnA = m_gmt_mgr->PixelConnectorPosX(1) + 0.5*m_gmt_mgr->PixelConnectorWidthX(1)  + xOffsetConnA + safety;
-  double xMaxConnC = 1.25 * GeoModelKernelUnits::cm + 0.5* 0.0125*GeoModelKernelUnits::cm + xOffsetConnC + safety;
-  double xMaxOmegaBase = 0.055 * GeoModelKernelUnits::cm + xBase + 1*GeoModelKernelUnits::mm; // The 1 mm is just extra safety. 
-  double yWidthConnA = 1.0 * GeoModelKernelUnits::cm;
-  double yWidthConnC = 0.2 * GeoModelKernelUnits::cm;
+  double xMaxConnC = 1.25 * Gaudi::Units::cm + 0.5* 0.0125*Gaudi::Units::cm + xOffsetConnC + safety;
+  double xMaxOmegaBase = 0.055 * Gaudi::Units::cm + xBase + 1*Gaudi::Units::mm; // The 1 mm is just extra safety. 
+  double yWidthConnA = 1.0 * Gaudi::Units::cm;
+  double yWidthConnC = 0.2 * Gaudi::Units::cm;
   double yPosConnA =  m_gmt_mgr->PixelLadderCableOffsetY() - m_gmt_mgr->PixelLadderServicesY();
   double yPosConnC =  yPosConnA;
   double xCenter = 0;
   double xWidthOmegaBase = xMaxOmegaBase - xBase;
   double xWidthConnA = xMaxConnA - xBase;
   double xWidthConnC = xMaxConnC - xBase;
-  double yWidthOmega = 1.2*GeoModelKernelUnits::cm + m_epsilon;
+  double yWidthOmega = 1.2*Gaudi::Units::cm + m_epsilon;
 
   const GeoBox* omegaBaseEnv = new GeoBox(0.5*xWidthOmegaBase, 0.5*yWidthOmega, halflength);
   const GeoBox* connAEnv     = new GeoBox(0.5*xWidthConnA, 0.5*yWidthConnA + safety, halflength);
@@ -98,7 +99,7 @@ GeoPixelLadderServices::~GeoPixelLadderServices(){
 GeoVPhysVol* GeoPixelLadderServices::Build() {
   GeoPhysVol* ladderSvcPhys = new GeoPhysVol(m_ladderServicesLV);
   //double thickness = m_gmt_mgr->PixelLadderThickness()+m_gmt_mgr->PixelCableThickness();
-  //double thickness = m_gmt_mgr->PixelLadderThickness() + m_gmt_mgr->PixelCableThickness() + 0.25*GeoModelKernelUnits::cm; // plus 0.25 cm New DC3 ???
+  //double thickness = m_gmt_mgr->PixelLadderThickness() + m_gmt_mgr->PixelCableThickness() + 0.25*Gaudi::Units::cm; // plus 0.25 cm New DC3 ???
   //double thickness = m_gmt_mgr->PixelLadderThickness()+ 6.5;  // m_gmt_mgr->PixelCableThickness() was 0.4 cm, plus 0.25 cm New DC3
   //
   // The Glue
@@ -154,16 +155,16 @@ GeoVPhysVol* GeoPixelLadderServices::BuildOmega() {
   double xOffset = m_xOffset;
   double yOffset = m_yOffset;
   /*
-  double xUpperBend = xOffset + 2.9*GeoModelKernelUnits::mm;
+  double xUpperBend = xOffset + 2.9*Gaudi::Units::mm;
   double yUpperBend = yOffset + 0;
-  double radUpperBend = 2.3*GeoModelKernelUnits::mm; 
+  double radUpperBend = 2.3*Gaudi::Units::mm; 
   double xLowerBend = xOffset + 0.9;
-  double yLowerBend = yOffset + 3.35*GeoModelKernelUnits::mm;
-  double radLowerBend = 0.8*GeoModelKernelUnits::mm; 
-  double yStart= yOffset + (4.675+0.5*2.65)*GeoModelKernelUnits::mm;
+  double yLowerBend = yOffset + 3.35*Gaudi::Units::mm;
+  double radLowerBend = 0.8*Gaudi::Units::mm; 
+  double yStart= yOffset + (4.675+0.5*2.65)*Gaudi::Units::mm;
   double yEnd =  yOffset -yStart;
-  double thick = 0.3*GeoModelKernelUnits::mm;
-  double length = 816*GeoModelKernelUnits::mm;
+  double thick = 0.3*Gaudi::Units::mm;
+  double length = 816*Gaudi::Units::mm;
   double zOffset = 0;
   */
   double xUpperBend = xOffset + m_gmt_mgr->PixelOmegaUpperBendX();
@@ -192,13 +193,13 @@ GeoVPhysVol* GeoPixelLadderServices::BuildOmega() {
 
 
   // Tube sector for upper bend
-  GeoTubs * upperBendShape = new GeoTubs(radUpperBend - thick, radUpperBend, 0.5* length, alpha-0.5*GeoModelKernelUnits::pi, GeoModelKernelUnits::pi - 2*alpha);
+  GeoTubs * upperBendShape = new GeoTubs(radUpperBend - thick, radUpperBend, 0.5* length, alpha-0.5*Gaudi::Units::pi, Gaudi::Units::pi - 2*alpha);
 
   // Tube sector for lower bend (+y)
-  GeoTubs * lowerBendShapeP = new GeoTubs(radLowerBend - thick, radLowerBend, 0.5* length, GeoModelKernelUnits::pi, 0.5*GeoModelKernelUnits::pi-alpha);
+  GeoTubs * lowerBendShapeP = new GeoTubs(radLowerBend - thick, radLowerBend, 0.5* length, Gaudi::Units::pi, 0.5*Gaudi::Units::pi-alpha);
 
   // Tube sector for lower bend (-y)
-  GeoTubs * lowerBendShapeM = new GeoTubs(radLowerBend - thick, radLowerBend, 0.5* length, 0.5*GeoModelKernelUnits::pi + alpha, 0.5*GeoModelKernelUnits::pi-alpha);
+  GeoTubs * lowerBendShapeM = new GeoTubs(radLowerBend - thick, radLowerBend, 0.5* length, 0.5*Gaudi::Units::pi + alpha, 0.5*Gaudi::Units::pi-alpha);
  
   // Lower Straight section (+y)
   GeoBox * lowerStraightBoxP = new GeoBox(0.5*thick, 0.5*(yStart - yLowerBend), 0.5*length);
@@ -213,9 +214,9 @@ GeoVPhysVol* GeoPixelLadderServices::BuildOmega() {
   const GeoShape & omegaShape = 
     (*lowerStraightBoxP     << GeoTrf::Translate3D(xLowerBend-radLowerBend+0.5*thick,0.5*(yLowerBend+yStart),zOffset) )
     .add(*lowerBendShapeP   << GeoTrf::Translate3D(xLowerBend,yLowerBend,zOffset) )
-    .add(*upperStraightBox  << GeoTrf::Translate3D(0.5*(xLowerStraight+xUpperStraight),0.5*(yLowerStraight+yUpperStraight),zOffset)*GeoTrf::RotateZ3D(0.5*GeoModelKernelUnits::pi-alpha) )
+    .add(*upperStraightBox  << GeoTrf::Translate3D(0.5*(xLowerStraight+xUpperStraight),0.5*(yLowerStraight+yUpperStraight),zOffset)*GeoTrf::RotateZ3D(0.5*Gaudi::Units::pi-alpha) )
     .add(*upperBendShape    << GeoTrf::Translate3D(xUpperBend,yUpperBend,zOffset) )
-    .add(*upperStraightBox  << GeoTrf::Translate3D(0.5*(xLowerStraight+xUpperStraight),-0.5*(yLowerStraight+yUpperStraight),zOffset)*GeoTrf::RotateZ3D(0.5*GeoModelKernelUnits::pi+alpha) )
+    .add(*upperStraightBox  << GeoTrf::Translate3D(0.5*(xLowerStraight+xUpperStraight),-0.5*(yLowerStraight+yUpperStraight),zOffset)*GeoTrf::RotateZ3D(0.5*Gaudi::Units::pi+alpha) )
     .add(*lowerBendShapeM   << GeoTrf::Translate3D(xLowerBend,-yLowerBend,zOffset) )
     .add(*lowerStraightBoxM << GeoTrf::Translate3D(xLowerBend-radLowerBend+0.5*thick,0.5*(-yLowerBend+yEnd),zOffset) );
 
@@ -240,14 +241,14 @@ GeoVPhysVol* GeoPixelLadderServices::BuildAlTube() {
   double yOffset = m_yOffset;
 
   /*
-  double xUpperBend = xOffset + 2.7*GeoModelKernelUnits::mm;
+  double xUpperBend = xOffset + 2.7*Gaudi::Units::mm;
   double yUpperBend = yOffset;
-  double radUpperBend = 2.0*GeoModelKernelUnits::mm; 
+  double radUpperBend = 2.0*Gaudi::Units::mm; 
   double xLowerBend = xOffset + 0.55;
-  double yLowerBend = yOffset+1.925*GeoModelKernelUnits::mm;
-  double radLowerBend = 0.5*GeoModelKernelUnits::mm; 
-  double thick = 0.2*GeoModelKernelUnits::mm;
-  double length = 838*GeoModelKernelUnits::mm;
+  double yLowerBend = yOffset+1.925*Gaudi::Units::mm;
+  double radLowerBend = 0.5*Gaudi::Units::mm; 
+  double thick = 0.2*Gaudi::Units::mm;
+  double length = 838*Gaudi::Units::mm;
   double zOffset = 0;
   */
 
@@ -275,13 +276,13 @@ GeoVPhysVol* GeoPixelLadderServices::BuildAlTube() {
 
 
   // Tube sector for upper bend
-  GeoTubs * upperBendShape = new GeoTubs(radUpperBend - thick, radUpperBend, 0.5* length, alpha-0.5*GeoModelKernelUnits::pi, GeoModelKernelUnits::pi - 2*alpha);
+  GeoTubs * upperBendShape = new GeoTubs(radUpperBend - thick, radUpperBend, 0.5* length, alpha-0.5*Gaudi::Units::pi, Gaudi::Units::pi - 2*alpha);
 
   // Tube sector for lower bend (+y)
-  GeoTubs * lowerBendShapeP = new GeoTubs(radLowerBend - thick, radLowerBend, 0.5* length, 0.5*GeoModelKernelUnits::pi-alpha, 0.5*GeoModelKernelUnits::pi+alpha);
+  GeoTubs * lowerBendShapeP = new GeoTubs(radLowerBend - thick, radLowerBend, 0.5* length, 0.5*Gaudi::Units::pi-alpha, 0.5*Gaudi::Units::pi+alpha);
 
   // Tube sector for lower bend (-y)
-  GeoTubs * lowerBendShapeM = new GeoTubs(radLowerBend - thick, radLowerBend, 0.5* length, GeoModelKernelUnits::pi, 0.5*GeoModelKernelUnits::pi+alpha);
+  GeoTubs * lowerBendShapeM = new GeoTubs(radLowerBend - thick, radLowerBend, 0.5* length, Gaudi::Units::pi, 0.5*Gaudi::Units::pi+alpha);
  
   // Lower Straight section 
   GeoBox * lowerStraightBox = new GeoBox(0.5*thick, yLowerBend, 0.5*length);
@@ -293,9 +294,9 @@ GeoVPhysVol* GeoPixelLadderServices::BuildAlTube() {
   const GeoShape & alTubeShape = 
     (*lowerStraightBox      << GeoTrf::Translate3D(xLowerBend-radLowerBend+0.5*thick,0,zOffset) )
     .add(*lowerBendShapeP   << GeoTrf::Translate3D(xLowerBend,yLowerBend,zOffset) )
-    .add(*upperStraightBox  << GeoTrf::Translate3D(0.5*(xLowerStraight+xUpperStraight),0.5*(yLowerStraight+yUpperStraight),zOffset)*GeoTrf::RotateZ3D(0.5*GeoModelKernelUnits::pi-alpha) )
+    .add(*upperStraightBox  << GeoTrf::Translate3D(0.5*(xLowerStraight+xUpperStraight),0.5*(yLowerStraight+yUpperStraight),zOffset)*GeoTrf::RotateZ3D(0.5*Gaudi::Units::pi-alpha) )
     .add(*upperBendShape    << GeoTrf::Translate3D(xUpperBend,yUpperBend,zOffset) )
-    .add(*upperStraightBox  << GeoTrf::Translate3D(0.5*(xLowerStraight+xUpperStraight),-0.5*(yLowerStraight+yUpperStraight),zOffset)*GeoTrf::RotateZ3D(0.5*GeoModelKernelUnits::pi+alpha) )
+    .add(*upperStraightBox  << GeoTrf::Translate3D(0.5*(xLowerStraight+xUpperStraight),-0.5*(yLowerStraight+yUpperStraight),zOffset)*GeoTrf::RotateZ3D(0.5*Gaudi::Units::pi+alpha) )
     .add(*lowerBendShapeM   << GeoTrf::Translate3D(xLowerBend,-yLowerBend,zOffset) );
 
   double totVolume = 
diff --git a/InnerDetector/InDetDetDescr/PixelGeoModel/src/GeoPixelLayer.cxx b/InnerDetector/InDetDetDescr/PixelGeoModel/src/GeoPixelLayer.cxx
index 8e103b87779df90b75e9fe0239792a079c188a6a..80d2d00918bf5e795753fdbc2f2cd958ee3c723e 100644
--- a/InnerDetector/InDetDetDescr/PixelGeoModel/src/GeoPixelLayer.cxx
+++ b/InnerDetector/InDetDetDescr/PixelGeoModel/src/GeoPixelLayer.cxx
@@ -30,6 +30,7 @@
 
 #include "GeoModelKernel/GeoTubs.h"
 #include "GeoModelKernel/GeoPhysVol.h"
+#include "GaudiKernel/SystemOfUnits.h"
 
 #include <sstream>
 
@@ -304,7 +305,7 @@ GeoVPhysVol* GeoPixelLayer::Build() {
   //
   // Layer dimensions from above, etc
   //
-  double safety = 0.01 * GeoModelKernelUnits::mm;
+  double safety = 0.01 * Gaudi::Units::mm;
   double rmin =  m_gmt_mgr->PixelLayerRadius()-layerThicknessN - safety;
   double rmax =  m_gmt_mgr->PixelLayerRadius()+layerThicknessP + safety;
   double length = m_gmt_mgr->PixelLadderLength() + 4*m_epsilon; // Ladder has length m_gmt_mgr->PixelLadderLength() +  2*m_epsilon
@@ -315,7 +316,7 @@ GeoVPhysVol* GeoPixelLayer::Build() {
   if(m_gmt_mgr->GetLD()==0&&m_gmt_mgr->ibl()&&m_gmt_mgr->PixelStaveLayout()>3&&m_gmt_mgr->PixelStaveLayout()<8)
     {
       bAddIBLStaveRings=true;
-      double safety = 0.001 * GeoModelKernelUnits::mm;
+      double safety = 0.001 * Gaudi::Units::mm;
       double outerRadius = m_gmt_mgr->IBLSupportMidRingInnerRadius();  
       rmax=outerRadius-safety;
 
@@ -346,7 +347,7 @@ GeoVPhysVol* GeoPixelLayer::Build() {
   //
   // A few variables needed below
   //  
-  double angle=(nSectors>0)?(360./(double)nSectors)*GeoModelKernelUnits::deg:(360.*GeoModelKernelUnits::deg);
+  double angle=(nSectors>0)?(360./(double)nSectors)*Gaudi::Units::deg:(360.*Gaudi::Units::deg);
   GeoTrf::Transform3D transRadiusAndTilt = GeoTrf::TranslateX3D(layerRadius)*GeoTrf::RotateZ3D(ladderTilt);
   double phiOfModuleZero =  m_gmt_mgr->PhiOfModuleZero();
 
diff --git a/InnerDetector/InDetDetDescr/PixelGeoModel/src/GeoPixelModule.cxx b/InnerDetector/InDetDetDescr/PixelGeoModel/src/GeoPixelModule.cxx
index 9f0fb3b103fee2b94f8b5894d0131a9d0d247733..e2f9223d32552811e37f3daf59c4668041cbf444 100644
--- a/InnerDetector/InDetDetDescr/PixelGeoModel/src/GeoPixelModule.cxx
+++ b/InnerDetector/InDetDetDescr/PixelGeoModel/src/GeoPixelModule.cxx
@@ -16,6 +16,7 @@
 #include "GeoModelKernel/GeoTransform.h"
 #include "GeoModelKernel/GeoShapeShift.h"
 #include "GeoModelKernel/GeoShapeUnion.h"
+#include "GaudiKernel/SystemOfUnits.h"
 
 using std::max;
 
@@ -137,7 +138,7 @@ GeoVPhysVol* GeoPixelModule::Build( ) {
   //
   // Place the Hybrid
   //
-  if (m_gmt_mgr->PixelHybridThickness(m_isModule3D)>0.00001*GeoModelKernelUnits::mm){
+  if (m_gmt_mgr->PixelHybridThickness(m_isModule3D)>0.00001*Gaudi::Units::mm){
     GeoPixelHybrid ph(m_isModule3D);
     double hybxpos = -0.5*(m_gmt_mgr->PixelBoardThickness(m_isModule3D)+m_gmt_mgr->PixelHybridThickness(m_isModule3D));
     GeoTransform* xform = new GeoTransform(GeoTrf::TranslateX3D(hybxpos));
@@ -200,7 +201,7 @@ double GeoPixelModule::ThicknessN_noSvc() {
   // is the max of ThicknessP and thickness from the module center to
   // the outer surface of the hybrid plus some safety.
   //
-  double safety = 0.01*GeoModelKernelUnits::mm; 
+  double safety = 0.01*Gaudi::Units::mm; 
   double thickn = 0.5 * m_gmt_mgr->PixelBoardThickness(m_isModule3D)+ m_gmt_mgr->PixelHybridThickness(m_isModule3D) + safety;
   double thick = max(thickn, ThicknessP()); 
   
@@ -234,7 +235,7 @@ double GeoPixelModule::ThicknessN() {
   //
 
 
-  double safety = 0.01*GeoModelKernelUnits::mm; 
+  double safety = 0.01*Gaudi::Units::mm; 
   double thickn = 0.5 * m_gmt_mgr->PixelBoardThickness(m_isModule3D)+ m_gmt_mgr->PixelHybridThickness(m_isModule3D) + safety;
   double thick = max(thickn, ThicknessP()); 
 
@@ -265,7 +266,7 @@ double GeoPixelModule::ThicknessP() {
   // is thickness from the module center to the outer surface of the
   // chips plus some safety.
 
-  double safety = 0.01*GeoModelKernelUnits::mm;
+  double safety = 0.01*Gaudi::Units::mm;
   double thick = 0.5 * m_gmt_mgr->PixelBoardThickness(m_isModule3D) +
     m_gmt_mgr->PixelChipThickness(m_isModule3D)+m_gmt_mgr->PixelChipGap(m_isModule3D) + safety;
 
diff --git a/InnerDetector/InDetDetDescr/PixelGeoModel/src/GeoPixelOldFrame.cxx b/InnerDetector/InDetDetDescr/PixelGeoModel/src/GeoPixelOldFrame.cxx
index e50c4ccec30f04d962a2a7522e771f52c65625df..5877c11627df7e0475c9f16bc06d4f25cccba03e 100644
--- a/InnerDetector/InDetDetDescr/PixelGeoModel/src/GeoPixelOldFrame.cxx
+++ b/InnerDetector/InDetDetDescr/PixelGeoModel/src/GeoPixelOldFrame.cxx
@@ -16,6 +16,7 @@
 #include "GeoModelKernel/GeoFullPhysVol.h"
 #include "GeoModelKernel/GeoMaterial.h"
 #include "GeoModelKernel/GeoTransform.h"
+#include "GaudiKernel/SystemOfUnits.h"
 
 // Satisfy interface
 
@@ -113,7 +114,7 @@ void GeoPixelOldFrame::BuildInBarrel(GeoFullPhysVol * parent) {
   
   // First part
   m_legacyManager->setBarrelInSFrame();
-  double alpha = 45.*GeoModelKernelUnits::deg;
+  double alpha = 45.*Gaudi::Units::deg;
   double w1    = m_legacyManager->PixelBarrelBFrameWidth();
   double w2    = m_legacyManager->PixelBarrelTFrameWidth();
   double off   = m_legacyManager->PixelBarrelFrameOffset();
@@ -206,7 +207,7 @@ void GeoPixelOldFrame::BuildOutBarrel(GeoFullPhysVol * parent) {
   // Add the pixel frame inside the endcap volume
   //
   m_legacyManager->setEndcapInSFrame();
-  double alpha = 45.*GeoModelKernelUnits::deg;
+  double alpha = 45.*Gaudi::Units::deg;
   double w1    = m_legacyManager->PixelEndcapBFrameWidth();
   double w2    = m_legacyManager->PixelEndcapTFrameWidth();
   double off   = m_legacyManager->PixelEndcapFrameOffset()+m_legacyManager->PixelEndcapFrameLength();
diff --git a/InnerDetector/InDetDetDescr/PixelGeoModel/src/GeoPixelRingSLHC.cxx b/InnerDetector/InDetDetDescr/PixelGeoModel/src/GeoPixelRingSLHC.cxx
index 01ace765ff7d7e445f6bc01cb50c1fb946bf7223..ca402ad4db54359b9d3fc8f70d7874a932975659 100644
--- a/InnerDetector/InDetDetDescr/PixelGeoModel/src/GeoPixelRingSLHC.cxx
+++ b/InnerDetector/InDetDetDescr/PixelGeoModel/src/GeoPixelRingSLHC.cxx
@@ -16,6 +16,7 @@
 #include "GeoModelKernel/GeoMaterial.h"
 #include "GeoModelKernel/GeoTransform.h"
 #include "GeoModelKernel/GeoAlignableTransform.h"
+#include "GaudiKernel/SystemOfUnits.h"
 
 #include "InDetReadoutGeometry/PixelDetectorManager.h"
 //#include <string>
@@ -42,8 +43,8 @@ GeoVPhysVol* GeoPixelRingSLHC::Build() {
   //(sar) Original block was in c'tor...
   // Dimensions from class methods
   //
-  double rmin = m_gmt_mgr->PixelRingRMin(); // Default is 0.01 GeoModelKernelUnits::mm safety added
-  double rmax = m_gmt_mgr->PixelRingRMax(); // Default is 0.01 GeoModelKernelUnits::mm safety added
+  double rmin = m_gmt_mgr->PixelRingRMin(); // Default is 0.01 Gaudi::Units::mm safety added
+  double rmax = m_gmt_mgr->PixelRingRMax(); // Default is 0.01 Gaudi::Units::mm safety added
   double halflength = m_gmt_mgr->PixelRingThickness()/2.;
   const GeoMaterial* air = m_mat_mgr->getMaterial("std::Air");
   const GeoTube* ringTube = new GeoTube(rmin,rmax,halflength);
@@ -60,7 +61,7 @@ GeoVPhysVol* GeoPixelRingSLHC::Build() {
   if(nmodules==0) return ringPhys;
 
   // deltaPhi is angle between two adjacent modules regardless of side of the disk
-  double deltaPhi = 360.*GeoModelKernelUnits::deg / (double)nmodules;
+  double deltaPhi = 360.*Gaudi::Units::deg / (double)nmodules;
 
   // This is the start angle of the even modules
   // Start angle could eventually come from the database...
@@ -99,8 +100,8 @@ GeoVPhysVol* GeoPixelRingSLHC::Build() {
 
     double angle = imod*deltaPhi+startAngle;
 
-    GeoTrf::Transform3D rm = GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg);
-    if( m_gmt_mgr->isDiskBack() ) rm = rm * GeoTrf::RotateX3D(180.*GeoModelKernelUnits::deg);
+    GeoTrf::Transform3D rm = GeoTrf::RotateY3D(90*Gaudi::Units::deg);
+    if( m_gmt_mgr->isDiskBack() ) rm = rm * GeoTrf::RotateX3D(180.*Gaudi::Units::deg);
     rm = rm * GeoTrf::RotateZ3D(angle);
 
     GeoTrf::Vector3D pos(moduleRadius,0,zpos);
diff --git a/InnerDetector/InDetDetDescr/PixelGeoModel/src/GeoPixelServices.cxx b/InnerDetector/InDetDetDescr/PixelGeoModel/src/GeoPixelServices.cxx
index 30aaf37b6dc521f8df3db7f93f5d43d71edee5f8..00f1c9f2b75afe0b22e412a2fbffc4df534b105c 100644
--- a/InnerDetector/InDetDetDescr/PixelGeoModel/src/GeoPixelServices.cxx
+++ b/InnerDetector/InDetDetDescr/PixelGeoModel/src/GeoPixelServices.cxx
@@ -34,7 +34,7 @@
 // TUBS
 //   Ignored: RIN2,ROUT2
 //   PHI: phi start location of tube sector
-//   WIDTH (GeoModelKernelUnits::deg): phi width of sector  
+//   WIDTH (Gaudi::Units::deg): phi width of sector  
 //   REPEAT: Repeat the tube sector this many times in phi with equal distance between them.
 // CONS, CONE
 //   WIDTH,REPEAT ignored if CONE
@@ -72,30 +72,30 @@
 //   Ignored: ROUT, RIN2, ROUT2
 //   RIN: Radial position of center of tube
 //   PHI: phi position of center
-//   WIDTH (GeoModelKernelUnits::mm): diameter 
+//   WIDTH (Gaudi::Units::mm): diameter 
 //   REPEAT: Repeat this many times in phi with equal distance between them.
 // ROD2
 //   Ignored: ROUT, RIN2, ROUT2
 //   RIN: Radial position of center of tube
 //   PHI: phi position of center
-//   WIDTH (GeoModelKernelUnits::mm): diameter 
+//   WIDTH (Gaudi::Units::mm): diameter 
 //   REPEAT: Repeat this many times in phi with equal distance between them.
 // BOX
 //   Ignored: RIN2, ROUT2
 //   ROUT-RIN = thickness of box (radially)
 //   (RIN+ROUT)/2 = radial poistion of center of box
 //   PHI: phi position of center
-//   WIDTH (GeoModelKernelUnits::mm) = width of box
+//   WIDTH (Gaudi::Units::mm) = width of box
 //   REPEAT: Repeat this many times in phi with equal distance between them.
 // TRAP
 //   Ignored: RIN2, ROUT2
 //   ROUT-RIN = thickness of trapezoid (radially)
 //   (RIN+ROUT)/2 = radial poistion of center of trapzoid
 //   PHI: phi position of center
-//   WIDTH (GeoModelKernelUnits::mm) = width of trapezoid at center
+//   WIDTH (Gaudi::Units::mm) = width of trapezoid at center
 //   REPEAT: Repeat this many times in phi with equal distance between them.
 //
-//   **IMPORTANT NOTE** WIDTH can be in degrees or GeoModelKernelUnits::mm. See OraclePixGeoManager
+//   **IMPORTANT NOTE** WIDTH can be in degrees or Gaudi::Units::mm. See OraclePixGeoManager
 
 
 #include "GeoPixelServices.h"
@@ -104,7 +104,7 @@
 #include "InDetGeoModelUtils/ServiceVolume.h"
 #include "InDetGeoModelUtils/ServiceVolumeMaker.h"
 #include "InDetGeoModelUtils/IInDetServMatBuilderTool.h"
-
+#include "GaudiKernel/PhysicalConstants.h"
 
 #include <sstream>
 #include <iomanip>
@@ -206,7 +206,7 @@ GeoPixelServices::GeoPixelServices(InDetDD::Zone * pixZone)
     std::vector<const InDetDD::ServiceVolume *> servicesOutPix;
     double svc3_rMin = 99999., svc3_rMax = 0.;
     std::vector<const InDetDD::ServiceVolume *> servicesOther;
-    double safety=0.001*GeoModelKernelUnits::mm;
+    double safety=0.001*Gaudi::Units::mm;
 
     for(std::vector<const InDetDD::ServiceVolume *>::const_iterator it=services.begin(); it!=services.end(); it++)
       {
@@ -403,15 +403,15 @@ void GeoPixelServices::initializeOld(const std::string & a)
       double phiLoc =  m_gmt_mgr->PixelServicePhiLoc(a, ii);
       double phiWidth =  m_gmt_mgr->PixelServiceWidth(a, ii);
       
-      // Can be in degree or GeoModelKernelUnits::mm. Usually it is GeoModelKernelUnits::deg expect for BOX, TRAP and ROD shape
+      // Can be in degree or Gaudi::Units::mm. Usually it is Gaudi::Units::deg expect for BOX, TRAP and ROD shape
       // Geometry manager makes no assumptions about units. So we must interpret here.
       if (shapeType == "BOX" || shapeType == "ROD" || shapeType == "ROD2" || shapeType == "TRAP") {
-	phiWidth *= GeoModelKernelUnits::mm;
+	phiWidth *= Gaudi::Units::mm;
       } else {
-	phiWidth *= GeoModelKernelUnits::degree;
+	phiWidth *= Gaudi::Units::degree;
       }
       
-      if (phiWidth == 0) phiWidth = 2*GeoModelKernelUnits::pi;
+      if (phiWidth == 0) phiWidth = 2*Gaudi::Units::pi;
       if (rmin2 <= 0) rmin2 = param.rmin(); 
       if (rmax2 <= 0) rmax2 = param.rmax(); 
       if (repeat == 0) repeat = 1;
diff --git a/InnerDetector/InDetDetDescr/PixelGeoModel/src/GeoPixelSiCrystal.cxx b/InnerDetector/InDetDetDescr/PixelGeoModel/src/GeoPixelSiCrystal.cxx
index 57fc49f96acbb47748d8450229d1672b8c5a50a6..23e8519e37ff58acae2177866f3717cffe58aa2a 100644
--- a/InnerDetector/InDetDetDescr/PixelGeoModel/src/GeoPixelSiCrystal.cxx
+++ b/InnerDetector/InDetDetDescr/PixelGeoModel/src/GeoPixelSiCrystal.cxx
@@ -16,6 +16,7 @@
 #include "GeoModelKernel/GeoLogVol.h"
 #include "GeoModelKernel/GeoFullPhysVol.h"
 #include "GeoModelKernel/GeoMaterial.h"
+#include "GaudiKernel/SystemOfUnits.h"
 #include "Identifier/Identifier.h"
 #include "InDetIdentifier/PixelID.h"
 #include "InDetReadoutGeometry/PixelDetectorManager.h"
@@ -109,17 +110,17 @@ GeoPixelSiCrystal::GeoPixelSiCrystal(bool isBLayer, bool isModule3D)
 
   if ( (m_gmt_mgr->DesignRPActiveArea(m_isModule3D) > width) ||
        (m_gmt_mgr->DesignZActiveArea(m_isModule3D) >  length) || 
-       (width - m_gmt_mgr->DesignRPActiveArea(m_isModule3D) > 4 * GeoModelKernelUnits::mm) || 
-       (length - m_gmt_mgr->DesignZActiveArea(m_isModule3D) > 4 * GeoModelKernelUnits::mm) ) { 
+       (width - m_gmt_mgr->DesignRPActiveArea(m_isModule3D) > 4 * Gaudi::Units::mm) || 
+       (length - m_gmt_mgr->DesignZActiveArea(m_isModule3D) > 4 * Gaudi::Units::mm) ) { 
     m_gmt_mgr->msg(MSG::WARNING) << "GeoPixelSiCrystal: Active area not consistent with sensor size. Sensor: " 
-			       << width/GeoModelKernelUnits::mm << " x " << length/GeoModelKernelUnits::mm << ", Active: " 
-			       << m_gmt_mgr->DesignRPActiveArea(m_isModule3D)/GeoModelKernelUnits::mm << " x " << m_gmt_mgr->DesignZActiveArea(m_isModule3D)/GeoModelKernelUnits::mm 
+			       << width/Gaudi::Units::mm << " x " << length/Gaudi::Units::mm << ", Active: " 
+			       << m_gmt_mgr->DesignRPActiveArea(m_isModule3D)/Gaudi::Units::mm << " x " << m_gmt_mgr->DesignZActiveArea(m_isModule3D)/Gaudi::Units::mm 
 			       << endmsg;
   } else {
     if (m_gmt_mgr->msgLvl(MSG::DEBUG)) m_gmt_mgr->msg(MSG::DEBUG) 
       << "GeoPixelSiCrystal: Sensor: "  
-      << width/GeoModelKernelUnits::mm << " x " << length/GeoModelKernelUnits::mm << ", Active: " 
-      << m_gmt_mgr->DesignRPActiveArea(m_isModule3D)/GeoModelKernelUnits::mm << " x " << m_gmt_mgr->DesignZActiveArea(m_isModule3D)/GeoModelKernelUnits::mm 
+      << width/Gaudi::Units::mm << " x " << length/Gaudi::Units::mm << ", Active: " 
+      << m_gmt_mgr->DesignRPActiveArea(m_isModule3D)/Gaudi::Units::mm << " x " << m_gmt_mgr->DesignZActiveArea(m_isModule3D)/Gaudi::Units::mm 
       << endmsg;		       
   }
 
diff --git a/InnerDetector/InDetDetDescr/PixelGeoModel/src/GeoPixelStaveRing.cxx b/InnerDetector/InDetDetDescr/PixelGeoModel/src/GeoPixelStaveRing.cxx
index f949df028596d1ff62268a03087b0e29af96ced9..da3635267f176c0b398e42b54573b3b6489923ec 100644
--- a/InnerDetector/InDetDetDescr/PixelGeoModel/src/GeoPixelStaveRing.cxx
+++ b/InnerDetector/InDetDetDescr/PixelGeoModel/src/GeoPixelStaveRing.cxx
@@ -17,7 +17,7 @@
 #include "GeoModelKernel/GeoPhysVol.h"
 #include "GeoModelKernel/GeoMaterial.h"
 #include "GeoModelKernel/GeoNameTag.h"
-
+#include "GaudiKernel/SystemOfUnits.h"
 
 #include <algorithm>
 using std::max;
@@ -48,7 +48,7 @@ GeoVPhysVol* GeoPixelStaveRing::Build(){
 
   m_gmt_mgr->msg(MSG::INFO) <<"Build detailed stave ring support : "<<m_ringName<<"  "<<m_ringPosition<<endmsg;
 
-  double safety = 0.001*GeoModelKernelUnits::mm; 
+  double safety = 0.001*Gaudi::Units::mm; 
   bool isBLayer = false;
   if(m_gmt_mgr->GetLD() == 0) isBLayer = true;
   GeoPixelSiCrystal theSensor(isBLayer);
diff --git a/InnerDetector/InDetDetDescr/PixelGeoModel/src/GeoPixelStaveRingServices.cxx b/InnerDetector/InDetDetDescr/PixelGeoModel/src/GeoPixelStaveRingServices.cxx
index 66130eeedae9448060317632bd3619ce2b5084d2..65f14b9acfb7ff525b05a25d4186a44c28697765 100644
--- a/InnerDetector/InDetDetDescr/PixelGeoModel/src/GeoPixelStaveRingServices.cxx
+++ b/InnerDetector/InDetDetDescr/PixelGeoModel/src/GeoPixelStaveRingServices.cxx
@@ -19,6 +19,7 @@
 #include "GeoModelKernel/GeoNameTag.h"
 
 #include "GeoModelKernel/GeoTransform.h"
+#include "GaudiKernel/SystemOfUnits.h"
 
 #include <algorithm>
 using std::max;
@@ -43,7 +44,7 @@ GeoVPhysVol* GeoPixelStaveRingServices::Build()
 
   double ladderHalfThickN = m_ladder.thicknessN();
   double ladderHalfThickP = m_ladder.thicknessP();
-  double safetyMargin = 0.001*GeoModelKernelUnits::mm;
+  double safetyMargin = 0.001*Gaudi::Units::mm;
 
   // Get endblock from m_staveSupport
   GeoPhysVol* endblockA=dynamic_cast<GeoPhysVol*>(m_staveSupport.getEndblockEnvelopShape(2));
@@ -109,7 +110,7 @@ GeoVPhysVol* GeoPixelStaveRingServices::Build()
   }
   else {
 
-    double angle=360./nSectors*GeoModelKernelUnits::deg;
+    double angle=360./nSectors*Gaudi::Units::deg;
     GeoTrf::Transform3D transRadiusAndTilt = GeoTrf::TranslateX3D(layerRadius)*GeoTrf::RotateZ3D(ladderTilt);
     double phiOfModuleZero =  m_gmt_mgr->PhiOfModuleZero();
 
@@ -208,7 +209,7 @@ GeoVPhysVol* GeoPixelStaveRingServices::Build()
 	double dimX=dimX_lin/cos(alpha1)-.15;
 	double dimY=m_gmt_mgr->IBLStaveFlexWidth();
 	double dimZ=m_gmt_mgr->IBLStaveFlexBaseThickness();
-	double angle=90.*GeoModelKernelUnits::deg-alpha1;   //90.-27.99;
+	double angle=90.*Gaudi::Units::deg-alpha1;   //90.-27.99;
 	double delta=m_gmt_mgr->IBLFlexDoglegDY();
 	double trX=-dimX_lin*tan(alpha1)*0.5;   //-3.28;
 	double trZ=eoStave+dimX_lin*0.5;
@@ -222,7 +223,7 @@ GeoVPhysVol* GeoPixelStaveRingServices::Build()
 	for(unsigned int iPt=0; iPt<xShape.size(); iPt++) tmp_shape->addVertex(xShape[iPt],yShape[iPt]);
 	
 	
-	//	GeoPara * tmp_shape = new GeoPara(0.47,5.5,9.,0.*GeoModelKernelUnits::deg,55.*GeoModelKernelUnits::deg,0.);
+	//	GeoPara * tmp_shape = new GeoPara(0.47,5.5,9.,0.*Gaudi::Units::deg,55.*Gaudi::Units::deg,0.);
 	std::string flexMatName = m_gmt_mgr->IBLFlexMaterial(1,"doglegA");
 	const GeoMaterial* tmp_material = m_mat_mgr->getMaterial(flexMatName);
 	GeoLogVol* tmp_logVol = new GeoLogVol("FlexDogLeg1",tmp_shape,tmp_material);
@@ -253,7 +254,7 @@ GeoVPhysVol* GeoPixelStaveRingServices::Build()
 	double trX2=trX*2.-dimX2_lin*tan(alpha2)*0.5;   //-3.28;
 	double trZ2=eoStave+dimX_lin+dimX2_lin*0.5;
 	xShape.clear(); yShape.clear();
-	angle=90.*GeoModelKernelUnits::deg-alpha2;
+	angle=90.*Gaudi::Units::deg-alpha2;
 	xShape.push_back(dimX2*0.5);  yShape.push_back(dimY2*0.5);
 	xShape.push_back(-dimX2*0.5);  yShape.push_back(dimY2*0.5);
 	xShape.push_back(-dimX2*0.5); yShape.push_back(-dimY2*0.5);
diff --git a/InnerDetector/InDetDetDescr/PixelGeoModel/src/GeoPixelTMT.cxx b/InnerDetector/InDetDetDescr/PixelGeoModel/src/GeoPixelTMT.cxx
index 5d2286e73b42245c64923a90fc9cb66c2e4f2c30..537463efb037e98b90ea25539f22752f674157ba 100644
--- a/InnerDetector/InDetDetDescr/PixelGeoModel/src/GeoPixelTMT.cxx
+++ b/InnerDetector/InDetDetDescr/PixelGeoModel/src/GeoPixelTMT.cxx
@@ -18,7 +18,7 @@
 #include "GeoModelKernel/GeoTransform.h"
 #include "GeoModelKernel/GeoShapeShift.h"
 #include "GeoModelKernel/GeoShapeUnion.h"
-#include "GeoModelKernel/Units.h"
+#include "GaudiKernel/SystemOfUnits.h"
 #include <utility> //std::swap
 #include <cmath>
 
@@ -51,7 +51,7 @@ GeoVPhysVol* GeoPixelTMT::Build() {
   GeoNameTag* tag = new GeoNameTag("TMT");
 
   // this part is unchanged: reading the DB, creating the shapes of the volumes and defining their position
-  GeoTrf::RotateX3D traprot(180.*GeoModelKernelUnits::deg);
+  GeoTrf::RotateX3D traprot(180.*Gaudi::Units::deg);
 
   int halfNModule = m_gmt_mgr->PixelNModule()/2;
 
@@ -129,7 +129,7 @@ GeoVPhysVol* GeoPixelTMT::Build() {
         theTMT->add(transPos);
         theTMT->add(tmpPhysVol);
 
-        GeoTransform* transNeg = new GeoTransform(GeoTrf::Translate3D(xpos,ypos,-(zpos+zshift))*GeoTrf::RotateX3D(180*GeoModelKernelUnits::deg));
+        GeoTransform* transNeg = new GeoTransform(GeoTrf::Translate3D(xpos,ypos,-(zpos+zshift))*GeoTrf::RotateX3D(180*Gaudi::Units::deg));
         theTMT->add(tag);
         theTMT->add(transNeg);
         theTMT->add(tmpPhysVol);
diff --git a/InnerDetector/InDetDetDescr/PixelGeoModel/src/OraclePixGeoManager.cxx b/InnerDetector/InDetDetDescr/PixelGeoModel/src/OraclePixGeoManager.cxx
index a4a53b36862262f81358fdd2888031f0d0602524..3346fa36e95f27cb62cc62b0359b0b84ebf3bbde 100644
--- a/InnerDetector/InDetDetDescr/PixelGeoModel/src/OraclePixGeoManager.cxx
+++ b/InnerDetector/InDetDetDescr/PixelGeoModel/src/OraclePixGeoManager.cxx
@@ -17,6 +17,7 @@
 #include "GeoModelInterfaces/IGeoDbTagSvc.h"
 #include "GeoModelUtilities/DecodeVersionKey.h"
 #include "GeoModelKernel/GeoMaterial.h"
+#include "GeoModelKernel/Units.h"
 
 //
 // Get the pixelDD Manager from SG.
@@ -30,7 +31,7 @@
 // Distorted material manager
 //
 #include "InDetGeoModelUtils/DistortedMaterialManager.h"
-#include "GeoModelKernel/Units.h"
+#include "GaudiKernel/SystemOfUnits.h"
 
 using InDetDD::PixelDetectorManager; 
 
@@ -64,7 +65,7 @@ OraclePixGeoManager::OraclePixGeoManager(const PixelGeoModelAthenaComps * athena
     m_diskRingIndexMap(0),
     m_zPositionMap(0),
     m_dbVersion(0),
-    m_defaultLengthUnit(GeoModelKernelUnits::mm)
+    m_defaultLengthUnit(Gaudi::Units::mm)
 {
   m_commonItems = 0;
   m_pDDmgr = 0;
@@ -171,8 +172,8 @@ OraclePixGeoManager::init()
 
   m_distortedMatManager = new InDetDD::DistortedMaterialManager;
  
-  // Set default lenth unit to GeoModelKernelUnits::mm for newer version and GeoModelKernelUnits::cm for older versions
-  m_defaultLengthUnit =  (dbVersion() < 3) ? GeoModelKernelUnits::cm : GeoModelKernelUnits::mm;
+  // Set default lenth unit to Gaudi::Units::mm for newer version and Gaudi::Units::cm for older versions
+  m_defaultLengthUnit =  (dbVersion() < 3) ? Gaudi::Units::cm : Gaudi::Units::mm;
 
   // Get the top level placements
   m_placements = new TopLevelPlacements(m_PixelTopLevel);
@@ -515,7 +516,7 @@ double OraclePixGeoManager::PixelBoardLength(bool isModule3D)
 double OraclePixGeoManager::PixelBoardThickness(bool isModule3D) 
 {
   if (m_dc1Geometry && isBarrel() && (m_currentLD == 0)) {
-    return 200*GeoModelKernelUnits::micrometer;
+    return 200*Gaudi::Units::micrometer;
   }
 
   if(ibl()&&isModule3D)
@@ -825,7 +826,7 @@ double OraclePixGeoManager::PixelServiceRMin2(const std::string & type, int inde
   if (!getPixelServiceRecordTestField("RIN2",type,index)) {
     return 0;
   } else {
-    return getPixelServiceRecordDouble("RIN2",type,index) * GeoModelKernelUnits::mm;
+    return getPixelServiceRecordDouble("RIN2",type,index) * Gaudi::Units::mm;
   }
 }
 
@@ -833,7 +834,7 @@ double OraclePixGeoManager::PixelServiceRMax2(const std::string & type, int inde
   if (!getPixelServiceRecordTestField("ROUT2",type,index)) {
     return 0;
   } else {
-    return getPixelServiceRecordDouble("ROUT2",type,index) * GeoModelKernelUnits::mm;
+    return getPixelServiceRecordDouble("ROUT2",type,index) * Gaudi::Units::mm;
   }
 }
 
@@ -860,7 +861,7 @@ double OraclePixGeoManager::PixelServicePhiLoc(const std::string & type, int ind
   if (!getPixelServiceRecordTestField("PHI",type,index)) {
     return 0;
   } else {
-    return getPixelServiceRecordDouble("PHI",type,index) * GeoModelKernelUnits::degree; 
+    return getPixelServiceRecordDouble("PHI",type,index) * Gaudi::Units::degree; 
   }
 }
 
@@ -868,7 +869,7 @@ double OraclePixGeoManager::PixelServiceWidth(const std::string & type, int inde
   if (!getPixelServiceRecordTestField("WIDTH",type,index)) {
     return 0;
   } else {
-    // Can be in degree or GeoModelKernelUnits::mm. Leave it to GeoPixelServices to interpret.    
+    // Can be in degree or Gaudi::Units::mm. Leave it to GeoPixelServices to interpret.    
     return getPixelServiceRecordDouble("WIDTH",type,index); 
   }
 }
@@ -1095,35 +1096,35 @@ double
 OraclePixGeoManager::PixelCableZStart(int index)
 {
   if (dbVersion() < 3) return m_legacyManager->PixelCableZStart(index);
-  return db()->getDouble(m_PixelBarrelCable,"ZSTART",index) * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_PixelBarrelCable,"ZSTART",index) * Gaudi::Units::mm;
 }
 
 double 
 OraclePixGeoManager::PixelCableZEnd(int index)
 {
   if (dbVersion() < 3) return m_legacyManager->PixelCableZEnd(index);
-  return db()->getDouble(m_PixelBarrelCable,"ZEND",index) * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_PixelBarrelCable,"ZEND",index) * Gaudi::Units::mm;
 }
 
 double 
 OraclePixGeoManager::PixelCableWidth(int index)
 {
   if (dbVersion() < 3) return m_legacyManager->PixelCableWidth(index);
-  return db()->getDouble(m_PixelBarrelCable,"WIDTH",index) * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_PixelBarrelCable,"WIDTH",index) * Gaudi::Units::mm;
 }
 
 double 
 OraclePixGeoManager::PixelCableThickness(int index)
 {
   if (dbVersion() < 3) return m_legacyManager->PixelCableThickness(index);
-  return db()->getDouble(m_PixelBarrelCable,"THICK",index) * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_PixelBarrelCable,"THICK",index) * Gaudi::Units::mm;
 }
 
 double 
 OraclePixGeoManager::PixelCableStackOffset(int index)
 {
   if (dbVersion() < 3) return m_legacyManager->PixelCableStackOffset(index);
-  return db()->getDouble(m_PixelBarrelCable,"STACKPOS",index) * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_PixelBarrelCable,"STACKPOS",index) * Gaudi::Units::mm;
 }
 
 double 
@@ -1310,19 +1311,19 @@ unsigned int OraclePixGeoManager::PixelEnvelopeNumPlanes()
 
 double OraclePixGeoManager::PixelEnvelopeZ(int i) 
 {
-  double zmin =  db()->getDouble(m_PixelEnvelope,"Z",i) * GeoModelKernelUnits::mm;
+  double zmin =  db()->getDouble(m_PixelEnvelope,"Z",i) * Gaudi::Units::mm;
   if (zmin < 0) msg(MSG::ERROR) << "PixelEnvelope table should only contain +ve z values" << endmsg;
   return std::abs(zmin);
 }
 
 double OraclePixGeoManager::PixelEnvelopeRMin(int i) 
 {
-  return db()->getDouble(m_PixelEnvelope,"RMIN",i) * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_PixelEnvelope,"RMIN",i) * Gaudi::Units::mm;
 }
 
 double OraclePixGeoManager::PixelEnvelopeRMax(int i) 
 {
-  return db()->getDouble(m_PixelEnvelope,"RMAX",i) * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_PixelEnvelope,"RMAX",i) * Gaudi::Units::mm;
 }
 
 
@@ -1367,32 +1368,32 @@ int OraclePixGeoManager::PixelFrameSections()
 
 double OraclePixGeoManager::PixelFrameRMinSide(int sectionIndex)
 {
-  return db()->getDouble(m_PixelFrame, "RMINSIDE", sectionIndex) * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_PixelFrame, "RMINSIDE", sectionIndex) * Gaudi::Units::mm;
 }
 
 double OraclePixGeoManager::PixelFrameRMaxSide(int sectionIndex)
 {
-  return db()->getDouble(m_PixelFrame, "RMAXSIDE", sectionIndex) * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_PixelFrame, "RMAXSIDE", sectionIndex) * Gaudi::Units::mm;
 }
 
 double OraclePixGeoManager::PixelFrameSideWidth(int sectionIndex)
 {
-  return db()->getDouble(m_PixelFrame, "SIDEWIDTH", sectionIndex) * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_PixelFrame, "SIDEWIDTH", sectionIndex) * Gaudi::Units::mm;
 } 
  
 double OraclePixGeoManager::PixelFrameZMin(int sectionIndex)
 { 
-  return db()->getDouble(m_PixelFrame, "ZMIN", sectionIndex) * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_PixelFrame, "ZMIN", sectionIndex) * Gaudi::Units::mm;
 }
 
 double OraclePixGeoManager::PixelFrameZMax(int sectionIndex)
 { 
-  return db()->getDouble(m_PixelFrame, "ZMAX", sectionIndex) * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_PixelFrame, "ZMAX", sectionIndex) * Gaudi::Units::mm;
 }
 
 double OraclePixGeoManager::PixelFramePhiStart(int sectionIndex)
 {
-  return db()->getDouble(m_PixelFrame, "PHISTART", sectionIndex) * GeoModelKernelUnits::deg;
+  return db()->getDouble(m_PixelFrame, "PHISTART", sectionIndex) * Gaudi::Units::deg;
 }
  
 int OraclePixGeoManager::PixelFrameNumSides(int sectionIndex)
@@ -1477,28 +1478,28 @@ double OraclePixGeoManager::PixelFrameElementZMin1(int sectionIndex, int element
 {
   int index = getFrameElementIndex(sectionIndex, element);
   if (index < 0) return 0; // Error message already printed in getFrameElementIndex.
-  return db()->getDouble(m_PixelFrameSect, "ZMIN1", index) * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_PixelFrameSect, "ZMIN1", index) * Gaudi::Units::mm;
 }
 
 double OraclePixGeoManager::PixelFrameElementZMin2(int sectionIndex, int element)
 {
   int index = getFrameElementIndex(sectionIndex, element);
   if (index < 0) return 0; // Error message already printed in getFrameElementIndex.
-  return db()->getDouble(m_PixelFrameSect, "ZMIN2", index) * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_PixelFrameSect, "ZMIN2", index) * Gaudi::Units::mm;
 }
 
 double OraclePixGeoManager::PixelFrameElementZMax1(int sectionIndex, int element)
 {
   int index = getFrameElementIndex(sectionIndex, element);
   if (index < 0) return 0; // Error message already printed in getFrameElementIndex.
-  return db()->getDouble(m_PixelFrameSect, "ZMAX1", index) * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_PixelFrameSect, "ZMAX1", index) * Gaudi::Units::mm;
 }
 
 double OraclePixGeoManager::PixelFrameElementZMax2(int sectionIndex, int element)
 {
   int index = getFrameElementIndex(sectionIndex, element);
   if (index < 0) return 0; // Error message already printed in getFrameElementIndex.
-  return db()->getDouble(m_PixelFrameSect, "ZMAX2", index) * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_PixelFrameSect, "ZMAX2", index) * Gaudi::Units::mm;
 }
 
 int OraclePixGeoManager::PixelStaveIndex(int layer)
@@ -1582,14 +1583,14 @@ double OraclePixGeoManager::PixelLadderLength()
 {
   if (useLegacy()) return m_legacyManager->PixelLadderLength(); 
   int index = PixelStaveIndex(m_currentLD);
-  return db()->getDouble(m_PixelStave,"ENVLENGTH",index)*GeoModelKernelUnits::mm;
+  return db()->getDouble(m_PixelStave,"ENVLENGTH",index)*Gaudi::Units::mm;
 }
 
 double OraclePixGeoManager::PixelLadderWidthClearance() 
 {
-  if (useLegacy()) return 0.9*GeoModelKernelUnits::mm; 
+  if (useLegacy()) return 0.9*Gaudi::Units::mm; 
   int index = PixelStaveIndex(m_currentLD);
-  return db()->getDouble(m_PixelStave,"CLEARANCEY",index)*GeoModelKernelUnits::mm;  
+  return db()->getDouble(m_PixelStave,"CLEARANCEY",index)*Gaudi::Units::mm;  
 }
 
 // Only used if ladder thickness is automatically calculated it, ie ENVTHICK = 0
@@ -1598,63 +1599,63 @@ double OraclePixGeoManager::PixelLadderThicknessClearance()
 {
   int index = PixelStaveIndex(m_currentLD);
   if (db()->testField(m_PixelStave,"CLEARANCEX",index)) {
-    return db()->getDouble(m_PixelStave,"CLEARANCEX",index)*GeoModelKernelUnits::mm;  
+    return db()->getDouble(m_PixelStave,"CLEARANCEX",index)*Gaudi::Units::mm;  
   }
-  return 0.1*GeoModelKernelUnits::mm;
+  return 0.1*Gaudi::Units::mm;
 }
 
 double OraclePixGeoManager::PixelLadderThickness() 
 {
   if (useLegacy()) return m_legacyManager->PixelLadderThickness();  // 2*1.48972 mm
   int index = PixelStaveIndex(m_currentLD);
-  return db()->getDouble(m_PixelStave,"ENVTHICK",index)*GeoModelKernelUnits::mm;
+  return db()->getDouble(m_PixelStave,"ENVTHICK",index)*Gaudi::Units::mm;
 }
 
 double OraclePixGeoManager::PixelLadderTilt() 
 {
-  return db()->getDouble(m_PixelLayer,"STAVETILT",m_currentLD)*GeoModelKernelUnits::deg;
+  return db()->getDouble(m_PixelLayer,"STAVETILT",m_currentLD)*Gaudi::Units::deg;
 }
 
 double OraclePixGeoManager::PixelLadderServicesX() 
 {
   if (useLegacy()) return m_legacyManager->PixelLadderServicesX(); // 1.48972 mm
   int index = PixelStaveIndex(m_currentLD);
-  return db()->getDouble(m_PixelStave,"SERVICEOFFSETX",index) * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_PixelStave,"SERVICEOFFSETX",index) * Gaudi::Units::mm;
 }
 
 double OraclePixGeoManager::PixelLadderServicesY() 
 {
   if (useLegacy()) return m_legacyManager->PixelLadderServicesY();  // 3mm
   int index = PixelStaveIndex(m_currentLD);
-  return db()->getDouble(m_PixelStave,"SERVICEOFFSETY",index) * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_PixelStave,"SERVICEOFFSETY",index) * Gaudi::Units::mm;
 }
 
 double OraclePixGeoManager::PixelLadderCableOffsetX() 
 {
   if (useLegacy()) return m_legacyManager->PixelLadderCableOffsetX(); // 0
   int index = PixelStaveIndex(m_currentLD);
-  return db()->getDouble(m_PixelStave,"CABLEOFFSETX",index) * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_PixelStave,"CABLEOFFSETX",index) * Gaudi::Units::mm;
 }
 
 double OraclePixGeoManager::PixelLadderCableOffsetY() 
 {
   if (useLegacy()) return m_legacyManager->PixelLadderCableOffsetY();  // 4mm
   int index = PixelStaveIndex(m_currentLD);
-  return db()->getDouble(m_PixelStave,"CABLEOFFSETY",index) * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_PixelStave,"CABLEOFFSETY",index) * Gaudi::Units::mm;
 }
 
 // SLHC/IBL only
 double OraclePixGeoManager::PixelLadderSupportThickness() 
 {
   int index = PixelStaveIndex(m_currentLD);
-  return db()->getDouble(m_PixelStave,"SUPPORTTHICK",index) * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_PixelStave,"SUPPORTTHICK",index) * Gaudi::Units::mm;
 }
 
 // SLHC/IBL only
 double OraclePixGeoManager::PixelLadderSupportWidth() 
 {
   int index = PixelStaveIndex(m_currentLD);
-  return db()->getDouble(m_PixelStave,"SUPPORTWIDTH",index) * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_PixelStave,"SUPPORTWIDTH",index) * Gaudi::Units::mm;
 }
 
 
@@ -1688,10 +1689,10 @@ double OraclePixGeoManager::PixelLadderSupportLength()
 {
   int index = PixelStaveIndex(m_currentLD);
   if (db()->testField(m_PixelStave,"SUPPORTHLENGTH",index)) {
-    double halflength = db()->getDouble(m_PixelStave,"SUPPORTHLENGTH",index) * GeoModelKernelUnits::mm;
+    double halflength = db()->getDouble(m_PixelStave,"SUPPORTHLENGTH",index) * Gaudi::Units::mm;
     if (halflength > 0)  return 2 * halflength;
   } 
-  double safety = 0.01*GeoModelKernelUnits::mm;
+  double safety = 0.01*Gaudi::Units::mm;
   return PixelLadderLength() - safety;
 }
 
@@ -1749,7 +1750,7 @@ double OraclePixGeoManager::IBLStaveFacePlateThickness()
   //  int index = PixelStaveIndex(m_currentLD);
   int index=0;
   if (db()->testField(m_PixelIBLStave,"FACEPLATETHICK",index)) {
-    double thickness = db()->getDouble(m_PixelIBLStave,"FACEPLATETHICK",index) * GeoModelKernelUnits::mm;
+    double thickness = db()->getDouble(m_PixelIBLStave,"FACEPLATETHICK",index) * Gaudi::Units::mm;
     if (thickness > 0)  return thickness ;
   } 
   return 0.0;
@@ -1760,7 +1761,7 @@ double OraclePixGeoManager:: IBLStaveMechanicalStaveWidth()
   //  int index = PixelStaveIndex(m_currentLD);
   int index=0;
   if (db()->testField(m_PixelIBLStave,"STAVEWIDTH",index)) {
-    double value = db()->getDouble(m_PixelIBLStave,"STAVEWIDTH",index) * GeoModelKernelUnits::mm;
+    double value = db()->getDouble(m_PixelIBLStave,"STAVEWIDTH",index) * Gaudi::Units::mm;
     if (value > 0)  return value ;
   } 
   return 0.0;
@@ -1771,7 +1772,7 @@ double OraclePixGeoManager:: IBLStaveMechanicalStaveEndBlockLength()
   //  int index = PixelStaveIndex(m_currentLD);
   int index=0;
   if (db()->testField(m_PixelIBLStave,"ENDBLOCKLENGTH",index)) {
-    double value = db()->getDouble(m_PixelIBLStave,"ENDBLOCKLENGTH",index) * GeoModelKernelUnits::mm;
+    double value = db()->getDouble(m_PixelIBLStave,"ENDBLOCKLENGTH",index) * Gaudi::Units::mm;
     if (value > 0)  return value ;
   } 
   return 0.0;
@@ -1782,7 +1783,7 @@ double OraclePixGeoManager:: IBLStaveMechanicalStaveEndBlockFixPoint()
   //  int index = PixelStaveIndex(m_currentLD);
   int index=0;
   if (db()->testField(m_PixelIBLStave,"ENDBLOCKFIXINGPOS",index)) {
-    double value = db()->getDouble(m_PixelIBLStave,"ENDBLOCKFIXINGPOS",index) * GeoModelKernelUnits::mm;
+    double value = db()->getDouble(m_PixelIBLStave,"ENDBLOCKFIXINGPOS",index) * Gaudi::Units::mm;
     return value ;
   } 
   return 0.0;
@@ -1794,7 +1795,7 @@ double OraclePixGeoManager:: IBLStaveMechanicalStaveEndBlockOmegaOverlap()
   try{
     int index=0;
     if (db()->testField(m_PixelIBLStave,"ENDBLOCKOMEGAOVERLAP",index)) {
-      double value = db()->getDouble(m_PixelIBLStave,"ENDBLOCKOMEGAOVERLAP",index) * GeoModelKernelUnits::mm;
+      double value = db()->getDouble(m_PixelIBLStave,"ENDBLOCKOMEGAOVERLAP",index) * Gaudi::Units::mm;
       return value ;
     } 
     return 0.0;
@@ -1810,7 +1811,7 @@ double OraclePixGeoManager::IBLStaveLength()
     {
       int index=0;
       if (db()->testField(m_PixelIBLStave,"STAVELENGTH",index)) {
-	double value = db()->getDouble(m_PixelIBLStave,"STAVELENGTH",index) * GeoModelKernelUnits::mm;
+	double value = db()->getDouble(m_PixelIBLStave,"STAVELENGTH",index) * Gaudi::Units::mm;
 	return value ;
       } 
     }
@@ -1820,7 +1821,7 @@ double OraclePixGeoManager::IBLStaveLength()
       //           IBL stave length not eqal to other stave length 
     }  
   
-  return 748.0 * GeoModelKernelUnits::mm;  
+  return 748.0 * Gaudi::Units::mm;  
 }
 
 double OraclePixGeoManager:: IBLStaveMechanicalStaveOffset(bool isModule3D)
@@ -1828,11 +1829,11 @@ double OraclePixGeoManager:: IBLStaveMechanicalStaveOffset(bool isModule3D)
   //  int index = PixelStaveIndex(m_currentLD);
   int index=0;
   if (!isModule3D&&db()->testField(m_PixelIBLStave,"MODULELATERALOFFSET",index)) {
-    double value = db()->getDouble(m_PixelIBLStave,"MODULELATERALOFFSET",index) * GeoModelKernelUnits::mm;
+    double value = db()->getDouble(m_PixelIBLStave,"MODULELATERALOFFSET",index) * Gaudi::Units::mm;
     return value ;
   } 
   if (isModule3D&&db()->testField(m_PixelIBLStave,"MODULELATERALOFFSET3D",index)) {
-    double value = db()->getDouble(m_PixelIBLStave,"MODULELATERALOFFSET3D",index) * GeoModelKernelUnits::mm;
+    double value = db()->getDouble(m_PixelIBLStave,"MODULELATERALOFFSET3D",index) * Gaudi::Units::mm;
     return value ;
   } 
   return 0.0;
@@ -1843,7 +1844,7 @@ double OraclePixGeoManager:: IBLStaveMechanicalStaveModuleOffset()
   //  int index = PixelStaveIndex(m_currentLD);
   int index=0;
   if (db()->testField(m_PixelIBLStave,"STAVETOMODULEGAP",index)) {
-    double value = db()->getDouble(m_PixelIBLStave,"STAVETOMODULEGAP",index) * GeoModelKernelUnits::mm;
+    double value = db()->getDouble(m_PixelIBLStave,"STAVETOMODULEGAP",index) * Gaudi::Units::mm;
     return value ;
   } 
   return 0.0;
@@ -1854,7 +1855,7 @@ double OraclePixGeoManager:: IBLStaveTubeOuterDiameter()
   //  int index = PixelStaveIndex(m_currentLD);
   int index=0;
   if (db()->testField(m_PixelIBLStave,"TUBEOUTERDIAM",index)) {
-    double value = db()->getDouble(m_PixelIBLStave,"TUBEOUTERDIAM",index) * GeoModelKernelUnits::mm;
+    double value = db()->getDouble(m_PixelIBLStave,"TUBEOUTERDIAM",index) * Gaudi::Units::mm;
     if (value > 0)  return value ;
   } 
   return 0.0;
@@ -1865,7 +1866,7 @@ double OraclePixGeoManager:: IBLStaveTubeInnerDiameter()
   //  int index = PixelStaveIndex(m_currentLD);
   int index=0;
   if (db()->testField(m_PixelIBLStave,"TUBEINNERDIAM",index)) {
-    double value = db()->getDouble(m_PixelIBLStave,"TUBEINNERDIAM",index) * GeoModelKernelUnits::mm;
+    double value = db()->getDouble(m_PixelIBLStave,"TUBEINNERDIAM",index) * Gaudi::Units::mm;
     if (value > 0)  return value ;
   } 
   return 0.0;
@@ -1876,7 +1877,7 @@ double OraclePixGeoManager:: IBLStaveTubeMiddlePos()
   //  int index = PixelStaveIndex(m_currentLD);
   int index=0;
   if (db()->testField(m_PixelIBLStave,"TUBEMIDDLEPOS",index)) {
-    double value = db()->getDouble(m_PixelIBLStave,"TUBEMIDDLEPOS",index) * GeoModelKernelUnits::mm;
+    double value = db()->getDouble(m_PixelIBLStave,"TUBEMIDDLEPOS",index) * Gaudi::Units::mm;
     return value ;
   } 
   return 0.0;
@@ -1887,7 +1888,7 @@ double OraclePixGeoManager:: IBLStaveFlexLayerThickness()
   //  int index = PixelStaveIndex(m_currentLD);
   int index=0;
   if (db()->testField(m_PixelIBLStave,"FLEXLAYERTHICK",index)) {
-    double value = db()->getDouble(m_PixelIBLStave,"FLEXLAYERTHICK",index) * GeoModelKernelUnits::mm;
+    double value = db()->getDouble(m_PixelIBLStave,"FLEXLAYERTHICK",index) * Gaudi::Units::mm;
     if (value > 0)  return value ;
   } 
   return 0.0;
@@ -1898,7 +1899,7 @@ double OraclePixGeoManager:: IBLStaveFlexBaseThickness()
   //  int index = PixelStaveIndex(m_currentLD);
   int index=0;
   if (db()->testField(m_PixelIBLStave,"FLEXBASETHICK",index)) {
-    double value = db()->getDouble(m_PixelIBLStave,"FLEXBASETHICK",index) * GeoModelKernelUnits::mm;
+    double value = db()->getDouble(m_PixelIBLStave,"FLEXBASETHICK",index) * Gaudi::Units::mm;
     if (value > 0)  return value ;
   } 
   return 0.0;
@@ -1909,7 +1910,7 @@ double OraclePixGeoManager:: IBLStaveFlexWidth()
   //  int index = PixelStaveIndex(m_currentLD);
   int index=0;
   if (db()->testField(m_PixelIBLStave,"FLEXWIDTH",index)) {
-    double value = db()->getDouble(m_PixelIBLStave,"FLEXWIDTH",index) * GeoModelKernelUnits::mm;
+    double value = db()->getDouble(m_PixelIBLStave,"FLEXWIDTH",index) * Gaudi::Units::mm;
     if (value > 0)  return value ;
   } 
   return 0.0;
@@ -1920,7 +1921,7 @@ double OraclePixGeoManager:: IBLStaveFlexOffset()
   //  int index = PixelStaveIndex(m_currentLD);
   int index=0;
   if (db()->testField(m_PixelIBLStave,"FLEXOFFSET",index)) {
-    double value = db()->getDouble(m_PixelIBLStave,"FLEXOFFSET",index) * GeoModelKernelUnits::mm;
+    double value = db()->getDouble(m_PixelIBLStave,"FLEXOFFSET",index) * Gaudi::Units::mm;
     return value ;
   } 
   return 0.0;
@@ -1932,7 +1933,7 @@ double OraclePixGeoManager::IBLStaveOmegaThickness()
   //  int index = PixelStaveIndex(m_currentLD);
   int index=0;
   if (db()->testField(m_PixelIBLStave,"OMEGATHICK",index)) {
-    double value = db()->getDouble(m_PixelIBLStave,"OMEGATHICK",index) * GeoModelKernelUnits::mm;
+    double value = db()->getDouble(m_PixelIBLStave,"OMEGATHICK",index) * Gaudi::Units::mm;
     return value ;
   } 
   return 0.0;
@@ -1943,7 +1944,7 @@ double OraclePixGeoManager::IBLStaveOmegaEndCenterX()
   //  int index = PixelStaveIndex(m_currentLD);
   int index=0;
   if (db()->testField(m_PixelIBLStave,"OMEGAENDCENTERX",index)) {
-    double value = db()->getDouble(m_PixelIBLStave,"OMEGAENDCENTERX",index) * GeoModelKernelUnits::mm;
+    double value = db()->getDouble(m_PixelIBLStave,"OMEGAENDCENTERX",index) * Gaudi::Units::mm;
     return value ;
   } 
   return 0.0;
@@ -1953,7 +1954,7 @@ double OraclePixGeoManager::IBLStaveOmegaEndCenterY()
   //  int index = PixelStaveIndex(m_currentLD);
   int index=0;
   if (db()->testField(m_PixelIBLStave,"OMEGAENDCENTERY",index)) {
-    double value = db()->getDouble(m_PixelIBLStave,"OMEGAENDCENTERY",index) * GeoModelKernelUnits::mm;
+    double value = db()->getDouble(m_PixelIBLStave,"OMEGAENDCENTERY",index) * Gaudi::Units::mm;
     return value ;
   } 
   return 0.0;
@@ -1963,7 +1964,7 @@ double OraclePixGeoManager::IBLStaveOmegaEndRadius()
   //  int index = PixelStaveIndex(m_currentLD);
   int index=0;
   if (db()->testField(m_PixelIBLStave,"OMEGAENDRADIUS",index)) {
-    double value = db()->getDouble(m_PixelIBLStave,"OMEGAENDRADIUS",index) * GeoModelKernelUnits::mm;
+    double value = db()->getDouble(m_PixelIBLStave,"OMEGAENDRADIUS",index) * Gaudi::Units::mm;
     return value ;
   } 
   return 0.0;
@@ -1973,7 +1974,7 @@ double OraclePixGeoManager::IBLStaveOmegaEndAngle()
   //  int index = PixelStaveIndex(m_currentLD);
   int index=0;
   if (db()->testField(m_PixelIBLStave,"OMEGAENDANGLE",index)) {
-    double value = db()->getDouble(m_PixelIBLStave,"OMEGAENDANGLE",index) * GeoModelKernelUnits::deg;
+    double value = db()->getDouble(m_PixelIBLStave,"OMEGAENDANGLE",index) * Gaudi::Units::deg;
     return value ;
   } 
   return 0.0;
@@ -1984,7 +1985,7 @@ double OraclePixGeoManager::IBLStaveOmegaMidCenterX()
   //  int index = PixelStaveIndex(m_currentLD);
   int index=0;
   if (db()->testField(m_PixelIBLStave,"OMEGAMIDCENTERX",index)) {
-    double value = db()->getDouble(m_PixelIBLStave,"OMEGAMIDCENTERX",index) * GeoModelKernelUnits::mm;
+    double value = db()->getDouble(m_PixelIBLStave,"OMEGAMIDCENTERX",index) * Gaudi::Units::mm;
     return value ;
   } 
   return 0.0;
@@ -1995,7 +1996,7 @@ double OraclePixGeoManager::IBLStaveOmegaMidRadius()
   //  int index = PixelStaveIndex(m_currentLD);
   int index=0;
   if (db()->testField(m_PixelIBLStave,"OMEGAMIDRADIUS",index)) {
-    double value = db()->getDouble(m_PixelIBLStave,"OMEGAMIDRADIUS",index) * GeoModelKernelUnits::mm;
+    double value = db()->getDouble(m_PixelIBLStave,"OMEGAMIDRADIUS",index) * Gaudi::Units::mm;
     return value ;
   } 
   return 0.0;
@@ -2005,7 +2006,7 @@ double OraclePixGeoManager::IBLStaveOmegaMidAngle()
   //  int index = PixelStaveIndex(m_currentLD);
   int index=0;
   if (db()->testField(m_PixelIBLStave,"OMEGAOPENINGANGLE",index)) {
-    double value = db()->getDouble(m_PixelIBLStave,"OMEGAOPENINGANGLE",index) * GeoModelKernelUnits::deg;
+    double value = db()->getDouble(m_PixelIBLStave,"OMEGAOPENINGANGLE",index) * Gaudi::Units::deg;
     return value ;
   } 
   return 0.0;
@@ -2033,7 +2034,7 @@ double OraclePixGeoManager::IBLStaveModuleGap()
   //  int index = PixelStaveIndex(m_currentLD);
   int index=0;
   if (db()->testField(m_PixelIBLStave,"MODULEGAP",index)) {
-    double value = db()->getDouble(m_PixelIBLStave,"MODULEGAP",index) * GeoModelKernelUnits::mm;
+    double value = db()->getDouble(m_PixelIBLStave,"MODULEGAP",index) * Gaudi::Units::mm;
     if (value > 0)  return value ;
   } 
   return 0.0;
@@ -2044,7 +2045,7 @@ int OraclePixGeoManager::IBLStaveModuleType()
   //  int index = PixelStaveIndex(m_currentLD);
   int index=0;
   if (db()->testField(m_PixelIBLStave,"MODULETYPE",index)) {
-    int value = db()->getInt(m_PixelIBLStave,"MODULETYPE",index) * GeoModelKernelUnits::mm;
+    int value = db()->getInt(m_PixelIBLStave,"MODULETYPE",index) * Gaudi::Units::mm;
     if (value > 0)  return value ;
   } 
   return 0;
@@ -2056,7 +2057,7 @@ double OraclePixGeoManager::IBLStaveFacePlateGreaseThickness()
   try{
     int index=0;
     if (db()->testField(m_PixelIBLGlueGrease,"FACEPLATEGREASETHICK",index)) {
-      double value = db()->getDouble(m_PixelIBLGlueGrease,"FACEPLATEGREASETHICK",index) * GeoModelKernelUnits::mm;
+      double value = db()->getDouble(m_PixelIBLGlueGrease,"FACEPLATEGREASETHICK",index) * Gaudi::Units::mm;
       return value ;
     }
     return 0.;
@@ -2071,7 +2072,7 @@ double OraclePixGeoManager::IBLStaveFacePlateGlueThickness()
   try{
     int index=0;
     if (db()->testField(m_PixelIBLGlueGrease,"FACEPLATEGLUETHICK",index)) {
-      double value = db()->getDouble(m_PixelIBLGlueGrease,"FACEPLATEGLUETHICK",index) * GeoModelKernelUnits::mm;
+      double value = db()->getDouble(m_PixelIBLGlueGrease,"FACEPLATEGLUETHICK",index) * Gaudi::Units::mm;
       return value ;
     }
     return 0.;
@@ -2086,7 +2087,7 @@ double OraclePixGeoManager::IBLStaveTubeGlueThickness()
   try{
     int index=0;
     if (db()->testField(m_PixelIBLGlueGrease,"TUBEGLUETHICK",index)) {
-      double value = db()->getDouble(m_PixelIBLGlueGrease,"TUBEGLUETHICK",index) * GeoModelKernelUnits::mm;
+      double value = db()->getDouble(m_PixelIBLGlueGrease,"TUBEGLUETHICK",index) * Gaudi::Units::mm;
       return value ;
     }
     return 0.;
@@ -2101,7 +2102,7 @@ double OraclePixGeoManager::IBLStaveOmegaGlueThickness()
   try{
     int index=0;
     if (db()->testField(m_PixelIBLGlueGrease,"OMEGAGLUETHICK",index)) {
-      double value = db()->getDouble(m_PixelIBLGlueGrease,"OMEGAGLUETHICK",index) * GeoModelKernelUnits::mm;
+      double value = db()->getDouble(m_PixelIBLGlueGrease,"OMEGAGLUETHICK",index) * Gaudi::Units::mm;
       return value ;
     }
     return 0.;
@@ -2116,7 +2117,7 @@ double OraclePixGeoManager:: IBLSupportRingWidth()
   //  int index = PixelStaveIndex(m_currentLD);
   int index=0;
   if (db()->testField(m_PixelIBLSupport,"STAVERINGWIDTH",index)) {
-    double value = db()->getDouble(m_PixelIBLSupport,"STAVERINGWIDTH",index) * GeoModelKernelUnits::mm;
+    double value = db()->getDouble(m_PixelIBLSupport,"STAVERINGWIDTH",index) * Gaudi::Units::mm;
     if (value > 0)  return value ;
   } 
   return 0.0;
@@ -2127,7 +2128,7 @@ double OraclePixGeoManager:: IBLSupportRingInnerRadius()
   //  int index = PixelStaveIndex(m_currentLD);
   int index=0;
   if (db()->testField(m_PixelIBLSupport,"STAVERINGINNERRADIUS",index)) {
-    double value = db()->getDouble(m_PixelIBLSupport,"STAVERINGINNERRADIUS",index) * GeoModelKernelUnits::mm;
+    double value = db()->getDouble(m_PixelIBLSupport,"STAVERINGINNERRADIUS",index) * Gaudi::Units::mm;
     if (value > 0)  return value ;
   } 
   return 0.0;
@@ -2138,7 +2139,7 @@ double OraclePixGeoManager:: IBLSupportRingOuterRadius()
   //  int index = PixelStaveIndex(m_currentLD);
   int index=0;
   if (db()->testField(m_PixelIBLSupport,"STAVERINGOUTERRADIUS",index)) {
-    double value = db()->getDouble(m_PixelIBLSupport,"STAVERINGOUTERRADIUS",index) * GeoModelKernelUnits::mm;
+    double value = db()->getDouble(m_PixelIBLSupport,"STAVERINGOUTERRADIUS",index) * Gaudi::Units::mm;
     if (value > 0)  return value ;
   } 
   return 0.0;
@@ -2150,7 +2151,7 @@ double OraclePixGeoManager:: IBLSupportMechanicalStaveRingFixPoint()
   //  int index = PixelStaveIndex(m_currentLD);
   int index=0;
   if (db()->testField(m_PixelIBLSupport,"STAVERINGFIXINGPOS",index)) {
-    double value = db()->getDouble(m_PixelIBLSupport,"STAVERINGFIXINGPOS",index) * GeoModelKernelUnits::mm;
+    double value = db()->getDouble(m_PixelIBLSupport,"STAVERINGFIXINGPOS",index) * Gaudi::Units::mm;
     if (value > 0)  return value ;
   } 
   return 0.0;
@@ -2161,7 +2162,7 @@ double OraclePixGeoManager:: IBLSupportMidRingWidth()
   //  int index = PixelStaveIndex(m_currentLD);
   int index=0;
   if (db()->testField(m_PixelIBLSupport,"STAVEMIDRINGWIDTH",index)) {
-    double value = db()->getDouble(m_PixelIBLSupport,"STAVEMIDRINGWIDTH",index) * GeoModelKernelUnits::mm;
+    double value = db()->getDouble(m_PixelIBLSupport,"STAVEMIDRINGWIDTH",index) * Gaudi::Units::mm;
     if (value > 0)  return value ;
   } 
   return 0.0;
@@ -2172,7 +2173,7 @@ double OraclePixGeoManager:: IBLSupportMidRingInnerRadius()
   //  int index = PixelStaveIndex(m_currentLD);
   int index=0;
   if (db()->testField(m_PixelIBLSupport,"STAVEMIDRINGINNERRADIUS",index)) {
-    double value = db()->getDouble(m_PixelIBLSupport,"STAVEMIDRINGINNERRADIUS",index) * GeoModelKernelUnits::mm;
+    double value = db()->getDouble(m_PixelIBLSupport,"STAVEMIDRINGINNERRADIUS",index) * Gaudi::Units::mm;
     if (value > 0)  return value;
   } 
   return 0.0;
@@ -2183,7 +2184,7 @@ double OraclePixGeoManager:: IBLSupportMidRingOuterRadius()
   //  int index = PixelStaveIndex(m_currentLD);
   int index=0;
   if (db()->testField(m_PixelIBLSupport,"STAVEMIDRINGOUTERRADIUS",index)) {
-    double value = db()->getDouble(m_PixelIBLSupport,"STAVEMIDRINGOUTERRADIUS",index) * GeoModelKernelUnits::mm;
+    double value = db()->getDouble(m_PixelIBLSupport,"STAVEMIDRINGOUTERRADIUS",index) * Gaudi::Units::mm;
     if (value > 0)  return value ;
   } 
   return 0.0;
@@ -2194,7 +2195,7 @@ double OraclePixGeoManager::IBLFlexMiddleGap()
   //  int index = PixelStaveIndex(m_currentLD);
   int index=0;
   if (db()->testField(m_PixelIBLFlex,"FLEXMIDGAP",index)) {
-    double value = db()->getDouble(m_PixelIBLFlex,"FLEXMIDGAP",index) * GeoModelKernelUnits::mm;
+    double value = db()->getDouble(m_PixelIBLFlex,"FLEXMIDGAP",index) * Gaudi::Units::mm;
     return value ;
   } 
   return 0.0;
@@ -2214,7 +2215,7 @@ double OraclePixGeoManager::IBLFlexDoglegLength()
   //  int index = PixelStaveIndex(m_currentLD);
   int index=0;
   if (db()->testField(m_PixelIBLFlex,"FLEXDOGLEGLENGTH",index)) {
-    double value = db()->getDouble(m_PixelIBLFlex,"FLEXDOGLEGLENGTH",index) * GeoModelKernelUnits::mm;
+    double value = db()->getDouble(m_PixelIBLFlex,"FLEXDOGLEGLENGTH",index) * Gaudi::Units::mm;
     return value ;
   } 
   return 0.0;
@@ -2226,7 +2227,7 @@ double OraclePixGeoManager::IBLStaveFlexWingWidth()
   //  int index = PixelStaveIndex(m_currentLD);
   int index=0;
   if (db()->testField(m_PixelIBLFlex,"FLEXWINGWIDTH",index)) {
-    double value = db()->getDouble(m_PixelIBLFlex,"FLEXWINGWIDTH",index) * GeoModelKernelUnits::mm;
+    double value = db()->getDouble(m_PixelIBLFlex,"FLEXWINGWIDTH",index) * Gaudi::Units::mm;
     return value ;
   } 
   return 0.0;
@@ -2237,7 +2238,7 @@ double OraclePixGeoManager::IBLStaveFlexWingThick()
   //  int index = PixelStaveIndex(m_currentLD);
   int index=0;
   if (db()->testField(m_PixelIBLFlex,"FLEXWINGTHICK",index)) {
-    double value = db()->getDouble(m_PixelIBLFlex,"FLEXWINGTHICK",index) * GeoModelKernelUnits::mm;
+    double value = db()->getDouble(m_PixelIBLFlex,"FLEXWINGTHICK",index) * Gaudi::Units::mm;
     return value ;
   } 
   return 0.0;
@@ -2248,7 +2249,7 @@ double OraclePixGeoManager::IBLFlexDoglegRatio()
   //  int index = PixelStaveIndex(m_currentLD);
   int index=0;
   if (db()->testField(m_PixelIBLFlex,"FLEXDOGLEGRATIO",index)) {
-    double value = db()->getDouble(m_PixelIBLFlex,"FLEXDOGLEGRATIO",index) * GeoModelKernelUnits::mm;
+    double value = db()->getDouble(m_PixelIBLFlex,"FLEXDOGLEGRATIO",index) * Gaudi::Units::mm;
     return value ;
   } 
   return 0.0;
@@ -2262,7 +2263,7 @@ double OraclePixGeoManager::IBLFlexDoglegHeight(int iHeight)
   //  int index = PixelStaveIndex(m_currentLD);
   int index=0;
   if (db()->testField(m_PixelIBLFlex,lname.str(),index)) {
-    double value = db()->getDouble(m_PixelIBLFlex,lname.str(),index) * GeoModelKernelUnits::mm;
+    double value = db()->getDouble(m_PixelIBLFlex,lname.str(),index) * Gaudi::Units::mm;
     return value ;
   } 
   return 0.0;
@@ -2273,7 +2274,7 @@ double OraclePixGeoManager::IBLFlexDoglegDY()
   //  int index = PixelStaveIndex(m_currentLD);
   int index=0;
   if (db()->testField(m_PixelIBLFlex,"FLEXDOGLEGDY",index)) {
-    double value = db()->getDouble(m_PixelIBLFlex,"FLEXDOGLEGDY",index) * GeoModelKernelUnits::mm;
+    double value = db()->getDouble(m_PixelIBLFlex,"FLEXDOGLEGDY",index) * Gaudi::Units::mm;
     return value ;
   } 
   return 0.0;
@@ -2287,7 +2288,7 @@ double OraclePixGeoManager::IBLFlexPP0Z(int iPos)
   //  int index = PixelStaveIndex(m_currentLD);
   int index=0;
   if (db()->testField(m_PixelIBLFlex,lname.str(),index)) {
-    double value = db()->getDouble(m_PixelIBLFlex,lname.str(),index) * GeoModelKernelUnits::mm;
+    double value = db()->getDouble(m_PixelIBLFlex,lname.str(),index) * Gaudi::Units::mm;
     return value ;
   } 
   return 0.0;
@@ -2302,7 +2303,7 @@ double OraclePixGeoManager::IBLFlexPP0Rmin(int iPos)
   //  int index = PixelStaveIndex(m_currentLD);
   int index=0;
   if (db()->testField(m_PixelIBLFlex,lname.str(),index)) {
-    double value = db()->getDouble(m_PixelIBLFlex,lname.str(),index) * GeoModelKernelUnits::mm;
+    double value = db()->getDouble(m_PixelIBLFlex,lname.str(),index) * Gaudi::Units::mm;
     return value ;
   } 
   return 0.0;
@@ -2316,7 +2317,7 @@ double OraclePixGeoManager::IBLFlexPP0Rmax(int iPos)
   //  int index = PixelStaveIndex(m_currentLD);
   int index=0;
   if (db()->testField(m_PixelIBLFlex,lname.str(),index)) {
-    double value = db()->getDouble(m_PixelIBLFlex,lname.str(),index) * GeoModelKernelUnits::mm;
+    double value = db()->getDouble(m_PixelIBLFlex,lname.str(),index) * Gaudi::Units::mm;
     return value ;
   } 
   return 0.0;
@@ -2367,10 +2368,10 @@ double OraclePixGeoManager:: IBLServiceGetMinRadialPosition(const std::string& s
       double zmin, zmax, r;
       int symm;
       if(srvType=="simple"){
-	zmin=db()->getDouble(m_PixelSimpleService,"ZMIN",ii)*GeoModelKernelUnits::mm;
-	zmax=db()->getDouble(m_PixelSimpleService,"ZMAX",ii)*GeoModelKernelUnits::mm;
+	zmin=db()->getDouble(m_PixelSimpleService,"ZMIN",ii)*Gaudi::Units::mm;
+	zmax=db()->getDouble(m_PixelSimpleService,"ZMAX",ii)*Gaudi::Units::mm;
 	symm=db()->getInt(m_PixelSimpleService,"ZSYMM",ii);
-	r=db()->getDouble(m_PixelSimpleService,"RMAX",ii)*GeoModelKernelUnits::mm;
+	r=db()->getDouble(m_PixelSimpleService,"RMAX",ii)*Gaudi::Units::mm;
       }
       else {
 	zmin=PixelServiceZMin(srvType, ii);
@@ -2417,10 +2418,10 @@ double OraclePixGeoManager:: IBLServiceGetMaxRadialPosition(const std::string& s
       double zmin, zmax, r;
       int symm;
       if(srvType=="simple"){
-	zmin=db()->getDouble(m_PixelSimpleService,"ZMIN",ii)*GeoModelKernelUnits::mm;
-	zmax=db()->getDouble(m_PixelSimpleService,"ZMAX",ii)*GeoModelKernelUnits::mm;
+	zmin=db()->getDouble(m_PixelSimpleService,"ZMIN",ii)*Gaudi::Units::mm;
+	zmax=db()->getDouble(m_PixelSimpleService,"ZMAX",ii)*Gaudi::Units::mm;
 	symm=db()->getInt(m_PixelSimpleService,"ZSYMM",ii);
-	r=db()->getDouble(m_PixelSimpleService,"RMAX",ii)*GeoModelKernelUnits::mm;
+	r=db()->getDouble(m_PixelSimpleService,"RMAX",ii)*Gaudi::Units::mm;
       }
       else {
 	zmin=PixelServiceZMin(srvType, ii);
@@ -2460,10 +2461,10 @@ double OraclePixGeoManager::PhiOfModuleZero()
 {
   // For backward compatibilty first module is at 1/2 a module division
   if (!db()->testField(m_PixelLayer,"PHIOFMODULEZERO",m_currentLD)){
-    if(NPixelSectors()>0) return 180.0*GeoModelKernelUnits::degree/NPixelSectors();
+    if(NPixelSectors()>0) return 180.0*Gaudi::Units::degree/NPixelSectors();
     return 0.;
   } else { 
-    return db()->getDouble(m_PixelLayer,"PHIOFMODULEZERO",m_currentLD) * GeoModelKernelUnits::degree;
+    return db()->getDouble(m_PixelLayer,"PHIOFMODULEZERO",m_currentLD) * Gaudi::Units::degree;
   }
 }
 
@@ -2481,7 +2482,7 @@ int OraclePixGeoManager::PixelNModule()
 double OraclePixGeoManager::PixelModuleAngle() 
 {
   int staveIndex = PixelStaveIndex(m_currentLD);
-  return db()->getDouble(m_PixelStave,"MODULETILT",staveIndex)*GeoModelKernelUnits::deg;
+  return db()->getDouble(m_PixelStave,"MODULETILT",staveIndex)*Gaudi::Units::deg;
 }
 
 double OraclePixGeoManager::PixelModuleDrDistance() 
@@ -2524,7 +2525,7 @@ double OraclePixGeoManager::PixelModuleZPositionTabulated(int etaModule, int typ
     msg(MSG::ERROR) << "Z position not found for etaModule,type =  " << etaModule << ", " << type << endmsg;
     return 0;
   }
-  return db()->getDouble(m_PixelStaveZ,"ZPOS",index) * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_PixelStaveZ,"ZPOS",index) * Gaudi::Units::mm;
 }
 
 double OraclePixGeoManager::PixelModuleShiftFlag(int etaModule) 
@@ -2537,7 +2538,7 @@ double OraclePixGeoManager::PixelModuleStaggerDistance()
 {
   int staveIndex = PixelStaveIndex(m_currentLD);
   if (!(slhc() || ibl()) || !db()->testField(m_PixelStave,"STAGGERDIST",staveIndex)) return 0; 
-  return db()->getDouble(m_PixelStave,"STAGGERDIST",staveIndex) * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_PixelStave,"STAGGERDIST",staveIndex) * Gaudi::Units::mm;
 }
 
 int OraclePixGeoManager::PixelModuleStaggerSign(int etaModule)
@@ -2690,49 +2691,49 @@ int OraclePixGeoManager::PixelTMTNumParts()
 double OraclePixGeoManager::PixelTMTWidthX1(int iPart)
 {
   if (useLegacy()) return m_legacyManager->PixelTMTWidthX1(iPart);
-  return db()->getDouble(m_PixelTMT,"WIDTHX1",iPart) * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_PixelTMT,"WIDTHX1",iPart) * Gaudi::Units::mm;
 }
 
 double OraclePixGeoManager::PixelTMTWidthX2(int iPart)
 {
   if (useLegacy()) return m_legacyManager->PixelTMTWidthX2(iPart);
-  return db()->getDouble(m_PixelTMT,"WIDTHX2",iPart) * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_PixelTMT,"WIDTHX2",iPart) * Gaudi::Units::mm;
 }
 
 double OraclePixGeoManager::PixelTMTWidthY(int iPart)
 {
   if (useLegacy()) return m_legacyManager->PixelTMTWidthY(iPart);
-  return db()->getDouble(m_PixelTMT,"WIDTHY",iPart) * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_PixelTMT,"WIDTHY",iPart) * Gaudi::Units::mm;
 }
 
 double OraclePixGeoManager::PixelTMTBaseX1(int iPart)
 {
   if (useLegacy()) return m_legacyManager->PixelTMTBaseX1(iPart);
-  return db()->getDouble(m_PixelTMT,"BASEX1",iPart) * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_PixelTMT,"BASEX1",iPart) * Gaudi::Units::mm;
 }
 
 double OraclePixGeoManager::PixelTMTBaseX2(int iPart)
 {
   if (useLegacy()) return m_legacyManager->PixelTMTBaseX2(iPart);
-  return db()->getDouble(m_PixelTMT,"BASEX2",iPart) * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_PixelTMT,"BASEX2",iPart) * Gaudi::Units::mm;
 }
 
 double OraclePixGeoManager::PixelTMTPosY(int iPart)
 {
   if (useLegacy()) return m_legacyManager->PixelTMTPosY(iPart);
-  return db()->getDouble(m_PixelTMT,"Y",iPart) * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_PixelTMT,"Y",iPart) * Gaudi::Units::mm;
 }
 
 double OraclePixGeoManager::PixelTMTPosZ1(int iPart)
 {
   if (useLegacy()) return m_legacyManager->PixelTMTPosZ1(iPart);
-  return db()->getDouble(m_PixelTMT,"Z1",iPart) * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_PixelTMT,"Z1",iPart) * Gaudi::Units::mm;
 }
 
 double OraclePixGeoManager::PixelTMTPosZ2(int iPart)
 {
   if (useLegacy()) return m_legacyManager->PixelTMTPosZ2(iPart);
-  return db()->getDouble(m_PixelTMT,"Z2",iPart) * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_PixelTMT,"Z2",iPart) * Gaudi::Units::mm;
 }
 
 bool OraclePixGeoManager::PixelTMTPerModule(int iPart)
@@ -2747,61 +2748,61 @@ bool OraclePixGeoManager::PixelTMTPerModule(int iPart)
 double OraclePixGeoManager::PixelOmegaUpperBendX()
 {
   if (useLegacy()) return m_legacyManager->PixelOmegaUpperBendX();
-  return db()->getDouble(m_PixelOmega,"UPPERBENDX") * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_PixelOmega,"UPPERBENDX") * Gaudi::Units::mm;
 }
 
 double OraclePixGeoManager::PixelOmegaUpperBendY()
 {
   if (useLegacy()) return m_legacyManager->PixelOmegaUpperBendY();
-  return db()->getDouble(m_PixelOmega,"UPPERBENDY") * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_PixelOmega,"UPPERBENDY") * Gaudi::Units::mm;
 }
 
 double OraclePixGeoManager::PixelOmegaUpperBendRadius()
 {
   if (useLegacy()) return m_legacyManager->PixelOmegaUpperBendRadius();
-  return db()->getDouble(m_PixelOmega,"UPPERBENDR") * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_PixelOmega,"UPPERBENDR") * Gaudi::Units::mm;
 }
 
 double OraclePixGeoManager::PixelOmegaLowerBendX()
 {
   if (useLegacy()) return m_legacyManager->PixelOmegaLowerBendX();
-  return db()->getDouble(m_PixelOmega,"LOWERBENDX") * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_PixelOmega,"LOWERBENDX") * Gaudi::Units::mm;
 }
 
 double OraclePixGeoManager::PixelOmegaLowerBendY()
 {
   if (useLegacy()) return m_legacyManager->PixelOmegaLowerBendY();
-  return db()->getDouble(m_PixelOmega,"LOWERBENDY") * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_PixelOmega,"LOWERBENDY") * Gaudi::Units::mm;
 }
 
 double OraclePixGeoManager::PixelOmegaLowerBendRadius()
 {
   if (useLegacy()) return m_legacyManager->PixelOmegaLowerBendRadius();
-  return db()->getDouble(m_PixelOmega,"LOWERBENDR") * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_PixelOmega,"LOWERBENDR") * Gaudi::Units::mm;
 }
 
 double OraclePixGeoManager::PixelOmegaWallThickness()
 {
   if (useLegacy()) return m_legacyManager->PixelOmegaWallThickness();
-  return db()->getDouble(m_PixelOmega,"THICK") * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_PixelOmega,"THICK") * Gaudi::Units::mm;
 }
 
 double OraclePixGeoManager::PixelOmegaLength()
 {
   if (useLegacy()) return m_legacyManager->PixelOmegaLength();
-  return db()->getDouble(m_PixelOmega,"LENGTH") * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_PixelOmega,"LENGTH") * Gaudi::Units::mm;
 }
 
 double OraclePixGeoManager::PixelOmegaStartY()
 {
   if (useLegacy()) return m_legacyManager->PixelOmegaStartY();
-  return db()->getDouble(m_PixelOmega,"STARTY") * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_PixelOmega,"STARTY") * Gaudi::Units::mm;
 }
 
 double OraclePixGeoManager::PixelOmegaEndY()
 {
   if (useLegacy()) return m_legacyManager->PixelOmegaEndY();
-  return db()->getDouble(m_PixelOmega,"ENDY") * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_PixelOmega,"ENDY") * Gaudi::Units::mm;
 }
 
 //
@@ -2811,49 +2812,49 @@ double OraclePixGeoManager::PixelOmegaEndY()
 double OraclePixGeoManager::PixelAlTubeUpperBendX()
 {
   if (useLegacy()) return m_legacyManager->PixelAlTubeUpperBendX();
-  return db()->getDouble(m_PixelAlTube,"UPPERBENDX") * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_PixelAlTube,"UPPERBENDX") * Gaudi::Units::mm;
 }
 
 double OraclePixGeoManager::PixelAlTubeUpperBendY()
 {
   if (useLegacy()) return m_legacyManager->PixelAlTubeUpperBendY();
-  return db()->getDouble(m_PixelAlTube,"UPPERBENDY") * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_PixelAlTube,"UPPERBENDY") * Gaudi::Units::mm;
 }
 
 double OraclePixGeoManager::PixelAlTubeUpperBendRadius()
 {
   if (useLegacy()) return m_legacyManager->PixelAlTubeUpperBendRadius();
-  return db()->getDouble(m_PixelAlTube,"UPPERBENDR") * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_PixelAlTube,"UPPERBENDR") * Gaudi::Units::mm;
 }
 
 double OraclePixGeoManager::PixelAlTubeLowerBendX()
 {
   if (useLegacy()) return m_legacyManager->PixelAlTubeLowerBendX();
-  return db()->getDouble(m_PixelAlTube,"LOWERBENDX") * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_PixelAlTube,"LOWERBENDX") * Gaudi::Units::mm;
 }
 
 double OraclePixGeoManager::PixelAlTubeLowerBendY()
 {
   if (useLegacy()) return m_legacyManager->PixelAlTubeLowerBendY();
-  return db()->getDouble(m_PixelAlTube,"LOWERBENDY") * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_PixelAlTube,"LOWERBENDY") * Gaudi::Units::mm;
 }
 
 double OraclePixGeoManager::PixelAlTubeLowerBendRadius()
 {
   if (useLegacy()) return m_legacyManager->PixelAlTubeLowerBendRadius();
-  return db()->getDouble(m_PixelAlTube,"LOWERBENDR") * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_PixelAlTube,"LOWERBENDR") * Gaudi::Units::mm;
 }
 
 double OraclePixGeoManager::PixelAlTubeWallThickness()
 {
   if (useLegacy()) return m_legacyManager->PixelAlTubeWallThickness();
-  return db()->getDouble(m_PixelAlTube,"THICK") * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_PixelAlTube,"THICK") * Gaudi::Units::mm;
 }
 
 double OraclePixGeoManager::PixelAlTubeLength()
 {
   if (useLegacy()) return m_legacyManager->PixelAlTubeLength();
-  return db()->getDouble(m_PixelAlTube,"LENGTH") * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_PixelAlTube,"LENGTH") * Gaudi::Units::mm;
 }
 
 //
@@ -2869,37 +2870,37 @@ int OraclePixGeoManager::PixelNumOmegaGlueElements()
 double OraclePixGeoManager::PixelOmegaGlueStartX(int index)
 {
   if (useLegacy()) return m_legacyManager->PixelOmegaGlueStartX(index);
-  return db()->getDouble(m_PixelOmegaGlue,"STARTX",index) * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_PixelOmegaGlue,"STARTX",index) * Gaudi::Units::mm;
 }
 
 double OraclePixGeoManager::PixelOmegaGlueThickness(int index)
 {
   if (useLegacy()) return m_legacyManager->PixelOmegaGlueThickness(index);
-  return db()->getDouble(m_PixelOmegaGlue,"THICK",index) * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_PixelOmegaGlue,"THICK",index) * Gaudi::Units::mm;
 }
 
 double OraclePixGeoManager::PixelOmegaGlueStartY(int index)
 {
   if (useLegacy()) return m_legacyManager->PixelOmegaGlueStartY(index);
-  return db()->getDouble(m_PixelOmegaGlue,"STARTY",index) * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_PixelOmegaGlue,"STARTY",index) * Gaudi::Units::mm;
 }
 
 double OraclePixGeoManager::PixelOmegaGlueEndY(int index)
 {
   if (useLegacy()) return m_legacyManager->PixelOmegaGlueEndY(index);
-  return db()->getDouble(m_PixelOmegaGlue,"ENDY",index) * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_PixelOmegaGlue,"ENDY",index) * Gaudi::Units::mm;
 }
 
 double OraclePixGeoManager::PixelOmegaGlueLength(int index)
 {
   if (useLegacy()) return m_legacyManager->PixelOmegaGlueLength(index);
-  return db()->getDouble(m_PixelOmegaGlue,"LENGTH",index) * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_PixelOmegaGlue,"LENGTH",index) * Gaudi::Units::mm;
 }
 
 double OraclePixGeoManager::PixelOmegaGluePosZ(int index)
 {
   if (useLegacy()) return m_legacyManager->PixelOmegaGluePosZ(index);
-  return db()->getDouble(m_PixelOmegaGlue,"Z",index) * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_PixelOmegaGlue,"Z",index) * Gaudi::Units::mm;
 }
 
 int OraclePixGeoManager::PixelOmegaGlueTypeNum(int index)
@@ -2915,45 +2916,45 @@ int OraclePixGeoManager::PixelOmegaGlueTypeNum(int index)
 double OraclePixGeoManager::PixelFluidZ1(int index)
 {
   if (useLegacy()) return m_legacyManager->PixelFluidZ1(index);
-  return db()->getDouble(m_PixelFluid,"Z1",index) * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_PixelFluid,"Z1",index) * Gaudi::Units::mm;
 }
 
 double OraclePixGeoManager::PixelFluidZ2(int index)
 {
   if (useLegacy()) return m_legacyManager->PixelFluidZ2(index);
-  return db()->getDouble(m_PixelFluid,"Z2",index) * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_PixelFluid,"Z2",index) * Gaudi::Units::mm;
 }
 
 double OraclePixGeoManager::PixelFluidThick1(int index)
 {
   if (useLegacy()) return m_legacyManager->PixelFluidThick1(index);
-  return db()->getDouble(m_PixelFluid,"THICK1",index) * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_PixelFluid,"THICK1",index) * Gaudi::Units::mm;
 }
 
 
 double OraclePixGeoManager::PixelFluidThick2(int index)
 {
   if (useLegacy()) return m_legacyManager->PixelFluidThick2(index);
-  return db()->getDouble(m_PixelFluid,"THICK2",index) * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_PixelFluid,"THICK2",index) * Gaudi::Units::mm;
 }
 
 double OraclePixGeoManager::PixelFluidWidth(int index)
 {
   if (useLegacy()) return m_legacyManager->PixelFluidWidth(index);
-  return db()->getDouble(m_PixelFluid,"WIDTH",index) * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_PixelFluid,"WIDTH",index) * Gaudi::Units::mm;
 }
 
 
 double OraclePixGeoManager::PixelFluidX(int index)
 {
   if (useLegacy()) return m_legacyManager->PixelFluidX(index);
-  return db()->getDouble(m_PixelFluid,"X",index) * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_PixelFluid,"X",index) * Gaudi::Units::mm;
 }
 
 double OraclePixGeoManager::PixelFluidY(int index)
 {
   if (useLegacy()) return m_legacyManager->PixelFluidY(index);
-  return db()->getDouble(m_PixelFluid,"Y",index) * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_PixelFluid,"Y",index) * Gaudi::Units::mm;
 }
 
 int OraclePixGeoManager::PixelFluidType(int index)
@@ -2999,25 +3000,25 @@ int OraclePixGeoManager::PixelFluidOrient(int layer, int phi)
 double OraclePixGeoManager::PixelPigtailThickness()
 {
   if (useLegacy()) return m_legacyManager->PixelPigtailThickness();
-  return db()->getDouble(m_PixelPigtail,"THICK") * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_PixelPigtail,"THICK") * Gaudi::Units::mm;
 }
 
 double OraclePixGeoManager::PixelPigtailStartY()
 {
   if (useLegacy()) return m_legacyManager->PixelPigtailStartY();
-  return db()->getDouble(m_PixelPigtail,"STARTY") * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_PixelPigtail,"STARTY") * Gaudi::Units::mm;
 }
 
 double OraclePixGeoManager::PixelPigtailEndY()
 {
   if (useLegacy()) return m_legacyManager->PixelPigtailEndY();
-  return db()->getDouble(m_PixelPigtail,"ENDY") * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_PixelPigtail,"ENDY") * Gaudi::Units::mm;
 }
 
 double OraclePixGeoManager::PixelPigtailWidthZ()
 {
   if (useLegacy()) return m_legacyManager->PixelPigtailWidthZ();
-  return db()->getDouble(m_PixelPigtail,"WIDTHZ") * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_PixelPigtail,"WIDTHZ") * Gaudi::Units::mm;
 }
 
 // Different width from the curved section in old geometry
@@ -3030,31 +3031,31 @@ double OraclePixGeoManager::PixelPigtailFlatWidthZ()
 double OraclePixGeoManager::PixelPigtailPosX()
 {
   if (useLegacy()) return m_legacyManager->PixelPigtailPosX();
-  return db()->getDouble(m_PixelPigtail,"X") * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_PixelPigtail,"X") * Gaudi::Units::mm;
 }
 
 double OraclePixGeoManager::PixelPigtailPosZ()
 {
   if (useLegacy()) return m_legacyManager->PixelPigtailPosZ();
-  return db()->getDouble(m_PixelPigtail,"Z") * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_PixelPigtail,"Z") * Gaudi::Units::mm;
 }
 
 double OraclePixGeoManager::PixelPigtailBendX()
 {
   if (useLegacy()) return m_legacyManager->PixelPigtailBendX();
-  return db()->getDouble(m_PixelPigtail,"BENDX") * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_PixelPigtail,"BENDX") * Gaudi::Units::mm;
 }
 
 double OraclePixGeoManager::PixelPigtailBendY()
 {
   if (useLegacy()) return m_legacyManager->PixelPigtailBendY();
-  return db()->getDouble(m_PixelPigtail,"BENDY") * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_PixelPigtail,"BENDY") * Gaudi::Units::mm;
 }
 
 double OraclePixGeoManager::PixelPigtailBendRMin()
 {
   if (useLegacy()) return m_legacyManager->PixelPigtailBendRMin();
-  return db()->getDouble(m_PixelPigtail,"BENDRMIN") * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_PixelPigtail,"BENDRMIN") * Gaudi::Units::mm;
 }
 
 double OraclePixGeoManager::PixelPigtailBendRMax()
@@ -3066,19 +3067,19 @@ double OraclePixGeoManager::PixelPigtailBendRMax()
 double OraclePixGeoManager::PixelPigtailBendPhiMin()
 {
   if (useLegacy()) return m_legacyManager->PixelPigtailBendPhiMin();
-  return db()->getDouble(m_PixelPigtail,"BENDPHIMIN") * GeoModelKernelUnits::deg;
+  return db()->getDouble(m_PixelPigtail,"BENDPHIMIN") * Gaudi::Units::deg;
 }
 
 double OraclePixGeoManager::PixelPigtailBendPhiMax()
 {
   if (useLegacy()) return m_legacyManager->PixelPigtailBendPhiMax();
-  return db()->getDouble(m_PixelPigtail,"BENDPHIMAX") * GeoModelKernelUnits::deg;
+  return db()->getDouble(m_PixelPigtail,"BENDPHIMAX") * Gaudi::Units::deg;
 }
 
 double OraclePixGeoManager::PixelPigtailEnvelopeLength()
 {
   if (useLegacy()) return m_legacyManager->PixelPigtailEnvelopeLength();
-  return db()->getDouble(m_PixelPigtail,"ENVLENGTH") * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_PixelPigtail,"ENVLENGTH") * Gaudi::Units::mm;
 }
 
 //
@@ -3093,37 +3094,37 @@ int OraclePixGeoManager::PixelNumConnectorElements()
 double OraclePixGeoManager::PixelConnectorWidthX(int index)
 {
   if (useLegacy()) return m_legacyManager->PixelConnectorWidthX(index);
-  return db()->getDouble(m_PixelConnector,"WIDTHX",index) * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_PixelConnector,"WIDTHX",index) * Gaudi::Units::mm;
 }
 
 double OraclePixGeoManager::PixelConnectorWidthY(int index)
 {
   if (useLegacy()) return m_legacyManager->PixelConnectorWidthY(index);
-  return db()->getDouble(m_PixelConnector,"WIDTHY",index) * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_PixelConnector,"WIDTHY",index) * Gaudi::Units::mm;
 }
 
 double OraclePixGeoManager::PixelConnectorWidthZ(int index)
 {
   if (useLegacy()) return m_legacyManager->PixelConnectorWidthZ(index);
-  return db()->getDouble(m_PixelConnector,"WIDTHZ",index) * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_PixelConnector,"WIDTHZ",index) * Gaudi::Units::mm;
 }
 
 double OraclePixGeoManager::PixelConnectorPosX(int index)
 {
   if (useLegacy()) return m_legacyManager->PixelConnectorPosX(index);
-  return db()->getDouble(m_PixelConnector,"X",index) * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_PixelConnector,"X",index) * Gaudi::Units::mm;
 }
 
 double OraclePixGeoManager::PixelConnectorPosY(int index)
 {
   if (useLegacy()) return m_legacyManager->PixelConnectorPosY(index);
-  return db()->getDouble(m_PixelConnector,"Y",index) * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_PixelConnector,"Y",index) * Gaudi::Units::mm;
 }
 
 double OraclePixGeoManager::PixelConnectorPosZ(int index)
 {
   if (useLegacy()) return m_legacyManager->PixelConnectorPosZ(index);
-  return db()->getDouble(m_PixelConnector,"Z",index) * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_PixelConnector,"Z",index) * Gaudi::Units::mm;
 }
 
 //
@@ -3387,7 +3388,7 @@ double OraclePixGeoManager::DesignPitchRP(bool isModule3D)
     return m_legacyManager->DesignPitchRP(isInnermostPixelLayer());
   } else {
     int type = designType((ibl()&&isModule3D));
-    return db()->getDouble(m_PixelReadout,"PITCHPHI",type) * GeoModelKernelUnits::mm;
+    return db()->getDouble(m_PixelReadout,"PITCHPHI",type) * Gaudi::Units::mm;
  } 
 }
 
@@ -3397,7 +3398,7 @@ double OraclePixGeoManager::DesignPitchZ(bool isModule3D)
     return m_legacyManager->DesignPitchZ(isInnermostPixelLayer());
   } else {
     int type = designType((ibl()&&isModule3D));
-    return db()->getDouble(m_PixelReadout,"PITCHETA",type) * GeoModelKernelUnits::mm;
+    return db()->getDouble(m_PixelReadout,"PITCHETA",type) * Gaudi::Units::mm;
   }
 }
 
@@ -3408,7 +3409,7 @@ double OraclePixGeoManager::DesignPitchZLong(bool isModule3D)
     return m_legacyManager->DesignPitchZLong(isInnermostPixelLayer());
   } else {
     int type = designType((ibl()&&isModule3D));
-    double pitch = db()->getDouble(m_PixelReadout,"PITCHETALONG",type) * GeoModelKernelUnits::mm;
+    double pitch = db()->getDouble(m_PixelReadout,"PITCHETALONG",type) * Gaudi::Units::mm;
     if (pitch == 0) pitch = DesignPitchZ(isModule3D);
     return pitch;
   }
@@ -3423,7 +3424,7 @@ double OraclePixGeoManager::DesignPitchZLongEnd(bool isModule3D)
     int type = designType((ibl()&&isModule3D));
     double pitch = 0;
     if (db()->testField(m_PixelReadout,"PITCHETAEND",type)) {
-      pitch = db()->getDouble(m_PixelReadout,"PITCHETAEND",type) * GeoModelKernelUnits::mm;
+      pitch = db()->getDouble(m_PixelReadout,"PITCHETAEND",type) * Gaudi::Units::mm;
     }
     if (pitch == 0) pitch = DesignPitchZLong(isModule3D);
     return pitch;
@@ -3518,18 +3519,18 @@ double  OraclePixGeoManager::PixelDiskRMin(bool includeSupports)
   if (!slhc()) {
     return db()->getDouble(m_PixelDisk,"RIDISK",m_currentLD)*mmcm();
   } else {
-    double result = db()->getDouble(m_PixelDisk,"RMIN",m_currentLD) * GeoModelKernelUnits::mm;
+    double result = db()->getDouble(m_PixelDisk,"RMIN",m_currentLD) * Gaudi::Units::mm;
     if(includeSupports) {
       result = std::min( result, PixelDiskSupportRMin(0) );
     }
     int etaInner = 0; // Inner ring
     int ringType = getDiskRingType(m_currentLD,etaInner); 
     if (ringType >= 0 && db()->testField(m_PixelRing,"RMIN",ringType) && db()->getDouble(m_PixelRing,"RMIN",ringType)) {
-      double ringRmin = db()->getDouble(m_PixelRing,"RMIN",ringType) * GeoModelKernelUnits::mm - 0.01*GeoModelKernelUnits::mm;  // ring envelope has a 0.01mm safety
+      double ringRmin = db()->getDouble(m_PixelRing,"RMIN",ringType) * Gaudi::Units::mm - 0.01*Gaudi::Units::mm;  // ring envelope has a 0.01mm safety
       if (ringRmin < result) {
 	msg(MSG::WARNING) << "Ring rmin is less than disk rmin for disk : " << m_currentLD 
 			  << ". Ring rmin: " << ringRmin << ", Disk rmin: " << result <<endmsg;
-	result = ringRmin - 0.1*GeoModelKernelUnits::mm; // NB. ring envelope has a 0.01mm saftey added, but we add a little more.
+	result = ringRmin - 0.1*Gaudi::Units::mm; // NB. ring envelope has a 0.01mm saftey added, but we add a little more.
       }
     }
     return result;
@@ -3539,7 +3540,7 @@ double  OraclePixGeoManager::PixelDiskRMin(bool includeSupports)
 // SLHC only
 double OraclePixGeoManager::PixelDiskRMax(bool includeSupports)
 {
-  double result = db()->getDouble(m_PixelDisk,"RMAX",m_currentLD) * GeoModelKernelUnits::mm;
+  double result = db()->getDouble(m_PixelDisk,"RMAX",m_currentLD) * Gaudi::Units::mm;
   if(includeSupports) {
     result = std::max( result, PixelDiskSupportRMax(2) );
   }
@@ -3551,11 +3552,11 @@ double OraclePixGeoManager::PixelDiskRMax(bool includeSupports)
     // This is not so nice as PixelRingRMax can potentially call PixelDiskRMax, however it
     // only calls PixelDiskRMax if the above condition is not satisified. So hopefully OK.
     // TODO: Code could do with some improvement to make it less fragile.
-    double ringRmax  = PixelRingRMax(0.01*GeoModelKernelUnits::mm); // ring envelope has a 0.01mm safety
+    double ringRmax  = PixelRingRMax(0.01*Gaudi::Units::mm); // ring envelope has a 0.01mm safety
     if (ringRmax > result) {
       msg(MSG::WARNING) << "Ring rmax is greater than disk rmax for disk : " << m_currentLD 
 			<< ". Ring rmax: " << ringRmax << ", Disk rmax: " << result <<endmsg;
-      result = ringRmax + 0.1*GeoModelKernelUnits::mm; // NB. ring envelope has a 0.01mm saftey added, but we add a little more.
+      result = ringRmax + 0.1*Gaudi::Units::mm; // NB. ring envelope has a 0.01mm saftey added, but we add a little more.
     }
   }
   // restore state
@@ -3591,7 +3592,7 @@ double OraclePixGeoManager::PixelRingRcenter() {
   // If ring rmin is present and non-zero use that.
   int ringType = getDiskRingType(m_currentLD,m_eta); 
   if (ringType >=0 && db()->testField(m_PixelRing,"RMIN",ringType) && db()->getDouble(m_PixelRing,"RMIN",ringType)) {
-    return db()->getDouble(m_PixelRing,"RMIN",ringType)  * GeoModelKernelUnits::mm + PixelModuleLength()/2;
+    return db()->getDouble(m_PixelRing,"RMIN",ringType)  * Gaudi::Units::mm + PixelModuleLength()/2;
   } else { 
     // Otherwise calculate from disk rmin/rmax
     int nrings = PixelDiskNRings();
@@ -3614,7 +3615,7 @@ double OraclePixGeoManager::PixelRingRMin(double safety) {
   // If ring rmin is present and non-zero use that.
   int ringType = getDiskRingType(m_currentLD,m_eta); 
   if (ringType >= 0 && db()->testField(m_PixelRing,"RMIN",ringType) && db()->getDouble(m_PixelRing,"RMIN",ringType)) {
-    return db()->getDouble(m_PixelRing,"RMIN",ringType)  * GeoModelKernelUnits::mm - std::abs(safety); 
+    return db()->getDouble(m_PixelRing,"RMIN",ringType)  * Gaudi::Units::mm - std::abs(safety); 
   } else {
     // Otherwise calculated it from disk rmin
     if(m_eta==0) return PixelDiskRMin() - std::abs(safety);
@@ -3660,7 +3661,7 @@ double OraclePixGeoManager::PixelRingZpos() {
 double OraclePixGeoManager::PixelRingZoffset() 
 {
   int index = getDiskRingIndex(m_currentLD,m_eta);
-  return std::abs(db()->getDouble(m_PixelDiskRing,"ZOFFSET",index))*GeoModelKernelUnits::mm;
+  return std::abs(db()->getDouble(m_PixelDiskRing,"ZOFFSET",index))*Gaudi::Units::mm;
 }
 
 // SLHC only
@@ -3674,13 +3675,13 @@ int OraclePixGeoManager::PixelRingSide()
 double OraclePixGeoManager::PixelRingStagger() 
 {
   int ringType = getDiskRingType(m_currentLD,m_eta);
-  return db()->getDouble(m_PixelRing,"STAGGER",ringType)*GeoModelKernelUnits::mm;
+  return db()->getDouble(m_PixelRing,"STAGGER",ringType)*Gaudi::Units::mm;
 }
 
 
 // SLHC only
 //int OraclePixGeoManager::PixelRingNmodules() {
-//  return db()->getInt("PixelRing","NMODULES",ringIndex)*GeoModelKernelUnits::mm();
+//  return db()->getInt("PixelRing","NMODULES",ringIndex)*Gaudi::Units::mm();
 //}
 
 
@@ -3770,7 +3771,7 @@ double OraclePixGeoManager::PixelModuleThicknessN() {
   // is the max of ThicknessP and thickness from the module center to
   // the outer surface of the hybrid plus some safety.
   //
-  double safety = 0.01*GeoModelKernelUnits::mm;
+  double safety = 0.01*Gaudi::Units::mm;
   double thickn = 0.5 * PixelBoardThickness()
     + PixelHybridThickness() + safety;
   double thick = std::max(thickn, PixelModuleThicknessP());
@@ -3785,7 +3786,7 @@ double OraclePixGeoManager::PixelModuleThicknessP() {
   // is thickness from the module center to the outer surface of the
   // chips plus some safety.
 
-  double safety = 0.01*GeoModelKernelUnits::mm;
+  double safety = 0.01*Gaudi::Units::mm;
   double thick = 0.5 * PixelBoardThickness() +
     PixelChipThickness() + PixelChipGap() + safety;
 
@@ -3829,39 +3830,39 @@ double OraclePixGeoManager::PixelModuleLength() {
 
 // return angle of the telescope
 double OraclePixGeoManager::DBMAngle() {
-  return db()->getDouble(m_DBMTelescope,"ANGLE")*GeoModelKernelUnits::deg;
+  return db()->getDouble(m_DBMTelescope,"ANGLE")*Gaudi::Units::deg;
 }
 
 // return dimension of the DBM telescope
 double OraclePixGeoManager::DBMTelescopeX() {
-   return db()->getDouble(m_DBMTelescope,"WIDTH")*GeoModelKernelUnits::mm;
+   return db()->getDouble(m_DBMTelescope,"WIDTH")*Gaudi::Units::mm;
 }
 double OraclePixGeoManager::DBMTelescopeY() {
-   return db()->getDouble(m_DBMTelescope,"HEIGHT")*GeoModelKernelUnits::mm;
+   return db()->getDouble(m_DBMTelescope,"HEIGHT")*Gaudi::Units::mm;
 }
 double OraclePixGeoManager::DBMTelescopeZ() {
-   return db()->getDouble(m_DBMTelescope,"LENGTH")*GeoModelKernelUnits::mm;
+   return db()->getDouble(m_DBMTelescope,"LENGTH")*Gaudi::Units::mm;
 }
 
 // return height and length of the module cage having a 3-layers structure
 double OraclePixGeoManager::DBMModuleCageY() {
-  return db()->getDouble(m_DBMTelescope,"CAGE_HEIGHT")*GeoModelKernelUnits::mm;
+  return db()->getDouble(m_DBMTelescope,"CAGE_HEIGHT")*Gaudi::Units::mm;
 } 
 double OraclePixGeoManager::DBMModuleCageZ() {
-  return db()->getDouble(m_DBMTelescope,"CAGE_LENGTH")*GeoModelKernelUnits::mm;
+  return db()->getDouble(m_DBMTelescope,"CAGE_LENGTH")*Gaudi::Units::mm;
 } 
 
 // return layer spacing
 double OraclePixGeoManager::DBMSpacingZ() {
-  return db()->getDouble(m_DBMCage,"ZSPACING")*GeoModelKernelUnits::mm;
+  return db()->getDouble(m_DBMCage,"ZSPACING")*Gaudi::Units::mm;
 }
 double OraclePixGeoManager::DBMSpacingRadial() {
   if (m_currentLD == 0)
-    return db()->getDouble(m_DBMCage,"RADIAL_SPACE_0")*GeoModelKernelUnits::mm;
+    return db()->getDouble(m_DBMCage,"RADIAL_SPACE_0")*Gaudi::Units::mm;
   else if (m_currentLD == 1)
-    return db()->getDouble(m_DBMCage,"RADIAL_SPACE_1")*GeoModelKernelUnits::mm;
+    return db()->getDouble(m_DBMCage,"RADIAL_SPACE_1")*Gaudi::Units::mm;
   else if (m_currentLD == 2)
-    return db()->getDouble(m_DBMCage,"RADIAL_SPACE_2")*GeoModelKernelUnits::mm;
+    return db()->getDouble(m_DBMCage,"RADIAL_SPACE_2")*Gaudi::Units::mm;
   else {
      msg(MSG::WARNING) << "DBMSpacingRadial() is not found" << endmsg;
      return 0.;
@@ -3869,174 +3870,174 @@ double OraclePixGeoManager::DBMSpacingRadial() {
 }
 // return dimension of bracket unit
 double OraclePixGeoManager::DBMBracketX() {
-  return db()->getDouble(m_DBMBracket,"WIDTH")*GeoModelKernelUnits::mm;
+  return db()->getDouble(m_DBMBracket,"WIDTH")*Gaudi::Units::mm;
 }
 double OraclePixGeoManager::DBMBracketY() {
-  return db()->getDouble(m_DBMBracket,"HEIGHT")*GeoModelKernelUnits::mm;
+  return db()->getDouble(m_DBMBracket,"HEIGHT")*Gaudi::Units::mm;
 }
 double OraclePixGeoManager::DBMBracketZ() {
-  return db()->getDouble(m_DBMBracket,"THICKNESS")*GeoModelKernelUnits::mm;
+  return db()->getDouble(m_DBMBracket,"THICKNESS")*Gaudi::Units::mm;
 }
 double OraclePixGeoManager::DBMTrapezBackTheta() {
-  return db()->getDouble(m_DBMBracket,"TRAPEZBACK_THETA")*GeoModelKernelUnits::deg;
+  return db()->getDouble(m_DBMBracket,"TRAPEZBACK_THETA")*Gaudi::Units::deg;
 }
 double OraclePixGeoManager::DBMTrapezBackX() {
-  return db()->getDouble(m_DBMBracket,"TRAPEZBACK_WIDTH")*GeoModelKernelUnits::mm;
+  return db()->getDouble(m_DBMBracket,"TRAPEZBACK_WIDTH")*Gaudi::Units::mm;
 }
 double OraclePixGeoManager::DBMTrapezBackY() {
-  return db()->getDouble(m_DBMBracket,"TRAPEZBACK_HEIGHT")*GeoModelKernelUnits::mm;
+  return db()->getDouble(m_DBMBracket,"TRAPEZBACK_HEIGHT")*Gaudi::Units::mm;
 }
 double OraclePixGeoManager::DBMTrapezBackShortZ() {
-  return db()->getDouble(m_DBMBracket,"TRAPEZBACK_ZSHORT")*GeoModelKernelUnits::mm;
+  return db()->getDouble(m_DBMBracket,"TRAPEZBACK_ZSHORT")*Gaudi::Units::mm;
 }
 double OraclePixGeoManager::DBMBrcktWindowX() {
-  return db()->getDouble(m_DBMBracket,"WINDOW_WIDTH")*GeoModelKernelUnits::mm;
+  return db()->getDouble(m_DBMBracket,"WINDOW_WIDTH")*Gaudi::Units::mm;
 }
 double OraclePixGeoManager::DBMBrcktWindowY() {
-  return db()->getDouble(m_DBMBracket,"WINDOW_HEIGHT")*GeoModelKernelUnits::mm;
+  return db()->getDouble(m_DBMBracket,"WINDOW_HEIGHT")*Gaudi::Units::mm;
 }
 double OraclePixGeoManager::DBMBrcktWindowOffset() {
-  return db()->getDouble(m_DBMBracket,"WINDOW_OFFSET")*GeoModelKernelUnits::mm;
+  return db()->getDouble(m_DBMBracket,"WINDOW_OFFSET")*Gaudi::Units::mm;
 }
 double OraclePixGeoManager::DBMBrcktWindowCenterZ() {
-  return db()->getDouble(m_DBMBracket,"WINDOW_CENTERZ")*GeoModelKernelUnits::mm;
+  return db()->getDouble(m_DBMBracket,"WINDOW_CENTERZ")*Gaudi::Units::mm;
 }
 double OraclePixGeoManager::DBMBrcktTopBlockZ() {
-  return db()->getDouble(m_DBMBracket,"TOPBLOCK_THICK")*GeoModelKernelUnits::mm;
+  return db()->getDouble(m_DBMBracket,"TOPBLOCK_THICK")*Gaudi::Units::mm;
 }
 double OraclePixGeoManager::DBMBrcktSideBlockX() {
-  return db()->getDouble(m_DBMBracket,"SIDEBLOCK_WIDTH")*GeoModelKernelUnits::mm;
+  return db()->getDouble(m_DBMBracket,"SIDEBLOCK_WIDTH")*Gaudi::Units::mm;
 }
 double OraclePixGeoManager::DBMBrcktSideBlockY() {
-  return db()->getDouble(m_DBMBracket,"SIDEBLOCK_HEIGHT")*GeoModelKernelUnits::mm;
+  return db()->getDouble(m_DBMBracket,"SIDEBLOCK_HEIGHT")*Gaudi::Units::mm;
 }
 double OraclePixGeoManager::DBMBrcktLockZ() {
-  return db()->getDouble(m_DBMBracket,"LOCK_THICK")*GeoModelKernelUnits::mm;
+  return db()->getDouble(m_DBMBracket,"LOCK_THICK")*Gaudi::Units::mm;
 }
 double OraclePixGeoManager::DBMBrcktLockY() {
-  return db()->getDouble(m_DBMBracket,"LOCK_HEIGHT")*GeoModelKernelUnits::mm;
+  return db()->getDouble(m_DBMBracket,"LOCK_HEIGHT")*Gaudi::Units::mm;
 }
 double OraclePixGeoManager::DBMBrcktFinLongZ() {
-  return db()->getDouble(m_DBMBracket,"COOLINGFIN_ZLONG")*GeoModelKernelUnits::mm;
+  return db()->getDouble(m_DBMBracket,"COOLINGFIN_ZLONG")*Gaudi::Units::mm;
 }
 double OraclePixGeoManager::DBMBrcktFinHeight() {
-  return db()->getDouble(m_DBMBracket,"COOLINGFIN_HEIGHT")*GeoModelKernelUnits::mm;
+  return db()->getDouble(m_DBMBracket,"COOLINGFIN_HEIGHT")*Gaudi::Units::mm;
 }
 double OraclePixGeoManager::DBMBrcktFinThick() {
-  return db()->getDouble(m_DBMBracket,"COOLINGFIN_THICK")*GeoModelKernelUnits::mm;
+  return db()->getDouble(m_DBMBracket,"COOLINGFIN_THICK")*Gaudi::Units::mm;
 }
 double OraclePixGeoManager::DBMBrcktFinPos() {
-  return db()->getDouble(m_DBMBracket,"COOLINGFIN_POS")*GeoModelKernelUnits::mm;
+  return db()->getDouble(m_DBMBracket,"COOLINGFIN_POS")*Gaudi::Units::mm;
 }
 
 // return spacing between V-slide and first layer
 double OraclePixGeoManager::DBMSpace() {
-  return db()->getDouble(m_DBMCage,"SPACING1")*GeoModelKernelUnits::mm;
+  return db()->getDouble(m_DBMCage,"SPACING1")*Gaudi::Units::mm;
 }
 
 // return dimensions of the main plate
 double OraclePixGeoManager::DBMMainPlateX() {
-  return db()->getDouble(m_DBMCage,"MAINPLATE_WIDTH")*GeoModelKernelUnits::mm;
+  return db()->getDouble(m_DBMCage,"MAINPLATE_WIDTH")*Gaudi::Units::mm;
 }
 double OraclePixGeoManager::DBMMainPlateY() {
-  return db()->getDouble(m_DBMCage,"MAINPLATE_HEIGHT")*GeoModelKernelUnits::mm;
+  return db()->getDouble(m_DBMCage,"MAINPLATE_HEIGHT")*Gaudi::Units::mm;
 }
 double OraclePixGeoManager::DBMMainPlateZ() {
-  return db()->getDouble(m_DBMCage,"MAINPLATE_THICK")*GeoModelKernelUnits::mm;
+  return db()->getDouble(m_DBMCage,"MAINPLATE_THICK")*Gaudi::Units::mm;
 }
 double OraclePixGeoManager::DBMMPlateWindowWidth() {
-  return db()->getDouble(m_DBMCage,"MPWINDOW_WIDTH")*GeoModelKernelUnits::mm;
+  return db()->getDouble(m_DBMCage,"MPWINDOW_WIDTH")*Gaudi::Units::mm;
 }
 double OraclePixGeoManager::DBMMPlateWindowHeight() {
-  return db()->getDouble(m_DBMCage,"MPWINDOW_HEIGHT")*GeoModelKernelUnits::mm;
+  return db()->getDouble(m_DBMCage,"MPWINDOW_HEIGHT")*Gaudi::Units::mm;
 }
 double OraclePixGeoManager::DBMMPlateWindowPos() {
-  return db()->getDouble(m_DBMCage,"MPWINDOW_POS")*GeoModelKernelUnits::mm;
+  return db()->getDouble(m_DBMCage,"MPWINDOW_POS")*Gaudi::Units::mm;
 }
 // return dimensions of aluminium side plates
 double OraclePixGeoManager::DBMCoolingSidePlateX() {
-  return db()->getDouble(m_DBMCage,"SIDEPLATE_THICK")*GeoModelKernelUnits::mm;
+  return db()->getDouble(m_DBMCage,"SIDEPLATE_THICK")*Gaudi::Units::mm;
 }
 double OraclePixGeoManager::DBMCoolingSidePlateY() {
-  return db()->getDouble(m_DBMCage,"SIDEPLATE_HEIGHT")*GeoModelKernelUnits::mm;
+  return db()->getDouble(m_DBMCage,"SIDEPLATE_HEIGHT")*Gaudi::Units::mm;
 }
 double OraclePixGeoManager::DBMCoolingSidePlateZ() {
-  return db()->getDouble(m_DBMCage,"SIDEPLATE_LENGTH")*GeoModelKernelUnits::mm;
+  return db()->getDouble(m_DBMCage,"SIDEPLATE_LENGTH")*Gaudi::Units::mm;
 }
 double OraclePixGeoManager::DBMCoolingSidePlatePos() {
-  return db()->getDouble(m_DBMCage,"SIDEPLATE_POS")*GeoModelKernelUnits::mm;
+  return db()->getDouble(m_DBMCage,"SIDEPLATE_POS")*Gaudi::Units::mm;
 }
 
 // return dimension of sensor, chip and ceramic
 double OraclePixGeoManager::DBMDiamondX() {
-  return db()->getDouble(m_DBMModule,"DIAMOND_WIDTH")*GeoModelKernelUnits::mm;
+  return db()->getDouble(m_DBMModule,"DIAMOND_WIDTH")*Gaudi::Units::mm;
 }
 double OraclePixGeoManager::DBMDiamondY() {
-  return db()->getDouble(m_DBMModule,"DIAMOND_HEIGHT")*GeoModelKernelUnits::mm;
+  return db()->getDouble(m_DBMModule,"DIAMOND_HEIGHT")*Gaudi::Units::mm;
 }
 double OraclePixGeoManager::DBMDiamondZ() {
-  return db()->getDouble(m_DBMModule,"DIAMOND_THICK")*GeoModelKernelUnits::mm;
+  return db()->getDouble(m_DBMModule,"DIAMOND_THICK")*Gaudi::Units::mm;
 }
 double OraclePixGeoManager::DBMFEI4X() {
-  return db()->getDouble(m_DBMModule,"FEI4_WIDTH")*GeoModelKernelUnits::mm;
+  return db()->getDouble(m_DBMModule,"FEI4_WIDTH")*Gaudi::Units::mm;
 }
 double OraclePixGeoManager::DBMFEI4Y() {
-  return db()->getDouble(m_DBMModule,"FEI4_HEIGHT")*GeoModelKernelUnits::mm;
+  return db()->getDouble(m_DBMModule,"FEI4_HEIGHT")*Gaudi::Units::mm;
 }
 double OraclePixGeoManager::DBMFEI4Z() {
-  return db()->getDouble(m_DBMModule,"FEI4_THICK")*GeoModelKernelUnits::mm;
+  return db()->getDouble(m_DBMModule,"FEI4_THICK")*Gaudi::Units::mm;
 }
 double OraclePixGeoManager::DBMCeramicX() {
-  return db()->getDouble(m_DBMModule,"CERAMIC_WIDTH")*GeoModelKernelUnits::mm;
+  return db()->getDouble(m_DBMModule,"CERAMIC_WIDTH")*Gaudi::Units::mm;
 }
 double OraclePixGeoManager::DBMCeramicY() {
-  return db()->getDouble(m_DBMModule,"CERAMIC_HEIGHT")*GeoModelKernelUnits::mm;
+  return db()->getDouble(m_DBMModule,"CERAMIC_HEIGHT")*Gaudi::Units::mm;
 }
 double OraclePixGeoManager::DBMCeramicZ() {
-  return db()->getDouble(m_DBMModule,"CERAMIC_THICK")*GeoModelKernelUnits::mm;
+  return db()->getDouble(m_DBMModule,"CERAMIC_THICK")*Gaudi::Units::mm;
 }
 double OraclePixGeoManager::DBMAirGap() {
-  return db()->getDouble(m_DBMModule,"AIR_GAP")*GeoModelKernelUnits::mm;
+  return db()->getDouble(m_DBMModule,"AIR_GAP")*Gaudi::Units::mm;
 }
 double OraclePixGeoManager::DBMKaptonZ() {
-  return db()->getDouble(m_DBMModule,"KAPTONZ")*GeoModelKernelUnits::mm;
+  return db()->getDouble(m_DBMModule,"KAPTONZ")*Gaudi::Units::mm;
 }
 
 // flex support
 double OraclePixGeoManager::DBMFlexSupportX() {
-  return db()->getDouble(m_DBMCage,"FLEXSUPP_WIDTH")*GeoModelKernelUnits::mm;
+  return db()->getDouble(m_DBMCage,"FLEXSUPP_WIDTH")*Gaudi::Units::mm;
 }
 double OraclePixGeoManager::DBMFlexSupportY() {
-    return db()->getDouble(m_DBMCage,"FLEXSUPP_HEIGHT")*GeoModelKernelUnits::mm;
+    return db()->getDouble(m_DBMCage,"FLEXSUPP_HEIGHT")*Gaudi::Units::mm;
 }
 double OraclePixGeoManager::DBMFlexSupportZ() {
-  return db()->getDouble(m_DBMCage,"FLEXSUPP_THICK")*GeoModelKernelUnits::mm;
+  return db()->getDouble(m_DBMCage,"FLEXSUPP_THICK")*Gaudi::Units::mm;
 }
 double OraclePixGeoManager::DBMFlexSupportOffset() {
-    return db()->getDouble(m_DBMCage, "FLEXSUPP_OFFSET")*GeoModelKernelUnits::mm;
+    return db()->getDouble(m_DBMCage, "FLEXSUPP_OFFSET")*Gaudi::Units::mm;
 }
 
 // return radius of supporting rod
 double OraclePixGeoManager::DBMRodRadius() {
-  return db()->getDouble(m_DBMCage,"ROD_RADIUS")*GeoModelKernelUnits::mm;
+  return db()->getDouble(m_DBMCage,"ROD_RADIUS")*Gaudi::Units::mm;
 }
 // return distance between center of rods
 double OraclePixGeoManager::DBMMPlateRod2RodY() {
-  return db()->getDouble(m_DBMCage,"ROD2ROD_VERT")*GeoModelKernelUnits::mm;
+  return db()->getDouble(m_DBMCage,"ROD2ROD_VERT")*Gaudi::Units::mm;
 }
 double OraclePixGeoManager::DBMMPlateRod2RodX() {
-  return db()->getDouble(m_DBMCage,"ROD2ROD_HOR")*GeoModelKernelUnits::mm;
+  return db()->getDouble(m_DBMCage,"ROD2ROD_HOR")*Gaudi::Units::mm;
 }
 
 // radius and thickness of PP0 board
 double OraclePixGeoManager::DBMPP0RIn() {
-  return db()->getDouble(m_DBMTelescope,"PP0_RIN")*GeoModelKernelUnits::mm;
+  return db()->getDouble(m_DBMTelescope,"PP0_RIN")*Gaudi::Units::mm;
 }
 double OraclePixGeoManager::DBMPP0ROut() {
-  return db()->getDouble(m_DBMTelescope,"PP0_ROUT")*GeoModelKernelUnits::mm;
+  return db()->getDouble(m_DBMTelescope,"PP0_ROUT")*Gaudi::Units::mm;
 }
 double OraclePixGeoManager::DBMPP0Thick() {
-  return db()->getDouble(m_DBMTelescope,"PP0_THICK")*GeoModelKernelUnits::mm;
+  return db()->getDouble(m_DBMTelescope,"PP0_THICK")*Gaudi::Units::mm;
 }
 
 
diff --git a/InnerDetector/InDetDetDescr/PixelGeoModel/src/OraclePixGeoManager.h b/InnerDetector/InDetDetDescr/PixelGeoModel/src/OraclePixGeoManager.h
index 04dbd659378bc69bdbaae11333a5d1c2ad898d6c..776fbace992caca2143c06e202d305282914a995 100644
--- a/InnerDetector/InDetDetDescr/PixelGeoModel/src/OraclePixGeoManager.h
+++ b/InnerDetector/InDetDetDescr/PixelGeoModel/src/OraclePixGeoManager.h
@@ -169,7 +169,7 @@ class OraclePixGeoManager : public PixelGeometryManager {
   // db version
   int m_dbVersion;
 
-  // default length unit set according to db version (GeoModelKernelUnits::mm or GeoModelKernelUnits::cm)
+  // default length unit set according to db version (Gaudi::Units::mm or Gaudi::Units::cm)
   double m_defaultLengthUnit;
 
  public:
@@ -836,7 +836,7 @@ class OraclePixGeoManager : public PixelGeometryManager {
   double CalculateThickness(double,std::string);
   int determineDbVersion();
   void addDefaultMaterials();
-  // return default length unit (GeoModelKernelUnits::mm or GeoModelKernelUnits::cm)
+  // return default length unit (Gaudi::Units::mm or Gaudi::Units::cm)
   double mmcm() {return m_defaultLengthUnit;}
 
 };
diff --git a/InnerDetector/InDetDetDescr/PixelGeoModel/src/PixelDetectorDC1DC2.cxx b/InnerDetector/InDetDetDescr/PixelGeoModel/src/PixelDetectorDC1DC2.cxx
index a945c0463b074ebe0f584950a2d909c115fa3b0f..0bc7cd79ca3c2156b2e37a8a5817b68dc86f9f4d 100644
--- a/InnerDetector/InDetDetDescr/PixelGeoModel/src/PixelDetectorDC1DC2.cxx
+++ b/InnerDetector/InDetDetDescr/PixelGeoModel/src/PixelDetectorDC1DC2.cxx
@@ -28,6 +28,7 @@
 #include "GeoModelKernel/GeoTransform.h"
 #include "GeoModelKernel/GeoTube.h"
 #include "GeoModelKernel/GeoTubs.h"
+#include "GaudiKernel/PhysicalConstants.h"
 #include "GeoModelInterfaces/IGeoModelSvc.h"
 #include "GeoModelInterfaces/StoredMaterialManager.h"
 #include "Identifier/Identifier.h"
@@ -152,19 +153,19 @@ double GeoPixelCable::Length() {
 
 double GeoPixelCable::Thickness() {
   //
-  // This is calculated from the GeoModelKernelUnits::rad length of the cables and their mass
+  // This is calculated from the Gaudi::Units::rad length of the cables and their mass
   // I have to go back on this later when I'll have defined a material
   // manager, for the time being I get the thickness by atlsim, using dtree
   // anf hardwire the numbers in the code...
   // I have to come back on the thickness using the cables recipes
   //
-  if(m_moduleNumber == 0) return 2.*0.0028412*GeoModelKernelUnits::cm;
-  if(m_moduleNumber == 1) return 2.*0.0056795*GeoModelKernelUnits::cm;
-  if(m_moduleNumber == 2) return 2.*0.0056830*GeoModelKernelUnits::cm;
-  if(m_moduleNumber == 3) return 2.*0.0056763*GeoModelKernelUnits::cm;
-  if(m_moduleNumber == 4) return 2.*0.0056752*GeoModelKernelUnits::cm;
-  if(m_moduleNumber == 5) return 2.*0.0057058*GeoModelKernelUnits::cm;
-  if(m_moduleNumber == 6) return 2.*0.0056818*GeoModelKernelUnits::cm;
+  if(m_moduleNumber == 0) return 2.*0.0028412*Gaudi::Units::cm;
+  if(m_moduleNumber == 1) return 2.*0.0056795*Gaudi::Units::cm;
+  if(m_moduleNumber == 2) return 2.*0.0056830*Gaudi::Units::cm;
+  if(m_moduleNumber == 3) return 2.*0.0056763*Gaudi::Units::cm;
+  if(m_moduleNumber == 4) return 2.*0.0056752*Gaudi::Units::cm;
+  if(m_moduleNumber == 5) return 2.*0.0057058*Gaudi::Units::cm;
+  if(m_moduleNumber == 6) return 2.*0.0056818*Gaudi::Units::cm;
 
   return 0.;
 
@@ -249,7 +250,7 @@ GeoVPhysVol* GeoPixelDisk::Build( ) {
   //
   GeoPixelSubDisk psd(theSensor);
   double zpos = -m_gmt_mgr->PixelECSiDz1()/2.;
-  double angle = 360.*GeoModelKernelUnits::deg/ (float) m_gmt_mgr->PixelECNSectors1();
+  double angle = 360.*Gaudi::Units::deg/ (float) m_gmt_mgr->PixelECNSectors1();
   GeoTrf::Translation3D pos(0.,0.,zpos);
 
   // Set numerology
@@ -261,7 +262,7 @@ GeoVPhysVol* GeoPixelDisk::Build( ) {
   m_gmt_mgr->SetEta(0);
   for (int ii = 0; ii <  m_gmt_mgr->PixelECNSectors1(); ii++) {
     m_gmt_mgr->SetPhi(ii);
-    GeoTrf::Transform3D rm = GeoTrf::RotateZ3D(ii*angle+angle/2.)*GeoTrf::RotateX3D(180.*GeoModelKernelUnits::deg);
+    GeoTrf::Transform3D rm = GeoTrf::RotateZ3D(ii*angle+angle/2.)*GeoTrf::RotateX3D(180.*Gaudi::Units::deg);
     GeoAlignableTransform* xform = new GeoAlignableTransform(GeoTrf::Transform3D(pos*rm));
     GeoVPhysVol * modulePhys = psd.Build();
     GeoNameTag* tag = new GeoNameTag("DiskSector");
@@ -328,7 +329,7 @@ double GeoPixelDisk::Thickness() {
   // 7-1 I switch to the minimum thickness possible as the cables are right
   // outside this volume.
   //
-  //  return 10*GeoModelKernelUnits::mm;
+  //  return 10*Gaudi::Units::mm;
   double tck = 2*(m_gmt_mgr->PixelBoardThickness()
                   +std::max(m_gmt_mgr->PixelHybridThickness(),m_gmt_mgr->PixelChipThickness()));
   tck += std::max(m_gmt_mgr->PixelECSiDz1(),m_gmt_mgr->PixelECSiDz2());
@@ -593,7 +594,7 @@ GeoVPhysVol* GeoPixelEnvelope::Build( ) {
   envelopePhys->add(xform);
   envelopePhys->add(pec.Build() );
   m_gmt_mgr->SetNeg();
-  GeoTrf::RotateX3D rm(180.*GeoModelKernelUnits::deg);
+  GeoTrf::RotateX3D rm(180.*Gaudi::Units::deg);
   xform = new GeoTransform(GeoTrf::Transform3D(GeoTrf::Translation3D(0.,0.,-zpos)*rm));
   tag  = new GeoNameTag("EndCap 2");
   envelopePhys->add(tag);
@@ -828,7 +829,7 @@ GeoVPhysVol* GeoPixelLayer::Build() {
   //
   // This is the maximum possible w/o going out of the mother volume!
   //
-  double LayerThickness = 8.499*GeoModelKernelUnits::mm;
+  double LayerThickness = 8.499*Gaudi::Units::mm;
   const GeoMaterial* air = m_mat_mgr->getMaterial("std::Air");
   //
   // Layer dimensions from the geometry manager
@@ -849,7 +850,7 @@ GeoVPhysVol* GeoPixelLayer::Build() {
   GeoPixelLadder pl(theSensor);
   GeoPixelTubeCables ptc;
   int nsectors = m_gmt_mgr->NPixelSectors();
-  double angle=360./nsectors*GeoModelKernelUnits::deg;
+  double angle=360./nsectors*Gaudi::Units::deg;
   double layerradius = m_gmt_mgr->PixelLayerRadius();
   double xcblpos =  layerradius + (pl.Thickness()/2.+ptc.Thickness()/2)/cos(m_gmt_mgr->PixelLadderTilt());
   GeoTrf::Vector3D posladder(layerradius, 0.,0.);
@@ -1343,7 +1344,7 @@ m_theSensor(theSensor)
   double rmax = RMax();
   double halflength = Thickness()/2.;
   const GeoMaterial* air = m_mat_mgr->getMaterial("std::Air");
-  const GeoTubs* SDTubs = new GeoTubs(rmin,rmax,halflength,-180.*GeoModelKernelUnits::deg/m_gmt_mgr->PixelECNSectors1()+0.000005,360.*GeoModelKernelUnits::deg/m_gmt_mgr->PixelECNSectors1()-0.00001);
+  const GeoTubs* SDTubs = new GeoTubs(rmin,rmax,halflength,-180.*Gaudi::Units::deg/m_gmt_mgr->PixelECNSectors1()+0.000005,360.*Gaudi::Units::deg/m_gmt_mgr->PixelECNSectors1()-0.00001);
   m_theSubDisk = new GeoLogVol("SubDiskLog",SDTubs,air);
   m_theSubDisk->ref();
 }
@@ -1359,7 +1360,7 @@ GeoVPhysVol* GeoPixelSubDisk::Build( ) {
   //
   double xpos = RMin()+m_gmt_mgr->PixelBoardLength()/2.;
   GeoNameTag* tag = new GeoNameTag("SiCrystal");
-  GeoTrf::Transform3D rm = GeoTrf::RotateX3D(180.*GeoModelKernelUnits::deg)*GeoTrf::RotateY3D(90.*GeoModelKernelUnits::deg);
+  GeoTrf::Transform3D rm = GeoTrf::RotateX3D(180.*Gaudi::Units::deg)*GeoTrf::RotateY3D(90.*Gaudi::Units::deg);
   GeoTrf::Translation3D pos(xpos,0.,0.);
   GeoAlignableTransform* xformsi = new GeoAlignableTransform(GeoTrf::Transform3D(pos*rm));
   SDPhys->add(tag);
@@ -1763,29 +1764,29 @@ double OraclePixGeoManager::CalculateThickness(double tck,string mat) {
 /////////////////////////////////////////////////////////
 double OraclePixGeoManager::PixelBoardWidth() 
 {
-  if(isBarrel()) return (*m_PixelModule)[m_currentLD]->getDouble("BOARDWIDTH")*GeoModelKernelUnits::cm;
-  if(isEndcap()) return (*m_PixelModule)[m_currentLD+3]->getDouble("BOARDWIDTH")*GeoModelKernelUnits::cm;
+  if(isBarrel()) return (*m_PixelModule)[m_currentLD]->getDouble("BOARDWIDTH")*Gaudi::Units::cm;
+  if(isEndcap()) return (*m_PixelModule)[m_currentLD+3]->getDouble("BOARDWIDTH")*Gaudi::Units::cm;
   return 0.;
 }
 double OraclePixGeoManager::PixelBoardLength() 
 {
-  if(isBarrel()) return (*m_PixelModule)[m_currentLD]->getDouble("BOARDLENGTH")*GeoModelKernelUnits::cm;
-  if(isEndcap()) return (*m_PixelModule)[m_currentLD+3]->getDouble("BOARDLENGTH")*GeoModelKernelUnits::cm;
+  if(isBarrel()) return (*m_PixelModule)[m_currentLD]->getDouble("BOARDLENGTH")*Gaudi::Units::cm;
+  if(isEndcap()) return (*m_PixelModule)[m_currentLD+3]->getDouble("BOARDLENGTH")*Gaudi::Units::cm;
   return 0.;
 }
 double OraclePixGeoManager::PixelBoardThickness() 
 {
   if (m_dc1Geometry && isBarrel() && (m_currentLD == 0)) {
-    return 200*GeoModelKernelUnits::micrometer;
+    return 200*Gaudi::Units::micrometer;
   }
-  if(isBarrel()) return (*m_PixelModule)[m_currentLD]->getDouble("BOARDTHICK")*GeoModelKernelUnits::cm;
-  if(isEndcap()) return (*m_PixelModule)[m_currentLD+3]->getDouble("BOARDTHICK")*GeoModelKernelUnits::cm;
+  if(isBarrel()) return (*m_PixelModule)[m_currentLD]->getDouble("BOARDTHICK")*Gaudi::Units::cm;
+  if(isEndcap()) return (*m_PixelModule)[m_currentLD+3]->getDouble("BOARDTHICK")*Gaudi::Units::cm;
   return 0.;
 }
 double  OraclePixGeoManager::PixelBoardActiveLen() 
 {
-  if(isEndcap()) return (*m_pxei)[m_currentLD]->getDouble("DRACTIVE")*GeoModelKernelUnits::cm;
-  if(isBarrel()) return (*m_pxbi)[m_currentLD]->getDouble("DZELEB")*GeoModelKernelUnits::cm;
+  if(isEndcap()) return (*m_pxei)[m_currentLD]->getDouble("DRACTIVE")*Gaudi::Units::cm;
+  if(isBarrel()) return (*m_pxbi)[m_currentLD]->getDouble("DZELEB")*Gaudi::Units::cm;
   return 0.;
 }
 /////////////////////////////////////////////////////////
@@ -1795,14 +1796,14 @@ double  OraclePixGeoManager::PixelBoardActiveLen()
 /////////////////////////////////////////////////////////
 double OraclePixGeoManager::PixelHybridWidth() 
 {
-  if(isBarrel()) return (*m_PixelModule)[m_currentLD]->getDouble("HYBRIDWIDTH")*GeoModelKernelUnits::cm;
-  if(isEndcap()) return (*m_PixelModule)[m_currentLD+3]->getDouble("HYBRIDWIDTH")*GeoModelKernelUnits::cm;
+  if(isBarrel()) return (*m_PixelModule)[m_currentLD]->getDouble("HYBRIDWIDTH")*Gaudi::Units::cm;
+  if(isEndcap()) return (*m_PixelModule)[m_currentLD+3]->getDouble("HYBRIDWIDTH")*Gaudi::Units::cm;
   return 0.;
 }
 double OraclePixGeoManager::PixelHybridLength() 
 {
-  if(isBarrel()) return (*m_PixelModule)[m_currentLD]->getDouble("HYBRIDLENGTH")*GeoModelKernelUnits::cm;
-  if(isEndcap()) return (*m_PixelModule)[m_currentLD+3]->getDouble("HYBRIDLENGTH")*GeoModelKernelUnits::cm;
+  if(isBarrel()) return (*m_PixelModule)[m_currentLD]->getDouble("HYBRIDLENGTH")*Gaudi::Units::cm;
+  if(isEndcap()) return (*m_PixelModule)[m_currentLD+3]->getDouble("HYBRIDLENGTH")*Gaudi::Units::cm;
   return 0.;
 }
 double OraclePixGeoManager::PixelHybridThickness() 
@@ -1820,7 +1821,7 @@ double OraclePixGeoManager::PixelHybridThickness()
   }
   // if it is negative is given in % of r.l.
   if(thick > 0.) { 
-    return thick*GeoModelKernelUnits::cm;
+    return thick*Gaudi::Units::cm;
   }
   return CalculateThickness(thick,mat);
 
@@ -1833,20 +1834,20 @@ double OraclePixGeoManager::PixelHybridThickness()
 
 double OraclePixGeoManager::PixelChipWidth()
 {
-  if(isBarrel()) return (*m_PixelModule)[m_currentLD]->getDouble("CHIPWIDTH")*GeoModelKernelUnits::cm;
-  if(isEndcap()) return (*m_PixelModule)[m_currentLD+3]->getDouble("CHIPWIDTH")*GeoModelKernelUnits::cm;
+  if(isBarrel()) return (*m_PixelModule)[m_currentLD]->getDouble("CHIPWIDTH")*Gaudi::Units::cm;
+  if(isEndcap()) return (*m_PixelModule)[m_currentLD+3]->getDouble("CHIPWIDTH")*Gaudi::Units::cm;
   return 0.;
 }
 double OraclePixGeoManager::PixelChipLength()
 {
-  if(isBarrel())return (*m_PixelModule)[m_currentLD]->getDouble("CHIPLENGTH")*GeoModelKernelUnits::cm;
-  if(isEndcap())return (*m_PixelModule)[m_currentLD+3]->getDouble("CHIPLENGTH")*GeoModelKernelUnits::cm;
+  if(isBarrel())return (*m_PixelModule)[m_currentLD]->getDouble("CHIPLENGTH")*Gaudi::Units::cm;
+  if(isEndcap())return (*m_PixelModule)[m_currentLD+3]->getDouble("CHIPLENGTH")*Gaudi::Units::cm;
   return 0.;
 }
 double OraclePixGeoManager::PixelChipGap()
 {
-  if(isBarrel()) return (*m_PixelModule)[m_currentLD]->getDouble("CHIPGAP")*GeoModelKernelUnits::cm;
-  if(isEndcap()) return (*m_PixelModule)[m_currentLD+3]->getDouble("CHIPGAP")*GeoModelKernelUnits::cm;
+  if(isBarrel()) return (*m_PixelModule)[m_currentLD]->getDouble("CHIPGAP")*Gaudi::Units::cm;
+  if(isEndcap()) return (*m_PixelModule)[m_currentLD+3]->getDouble("CHIPGAP")*Gaudi::Units::cm;
   return 0.;
 }
 double OraclePixGeoManager::PixelChipThickness() {
@@ -1862,7 +1863,7 @@ double OraclePixGeoManager::PixelChipThickness() {
   } 
   // if it is negative is given in % of r.l.
   if(thick > 0.) { 
-    return thick*GeoModelKernelUnits::cm;
+    return thick*Gaudi::Units::cm;
   } 
   return CalculateThickness(thick,mat);
 
@@ -1875,20 +1876,20 @@ double OraclePixGeoManager::PixelChipThickness() {
 /////////////////////////////////////////////////////////
 double OraclePixGeoManager::PixelECCarbonRMin(string a) {
   if(a == "Inner") {
-    return (*m_PixelDisk)[m_currentLD]->getDouble("SUP1RMIN")*GeoModelKernelUnits::cm;
+    return (*m_PixelDisk)[m_currentLD]->getDouble("SUP1RMIN")*Gaudi::Units::cm;
   } else if (a == "Central") {
-    return (*m_PixelDisk)[m_currentLD]->getDouble("SUP2RMIN")*GeoModelKernelUnits::cm;
+    return (*m_PixelDisk)[m_currentLD]->getDouble("SUP2RMIN")*Gaudi::Units::cm;
   }
-  return (*m_PixelDisk)[m_currentLD]->getDouble("SUP3RMIN")*GeoModelKernelUnits::cm;
+  return (*m_PixelDisk)[m_currentLD]->getDouble("SUP3RMIN")*Gaudi::Units::cm;
 }
 
 double OraclePixGeoManager::PixelECCarbonRMax(string a) {
   if(a == "Inner") {
-    return (*m_PixelDisk)[m_currentLD]->getDouble("SUP1RMAX")*GeoModelKernelUnits::cm;
+    return (*m_PixelDisk)[m_currentLD]->getDouble("SUP1RMAX")*Gaudi::Units::cm;
   } else if (a == "Central") {
-    return (*m_PixelDisk)[m_currentLD]->getDouble("SUP2RMAX")*GeoModelKernelUnits::cm;
+    return (*m_PixelDisk)[m_currentLD]->getDouble("SUP2RMAX")*Gaudi::Units::cm;
   } else {
-    return (*m_PixelDisk)[m_currentLD]->getDouble("SUP3RMAX")*GeoModelKernelUnits::cm;
+    return (*m_PixelDisk)[m_currentLD]->getDouble("SUP3RMAX")*Gaudi::Units::cm;
   }
 }
 
@@ -1907,7 +1908,7 @@ double OraclePixGeoManager::PixelECCarbonThickness(string a) {
     imat =(*m_PixelDisk)[m_currentLD]->getInt("SUP3MAT")-1;
   }
   if(tck>0.) {
-    return tck*GeoModelKernelUnits::cm;
+    return tck*Gaudi::Units::cm;
   } 
   return CalculateThickness(tck,mat[imat]);
 }
@@ -1979,12 +1980,12 @@ double*  OraclePixGeoManager::PixelServiceR(string a, int n) {
     }
   }
   // If this is negative this is the thickness of the cyl in % of r.l.
-  r[0] = rmin*GeoModelKernelUnits::cm;
+  r[0] = rmin*Gaudi::Units::cm;
   if(rmax > 0) {
-    r[1] = rmax*GeoModelKernelUnits::cm;
+    r[1] = rmax*Gaudi::Units::cm;
   } else {
     string material = PixelServiceMaterial(a,n);
-    r[1] = fabs(rmin*GeoModelKernelUnits::cm)+CalculateThickness(rmax,material);
+    r[1] = fabs(rmin*Gaudi::Units::cm)+CalculateThickness(rmax,material);
   }
   return r;
 }
@@ -2012,15 +2013,15 @@ double* OraclePixGeoManager::PixelServiceZ(string a,int n) {
       z[1] = (*m_PixelEndcapService)[n+m_endcapInFrames]->getDouble("ZOUT");
     }
   }
-  z[0] = z[0] *GeoModelKernelUnits::cm;
+  z[0] = z[0] *Gaudi::Units::cm;
   if(z[0]*(z[1]) > -0.000000001) { // same sign and z[0] > 0.
-    z[1] = z[1] *GeoModelKernelUnits::cm;
+    z[1] = z[1] *Gaudi::Units::cm;
   } else {
     string material = PixelServiceMaterial(a,n);
     z[1] = z[0] * (1 + CalculateThickness(z[1],material)/fabs(z[0]));
   }
   if(isEndcap() && a == "Inside" ) { // Translate to the ecnter of EndCap
-    double center = ((*m_PixelEndcapGeneral)[0]->getDouble("ZMAX")+(*m_PixelEndcapGeneral)[0]->getDouble("ZMIN"))/2.*GeoModelKernelUnits::cm;
+    double center = ((*m_PixelEndcapGeneral)[0]->getDouble("ZMAX")+(*m_PixelEndcapGeneral)[0]->getDouble("ZMIN"))/2.*Gaudi::Units::cm;
     z[0] = z[0]-center;
     z[1] = z[1]-center;
   }
@@ -2148,7 +2149,7 @@ double OraclePixGeoManager::PixelLadderThickness()
 {
   double tck = (*m_PixelStave)[0]->getDouble("SUPPORTTHICK");
   if( tck > 0.) {
-    return tck*GeoModelKernelUnits::cm;
+    return tck*Gaudi::Units::cm;
   } else {
     return CalculateThickness(tck,"pix::Ladder");
   }
@@ -2158,7 +2159,7 @@ double OraclePixGeoManager::PixelECCablesThickness()
 {
   double tck =  (*m_PixelDisk)[m_currentLD]->getDouble("CABLETHICK");
   if( tck > 0.) {
-    return tck*GeoModelKernelUnits::cm;
+    return tck*Gaudi::Units::cm;
   } else {
     return CalculateThickness(tck,"pix::ECCables");
   }
@@ -2219,14 +2220,14 @@ double OraclePixGeoManager::Voltage(bool isBLayer){
   // override B-layer voltage for DC1 geometry by 
   // value in old DB (approx ratio of thicknesses (200/250 = 0.8)
   // 97.1*0.8 = 77.68. In Nova its 77.7.
-  if (isBLayer && m_dc1Geometry) return 77.7*GeoModelKernelUnits::volt; 
-  if(isBLayer) { return (*m_plor)[0]->getDouble("VOLTAGE")*GeoModelKernelUnits::volt;}
-  return (*m_plor)[1]->getDouble("VOLTAGE")*GeoModelKernelUnits::volt;
+  if (isBLayer && m_dc1Geometry) return 77.7*Gaudi::Units::volt; 
+  if(isBLayer) { return (*m_plor)[0]->getDouble("VOLTAGE")*Gaudi::Units::volt;}
+  return (*m_plor)[1]->getDouble("VOLTAGE")*Gaudi::Units::volt;
 }
 
 double OraclePixGeoManager::Temperature(bool isBLayer){
-  if(isBLayer) { return (*m_plor)[0]->getDouble("TEMPC")*GeoModelKernelUnits::kelvin+GeoModelKernelUnits::STP_Temperature;}
-  return (*m_plor)[1]->getDouble("TEMPC")*GeoModelKernelUnits::kelvin+GeoModelKernelUnits::STP_Temperature;
+  if(isBLayer) { return (*m_plor)[0]->getDouble("TEMPC")*Gaudi::Units::kelvin+Gaudi::Units::STP_Temperature;}
+  return (*m_plor)[1]->getDouble("TEMPC")*Gaudi::Units::kelvin+Gaudi::Units::STP_Temperature;
 }
 
 const GeoTrf::Vector3D & 
@@ -2234,9 +2235,9 @@ OraclePixGeoManager::magneticField(bool isBLayer) const
 {
   if (m_magFieldFromNova) {
     if(isBLayer) { 
-      m_magField = GeoTrf::Vector3D(0, 0, (*m_plrn)[0]->getDouble("BFIELD") * GeoModelKernelUnits::tesla);
+      m_magField = GeoTrf::Vector3D(0, 0, (*m_plrn)[0]->getDouble("BFIELD") * Gaudi::Units::tesla);
     } else {
-      m_magField = GeoTrf::Vector3D(0, 0, (*m_plrn)[1]->getDouble("BFIELD") * GeoModelKernelUnits::tesla);
+      m_magField = GeoTrf::Vector3D(0, 0, (*m_plrn)[1]->getDouble("BFIELD") * Gaudi::Units::tesla);
     }
   }
   return m_magField;
diff --git a/InnerDetector/InDetDetDescr/PixelGeoModel/src/PixelDetectorDC1DC2.h b/InnerDetector/InDetDetDescr/PixelGeoModel/src/PixelDetectorDC1DC2.h
index 4a59f7251044a91b4588141f23ef9e6390ba00e7..4a5337eeca1622ae02e2b49f581fc666ef5b580f 100644
--- a/InnerDetector/InDetDetDescr/PixelGeoModel/src/PixelDetectorDC1DC2.h
+++ b/InnerDetector/InDetDetDescr/PixelGeoModel/src/PixelDetectorDC1DC2.h
@@ -7,7 +7,7 @@
 #include "Identifier/Identifier.h"
 #include "GeoPrimitives/GeoPrimitives.h"
 #include "GeoModelKernel/GeoDefinitions.h"
-#include "GeoModelKernel/Units.h"
+#include "GaudiKernel/SystemOfUnits.h"
 #include "RDBAccessSvc/IRDBRecord.h" //IRDBRecord used in code in the header
 #include "RDBAccessSvc/IRDBRecordset.h"
 #include "RDBAccessSvc/IRDBAccessSvc.h" //for IRDBRecordset_ptr typedef
@@ -926,16 +926,16 @@ class OraclePixGeoManager : public PixelGeometryManager {
 // ATLS
 double OraclePixGeoManager::GetATLSRadius() 
 {
-  return (*m_atls)[0]->getDouble("RMAX")*GeoModelKernelUnits::cm;
+  return (*m_atls)[0]->getDouble("RMAX")*Gaudi::Units::cm;
  }
 
 double OraclePixGeoManager::GetATLSRmin() 
 {
- return (*m_atls)[0]->getDouble("RMIN")*GeoModelKernelUnits::cm;
+ return (*m_atls)[0]->getDouble("RMIN")*Gaudi::Units::cm;
 }
 double OraclePixGeoManager::GetATLSLength() 
 {
-  return (*m_atls)[0]->getDouble("ZMAX")*GeoModelKernelUnits::cm;
+  return (*m_atls)[0]->getDouble("ZMAX")*Gaudi::Units::cm;
 }
 
 //
@@ -951,35 +951,35 @@ int OraclePixGeoManager::PixelEndcapMinorVersion()
   { return static_cast<int>(((*m_PixelEndcapGeneral)[0]->getDouble("VERSION") - PixelEndcapMajorVersion())*10 + 0.5);}
 
 // PXBG
-double OraclePixGeoManager::PixelRMin() {return (*m_PixelCommon)[0]->getDouble("RMIN")*GeoModelKernelUnits::cm;}
-double OraclePixGeoManager::PixelRMax() {return (*m_PixelCommon)[0]->getDouble("RMAX")*GeoModelKernelUnits::cm;}
-double OraclePixGeoManager::PixelHalfLength() {return (*m_PixelCommon)[0]->getDouble("HALFLENGTH")*GeoModelKernelUnits::cm;}
+double OraclePixGeoManager::PixelRMin() {return (*m_PixelCommon)[0]->getDouble("RMIN")*Gaudi::Units::cm;}
+double OraclePixGeoManager::PixelRMax() {return (*m_PixelCommon)[0]->getDouble("RMAX")*Gaudi::Units::cm;}
+double OraclePixGeoManager::PixelHalfLength() {return (*m_PixelCommon)[0]->getDouble("HALFLENGTH")*Gaudi::Units::cm;}
 int OraclePixGeoManager::PixelBarrelNLayer() {return (*m_PixelBarrelGeneral)[0]->getInt("NLAYER");}
 
 // m_PixelBarrelGeneral
-double OraclePixGeoManager::PixelBarrelRMin() {return (*m_PixelBarrelGeneral)[0]->getDouble("RMIN")*GeoModelKernelUnits::cm;}
-double OraclePixGeoManager::PixelBarrelRMax() {return (*m_PixelBarrelGeneral)[0]->getDouble("RMAX")*GeoModelKernelUnits::cm;}
-double OraclePixGeoManager::PixelBarrelHalfLength() {return (*m_PixelBarrelGeneral)[0]->getDouble("HALFLENGTH")*GeoModelKernelUnits::cm;}
+double OraclePixGeoManager::PixelBarrelRMin() {return (*m_PixelBarrelGeneral)[0]->getDouble("RMIN")*Gaudi::Units::cm;}
+double OraclePixGeoManager::PixelBarrelRMax() {return (*m_PixelBarrelGeneral)[0]->getDouble("RMAX")*Gaudi::Units::cm;}
+double OraclePixGeoManager::PixelBarrelHalfLength() {return (*m_PixelBarrelGeneral)[0]->getDouble("HALFLENGTH")*Gaudi::Units::cm;}
 
 // PXBI
 double OraclePixGeoManager::PixelLayerRadius() 
 {
-  return (*m_PixelLayer)[m_currentLD]->getDouble("RLAYER")*GeoModelKernelUnits::cm;
+  return (*m_PixelLayer)[m_currentLD]->getDouble("RLAYER")*Gaudi::Units::cm;
 }
 
 double OraclePixGeoManager::PixelLadderHalfLength() 
 {
-  return (*m_PixelStave)[0]->getDouble("SUPPORTHLENGTH")*GeoModelKernelUnits::cm;
+  return (*m_PixelStave)[0]->getDouble("SUPPORTHLENGTH")*Gaudi::Units::cm;
 }
 
 double OraclePixGeoManager::PixelLadderWidth() 
 {
-  return (*m_PixelStave)[0]->getDouble("SUPPORTWIDTH")*GeoModelKernelUnits::cm;
+  return (*m_PixelStave)[0]->getDouble("SUPPORTWIDTH")*Gaudi::Units::cm;
 }
 
 double OraclePixGeoManager::PixelLadderTilt() 
 {
-  return (*m_PixelLayer)[m_currentLD]->getDouble("STAVETILT")*GeoModelKernelUnits::deg;
+  return (*m_PixelLayer)[m_currentLD]->getDouble("STAVETILT")*Gaudi::Units::deg;
 }
 int OraclePixGeoManager::NPixelSectors() 
 {
@@ -988,7 +988,7 @@ int OraclePixGeoManager::NPixelSectors()
 
 double OraclePixGeoManager::PixelBalcony() 
 {
-  return (*m_pxbi)[m_currentLD]->getDouble("DXELEB")*GeoModelKernelUnits::cm;
+  return (*m_pxbi)[m_currentLD]->getDouble("DXELEB")*Gaudi::Units::cm;
 }
 
 int OraclePixGeoManager::PixelNModule() 
@@ -998,17 +998,17 @@ int OraclePixGeoManager::PixelNModule()
 
 double OraclePixGeoManager::PixelModuleAngle() 
 {
-  return (*m_PixelStave)[0]->getDouble("MODULETILT")*GeoModelKernelUnits::deg;
+  return (*m_PixelStave)[0]->getDouble("MODULETILT")*Gaudi::Units::deg;
 }
 
 double OraclePixGeoManager::PixelModuleDrDistance() 
 {
-  return (*m_PixelStave)[0]->getDouble("CENTRMODULESHIFT")*GeoModelKernelUnits::cm;
+  return (*m_PixelStave)[0]->getDouble("CENTRMODULESHIFT")*Gaudi::Units::cm;
 }
 
 double OraclePixGeoManager::PixelModulePosition(int im) 
 {
-  return (*m_PixelStave)[0]->getDouble("MODULEDZ")*GeoModelKernelUnits::cm*im;
+  return (*m_PixelStave)[0]->getDouble("MODULEDZ")*Gaudi::Units::cm*im;
 }
 
 // OBSOLETE!!! TO MOVE INTO THE NEW FACTORY 
@@ -1029,23 +1029,23 @@ double OraclePixGeoManager::PixelModuleAngleSign(int im)
 
 // PBAC
 double OraclePixGeoManager::PixelCableWidth() {
-  return (*m_PixelStave)[0]->getDouble("CABLEWIDTH")*GeoModelKernelUnits::cm;
+  return (*m_PixelStave)[0]->getDouble("CABLEWIDTH")*Gaudi::Units::cm;
 }
 
 double OraclePixGeoManager::PixelCableThickness() {
-  return (*m_PixelStave)[0]->getDouble("CABLETHICK")*GeoModelKernelUnits::cm;
+  return (*m_PixelStave)[0]->getDouble("CABLETHICK")*Gaudi::Units::cm;
 }
 
 double OraclePixGeoManager::PixelCableZMax() {
-  return (*m_PixelStave)[0]->getDouble("SUPPORTHLENGTH")*GeoModelKernelUnits::cm;
+  return (*m_PixelStave)[0]->getDouble("SUPPORTHLENGTH")*Gaudi::Units::cm;
 }
 
 double OraclePixGeoManager::PixelCableZMin() {
-  return (*m_PixelStave)[0]->getDouble("CABLEZMIN")*GeoModelKernelUnits::cm;
+  return (*m_PixelStave)[0]->getDouble("CABLEZMIN")*Gaudi::Units::cm;
 }
 
 double OraclePixGeoManager::PixelCableDeltaZ() {
-  return (*m_PixelStave)[0]->getDouble("MODULEDZ")*GeoModelKernelUnits::cm;
+  return (*m_PixelStave)[0]->getDouble("MODULEDZ")*Gaudi::Units::cm;
 }
 
 
@@ -1053,24 +1053,24 @@ double OraclePixGeoManager::PixelCableDeltaZ() {
 int OraclePixGeoManager::PixelEndcapNDisk() {return (*m_PixelEndcapGeneral)[0]->getInt("NDISK");}
 
 // Endcap container PEVO
-double  OraclePixGeoManager::PixelEndcapRMin() {return (*m_PixelEndcapGeneral)[0]->getDouble("RMIN")*GeoModelKernelUnits::cm;}
+double  OraclePixGeoManager::PixelEndcapRMin() {return (*m_PixelEndcapGeneral)[0]->getDouble("RMIN")*Gaudi::Units::cm;}
 
-double  OraclePixGeoManager::PixelEndcapRMax() {return (*m_PixelEndcapGeneral)[0]->getDouble("RMAX")*GeoModelKernelUnits::cm;}
+double  OraclePixGeoManager::PixelEndcapRMax() {return (*m_PixelEndcapGeneral)[0]->getDouble("RMAX")*Gaudi::Units::cm;}
 
-double  OraclePixGeoManager::PixelEndcapZMin() {return (*m_PixelEndcapGeneral)[0]->getDouble("ZMIN")*GeoModelKernelUnits::cm;}
+double  OraclePixGeoManager::PixelEndcapZMin() {return (*m_PixelEndcapGeneral)[0]->getDouble("ZMIN")*Gaudi::Units::cm;}
 
-double  OraclePixGeoManager::PixelEndcapZMax() {return (*m_PixelEndcapGeneral)[0]->getDouble("ZMAX")*GeoModelKernelUnits::cm;}
+double  OraclePixGeoManager::PixelEndcapZMax() {return (*m_PixelEndcapGeneral)[0]->getDouble("ZMAX")*Gaudi::Units::cm;}
 
 int OraclePixGeoManager::PixelEndcapNSupportFrames() {return (int) (*m_PixelEndcapGeneral)[0]->getDouble("NFRAME");}
 
 // Endcap Inner (PXEI)
-double  OraclePixGeoManager::PixelDiskPosition() {return (*m_PixelDisk)[m_currentLD]->getDouble("ZDISK")*GeoModelKernelUnits::cm;}
+double  OraclePixGeoManager::PixelDiskPosition() {return (*m_PixelDisk)[m_currentLD]->getDouble("ZDISK")*Gaudi::Units::cm;}
 
-double  OraclePixGeoManager::PixelDiskRMin() {return (*m_PixelDisk)[m_currentLD]->getDouble("RIDISK")*GeoModelKernelUnits::cm;}
+double  OraclePixGeoManager::PixelDiskRMin() {return (*m_PixelDisk)[m_currentLD]->getDouble("RIDISK")*Gaudi::Units::cm;}
 
-double OraclePixGeoManager::PixelECSiDz1() {return (*m_PixelDisk)[m_currentLD]->getDouble("DZCOUNTER")*GeoModelKernelUnits::cm;}
+double OraclePixGeoManager::PixelECSiDz1() {return (*m_PixelDisk)[m_currentLD]->getDouble("DZCOUNTER")*Gaudi::Units::cm;}
 
-double OraclePixGeoManager::PixelECSiDz2() {return (*m_PixelDisk)[m_currentLD]->getDouble("DZCOUNTER")*GeoModelKernelUnits::cm;}
+double OraclePixGeoManager::PixelECSiDz2() {return (*m_PixelDisk)[m_currentLD]->getDouble("DZCOUNTER")*Gaudi::Units::cm;}
 
 int OraclePixGeoManager::PixelECNSectors1() {return (*m_PixelDisk)[m_currentLD]->getInt("NMODULE");}
 
@@ -1078,53 +1078,53 @@ int OraclePixGeoManager::PixelECNSectors2() {return (*m_PixelDisk)[m_currentLD]-
 
 // Endcap Cables PEAC
 double OraclePixGeoManager::PixelECCablesRMin() {
-  return (*m_PixelDisk)[m_currentLD]->getDouble("RMINCABLE")*GeoModelKernelUnits::cm;
+  return (*m_PixelDisk)[m_currentLD]->getDouble("RMINCABLE")*Gaudi::Units::cm;
 }
 
 double OraclePixGeoManager::PixelECCablesRMax() {
-  return (*m_PixelDisk)[m_currentLD]->getDouble("RMAXCABLE")*GeoModelKernelUnits::cm;
+  return (*m_PixelDisk)[m_currentLD]->getDouble("RMAXCABLE")*Gaudi::Units::cm;
 }
 
 
 double OraclePixGeoManager::PixelECCablesDistance() {
-  return (*m_PixelDisk)[m_currentLD]->getDouble("ZCABLE")*GeoModelKernelUnits::cm;
+  return (*m_PixelDisk)[m_currentLD]->getDouble("ZCABLE")*Gaudi::Units::cm;
 }
 //
 // Design
 //
 
 double OraclePixGeoManager::DesignRPActiveArea(){
-  return (*m_pxbi)[0]->getDouble("DYACTIVE")*GeoModelKernelUnits::cm;
+  return (*m_pxbi)[0]->getDouble("DYACTIVE")*Gaudi::Units::cm;
 }
 double OraclePixGeoManager::DesignZActiveArea(){
-  return (*m_pxbi)[0]->getDouble("DZELEB")*GeoModelKernelUnits::cm;
+  return (*m_pxbi)[0]->getDouble("DZELEB")*Gaudi::Units::cm;
 }
 
 double OraclePixGeoManager::DesignPitchRP(bool isBLayer) {
-  if(isBLayer) return (*m_pxbd)[0]->getDouble("PITCHRP")*GeoModelKernelUnits::cm;
-  else return (*m_pxbd)[1]->getDouble("PITCHRP")*GeoModelKernelUnits::cm;
+  if(isBLayer) return (*m_pxbd)[0]->getDouble("PITCHRP")*Gaudi::Units::cm;
+  else return (*m_pxbd)[1]->getDouble("PITCHRP")*Gaudi::Units::cm;
 }
 
 double OraclePixGeoManager::DesignPitchZ(bool isBLayer) {
   double pitchZ;
   if(isBLayer) {
     if (m_dc1Geometry) { // Override NOVA 
-      pitchZ = 300 * GeoModelKernelUnits::micrometer; 
+      pitchZ = 300 * Gaudi::Units::micrometer; 
     } else {
-      pitchZ = (*m_pxbd)[0]->getDouble("PITCHZ") * GeoModelKernelUnits::cm;
+      pitchZ = (*m_pxbd)[0]->getDouble("PITCHZ") * Gaudi::Units::cm;
     }
   } else {
-    pitchZ = (*m_pxbd)[1]->getDouble("PITCHZ") * GeoModelKernelUnits::cm;
+    pitchZ = (*m_pxbd)[1]->getDouble("PITCHZ") * Gaudi::Units::cm;
   }
   return pitchZ;
 }
 
 double OraclePixGeoManager::DesignGapRP() {
-  return (*m_pdch)[0]->getDouble("GAPRP")*GeoModelKernelUnits::cm;
+  return (*m_pdch)[0]->getDouble("GAPRP")*Gaudi::Units::cm;
 }
 
 double OraclePixGeoManager::DesignGapZ() {
-  return (*m_pdch)[0]->getDouble("GAPZ")*GeoModelKernelUnits::cm;
+  return (*m_pdch)[0]->getDouble("GAPZ")*Gaudi::Units::cm;
 }
 
 
diff --git a/InnerDetector/InDetDetDescr/PixelGeoModel/src/PixelDetectorFactory.cxx b/InnerDetector/InDetDetDescr/PixelGeoModel/src/PixelDetectorFactory.cxx
index 160edfb488baf2c572c8e31e2f65ada8d103469c..1651b6cf1d8dae4848ecd4b30cfeea3181e3dc5a 100644
--- a/InnerDetector/InDetDetDescr/PixelGeoModel/src/PixelDetectorFactory.cxx
+++ b/InnerDetector/InDetDetDescr/PixelGeoModel/src/PixelDetectorFactory.cxx
@@ -13,6 +13,7 @@
 #include "GeoModelKernel/GeoNameTag.h"  
 #include "GeoModelKernel/GeoPhysVol.h"  
 #include "GeoModelKernel/GeoAlignableTransform.h"  
+#include "GaudiKernel/SystemOfUnits.h"
 
 // InDetReadoutGeometry
 #include "InDetReadoutGeometry/SiCommonItems.h" 
@@ -120,8 +121,8 @@ void PixelDetectorFactory::create(GeoPhysVol *world)
   m_geometryManager->SetCurrentLD(0);
   m_geometryManager->SetBarrel();
   if(msgLvl(MSG::DEBUG)) {
-    msg(MSG::DEBUG) << " B-Layer basic eta pitch: " << m_geometryManager->DesignPitchZ()/GeoModelKernelUnits::micrometer << "um" << endmsg;  
-    msg(MSG::DEBUG) << " B-Layer sensor thickness: " << m_geometryManager->PixelBoardThickness()/GeoModelKernelUnits::micrometer << "um" << endmsg;   
+    msg(MSG::DEBUG) << " B-Layer basic eta pitch: " << m_geometryManager->DesignPitchZ()/Gaudi::Units::micrometer << "um" << endmsg;  
+    msg(MSG::DEBUG) << " B-Layer sensor thickness: " << m_geometryManager->PixelBoardThickness()/Gaudi::Units::micrometer << "um" << endmsg;   
   }
 
   // Top level transform
diff --git a/InnerDetector/InDetDetDescr/PixelGeoModel/src/PixelDetectorFactoryDC2.cxx b/InnerDetector/InDetDetDescr/PixelGeoModel/src/PixelDetectorFactoryDC2.cxx
index 9731105c0ecbb1a6114f36d0c7daf70b113d9b1a..0d5797ba806d447cedd8fced3f90af87f6e5c5e9 100644
--- a/InnerDetector/InDetDetDescr/PixelGeoModel/src/PixelDetectorFactoryDC2.cxx
+++ b/InnerDetector/InDetDetDescr/PixelGeoModel/src/PixelDetectorFactoryDC2.cxx
@@ -125,12 +125,12 @@ void PixelDetectorFactoryDC2::create(GeoPhysVol *world)
     msg(MSG::INFO) << " " << m_detectorManager->getVersion().fullDescription() << endmsg;
 
     // Printout the parameters that are different in DC1 and DC2.
-    msg(MSG::INFO) << " B-Layer basic eta pitch: " << geometryManager->DesignPitchZ(true)/GeoModelKernelUnits::micrometer << "um" << endmsg;
+    msg(MSG::INFO) << " B-Layer basic eta pitch: " << geometryManager->DesignPitchZ(true)/Gaudi::Units::micrometer << "um" << endmsg;
   }  
   geometryManager->SetCurrentLD(0);
   geometryManager->SetBarrel();
   if(msgLvl(MSG::INFO)) 
-    msg(MSG::INFO) << " B-Layer sensor thickness: " << geometryManager->PixelBoardThickness()/GeoModelKernelUnits::micrometer << "um" << endmsg;   
+    msg(MSG::INFO) << " B-Layer sensor thickness: " << geometryManager->PixelBoardThickness()/Gaudi::Units::micrometer << "um" << endmsg;   
   
   //
   // Create the Pixel Envelope...
diff --git a/InnerDetector/InDetDetDescr/PixelGeoModel/src/PixelDetectorFactorySR1.cxx b/InnerDetector/InDetDetDescr/PixelGeoModel/src/PixelDetectorFactorySR1.cxx
index e0a93585e536fe18d9147ad4b1eeef71a67122d3..f833a3103e9c97bfeba740e557e78a390ec3f5a4 100644
--- a/InnerDetector/InDetDetDescr/PixelGeoModel/src/PixelDetectorFactorySR1.cxx
+++ b/InnerDetector/InDetDetDescr/PixelGeoModel/src/PixelDetectorFactorySR1.cxx
@@ -16,6 +16,7 @@
 #include "GeoModelKernel/GeoIdentifierTag.h"  
 #include "GeoModelKernel/GeoPhysVol.h"  
 #include "GeoModelKernel/GeoAlignableTransform.h"  
+#include "GaudiKernel/SystemOfUnits.h"
 
 // InDetReadoutGeometry
 #include "InDetReadoutGeometry/SiCommonItems.h" 
@@ -110,8 +111,8 @@ void PixelDetectorFactorySR1::create(GeoPhysVol *world)
     msg(MSG::INFO) << " " << m_detectorManager->getVersion().fullDescription() << endmsg;
 
     // Printout the parameters that are different in DC1 and DC2.
-    msg(MSG::INFO) << " B-Layer basic eta pitch: " << m_geometryManager->DesignPitchZ()/GeoModelKernelUnits::micrometer << "um" << endmsg;
-    msg(MSG::INFO) << " B-Layer sensor thickness: " << m_geometryManager->PixelBoardThickness()/GeoModelKernelUnits::micrometer << "um" << endmsg;   
+    msg(MSG::INFO) << " B-Layer basic eta pitch: " << m_geometryManager->DesignPitchZ()/Gaudi::Units::micrometer << "um" << endmsg;
+    msg(MSG::INFO) << " B-Layer sensor thickness: " << m_geometryManager->PixelBoardThickness()/Gaudi::Units::micrometer << "um" << endmsg;   
   }  
 
   bool barrelPresent   = m_geometryManager->partPresent("Barrel");
@@ -195,7 +196,7 @@ void PixelDetectorFactorySR1::create(GeoPhysVol *world)
       physVol = pec.Build();
       
       GeoTrf::Transform3D endcapCTransform = m_geometryManager->partTransform("EndcapC");
-      transform = new GeoAlignableTransform(topTransform * endcapCTransform * GeoTrf::TranslateZ3D(-zpos) * GeoTrf::RotateY3D(180*GeoModelKernelUnits::deg));
+      transform = new GeoAlignableTransform(topTransform * endcapCTransform * GeoTrf::TranslateZ3D(-zpos) * GeoTrf::RotateY3D(180*Gaudi::Units::deg));
       
       GeoNameTag* tag  = new GeoNameTag("Pixel");
       world->add(tag);
diff --git a/InnerDetector/InDetDetDescr/PixelGeoModel/src/PixelLegacyManager.cxx b/InnerDetector/InDetDetDescr/PixelGeoModel/src/PixelLegacyManager.cxx
index 1bd7b37a9ece6dfdb4da379e1f2aaca8f14917ff..9e19a15c0924a41f7cd178f561eddaabe2e665d4 100644
--- a/InnerDetector/InDetDetDescr/PixelGeoModel/src/PixelLegacyManager.cxx
+++ b/InnerDetector/InDetDetDescr/PixelGeoModel/src/PixelLegacyManager.cxx
@@ -8,7 +8,7 @@
 #include "RDBAccessSvc/IRDBRecord.h"
 #include "RDBAccessSvc/IRDBRecordset.h"
 #include "GeoPrimitives/GeoPrimitives.h"
-#include "GeoModelKernel/Units.h"
+#include "GaudiKernel/SystemOfUnits.h"
 
 #include <sstream>
 #include <string>
@@ -89,36 +89,36 @@ int PixelLegacyManager::PixelBarrelNTFrame()
 double PixelLegacyManager::PixelBarrelBFrameWidth() 
 {
   if (m_BarrelInSFrame) {
-    return (*m_pfba)[0]->getDouble("WIDTH1")*GeoModelKernelUnits::cm;
+    return (*m_pfba)[0]->getDouble("WIDTH1")*Gaudi::Units::cm;
   } else {
-    return (*m_pfec)[0]->getDouble("WIDTH1")*GeoModelKernelUnits::cm;
+    return (*m_pfec)[0]->getDouble("WIDTH1")*Gaudi::Units::cm;
   }
 }
 
 double PixelLegacyManager::PixelBarrelTFrameWidth() 
 {
   if (m_BarrelInSFrame) {
-    return (*m_pfba)[0]->getDouble("WIDTH2")*GeoModelKernelUnits::cm;
+    return (*m_pfba)[0]->getDouble("WIDTH2")*Gaudi::Units::cm;
   } else {
-    return (*m_pfec)[0]->getDouble("WIDTH2")*GeoModelKernelUnits::cm;
+    return (*m_pfec)[0]->getDouble("WIDTH2")*Gaudi::Units::cm;
   }
 }
 
 double PixelLegacyManager::PixelBarrelFrameLength() 
 {
   if (m_BarrelInSFrame) {
-    return (*m_pfba)[0]->getDouble("LENGTH")*GeoModelKernelUnits::cm;
+    return (*m_pfba)[0]->getDouble("LENGTH")*Gaudi::Units::cm;
   } else {
-    return (*m_pfec)[0]->getDouble("LENGTH")*GeoModelKernelUnits::cm;
+    return (*m_pfec)[0]->getDouble("LENGTH")*Gaudi::Units::cm;
   }
 }
 
 double PixelLegacyManager::PixelBarrelFrameOffset() 
 {
   if (m_BarrelInSFrame) {
-    return (*m_pfba)[0]->getDouble("OFFSET")*GeoModelKernelUnits::cm;
+    return (*m_pfba)[0]->getDouble("OFFSET")*Gaudi::Units::cm;
   } else {
-    return (*m_pfec)[0]->getDouble("OFFSET")*GeoModelKernelUnits::cm;
+    return (*m_pfec)[0]->getDouble("OFFSET")*Gaudi::Units::cm;
   }
 }
 
@@ -135,33 +135,33 @@ int PixelLegacyManager::PixelEndcapNTFrame()
 
 double PixelLegacyManager::PixelEndcapBFrameWidth()
 {
-  return (*m_pecf)[0]->getDouble("WIDTH1")*GeoModelKernelUnits::cm;
+  return (*m_pecf)[0]->getDouble("WIDTH1")*Gaudi::Units::cm;
 }
 
 double PixelLegacyManager::PixelEndcapTFrameWidth() 
 {
-  return (*m_pecf)[0]->getDouble("WIDTH2")*GeoModelKernelUnits::cm;
+  return (*m_pecf)[0]->getDouble("WIDTH2")*Gaudi::Units::cm;
 }
 
 double PixelLegacyManager::PixelEndcapFrameLength() 
 {
-  return (*m_pecf)[0]->getDouble("LENGTH")*GeoModelKernelUnits::cm;
+  return (*m_pecf)[0]->getDouble("LENGTH")*Gaudi::Units::cm;
 }
 
 double PixelLegacyManager::PixelEndcapFrameOffset() 
 {
-  return (*m_pecf)[0]->getDouble("OFFSET")*GeoModelKernelUnits::cm;
+  return (*m_pecf)[0]->getDouble("OFFSET")*Gaudi::Units::cm;
 }
 
 double PixelLegacyManager::PixelBFrameHalfLength() 
 {
   if (m_BarrelInSFrame) {
-    return (*m_pbba)[0]->getDouble("DZ")*GeoModelKernelUnits::cm;
+    return (*m_pbba)[0]->getDouble("DZ")*Gaudi::Units::cm;
   } else {
     if (m_EndcapInSFrame) {
-      return (*m_pecb)[0]->getDouble("DZ")*GeoModelKernelUnits::cm;
+      return (*m_pecb)[0]->getDouble("DZ")*Gaudi::Units::cm;
     } else {
-      return (*m_pbec)[0]->getDouble("DZ")*GeoModelKernelUnits::cm;
+      return (*m_pbec)[0]->getDouble("DZ")*Gaudi::Units::cm;
     }
   }
 }
@@ -169,12 +169,12 @@ double PixelLegacyManager::PixelBFrameHalfLength()
 double PixelLegacyManager::PixelBFrameHalfWidth() 
 {
   if (m_BarrelInSFrame) {
-    return (*m_pbba)[0]->getDouble("DY")*GeoModelKernelUnits::cm;
+    return (*m_pbba)[0]->getDouble("DY")*Gaudi::Units::cm;
   } else {
     if (m_EndcapInSFrame) {
-      return (*m_pecb)[0]->getDouble("DY")*GeoModelKernelUnits::cm;
+      return (*m_pecb)[0]->getDouble("DY")*Gaudi::Units::cm;
     } else {
-      return (*m_pbec)[0]->getDouble("DY")*GeoModelKernelUnits::cm;
+      return (*m_pbec)[0]->getDouble("DY")*Gaudi::Units::cm;
     }
   }
 }
@@ -182,12 +182,12 @@ double PixelLegacyManager::PixelBFrameHalfWidth()
 double PixelLegacyManager::PixelBFrameHalfThickness() 
 {
   if (m_BarrelInSFrame) {
-    return (*m_pbba)[0]->getDouble("DX")*GeoModelKernelUnits::cm;
+    return (*m_pbba)[0]->getDouble("DX")*Gaudi::Units::cm;
   } else {
     if (m_EndcapInSFrame) {
-      return (*m_pecb)[0]->getDouble("DX")*GeoModelKernelUnits::cm;
+      return (*m_pecb)[0]->getDouble("DX")*Gaudi::Units::cm;
     } else {
-      return (*m_pbec)[0]->getDouble("DX")*GeoModelKernelUnits::cm;
+      return (*m_pbec)[0]->getDouble("DX")*Gaudi::Units::cm;
     }
   }
 }
@@ -195,15 +195,15 @@ double PixelLegacyManager::PixelBFrameHalfThickness()
 double PixelLegacyManager::PixelTFrameHalfLength() 
 {
   if (m_BarrelInSFrame) {
-    return (*m_ptba)[0]->getDouble("DZ")*GeoModelKernelUnits::cm;
+    return (*m_ptba)[0]->getDouble("DZ")*Gaudi::Units::cm;
   } else {
     if (m_EndcapInSFrame) {
-      return (*m_pect)[0]->getDouble("DZ")*GeoModelKernelUnits::cm;
+      return (*m_pect)[0]->getDouble("DZ")*Gaudi::Units::cm;
     } else {
       if (m_EndConeSFrame) {
-        return (*m_pecn)[0]->getDouble("DZ")*GeoModelKernelUnits::cm;
+        return (*m_pecn)[0]->getDouble("DZ")*Gaudi::Units::cm;
       } else {
-        return (*m_ptec)[0]->getDouble("DZ")*GeoModelKernelUnits::cm;
+        return (*m_ptec)[0]->getDouble("DZ")*Gaudi::Units::cm;
       } 
     }
   }
@@ -212,15 +212,15 @@ double PixelLegacyManager::PixelTFrameHalfLength()
 double PixelLegacyManager::PixelTFrameHalfWidthY() 
 {
   if (m_BarrelInSFrame) {
-    return (*m_ptba)[0]->getDouble("DY")*GeoModelKernelUnits::cm;
+    return (*m_ptba)[0]->getDouble("DY")*Gaudi::Units::cm;
   } else {
     if (m_EndcapInSFrame) {
-      return (*m_pect)[0]->getDouble("DY")*GeoModelKernelUnits::cm;
+      return (*m_pect)[0]->getDouble("DY")*Gaudi::Units::cm;
     } else {
       if (m_EndConeSFrame) {
-        return (*m_pecn)[0]->getDouble("DY")*GeoModelKernelUnits::cm;
+        return (*m_pecn)[0]->getDouble("DY")*Gaudi::Units::cm;
       } else {
-        return (*m_ptec)[0]->getDouble("DY")*GeoModelKernelUnits::cm;
+        return (*m_ptec)[0]->getDouble("DY")*Gaudi::Units::cm;
       } 
     }
   }
@@ -229,15 +229,15 @@ double PixelLegacyManager::PixelTFrameHalfWidthY()
 double PixelLegacyManager::PixelTFrameHalfWidthXzn() 
 {
   if (m_BarrelInSFrame) {
-    return (*m_ptba)[0]->getDouble("DX1")*GeoModelKernelUnits::cm;
+    return (*m_ptba)[0]->getDouble("DX1")*Gaudi::Units::cm;
   } else {
     if (m_EndcapInSFrame) {
-      return (*m_pect)[0]->getDouble("DX1")*GeoModelKernelUnits::cm;
+      return (*m_pect)[0]->getDouble("DX1")*Gaudi::Units::cm;
     } else {    
       if (m_EndConeSFrame) {
-        return (*m_pecn)[0]->getDouble("DX1")*GeoModelKernelUnits::cm;
+        return (*m_pecn)[0]->getDouble("DX1")*Gaudi::Units::cm;
       } else {
-        return (*m_ptec)[0]->getDouble("DX1")*GeoModelKernelUnits::cm;
+        return (*m_ptec)[0]->getDouble("DX1")*Gaudi::Units::cm;
       } 
     }
   }
@@ -246,15 +246,15 @@ double PixelLegacyManager::PixelTFrameHalfWidthXzn()
 double PixelLegacyManager::PixelTFrameHalfWidthXzp() 
 {
   if (m_BarrelInSFrame) {
-    return (*m_ptba)[0]->getDouble("DX2")*GeoModelKernelUnits::cm;
+    return (*m_ptba)[0]->getDouble("DX2")*Gaudi::Units::cm;
   } else {
     if (m_EndcapInSFrame) {
-      return (*m_pect)[0]->getDouble("DX2")*GeoModelKernelUnits::cm;
+      return (*m_pect)[0]->getDouble("DX2")*Gaudi::Units::cm;
     } else {
       if (m_EndConeSFrame) {
-        return (*m_pecn)[0]->getDouble("DX2")*GeoModelKernelUnits::cm;
+        return (*m_pecn)[0]->getDouble("DX2")*Gaudi::Units::cm;
       } else {
-        return (*m_ptec)[0]->getDouble("DX2")*GeoModelKernelUnits::cm;
+        return (*m_ptec)[0]->getDouble("DX2")*Gaudi::Units::cm;
       } 
     }
   }
@@ -263,15 +263,15 @@ double PixelLegacyManager::PixelTFrameHalfWidthXzp()
 double PixelLegacyManager::PixelTFrameDzDr()
 {
   if (m_BarrelInSFrame) {
-    return (*m_ptba)[0]->getDouble("DZDR")*GeoModelKernelUnits::deg;
+    return (*m_ptba)[0]->getDouble("DZDR")*Gaudi::Units::deg;
   } else {
     if (m_EndcapInSFrame) {
-      return (*m_pect)[0]->getDouble("DZDR")*GeoModelKernelUnits::cm;
+      return (*m_pect)[0]->getDouble("DZDR")*Gaudi::Units::cm;
     } else {
       if (m_EndConeSFrame) {
-        return (*m_pecn)[0]->getDouble("DZDR")*GeoModelKernelUnits::deg;
+        return (*m_pecn)[0]->getDouble("DZDR")*Gaudi::Units::deg;
       } else {
-        return (*m_ptec)[0]->getDouble("DZDR")*GeoModelKernelUnits::deg;
+        return (*m_ptec)[0]->getDouble("DZDR")*Gaudi::Units::deg;
       } 
     }
   }
@@ -279,33 +279,33 @@ double PixelLegacyManager::PixelTFrameDzDr()
 
 double PixelLegacyManager::PixelBarrelFrameECRadius()
 {
-  return (*m_pecn)[0]->getDouble("RADIUS")*GeoModelKernelUnits::cm;
+  return (*m_pecn)[0]->getDouble("RADIUS")*Gaudi::Units::cm;
 }
 
 double PixelLegacyManager::PixelBarrelFrameECZPos() 
 {
-  return (*m_pecn)[0]->getDouble("Z")*GeoModelKernelUnits::cm;
+  return (*m_pecn)[0]->getDouble("Z")*Gaudi::Units::cm;
 }
 
 double PixelLegacyManager::PixelBarrelFrameECAlphaX() 
 {
-  return (*m_pecn)[0]->getDouble("ANGLEX")*GeoModelKernelUnits::deg;
+  return (*m_pecn)[0]->getDouble("ANGLEX")*Gaudi::Units::deg;
 }
 
 double PixelLegacyManager::PixelBarrelFrameECAlphaY() 
 {
-  return (*m_pecn)[0]->getDouble("ANGLEY")*GeoModelKernelUnits::deg;
+  return (*m_pecn)[0]->getDouble("ANGLEY")*Gaudi::Units::deg;
 }
 
 
 double PixelLegacyManager::PixelLadderThickness() 
 {
-  return 2 * 1.48972*GeoModelKernelUnits::mm;
+  return 2 * 1.48972*Gaudi::Units::mm;
 }
 
 double PixelLegacyManager::PixelLadderLength() 
 {
-  return 2 * (*m_pxbi)[0]->getDouble("DZLADDER")*GeoModelKernelUnits::cm;
+  return 2 * (*m_pxbi)[0]->getDouble("DZLADDER")*Gaudi::Units::cm;
 }
 
 double PixelLegacyManager::PixelLadderServicesX() 
@@ -315,28 +315,28 @@ double PixelLegacyManager::PixelLadderServicesX()
 
 double PixelLegacyManager::PixelLadderServicesY() 
 {
-  return 3*GeoModelKernelUnits::mm;
+  return 3*Gaudi::Units::mm;
 }
 
 
 double PixelLegacyManager::PixelLadderCableOffsetX() 
 {
-  return 0.099*GeoModelKernelUnits::mm;
+  return 0.099*Gaudi::Units::mm;
 }
 
 double PixelLegacyManager::PixelLadderCableOffsetY() 
 {
-  return 4*GeoModelKernelUnits::mm;
+  return 4*Gaudi::Units::mm;
 }
 
 double PixelLegacyManager::PixelLadderConnectorOffsetX() 
 {
-  return -5.8*GeoModelKernelUnits::mm;
+  return -5.8*Gaudi::Units::mm;
 }
 
 double PixelLegacyManager::PixelLadderPigtailOffsetY() 
 {
-  return -0.5*GeoModelKernelUnits::mm - PixelLadderCableOffsetY();
+  return -0.5*Gaudi::Units::mm - PixelLadderCableOffsetY();
 }
 
 
@@ -353,34 +353,34 @@ double
 PixelLegacyManager::PixelCableZStart(int index)
 {
   // In old code two cables were connected to middle. Correction stops them touching.
-  double correction = (index == 7) ? 0.000001*GeoModelKernelUnits::cm : 0;
-  return ((*m_poci)[index]->getDouble("Z")  -  (*m_poci)[index]->getDouble("DZ")) * GeoModelKernelUnits::cm + correction;
+  double correction = (index == 7) ? 0.000001*Gaudi::Units::cm : 0;
+  return ((*m_poci)[index]->getDouble("Z")  -  (*m_poci)[index]->getDouble("DZ")) * Gaudi::Units::cm + correction;
 }
 
 double 
 PixelLegacyManager::PixelCableZEnd(int index)
 {
   // In old code two cables were connected to middle. Correction stops them touching.
-  double correction = (index == 7) ? 0.000001*GeoModelKernelUnits::cm : 0;
-  return ((*m_poci)[index]->getDouble("Z") +  (*m_poci)[index]->getDouble("DZ")) * GeoModelKernelUnits::cm + correction;
+  double correction = (index == 7) ? 0.000001*Gaudi::Units::cm : 0;
+  return ((*m_poci)[index]->getDouble("Z") +  (*m_poci)[index]->getDouble("DZ")) * Gaudi::Units::cm + correction;
 }
 
 double 
 PixelLegacyManager::PixelCableWidth(int index)
 {
-  return (*m_poci)[index]->getDouble("DY") * GeoModelKernelUnits::cm;
+  return (*m_poci)[index]->getDouble("DY") * Gaudi::Units::cm;
 }
 
 double 
 PixelLegacyManager::PixelCableThickness(int index)
 {
-  return (*m_poci)[index]->getDouble("DX")*GeoModelKernelUnits::cm;
+  return (*m_poci)[index]->getDouble("DX")*Gaudi::Units::cm;
 }
 
 double 
 PixelLegacyManager::PixelCableStackOffset(int index)
 {
-  return (*m_poci)[index]->getDouble("X")*GeoModelKernelUnits::cm;
+  return (*m_poci)[index]->getDouble("X")*Gaudi::Units::cm;
 }
 
 
@@ -417,47 +417,47 @@ double PixelLegacyManager::PixelTMTVariable(int iPart, const std::string & varNa
 
 double PixelLegacyManager::PixelTMTDzdr(int iPart)
 {
-  return PixelTMTVariable(iPart, "DZDR") * GeoModelKernelUnits::deg;
+  return PixelTMTVariable(iPart, "DZDR") * Gaudi::Units::deg;
 }
 
 
 double PixelLegacyManager::PixelTMTPosX(int iPart)
 {
-  return PixelTMTVariable(iPart, "X") * GeoModelKernelUnits::cm;
+  return PixelTMTVariable(iPart, "X") * Gaudi::Units::cm;
 }
 
 double PixelLegacyManager::PixelTMTPosZ(int iPart)
 {
-  return PixelTMTVariable(iPart, "Z") * GeoModelKernelUnits::cm;
+  return PixelTMTVariable(iPart, "Z") * Gaudi::Units::cm;
 }
 
 double PixelLegacyManager::PixelTMTLength(int iPart)
 {
-  return 2 * PixelTMTVariable(iPart, "DZ") * GeoModelKernelUnits::cm;
+  return 2 * PixelTMTVariable(iPart, "DZ") * Gaudi::Units::cm;
 }
 
 double PixelLegacyManager::PixelTMTWidthX2(int iPart)
 {
-  return 2 * PixelTMTVariable(iPart, "DX2") * GeoModelKernelUnits::cm;
+  return 2 * PixelTMTVariable(iPart, "DX2") * Gaudi::Units::cm;
 }
 
 double PixelLegacyManager::PixelTMTWidthX1(int iPart)
 {
-  return 2 * PixelTMTVariable(iPart, "DX1") * GeoModelKernelUnits::cm;
+  return 2 * PixelTMTVariable(iPart, "DX1") * Gaudi::Units::cm;
 }
 
 double PixelLegacyManager::PixelTMTWidthY(int iPart)
 {
-  return 2 * PixelTMTVariable(iPart, "DY") * GeoModelKernelUnits::cm;
+  return 2 * PixelTMTVariable(iPart, "DY") * Gaudi::Units::cm;
 }
 
 double PixelLegacyManager::PixelTMTBaseX1(int iPart)
 {
   double theta = PixelTMTDzdr(iPart);
   if (theta == 0) {
-    return PixelTMTVariable(iPart, "X")*GeoModelKernelUnits::cm + 0.25*(PixelTMTWidthX1(iPart)+PixelTMTWidthX2(iPart));
+    return PixelTMTVariable(iPart, "X")*Gaudi::Units::cm + 0.25*(PixelTMTWidthX1(iPart)+PixelTMTWidthX2(iPart));
   } else {
-    return  PixelTMTVariable(iPart, "X")*GeoModelKernelUnits::cm - 0.5*PixelTMTLength(iPart) * tan(theta) + 0.5*PixelTMTWidthX1(iPart);
+    return  PixelTMTVariable(iPart, "X")*Gaudi::Units::cm - 0.5*PixelTMTLength(iPart) * tan(theta) + 0.5*PixelTMTWidthX1(iPart);
   }
 }
 
@@ -465,15 +465,15 @@ double PixelLegacyManager::PixelTMTBaseX2(int iPart)
 {
   double theta = PixelTMTDzdr(iPart);
   if (theta == 0) {
-    return PixelTMTVariable(iPart, "X")*GeoModelKernelUnits::cm + 0.25*(PixelTMTWidthX1(iPart)+PixelTMTWidthX2(iPart));
+    return PixelTMTVariable(iPart, "X")*Gaudi::Units::cm + 0.25*(PixelTMTWidthX1(iPart)+PixelTMTWidthX2(iPart));
   } else {
-    return PixelTMTVariable(iPart, "X")*GeoModelKernelUnits::cm + 0.5*PixelTMTLength(iPart) * tan(theta) + 0.5*PixelTMTWidthX2(iPart);
+    return PixelTMTVariable(iPart, "X")*Gaudi::Units::cm + 0.5*PixelTMTLength(iPart) * tan(theta) + 0.5*PixelTMTWidthX2(iPart);
   }
 }
 
 double PixelLegacyManager::PixelTMTPosY(int iPart)
 {
-  return PixelTMTVariable(iPart, "Y") * GeoModelKernelUnits::cm;
+  return PixelTMTVariable(iPart, "Y") * Gaudi::Units::cm;
 }
 
 double PixelLegacyManager::PixelTMTPosZ1(int iPart)
@@ -498,52 +498,52 @@ bool PixelLegacyManager::PixelTMTPerModule(int iPart)
 //
 double PixelLegacyManager::PixelOmegaUpperBendX()
 {
-  return (*m_poti)[2]->getDouble("X") * GeoModelKernelUnits::cm;
+  return (*m_poti)[2]->getDouble("X") * Gaudi::Units::cm;
 }
 
 double PixelLegacyManager::PixelOmegaUpperBendY()
 {
-  return (*m_poti)[2]->getDouble("Y") * GeoModelKernelUnits::cm;
+  return (*m_poti)[2]->getDouble("Y") * Gaudi::Units::cm;
 }
 
 double PixelLegacyManager::PixelOmegaUpperBendRadius()
 {
-  return (*m_poti)[2]->getDouble("RMAX") * GeoModelKernelUnits::cm;
+  return (*m_poti)[2]->getDouble("RMAX") * Gaudi::Units::cm;
 }
 
 double PixelLegacyManager::PixelOmegaLowerBendX()
 {
-  return (*m_poti)[0]->getDouble("X") * GeoModelKernelUnits::cm;
+  return (*m_poti)[0]->getDouble("X") * Gaudi::Units::cm;
 }
 
 double PixelLegacyManager::PixelOmegaLowerBendY()
 {
-  return (*m_poti)[0]->getDouble("Y") * GeoModelKernelUnits::cm;
+  return (*m_poti)[0]->getDouble("Y") * Gaudi::Units::cm;
 }
 
 double PixelLegacyManager::PixelOmegaLowerBendRadius()
 {
-  return (*m_poti)[0]->getDouble("RMAX") * GeoModelKernelUnits::cm;
+  return (*m_poti)[0]->getDouble("RMAX") * Gaudi::Units::cm;
 }
 
 double PixelLegacyManager::PixelOmegaWallThickness()
 {
-  return ((*m_poti)[0]->getDouble("RMAX") - (*m_poti)[0]->getDouble("RMIN")) * GeoModelKernelUnits::cm;
+  return ((*m_poti)[0]->getDouble("RMAX") - (*m_poti)[0]->getDouble("RMIN")) * Gaudi::Units::cm;
 }
 
 double PixelLegacyManager::PixelOmegaLength()
 {
-  return 2. * (*m_poti)[0]->getDouble("DZ") * GeoModelKernelUnits::cm;
+  return 2. * (*m_poti)[0]->getDouble("DZ") * Gaudi::Units::cm;
 }
 
 double PixelLegacyManager::PixelOmegaStartY()
 {
-  return ((*m_posi)[0]->getDouble("Y") + 0.5*(*m_posi)[0]->getDouble("DY")) * GeoModelKernelUnits::cm;
+  return ((*m_posi)[0]->getDouble("Y") + 0.5*(*m_posi)[0]->getDouble("DY")) * Gaudi::Units::cm;
 }
 
 double PixelLegacyManager::PixelOmegaEndY()
 {
-  return ((*m_posi)[1]->getDouble("Y") - 0.5*(*m_posi)[1]->getDouble("DY")) * GeoModelKernelUnits::cm;
+  return ((*m_posi)[1]->getDouble("Y") - 0.5*(*m_posi)[1]->getDouble("DY")) * Gaudi::Units::cm;
 }
 
 //
@@ -552,42 +552,42 @@ double PixelLegacyManager::PixelOmegaEndY()
 
 double PixelLegacyManager::PixelAlTubeUpperBendX()
 {
-  return (*m_poti)[5]->getDouble("X") * GeoModelKernelUnits::cm;
+  return (*m_poti)[5]->getDouble("X") * Gaudi::Units::cm;
 }
 
 double PixelLegacyManager::PixelAlTubeUpperBendY()
 {
-  return (*m_poti)[5]->getDouble("Y") * GeoModelKernelUnits::cm;
+  return (*m_poti)[5]->getDouble("Y") * Gaudi::Units::cm;
 }
 
 double PixelLegacyManager::PixelAlTubeUpperBendRadius()
 {
-  return (*m_poti)[5]->getDouble("RMAX") * GeoModelKernelUnits::cm;
+  return (*m_poti)[5]->getDouble("RMAX") * Gaudi::Units::cm;
 }
 
 double PixelLegacyManager::PixelAlTubeLowerBendX()
 {
-  return (*m_poti)[3]->getDouble("X") * GeoModelKernelUnits::cm;
+  return (*m_poti)[3]->getDouble("X") * Gaudi::Units::cm;
 }
 
 double PixelLegacyManager::PixelAlTubeLowerBendY()
 {
-  return (*m_poti)[3]->getDouble("Y") * GeoModelKernelUnits::cm;
+  return (*m_poti)[3]->getDouble("Y") * Gaudi::Units::cm;
 }
 
 double PixelLegacyManager::PixelAlTubeLowerBendRadius()
 {
-  return (*m_poti)[3]->getDouble("RMAX") * GeoModelKernelUnits::cm;
+  return (*m_poti)[3]->getDouble("RMAX") * Gaudi::Units::cm;
 }
 
 double PixelLegacyManager::PixelAlTubeWallThickness()
 {
-  return ((*m_poti)[3]->getDouble("RMAX") - (*m_poti)[3]->getDouble("RMIN")) * GeoModelKernelUnits::cm;
+  return ((*m_poti)[3]->getDouble("RMAX") - (*m_poti)[3]->getDouble("RMIN")) * Gaudi::Units::cm;
 }
 
 double PixelLegacyManager::PixelAlTubeLength()
 {
-  return 2 * (*m_poti)[3]->getDouble("DZ") * GeoModelKernelUnits::cm;
+  return 2 * (*m_poti)[3]->getDouble("DZ") * Gaudi::Units::cm;
 }
 
 //
@@ -601,32 +601,32 @@ int PixelLegacyManager::PixelNumOmegaGlueElements()
 
 double PixelLegacyManager::PixelOmegaGlueStartX(int index)
 {
-  return ((*m_posi)[index+2]->getDouble("X") - 0.5*(*m_posi)[index+2]->getDouble("DX")) * GeoModelKernelUnits::cm;
+  return ((*m_posi)[index+2]->getDouble("X") - 0.5*(*m_posi)[index+2]->getDouble("DX")) * Gaudi::Units::cm;
 }
 
 double PixelLegacyManager::PixelOmegaGlueThickness(int index)
 {
-  return (*m_posi)[index+2]->getDouble("DX") * GeoModelKernelUnits::cm;
+  return (*m_posi)[index+2]->getDouble("DX") * Gaudi::Units::cm;
 }
 
 double PixelLegacyManager::PixelOmegaGlueStartY(int index)
 {
-  return ((*m_posi)[index+2]->getDouble("Y") - 0.5*(*m_posi)[index+2]->getDouble("DY")) * GeoModelKernelUnits::cm;
+  return ((*m_posi)[index+2]->getDouble("Y") - 0.5*(*m_posi)[index+2]->getDouble("DY")) * Gaudi::Units::cm;
 }
 
 double PixelLegacyManager::PixelOmegaGlueEndY(int index)
 {
-  return ((*m_posi)[index+2]->getDouble("Y") + 0.5*(*m_posi)[index+2]->getDouble("DY")) * GeoModelKernelUnits::cm;
+  return ((*m_posi)[index+2]->getDouble("Y") + 0.5*(*m_posi)[index+2]->getDouble("DY")) * Gaudi::Units::cm;
 }
 
 double PixelLegacyManager::PixelOmegaGlueLength(int index)
 {
-  return 2 * (*m_posi)[index+2]->getDouble("DZ") * GeoModelKernelUnits::cm;
+  return 2 * (*m_posi)[index+2]->getDouble("DZ") * Gaudi::Units::cm;
 }
 
 double PixelLegacyManager::PixelOmegaGluePosZ(int index)
 {
-  return (*m_posi)[index+2]->getDouble("Z") * GeoModelKernelUnits::cm;
+  return (*m_posi)[index+2]->getDouble("Z") * Gaudi::Units::cm;
 }
 
 int PixelLegacyManager::PixelOmegaGlueTypeNum(int index)
@@ -640,24 +640,24 @@ int PixelLegacyManager::PixelOmegaGlueTypeNum(int index)
 
 double PixelLegacyManager::PixelFluidZ1(int index)
 {
-  double dz = (*m_pcff)[index%2]->getDouble("DZ")*GeoModelKernelUnits::cm;
-  double posz = (*m_pcff)[index%2]->getDouble("Z")*GeoModelKernelUnits::cm;
+  double dz = (*m_pcff)[index%2]->getDouble("DZ")*Gaudi::Units::cm;
+  double posz = (*m_pcff)[index%2]->getDouble("Z")*Gaudi::Units::cm;
   return posz-dz;
 }
 
 double PixelLegacyManager::PixelFluidZ2(int index)
 {
-  double dz = (*m_pcff)[index%2]->getDouble("DZ")*GeoModelKernelUnits::cm;
-  double posz = (*m_pcff)[index%2]->getDouble("Z")*GeoModelKernelUnits::cm;
+  double dz = (*m_pcff)[index%2]->getDouble("DZ")*Gaudi::Units::cm;
+  double posz = (*m_pcff)[index%2]->getDouble("Z")*Gaudi::Units::cm;
   return posz+dz;
 }
 
 double PixelLegacyManager::PixelFluidThick1(int index)
 {
   if (index < 2) {
-    return 2*(*m_pcff)[index%2]->getDouble("DX1")*GeoModelKernelUnits::cm;
+    return 2*(*m_pcff)[index%2]->getDouble("DX1")*Gaudi::Units::cm;
   } else {
-    return 2*(*m_pcff)[index%2]->getDouble("DX2")*GeoModelKernelUnits::cm;
+    return 2*(*m_pcff)[index%2]->getDouble("DX2")*Gaudi::Units::cm;
   }
 }
 
@@ -665,26 +665,26 @@ double PixelLegacyManager::PixelFluidThick1(int index)
 double PixelLegacyManager::PixelFluidThick2(int index)
 {
   if (index < 2) {
-    return 2*(*m_pcff)[index%2]->getDouble("DX2")*GeoModelKernelUnits::cm;
+    return 2*(*m_pcff)[index%2]->getDouble("DX2")*Gaudi::Units::cm;
   } else {
-    return 2*(*m_pcff)[index%2]->getDouble("DX1")*GeoModelKernelUnits::cm;
+    return 2*(*m_pcff)[index%2]->getDouble("DX1")*Gaudi::Units::cm;
   }
 }
 
 double PixelLegacyManager::PixelFluidWidth(int index)
 {
-  return 2*(*m_pcff)[index%2]->getDouble("DY")*GeoModelKernelUnits::cm;
+  return 2*(*m_pcff)[index%2]->getDouble("DY")*Gaudi::Units::cm;
 }
 
 
 double PixelLegacyManager::PixelFluidX(int index)
 {
-  return (*m_pcff)[index%2]->getDouble("X")*GeoModelKernelUnits::cm;
+  return (*m_pcff)[index%2]->getDouble("X")*Gaudi::Units::cm;
 }
 
 double PixelLegacyManager::PixelFluidY(int index)
 {
-  return (*m_pcff)[index%2]->getDouble("Y")*GeoModelKernelUnits::cm;
+  return (*m_pcff)[index%2]->getDouble("Y")*Gaudi::Units::cm;
 }
 
 int PixelLegacyManager::PixelFluidType(int index)
@@ -716,17 +716,17 @@ int PixelLegacyManager::PixelFluidOrient(int layer, int phi)
 //
 double PixelLegacyManager::PixelPigtailThickness()
 {
-  return (*m_poai)[0]->getDouble("DX") * GeoModelKernelUnits::cm;
+  return (*m_poai)[0]->getDouble("DX") * Gaudi::Units::cm;
 }
 
 double PixelLegacyManager::PixelPigtailStartY()
 {
-  return -0.5*(*m_poai)[0]->getDouble("DY") * GeoModelKernelUnits::cm;
+  return -0.5*(*m_poai)[0]->getDouble("DY") * Gaudi::Units::cm;
 }
 
 double PixelLegacyManager::PixelPigtailEndY()
 {
-  return  0.5*(*m_poai)[0]->getDouble("DY") * GeoModelKernelUnits::cm;
+  return  0.5*(*m_poai)[0]->getDouble("DY") * Gaudi::Units::cm;
 }
 
 double PixelLegacyManager::PixelPigtailFlatWidthZ()
@@ -734,59 +734,59 @@ double PixelLegacyManager::PixelPigtailFlatWidthZ()
   // Assume its actually the full width but in old geometry it was interpreted as a half width so we
   // multiply by 2. This gives the flat section twice the width of the curved section which I don't think was the 
   // intention.
-  return 2*(*m_poai)[0]->getDouble("DZ") * GeoModelKernelUnits::cm;
+  return 2*(*m_poai)[0]->getDouble("DZ") * Gaudi::Units::cm;
 }
 
 double PixelLegacyManager::PixelPigtailWidthZ()
 {
-  return 2*(*m_pobi)[0]->getDouble("DZ") * GeoModelKernelUnits::cm;
+  return 2*(*m_pobi)[0]->getDouble("DZ") * Gaudi::Units::cm;
 }
 
 // FIXME some weird offset
 double PixelLegacyManager::PixelPigtailPosX()
 {
-  return (*m_poai)[0]->getDouble("X") * GeoModelKernelUnits::cm + PixelLadderConnectorOffsetX();
+  return (*m_poai)[0]->getDouble("X") * Gaudi::Units::cm + PixelLadderConnectorOffsetX();
 }
 
 double PixelLegacyManager::PixelPigtailPosZ()
 {
-  return (*m_poai)[0]->getDouble("Z") * GeoModelKernelUnits::cm;
+  return (*m_poai)[0]->getDouble("Z") * Gaudi::Units::cm;
 }
 
 double PixelLegacyManager::PixelPigtailBendX()
 {
-  return (*m_pobi)[0]->getDouble("X") * GeoModelKernelUnits::cm + PixelLadderConnectorOffsetX();
+  return (*m_pobi)[0]->getDouble("X") * Gaudi::Units::cm + PixelLadderConnectorOffsetX();
 }
 
 double PixelLegacyManager::PixelPigtailBendY()
 {
-  return (*m_pobi)[0]->getDouble("Y") * GeoModelKernelUnits::cm + PixelLadderPigtailOffsetY();
+  return (*m_pobi)[0]->getDouble("Y") * Gaudi::Units::cm + PixelLadderPigtailOffsetY();
 }
 
 double PixelLegacyManager::PixelPigtailBendRMin()
 {
-  return (*m_pobi)[0]->getDouble("RMIN") * GeoModelKernelUnits::cm;
+  return (*m_pobi)[0]->getDouble("RMIN") * Gaudi::Units::cm;
 }
 
 double PixelLegacyManager::PixelPigtailBendRMax()
 {
-  return (*m_pobi)[0]->getDouble("RMAX") * GeoModelKernelUnits::cm;
+  return (*m_pobi)[0]->getDouble("RMAX") * Gaudi::Units::cm;
 }
 
 double PixelLegacyManager::PixelPigtailBendPhiMin()
 {
-  return (*m_pobi)[0]->getDouble("PHI1") * GeoModelKernelUnits::deg;
+  return (*m_pobi)[0]->getDouble("PHI1") * Gaudi::Units::deg;
 }
 
 double PixelLegacyManager::PixelPigtailBendPhiMax()
 {
-  return (*m_pobi)[0]->getDouble("PHI2") * GeoModelKernelUnits::deg;
+  return (*m_pobi)[0]->getDouble("PHI2") * Gaudi::Units::deg;
 }
 
 double PixelLegacyManager::PixelPigtailEnvelopeLength()
 {
   // FIXME Check
-  return 2*(*m_posi)[9]->getDouble("DZ") * GeoModelKernelUnits::cm;
+  return 2*(*m_posi)[9]->getDouble("DZ") * Gaudi::Units::cm;
 }
 
 //
@@ -799,22 +799,22 @@ int PixelLegacyManager::PixelNumConnectorElements()
 
 double PixelLegacyManager::PixelConnectorWidthX(int index)
 {
-  return (*m_poai)[index+1]->getDouble("DX") * GeoModelKernelUnits::cm;
+  return (*m_poai)[index+1]->getDouble("DX") * Gaudi::Units::cm;
 }
 
 double PixelLegacyManager::PixelConnectorWidthY(int index)
 {
-  return (*m_poai)[index+1]->getDouble("DY") * GeoModelKernelUnits::cm;
+  return (*m_poai)[index+1]->getDouble("DY") * Gaudi::Units::cm;
 }
 
 double PixelLegacyManager::PixelConnectorWidthZ(int index)
 {
-  return 2*(*m_poai)[index+1]->getDouble("DZ") * GeoModelKernelUnits::cm;
+  return 2*(*m_poai)[index+1]->getDouble("DZ") * Gaudi::Units::cm;
 }
 
 double PixelLegacyManager::PixelConnectorPosX(int index)
 {
-  return (*m_poai)[index+1]->getDouble("X") * GeoModelKernelUnits::cm + PixelLadderConnectorOffsetX();
+  return (*m_poai)[index+1]->getDouble("X") * Gaudi::Units::cm + PixelLadderConnectorOffsetX();
 }
 
 double PixelLegacyManager::PixelConnectorPosY(int)
@@ -824,8 +824,8 @@ double PixelLegacyManager::PixelConnectorPosY(int)
 
 double PixelLegacyManager::PixelConnectorPosZ(int index)
 {
-  // same as  (*m_pobi)[0]->getDouble("Z") * GeoModelKernelUnits::cm;
-  return (*m_poai)[index+1]->getDouble("Z") * GeoModelKernelUnits::cm;
+  // same as  (*m_pobi)[0]->getDouble("Z") * Gaudi::Units::cm;
+  return (*m_poai)[index+1]->getDouble("Z") * Gaudi::Units::cm;
 }
 
 
@@ -908,19 +908,19 @@ int PixelLegacyManager::EmptyRowConnections(int index)
 
 double PixelLegacyManager::DesignRPActiveArea()
 {
-  return (*m_pxbi)[0]->getDouble("DYACTIVE")*GeoModelKernelUnits::cm;
+  return (*m_pxbi)[0]->getDouble("DYACTIVE")*Gaudi::Units::cm;
 
 }
 
 double PixelLegacyManager::DesignZActiveArea()
 {
-  return (*m_pxbi)[0]->getDouble("DZELEB")*GeoModelKernelUnits::cm;
+  return (*m_pxbi)[0]->getDouble("DZELEB")*Gaudi::Units::cm;
 }
     
 double PixelLegacyManager::DesignPitchRP(bool isBLayer)
 {
   int type = designType(isBLayer);
-  return (*m_pxbd)[type]->getDouble("PITCHRP")*GeoModelKernelUnits::cm;
+  return (*m_pxbd)[type]->getDouble("PITCHRP")*Gaudi::Units::cm;
 }
 
 // FIXME m_dc1Geometry
@@ -930,9 +930,9 @@ double PixelLegacyManager::DesignPitchZ(bool isBLayer)
   double pitchZ;
   if(isBLayer && m_dc1Geometry) {
     // Override NOVA 
-    pitchZ = 300 * GeoModelKernelUnits::micrometer; 
+    pitchZ = 300 * Gaudi::Units::micrometer; 
   } else {
-    pitchZ = (*m_pxbd)[type]->getDouble("PITCHZ") * GeoModelKernelUnits::cm;
+    pitchZ = (*m_pxbd)[type]->getDouble("PITCHZ") * Gaudi::Units::cm;
   }
   return pitchZ;
 }
@@ -945,12 +945,12 @@ double PixelLegacyManager::DesignPitchZLong(bool isBLayer)
 
 double PixelLegacyManager::DesignGapRP()
 {
-  return (*m_pdch)[0]->getDouble("GAPRP")*GeoModelKernelUnits::cm;
+  return (*m_pdch)[0]->getDouble("GAPRP")*Gaudi::Units::cm;
 }
 
 double PixelLegacyManager::DesignGapZ()
 {
-  return (*m_pdch)[0]->getDouble("GAPZ")*GeoModelKernelUnits::cm;
+  return (*m_pdch)[0]->getDouble("GAPZ")*Gaudi::Units::cm;
 }
 
 int PixelLegacyManager::DesignCircuitsEta()
diff --git a/InnerDetector/InDetDetDescr/SCT_Cabling/CMakeLists.txt b/InnerDetector/InDetDetDescr/SCT_Cabling/CMakeLists.txt
index fe5a3bb132cb49ff6a475ce9441a938b0bc6b4b1..ae8d4b886dc1c1e0c3046a4a72b91a38d47a23ab 100644
--- a/InnerDetector/InDetDetDescr/SCT_Cabling/CMakeLists.txt
+++ b/InnerDetector/InDetDetDescr/SCT_Cabling/CMakeLists.txt
@@ -39,7 +39,7 @@ atlas_add_component( SCT_Cabling
 atlas_add_test( TestSCT_CablingCfg
                 SCRIPT share/TestSCT_CablingCfg.sh
                 PROPERTIES TIMEOUT 300
-                ENVIRONMENT THREADS=2 )
+                ENVIRONMENT THREADS=1 )
 
 # Install files from the package:
 atlas_install_joboptions( share/*.py )
diff --git a/InnerDetector/InDetDetDescr/SCT_Cabling/SCT_Cabling/ISCT_CablingTool.h b/InnerDetector/InDetDetDescr/SCT_Cabling/SCT_Cabling/ISCT_CablingTool.h
index 6a1e8a7e9ea0f0cd026af5a7baf0bdec3778637f..52340082ef86a2ea7e10a5a7023eab9b04759b71 100644
--- a/InnerDetector/InDetDetDescr/SCT_Cabling/SCT_Cabling/ISCT_CablingTool.h
+++ b/InnerDetector/InDetDetDescr/SCT_Cabling/SCT_Cabling/ISCT_CablingTool.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef ISCT_CablingTool_h
@@ -18,6 +18,7 @@
 #include "SCT_Cabling/SCT_OnlineId.h"
 
 //Gaudi includes
+#include "GaudiKernel/EventContext.h"
 #include "GaudiKernel/IAlgTool.h"
 
 //standard includes
@@ -42,36 +43,47 @@ class ISCT_CablingTool: virtual public IAlgTool {
 
   /// return offline hash, given the online Id (used by decoders)
   virtual IdentifierHash getHashFromOnlineId(const SCT_OnlineId& onlineId, const bool withWarnings = true) const = 0;
+  virtual IdentifierHash getHashFromOnlineId(const SCT_OnlineId& onlineId, const EventContext& ctx, const bool withWarnings = true) const = 0;
 
   /// return the online Id, given a hash (used by simulation encoders)
   virtual SCT_OnlineId getOnlineIdFromHash(const IdentifierHash& hash) const = 0;
+  virtual SCT_OnlineId getOnlineIdFromHash(const IdentifierHash& hash, const EventContext& ctx) const = 0;
 
   /// return the rob/rod Id, given a hash (used by simulation encoders)
   virtual std::uint32_t getRobIdFromHash(const IdentifierHash& hash) const = 0;
+  virtual std::uint32_t getRobIdFromHash(const IdentifierHash& hash, const EventContext& ctx) const = 0;
 
   /// return the online Id, given an offlineId
   virtual SCT_OnlineId getOnlineIdFromOfflineId(const Identifier& offlineId) const = 0;
+  virtual SCT_OnlineId getOnlineIdFromOfflineId(const Identifier& offlineId, const EventContext& ctx) const = 0;
 
   /// return the rob/rod Id, given an offlineId (used by simulation encoders)
   virtual std::uint32_t getRobIdFromOfflineId(const Identifier& offlineId) const = 0;
+  virtual std::uint32_t getRobIdFromOfflineId(const Identifier& offlineId, const EventContext& ctx) const = 0;
 
   /// size of the data structure (for the SCT should be 8176, one for each module side)
   virtual unsigned int size() const = 0;
+  virtual unsigned int size(const EventContext& ctx) const = 0;
 
   /// is the data structure empty?
   virtual bool empty() const = 0;
+  virtual bool empty(const EventContext& ctx) const = 0;
 
   /// get hash from a module serial number, needed in the conditions service because configurations are stored by module s/n
   virtual IdentifierHash getHashFromSerialNumber(const SCT_SerialNumber& sn) const = 0;
+  virtual IdentifierHash getHashFromSerialNumber(const SCT_SerialNumber& sn, const EventContext& ctx) const = 0;
 
   /// get module serial number from hash, needed during filling of data structure
   virtual SCT_SerialNumber getSerialNumberFromHash(const IdentifierHash& hash) const = 0;
+  virtual SCT_SerialNumber getSerialNumberFromHash(const IdentifierHash& hash, const EventContext& ctx) const = 0;
 
   /// fill a users vector with all the RodIds
   virtual void getAllRods(std::vector<std::uint32_t>& usersVector) const = 0;
+  virtual void getAllRods(std::vector<std::uint32_t>& usersVector, const EventContext& ctx) const = 0;
 
   /// fill a user's vector with all the hash ids which belong to a given rod
   virtual void getHashesForRod(std::vector<IdentifierHash>& usersVector, const std::uint32_t rodId) const = 0;
+  virtual void getHashesForRod(std::vector<IdentifierHash>& usersVector, const std::uint32_t rodId, const EventContext& ctx) const = 0;
 };
 
 #endif // ISCT_CablingTool_h
diff --git a/InnerDetector/InDetDetDescr/SCT_Cabling/share/TestSCT_CablingCfg.sh b/InnerDetector/InDetDetDescr/SCT_Cabling/share/TestSCT_CablingCfg.sh
index 64a170078fbdd0ab5eda1d403b6d0ce77cea4a3d..6ab4957fe3d5622409f64f96afa39cc73912fba6 100755
--- a/InnerDetector/InDetDetDescr/SCT_Cabling/share/TestSCT_CablingCfg.sh
+++ b/InnerDetector/InDetDetDescr/SCT_Cabling/share/TestSCT_CablingCfg.sh
@@ -10,7 +10,7 @@ svcMgr.AvalancheSchedulerSvc.ShowControlFlow=True
 svcMgr.AvalancheSchedulerSvc.ShowDataDependencies=True
 EOF
 
-athena --threads=2 --config-only=bootstrap.pkl bootstrap.py
+athena --threads=1 --config-only=bootstrap.pkl bootstrap.py
 
 get_files -jo SCT_Cabling/TestSCT_CablingCfg.py
  
@@ -24,5 +24,5 @@ else
     echo
     echo "JOs reading stage finished, launching Athena from pickle file"
     echo 
-    athena --evtMax=2 TestSCT_CablingCfg.pkl
+    athena --evtMax=2 TestSCT_CablingCfg.pkl 2>&1
 fi
diff --git a/InnerDetector/InDetDetDescr/SCT_Cabling/src/SCT_CablingCondAlgFromCoraCool.cxx b/InnerDetector/InDetDetDescr/SCT_Cabling/src/SCT_CablingCondAlgFromCoraCool.cxx
index 4add5248d8dff54e121af8a50502608c8db120cb..66196b2084fd31d1984c79dfa71056e5a149360a 100644
--- a/InnerDetector/InDetDetDescr/SCT_Cabling/src/SCT_CablingCondAlgFromCoraCool.cxx
+++ b/InnerDetector/InDetDetDescr/SCT_Cabling/src/SCT_CablingCondAlgFromCoraCool.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 /**   
@@ -173,7 +173,7 @@ namespace {
 
 // Constructor
 SCT_CablingCondAlgFromCoraCool::SCT_CablingCondAlgFromCoraCool(const std::string& name, ISvcLocator* pSvcLocator):
-  AthAlgorithm(name, pSvcLocator),
+  AthReentrantAlgorithm(name, pSvcLocator),
   m_condSvc{"CondSvc", name}
 {
 }
@@ -227,9 +227,9 @@ SCT_CablingCondAlgFromCoraCool::finalize() {
 
 //
 StatusCode
-SCT_CablingCondAlgFromCoraCool::execute() {
+SCT_CablingCondAlgFromCoraCool::execute(const EventContext& ctx) const {
   // Write Cond Handle
-  SG::WriteCondHandle<SCT_CablingData> writeHandle{m_writeKey};
+  SG::WriteCondHandle<SCT_CablingData> writeHandle{m_writeKey, ctx};
   if (writeHandle.isValid()) {
     ATH_MSG_DEBUG("CondHandle " << writeHandle.fullKey() << " is already valid."
                   << ". In theory this should not be called, but may happen"
@@ -244,7 +244,7 @@ SCT_CablingCondAlgFromCoraCool::execute() {
   bool isRun2{m_readKeyRod.key()==rodFolderName2};
 
   // let's get the ROD AttrLists
-  SG::ReadCondHandle<CondAttrListVec> readHandleRod{m_readKeyRod};
+  SG::ReadCondHandle<CondAttrListVec> readHandleRod{m_readKeyRod, ctx};
   const CondAttrListVec* pRod{*readHandleRod};
   if (pRod==nullptr) {
     ATH_MSG_FATAL("Could not find ROD configuration data: " << m_readKeyRod.key());
@@ -310,7 +310,7 @@ SCT_CablingCondAlgFromCoraCool::execute() {
    * In fact for the barrel its obvious, so only extract the endcap ones
    **/
   IntMap geoMurMap;
-  SG::ReadCondHandle<CondAttrListVec> readHandleGeo{m_readKeyGeo};
+  SG::ReadCondHandle<CondAttrListVec> readHandleGeo{m_readKeyGeo, ctx};
   const CondAttrListVec* pGeo{*readHandleGeo};
   if (pGeo==nullptr) {
     ATH_MSG_FATAL("Could not find Geog configuration data: " << m_readKeyGeo.key());
@@ -330,7 +330,7 @@ SCT_CablingCondAlgFromCoraCool::execute() {
    * so make a temporary data structure.
    **/
   IntMap murPositionMap;
-  SG::ReadCondHandle<CondAttrListVec> readHandleRodMur{m_readKeyRodMur};
+  SG::ReadCondHandle<CondAttrListVec> readHandleRodMur{m_readKeyRodMur, ctx};
   const CondAttrListVec* pRodMur{*readHandleRodMur};
   if (pRodMur==nullptr) {
     ATH_MSG_FATAL("Could not find RodMur configuration data: " << m_readKeyRodMur.key());
@@ -359,7 +359,7 @@ SCT_CablingCondAlgFromCoraCool::execute() {
   if (not allInsertsSucceeded) ATH_MSG_WARNING("Some MUR-position map inserts failed.");
 
   // let's get the MUR AttrLists
-  SG::ReadCondHandle<CondAttrListVec> readHandleMur{m_readKeyMur};
+  SG::ReadCondHandle<CondAttrListVec> readHandleMur{m_readKeyMur, ctx};
   const CondAttrListVec* pMur{*readHandleMur};
   if (pMur==nullptr) {
     ATH_MSG_FATAL("Could not find ROD configuration data: " << m_readKeyMur.key());
@@ -538,7 +538,7 @@ SCT_CablingCondAlgFromCoraCool::execute() {
 
 //
 bool
-SCT_CablingCondAlgFromCoraCool::insert(const IdentifierHash& hash, const SCT_OnlineId& onlineId, const SCT_SerialNumber& sn, SCT_CablingData* data) {
+SCT_CablingCondAlgFromCoraCool::insert(const IdentifierHash& hash, const SCT_OnlineId& onlineId, const SCT_SerialNumber& sn, SCT_CablingData* data) const {
   if (not sn.isWellFormed()) {
     ATH_MSG_FATAL("Serial number is not in correct format");
     return false;
diff --git a/InnerDetector/InDetDetDescr/SCT_Cabling/src/SCT_CablingCondAlgFromCoraCool.h b/InnerDetector/InDetDetDescr/SCT_Cabling/src/SCT_CablingCondAlgFromCoraCool.h
index ed29ad6704e3eb32296c068a11ec67146267f599..bf2ff175ce717c9beea8752f889bb03862fb9185 100644
--- a/InnerDetector/InDetDetDescr/SCT_Cabling/src/SCT_CablingCondAlgFromCoraCool.h
+++ b/InnerDetector/InDetDetDescr/SCT_Cabling/src/SCT_CablingCondAlgFromCoraCool.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef SCT_CablingCondAlgFromCoraCool_H
@@ -14,7 +14,7 @@
  */
 
 //Athena includes
-#include "AthenaBaseComps/AthAlgorithm.h"
+#include "AthenaBaseComps/AthReentrantAlgorithm.h"
 #include "AthenaPoolUtilities/CondAttrListVec.h"
 #include "SCT_Cabling/SCT_CablingData.h"
 #include "StoreGate/ReadCondHandleKey.h"
@@ -33,18 +33,18 @@
  *
  */
 
-class SCT_CablingCondAlgFromCoraCool: public AthAlgorithm {
+class SCT_CablingCondAlgFromCoraCool: public AthReentrantAlgorithm {
  public:
 
   SCT_CablingCondAlgFromCoraCool(const std::string& name, ISvcLocator* svc);
   virtual ~SCT_CablingCondAlgFromCoraCool() = default;
   virtual StatusCode initialize() override;
-  virtual StatusCode execute() override;
+  virtual StatusCode execute(const EventContext& ctx) const override;
   virtual StatusCode finalize() override;
   
 private:
 
-  bool insert(const IdentifierHash& hash, const SCT_OnlineId& onlineId, const SCT_SerialNumber& sn, SCT_CablingData* data);
+  bool insert(const IdentifierHash& hash, const SCT_OnlineId& onlineId, const SCT_SerialNumber& sn, SCT_CablingData* data) const;
 
   SG::ReadCondHandleKey<CondAttrListVec> m_readKeyRod{this, "ReadKeyRod", "/SCT/DAQ/Config/ROD", "Key of input (raw) conditions folder of Rods"};
   SG::ReadCondHandleKey<CondAttrListVec> m_readKeyRodMur{this, "ReadKeyRodMur", "/SCT/DAQ/Config/RODMUR", "Key of input (raw) conditions folder of RodMurs"};
diff --git a/InnerDetector/InDetDetDescr/SCT_Cabling/src/SCT_CablingCondAlgFromText.cxx b/InnerDetector/InDetDetDescr/SCT_Cabling/src/SCT_CablingCondAlgFromText.cxx
index 1c1948fea007ffd6e1d4c513f77db6eddb870465..ecba6f9bb07818872064e87bde3cd8ff9a01acf0 100644
--- a/InnerDetector/InDetDetDescr/SCT_Cabling/src/SCT_CablingCondAlgFromText.cxx
+++ b/InnerDetector/InDetDetDescr/SCT_Cabling/src/SCT_CablingCondAlgFromText.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 /**   
@@ -58,7 +58,7 @@ namespace {
 
 // Constructor
 SCT_CablingCondAlgFromText::SCT_CablingCondAlgFromText(const std::string& name, ISvcLocator* pSvcLocator):
-  AthAlgorithm(name, pSvcLocator),
+  AthReentrantAlgorithm(name, pSvcLocator),
   m_condSvc{"CondSvc", name}
 {
 }
@@ -96,9 +96,9 @@ SCT_CablingCondAlgFromText::finalize() {
 
 //
 StatusCode
-SCT_CablingCondAlgFromText::execute() {
+SCT_CablingCondAlgFromText::execute(const EventContext& ctx) const {
   // Write Cond Handle
-  SG::WriteCondHandle<SCT_CablingData> writeHandle{m_writeKey};
+  SG::WriteCondHandle<SCT_CablingData> writeHandle{m_writeKey, ctx};
   if (writeHandle.isValid()) {
     ATH_MSG_DEBUG("CondHandle " << writeHandle.fullKey() << " is already valid."
                   << ". In theory this should not be called, but may happen"
@@ -238,7 +238,7 @@ SCT_CablingCondAlgFromText::execute() {
 
 //
 bool
-SCT_CablingCondAlgFromText::insert(const IdentifierHash& hash, const SCT_OnlineId& onlineId, const SCT_SerialNumber& sn, SCT_CablingData* data) {
+SCT_CablingCondAlgFromText::insert(const IdentifierHash& hash, const SCT_OnlineId& onlineId, const SCT_SerialNumber& sn, SCT_CablingData* data) const {
   if (not sn.isWellFormed()) {
     ATH_MSG_FATAL("Serial number is not in correct format");
     return false;
diff --git a/InnerDetector/InDetDetDescr/SCT_Cabling/src/SCT_CablingCondAlgFromText.h b/InnerDetector/InDetDetDescr/SCT_Cabling/src/SCT_CablingCondAlgFromText.h
index a989786b27fb0002a7edce72f3c205afcddab4f5..d01a858f29b704a93da42dd619ebb896bf9631e2 100644
--- a/InnerDetector/InDetDetDescr/SCT_Cabling/src/SCT_CablingCondAlgFromText.h
+++ b/InnerDetector/InDetDetDescr/SCT_Cabling/src/SCT_CablingCondAlgFromText.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef SCT_CablingCondAlgFromText_H
@@ -14,7 +14,7 @@
  */
 
 //Athena includes
-#include "AthenaBaseComps/AthAlgorithm.h"
+#include "AthenaBaseComps/AthReentrantAlgorithm.h"
 #include "SCT_Cabling/SCT_CablingData.h"
 #include "StoreGate/WriteCondHandleKey.h"
 
@@ -31,18 +31,18 @@
  *
  */
 
-class SCT_CablingCondAlgFromText: public AthAlgorithm {
+class SCT_CablingCondAlgFromText: public AthReentrantAlgorithm {
  public:
 
   SCT_CablingCondAlgFromText(const std::string& name, ISvcLocator* svc);
   virtual ~SCT_CablingCondAlgFromText() = default;
   virtual StatusCode initialize() override;
-  virtual StatusCode execute() override;
+  virtual StatusCode execute(const EventContext& ctx) const override;
   virtual StatusCode finalize() override;
   
 private:
 
-  bool insert(const IdentifierHash& hash, const SCT_OnlineId& onlineId, const SCT_SerialNumber& sn, SCT_CablingData* data);
+  bool insert(const IdentifierHash& hash, const SCT_OnlineId& onlineId, const SCT_SerialNumber& sn, SCT_CablingData* data) const;
   StringProperty m_source{this, "DataSource", "SCT_MC_FullCabling_svc.dat", "a plain text file for the SCT Cabing"};
   SG::WriteCondHandleKey<SCT_CablingData> m_writeKey{this, "WriteKey", "SCT_CablingData", "Key of output (derived) conditions folder"};
   ServiceHandle<ICondSvc> m_condSvc;
diff --git a/InnerDetector/InDetDetDescr/SCT_Cabling/src/SCT_CablingTool.cxx b/InnerDetector/InDetDetDescr/SCT_Cabling/src/SCT_CablingTool.cxx
index 4062118a51331b894dc2effa35c26b6b338e2c42..38c5c554382beb815cfb43f3b374ae8d34bb800b 100644
--- a/InnerDetector/InDetDetDescr/SCT_Cabling/src/SCT_CablingTool.cxx
+++ b/InnerDetector/InDetDetDescr/SCT_Cabling/src/SCT_CablingTool.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 /**
@@ -71,8 +71,8 @@ SCT_CablingTool::finalize() {
 
 //
 unsigned int
-SCT_CablingTool::size() const {
-  const SCT_CablingData* data{getData()};
+SCT_CablingTool::size(const EventContext& ctx) const {
+  const SCT_CablingData* data{getData(ctx)};
   if (data==nullptr) {
     ATH_MSG_FATAL("Filling the cabling FAILED");
     return 0;
@@ -81,15 +81,27 @@ SCT_CablingTool::size() const {
   return data->getHashEntries();
 }
 
+unsigned int
+SCT_CablingTool::size() const {
+  const EventContext& ctx{Gaudi::Hive::currentContext()};
+  return size(ctx);
+}
+
 //
+bool
+SCT_CablingTool::empty(const EventContext& ctx) const {
+  return (size(ctx)==0);
+}
+
 bool
 SCT_CablingTool::empty() const {
-  return (size()==0);
+  const EventContext& ctx{Gaudi::Hive::currentContext()};
+  return empty(ctx);
 }
 
 //
 IdentifierHash 
-SCT_CablingTool::getHashFromOnlineId(const SCT_OnlineId& onlineId, const bool withWarnings) const {
+SCT_CablingTool::getHashFromOnlineId(const SCT_OnlineId& onlineId, const EventContext& ctx, const bool withWarnings) const {
   //is it valid at all?
   if (not onlineId.is_valid()) {
     if (withWarnings) ATH_MSG_WARNING("Invalid online id ("<<std::hex<<onlineId<<") "<<std::dec);
@@ -102,7 +114,7 @@ SCT_CablingTool::getHashFromOnlineId(const SCT_OnlineId& onlineId, const bool wi
     return invalidHash;
   }
 
-  const SCT_CablingData* data{getData()};
+  const SCT_CablingData* data{getData(ctx)};
   if (data==nullptr) {
     ATH_MSG_FATAL("Filling the cabling FAILED");
     return invalidHash;
@@ -111,10 +123,16 @@ SCT_CablingTool::getHashFromOnlineId(const SCT_OnlineId& onlineId, const bool wi
   return data->getHashFromOnlineId(onlineId);
 }
 
+IdentifierHash
+SCT_CablingTool::getHashFromOnlineId(const SCT_OnlineId& onlineId, const bool withWarnings) const {
+  const EventContext& ctx{Gaudi::Hive::currentContext()};
+  return getHashFromOnlineId(onlineId, ctx, withWarnings);
+}
+
 //
 SCT_OnlineId 
-SCT_CablingTool::getOnlineIdFromHash(const IdentifierHash& hash) const {
-  const SCT_CablingData* data{getData()};
+SCT_CablingTool::getOnlineIdFromHash(const IdentifierHash& hash, const EventContext& ctx) const {
+  const SCT_CablingData* data{getData(ctx)};
   if (data==nullptr) {
     ATH_MSG_FATAL("Filling the cabling FAILED");
     return invalidId;
@@ -123,20 +141,56 @@ SCT_CablingTool::getOnlineIdFromHash(const IdentifierHash& hash) const {
   return data->getOnlineIdFromHash(hash);
 }
 
+SCT_OnlineId
+SCT_CablingTool::getOnlineIdFromHash(const IdentifierHash& hash) const {
+  const EventContext& ctx{Gaudi::Hive::currentContext()};
+  return getOnlineIdFromHash(hash, ctx);
+}
+
 //
 SCT_OnlineId
-SCT_CablingTool::getOnlineIdFromOfflineId(const Identifier& offlineId) const {
+SCT_CablingTool::getOnlineIdFromOfflineId(const Identifier& offlineId, const EventContext& ctx) const {
   if (not offlineId.is_valid()) return invalidId;
   IdentifierHash hash(m_idHelper->wafer_hash(offlineId));
-  return getOnlineIdFromHash(hash);
+  return getOnlineIdFromHash(hash, ctx);
+}
+
+SCT_OnlineId
+SCT_CablingTool::getOnlineIdFromOfflineId(const Identifier& offlineId) const {
+  const EventContext& ctx{Gaudi::Hive::currentContext()};
+  return getOnlineIdFromOfflineId(offlineId, ctx);
+}
+
+//
+std::uint32_t
+SCT_CablingTool::getRobIdFromHash(const IdentifierHash& hash, const EventContext& ctx) const {
+  return getOnlineIdFromHash(hash, ctx).rod();
+}
+
+std::uint32_t
+SCT_CablingTool::getRobIdFromHash(const IdentifierHash& hash) const {
+  const EventContext& ctx{Gaudi::Hive::currentContext()};
+  return getRobIdFromHash(hash, ctx);
+}
+
+//
+std::uint32_t
+SCT_CablingTool::getRobIdFromOfflineId(const Identifier& offlineId, const EventContext& ctx) const {
+  return getOnlineIdFromOfflineId(offlineId, ctx).rod();
+}
+
+std::uint32_t
+SCT_CablingTool::getRobIdFromOfflineId(const Identifier& offlineId) const {
+  const EventContext& ctx{Gaudi::Hive::currentContext()};
+  return getRobIdFromOfflineId(offlineId, ctx);
 }
 
 //
 IdentifierHash
-SCT_CablingTool::getHashFromSerialNumber(const SCT_SerialNumber& sn) const {
+SCT_CablingTool::getHashFromSerialNumber(const SCT_SerialNumber& sn, const EventContext& ctx) const {
   if (not sn.isWellFormed()) return invalidHash;
 
-  const SCT_CablingData* data{getData()};
+  const SCT_CablingData* data{getData(ctx)};
   if (data==nullptr) {
     ATH_MSG_FATAL("Filling the cabling FAILED");
     return invalidHash;
@@ -145,13 +199,19 @@ SCT_CablingTool::getHashFromSerialNumber(const SCT_SerialNumber& sn) const {
   return data->getHashFromSerialNumber(sn);
 }
 
+IdentifierHash
+SCT_CablingTool::getHashFromSerialNumber(const SCT_SerialNumber& sn) const {
+  const EventContext& ctx{Gaudi::Hive::currentContext()};
+  return getHashFromSerialNumber(sn, ctx);
+}
+
 SCT_SerialNumber
-SCT_CablingTool::getSerialNumberFromHash(const IdentifierHash& hash) const {
+SCT_CablingTool::getSerialNumberFromHash(const IdentifierHash& hash, const EventContext& ctx) const {
   if (not hash.is_valid()) return invalidSn;
   //hash must be even
   IdentifierHash evenHash{even(hash)};
   
-  const SCT_CablingData* data{getData()};
+  const SCT_CablingData* data{getData(ctx)};
   if (data==nullptr) {
     ATH_MSG_FATAL("Filling the cabling FAILED");
     return invalidSn;
@@ -160,9 +220,15 @@ SCT_CablingTool::getSerialNumberFromHash(const IdentifierHash& hash) const {
   return data->getSerialNumberFromHash(evenHash);
 }
 
+SCT_SerialNumber
+SCT_CablingTool::getSerialNumberFromHash(const IdentifierHash& hash) const {
+  const EventContext& ctx{Gaudi::Hive::currentContext()};
+  return getSerialNumberFromHash(hash, ctx);
+}
+
 void
-SCT_CablingTool::getAllRods(std::vector<std::uint32_t>& usersVector) const {
-  const SCT_CablingData* data{getData()};
+SCT_CablingTool::getAllRods(std::vector<std::uint32_t>& usersVector, const EventContext& ctx) const {
+  const SCT_CablingData* data{getData(ctx)};
   if (data==nullptr) {
     ATH_MSG_FATAL("Filling the cabling FAILED");
     return;
@@ -172,21 +238,32 @@ SCT_CablingTool::getAllRods(std::vector<std::uint32_t>& usersVector) const {
 }
 
 void
-SCT_CablingTool::getHashesForRod(std::vector<IdentifierHash>& usersVector, const std::uint32_t rodId) const {
-  SCT_OnlineId firstPossibleId(rodId,SCT_OnlineId::FIRST_FIBRE);
-  const bool withWarnings(false);
-  for (SCT_OnlineId i(firstPossibleId);i!=SCT_OnlineId::INVALID_ONLINE_ID;++i) {
-    IdentifierHash thisHash(getHashFromOnlineId(i, withWarnings));
+SCT_CablingTool::getAllRods(std::vector<std::uint32_t>& usersVector) const {
+  const EventContext& ctx{Gaudi::Hive::currentContext()};
+  getAllRods(usersVector, ctx);
+}
+
+void
+SCT_CablingTool::getHashesForRod(std::vector<IdentifierHash>& usersVector, const std::uint32_t rodId, const EventContext& ctx) const {
+  SCT_OnlineId firstPossibleId{rodId, SCT_OnlineId::FIRST_FIBRE};
+  const bool withWarnings{false};
+  for (SCT_OnlineId i{firstPossibleId}; i!=SCT_OnlineId::INVALID_ONLINE_ID; ++i) {
+    IdentifierHash thisHash(getHashFromOnlineId(i, ctx, withWarnings));
     if (thisHash != invalidHash) {
       usersVector.push_back(thisHash);
     }
   }
 }
 
+void
+SCT_CablingTool::getHashesForRod(std::vector<IdentifierHash>& usersVector, const std::uint32_t rodId) const {
+  const EventContext& ctx{Gaudi::Hive::currentContext()};
+  getHashesForRod(usersVector, rodId, ctx);
+}
+
 const SCT_CablingData*
-SCT_CablingTool::getData() const {
+SCT_CablingTool::getData(const EventContext& ctx) const {
   static const EventContext::ContextEvt_t invalidValue{EventContext::INVALID_CONTEXT_EVT};
-  const EventContext& ctx{Gaudi::Hive::currentContext()};
   const EventContext::ContextID_t slot{ctx.slot()};
   const EventContext::ContextEvt_t evt{ctx.evt()};
   if (slot>=m_cache.size()) {
diff --git a/InnerDetector/InDetDetDescr/SCT_Cabling/src/SCT_CablingTool.h b/InnerDetector/InDetDetDescr/SCT_Cabling/src/SCT_CablingTool.h
index 0cd29cac31cc6a800dda5f38455c9b20f5e6f995..e6cdf40689268152704f8e4ddccdef75afa530e1 100644
--- a/InnerDetector/InDetDetDescr/SCT_Cabling/src/SCT_CablingTool.h
+++ b/InnerDetector/InDetDetDescr/SCT_Cabling/src/SCT_CablingTool.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef SCT_CablingTool_h
@@ -49,41 +49,48 @@ class SCT_CablingTool: public extends<AthAlgTool, ISCT_CablingTool> {
   
   //@name ISCT_CablingTool methods implemented, these are visible to clients
   //@{
+  /// size of the data structure (for the SCT should be 8176, one for each module side)
+  virtual unsigned int size(const EventContext& ctx) const override;
+  virtual unsigned int size() const override;
+    
+  /// is the data structure empty?
+  virtual bool empty(const EventContext& ctx) const override;
+  virtual bool empty() const override;
+    
   /// return offline hash, given the online Id (used by decoders)
+  virtual IdentifierHash getHashFromOnlineId(const SCT_OnlineId& onlineId, const EventContext& ctx, const bool withWarnings=true) const override;
   virtual IdentifierHash getHashFromOnlineId(const SCT_OnlineId& onlineId, const bool withWarnings=true) const override;
    
   /// return the online Id, given a hash (used by simulation encoders)
+  virtual SCT_OnlineId getOnlineIdFromHash(const IdentifierHash& hash, const EventContext& ctx) const override;
   virtual SCT_OnlineId getOnlineIdFromHash(const IdentifierHash& hash) const override;
   
   /// return the online Id, given an offlineId
+  virtual SCT_OnlineId getOnlineIdFromOfflineId(const Identifier& offlineId, const EventContext& ctx) const override;
   virtual SCT_OnlineId getOnlineIdFromOfflineId(const Identifier& offlineId) const override;
   
   /// return the rob/rod Id, given a hash (used by simulation encoders)
-  virtual std::uint32_t getRobIdFromHash(const IdentifierHash& hash) const override {
-    return getOnlineIdFromHash(hash).rod();
-  }
+  virtual std::uint32_t getRobIdFromHash(const IdentifierHash& hash, const EventContext& ctx) const override;
+  virtual std::uint32_t getRobIdFromHash(const IdentifierHash& hash) const override;
     
   /// return the rob/rod Id, given an offlineId (used by simulation encoders)
-  virtual std::uint32_t getRobIdFromOfflineId(const Identifier& offlineId) const override {
-    return getOnlineIdFromOfflineId(offlineId).rod();
-  }
+  virtual std::uint32_t getRobIdFromOfflineId(const Identifier& offlineId, const EventContext& ctx) const override;
+  virtual std::uint32_t getRobIdFromOfflineId(const Identifier& offlineId) const override;
 
-  /// size of the data structure (for the SCT should be 8176, one for each module side)
-  virtual unsigned int size() const override;
-    
-  /// is the data structure empty?
-  virtual bool empty() const override;
-    
   /// get hash from a module serial number, needed in the conditions service because configurations are stored by module s/n
+  virtual IdentifierHash getHashFromSerialNumber(const SCT_SerialNumber& sn, const EventContext& ctx) const override;
   virtual IdentifierHash getHashFromSerialNumber(const SCT_SerialNumber& sn) const override;
 
   /// get module serial number from hash, needed during filling of data structure
+  virtual SCT_SerialNumber getSerialNumberFromHash(const IdentifierHash& hash, const EventContext& ctx) const override;
   virtual SCT_SerialNumber getSerialNumberFromHash(const IdentifierHash& hash) const override;
 
   /// fill a users vector with all the RodIds
+  virtual void getAllRods(std::vector<std::uint32_t>& usersVector, const EventContext& ctx) const override;
   virtual void getAllRods(std::vector<std::uint32_t>& usersVector) const override;
 
   /// fill a user's vector with all the hash ids which belong to a given rod
+  virtual void getHashesForRod(std::vector<IdentifierHash>& usersVector, const std::uint32_t rodId, const EventContext& ctx) const override;
   virtual void getHashesForRod(std::vector<IdentifierHash>& usersVector, const std::uint32_t rodId) const override;
   //@}
 
@@ -100,7 +107,7 @@ class SCT_CablingTool: public extends<AthAlgTool, ISCT_CablingTool> {
   // Pointer of SCT_CablingData
   mutable Gaudi::Hive::ContextSpecificPtr<const SCT_CablingData> m_condData;
 
-  const SCT_CablingData* getData() const;
+  const SCT_CablingData* getData(const EventContext& ctx) const;
 };
 
 #endif // SCT_CablingTool_h
diff --git a/InnerDetector/InDetDetDescr/SCT_Cabling/src/SCT_CablingToolCB.cxx b/InnerDetector/InDetDetDescr/SCT_Cabling/src/SCT_CablingToolCB.cxx
index f9a11d8143e0ced2ecbbece71ba52d2edecbf393..c99cb35312fde597a15e3a2f93769a0776277827 100644
--- a/InnerDetector/InDetDetDescr/SCT_Cabling/src/SCT_CablingToolCB.cxx
+++ b/InnerDetector/InDetDetDescr/SCT_Cabling/src/SCT_CablingToolCB.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 /**
@@ -21,7 +21,6 @@
 //Gaudi includes
 #include "GaudiKernel/StatusCode.h"
 #include "GaudiKernel/IIncidentSvc.h"
-#include "EventInfo/EventIncident.h"
 
 //constants in file scope
 static const std::string coracool("CORACOOL");
@@ -119,12 +118,22 @@ SCT_CablingToolCB::size() const {
   return m_data.getHashEntries();
 }
 
+unsigned int
+SCT_CablingToolCB::size(const EventContext& /*ctx*/) const {
+  return size();
+}
+
 //
 bool
 SCT_CablingToolCB::empty() const {
   return (size()==0);
 }
 
+bool
+SCT_CablingToolCB::empty(const EventContext& /*ctx*/) const {
+  return empty();
+}
+
 //
 IdentifierHash 
 SCT_CablingToolCB::getHashFromOnlineId(const SCT_OnlineId& onlineId, const bool withWarnings) const {
@@ -143,12 +152,22 @@ SCT_CablingToolCB::getHashFromOnlineId(const SCT_OnlineId& onlineId, const bool
   return m_data.getHashFromOnlineId(onlineId);
 }
 
+IdentifierHash 
+SCT_CablingToolCB::getHashFromOnlineId(const SCT_OnlineId& onlineId, const EventContext& /*ctx*/, const bool withWarnings) const {
+  return getHashFromOnlineId(onlineId, withWarnings);
+}
+
 //
 SCT_OnlineId 
 SCT_CablingToolCB::getOnlineIdFromHash(const IdentifierHash& hash) const {
   return m_data.getOnlineIdFromHash(hash);
 }
 
+SCT_OnlineId 
+SCT_CablingToolCB::getOnlineIdFromHash(const IdentifierHash& hash, const EventContext& /*ctx*/) const {
+  return getOnlineIdFromHash(hash);
+}
+
 //
 SCT_OnlineId
 SCT_CablingToolCB::getOnlineIdFromOfflineId(const Identifier& offlineId) const {
@@ -157,6 +176,33 @@ SCT_CablingToolCB::getOnlineIdFromOfflineId(const Identifier& offlineId) const {
   return getOnlineIdFromHash(hash);
 }
 
+SCT_OnlineId
+SCT_CablingToolCB::getOnlineIdFromOfflineId(const Identifier& offlineId, const EventContext& /*ctx*/) const {
+  return getOnlineIdFromOfflineId(offlineId);
+}
+
+//
+std::uint32_t
+SCT_CablingToolCB::getRobIdFromHash(const IdentifierHash& hash) const {
+  return getOnlineIdFromHash(hash).rod();
+}
+
+std::uint32_t
+SCT_CablingToolCB::getRobIdFromHash(const IdentifierHash& hash, const EventContext& /*ctx*/) const {
+  return getRobIdFromHash(hash);
+}
+
+//
+std::uint32_t
+SCT_CablingToolCB::getRobIdFromOfflineId(const Identifier& offlineId) const {
+  return getOnlineIdFromOfflineId(offlineId).rod();
+}
+
+std::uint32_t
+SCT_CablingToolCB::getRobIdFromOfflineId(const Identifier& offlineId, const EventContext& /*ctx*/) const {
+  return getRobIdFromOfflineId(offlineId);
+}
+
 //
 IdentifierHash
 SCT_CablingToolCB::getHashFromSerialNumber(const SCT_SerialNumber& sn) const {
@@ -164,6 +210,11 @@ SCT_CablingToolCB::getHashFromSerialNumber(const SCT_SerialNumber& sn) const {
   return m_data.getHashFromSerialNumber(sn);
 }
 
+IdentifierHash
+SCT_CablingToolCB::getHashFromSerialNumber(const SCT_SerialNumber& sn, const EventContext& /*ctx*/) const {
+  return getHashFromSerialNumber(sn);
+}
+
 SCT_SerialNumber
 SCT_CablingToolCB::getSerialNumberFromHash(const IdentifierHash& hash) const {
   if (not hash.is_valid()) return invalidSn;
@@ -172,6 +223,21 @@ SCT_CablingToolCB::getSerialNumberFromHash(const IdentifierHash& hash) const {
   return m_data.getSerialNumberFromHash(evenHash);
 }
 
+SCT_SerialNumber
+SCT_CablingToolCB::getSerialNumberFromHash(const IdentifierHash& hash, const EventContext& /*ctx*/) const {
+  return getSerialNumberFromHash(hash);
+}
+
+void
+SCT_CablingToolCB::getAllRods(std::vector<std::uint32_t>& usersVector) const {
+  m_data.getRods(usersVector);
+}
+
+void
+SCT_CablingToolCB::getAllRods(std::vector<std::uint32_t>& usersVector, const EventContext& /*ctx*/) const {
+  getAllRods(usersVector);
+}
+
 void
 SCT_CablingToolCB::getHashesForRod(std::vector<IdentifierHash>& usersVector, const std::uint32_t rodId) const {
   SCT_OnlineId firstPossibleId(rodId,SCT_OnlineId::FIRST_FIBRE);
@@ -183,3 +249,8 @@ SCT_CablingToolCB::getHashesForRod(std::vector<IdentifierHash>& usersVector, con
     }
   }
 }
+
+void
+SCT_CablingToolCB::getHashesForRod(std::vector<IdentifierHash>& usersVector, const std::uint32_t rodId, const EventContext& /*ctx*/) const {
+  getHashesForRod(usersVector, rodId);
+}
diff --git a/InnerDetector/InDetDetDescr/SCT_Cabling/src/SCT_CablingToolCB.h b/InnerDetector/InDetDetDescr/SCT_Cabling/src/SCT_CablingToolCB.h
index 0987e56b41227db95753d74337f1abf390d72b65..73cf362bbc56eabcd8ba7038f15e6069215ace76 100644
--- a/InnerDetector/InDetDetDescr/SCT_Cabling/src/SCT_CablingToolCB.h
+++ b/InnerDetector/InDetDetDescr/SCT_Cabling/src/SCT_CablingToolCB.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef SCT_CablingToolCB_h
@@ -53,41 +53,48 @@ class SCT_CablingToolCB: public extends<AthAlgTool, ISCT_CablingTool, IIncidentL
   
   //@name ISCT_CablingToolCB methods implemented, these are visible to clients
   //@{
+  /// size of the data structure (for the SCT should be 8176, one for each module side)
+  virtual unsigned int size(const EventContext& ctx) const override;
+  virtual unsigned int size() const override;
+    
+  /// is the data structure empty?
+  virtual bool empty(const EventContext& ctx) const override;
+  virtual bool empty() const override;
+    
   /// return offline hash, given the online Id (used by decoders)
+  virtual IdentifierHash getHashFromOnlineId(const SCT_OnlineId& onlineId, const EventContext& ctx, const bool withWarnings=true) const override;
   virtual IdentifierHash getHashFromOnlineId(const SCT_OnlineId& onlineId, const bool withWarnings=true) const override;
    
   /// return the online Id, given a hash (used by simulation encoders)
+  virtual SCT_OnlineId getOnlineIdFromHash(const IdentifierHash& hash, const EventContext& ctx) const override;
   virtual SCT_OnlineId getOnlineIdFromHash(const IdentifierHash& hash) const override;
   
   /// return the online Id, given an offlineId
+  virtual SCT_OnlineId getOnlineIdFromOfflineId(const Identifier& offlineId, const EventContext& ctx) const override;
   virtual SCT_OnlineId getOnlineIdFromOfflineId(const Identifier& offlineId) const override;
   
   /// return the rob/rod Id, given a hash (used by simulation encoders)
-  virtual std::uint32_t getRobIdFromHash(const IdentifierHash& hash) const override {
-    return getOnlineIdFromHash(hash).rod();
-  }
+  virtual std::uint32_t getRobIdFromHash(const IdentifierHash& hash, const EventContext& ctx) const override;
+  virtual std::uint32_t getRobIdFromHash(const IdentifierHash& hash) const override;
     
   /// return the rob/rod Id, given an offlineId (used by simulation encoders)
-  virtual std::uint32_t getRobIdFromOfflineId(const Identifier& offlineId) const override {
-    return getOnlineIdFromOfflineId(offlineId).rod();
-  }
+  virtual std::uint32_t getRobIdFromOfflineId(const Identifier& offlineId, const EventContext& ctx) const override;
+  virtual std::uint32_t getRobIdFromOfflineId(const Identifier& offlineId) const override;
 
-  /// size of the data structure (for the SCT should be 8176, one for each module side)
-  virtual unsigned int size() const override;
-    
-  /// is the data structure empty?
-  virtual bool empty() const override;
-    
   /// get hash from a module serial number, needed in the conditions service because configurations are stored by module s/n
+  virtual IdentifierHash getHashFromSerialNumber(const SCT_SerialNumber& sn, const EventContext& ctx) const override;
   virtual IdentifierHash getHashFromSerialNumber(const SCT_SerialNumber& sn) const override;
 
   /// get module serial number from hash, needed during filling of data structure
+  virtual SCT_SerialNumber getSerialNumberFromHash(const IdentifierHash& hash, const EventContext& ctx) const override;
   virtual SCT_SerialNumber getSerialNumberFromHash(const IdentifierHash& hash) const override;
 
   /// fill a users vector with all the RodIds
-  virtual void getAllRods(std::vector<std::uint32_t>& usersVector) const override { m_data.getRods(usersVector); }
+  virtual void getAllRods(std::vector<std::uint32_t>& usersVector, const EventContext& ctx) const override;
+  virtual void getAllRods(std::vector<std::uint32_t>& usersVector) const override;
     
   /// fill a user's vector with all the hash ids which belong to a given rod
+  virtual void getHashesForRod(std::vector<IdentifierHash>& usersVector, const std::uint32_t rodId, const EventContext& ctx) const override;
   virtual void getHashesForRod(std::vector<IdentifierHash>& usersVector, const std::uint32_t rodId) const override;
   //@}
 
diff --git a/InnerDetector/InDetDetDescr/SCT_Cabling/src/SCT_TestCablingAlg.cxx b/InnerDetector/InDetDetDescr/SCT_Cabling/src/SCT_TestCablingAlg.cxx
index c5e8dc4f814b8d0feb6deef738794a055d5338b5..a879af5acf09ca96408d796f8951d38918dfe755 100644
--- a/InnerDetector/InDetDetDescr/SCT_Cabling/src/SCT_TestCablingAlg.cxx
+++ b/InnerDetector/InDetDetDescr/SCT_Cabling/src/SCT_TestCablingAlg.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 /**
@@ -37,7 +37,7 @@ using namespace std;
 using namespace SCT_Cabling;
  
 SCT_TestCablingAlg::SCT_TestCablingAlg(const std::string& name, ISvcLocator* pSvcLocator):
-  AthAlgorithm(name, pSvcLocator),
+  AthReentrantAlgorithm(name, pSvcLocator),
   m_idHelper{nullptr} {
   //nop
 }
@@ -51,7 +51,7 @@ SCT_TestCablingAlg::initialize() {
 }
 
 std::string
-SCT_TestCablingAlg::coordString(const Identifier& offlineId) {
+SCT_TestCablingAlg::coordString(const Identifier& offlineId) const {
   using std::to_string;
   const std::string sep{", "};
   std::string result{std::string("[") + to_string(m_idHelper->barrel_ec(offlineId)) + sep};
@@ -63,43 +63,43 @@ SCT_TestCablingAlg::coordString(const Identifier& offlineId) {
 }
 
 StatusCode
-SCT_TestCablingAlg::execute() {
+SCT_TestCablingAlg::execute(const EventContext& ctx) const {
   const string testAreaPath{CoveritySafe::getenv("TestArea")};
   string filename{testAreaPath+"/cabling.txt"};
   ATH_MSG_INFO("Filename: " << filename << " will be written to your $TestArea.");
   ofstream opFile1{filename.c_str(), ios::out};
   ATH_MSG_INFO("Executing...");
   ATH_MSG_INFO("hash, offline Id, online Id(hex), serial number");
-  const unsigned int nHashesInCabling{2*m_cablingTool->size()};
+  const unsigned int nHashesInCabling{2*m_cablingTool->size(ctx)};
   for (unsigned int i{0}; i!=nHashesInCabling; ++i) {
     IdentifierHash hash{i};
     Identifier offlineId{m_idHelper->wafer_id(hash)};
-    SCT_OnlineId onlineId{m_cablingTool->getOnlineIdFromHash(hash)};
-    SCT_SerialNumber sn{m_cablingTool->getSerialNumberFromHash(hash)};
+    SCT_OnlineId onlineId{m_cablingTool->getOnlineIdFromHash(hash, ctx)};
+    SCT_SerialNumber sn{m_cablingTool->getSerialNumberFromHash(hash, ctx)};
     ATH_MSG_INFO(i << " " << offlineId << " " << hex << onlineId << dec << " " << sn << " " << coordString(offlineId));
     opFile1 << i << " " << offlineId << " " << hex << onlineId << dec << " " << sn << " " << coordString(offlineId) << std::endl;
-    if (m_cablingTool->getHashFromOnlineId(onlineId) != hash){
-      ATH_MSG_ERROR("?? " << m_cablingTool->getHashFromOnlineId(onlineId));
+    if (m_cablingTool->getHashFromOnlineId(onlineId, ctx) != hash){
+      ATH_MSG_ERROR("?? " << m_cablingTool->getHashFromOnlineId(onlineId, ctx));
     }
   }
   opFile1.close();
-  ATH_MSG_INFO("Size: " << m_cablingTool->size());
+  ATH_MSG_INFO("Size: " << m_cablingTool->size(ctx));
   std::vector<unsigned int> rods;
-  m_cablingTool->getAllRods(rods);
+  m_cablingTool->getAllRods(rods, ctx);
   ATH_MSG_INFO("Num. of rods= " << rods.size());
   ATH_MSG_INFO("First rod id " << std::hex << rods[0] << std::dec);
   string sn{"20220130000299"};
-  ATH_MSG_INFO("Hash from serial number " << m_cablingTool->getHashFromSerialNumber(sn));
+  ATH_MSG_INFO("Hash from serial number " << m_cablingTool->getHashFromSerialNumber(sn, ctx));
   int tsn{130000299};
-  ATH_MSG_INFO("Hash from truncated serial number " << m_cablingTool->getHashFromSerialNumber(tsn));
+  ATH_MSG_INFO("Hash from truncated serial number " << m_cablingTool->getHashFromSerialNumber(tsn, ctx));
   unsigned long long snll{20220130000299LL};
-  ATH_MSG_INFO("Hash from truncated serial number " << m_cablingTool->getHashFromSerialNumber(snll));
-  ATH_MSG_INFO("Hash from onlineid " << m_cablingTool->getHashFromOnlineId(0x3d230006));
-  ATH_MSG_INFO("Hash from invalid onlineid " << m_cablingTool->getHashFromOnlineId(0x3d250006));
-  ATH_MSG_INFO("Hash from textfile onlineid " << m_cablingTool->getHashFromOnlineId(0x3d220010));
-  ATH_MSG_INFO("Hash from db onlineid " << m_cablingTool->getHashFromOnlineId(0x3d220105));
+  ATH_MSG_INFO("Hash from truncated serial number " << m_cablingTool->getHashFromSerialNumber(snll, ctx));
+  ATH_MSG_INFO("Hash from onlineid " << m_cablingTool->getHashFromOnlineId(0x3d230006, ctx));
+  ATH_MSG_INFO("Hash from invalid onlineid " << m_cablingTool->getHashFromOnlineId(0x3d250006, ctx));
+  ATH_MSG_INFO("Hash from textfile onlineid " << m_cablingTool->getHashFromOnlineId(0x3d220010, ctx));
+  ATH_MSG_INFO("Hash from db onlineid " << m_cablingTool->getHashFromOnlineId(0x3d220105, ctx));
   std::vector<IdentifierHash> hashVec;
-  m_cablingTool->getHashesForRod(hashVec, 0x220005);
+  m_cablingTool->getHashesForRod(hashVec, 0x220005, ctx);
   ATH_MSG_INFO("number of hashes for rod 0x220005: " << hashVec.size());
   //new section December 2014
   
@@ -124,8 +124,8 @@ SCT_TestCablingAlg::execute() {
   for (unsigned int i{0}; i!=nHashesInCabling; ++i) {
     IdentifierHash hash{i};
     Identifier offlineId{m_idHelper->wafer_id(hash)};
-    SCT_OnlineId onlineId{m_cablingTool->getOnlineIdFromHash(hash)};
-    SCT_SerialNumber sn{m_cablingTool->getSerialNumberFromHash(hash)};
+    SCT_OnlineId onlineId{m_cablingTool->getOnlineIdFromHash(hash, ctx)};
+    SCT_SerialNumber sn{m_cablingTool->getSerialNumberFromHash(hash, ctx)};
     //rod, fibre, bec, layerDisk, eta,  phi, side,  robId, sn
     const int bec{m_idHelper->barrel_ec(offlineId)};
     const int layer{m_idHelper->layer_disk(offlineId)};
diff --git a/InnerDetector/InDetDetDescr/SCT_Cabling/src/SCT_TestCablingAlg.h b/InnerDetector/InDetDetDescr/SCT_Cabling/src/SCT_TestCablingAlg.h
index 79347ef144f6ba476a218ba2b4d5133b3f06888d..ee07cfe6130a623b4585811a7bc31f33f4c48904 100644
--- a/InnerDetector/InDetDetDescr/SCT_Cabling/src/SCT_TestCablingAlg.h
+++ b/InnerDetector/InDetDetDescr/SCT_Cabling/src/SCT_TestCablingAlg.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef SCT_TestCablingAlg_h
@@ -11,7 +11,7 @@
  * @date 20 October, 2008
  **/
 
-#include "AthenaBaseComps/AthAlgorithm.h"
+#include "AthenaBaseComps/AthReentrantAlgorithm.h"
 
 //package includes
 #include "SCT_Cabling/ISCT_CablingTool.h"
@@ -29,19 +29,19 @@ class SCT_ID;
 /**
  * SCT_TestCablingAlg exercises the routines of the SCT cabling service
  **/
-class SCT_TestCablingAlg:public AthAlgorithm {
+class SCT_TestCablingAlg:public AthReentrantAlgorithm {
  public:
   SCT_TestCablingAlg(const std::string& name, ISvcLocator* pSvcLocator);
   ~SCT_TestCablingAlg() = default;
   // Standard Gaudi functions
   StatusCode initialize(); //!< Gaudi initialiser
-  StatusCode execute();    //!< Gaudi executer
-  StatusCode finalize();   //!< Gaudi finaliser
+  StatusCode execute(const EventContext& ctx) const; //!< Gaudi executer
+  StatusCode finalize(); //!< Gaudi finaliser
 
  private:
   ToolHandle<ISCT_CablingTool> m_cablingTool{this, "SCT_CablingTool", "SCT_CablingTool", "Tool to retrieve SCT Cabling"};
   const SCT_ID* m_idHelper; //!< helper for offlineId/hash conversions
-  std::string coordString(const Identifier& offlineId);
+  std::string coordString(const Identifier& offlineId) const;
 
 };
 #endif // SCT_TestCablingAlg_h
diff --git a/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_Barrel.cxx b/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_Barrel.cxx
index ce889524052db66238e836c5be1891775fd6147a..f9daf218931f6e89004d0f1c9493aa9de7161567 100755
--- a/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_Barrel.cxx
+++ b/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_Barrel.cxx
@@ -33,7 +33,7 @@
 #include "GeoModelKernel/GeoMaterial.h"
 #include "GeoModelKernel/GeoShape.h"
 #include "GeoModelKernel/GeoShapeShift.h"
-#include "GeoModelKernel/Units.h"
+#include "GaudiKernel/SystemOfUnits.h"
 
 #include <iostream>
 
@@ -59,7 +59,7 @@ SCT_Barrel::getParameters()
   m_thermalShieldEndWallThickness = parameters->thermalShieldEndCapThickness();
 
   // Clearannce in z between layer and interlink.
-  m_zClearance = 1*GeoModelKernelUnits::mm;
+  m_zClearance = 1*Gaudi::Units::mm;
 
   // Layer internal structure and services depend on geometry version
   m_isOldGeometry = parameters->isOldGeometry();
@@ -256,17 +256,14 @@ void SCT_Barrel::buildEMIShield(GeoFullPhysVol * parent) const
   const GeoShape * emiShieldShape  = 0;
   const GeoMaterial * material;
   const GeoTube * emiShieldTube  = new GeoTube(innerRadius, outerRadius,  0.5*length);
-  //  std::cout << "EMI tube volume = " << emiShieldTube->volume() << std::endl; 
   if (m_isOldGeometry) {
     emiShieldShape = emiShieldTube;
     material = materials.getMaterial(materialName);
   } else {
     const GeoTube* cutOut = new GeoTube(innerRadius, outerRadius, 0.5*pixelAttachmentLength);
-    //    std::cout << "Cut-out volume = " << cutOut->volume() << std::endl; 
     const GeoShape* emiTemp = (GeoShape*)&(emiShieldTube->subtract(*cutOut << GeoTrf::TranslateZ3D(pixelAttachmentZpos)));
     emiShieldShape = (GeoShape*)&emiTemp->subtract(*cutOut << GeoTrf::TranslateZ3D(-pixelAttachmentZpos));
     double emiVolume = emiShieldTube->volume() - 2. * cutOut->volume();
-    //    std::cout << "EMI final volume = " << emiVolume << std::endl; 
     material = materials.getMaterialForVolume(materialName, emiVolume);
   }
   const GeoLogVol  * emiShieldLog = new GeoLogVol("EMIShield", emiShieldShape, material);
@@ -277,21 +274,18 @@ void SCT_Barrel::buildEMIShield(GeoFullPhysVol * parent) const
   if (!m_isOldGeometry) {
     double dphi = jointRPhi / outerRadius;
     const GeoTubs* emiJointTubs = new GeoTubs(outerRadius, outerRadius+jointDeltaR, 0.5*length,
-                                              -0.5 * dphi * GeoModelKernelUnits::radian, dphi * GeoModelKernelUnits::radian);
-    //    std::cout << "EMIJoint tubs volume = " << emiJointTubs->volume() << std::endl; 
+                                              -0.5 * dphi * Gaudi::Units::radian, dphi * Gaudi::Units::radian);
     const GeoTubs* jointCutOut = new GeoTubs(outerRadius, outerRadius+jointDeltaR, 0.5*pixelAttachmentLength,
-                                             -0.5 * dphi * GeoModelKernelUnits::radian, dphi * GeoModelKernelUnits::radian);
-    //    std::cout << "Cut-out volume = " << jointCutOut->volume() << std::endl; 
+                                             -0.5 * dphi * Gaudi::Units::radian, dphi * Gaudi::Units::radian);
     const GeoShape* jointTemp = (GeoShape*)&(emiJointTubs->subtract(*jointCutOut << GeoTrf::TranslateZ3D(pixelAttachmentZpos)));
     const GeoShape* emiJointShape = (GeoShape*)&jointTemp->subtract(*jointCutOut << GeoTrf::TranslateZ3D(-pixelAttachmentZpos));
     double jointVolume = emiJointTubs->volume() - 2. * jointCutOut->volume();
-    //    std::cout << "EMIJoint final volume = " << jointVolume << std::endl; 
     const GeoMaterial * jointMaterial = materials.getMaterialForVolume(jointMaterialName, jointVolume);
     const GeoLogVol  * emiJointLog = new GeoLogVol("EMIShieldJoint", emiJointShape, jointMaterial);
     GeoPhysVol * emiJoint = new GeoPhysVol(emiJointLog);
     // Place 3 copies
     for (int i=0; i<3; i++) {
-      double angle = (90. + i * 120.) * GeoModelKernelUnits::degree;
+      double angle = (90. + i * 120.) * Gaudi::Units::degree;
       parent->add(new GeoTransform(GeoTrf::RotateZ3D(angle)));
       parent->add(emiJoint);
     }
diff --git a/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_BarrelModuleParameters.cxx b/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_BarrelModuleParameters.cxx
index 5e9b1e1dc34181b74d7d2c489666878de40ceff9..96f390bc501aa638c93237ebff242b3e30d606ba 100755
--- a/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_BarrelModuleParameters.cxx
+++ b/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_BarrelModuleParameters.cxx
@@ -9,31 +9,12 @@
 
 #include "RDBAccessSvc/IRDBRecord.h"
 
-#include "GeoModelKernel/Units.h"
+#include "GaudiKernel/SystemOfUnits.h"
 
 #include <cmath>
 
 using std::abs;
 
-//
-// A few hard wired numbers (some of which should go in NOVA)
-//
-/*
-const double SCT_MODULE_HYBRID_OFFSET = 5.0 * GeoModelKernelUnits::mm; // Planar distance from center of sensor to edge of hybrid.
-const int STEREO_UPPER_SIGN = -1; // Sign of stereo rotation of upper sensor with axis going
-                                  // from lower to upper  
-
-const double PITCH = 80 * micrometer;
-const double HALF_ACTIVE_STRIP_LENGTH = 31 * GeoModelKernelUnits::mm;
-const double NOMINAL_WAFER_LENGTH = 63.960 * GeoModelKernelUnits::mm;
-const double REF_DISTANCE_BETWEEN_FIDUCIALS = 2.19 * GeoModelKernelUnits::mm; 
-const double DISTANCE_CORNER_MARK_TO_CENTER = 31.750 * GeoModelKernelUnits::mm; 
-const double DISTANCE_CORNER_MARK_TO_FIDUCIAL = 0.8 * GeoModelKernelUnits::mm; 
-const double DISTANCE_CENTER_TO_CENTER = 2 * (DISTANCE_CORNER_MARK_TO_CENTER - 
-                                              DISTANCE_CORNER_MARK_TO_FIDUCIAL)
-                                         + REF_DISTANCE_BETWEEN_FIDUCIALS;
-*/
-
 SCT_BarrelModuleParameters::SCT_BarrelModuleParameters()
 {
   m_rdb = SCT_DataBase::instance();
@@ -45,19 +26,19 @@ SCT_BarrelModuleParameters::SCT_BarrelModuleParameters()
 double 
 SCT_BarrelModuleParameters::sensorThickness() const 
 {
-  return m_rdb->brlSensor()->getDouble("THICKNESS") * GeoModelKernelUnits::mm;
+  return m_rdb->brlSensor()->getDouble("THICKNESS") * Gaudi::Units::mm;
 }
 
 double 
 SCT_BarrelModuleParameters::sensorWidth() const 
 {
-  return m_rdb->brlSensor()->getDouble("WIDTH") * GeoModelKernelUnits::mm;
+  return m_rdb->brlSensor()->getDouble("WIDTH") * Gaudi::Units::mm;
 }
 
 double 
 SCT_BarrelModuleParameters::sensorLength() const 
 {
-  return m_rdb->brlSensor()->getDouble("WAFERLENGTH") * GeoModelKernelUnits::mm;
+  return m_rdb->brlSensor()->getDouble("WAFERLENGTH") * Gaudi::Units::mm;
 }
 
 int
@@ -75,20 +56,20 @@ SCT_BarrelModuleParameters::sensorMaterial() const
 double
 SCT_BarrelModuleParameters::sensorDistCenterToCenter() const 
 {
-  return 2 * m_rdb->brlSensor()->getDouble("CENTERTOFIDUCIAL") * GeoModelKernelUnits::mm 
-    + m_rdb->brlSensor()->getDouble("FIDUCIALSEP") * GeoModelKernelUnits::mm;
+  return 2 * m_rdb->brlSensor()->getDouble("CENTERTOFIDUCIAL") * Gaudi::Units::mm 
+    + m_rdb->brlSensor()->getDouble("FIDUCIALSEP") * Gaudi::Units::mm;
 }
 
 double
 SCT_BarrelModuleParameters::sensorStripLength() const
 {
-  return 2 * m_rdb->brlSensor()->getDouble("ACTIVEHALFLENGTH") * GeoModelKernelUnits::mm;
+  return 2 * m_rdb->brlSensor()->getDouble("ACTIVEHALFLENGTH") * Gaudi::Units::mm;
 }
 
 double
 SCT_BarrelModuleParameters::sensorStripPitch() const
 {
-  return m_rdb->brlSensor()->getDouble("STRIPPITCH") * GeoModelKernelUnits::mm;
+  return m_rdb->brlSensor()->getDouble("STRIPPITCH") * Gaudi::Units::mm;
 }
 
 int 
@@ -118,19 +99,19 @@ SCT_BarrelModuleParameters::sensorStripShift() const
 double 
 SCT_BarrelModuleParameters::baseBoardThickness() const 
 {
-  return m_rdb->brlModule()->getDouble("BASEBOARDTHICKNESS") * GeoModelKernelUnits::mm;
+  return m_rdb->brlModule()->getDouble("BASEBOARDTHICKNESS") * Gaudi::Units::mm;
 }
 
 double 
 SCT_BarrelModuleParameters::baseBoardWidth() const 
 {
-  return m_rdb->brlModule()->getDouble("BASEBOARDWIDTH") * GeoModelKernelUnits::mm;
+  return m_rdb->brlModule()->getDouble("BASEBOARDWIDTH") * Gaudi::Units::mm;
 }
 
 double 
 SCT_BarrelModuleParameters::baseBoardLength() const 
 {
-  return m_rdb->brlModule()->getDouble("BASEBOARDLENGTH") * GeoModelKernelUnits::mm;
+  return m_rdb->brlModule()->getDouble("BASEBOARDLENGTH") * Gaudi::Units::mm;
 }
 
 std::string
@@ -142,13 +123,13 @@ SCT_BarrelModuleParameters::baseBoardMaterial() const
 double 
 SCT_BarrelModuleParameters::baseBoardOffsetY() const 
 {
-  return m_rdb->brlModule()->getDouble("BASEBOARDOFFSETY") * GeoModelKernelUnits::mm;
+  return m_rdb->brlModule()->getDouble("BASEBOARDOFFSETY") * Gaudi::Units::mm;
 }
 
 double 
 SCT_BarrelModuleParameters::baseBoardOffsetZ() const 
 {
-  return m_rdb->brlModule()->getDouble("BASEBOARDOFFSETZ") * GeoModelKernelUnits::mm;
+  return m_rdb->brlModule()->getDouble("BASEBOARDOFFSETZ") * Gaudi::Units::mm;
 }
 
 //
@@ -157,19 +138,19 @@ SCT_BarrelModuleParameters::baseBoardOffsetZ() const
 double 
 SCT_BarrelModuleParameters::hybridThickness() const 
 {
-  return m_rdb->brlModule()->getDouble("HYBRIDTHICKNESS") * GeoModelKernelUnits::mm;
+  return m_rdb->brlModule()->getDouble("HYBRIDTHICKNESS") * Gaudi::Units::mm;
 }
 
 double 
 SCT_BarrelModuleParameters::hybridWidth() const 
 {
-  return m_rdb->brlModule()->getDouble("HYBRIDWIDTH") * GeoModelKernelUnits::mm;
+  return m_rdb->brlModule()->getDouble("HYBRIDWIDTH") * Gaudi::Units::mm;
 }
 
 double 
 SCT_BarrelModuleParameters::hybridLength() const 
 {
-  return m_rdb->brlModule()->getDouble("HYBRIDLENGTH") * GeoModelKernelUnits::mm;
+  return m_rdb->brlModule()->getDouble("HYBRIDLENGTH") * Gaudi::Units::mm;
 }
 
 std::string
@@ -181,13 +162,13 @@ SCT_BarrelModuleParameters::hybridMaterial() const
 double 
 SCT_BarrelModuleParameters::hybridOffsetX() const 
 {
-  return m_rdb->brlModule()->getDouble("HYBRIDOFFSETX") * GeoModelKernelUnits::mm;
+  return m_rdb->brlModule()->getDouble("HYBRIDOFFSETX") * Gaudi::Units::mm;
 }
 
 double 
 SCT_BarrelModuleParameters::hybridOffsetZ() const 
 {
-  return m_rdb->brlModule()->getDouble("HYBRIDOFFSETZ") * GeoModelKernelUnits::mm;
+  return m_rdb->brlModule()->getDouble("HYBRIDOFFSETZ") * Gaudi::Units::mm;
 }
 
 //
@@ -196,19 +177,19 @@ SCT_BarrelModuleParameters::hybridOffsetZ() const
 double 
 SCT_BarrelModuleParameters::pigtailThickness() const 
 {
-  return m_rdb->brlModule()->getDouble("PIGTAILTHICKNESS") * GeoModelKernelUnits::mm;
+  return m_rdb->brlModule()->getDouble("PIGTAILTHICKNESS") * Gaudi::Units::mm;
 }
 
 double 
 SCT_BarrelModuleParameters::pigtailWidth() const 
 {
-  return m_rdb->brlModule()->getDouble("PIGTAILWIDTH") * GeoModelKernelUnits::mm;
+  return m_rdb->brlModule()->getDouble("PIGTAILWIDTH") * Gaudi::Units::mm;
 }
 
 double 
 SCT_BarrelModuleParameters::pigtailLength() const 
 {
-  return m_rdb->brlModule()->getDouble("PIGTAILLENGTH") * GeoModelKernelUnits::mm;
+  return m_rdb->brlModule()->getDouble("PIGTAILLENGTH") * Gaudi::Units::mm;
 }
 
 std::string
@@ -242,14 +223,14 @@ SCT_BarrelModuleParameters::moduleUpperSideNumber() const
 double 
 SCT_BarrelModuleParameters::moduleStereoAngle() const
 {
-  return m_rdb->brlModule()->getDouble("STEREOANGLE") * GeoModelKernelUnits::milliradian;
+  return m_rdb->brlModule()->getDouble("STEREOANGLE") * Gaudi::Units::milliradian;
 }
 
 
 double 
 SCT_BarrelModuleParameters::moduleSensorToSensorGap() const
 {
-  return m_rdb->brlModule()->getDouble("SENSORTOSENSORGAP") * GeoModelKernelUnits::mm;
+  return m_rdb->brlModule()->getDouble("SENSORTOSENSORGAP") * Gaudi::Units::mm;
 }
 
 
diff --git a/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_BarrelParameters.cxx b/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_BarrelParameters.cxx
index ae69ebf0f092cf1424f73940fa36a9506880d487..c9cdeb4c5dd079b8382cca7bdd079d6710233967 100755
--- a/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_BarrelParameters.cxx
+++ b/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_BarrelParameters.cxx
@@ -8,10 +8,9 @@
 #include "SCT_GeoModel/SCT_DataBase.h"
 
 #include "RDBAccessSvc/IRDBRecord.h"
-#include "GeoModelKernel/Units.h"
+#include "GaudiKernel/SystemOfUnits.h"
 
 #include <cmath>
-#include <iostream>
 
 
 SCT_BarrelParameters::SCT_BarrelParameters()
@@ -32,7 +31,7 @@ SCT_BarrelParameters::skiFirstStagger() const
 double 
 SCT_BarrelParameters::skiRadialSep() const
 {
-  return m_rdb->brlSki()->getDouble("SKIRADIALSEP") * GeoModelKernelUnits::mm;
+  return m_rdb->brlSki()->getDouble("SKIRADIALSEP") * Gaudi::Units::mm;
 }
 
 int
@@ -44,7 +43,7 @@ SCT_BarrelParameters::modulesPerSki() const
 double 
 SCT_BarrelParameters::skiZPosition(int index) const
 {
-  return m_rdb->brlSkiZ(index)->getDouble("ZPOSITION") * GeoModelKernelUnits::mm;
+  return m_rdb->brlSkiZ(index)->getDouble("ZPOSITION") * Gaudi::Units::mm;
 }
 
 int 
@@ -59,7 +58,7 @@ SCT_BarrelParameters::skiModuleIdentifier(int index) const
 double 
 SCT_BarrelParameters::tilt(int iLayer) const
 {
-  return m_rdb->brlLayer(iLayer)->getDouble("TILT") * GeoModelKernelUnits::degree;
+  return m_rdb->brlLayer(iLayer)->getDouble("TILT") * Gaudi::Units::degree;
 }
 
 int 
@@ -72,7 +71,7 @@ SCT_BarrelParameters::layerStereoSign(int iLayer) const
 double 
 SCT_BarrelParameters::radius(int iLayer) const
 {
-  return m_rdb->brlLayer(iLayer)->getDouble("RADIUS") * GeoModelKernelUnits::mm;
+  return m_rdb->brlLayer(iLayer)->getDouble("RADIUS") * Gaudi::Units::mm;
 }
 
 int 
@@ -84,7 +83,7 @@ SCT_BarrelParameters::skisPerLayer(int iLayer) const
 double 
 SCT_BarrelParameters::layerBracketPhiOffset(int iLayer) const
 {
-  return m_rdb->brlLayer(iLayer)->getDouble("BRACKETPHIOFFSET") * GeoModelKernelUnits::deg;
+  return m_rdb->brlLayer(iLayer)->getDouble("BRACKETPHIOFFSET") * Gaudi::Units::deg;
 }
 
 double 
@@ -93,9 +92,9 @@ SCT_BarrelParameters::layerPhiOfRefModule(int iLayer) const
   // For backward compatibility, if field is null return (90 - tilt) 
   // as ref module is horizontal in old versions.
   if  (m_rdb->brlLayer(iLayer)->isFieldNull("PHIOFREFMODULE")) {
-    return 90*GeoModelKernelUnits::deg - tilt(iLayer);
+    return 90*Gaudi::Units::deg - tilt(iLayer);
   }
-  return m_rdb->brlLayer(iLayer)->getDouble("PHIOFREFMODULE") * GeoModelKernelUnits::deg;
+  return m_rdb->brlLayer(iLayer)->getDouble("PHIOFREFMODULE") * Gaudi::Units::deg;
 }
 
 
@@ -105,19 +104,19 @@ SCT_BarrelParameters::layerPhiOfRefModule(int iLayer) const
 double
 SCT_BarrelParameters::bracketThickness() const
 {
-  return m_rdb->brlSki()->getDouble("BRACKETTHICKNESS") * GeoModelKernelUnits::mm;
+  return m_rdb->brlSki()->getDouble("BRACKETTHICKNESS") * Gaudi::Units::mm;
 }
 
 double
 SCT_BarrelParameters::bracketWidth() const
 {
-  return m_rdb->brlSki()->getDouble("BRACKETWIDTH") * GeoModelKernelUnits::mm;
+  return m_rdb->brlSki()->getDouble("BRACKETWIDTH") * Gaudi::Units::mm;
 }
  
 double
 SCT_BarrelParameters::bracketLength() const
 {
-  return m_rdb->brlSki()->getDouble("BRACKETLENGTH") * GeoModelKernelUnits::mm;
+  return m_rdb->brlSki()->getDouble("BRACKETLENGTH") * Gaudi::Units::mm;
 }
 
 std::string
@@ -132,19 +131,19 @@ SCT_BarrelParameters::bracketMaterial() const
 double
 SCT_BarrelParameters::doglegThickness() const
 {
-  return m_rdb->brlSki()->getDouble("DOGLEGTHICKNESS") * GeoModelKernelUnits::mm;
+  return m_rdb->brlSki()->getDouble("DOGLEGTHICKNESS") * Gaudi::Units::mm;
 }
 
 double
 SCT_BarrelParameters::doglegWidth() const
 {
-  return m_rdb->brlSki()->getDouble("DOGLEGWIDTH") * GeoModelKernelUnits::mm;
+  return m_rdb->brlSki()->getDouble("DOGLEGWIDTH") * Gaudi::Units::mm;
 }
  
 double
 SCT_BarrelParameters::doglegLength() const
 {
-  return m_rdb->brlSki()->getDouble("DOGLEGLENGTH") * GeoModelKernelUnits::mm;
+  return m_rdb->brlSki()->getDouble("DOGLEGLENGTH") * Gaudi::Units::mm;
 }
 
 std::string
@@ -156,13 +155,13 @@ SCT_BarrelParameters::doglegMaterial() const
 double
 SCT_BarrelParameters::doglegOffsetX() const
 {
-  return m_rdb->brlSki()->getDouble("DOGLEGOFFSETX") * GeoModelKernelUnits::mm;
+  return m_rdb->brlSki()->getDouble("DOGLEGOFFSETX") * Gaudi::Units::mm;
 }
 
 double
 SCT_BarrelParameters::doglegOffsetY() const
 {
-  return m_rdb->brlSki()->getDouble("DOGLEGOFFSETY") * GeoModelKernelUnits::mm;
+  return m_rdb->brlSki()->getDouble("DOGLEGOFFSETY") * Gaudi::Units::mm;
 }
 
 //
@@ -171,19 +170,19 @@ SCT_BarrelParameters::doglegOffsetY() const
 double
 SCT_BarrelParameters::coolingBlockThickness() const
 {
-  return m_rdb->brlSki()->getDouble("COOLINGBLOCKTHICK") * GeoModelKernelUnits::mm;
+  return m_rdb->brlSki()->getDouble("COOLINGBLOCKTHICK") * Gaudi::Units::mm;
 }
 
 double
 SCT_BarrelParameters::coolingBlockWidth() const
 {
-  return m_rdb->brlSki()->getDouble("COOLINGBLOCKWIDTH") * GeoModelKernelUnits::mm;
+  return m_rdb->brlSki()->getDouble("COOLINGBLOCKWIDTH") * Gaudi::Units::mm;
 }
  
 double
 SCT_BarrelParameters::coolingBlockLength() const
 {
-  return m_rdb->brlSki()->getDouble("COOLINGBLOCKLENGTH") * GeoModelKernelUnits::mm;
+  return m_rdb->brlSki()->getDouble("COOLINGBLOCKLENGTH") * Gaudi::Units::mm;
 }
 
 std::string
@@ -195,19 +194,19 @@ SCT_BarrelParameters::coolingBlockMaterial() const
 double
 SCT_BarrelParameters::coolingBlockOffsetX() const
 {
-  return m_rdb->brlSki()->getDouble("COOLINGBLOCKOFFSETX") * GeoModelKernelUnits::mm;
+  return m_rdb->brlSki()->getDouble("COOLINGBLOCKOFFSETX") * Gaudi::Units::mm;
 }
 
 double
 SCT_BarrelParameters::coolingBlockOffsetY() const
 {
-  return m_rdb->brlSki()->getDouble("COOLINGBLOCKOFFSETY") * GeoModelKernelUnits::mm;
+  return m_rdb->brlSki()->getDouble("COOLINGBLOCKOFFSETY") * Gaudi::Units::mm;
 }
 
 double
 SCT_BarrelParameters::coolingBlockOffsetZ() const
 {
-  return m_rdb->brlSki()->getDouble("COOLINGBLOCKOFFSETZ") * GeoModelKernelUnits::mm;
+  return m_rdb->brlSki()->getDouble("COOLINGBLOCKOFFSETZ") * Gaudi::Units::mm;
 }
 
 //
@@ -216,7 +215,7 @@ SCT_BarrelParameters::coolingBlockOffsetZ() const
 double
 SCT_BarrelParameters::coolingPipeRadius() const
 {
-  return m_rdb->brlSki()->getDouble("COOLINGPIPERADIUS") * GeoModelKernelUnits::mm;
+  return m_rdb->brlSki()->getDouble("COOLINGPIPERADIUS") * Gaudi::Units::mm;
 }
 
 std::string
@@ -228,13 +227,13 @@ SCT_BarrelParameters::coolingPipeMaterial() const
 double
 SCT_BarrelParameters::coolingPipeOffsetX() const
 {
-  return m_rdb->brlSki()->getDouble("COOLINGPIPEOFFSETX") * GeoModelKernelUnits::mm;
+  return m_rdb->brlSki()->getDouble("COOLINGPIPEOFFSETX") * Gaudi::Units::mm;
 }
 
 double
 SCT_BarrelParameters::coolingPipeOffsetY() const
 {
-  return m_rdb->brlSki()->getDouble("COOLINGPIPEOFFSETY") * GeoModelKernelUnits::mm;
+  return m_rdb->brlSki()->getDouble("COOLINGPIPEOFFSETY") * Gaudi::Units::mm;
 }
 
 
@@ -244,13 +243,13 @@ SCT_BarrelParameters::coolingPipeOffsetY() const
 double
 SCT_BarrelParameters::powerTapeThickness() const
 {
-  return m_rdb->brlSki()->getDouble("POWERTAPETHICKNESS") * GeoModelKernelUnits::mm;
+  return m_rdb->brlSki()->getDouble("POWERTAPETHICKNESS") * Gaudi::Units::mm;
 }
 
 double
 SCT_BarrelParameters::powerTapeWidth() const
 {
-  return m_rdb->brlSki()->getDouble("POWERTAPEWIDTH") * GeoModelKernelUnits::mm;
+  return m_rdb->brlSki()->getDouble("POWERTAPEWIDTH") * Gaudi::Units::mm;
 }
 
 std::string
@@ -262,7 +261,7 @@ SCT_BarrelParameters::powerTapeMaterial() const
 double
 SCT_BarrelParameters::powerTapeStartPointOffset() const
 {
-  return m_rdb->brlSki()->getDouble("POWERTAPESTARTOFFSET") * GeoModelKernelUnits::mm;
+  return m_rdb->brlSki()->getDouble("POWERTAPESTARTOFFSET") * Gaudi::Units::mm;
 }
  
 //
@@ -271,13 +270,13 @@ SCT_BarrelParameters::powerTapeStartPointOffset() const
 double
 SCT_BarrelParameters::harnessThickness() const
 {
-  return m_rdb->brlSki()->getDouble("HARNESSTHICKNESS") * GeoModelKernelUnits::mm;
+  return m_rdb->brlSki()->getDouble("HARNESSTHICKNESS") * Gaudi::Units::mm;
 }
 
 double
 SCT_BarrelParameters::harnessWidth() const
 {
-  return m_rdb->brlSki()->getDouble("HARNESSWIDTH") * GeoModelKernelUnits::mm;
+  return m_rdb->brlSki()->getDouble("HARNESSWIDTH") * Gaudi::Units::mm;
 }
 
 std::string
@@ -292,7 +291,7 @@ SCT_BarrelParameters::harnessMaterial() const
 double 
 SCT_BarrelParameters::supportCylInnerRadius(int iLayer) const
 {
-  return m_rdb->brlServPerLayer(iLayer)->getDouble("SUPPORTCYLINNERRAD") * GeoModelKernelUnits::mm;
+  return m_rdb->brlServPerLayer(iLayer)->getDouble("SUPPORTCYLINNERRAD") * Gaudi::Units::mm;
 }
 
 double 
@@ -304,7 +303,7 @@ SCT_BarrelParameters::supportCylOuterRadius(int iLayer) const
 double 
 SCT_BarrelParameters::supportCylDeltaR(int iLayer) const
 {
-  return m_rdb->brlServPerLayer(iLayer)->getDouble("SUPPORTCYLDELTAR") * GeoModelKernelUnits::mm;
+  return m_rdb->brlServPerLayer(iLayer)->getDouble("SUPPORTCYLDELTAR") * Gaudi::Units::mm;
 }
 
 std::string 
@@ -320,13 +319,13 @@ SCT_BarrelParameters::supportCylMaterial(int iLayer) const
 double 
 SCT_BarrelParameters::flangeDeltaZ(int iLayer) const
 {
-  return m_rdb->brlServPerLayer(iLayer)->getDouble("FLANGEDELTAZ") * GeoModelKernelUnits::mm;
+  return m_rdb->brlServPerLayer(iLayer)->getDouble("FLANGEDELTAZ") * Gaudi::Units::mm;
 }
 
 double 
 SCT_BarrelParameters::flangeDeltaR(int iLayer) const
 {
-  return m_rdb->brlServPerLayer(iLayer)->getDouble("FLANGEDELTAR") * GeoModelKernelUnits::mm;
+  return m_rdb->brlServPerLayer(iLayer)->getDouble("FLANGEDELTAR") * Gaudi::Units::mm;
 }
 
 std::string 
@@ -341,13 +340,13 @@ SCT_BarrelParameters::flangeMaterial(int iLayer) const
 double 
 SCT_BarrelParameters::clampDeltaZ(int iLayer) const
 {
-  return m_rdb->brlServPerLayer(iLayer)->getDouble("CLAMPDELTAZ") * GeoModelKernelUnits::mm;
+  return m_rdb->brlServPerLayer(iLayer)->getDouble("CLAMPDELTAZ") * Gaudi::Units::mm;
 }
 
 double 
 SCT_BarrelParameters::clampDeltaR(int iLayer) const
 {
-  return m_rdb->brlServPerLayer(iLayer)->getDouble("CLAMPDELTAR") * GeoModelKernelUnits::mm;
+  return m_rdb->brlServPerLayer(iLayer)->getDouble("CLAMPDELTAR") * Gaudi::Units::mm;
 }
 
 std::string 
@@ -362,7 +361,7 @@ SCT_BarrelParameters::clampMaterial(int iLayer) const
 double 
 SCT_BarrelParameters::coolingEndDeltaR(int iLayer) const
 {
-  return m_rdb->brlServPerLayer(iLayer)->getDouble("COOLINGENDDELTAR") * GeoModelKernelUnits::mm;
+  return m_rdb->brlServPerLayer(iLayer)->getDouble("COOLINGENDDELTAR") * Gaudi::Units::mm;
 }
 
 std::string 
@@ -377,7 +376,7 @@ SCT_BarrelParameters::coolingEndMaterial(int iLayer) const
 double 
 SCT_BarrelParameters::closeOutDeltaZ(int iLayer) const
 {
-  return m_rdb->brlServPerLayer(iLayer)->getDouble("CLOSEOUTDELTAZ") * GeoModelKernelUnits::mm;
+  return m_rdb->brlServPerLayer(iLayer)->getDouble("CLOSEOUTDELTAZ") * Gaudi::Units::mm;
 }
 
 std::string 
@@ -392,19 +391,19 @@ SCT_BarrelParameters::closeOutMaterial(int iLayer) const
 double 
 SCT_BarrelParameters::interLinkDeltaZ() const
 {
-  return m_rdb->brlServices()->getDouble("INTERLINKDELTAZ") * GeoModelKernelUnits::mm; 
+  return m_rdb->brlServices()->getDouble("INTERLINKDELTAZ") * Gaudi::Units::mm; 
 }
 
 double 
 SCT_BarrelParameters::interLinkInnerRadius() const
 {
-  return m_rdb->brlServices()->getDouble("INTERLINKINNERRADIUS") * GeoModelKernelUnits::mm; 
+  return m_rdb->brlServices()->getDouble("INTERLINKINNERRADIUS") * Gaudi::Units::mm; 
 }
 
 double 
 SCT_BarrelParameters::interLinkOuterRadius() const
 {
-  return m_rdb->brlServices()->getDouble("INTERLINKOUTERRADIUS") * GeoModelKernelUnits::mm; 
+  return m_rdb->brlServices()->getDouble("INTERLINKOUTERRADIUS") * Gaudi::Units::mm; 
 }
 
 std::string 
@@ -417,9 +416,9 @@ double
 SCT_BarrelParameters::interLinkDeltaPhi() const
 {
   if  (m_rdb->brlServices()->isFieldNull("INTERLINKDPHI")) {
-    return 360.*GeoModelKernelUnits::deg;
+    return 360.*Gaudi::Units::deg;
   }
-  return m_rdb->brlServices()->getDouble("INTERLINKDPHI") * GeoModelKernelUnits::deg; 
+  return m_rdb->brlServices()->getDouble("INTERLINKDPHI") * Gaudi::Units::deg; 
 }
 
 double 
@@ -428,7 +427,7 @@ SCT_BarrelParameters::interLinkPhiPos() const
   if  (m_rdb->brlServices()->isFieldNull("INTERLINKPHIPOS")) {
     return 0.;
   }
-  return m_rdb->brlServices()->getDouble("INTERLINKPHIPOS") * GeoModelKernelUnits::deg;
+  return m_rdb->brlServices()->getDouble("INTERLINKPHIPOS") * Gaudi::Units::deg;
 }
 
 int
@@ -446,7 +445,7 @@ SCT_BarrelParameters::bearingDeltaPhi() const
   if  (m_rdb->brlServices()->isFieldNull("BEARINGDPHI")) {
     return 0.;
   }
-  return m_rdb->brlServices()->getDouble("BEARINGDPHI") * GeoModelKernelUnits::deg; 
+  return m_rdb->brlServices()->getDouble("BEARINGDPHI") * Gaudi::Units::deg; 
 }
 
 double 
@@ -455,7 +454,7 @@ SCT_BarrelParameters::bearingPhiPos() const
   if  (m_rdb->brlServices()->isFieldNull("BEARINGPHIPOS")) {
     return 0.;
   }
-  return m_rdb->brlServices()->getDouble("BEARINGPHIPOS") * GeoModelKernelUnits::deg;
+  return m_rdb->brlServices()->getDouble("BEARINGPHIPOS") * Gaudi::Units::deg;
 }
 
 int
@@ -489,13 +488,13 @@ SCT_BarrelParameters::includeFSI() const
 double 
 SCT_BarrelParameters::fsiFlangeInnerRadius() const
 {
-  return m_rdb->brlFSI()->getDouble("FLANGEINNERRADIUS") * GeoModelKernelUnits::mm; 
+  return m_rdb->brlFSI()->getDouble("FLANGEINNERRADIUS") * Gaudi::Units::mm; 
 }
 
 double 
 SCT_BarrelParameters::fsiFlangeOuterRadius() const
 {
-  return m_rdb->brlFSI()->getDouble("FLANGEOUTERRADIUS") * GeoModelKernelUnits::mm; 
+  return m_rdb->brlFSI()->getDouble("FLANGEOUTERRADIUS") * Gaudi::Units::mm; 
 }
 
 std::string 
@@ -507,7 +506,7 @@ SCT_BarrelParameters::fsiFlangeMaterial() const
 double 
 SCT_BarrelParameters::fsiFibreMaskDeltaR() const
 {
-  return m_rdb->brlFSI()->getDouble("FIBREMASKDELTAR") * GeoModelKernelUnits::mm; 
+  return m_rdb->brlFSI()->getDouble("FIBREMASKDELTAR") * Gaudi::Units::mm; 
 }
 
 std::string 
@@ -519,19 +518,19 @@ SCT_BarrelParameters::fsiFibreMaskMaterial() const
 double 
 SCT_BarrelParameters::fsiEndJewelRadialWidth() const
 {
-  return m_rdb->brlFSI()->getDouble("ENDJEWELRADIALWIDTH") * GeoModelKernelUnits::mm; 
+  return m_rdb->brlFSI()->getDouble("ENDJEWELRADIALWIDTH") * Gaudi::Units::mm; 
 }
 
 double 
 SCT_BarrelParameters::fsiEndJewelRPhiWidth() const
 {
-  return m_rdb->brlFSI()->getDouble("ENDJEWELRPHIWIDTH") * GeoModelKernelUnits::mm; 
+  return m_rdb->brlFSI()->getDouble("ENDJEWELRPHIWIDTH") * Gaudi::Units::mm; 
 }
 
 double 
 SCT_BarrelParameters::fsiEndJewelLength() const
 {
-  return m_rdb->brlFSI()->getDouble("ENDJEWELLENGTH") * GeoModelKernelUnits::mm; 
+  return m_rdb->brlFSI()->getDouble("ENDJEWELLENGTH") * Gaudi::Units::mm; 
 }
 
 std::string 
@@ -549,31 +548,31 @@ SCT_BarrelParameters::fsiEndJewelNRepeat(int iLayer) const
 double 
 SCT_BarrelParameters::fsiEndJewelPhi(int iLayer) const
 {
-  return m_rdb->brlFSILocation(iLayer)->getDouble("ENDJEWELPHI") * GeoModelKernelUnits::degree;
+  return m_rdb->brlFSILocation(iLayer)->getDouble("ENDJEWELPHI") * Gaudi::Units::degree;
 }
 
 double 
 SCT_BarrelParameters::fsiEndJewelZ(int iLayer) const
 {
-  return m_rdb->brlFSILocation(iLayer)->getDouble("ENDJEWELZ") * GeoModelKernelUnits::mm;
+  return m_rdb->brlFSILocation(iLayer)->getDouble("ENDJEWELZ") * Gaudi::Units::mm;
 }
 
 double 
 SCT_BarrelParameters::fsiScorpionRadialWidth() const
 {
-  return m_rdb->brlFSI()->getDouble("SCORPIONRADIALWIDTH") * GeoModelKernelUnits::mm; 
+  return m_rdb->brlFSI()->getDouble("SCORPIONRADIALWIDTH") * Gaudi::Units::mm; 
 }
 
 double 
 SCT_BarrelParameters::fsiScorpionRPhiWidth() const
 {
-  return m_rdb->brlFSI()->getDouble("SCORPIONRPHIWIDTH") * GeoModelKernelUnits::mm; 
+  return m_rdb->brlFSI()->getDouble("SCORPIONRPHIWIDTH") * Gaudi::Units::mm; 
 }
 
 double 
 SCT_BarrelParameters::fsiScorpionLength() const
 {
-  return m_rdb->brlFSI()->getDouble("SCORPIONLENGTH") * GeoModelKernelUnits::mm; 
+  return m_rdb->brlFSI()->getDouble("SCORPIONLENGTH") * Gaudi::Units::mm; 
 }
 
 std::string 
@@ -591,13 +590,13 @@ SCT_BarrelParameters::fsiScorpionNRepeat(int iLayer) const
 double 
 SCT_BarrelParameters::fsiScorpionPhi(int iLayer) const
 {
-  return m_rdb->brlFSILocation(iLayer)->getDouble("SCORPIONPHI") * GeoModelKernelUnits::degree;
+  return m_rdb->brlFSILocation(iLayer)->getDouble("SCORPIONPHI") * Gaudi::Units::degree;
 }
 
 double 
 SCT_BarrelParameters::fsiScorpionZ(int iLayer) const
 {
-  return m_rdb->brlFSILocation(iLayer)->getDouble("SCORPIONZ") * GeoModelKernelUnits::mm;
+  return m_rdb->brlFSILocation(iLayer)->getDouble("SCORPIONZ") * Gaudi::Units::mm;
 }
 
 
@@ -607,19 +606,19 @@ SCT_BarrelParameters::fsiScorpionZ(int iLayer) const
 double 
 SCT_BarrelParameters::spiderDeltaZ() const
 {
-  return m_rdb->brlServices()->getDouble("SPIDERDELTAZ") * GeoModelKernelUnits::mm; 
+  return m_rdb->brlServices()->getDouble("SPIDERDELTAZ") * Gaudi::Units::mm; 
 }
 
 double 
 SCT_BarrelParameters::spiderInnerRadius() const
 {
-  return m_rdb->brlServices()->getDouble("SPIDERINNERRADIUS") * GeoModelKernelUnits::mm; 
+  return m_rdb->brlServices()->getDouble("SPIDERINNERRADIUS") * Gaudi::Units::mm; 
 }
 
 double 
 SCT_BarrelParameters::spiderOuterRadius() const
 {
-  return m_rdb->brlServices()->getDouble("SPIDEROUTERRADIUS") * GeoModelKernelUnits::mm; 
+  return m_rdb->brlServices()->getDouble("SPIDEROUTERRADIUS") * Gaudi::Units::mm; 
 }
 
 std::string 
@@ -634,85 +633,85 @@ SCT_BarrelParameters::spiderMaterial() const
 double
 SCT_BarrelParameters::thermalShieldInnerRadius() const
 {
-  return m_rdb->brlThermalShield()->getDouble("INNERRADIUS") * GeoModelKernelUnits::mm;
+  return m_rdb->brlThermalShield()->getDouble("INNERRADIUS") * Gaudi::Units::mm;
 }
 
 double
 SCT_BarrelParameters::thermalShieldOuterRadius() const
 {
-  return m_rdb->brlThermalShield()->getDouble("OUTERRADIUS") * GeoModelKernelUnits::mm;
+  return m_rdb->brlThermalShield()->getDouble("OUTERRADIUS") * Gaudi::Units::mm;
 }
 
 double
 SCT_BarrelParameters::thermalShieldEndZMax() const
 {
-  return m_rdb->brlThermalShield()->getDouble("ENDZMAX") * GeoModelKernelUnits::mm;
+  return m_rdb->brlThermalShield()->getDouble("ENDZMAX") * Gaudi::Units::mm;
 }
 
 double
 SCT_BarrelParameters::thermalShieldCylTotalThickness() const
 {
-  return m_rdb->brlThermalShield()->getDouble("CYLTOTALTHICKNESS") * GeoModelKernelUnits::mm;
+  return m_rdb->brlThermalShield()->getDouble("CYLTOTALTHICKNESS") * Gaudi::Units::mm;
 }
 
 double
 SCT_BarrelParameters::thermalShieldCylInnerWallThickness() const
 {
-  return m_rdb->brlThermalShield()->getDouble("CYLINNERWALLTHICK") * GeoModelKernelUnits::mm;
+  return m_rdb->brlThermalShield()->getDouble("CYLINNERWALLTHICK") * Gaudi::Units::mm;
 }
 
 double
 SCT_BarrelParameters::thermalShieldCylOuterWallThickness() const
 {
-  return m_rdb->brlThermalShield()->getDouble("CYLOUTERWALLTHICK") * GeoModelKernelUnits::mm;
+  return m_rdb->brlThermalShield()->getDouble("CYLOUTERWALLTHICK") * Gaudi::Units::mm;
 }
 
 double
 SCT_BarrelParameters::thermalShieldSpacerZWidth() const
 {
-  return m_rdb->brlThermalShield()->getDouble("SPACERZWIDTH") * GeoModelKernelUnits::mm;
+  return m_rdb->brlThermalShield()->getDouble("SPACERZWIDTH") * Gaudi::Units::mm;
 }
 
 double
 SCT_BarrelParameters::thermalShieldFirstSpacerZMin() const
 {
-  return m_rdb->brlThermalShield()->getDouble("FIRSTSPACERZMIN") * GeoModelKernelUnits::mm;
+  return m_rdb->brlThermalShield()->getDouble("FIRSTSPACERZMIN") * Gaudi::Units::mm;
 }
 
 double
 SCT_BarrelParameters::thermalShieldEndCapCylThickness() const
 {
-  return m_rdb->brlThermalShield()->getDouble("ENDCAPCYLTHICKNESS") * GeoModelKernelUnits::mm;
+  return m_rdb->brlThermalShield()->getDouble("ENDCAPCYLTHICKNESS") * Gaudi::Units::mm;
 }
 
 double
 SCT_BarrelParameters::thermalShieldEndCapThickness() const
 {
-  return m_rdb->brlThermalShield()->getDouble("ENDCAPTHICKNESS") * GeoModelKernelUnits::mm;
+  return m_rdb->brlThermalShield()->getDouble("ENDCAPTHICKNESS") * Gaudi::Units::mm;
 }
 
 double
 SCT_BarrelParameters::thermalShieldBulkheadInnerRadius() const
 {
-  return m_rdb->brlThermalShield()->getDouble("BULKHEADINNERRADIUS") * GeoModelKernelUnits::mm;
+  return m_rdb->brlThermalShield()->getDouble("BULKHEADINNERRADIUS") * Gaudi::Units::mm;
 }
 
 double
 SCT_BarrelParameters::thermalShieldBulkheadOuterRadius() const
 {
-  return m_rdb->brlThermalShield()->getDouble("BULKHEADOUTERRADIUS") * GeoModelKernelUnits::mm;
+  return m_rdb->brlThermalShield()->getDouble("BULKHEADOUTERRADIUS") * Gaudi::Units::mm;
 }
 
 double
 SCT_BarrelParameters::thermalShieldEndPanelInnerRadius() const
 {
-  return m_rdb->brlThermalShield()->getDouble("ENDPANELINNERRADIUS") * GeoModelKernelUnits::mm;
+  return m_rdb->brlThermalShield()->getDouble("ENDPANELINNERRADIUS") * Gaudi::Units::mm;
 }
 
 double
 SCT_BarrelParameters::thermalShieldEndPanelOuterRadius() const
 {
-  return m_rdb->brlThermalShield()->getDouble("ENDPANELOUTERRADIUS") * GeoModelKernelUnits::mm;
+  return m_rdb->brlThermalShield()->getDouble("ENDPANELOUTERRADIUS") * Gaudi::Units::mm;
 }
 
 std::string
@@ -745,19 +744,19 @@ SCT_BarrelParameters::thermalShieldMaterialInnerSect() const
 double
 SCT_BarrelParameters::emiShieldInnerRadius() const
 {
-  return m_rdb->brlServices()->getDouble("EMIINNERRADIUS") * GeoModelKernelUnits::mm;
+  return m_rdb->brlServices()->getDouble("EMIINNERRADIUS") * Gaudi::Units::mm;
 }
 
 double
 SCT_BarrelParameters::emiShieldDeltaR() const
 {
-  return m_rdb->brlServices()->getDouble("EMIDELTAR") * GeoModelKernelUnits::mm;
+  return m_rdb->brlServices()->getDouble("EMIDELTAR") * Gaudi::Units::mm;
 }
 
 double
 SCT_BarrelParameters::emiShieldZMax() const
 {
-  return m_rdb->brlServices()->getDouble("EMIZMAX") * GeoModelKernelUnits::mm;
+  return m_rdb->brlServices()->getDouble("EMIZMAX") * Gaudi::Units::mm;
 }
 
 std::string
@@ -769,13 +768,13 @@ SCT_BarrelParameters::emiShieldMaterial() const
 double
 SCT_BarrelParameters::emiJointDeltaR() const
 {
-  return m_rdb->brlServices()->getDouble("EMIJOINTDELTAR") * GeoModelKernelUnits::mm;
+  return m_rdb->brlServices()->getDouble("EMIJOINTDELTAR") * Gaudi::Units::mm;
 }
 
 double
 SCT_BarrelParameters::emiJointRPhi() const
 {
-  return m_rdb->brlServices()->getDouble("EMIJOINTRPHI") * GeoModelKernelUnits::mm;
+  return m_rdb->brlServices()->getDouble("EMIJOINTRPHI") * Gaudi::Units::mm;
 }
 
 std::string
@@ -792,25 +791,25 @@ SCT_BarrelParameters::emiJointMaterial() const
 double 
 SCT_BarrelParameters::pixelAttachmentInnerRadius() const
 {
-  return m_rdb->brlServices()->getDouble("PIXELATTACHINNERRAD") * GeoModelKernelUnits::mm; 
+  return m_rdb->brlServices()->getDouble("PIXELATTACHINNERRAD") * Gaudi::Units::mm; 
 }
 
 double 
 SCT_BarrelParameters::pixelAttachmentOuterRadius() const
 {
-  return m_rdb->brlServices()->getDouble("PIXELATTACHOUTERRAD") * GeoModelKernelUnits::mm; 
+  return m_rdb->brlServices()->getDouble("PIXELATTACHOUTERRAD") * Gaudi::Units::mm; 
 }
 
 double 
 SCT_BarrelParameters::pixelAttachmentZMin() const
 {
-  return m_rdb->brlServices()->getDouble("PIXELATTACHZMIN") * GeoModelKernelUnits::mm; 
+  return m_rdb->brlServices()->getDouble("PIXELATTACHZMIN") * Gaudi::Units::mm; 
 }
 
 double 
 SCT_BarrelParameters::pixelAttachmentDeltaZ() const
 {
-  return m_rdb->brlServices()->getDouble("PIXELATTACHDELTAZ") * GeoModelKernelUnits::mm; 
+  return m_rdb->brlServices()->getDouble("PIXELATTACHDELTAZ") * Gaudi::Units::mm; 
 }
 
 std::string 
@@ -831,31 +830,31 @@ SCT_BarrelParameters::numLayers() const
 double 
 SCT_BarrelParameters::barrelInnerRadius() const
 {
-  return m_rdb->brlGeneral()->getDouble("INNERRADIUS") * GeoModelKernelUnits::mm; 
+  return m_rdb->brlGeneral()->getDouble("INNERRADIUS") * Gaudi::Units::mm; 
 }
 
 double 
 SCT_BarrelParameters::barrelOuterRadius() const
 {
-  return m_rdb->brlGeneral()->getDouble("OUTERRADIUS") * GeoModelKernelUnits::mm; 
+  return m_rdb->brlGeneral()->getDouble("OUTERRADIUS") * Gaudi::Units::mm; 
 }
 
 double 
 SCT_BarrelParameters::barrelLength() const
 {
-  return m_rdb->brlGeneral()->getDouble("LENGTH") * GeoModelKernelUnits::mm; 
+  return m_rdb->brlGeneral()->getDouble("LENGTH") * Gaudi::Units::mm; 
 }
 
 double 
 SCT_BarrelParameters::cylinderLength() const
 {
-  return m_rdb->brlGeneral()->getDouble("CYLINDERLENGTH") * GeoModelKernelUnits::mm; 
+  return m_rdb->brlGeneral()->getDouble("CYLINDERLENGTH") * Gaudi::Units::mm; 
 }
 
 double 
 SCT_BarrelParameters::activeLength() const
 {
-  return m_rdb->brlGeneral()->getDouble("ACTIVELENGTH") * GeoModelKernelUnits::mm; 
+  return m_rdb->brlGeneral()->getDouble("ACTIVELENGTH") * Gaudi::Units::mm; 
 }
 
 bool 
diff --git a/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_ComponentFactory.cxx b/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_ComponentFactory.cxx
index cf2f14e1296374157b889e61df0f66a00b9ce6ce..cee35aa92f6f025439e7ad61aaadfaeff9c88404 100755
--- a/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_ComponentFactory.cxx
+++ b/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_ComponentFactory.cxx
@@ -3,7 +3,7 @@
 */
 
 #include "SCT_GeoModel/SCT_ComponentFactory.h"
-#include "GeoModelKernel/Units.h"
+#include "GaudiKernel/SystemOfUnits.h"
 
 #include <sstream>
 #include <string>
@@ -13,7 +13,7 @@ using InDetDD::SCT_DetectorManager;
 SCT_DetectorManager * SCT_ComponentFactory::s_detectorManager = 0;
 const SCT_GeometryManager * SCT_ComponentFactory::s_geometryManager = 0;
 
-double SCT_ComponentFactory::s_epsilon = 1.0e-6 * GeoModelKernelUnits::mm;
+double SCT_ComponentFactory::s_epsilon = 1.0e-6 * Gaudi::Units::mm;
 
 SCT_ComponentFactory::SCT_ComponentFactory(const std::string & name) 
   : m_name(name)
diff --git a/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_DetectorFactory.cxx b/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_DetectorFactory.cxx
index 3a9fdd418ed61f896ef448c7910d3c8479fab9c6..94b2350d3ac814ea93b2f23630760bbda38f0c6a 100755
--- a/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_DetectorFactory.cxx
+++ b/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_DetectorFactory.cxx
@@ -50,8 +50,8 @@
 #include "GaudiKernel/ISvcLocator.h"
 
 #include "GeoModelKernel/GeoDefinitions.h"
+#include "GaudiKernel/SystemOfUnits.h"
 
-#include "GeoModelKernel/Units.h"
 
 
 #include <iostream> 
@@ -246,7 +246,7 @@ void SCT_DetectorFactory::create(GeoPhysVol *world)
     GeoVPhysVol * forwardMinusPV = sctForwardMinus.build(idFwdMinus);
 
     GeoTrf::Transform3D rot;
-    rot = GeoTrf::RotateY3D(180 * GeoModelKernelUnits::degree);
+    rot = GeoTrf::RotateY3D(180 * Gaudi::Units::degree);
   
     GeoTrf::Transform3D fwdTransformMinus(sctTransform  
                                            * sctGeneral->partTransform(forwardMinusLabel)  
diff --git a/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_FSIHelper.cxx b/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_FSIHelper.cxx
index 5b0b4e3c9bcd8958deb068f7602f5de83798ec73..da47861300761833cdb24a627c937057b8f09f6a 100755
--- a/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_FSIHelper.cxx
+++ b/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_FSIHelper.cxx
@@ -6,7 +6,7 @@
 #include "SCT_GeoModel/SCT_FSIHelper.h"
 #include "SCT_GeoModel/SCT_DataBase.h"
 #include "RDBAccessSvc/IRDBRecord.h"
-#include "GeoModelKernel/Units.h"
+#include "GaudiKernel/SystemOfUnits.h"
 
 #include <iostream>
 
@@ -66,8 +66,8 @@ FSIHelper::fill()
   // Loop through location types
   for (int iLocIndex = 0; iLocIndex < m_rdb->fwdFSILocationSize(); iLocIndex++) {
     std::string locType =  m_rdb->fwdFSILocation(iLocIndex)->getString("LOCTYPE");
-    double radius =  m_rdb->fwdFSILocation(iLocIndex)->getDouble("LOCR") * GeoModelKernelUnits::mm;
-    double rphi = m_rdb->fwdFSILocation(iLocIndex)->getDouble("LOCPHI") * GeoModelKernelUnits::deg;
+    double radius =  m_rdb->fwdFSILocation(iLocIndex)->getDouble("LOCR") * Gaudi::Units::mm;
+    double rphi = m_rdb->fwdFSILocation(iLocIndex)->getDouble("LOCPHI") * Gaudi::Units::deg;
     int side =  m_rdb->fwdFSILocation(iLocIndex)->getInt("SIDE");
     FSILocation * location = new  FSILocation(locType, radius, rphi, side);
     m_locationTypes[locType] = location;
diff --git a/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_Forward.cxx b/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_Forward.cxx
index 9282e83020c2c72473c71bc906fa689d9f4a6232..405c90423da59034bf55eb628f0490f939702844 100755
--- a/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_Forward.cxx
+++ b/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_Forward.cxx
@@ -32,7 +32,7 @@
 #include "GeoModelKernel/GeoTransform.h"
 #include "GeoModelKernel/GeoAlignableTransform.h"
 #include "GeoModelKernel/GeoMaterial.h"
-#include "GeoModelKernel/Units.h"
+#include "GaudiKernel/SystemOfUnits.h"
 
 #include <sstream>
 #include <cmath>
@@ -104,7 +104,6 @@ SCT_Forward::preBuild()
   for (int iWheel = 0; iWheel < m_numWheels; iWheel++){
     // Build Wheels
     std::ostringstream name; name << "Wheel" << iWheel << ((m_endcap > 0) ? "A" : "C");
-    //std::cout << getName() << ", iWheel = " << iWheel << ", " <<  name.str() << ", m_endcap = " << m_endcap << std::endl;
     const SCT_FwdWheel * wheel = new SCT_FwdWheel(name.str(), iWheel, m_modules, m_endcap);
     m_wheels.push_back(wheel);
   }
@@ -127,17 +126,9 @@ SCT_Forward::build(SCT_Identifier id) const
 
   for (int iWheel = 0; iWheel < m_numWheels; iWheel++){
 
-    // Build Wheels
-    // std::cout << "iWheel = " << iWheel << std::endl;
-    //std::ostringstream name; name << "Wheel" << iWheel << ((m_endcap > 0) ? "A" : "C");
-    //const SCT_FwdWheel * wheel = new SCT_FwdWheel(name.str(), iWheel, m_modules, m_endcap);
-    //m_wheels.push_back(wheel);
-
     const SCT_FwdWheel * wheel = m_wheels[iWheel];
     std::ostringstream wheelName; wheelName << "Wheel#" << iWheel;
     double zpos = wheel->zPosition() - zCenter();
-    //    std::cout << "Adding wheel " << iWheel << ", z = " << m_wheels[iWheel]->zPosition()
-    //          << " at " << zpos << ", thickness = " << wheel->thickness() << std::endl;
     forward->add(new GeoNameTag(wheelName.str()));
     forward->add(new GeoIdentifierTag(iWheel));
     GeoAlignableTransform * transform = new GeoAlignableTransform(GeoTrf::TranslateZ3D(zpos));
@@ -196,11 +187,8 @@ SCT_Forward::build(SCT_Identifier id) const
         int numPipes = 8 * m_wheels[iWheel]->numRings();
     
         // Label Cooling pipe with W# at end of string  
-        // std::ostringstream label; label << "CoolingPipeW" << iWheel + 1;       
-        //SCT_FwdCoolingPipe * coolingPipe = new SCT_FwdCoolingPipe(label.str(), numPipes, rStart, startPos, endPos);
         SCT_FwdCoolingPipe coolingPipe("OffDiskCoolingPipeW"+intToString(iWheel),
                                        numPipes, rStart, startPos, endPos);  
-        //std::cout << "Cooling pipe rmin,rmax: " << coolingPipe.innerRadius() << ", " << coolingPipe.outerRadius()  << std::endl;
       
         // Place the cooling pipes
         double coolingPipeZPos = coolingPipe.zPosition() - zCenter();
@@ -224,7 +212,7 @@ SCT_Forward::build(SCT_Identifier id) const
       // Calculate radius to start placing power tapes. This is half way bewteen outer radius
       // of support fram and outer radius of forward envelope.
       // The -1 mm is to avoid a clash with the thermal shield.
-      double innerRadiusPowerTapes = 0.5*(supportFrame.outerRadius() + m_outerRadius) - 1*GeoModelKernelUnits::mm;
+      double innerRadiusPowerTapes = 0.5*(supportFrame.outerRadius() + m_outerRadius) - 1*Gaudi::Units::mm;
 
       // Inner radius of cylinder representing power tapes. Gets incremented for each wheel.
       double rStart = innerRadiusPowerTapes;
@@ -238,12 +226,8 @@ SCT_Forward::build(SCT_Identifier id) const
         int numModules = m_wheels[iWheel]->totalModules();
 
         // Label power tape with W# at end of string  
-        //std::ostringstream label; label << "PowerTapeW" << iWheel + 1;       
-        //SCT_FwdPowerTape * powerTape = new SCT_FwdPowerTape(label.str(), numModules, rStart, startPos, endPos);
         SCT_FwdPowerTape powerTape("OffDiskPowerTapeW"+intToString(iWheel),
                                    numModules, rStart, startPos, endPos);
-        //std::cout << "PowerTape rmin,rmax: " << powerTape.innerRadius() << ", " << powerTape.outerRadius()  << std::endl;
-
 
         // Place Power Tapes
         double powerTapeZPos = powerTape.zPosition() - zCenter();
diff --git a/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_ForwardModuleParameters.cxx b/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_ForwardModuleParameters.cxx
index d1617a10e14e585fccbe1b5109c23f366ceb2c9e..fb09c3900adb960314417fe6ec5df4da25b79130 100755
--- a/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_ForwardModuleParameters.cxx
+++ b/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_ForwardModuleParameters.cxx
@@ -9,7 +9,7 @@
 #include "RDBAccessSvc/IRDBRecordset.h"
 #include "RDBAccessSvc/IRDBRecord.h"
 
-#include "GeoModelKernel/Units.h"
+#include "GaudiKernel/SystemOfUnits.h"
 
 #include <cmath>
 
@@ -31,55 +31,55 @@ SCT_ForwardModuleParameters::fwdSensorNumWafers(int iModuleType) const
 double 
 SCT_ForwardModuleParameters::fwdSensorThickness(int iModuleType) const
 {
-  return  m_rdb->fwdSensor(iModuleType)->getDouble("THICKNESS") * GeoModelKernelUnits::mm;
+  return  m_rdb->fwdSensor(iModuleType)->getDouble("THICKNESS") * Gaudi::Units::mm;
 }
 
 double 
 SCT_ForwardModuleParameters::fwdSensorInnerWidthNear(int iModuleType) const
 {
-  return  m_rdb->fwdSensor(iModuleType)->getDouble("INNERWIDTHNEAR") * GeoModelKernelUnits::mm;
+  return  m_rdb->fwdSensor(iModuleType)->getDouble("INNERWIDTHNEAR") * Gaudi::Units::mm;
 }
 
 double 
 SCT_ForwardModuleParameters::fwdSensorInnerWidthFar(int iModuleType) const
 {
-  return  m_rdb->fwdSensor(iModuleType)->getDouble("INNERWIDTHFAR") * GeoModelKernelUnits::mm;
+  return  m_rdb->fwdSensor(iModuleType)->getDouble("INNERWIDTHFAR") * Gaudi::Units::mm;
 }
 
 double 
 SCT_ForwardModuleParameters::fwdSensorOuterWidthNear(int iModuleType) const
 {
-  return  m_rdb->fwdSensor(iModuleType)->getDouble("OUTERWIDTHNEAR") * GeoModelKernelUnits::mm;
+  return  m_rdb->fwdSensor(iModuleType)->getDouble("OUTERWIDTHNEAR") * Gaudi::Units::mm;
 }
 
 double 
 SCT_ForwardModuleParameters::fwdSensorOuterWidthFar(int iModuleType) const
 {
-  return  m_rdb->fwdSensor(iModuleType)->getDouble("OUTERWIDTHFAR") * GeoModelKernelUnits::mm;
+  return  m_rdb->fwdSensor(iModuleType)->getDouble("OUTERWIDTHFAR") * Gaudi::Units::mm;
 }
 
 double 
 SCT_ForwardModuleParameters::fwdSensorLengthNear(int iModuleType) const
 {
-  return  m_rdb->fwdSensor(iModuleType)->getDouble("LENGTHNEAR") * GeoModelKernelUnits::mm;
+  return  m_rdb->fwdSensor(iModuleType)->getDouble("LENGTHNEAR") * Gaudi::Units::mm;
 }
 
 double 
 SCT_ForwardModuleParameters::fwdSensorLengthFar(int iModuleType) const
 {
-  return  m_rdb->fwdSensor(iModuleType)->getDouble("LENGTHFAR") * GeoModelKernelUnits::mm;
+  return  m_rdb->fwdSensor(iModuleType)->getDouble("LENGTHFAR") * Gaudi::Units::mm;
 }
 
 double 
 SCT_ForwardModuleParameters::fwdSensorRadiusNear(int iModuleType) const
 {
-  return  m_rdb->fwdSensor(iModuleType)->getDouble("RADIUSNEAR") * GeoModelKernelUnits::mm;
+  return  m_rdb->fwdSensor(iModuleType)->getDouble("RADIUSNEAR") * Gaudi::Units::mm;
 }
 
 double 
 SCT_ForwardModuleParameters::fwdSensorRadiusFar(int iModuleType) const
 {
-  return  m_rdb->fwdSensor(iModuleType)->getDouble("RADIUSFAR") * GeoModelKernelUnits::mm;
+  return  m_rdb->fwdSensor(iModuleType)->getDouble("RADIUSFAR") * Gaudi::Units::mm;
 }
 
 std::string 
@@ -109,19 +109,19 @@ SCT_ForwardModuleParameters::fwdSensorActiveFar(int iModuleType) const
 double 
 SCT_ForwardModuleParameters::fwdSensorActiveHalfLengthNear(int iModuleType) const
 {
-  return  m_rdb->fwdSensor(iModuleType)->getDouble("ACTIVEHALFLENGTHNEAR") * GeoModelKernelUnits::mm;
+  return  m_rdb->fwdSensor(iModuleType)->getDouble("ACTIVEHALFLENGTHNEAR") * Gaudi::Units::mm;
 }
 
 double 
 SCT_ForwardModuleParameters::fwdSensorActiveHalfLengthFar(int iModuleType) const
 {
-  return  m_rdb->fwdSensor(iModuleType)->getDouble("ACTIVEHALFLENGTHFAR") * GeoModelKernelUnits::mm;
+  return  m_rdb->fwdSensor(iModuleType)->getDouble("ACTIVEHALFLENGTHFAR") * Gaudi::Units::mm;
 }
 
 double 
 SCT_ForwardModuleParameters::fwdSensorAngularPitch(int iModuleType) const
 {
-  return  m_rdb->fwdSensor(iModuleType)->getDouble("ANGULARPITCH") * GeoModelKernelUnits::radian;
+  return  m_rdb->fwdSensor(iModuleType)->getDouble("ANGULARPITCH") * Gaudi::Units::radian;
 }
 
 int
@@ -149,37 +149,37 @@ SCT_ForwardModuleParameters::fwdSensorStripShift(int iModuleType) const
 double 
 SCT_ForwardModuleParameters::fwdHybridThickness() const
 {
-  return  m_rdb->fwdHybrid()->getDouble("THICKNESS") * GeoModelKernelUnits::mm;
+  return  m_rdb->fwdHybrid()->getDouble("THICKNESS") * Gaudi::Units::mm;
 }
 
 double 
 SCT_ForwardModuleParameters::fwdHybridInnerWidth() const
 {
-  return  m_rdb->fwdHybrid()->getDouble("INNERWIDTH") * GeoModelKernelUnits::mm;
+  return  m_rdb->fwdHybrid()->getDouble("INNERWIDTH") * Gaudi::Units::mm;
 }
 
 double 
 SCT_ForwardModuleParameters::fwdHybridOuterWidth() const
 {
-  return  m_rdb->fwdHybrid()->getDouble("OUTERWIDTH") * GeoModelKernelUnits::mm;
+  return  m_rdb->fwdHybrid()->getDouble("OUTERWIDTH") * Gaudi::Units::mm;
 }
 
 double 
 SCT_ForwardModuleParameters::fwdHybridLength() const
 {
-  return  m_rdb->fwdHybrid()->getDouble("LENGTH") * GeoModelKernelUnits::mm;
+  return  m_rdb->fwdHybrid()->getDouble("LENGTH") * Gaudi::Units::mm;
 }
 
 double 
 SCT_ForwardModuleParameters::fwdHybridLengthToCorner() const
 {
-  return  m_rdb->fwdHybrid()->getDouble("LENGTHTOCORNER") * GeoModelKernelUnits::mm;
+  return  m_rdb->fwdHybrid()->getDouble("LENGTHTOCORNER") * Gaudi::Units::mm;
 }
 
 double 
 SCT_ForwardModuleParameters::fwdHybridMountPointToInnerEdge() const
 {
-  return  m_rdb->fwdHybrid()->getDouble("MOUNTPOINTTOINEDGE") * GeoModelKernelUnits::mm;
+  return  m_rdb->fwdHybrid()->getDouble("MOUNTPOINTTOINEDGE") * Gaudi::Units::mm;
 }
 
 std::string 
@@ -194,26 +194,26 @@ SCT_ForwardModuleParameters::fwdHybridMaterial() const
 double 
 SCT_ForwardModuleParameters::fwdSpineThickness(int iModuleType) const
 {
-  return  m_rdb->fwdSpine(iModuleType)->getDouble("THICKNESS") * GeoModelKernelUnits::mm;
+  return  m_rdb->fwdSpine(iModuleType)->getDouble("THICKNESS") * Gaudi::Units::mm;
 }
 
 double 
 SCT_ForwardModuleParameters::fwdSpineWidth(int iModuleType) const
 {
-  return  m_rdb->fwdSpine(iModuleType)->getDouble("WIDTH") * GeoModelKernelUnits::mm;
+  return  m_rdb->fwdSpine(iModuleType)->getDouble("WIDTH") * Gaudi::Units::mm;
 }
 
 double 
 SCT_ForwardModuleParameters::fwdSpineEndToModuleCenter(int iModuleType) const
 {
-  return  m_rdb->fwdSpine(iModuleType)->getDouble("ENDTOMODULECENTER") * GeoModelKernelUnits::mm;
+  return  m_rdb->fwdSpine(iModuleType)->getDouble("ENDTOMODULECENTER") * Gaudi::Units::mm;
 }
 
 
 double 
 SCT_ForwardModuleParameters::fwdSpineEndLocatorToEndMount(int iModuleType) const
 {
-  return  m_rdb->fwdSpine(iModuleType)->getDouble("ENDLOCATORTOENDMOUNT") * GeoModelKernelUnits::mm;
+  return  m_rdb->fwdSpine(iModuleType)->getDouble("ENDLOCATORTOENDMOUNT") * Gaudi::Units::mm;
 }
 
 
@@ -230,55 +230,55 @@ SCT_ForwardModuleParameters::fwdSpineMaterial(int iModuleType) const
 double 
 SCT_ForwardModuleParameters::fwdSubSpineInnerWidth(int iModuleType) const
 {
-  return  m_rdb->fwdSpine(iModuleType)->getDouble("SUBINNERWIDTH") * GeoModelKernelUnits::mm;
+  return  m_rdb->fwdSpine(iModuleType)->getDouble("SUBINNERWIDTH") * Gaudi::Units::mm;
 }
 
 double 
 SCT_ForwardModuleParameters::fwdSubSpineInnerLength(int iModuleType) const
 {
-  return  m_rdb->fwdSpine(iModuleType)->getDouble("SUBINNERLENGTH") * GeoModelKernelUnits::mm;
+  return  m_rdb->fwdSpine(iModuleType)->getDouble("SUBINNERLENGTH") * Gaudi::Units::mm;
 }
 
 double 
 SCT_ForwardModuleParameters::fwdSubSpineInnerRefDist(int iModuleType) const
 {
-  return  m_rdb->fwdSpine(iModuleType)->getDouble("SUBINNERREFDIST") * GeoModelKernelUnits::mm;
+  return  m_rdb->fwdSpine(iModuleType)->getDouble("SUBINNERREFDIST") * Gaudi::Units::mm;
 }
 
 double 
 SCT_ForwardModuleParameters::fwdSubSpineMiddleWidth(int iModuleType) const
 {
-  return  m_rdb->fwdSpine(iModuleType)->getDouble("SUBMIDDLEWIDTH") * GeoModelKernelUnits::mm;
+  return  m_rdb->fwdSpine(iModuleType)->getDouble("SUBMIDDLEWIDTH") * Gaudi::Units::mm;
 }
 
 double 
 SCT_ForwardModuleParameters::fwdSubSpineMiddleLength(int iModuleType) const
 {
-  return  m_rdb->fwdSpine(iModuleType)->getDouble("SUBMIDDLELENGTH") * GeoModelKernelUnits::mm;
+  return  m_rdb->fwdSpine(iModuleType)->getDouble("SUBMIDDLELENGTH") * Gaudi::Units::mm;
 }
 
 double 
 SCT_ForwardModuleParameters::fwdSubSpineMiddleRefDist(int iModuleType) const
 {
-  return  m_rdb->fwdSpine(iModuleType)->getDouble("SUBMIDDLEREFDIST") * GeoModelKernelUnits::mm;
+  return  m_rdb->fwdSpine(iModuleType)->getDouble("SUBMIDDLEREFDIST") * Gaudi::Units::mm;
 }
 
 double 
 SCT_ForwardModuleParameters::fwdSubSpineOuterWidth(int iModuleType) const
 {
-  return  m_rdb->fwdSpine(iModuleType)->getDouble("SUBOUTERWIDTH") * GeoModelKernelUnits::mm;
+  return  m_rdb->fwdSpine(iModuleType)->getDouble("SUBOUTERWIDTH") * Gaudi::Units::mm;
 }
 
 double 
 SCT_ForwardModuleParameters::fwdSubSpineOuterLength(int iModuleType) const
 {
-  return  m_rdb->fwdSpine(iModuleType)->getDouble("SUBOUTERLENGTH") * GeoModelKernelUnits::mm;
+  return  m_rdb->fwdSpine(iModuleType)->getDouble("SUBOUTERLENGTH") * Gaudi::Units::mm;
 }
 
 double 
 SCT_ForwardModuleParameters::fwdSubSpineOuterRefDist(int iModuleType) const
 {
-  return  m_rdb->fwdSpine(iModuleType)->getDouble("SUBOUTERREFDIST") * GeoModelKernelUnits::mm;
+  return  m_rdb->fwdSpine(iModuleType)->getDouble("SUBOUTERREFDIST") * Gaudi::Units::mm;
 }
 
 std::string 
@@ -301,7 +301,7 @@ SCT_ForwardModuleParameters::fwdModuleNumTypes() const
 double 
 SCT_ForwardModuleParameters::fwdModuleStereoAngle(int iModuleType) const
 {
-  return m_rdb->fwdModule(iModuleType)->getDouble("STEREOANGLE") * GeoModelKernelUnits::milliradian;
+  return m_rdb->fwdModule(iModuleType)->getDouble("STEREOANGLE") * Gaudi::Units::milliradian;
 }
 
 int
@@ -323,25 +323,25 @@ SCT_ForwardModuleParameters::fwdModuleUpperSideNumber(int iModuleType) const
 double
 SCT_ForwardModuleParameters::fwdModuleGlueThickness(int iModuleType) const
 {
-  return m_rdb->fwdModule(iModuleType)->getDouble("GLUETHICKNESS") * GeoModelKernelUnits::mm;
+  return m_rdb->fwdModule(iModuleType)->getDouble("GLUETHICKNESS") * Gaudi::Units::mm;
 }
 
 double
 SCT_ForwardModuleParameters::fwdModuleMountPoint(int iModuleType) const
 {
-  return m_rdb->fwdModule(iModuleType)->getDouble("MOUNTPOINT") * GeoModelKernelUnits::mm;
+  return m_rdb->fwdModule(iModuleType)->getDouble("MOUNTPOINT") * Gaudi::Units::mm;
 }
 
 double
 SCT_ForwardModuleParameters::fwdModuleDistBtwMountPoints(int iModuleType) const
 {
-  return m_rdb->fwdModule(iModuleType)->getDouble("DISTBTWMOUNTPOINTS") * GeoModelKernelUnits::mm;
+  return m_rdb->fwdModule(iModuleType)->getDouble("DISTBTWMOUNTPOINTS") * Gaudi::Units::mm;
 }
 
 double 
 SCT_ForwardModuleParameters::fwdModuleHybridEdgeToSpine(int iModuleType) const
 {
-  return m_rdb->fwdModule(iModuleType)->getDouble("HYBRIDEDGETOSPINE")*GeoModelKernelUnits::mm;
+  return m_rdb->fwdModule(iModuleType)->getDouble("HYBRIDEDGETOSPINE")*Gaudi::Units::mm;
 }  
 
 bool 
@@ -367,19 +367,19 @@ SCT_ForwardModuleParameters::fwdModuleConnectorPresent() const
 double 
 SCT_ForwardModuleParameters::fwdModuleConnectorDeltaR() const
 {
-  return m_rdb->fwdModuleConnector()->getDouble("DELTAR") * GeoModelKernelUnits::mm;
+  return m_rdb->fwdModuleConnector()->getDouble("DELTAR") * Gaudi::Units::mm;
 }
 
 double 
 SCT_ForwardModuleParameters::fwdModuleConnectorRPhi() const
 {
-  return m_rdb->fwdModuleConnector()->getDouble("RPHI") * GeoModelKernelUnits::mm;
+  return m_rdb->fwdModuleConnector()->getDouble("RPHI") * Gaudi::Units::mm;
 }
 
 double 
 SCT_ForwardModuleParameters::fwdModuleConnectorThickness() const
 {
-  return m_rdb->fwdModuleConnector()->getDouble("THICKNESS") * GeoModelKernelUnits::mm;
+  return m_rdb->fwdModuleConnector()->getDouble("THICKNESS") * Gaudi::Units::mm;
 }
 
 std::string
diff --git a/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_ForwardParameters.cxx b/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_ForwardParameters.cxx
index a56ae8177ae54af028955ea37b02c1ec7539175f..80fc94334cbbc2b0454874d57d8df59a3979e572 100755
--- a/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_ForwardParameters.cxx
+++ b/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_ForwardParameters.cxx
@@ -10,7 +10,7 @@
 #include "RDBAccessSvc/IRDBRecord.h"
 
 #include "SCT_GeoModel/SCT_FSIHelper.h"
-#include "GeoModelKernel/Units.h"
+#include "GaudiKernel/SystemOfUnits.h"
 
 #include <iostream>
 #include <cmath>
@@ -38,13 +38,13 @@ SCT_ForwardParameters::fwdRingNumModules(int iRing) const
 double
 SCT_ForwardParameters::fwdRingModuleStagger(int iRing) const
 {
-  return m_rdb->fwdRing(iRing)->getDouble("MODULESTAGGER") * GeoModelKernelUnits::mm;
+  return m_rdb->fwdRing(iRing)->getDouble("MODULESTAGGER") * Gaudi::Units::mm;
 }
 
 double
 SCT_ForwardParameters::fwdRingPhiOfRefModule(int iRing) const
 {
-  return m_rdb->fwdRing(iRing)->getDouble("PHIOFREFMODULE") * GeoModelKernelUnits::deg;
+  return m_rdb->fwdRing(iRing)->getDouble("PHIOFREFMODULE") * Gaudi::Units::deg;
 }
 
 
@@ -57,7 +57,7 @@ SCT_ForwardParameters::fwdRingUsualRingSide(int iRing) const
 double
 SCT_ForwardParameters::fwdRingDistToDiscCenter(int iRing) const
 {
-  return m_rdb->fwdRing(iRing)->getDouble("RINGTODISCCENTER") * GeoModelKernelUnits::mm;
+  return m_rdb->fwdRing(iRing)->getDouble("RINGTODISCCENTER") * Gaudi::Units::mm;
 }
 
 
@@ -68,7 +68,7 @@ SCT_ForwardParameters::fwdRingDistToDiscCenter(int iRing) const
 double
 SCT_ForwardParameters::fwdWheelZPosition(int iWheel) const
 {
-  return m_rdb->fwdWheel(iWheel)->getDouble("ZPOSITION") * GeoModelKernelUnits::mm;
+  return m_rdb->fwdWheel(iWheel)->getDouble("ZPOSITION") * Gaudi::Units::mm;
 }
 
 // Returns +/-1 
@@ -167,19 +167,19 @@ SCT_ForwardParameters::fwdWheelModuleType(int iWheel, int iRing, int ec) const
 double
 SCT_ForwardParameters::fwdDiscSupportInnerRadius() const
 {
-  return m_rdb->fwdDiscSupport()->getDouble("INNERRADIUS") * GeoModelKernelUnits::mm;
+  return m_rdb->fwdDiscSupport()->getDouble("INNERRADIUS") * Gaudi::Units::mm;
 }
 
 double
 SCT_ForwardParameters::fwdDiscSupportOuterRadius() const
 {
-  return m_rdb->fwdDiscSupport()->getDouble("OUTERRADIUS") * GeoModelKernelUnits::mm;
+  return m_rdb->fwdDiscSupport()->getDouble("OUTERRADIUS") * Gaudi::Units::mm;
 }
  
 double
 SCT_ForwardParameters::fwdDiscSupportThickness() const
 {
-  return m_rdb->fwdDiscSupport()->getDouble("THICKNESS") * GeoModelKernelUnits::mm;
+  return m_rdb->fwdDiscSupport()->getDouble("THICKNESS") * Gaudi::Units::mm;
 }
 
 std::string
@@ -206,7 +206,7 @@ SCT_ForwardParameters::fwdPatchPanelType(int iLoc) const
 double
 SCT_ForwardParameters::fwdPatchPanelLocAngle(int iLoc) const
 {
-  return m_rdb->fwdPatchPanelLoc(iLoc)->getDouble("LOCANGLE") * GeoModelKernelUnits::degree;
+  return m_rdb->fwdPatchPanelLoc(iLoc)->getDouble("LOCANGLE") * Gaudi::Units::degree;
 }
 
 bool
@@ -224,26 +224,26 @@ SCT_ForwardParameters::fwdNumPatchPanelTypes() const
 double
 SCT_ForwardParameters::fwdPatchPanelThickness(int iType) const
 {
-  return m_rdb->fwdPatchPanel(iType)->getDouble("THICKNESS") * GeoModelKernelUnits::mm;
+  return m_rdb->fwdPatchPanel(iType)->getDouble("THICKNESS") * Gaudi::Units::mm;
 }
 
 double
 SCT_ForwardParameters::fwdPatchPanelMidRadius(int iType) const
 {
-  return m_rdb->fwdPatchPanel(iType)->getDouble("MIDRADIUS") * GeoModelKernelUnits::mm;
+  return m_rdb->fwdPatchPanel(iType)->getDouble("MIDRADIUS") * Gaudi::Units::mm;
 }
 
  
 double
 SCT_ForwardParameters::fwdPatchPanelDeltaR(int iType) const
 {
-  return m_rdb->fwdPatchPanel(iType)->getDouble("DELTAR") * GeoModelKernelUnits::mm;
+  return m_rdb->fwdPatchPanel(iType)->getDouble("DELTAR") * Gaudi::Units::mm;
 }
 
 double
 SCT_ForwardParameters::fwdPatchPanelRPhi(int iType) const
 {
-  return m_rdb->fwdPatchPanel(iType)->getDouble("RPHI") * GeoModelKernelUnits::mm;
+  return m_rdb->fwdPatchPanel(iType)->getDouble("RPHI") * Gaudi::Units::mm;
 }
 
 std::string
@@ -269,19 +269,19 @@ SCT_ForwardParameters::fwdPPConnectorPresent() const
 double
 SCT_ForwardParameters::fwdPPConnectorThickness() const
 {
-  return m_rdb->fwdPPConnector()->getDouble("THICKNESS") * GeoModelKernelUnits::mm;
+  return m_rdb->fwdPPConnector()->getDouble("THICKNESS") * Gaudi::Units::mm;
 }
 
 double
 SCT_ForwardParameters::fwdPPConnectorDeltaR() const
 {
-  return m_rdb->fwdPPConnector()->getDouble("DELTAR") * GeoModelKernelUnits::mm;
+  return m_rdb->fwdPPConnector()->getDouble("DELTAR") * Gaudi::Units::mm;
 }
 
 double
 SCT_ForwardParameters::fwdPPConnectorRPhi() const
 {
-  return m_rdb->fwdPPConnector()->getDouble("RPHI") * GeoModelKernelUnits::mm;
+  return m_rdb->fwdPPConnector()->getDouble("RPHI") * Gaudi::Units::mm;
 }
 
 std::string
@@ -307,19 +307,19 @@ SCT_ForwardParameters::fwdPPCoolingPresent() const
 double
 SCT_ForwardParameters::fwdPPCoolingThickness() const
 {
-  return m_rdb->fwdPPCooling()->getDouble("THICKNESS") * GeoModelKernelUnits::mm;
+  return m_rdb->fwdPPCooling()->getDouble("THICKNESS") * Gaudi::Units::mm;
 }
 
 double
 SCT_ForwardParameters::fwdPPCoolingDeltaR() const
 {
-  return m_rdb->fwdPPCooling()->getDouble("DELTAR") * GeoModelKernelUnits::mm;
+  return m_rdb->fwdPPCooling()->getDouble("DELTAR") * Gaudi::Units::mm;
 }
 
 double
 SCT_ForwardParameters::fwdPPCoolingRPhi() const
 {
-  return m_rdb->fwdPPCooling()->getDouble("RPHI") * GeoModelKernelUnits::mm;
+  return m_rdb->fwdPPCooling()->getDouble("RPHI") * Gaudi::Units::mm;
 }
 
 std::string
@@ -347,25 +347,25 @@ SCT_ForwardParameters::fwdCoolingBlockMainOrSecondary(int iType) const
 double
 SCT_ForwardParameters::fwdCoolingBlockDeltaR(int iType) const
 {
-  return m_rdb->fwdCoolingBlock(iType)->getDouble("DELTAR") * GeoModelKernelUnits::mm;
+  return m_rdb->fwdCoolingBlock(iType)->getDouble("DELTAR") * Gaudi::Units::mm;
 }
 
 double
 SCT_ForwardParameters::fwdCoolingBlockRPhi(int iType) const
 {
-  return m_rdb->fwdCoolingBlock(iType)->getDouble("RPHI") * GeoModelKernelUnits::mm;
+  return m_rdb->fwdCoolingBlock(iType)->getDouble("RPHI") * Gaudi::Units::mm;
 }
 
 double
 SCT_ForwardParameters::fwdCoolingBlockThickness(int iType) const
 {
-  return m_rdb->fwdCoolingBlock(iType)->getDouble("THICKNESS") * GeoModelKernelUnits::mm;
+  return m_rdb->fwdCoolingBlock(iType)->getDouble("THICKNESS") * Gaudi::Units::mm;
 }
 
 double
 SCT_ForwardParameters::fwdCoolingBlockOffsetFromDisc(int iType) const
 {
-  return m_rdb->fwdCoolingBlock(iType)->getDouble("OFFSETFROMDISC") * GeoModelKernelUnits::mm;
+  return m_rdb->fwdCoolingBlock(iType)->getDouble("OFFSETFROMDISC") * Gaudi::Units::mm;
 }
 
 std::string
@@ -381,19 +381,19 @@ SCT_ForwardParameters::fwdCoolingBlockMaterial(int iType) const
 double 
 SCT_ForwardParameters::fwdDiscPowerTapeInnerRadius(int iRing) const
 {
-  return m_rdb->fwdRingServices(iRing)->getDouble("POWERTAPEINNERRADIUS") * GeoModelKernelUnits::mm;
+  return m_rdb->fwdRingServices(iRing)->getDouble("POWERTAPEINNERRADIUS") * Gaudi::Units::mm;
 }
 
 double 
 SCT_ForwardParameters::fwdDiscPowerTapeOuterRadius(int iRing) const
 {
-  return m_rdb->fwdRingServices(iRing)->getDouble("POWERTAPEOUTERRADIUS") * GeoModelKernelUnits::mm;
+  return m_rdb->fwdRingServices(iRing)->getDouble("POWERTAPEOUTERRADIUS") * Gaudi::Units::mm;
 }
 
 double 
 SCT_ForwardParameters::fwdDiscPowerTapeThickness(int iRing) const
 {
-  return m_rdb->fwdRingServices(iRing)->getDouble("POWERTAPETHICKNESS") * GeoModelKernelUnits::mm;
+  return m_rdb->fwdRingServices(iRing)->getDouble("POWERTAPETHICKNESS") * Gaudi::Units::mm;
 }
 
 std::string
@@ -410,19 +410,19 @@ SCT_ForwardParameters::fwdDiscPowerTapeMaterial(int iRing) const
 double 
 SCT_ForwardParameters::fwdRingCoolingInnerRadius(int iRing) const
 {
-  return m_rdb->fwdRingServices(iRing)->getDouble("COOLINGINNERRADIUS") * GeoModelKernelUnits::mm;
+  return m_rdb->fwdRingServices(iRing)->getDouble("COOLINGINNERRADIUS") * Gaudi::Units::mm;
 }
 
 double 
 SCT_ForwardParameters::fwdRingCoolingOuterRadius(int iRing) const
 {
-  return m_rdb->fwdRingServices(iRing)->getDouble("COOLINGOUTERRADIUS") * GeoModelKernelUnits::mm;
+  return m_rdb->fwdRingServices(iRing)->getDouble("COOLINGOUTERRADIUS") * Gaudi::Units::mm;
 }
 
 double 
 SCT_ForwardParameters::fwdRingCoolingThickness(int iRing) const
 {
-  return m_rdb->fwdRingServices(iRing)->getDouble("COOLINGTHICKNESS") * GeoModelKernelUnits::mm;
+  return m_rdb->fwdRingServices(iRing)->getDouble("COOLINGTHICKNESS") * Gaudi::Units::mm;
 }
 
 std::string
@@ -448,13 +448,13 @@ SCT_ForwardParameters::fwdDiscFixationPresent() const
 double
 SCT_ForwardParameters::fwdDiscFixationThickness() const
 {
-  return m_rdb->fwdDiscFixation()->getDouble("THICKNESS") * GeoModelKernelUnits::mm;
+  return m_rdb->fwdDiscFixation()->getDouble("THICKNESS") * Gaudi::Units::mm;
 }
 
 double
 SCT_ForwardParameters::fwdDiscFixationRadius() const
 {
-  return m_rdb->fwdDiscFixation()->getDouble("RADIUS") * GeoModelKernelUnits::mm;
+  return m_rdb->fwdDiscFixation()->getDouble("RADIUS") * Gaudi::Units::mm;
 }
 
 std::string
@@ -469,25 +469,25 @@ SCT_ForwardParameters::fwdDiscFixationMaterial() const
 double 
 SCT_ForwardParameters::fwdSupportFrameRadialThickness() const
 {
-  return m_rdb->fwdServices()->getDouble("SUPPORTFRAMEDELTAR") * GeoModelKernelUnits::mm;
+  return m_rdb->fwdServices()->getDouble("SUPPORTFRAMEDELTAR") * Gaudi::Units::mm;
 }
 
 double 
 SCT_ForwardParameters::fwdSupportFrameInnerRadius() const
 {
-  return m_rdb->fwdServices()->getDouble("SUPPORTFRAMEINNERRAD") * GeoModelKernelUnits::mm;
+  return m_rdb->fwdServices()->getDouble("SUPPORTFRAMEINNERRAD") * Gaudi::Units::mm;
 }
 
 double 
 SCT_ForwardParameters::fwdSupportFrameZMin() const 
 {
-  return m_rdb->fwdServices()->getDouble("SUPPORTFRAMEZMIN") * GeoModelKernelUnits::mm;
+  return m_rdb->fwdServices()->getDouble("SUPPORTFRAMEZMIN") * Gaudi::Units::mm;
 }
 
 double 
 SCT_ForwardParameters::fwdSupportFrameZMax() const 
 {
-  return m_rdb->fwdServices()->getDouble("SUPPORTFRAMEZMAX") * GeoModelKernelUnits::mm;
+  return m_rdb->fwdServices()->getDouble("SUPPORTFRAMEZMAX") * Gaudi::Units::mm;
 } 
 
 std::string 
@@ -502,7 +502,7 @@ SCT_ForwardParameters::fwdSupportFrameMaterial() const
 double
 SCT_ForwardParameters::fwdCoolingPipeRadius() const
 {
-  return m_rdb->fwdServices()->getDouble("COOLINGPIPERADIUS") * GeoModelKernelUnits::mm;
+  return m_rdb->fwdServices()->getDouble("COOLINGPIPERADIUS") * Gaudi::Units::mm;
 }
 
 std::string
@@ -517,7 +517,7 @@ SCT_ForwardParameters::fwdCoolingPipeMaterial() const
 double
 SCT_ForwardParameters::fwdPowerTapeCrossSectArea() const
 {
-  return m_rdb->fwdServices()->getDouble("POWERTAPECROSSSECT") * GeoModelKernelUnits::mm2;
+  return m_rdb->fwdServices()->getDouble("POWERTAPECROSSSECT") * Gaudi::Units::mm2;
 }
 
 
@@ -539,21 +539,21 @@ SCT_ForwardParameters::fwdFSINumGeomTypes() const
 double
 SCT_ForwardParameters::fwdFSIGeomDeltaR(int iType) const
 {
-  return m_rdb->fwdFSIType(iType)->getDouble("DELTAR") * GeoModelKernelUnits::mm;
+  return m_rdb->fwdFSIType(iType)->getDouble("DELTAR") * Gaudi::Units::mm;
 }
 
 double
 SCT_ForwardParameters::fwdFSIGeomRPhi(int iType) const
 {
-  return m_rdb->fwdFSIType(iType)->getDouble("RPHI") * GeoModelKernelUnits::mm;
+  return m_rdb->fwdFSIType(iType)->getDouble("RPHI") * Gaudi::Units::mm;
 }
 
 double
 SCT_ForwardParameters::fwdFSIGeomThickness(int iType) const
 {
   // Fix for SCT-DC3-03. May be removed when ATLAS-DC3-07 is obsolete.
-  if (iType == 0 && m_rdb->versionTag() == "SCT-DC3-03") return  26*GeoModelKernelUnits::mm;
-  return m_rdb->fwdFSIType(iType)->getDouble("THICKNESS") * GeoModelKernelUnits::mm;
+  if (iType == 0 && m_rdb->versionTag() == "SCT-DC3-03") return  26*Gaudi::Units::mm;
+  return m_rdb->fwdFSIType(iType)->getDouble("THICKNESS") * Gaudi::Units::mm;
 }
 
 std::string
@@ -566,8 +566,8 @@ double
 SCT_ForwardParameters::fwdFSIGeomZOffset(int iType) const
 {
   // Fix for SCT-DC3-03. May be removed when ATLAS-DC3-07 is obsolete.
-  if (iType == 0 && m_rdb->versionTag() == "SCT-DC3-03") return  22*GeoModelKernelUnits::mm;
-  return m_rdb->fwdFSIType(iType)->getDouble("ZOFFSET") * GeoModelKernelUnits::mm;
+  if (iType == 0 && m_rdb->versionTag() == "SCT-DC3-03") return  22*Gaudi::Units::mm;
+  return m_rdb->fwdFSIType(iType)->getDouble("ZOFFSET") * Gaudi::Units::mm;
 }
 
 
@@ -616,7 +616,7 @@ SCT_ForwardParameters::fwdCylinderServiceLocName(int iLoc) const
 double
 SCT_ForwardParameters::fwdCylinderServiceLocAngle(int iLoc) const
 {
-  return m_rdb->fwdCylServLoc(iLoc)->getDouble("LOCANGLE") * GeoModelKernelUnits::degree;
+  return m_rdb->fwdCylServLoc(iLoc)->getDouble("LOCANGLE") * Gaudi::Units::degree;
 }
 
 int
@@ -640,13 +640,13 @@ SCT_ForwardParameters::fwdCylinderServiceMaterial(int iType) const
 double
 SCT_ForwardParameters::fwdCylinderServiceDeltaR(int iType) const
 {
-  return m_rdb->fwdCylServ(iType)->getDouble("DELTAR") * GeoModelKernelUnits::mm;
+  return m_rdb->fwdCylServ(iType)->getDouble("DELTAR") * Gaudi::Units::mm;
 }
 
 double
 SCT_ForwardParameters::fwdCylinderServiceRPhi(int iType) const
 {
-  return m_rdb->fwdCylServ(iType)->getDouble("RPHI") * GeoModelKernelUnits::mm;
+  return m_rdb->fwdCylServ(iType)->getDouble("RPHI") * Gaudi::Units::mm;
 }
 
 //
@@ -667,25 +667,25 @@ SCT_ForwardParameters::fwdThermalShieldMaterial(int iElement) const
 double
 SCT_ForwardParameters::fwdThermalShieldInnerRadius(int iElement) const
 {
-  return m_rdb->fwdThermalShield(iElement)->getDouble("INNERRADIUS") * GeoModelKernelUnits::mm;
+  return m_rdb->fwdThermalShield(iElement)->getDouble("INNERRADIUS") * Gaudi::Units::mm;
 }
 
 double 
 SCT_ForwardParameters::fwdThermalShieldOuterRadius(int iElement) const
 {
-  return m_rdb->fwdThermalShield(iElement)->getDouble("OUTERRADIUS") * GeoModelKernelUnits::mm;
+  return m_rdb->fwdThermalShield(iElement)->getDouble("OUTERRADIUS") * Gaudi::Units::mm;
 }
 
 double 
 SCT_ForwardParameters::fwdThermalShieldZMin(int iElement) const 
 {
-  return m_rdb->fwdThermalShield(iElement)->getDouble("ZMIN") * GeoModelKernelUnits::mm;
+  return m_rdb->fwdThermalShield(iElement)->getDouble("ZMIN") * Gaudi::Units::mm;
 }
 
 double 
 SCT_ForwardParameters::fwdThermalShieldZMax(int iElement) const 
 {
-  return m_rdb->fwdThermalShield(iElement)->getDouble("ZMAX") * GeoModelKernelUnits::mm;
+  return m_rdb->fwdThermalShield(iElement)->getDouble("ZMAX") * Gaudi::Units::mm;
 } 
 
 
@@ -701,31 +701,31 @@ SCT_ForwardParameters::fwdNumWheels() const
 double
 SCT_ForwardParameters::fwdInnerRadius() const
 {
-  return m_rdb->fwdGeneral()->getDouble("INNERRADIUS") * GeoModelKernelUnits::mm;
+  return m_rdb->fwdGeneral()->getDouble("INNERRADIUS") * Gaudi::Units::mm;
 }
 
 double
 SCT_ForwardParameters::fwdOuterRadius() const
 {
-  return m_rdb->fwdGeneral()->getDouble("OUTERRADIUS") * GeoModelKernelUnits::mm;
+  return m_rdb->fwdGeneral()->getDouble("OUTERRADIUS") * Gaudi::Units::mm;
 }
 
 double
 SCT_ForwardParameters::fwdZMin() const
 {
-  return m_rdb->fwdGeneral()->getDouble("ZMIN") * GeoModelKernelUnits::mm;
+  return m_rdb->fwdGeneral()->getDouble("ZMIN") * Gaudi::Units::mm;
 }
 
 double
 SCT_ForwardParameters::fwdZMax() const
 {
-  return m_rdb->fwdGeneral()->getDouble("ZMAX") * GeoModelKernelUnits::mm;
+  return m_rdb->fwdGeneral()->getDouble("ZMAX") * Gaudi::Units::mm;
 }
 
 double
 SCT_ForwardParameters::fwdTrtGapPos() const
 {
-  return m_rdb->fwdGeneral()->getDouble("TRTGAPPOS") * GeoModelKernelUnits::mm;
+  return m_rdb->fwdGeneral()->getDouble("TRTGAPPOS") * Gaudi::Units::mm;
 }
 
 //
@@ -751,19 +751,19 @@ SCT_ForwardParameters::fwdOptoHarnessDiscType(int index) const
 double 
 SCT_ForwardParameters::fwdOptoHarnessInnerRadius(int index) const
 {
-  return m_rdb->fwdOptoHarness(index)->getDouble("INNERRADIUS") * GeoModelKernelUnits::mm;
+  return m_rdb->fwdOptoHarness(index)->getDouble("INNERRADIUS") * Gaudi::Units::mm;
 }
 
 double 
 SCT_ForwardParameters::fwdOptoHarnessOuterRadius(int index) const
 {
-  return m_rdb->fwdOptoHarness(index)->getDouble("OUTERRADIUS") * GeoModelKernelUnits::mm;
+  return m_rdb->fwdOptoHarness(index)->getDouble("OUTERRADIUS") * Gaudi::Units::mm;
 }
 
 double 
 SCT_ForwardParameters::fwdOptoHarnessThickness(int index) const
 {
-  return m_rdb->fwdOptoHarness(index)->getDouble("THICKNESS") * GeoModelKernelUnits::mm;
+  return m_rdb->fwdOptoHarness(index)->getDouble("THICKNESS") * Gaudi::Units::mm;
 }
 
 std::string
diff --git a/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_FwdCoolingPipe.cxx b/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_FwdCoolingPipe.cxx
index 2365854c61dfe46327ee4adacf05ede013b499bb..bd06f571ebd0ef284f2fcd21af6af02499cbd7b5 100755
--- a/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_FwdCoolingPipe.cxx
+++ b/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_FwdCoolingPipe.cxx
@@ -12,7 +12,7 @@
 #include "GeoModelKernel/GeoTube.h"
 #include "GeoModelKernel/GeoLogVol.h"
 #include "GeoModelKernel/GeoPhysVol.h"
-#include "GeoModelKernel/Units.h"
+#include "GaudiKernel/PhysicalConstants.h"
 
 #include <cmath>
 
@@ -47,13 +47,13 @@ GeoVPhysVol *
 SCT_FwdCoolingPipe::build() 
 {
   // Calculate the dimensions.
-  // area = GeoModelKernelUnits::pi*(pipeRadius)^2 * numPipes
-  // also area = 2*GeoModelKernelUnits::pi*r_ave*delta_r approx= 2 * GeoModelKernelUnits::pi * rMin * delta_r
+  // area = Gaudi::Units::pi*(pipeRadius)^2 * numPipes
+  // also area = 2*Gaudi::Units::pi*r_ave*delta_r approx= 2 * Gaudi::Units::pi * rMin * delta_r
   // solve for delta_r
   // m_thickness = delta_r
 
-  double area = GeoModelKernelUnits::pi * sqr(m_pipeRadius) * m_numPipes;
-  m_thickness = area/(2. * GeoModelKernelUnits::pi * m_innerRadius);
+  double area = Gaudi::Units::pi * sqr(m_pipeRadius) * m_numPipes;
+  m_thickness = area/(2. * Gaudi::Units::pi * m_innerRadius);
   m_outerRadius = m_innerRadius +  m_thickness;
 
 
diff --git a/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_FwdCylinderServices.cxx b/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_FwdCylinderServices.cxx
index 75544a45403829787034d4fe4cee5abe506c3bc8..e8bf3e68b7cc0d35dd5984f9a73ca9e01c7693a8 100755
--- a/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_FwdCylinderServices.cxx
+++ b/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_FwdCylinderServices.cxx
@@ -17,17 +17,12 @@
 #include "GeoModelKernel/GeoPhysVol.h"
 #include "GeoModelKernel/GeoTransform.h"
 #include "GeoModelKernel/GeoMaterial.h"
-#include "GeoModelKernel/Units.h"
 #include "GeoModelKernel/GeoDefinitions.h"
-
-
-
+#include "GaudiKernel/SystemOfUnits.h"
 
 #include <sstream>
 #include <cmath>
 
-#include <iostream>
-
 SCT_FwdCylinderServices::SCT_FwdCylinderServices(const std::string & name,
                                                  double rmin,
                                                  double rmax,
@@ -136,7 +131,7 @@ SCT_FwdCylinderServices::build()
   double coolingDPhi = m_coolingRPhi / coolingRmin;
   const GeoCons* coolingShape = new GeoCons(coolingRmin, coolingRmin, coolingRmax1, coolingRmax2, 
                                             0.5 * m_length, 
-                                            -0.5 * coolingDPhi * GeoModelKernelUnits::radian, coolingDPhi * GeoModelKernelUnits::radian);
+                                            -0.5 * coolingDPhi * Gaudi::Units::radian, coolingDPhi * Gaudi::Units::radian);
   const GeoLogVol * coolingLog = new GeoLogVol("CoolingPipe", coolingShape, materials.getMaterialForVolume(m_coolingMaterialName, coolingShape->volume()));
   GeoPhysVol * coolingPipe = new GeoPhysVol(coolingLog);
 
@@ -146,7 +141,7 @@ SCT_FwdCylinderServices::build()
   double lmtRmax2 = lmtRmin + 1.8 * m_lmtDeltaR;
   double lmtDPhi = m_lmtRPhi / lmtRmin;
   const GeoCons* lmtShape = new GeoCons(lmtRmin, lmtRmin, lmtRmax1, lmtRmax2, 0.5 * m_length, 
-                                        -0.5 * lmtDPhi * GeoModelKernelUnits::radian, lmtDPhi * GeoModelKernelUnits::radian);
+                                        -0.5 * lmtDPhi * Gaudi::Units::radian, lmtDPhi * Gaudi::Units::radian);
   const GeoLogVol * lmtLog = new GeoLogVol("LMT", lmtShape, materials.getMaterialForVolume(m_lmtMaterialName,lmtShape->volume()));
   GeoPhysVol * lmt = new GeoPhysVol(lmtLog);
 
@@ -156,7 +151,7 @@ SCT_FwdCylinderServices::build()
   double lmtCoolingDPhi = m_lmtCoolingRPhi / lmtCoolingRmin;
   double lmtLength = m_length - 2. * m_lmtCoolingZOffset;
   const GeoTubs* lmtCoolingShape = new GeoTubs(lmtCoolingRmin, lmtCoolingRmax, 0.5 * lmtLength, 
-                                               -0.5 * lmtCoolingDPhi * GeoModelKernelUnits::radian, lmtCoolingDPhi * GeoModelKernelUnits::radian);
+                                               -0.5 * lmtCoolingDPhi * Gaudi::Units::radian, lmtCoolingDPhi * Gaudi::Units::radian);
   const GeoLogVol * lmtCoolingLog = new GeoLogVol("LMTCooling", lmtCoolingShape, materials.getMaterialForVolume(m_lmtCoolingMaterialName,lmtCoolingShape->volume()));
   GeoPhysVol * lmtCooling = new GeoPhysVol(lmtCoolingLog);
 
@@ -166,7 +161,7 @@ SCT_FwdCylinderServices::build()
   double fibreRmax2 = fibreRmin + 1.8 * m_fibreDeltaR;
   double fibreDPhi = m_fibreRPhi / fibreRmin;
   const GeoCons* fibreShape = new GeoCons(fibreRmin, fibreRmin, fibreRmax1, fibreRmax2, 0.5 * m_length,
-                                          -0.5 * fibreDPhi * GeoModelKernelUnits::radian, fibreDPhi * GeoModelKernelUnits::radian);
+                                          -0.5 * fibreDPhi * Gaudi::Units::radian, fibreDPhi * Gaudi::Units::radian);
   const GeoLogVol * fibreLog = new GeoLogVol("Fibres", fibreShape, materials.getMaterialForVolume(m_fibreMaterialName,fibreShape->volume()));
   GeoPhysVol * fibres = new GeoPhysVol(fibreLog);
 
@@ -175,7 +170,7 @@ SCT_FwdCylinderServices::build()
   double nPipeRmax = nPipeRmin + m_nPipeDeltaR;
   double nPipeDPhi = m_nPipeRPhi / nPipeRmin;
   const GeoTubs* nPipeShape = new GeoTubs(nPipeRmin, nPipeRmax, 0.5 * m_length, 
-                                          -0.5 * nPipeDPhi * GeoModelKernelUnits::radian, nPipeDPhi * GeoModelKernelUnits::radian);
+                                          -0.5 * nPipeDPhi * Gaudi::Units::radian, nPipeDPhi * Gaudi::Units::radian);
   const GeoLogVol * nPipeLog = new GeoLogVol("NPipe", nPipeShape, materials.getMaterialForVolume(m_nPipeMaterialName,nPipeShape->volume()));
   GeoPhysVol * nPipe = new GeoPhysVol(nPipeLog);
 
@@ -184,7 +179,7 @@ SCT_FwdCylinderServices::build()
   double railRmax = railRmin + m_railDeltaR;
   double railDPhi = m_railRPhi / railRmin;
   const GeoTubs* railShape = new GeoTubs(railRmin, railRmax,
-                                         0.5 * m_length, -0.5 * railDPhi * GeoModelKernelUnits::radian, railDPhi * GeoModelKernelUnits::radian);
+                                         0.5 * m_length, -0.5 * railDPhi * Gaudi::Units::radian, railDPhi * Gaudi::Units::radian);
   const GeoLogVol * railLog = new GeoLogVol("Rail", railShape, materials.getMaterialForVolume(m_railMaterialName,railShape->volume()));
   GeoPhysVol * rail = new GeoPhysVol(railLog);
 
@@ -193,16 +188,14 @@ SCT_FwdCylinderServices::build()
 
     // Cooling pipe
     for (unsigned int iLoc = 0; iLoc < m_coolingLocAngle.size(); iLoc++) {
-      double coolingAngle = m_coolingLocAngle[iLoc] + iquad * 90*GeoModelKernelUnits::degree;
-      //      std::cout << "Placing cooling pipe at " << coolingAngle / GeoModelKernelUnits::degree << " GeoModelKernelUnits::degrees" << std::endl;
+      double coolingAngle = m_coolingLocAngle[iLoc] + iquad * 90*Gaudi::Units::degree;
       cylinder->add(new GeoTransform(GeoTrf::RotateZ3D(coolingAngle)));
       cylinder->add(coolingPipe);
     }
 
     // Low Mass Tapes and LMT Cooling are at same phi positions
     for (unsigned int iLoc = 0; iLoc < m_lmtLocAngle.size(); iLoc++) {
-      double lmtAngle = m_lmtLocAngle[iLoc] + iquad * 90*GeoModelKernelUnits::degree;
-      //      std::cout << "Placing LMT at " << lmtAngle / GeoModelKernelUnits::degree << " GeoModelKernelUnits::degrees" << std::endl;
+      double lmtAngle = m_lmtLocAngle[iLoc] + iquad * 90*Gaudi::Units::degree;
       cylinder->add(new GeoTransform(GeoTrf::RotateZ3D(lmtAngle)));
       cylinder->add(lmt);
       cylinder->add(new GeoTransform(GeoTrf::RotateZ3D(lmtAngle)*GeoTrf::TranslateZ3D(m_lmtCoolingZOffset)));
@@ -211,24 +204,21 @@ SCT_FwdCylinderServices::build()
 
     // Fibres are between pairs of LMTs
     for (unsigned int iLoc = 0; iLoc < m_fibreLocAngle.size(); iLoc++) {
-      double fibreAngle = m_fibreLocAngle[iLoc] + iquad * 90*GeoModelKernelUnits::degree;
-      //      std::cout << "Placing fibres at " << fibreAngle / GeoModelKernelUnits::degree << " GeoModelKernelUnits::degrees" << std::endl;
+      double fibreAngle = m_fibreLocAngle[iLoc] + iquad * 90*Gaudi::Units::degree;
       cylinder->add(new GeoTransform(GeoTrf::RotateZ3D(fibreAngle)));
       cylinder->add(fibres);
     }
 
     // N2 Pipes
     for (unsigned int iLoc = 0; iLoc < m_nPipeLocAngle.size(); iLoc++) {
-      double nPipeAngle = m_nPipeLocAngle[iLoc] + iquad * 90*GeoModelKernelUnits::degree;
-      //      std::cout << "Placing N2 pipe at " << nPipeAngle / GeoModelKernelUnits::degree << " GeoModelKernelUnits::degrees" << std::endl;
+      double nPipeAngle = m_nPipeLocAngle[iLoc] + iquad * 90*Gaudi::Units::degree;
       cylinder->add(new GeoTransform(GeoTrf::RotateZ3D(nPipeAngle)));
       cylinder->add(nPipe);
     }
 
     // Rails
     for (unsigned int iLoc = 0; iLoc < m_railLocAngle.size(); iLoc++) {
-      double railAngle = m_railLocAngle[iLoc] + iquad * 90*GeoModelKernelUnits::degree;
-      //      std::cout << "Placing rail at " << railAngle / GeoModelKernelUnits::degree << " GeoModelKernelUnits::degrees" << std::endl;
+      double railAngle = m_railLocAngle[iLoc] + iquad * 90*Gaudi::Units::degree;
       cylinder->add(new GeoTransform(GeoTrf::RotateZ3D(railAngle)));
       cylinder->add(rail);
     }
diff --git a/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_FwdHybrid.cxx b/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_FwdHybrid.cxx
index 761b82e5d9d4bfb09830841a8ce4976dc523a73f..99b73df0b4d4e3ca155b3e1961da9f682eccab2b 100755
--- a/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_FwdHybrid.cxx
+++ b/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_FwdHybrid.cxx
@@ -28,12 +28,10 @@
 #include "GeoModelKernel/GeoTransform.h"
 #include "GeoModelKernel/GeoAlignableTransform.h"
 #include "GeoModelKernel/GeoMaterial.h"
-#include "GeoModelKernel/Units.h"
+#include "GaudiKernel/SystemOfUnits.h"
 
 #include "GeoModelKernel/GeoDefinitions.h"
 
-
-
 #include <cmath>
 
 
@@ -54,9 +52,9 @@ SCT_FwdHybrid::getParameters()
 
   m_materialName  = parameters->fwdHybridMaterial();
 
-  //double GeoModelKernelUnits::radlength;
-  //GeoModelKernelUnits::radlength = 18.8 * GeoModelKernelUnits::cm;
-  // [GeoModelKernelUnits::cm] for carbon (Partickle Physics Booklet)
+  //double Gaudi::Units::radlength;
+  //Gaudi::Units::radlength = 18.8 * Gaudi::Units::cm;
+  // [Gaudi::Units::cm] for carbon (Partickle Physics Booklet)
 
   m_thickness  = parameters->fwdHybridThickness();
   m_thickness2 = m_thickness;
@@ -105,7 +103,7 @@ GeoVPhysVol * SCT_FwdHybrid::build()
     position = -1 * position;  };
   
   double rotation = 0.;
-  if (m_ringType == 0)  rotation = 180. * GeoModelKernelUnits::deg;  
+  if (m_ringType == 0)  rotation = 180. * Gaudi::Units::deg;  
   
   const GeoShape & hybridPos2 = (*hybridShape1 << GeoTrf::RotateX3D(rotation)
                       << GeoTrf::TranslateZ3D(position) );
@@ -114,7 +112,6 @@ GeoVPhysVol * SCT_FwdHybrid::build()
   SCT_MaterialManager materials;
   const GeoShapeUnion & hybridShape = hybridPos1.add(hybridPos2);
   // error getting volume directly.
-  //m_material = materials.getMaterialForVolume(m_materialName, hybridShape.volume());
   m_material = materials.getMaterialForVolume(m_materialName, hybridShape1->volume()+hybridShape2->volume());
   const GeoLogVol * hybridLog = new GeoLogVol(getName(), &hybridShape, m_material);
   GeoPhysVol * hybrid = new GeoPhysVol(hybridLog);
diff --git a/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_FwdModule.cxx b/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_FwdModule.cxx
index 7c5baa4f2af3f18d3289ded5ce1c8ac49a39a911..c1170044dc732543df542cc07246e476227a0414 100755
--- a/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_FwdModule.cxx
+++ b/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_FwdModule.cxx
@@ -38,10 +38,7 @@
 #include "GeoModelKernel/GeoAlignableTransform.h"
 #include "GeoModelKernel/GeoMaterial.h"
 #include "GeoModelKernel/GeoDefinitions.h"
-#include "GeoModelKernel/Units.h"
-
-
-
+#include "GaudiKernel/SystemOfUnits.h"
 
 #include <cmath>
 #include <sstream>
@@ -85,7 +82,6 @@ void
 SCT_FwdModule::getParameters()
 {
   const SCT_ForwardModuleParameters * parameters = geometryManager()->forwardModuleParameters();
-  // m_safety = geometryManager()->safety();
   m_glueThickness = parameters->fwdModuleGlueThickness(m_ringType);
   m_distBtwMountPoints = parameters->fwdModuleDistBtwMountPoints(m_ringType);
   m_mountPointToCenter = parameters->fwdModuleMountPoint(m_ringType);
@@ -104,42 +100,42 @@ const GeoLogVol * SCT_FwdModule::preBuild()
   const SCT_GeneralParameters * generalParameters = geometryManager()->generalParameters();
   
   double safety = generalParameters->safety();
-  double safetyTmp = safety * GeoModelKernelUnits::cm; // For compatibility with minor bug in older version - safety already in CLHEP units;
+  double safetyTmp = safety * Gaudi::Units::cm; // For compatibility with minor bug in older version - safety already in CLHEP units;
 
-  // module_length = (zhyb->hyby - zhyb->hybysh + zsmi[m_ringType].mountd2 + 0.33 ) * GeoModelKernelUnits::cm + safety;
+  // module_length = (zhyb->hyby - zhyb->hybysh + zsmi[m_ringType].mountd2 + 0.33 ) * Gaudi::Units::cm + safety;
   // Distance from outer bybrid edge to outer spine edge.
-  // FIXME: The 1.05GeoModelKernelUnits::mm is not needed
-  double moduleLength = m_hybrid->mountPointToOuterEdge() + m_mountPointToCenter + m_spine->moduleCenterToEnd() + 1.05 * GeoModelKernelUnits::mm;
+  // FIXME: The 1.05Gaudi::Units::mm is not needed
+  double moduleLength = m_hybrid->mountPointToOuterEdge() + m_mountPointToCenter + m_spine->moduleCenterToEnd() + 1.05 * Gaudi::Units::mm;
   m_length = moduleLength + safety; // We add a bit of safety for the envelope
 
-  //  module_thickness = (zhyb->hybz0 * 2 + safety) * GeoModelKernelUnits::cm;
+  //  module_thickness = (zhyb->hybz0 * 2 + safety) * Gaudi::Units::cm;
   double sensorEnvelopeThickness = 2 * m_sensor->thickness() + m_spine->thickness() + 2 * m_glueThickness;
   m_thickness = std::max(sensorEnvelopeThickness,  m_hybrid->thickness());
 
-  // module_widthInner = ((zsmo->subdq + zssp[m_ringType].ssp0l + 0.325) * 2.+ 0.7 + safety)*GeoModelKernelUnits::cm;   // upto to NOVA_760
-  // module_widthOuter = ((zsmo->subdq + zssp[m_ringType].ssp2l + 0.325) * 2.+ 0.7 + safety)*GeoModelKernelUnits::cm;   // upto to NOVA_760
+  // module_widthInner = ((zsmo->subdq + zssp[m_ringType].ssp0l + 0.325) * 2.+ 0.7 + safety)*Gaudi::Units::cm;   // upto to NOVA_760
+  // module_widthOuter = ((zsmo->subdq + zssp[m_ringType].ssp2l + 0.325) * 2.+ 0.7 + safety)*Gaudi::Units::cm;   // upto to NOVA_760
   
-  //module_widthInner = ((zsmo->subdq + zssp[m_ringType].ssp0l) * 2.+ 0.7 + safety)*GeoModelKernelUnits::cm;
-  //module_widthOuter = ((zsmo->subdq + zssp[m_ringType].ssp2l) * 2.+ 0.7 + safety)*GeoModelKernelUnits::cm;
+  //module_widthInner = ((zsmo->subdq + zssp[m_ringType].ssp0l) * 2.+ 0.7 + safety)*Gaudi::Units::cm;
+  //module_widthOuter = ((zsmo->subdq + zssp[m_ringType].ssp2l) * 2.+ 0.7 + safety)*Gaudi::Units::cm;
   
-  m_widthInner = (m_spine->width() + 2 * m_subspineL->innerWidth() + 0.7*GeoModelKernelUnits::cm) + safetyTmp; 
-  m_widthOuter = (m_spine->width() + 2 * m_subspineL->outerWidth() + 0.7*GeoModelKernelUnits::cm) + safetyTmp; 
+  m_widthInner = (m_spine->width() + 2 * m_subspineL->innerWidth() + 0.7*Gaudi::Units::cm) + safetyTmp; 
+  m_widthOuter = (m_spine->width() + 2 * m_subspineL->outerWidth() + 0.7*Gaudi::Units::cm) + safetyTmp; 
   
 
 
   if (m_ringType == 3 ) {
-    //  module_widthOuter = (( zsmo->subdq + zssp[m_ringType].ssp2l + 0.325) * 2.+ 1.6 + safety)*GeoModelKernelUnits::cm;  // upto to NOVA_760
-    //  module_widthOuter = (( zsmo->subdq + zssp[m_ringType].ssp2l) * 2.+ 1.6 + safety)*GeoModelKernelUnits::cm; 
-    m_widthOuter = m_spine->width() + 2 * m_subspineL->outerWidth() + 1.6*GeoModelKernelUnits::cm + safetyTmp; 
+    //  module_widthOuter = (( zsmo->subdq + zssp[m_ringType].ssp2l + 0.325) * 2.+ 1.6 + safety)*Gaudi::Units::cm;  // upto to NOVA_760
+    //  module_widthOuter = (( zsmo->subdq + zssp[m_ringType].ssp2l) * 2.+ 1.6 + safety)*Gaudi::Units::cm; 
+    m_widthOuter = m_spine->width() + 2 * m_subspineL->outerWidth() + 1.6*Gaudi::Units::cm + safetyTmp; 
   }  
     
   // Calculate module shift. Distance between module physics center and center of envelope.  
   int hybridSign =  m_hybridIsOnInnerEdge ? +1: -1;
-  //module_shift = (zhyb->hyby - zhyb->hybysh + zsmi[m_ringType].mountd + 0.05)*GeoModelKernelUnits::cm;
+  //module_shift = (zhyb->hyby - zhyb->hybysh + zsmi[m_ringType].mountd + 0.05)*Gaudi::Units::cm;
   //module_shift = hybrid * (module_length / 2. - module_shift);
 
-  double moduleCenterToHybridOuterEdge = m_hybrid->mountPointToOuterEdge() + m_mountPointToCenter + 0.5*GeoModelKernelUnits::mm;
-  //FIXME: Should be: (ie don't need the 0.5GeoModelKernelUnits::mm)
+  double moduleCenterToHybridOuterEdge = m_hybrid->mountPointToOuterEdge() + m_mountPointToCenter + 0.5*Gaudi::Units::mm;
+  //FIXME: Should be: (ie don't need the 0.5Gaudi::Units::mm)
   // double moduleCenterToHybridOuterEdge = m_hybrid->mountPointToOuterEdge() + m_mountPointToCenter ;
   m_moduleShift = hybridSign * (0.5 * m_length - moduleCenterToHybridOuterEdge);
 
@@ -196,7 +192,7 @@ GeoVPhysVol * SCT_FwdModule::build(SCT_Identifier id) const
   rotation = 0.5 * m_stereoAngle;
   GeoTrf::Translation3D vecB(positionX,0,0);
   // Rotate so that X axis goes from backside to implant side 
-  GeoTrf::Transform3D rotB = GeoTrf::RotateX3D(rotation)*GeoTrf::RotateZ3D(180*GeoModelKernelUnits::degree);
+  GeoTrf::Transform3D rotB = GeoTrf::RotateX3D(rotation)*GeoTrf::RotateZ3D(180*Gaudi::Units::degree);
   // First translate in z (only non-zero for truncated middle)
   // Then rotate and then translate in x.
   GeoAlignableTransform *bottomTransform
@@ -223,7 +219,7 @@ GeoVPhysVol * SCT_FwdModule::build(SCT_Identifier id) const
   positionX=-positionX;
   rotation=-rotation;
   GeoTrf::RotateX3D rotT(rotation);
-  //rotT.rotateZ(180*GeoModelKernelUnits::degree); // Rotate so that X axis goes from implant side to backside 
+  //rotT.rotateZ(180*Gaudi::Units::degree); // Rotate so that X axis goes from implant side to backside 
   GeoTrf::Translation3D vecT(positionX,0,0);
   // First translate in z (only non-zero for truncated middle)
   // Then rotate and then translate in x.
diff --git a/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_FwdModuleConnector.cxx b/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_FwdModuleConnector.cxx
index d2428723b1e563db1698818b1d929e412ce32b8b..5ba0a82cba9aef8700f98ee1584593d333ad7a09 100755
--- a/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_FwdModuleConnector.cxx
+++ b/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_FwdModuleConnector.cxx
@@ -14,10 +14,9 @@
 #include "GeoModelKernel/GeoPhysVol.h"
 #include "GeoModelKernel/GeoShape.h"
 #include "GeoModelKernel/GeoShapeShift.h"
-#include "GeoModelKernel/Units.h"
+#include "GaudiKernel/SystemOfUnits.h"
 
 #include <cmath>
-#include <iostream>
 
 SCT_FwdModuleConnector::SCT_FwdModuleConnector(const std::string & name, int ringType)
   : SCT_SharedComponentFactory(name), m_ringType(ringType)
@@ -47,8 +46,6 @@ SCT_FwdModuleConnector::build()
   // Construct box
   const GeoBox * moduleConnShape = new GeoBox(0.5 * m_thickness, 0.5 * m_rphi, 0.5 * m_deltaR);
   m_material = materials.getMaterialForVolume(m_materialName, moduleConnShape->volume());
-  //  std::cout << "Material = " << m_material->getName() << std::endl;
-  //  std::cout << "Density = " << m_material->getDensity()/(gram/GeoModelKernelUnits::cm3) << std::endl;
 
   // Shift to correct position within module
   double xposition = 0.5 * (parameters->fwdHybridThickness() + m_thickness);
diff --git a/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_FwdOptoHarness.cxx b/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_FwdOptoHarness.cxx
index 422f0087e19c0869b35b9a8c25d6aba30f589e71..0a25774b19791a3b6b913a2cd812fc19c7a86f29 100755
--- a/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_FwdOptoHarness.cxx
+++ b/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_FwdOptoHarness.cxx
@@ -12,7 +12,7 @@
 #include "GeoModelKernel/GeoTube.h"
 #include "GeoModelKernel/GeoLogVol.h"
 #include "GeoModelKernel/GeoPhysVol.h"
-#include "GeoModelKernel/Units.h"
+#include "GaudiKernel/SystemOfUnits.h"
 
 #include <cmath>
 #include <iostream>
@@ -56,9 +56,6 @@ SCT_FwdOptoHarness::build()
 
   const GeoTube * optoHarnessShape = new GeoTube(m_innerRadius, m_outerRadius, 0.5 * m_thickness);
   m_material = materials.getMaterialForVolume(m_materialName, optoHarnessShape->volume());
-  //  m_material = materials.getMaterial(m_materialName);
-  //  cout << "Material = " << m_material->getName() << endl;
-  //  cout << "Density = " << m_material->getDensity()/(gram/GeoModelKernelUnits::cm3) << endl;
   const GeoLogVol * optoHarnessLog = new GeoLogVol(getName(), optoHarnessShape, m_material);
 
   GeoPhysVol * optoHarness = new GeoPhysVol(optoHarnessLog);
diff --git a/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_FwdPowerTape.cxx b/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_FwdPowerTape.cxx
index 136cd3e68c9e3e7b2d40af2281d2e8cc8bbab7f5..26eb848821793cc0bfb53e27f94541722c5f25ea 100755
--- a/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_FwdPowerTape.cxx
+++ b/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_FwdPowerTape.cxx
@@ -12,7 +12,7 @@
 #include "GeoModelKernel/GeoTube.h"
 #include "GeoModelKernel/GeoLogVol.h"
 #include "GeoModelKernel/GeoPhysVol.h"
-#include "GeoModelKernel/Units.h"
+#include "GaudiKernel/PhysicalConstants.h"
 
 #include <cmath>
 
@@ -45,11 +45,11 @@ GeoVPhysVol *
 SCT_FwdPowerTape::build() 
 {
   // Calculate the dimensions.
-  // The area = 2*GeoModelKernelUnits::pi*r_ave*delta_r approx= 2 * GeoModelKernelUnits::pi * rMin * delta_r
+  // The area = 2*Gaudi::Units::pi*r_ave*delta_r approx= 2 * Gaudi::Units::pi * rMin * delta_r
   // where m_thickness = delta_r
 
   double area = m_crossSectArea * m_numModules;
-  m_thickness = area/(2. * GeoModelKernelUnits::pi * m_innerRadius);
+  m_thickness = area/(2. * Gaudi::Units::pi * m_innerRadius);
   m_outerRadius = m_innerRadius +  m_thickness;
 
   // Make the support disk. A simple tube.
diff --git a/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_FwdRing.cxx b/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_FwdRing.cxx
index d7194c036ad7787c3eb47ef65bc32839b9d35c79..4ba75ed8c4e9051e0f8d2b1475c1f4915daf7fe7 100755
--- a/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_FwdRing.cxx
+++ b/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_FwdRing.cxx
@@ -25,10 +25,8 @@
 #include "GeoModelKernel/GeoAlignableTransform.h"
 #include "GeoModelKernel/GeoMaterial.h"
 #include "GeoModelKernel/GeoShapeShift.h"
-#include "GeoModelKernel/Units.h"
 #include "GeoModelKernel/GeoDefinitions.h"
-
-
+#include "GaudiKernel/PhysicalConstants.h"
 
 #include <sstream>
 #include <cmath>
@@ -36,19 +34,11 @@
 inline double sqr(double x) {return x*x;}
 
 SCT_FwdRing::SCT_FwdRing(const std::string & name, 
-                         //int ringType, 
                          const SCT_FwdModule * module, 
-                         //const SCT_FwdRingCooling * cooling,
-                         //int stereoSign,
-                         //int ringSide)
                          int iWheel,
                          int iRing,
                          int ec)
   : SCT_UniqueComponentFactory(name), 
-    //    m_ringType(ringType), 
-    // m_ringSide(ringSide), 
-    //m_stereoSign(stereoSign), 
-    //m_cooling(cooling)
     m_iWheel(iWheel),
     m_iRing(iRing),
     m_endcap(ec),
@@ -96,14 +86,6 @@ SCT_FwdRing::~SCT_FwdRing()
 const GeoLogVol * 
 SCT_FwdRing::preBuild()
 {
-  //   std::cout << getName() << std::endl;
-  //   std::cout << "Wheel, Ring = " << m_iWheel << ", " << m_iRing << std::endl;
-  //   std::cout << "m_module->thickness() = " << m_module->thickness() << std::endl;
-  //   std::cout << "m_moduleStagger = " << m_moduleStagger << std::endl;
-  //   std::cout << "m_refStartAngle = " << m_refStartAngle << std::endl;
-  //   std::cout << "m_refFirstStagger = " << m_refFirstStagger << std::endl;
-  //   std::cout << "m_ringOffset = " << m_ringOffset << std::endl;
-
   // Make a ring. This is made of two half rings. They are identical but as
   // we need different identifiers they are made seperately.
   // We will refer to the two halves as inner and outer.
@@ -128,8 +110,8 @@ SCT_FwdRing::preBuild()
   // If disc is rotated then recalculate the angle.
   // It assumed the disc is rotated around the Y axis.  
   // TODO: Check this assumption. 
-  if (m_discRotated) angle = GeoModelKernelUnits::pi - angle;
-  double divisionAngle = 2*GeoModelKernelUnits::pi / m_numModules;
+  if (m_discRotated) angle = Gaudi::Units::pi - angle;
+  double divisionAngle = 2*Gaudi::Units::pi / m_numModules;
 
   // Now we choose module 0 as the first module with -0.5 * divAngle <  phi <=  0.5 * divAngle   
   double moduleCount = angle / divisionAngle;
@@ -140,7 +122,7 @@ SCT_FwdRing::preBuild()
   // Determine numbering for -ve endcap.
   // This is for a rotation around Y axis.
   // After rotation we want the first module closest to phi = 0.
-  double angleNegEC = GeoModelKernelUnits::pi - m_startAngle; 
+  double angleNegEC = Gaudi::Units::pi - m_startAngle; 
   double moduleCountNegEC = angleNegEC / divisionAngle;
   m_moduleZero = static_cast<int>(floor(moduleCountNegEC + 0.5 - 0.0001));
   
@@ -149,35 +131,17 @@ SCT_FwdRing::preBuild()
   m_firstStagger = m_refFirstStagger;
   if (moduleCountInt % 2) m_firstStagger = -m_refFirstStagger;
 
-  //   std::cout << "RingType, RingSide, Stereo, rotated = " << m_iRing << " " << m_ringSide << " "
-  //          << m_stereoSign << " " << m_discRotated << std::endl;
-  //   std::cout << "Ref   Start angle and stagger " << m_refStartAngle/GeoModelKernelUnits::deg << " " << m_refFirstStagger << std::endl;
-  //   std::cout << "First Start angle and stagger " << m_startAngle/GeoModelKernelUnits::deg << " " << m_firstStagger << std::endl;
-  //   std::cout << "Module zero in -ve endcap " << m_moduleZero << std::endl;
-
-
   makeModuleServices();
 
   // Make envelope for ring
-  double moduleClearanceZ = 0.6 * GeoModelKernelUnits::mm; // Arbitrary choice
-  double moduleClearanceR = 0.5 * GeoModelKernelUnits::mm; 
+  double moduleClearanceZ = 0.6 * Gaudi::Units::mm; // Arbitrary choice
+  double moduleClearanceR = 0.5 * Gaudi::Units::mm; 
 
   m_innerRadius = m_module->innerRadius() - 0.5*m_module->stereoAngle()*(0.5*m_module->innerWidth()) - moduleClearanceR;
   m_outerRadius = sqrt(sqr(m_module->outerRadius()) + sqr(0.5*m_module->outerWidth())) 
     + 0.5*m_module->stereoAngle()*(0.5*m_module->outerWidth()) + moduleClearanceR;
 
   // Calculate clearance we have. NB. This is an approximate.
-  //std::cout << "Module clearance (radial value does not take into account stereo rotation:" << std::endl;
-  //std::cout << " radial: " << moduleClearanceR/GeoModelKernelUnits::mm << " mm" << std::endl;
-  //std::cout << " away from disc in z " << moduleClearanceZ/GeoModelKernelUnits::mm << " mm" << std::endl;
-  //std::cout << " Lo Module to cooling block: " << -m_moduleStagger-0.5*m_module->thickness() - m_moduleServicesLoOuterZPos << std::endl;
-  //std::cout << " Hi Module to cooling block: " << +m_moduleStagger-0.5*m_module->thickness() - m_moduleServicesHiOuterZPos << std::endl;
-  //std::cout << " Module to Module: " << m_moduleStagger-m_module->thickness() << std::endl;
-  //std::cout << " towards disc in z "   
-  //     << std::min(m_moduleStagger-m_module->thickness(), 
-  //   std::min(-m_moduleStagger-0.5*m_module->thickness() - m_moduleServicesLoOuterZPos,
-  //     +m_moduleStagger-0.5*m_module->thickness() - m_moduleServicesHiOuterZPos)) / GeoModelKernelUnits::mm << " mm" << std::endl;
-
   m_thicknessOuter = 0.5 * m_module->thickness() + m_moduleStagger + moduleClearanceZ;
   m_thicknessInner = m_maxModuleServicesBaseToRingCenter + 2*m_safety;
   // We have to at least include 1*m_safety as the moduleservices envelope is increased by this amount.
@@ -193,11 +157,7 @@ SCT_FwdRing::preBuild()
   const GeoShape & ringEnvelopeShape = (*tmpShape <<  GeoTrf::Translate3D(0, 0, envelopeShift));
   GeoLogVol * ringLog = new GeoLogVol(getName(), &ringEnvelopeShape, materials.gasMaterial());
 
-  //std::cout << "m_innerRadius = " << m_innerRadius << std::endl;
-  //std::cout << "m_outerRadius = " << m_outerRadius << std::endl;
-
   return ringLog;
-
 }
 
 
@@ -209,7 +169,7 @@ SCT_FwdRing::build(SCT_Identifier id) const
   // Physical volume for the half ring
   GeoPhysVol * ring = new GeoPhysVol(m_logVolume);
   
-  double deltaPhi = 360*GeoModelKernelUnits::degree / m_numModules;
+  double deltaPhi = 360*Gaudi::Units::degree / m_numModules;
   bool negativeEndCap = (id.getBarrelEC() < 0);
   
   for (int i = 0; i < m_numModules; i++){
@@ -239,15 +199,6 @@ SCT_FwdRing::build(SCT_Identifier id) const
       idModule = (m_numModules + m_moduleZero - idNumber) % m_numModules; 
     }
 
-    //std::cout << "Endcap# = " <<id.getBarrelEC() 
-    //       << ", idModule = " << idModule 
-    //        << ", idModuleSimulation = " <<  idModuleSimulation 
-    //       << ", idModule2 = " << (idModuleSimulation & 0xffff)
-    //       << ", max    = " << ((idModuleSimulation & 0x00ff0000) >> 16)
-    //       << ", moduleZero = " << ((idModuleSimulation & 0xff000000) >> 24)
-    //       << std::endl;
-
-    
     // The module is a TRD with length along z-axis. 
     // We need to rotate this so length is along the y-axis
     // This can be achieved with a 90 deg rotation around Y. 
@@ -261,16 +212,11 @@ SCT_FwdRing::build(SCT_Identifier id) const
 
     double phi = i * deltaPhi + m_startAngle;
 
-    //std::cout << "Endcap# = " <<id.getBarrelEC() 
-    //       << ", idModule = " << idModule 
-    //       << ", i = " << i 
-    //       << ", phi = " << phi/GeoModelKernelUnits::degree << std::endl;
-
     GeoTrf::Transform3D rot = GeoTrf::RotateZ3D(phi + 0.5 * m_module->stereoAngle() * m_stereoSign);
     if (m_ringSide > 0) {
-      rot = rot*GeoTrf::RotateX3D(180*GeoModelKernelUnits::degree);
+      rot = rot*GeoTrf::RotateX3D(180*Gaudi::Units::degree);
     }
-    rot = rot*GeoTrf::RotateY3D(90*GeoModelKernelUnits::degree);
+    rot = rot*GeoTrf::RotateY3D(90*Gaudi::Units::degree);
     
     double zPos =  staggerUpperLower * m_moduleStagger * m_ringSide;
     GeoTrf::Vector3D xyz(m_module->sensorCenterRadius(), 0, zPos);
diff --git a/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_FwdSensor.cxx b/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_FwdSensor.cxx
index a681a2f0291dde7d5f2a3dc23f65d3de5a4ad7b1..c8cd1d7aa2eb08f2ce1bb6d2c5a7d4cd466683df 100755
--- a/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_FwdSensor.cxx
+++ b/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_FwdSensor.cxx
@@ -31,12 +31,10 @@
 #include "GeoModelKernel/GeoTransform.h"
 #include "GeoModelKernel/GeoAlignableTransform.h"
 #include "GeoModelKernel/GeoMaterial.h"
-#include "GeoModelKernel/Units.h"
+#include "GaudiKernel/SystemOfUnits.h"
 
 #include "GeoModelKernel/GeoDefinitions.h"
 
-
-
 #include "InDetReadoutGeometry/SCT_DetectorManager.h"
 #include "InDetReadoutGeometry/SCT_ForwardModuleSideDesign.h"
 #include "InDetReadoutGeometry/SiDetectorElement.h"
@@ -115,23 +113,10 @@ SCT_FwdSensor::getParameters()
     m_sensorOffset = m_radiusF - m_sensorRadius;
   }
   
-  //std::cout << "SCT_FwdSensor : " << std::endl;
-  //std::cout << "  ringType = " << m_ringType << std::endl;
-  //std::cout << "  sensorCenterRadius = " << m_sensorRadius << std::endl;
-  //std::cout << "  innerRadius = " << m_innerRadius << std::endl;
-  //std::cout << "  outerRadius = " << m_outerRadius << std::endl;
-
-
-   
-
   // The thickness of the two are the same, but to be pedantic.
   m_thickness = std::max(m_thicknessF, m_thicknessN);
-
-
 }
 
-
-
 const GeoLogVol * SCT_FwdSensor::preBuild()
 {
 
@@ -282,11 +267,6 @@ void SCT_FwdSensor::makeDesign()
      
   double step = parameters->fwdSensorAngularPitch(m_ringType);
 
-  /* 
-     std::cout << "ZB -----------------" << cells << " " << std::endl;
-     std::cout << radius1 << "  " << radius2 << "  " << halfHeight1 << "  " << halfHeight2 << std::endl;
-  */
-
   // Readout direction is same direction as local phi direction for outer module
   // and the opposite direction for inner and middle module.
   bool swapStripReadout = (m_ringType != 0); // ie false for outer module only.
@@ -316,10 +296,10 @@ void SCT_FwdSensor::makeDesign()
   // This is the default and no action is required. 
   // Can force axes not to be swapped by setting to false.
   // 
-  // bool phiSyGeoModelKernelUnits::mmetric = true;
-  // bool etaSyGeoModelKernelUnits::mmetric = false; 
-  // bool depthSyGeoModelKernelUnits::mmetric = true;
-  // m_design->setSyGeoModelKernelUnits::mmetry(phiSyGeoModelKernelUnits::mmetric, etaSyGeoModelKernelUnits::mmetric, depthSyGeoModelKernelUnits::mmetric,
+  // bool phiSyGaudi::Units::mmetric = true;
+  // bool etaSyGaudi::Units::mmetric = false; 
+  // bool depthSyGaudi::Units::mmetric = true;
+  // m_design->setSyGaudi::Units::mmetry(phiSyGaudi::Units::mmetric, etaSyGaudi::Units::mmetric, depthSyGaudi::Units::mmetric,
   //
 
 }
@@ -348,7 +328,6 @@ GeoVPhysVol *SCT_FwdSensor::build(SCT_Identifier id) const
     detectorManager()->addDetectorElement(detElement);
 
   } else {
-    // std::cout << " ZB --> build - warning" << std::endl;
     static bool noElementWarning = true; // So we don't get the message thousands of times.
     if (noElementWarning) {
       std::cout << "WARNING!!!!: No SCT id helper and so no elements being produced." << std::endl;
diff --git a/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_FwdSpine.cxx b/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_FwdSpine.cxx
index 7e01fc5b52f6548cf046ae052a65d293b794ec40..6c6f13e57d7c97994394c4e5ce1405c1373e2f74 100755
--- a/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_FwdSpine.cxx
+++ b/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_FwdSpine.cxx
@@ -24,16 +24,11 @@
 #include "GeoModelKernel/GeoShape.h"
 #include "GeoModelKernel/GeoShapeShift.h"
 #include "GeoModelKernel/GeoShapeUnion.h"
-
-#include "GeoModelKernel/Units.h"
-
 #include "GeoModelKernel/GeoDefinitions.h"
-
-
+#include "GaudiKernel/SystemOfUnits.h"
 
 #include <cmath>
 
-
 SCT_FwdSpine::SCT_FwdSpine(const std::string & name,
          int ringType)
   : SCT_SharedComponentFactory(name), m_ringType(ringType)
@@ -70,7 +65,7 @@ SCT_FwdSpine::getParameters()
     - parameters->fwdHybridMountPointToInnerEdge()
     - parameters->fwdModuleHybridEdgeToSpine(m_ringType);
    
-  // (zssp[m_ringType].spndox + zsmi[m_ringType].mountd - zhyb->hybysh - zhyb->hybgap0) * GeoModelKernelUnits::cm;
+  // (zssp[m_ringType].spndox + zsmi[m_ringType].mountd - zhyb->hybysh - zhyb->hybgap0) * Gaudi::Units::cm;
 
 }
 
diff --git a/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_FwdWheel.cxx b/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_FwdWheel.cxx
index c28934fe5d36caf00e71f560ac3c946e98596fe3..a8df7a8d0623536f9115c4109e9a7f963ef76d2d 100755
--- a/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_FwdWheel.cxx
+++ b/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_FwdWheel.cxx
@@ -37,11 +37,8 @@
 #include "GeoModelKernel/GeoAlignableTransform.h"
 #include "GeoModelKernel/GeoMaterial.h"
 #include "GeoModelKernel/GeoShapeShift.h"
-#include "GeoModelKernel/Units.h"
 #include "GeoModelKernel/GeoDefinitions.h"
-
-
-
+#include "GaudiKernel/SystemOfUnits.h"
 
 #include <sstream>
 #include <cmath>
@@ -111,12 +108,12 @@ SCT_FwdWheel::getParameters()
 
   // FIXME: Check and put these in DB or calculate them
   // We have a maximum width of 80.2. Make it 75 for some clearance.
-  //m_innerRadius = 267 * GeoModelKernelUnits::mm;
-  //m_outerRadius = 590 * GeoModelKernelUnits::mm;
-  //m_thickness = 100 * GeoModelKernelUnits::mm;
+  //m_innerRadius = 267 * Gaudi::Units::mm;
+  //m_outerRadius = 590 * Gaudi::Units::mm;
+  //m_thickness = 100 * Gaudi::Units::mm;
   // These get swapped later if the wheel is rotated.
-  m_thicknessFront = 30 * GeoModelKernelUnits::mm;
-  m_thicknessBack  = 45 * GeoModelKernelUnits::mm;
+  m_thicknessFront = 30 * Gaudi::Units::mm;
+  m_thicknessBack  = 45 * Gaudi::Units::mm;
 
   m_numFSITypes = parameters->fwdFSINumGeomTypes();
   m_fsiVector =  &(parameters->fsiVector(m_iWheel));
@@ -207,7 +204,7 @@ SCT_FwdWheel::preBuild()
   // If first or last wheel there is nothing protruding beyond the rings so we reduce the
   // envelope size. Comes to about 20 mm. Note the front becomes the back later for the last wheel.
   if ((m_iWheel == 0) || (m_iWheel == m_numWheels - 1)) {
-     m_thicknessFront = maxModuleThickness + 1*GeoModelKernelUnits::mm; // We give plenty of safety as we have the room.
+     m_thicknessFront = maxModuleThickness + 1*Gaudi::Units::mm; // We give plenty of safety as we have the room.
   // But now modified by disc fixations
      if(m_discFixationPresent) {
        m_thicknessFront = std::max(m_thicknessFront,m_discFixation->radius() + m_safety);
@@ -238,23 +235,14 @@ SCT_FwdWheel::preBuild()
     m_thicknessBack  = tmp;
   }
   
-  //  std::cout << " Wheel front thickness = "   << m_thicknessFront << std::endl;
-  //  std::cout << " Wheel back thickness = "   << m_thicknessBack << std::endl;
   m_thickness =  m_thicknessFront +  m_thicknessBack;
 
-
-
   m_innerRadius = minInnerRadius - m_safety;
   m_outerRadius = maxOuterRadius + m_safety;
 
   // TODO. Have to account for FSI and patch panels
   //m_thickness   = 2. * maxRingOffset + maxThickness; 
-  // m_thickness  = 100 * GeoModelKernelUnits::mm;
-
-  //  std::cout << "Wheel " << m_iWheel << ":" << std::endl;
-  //  std::cout << " innerRadius = " << m_innerRadius << std::endl;
-  //  std::cout << " outerRadius = " << m_outerRadius << std::endl;
-  //  std::cout << " thickness = "   << m_thickness << std::endl;
+  // m_thickness  = 100 * Gaudi::Units::mm;
 
   // Make envelope for the wheel
   SCT_MaterialManager materials;
@@ -274,9 +262,6 @@ SCT_FwdWheel::preBuild()
 GeoVPhysVol * 
 SCT_FwdWheel::build(SCT_Identifier id) const
 {
-
-  //std::cout << "SCT_FwdWheel: Building Wheel "  << m_iWheel << std::endl;
-
   GeoFullPhysVol * wheel = new GeoFullPhysVol(m_logVolume);
 
   // Add discsupport. Its centered so no need for a transform
@@ -296,14 +281,8 @@ SCT_FwdWheel::build(SCT_Identifier id) const
 
     // Position ring
     double ringZpos = ring->ringSide() * ring->ringOffset(); 
-    //    std::cout << "Wheel, ring = " << m_iWheel << ", " << iRing << std::endl;
-    //    std::cout << " ringZpos, thickness = " <<  ringZpos << ", " <<  ring->thickness() << std::endl;
     double ringOuterZ = ring->ringOffset() +  ring->thicknessOuter();
-    //    std::cout << " ring outer z = " <<  ringOuterZ << std::endl;
     maxZOfRingsFront = std::max(maxZOfRingsFront, ringOuterZ);
-    //    std::cout << " ring inner radius = " <<  ring->innerRadius() << std::endl;
-    //    std::cout << " ring outer radius = " <<  ring->outerRadius() << std::endl;
-
 
     std::string ringNameTag = "Ring#" + intToString(ring->identifier());
     wheel->add(new GeoNameTag(ringNameTag));
@@ -317,7 +296,6 @@ SCT_FwdWheel::build(SCT_Identifier id) const
     SCT_FwdRingCooling cooling("RingCoolingW"+intToString(m_iWheel)+"R"+intToString(iRing),
                                iRing);
     double coolingZpos = ring->ringSide() * (0.5*(m_discSupport->thickness() + cooling.thickness()));
-    //std::cout << "coolingZpos, thickness = " <<  coolingZpos << ", " <<  cooling->thickness() << std::endl;
     wheel->add(new GeoTransform(GeoTrf::TranslateZ3D(coolingZpos)));
     wheel->add(cooling.getVolume());
  
@@ -328,8 +306,6 @@ SCT_FwdWheel::build(SCT_Identifier id) const
 
     double powerTapeZpos = ring->ringSide() * (0.5*(m_discSupport->thickness() + powerTape.thickness()) +
                                                cooling.thickness());
-    //std::cout << "powerTapeZpos, thickness = " <<  powerTapeZpos << ", " <<  powerTape->thickness() << std::endl;
-
     // Make sure we don't overlap with powertape from outer rings
     // We store max extent of power tape for each side (Plus, Minus)
     // This is really only ever an issue for ring2 but we keep it general.
@@ -337,24 +313,18 @@ SCT_FwdWheel::build(SCT_Identifier id) const
       double powerTapeZstart = powerTapeZpos -  0.5 * powerTape.thickness();
       if (powerTapeZstart < powerTapeZPlusMax) {
         powerTapeZpos = powerTapeZPlusMax +  0.5 * powerTape.thickness();
-        //std::cout << "Moving power tape!!!" << std::endl;
       }
       powerTapeZPlusMax = powerTapeZpos +  0.5 * powerTape.thickness();
     } else {
       double powerTapeZstart = powerTapeZpos +  0.5 * powerTape.thickness();
       if (powerTapeZstart > powerTapeZMinusMax) {
         powerTapeZpos = powerTapeZMinusMax -  0.5 * powerTape.thickness();
-        //std::cout << "Moving power tape!!!" << std::endl;
       }
       powerTapeZMinusMax = powerTapeZpos -  0.5 * powerTape.thickness();
     }
     if ((std::abs(powerTapeZpos)+0.5*powerTape.thickness()) > (std::abs(ringZpos) -  0.5*ring->thicknessInner())) {
       std::cout << "ERROR:  Power tapes clash with modules!!!" << std::endl; 
     }
-    //std::cout << "  powertape max " << std::abs(powerTapeZpos)+0.5*powerTape.thickness() << std::endl;
-    //std::cout << "  modules min " <<  std::abs(ringZpos) -  0.5*ring->thicknessInner() << std::endl;
- 
-    //std::cout << "new powerTapeZpos, thickness = " <<  powerTapeZpos << ", " <<  powerTape->thickness() << std::endl;
     wheel->add(new GeoTransform(GeoTrf::TranslateZ3D(powerTapeZpos)));
     wheel->add(powerTape.getVolume());
   
@@ -391,7 +361,7 @@ SCT_FwdWheel::build(SCT_Identifier id) const
     for (int iRepeat = 0; iRepeat < numRepeat; iRepeat++) {
   
       // Calculate the location.
-      double patchPanelAngle = m_patchPanelLocAngle[iPPLoc] + iRepeat * 90*GeoModelKernelUnits::degree;
+      double patchPanelAngle = m_patchPanelLocAngle[iPPLoc] + iRepeat * 90*Gaudi::Units::degree;
       double patchPanelZpos =  patchPanelSide * (powerTapeZMax + 0.5*m_patchPanel[ppType]->thickness() + m_safety);
       double patchPanelR = m_patchPanel[ppType]->midRadius();
 
@@ -445,9 +415,7 @@ SCT_FwdWheel::build(SCT_Identifier id) const
   // Add the optoharness - type depends on number of rings
   // The optoharness is always on the back side (except if the wheel is rotates)
   double optoHarnessZMax = 0.5 * m_discSupport->thickness();
-  if (!m_optoHarnessPresent) {
-    //std::cout << "SCT_FwdOptoHarness not built" << std::endl;
-  } else {
+  if (m_optoHarnessPresent) {
     std::string optoharnessName = "OptoHarnessO";
     if(m_numRings > 1) {optoharnessName+="M";}
     if(m_numRings > 2) {optoharnessName+="I";}
@@ -467,19 +435,6 @@ SCT_FwdWheel::build(SCT_Identifier id) const
     int fsiSide =   fsiUsualSide * m_rotateWheel;
     double fsiZpos = fsiSide * m_fsiType[type]->zOffset(); 
 
-    //   std::cout << "Placing FSI. Type: " << type << ", "  
-    //        << "Sim type: " << (*m_fsiVector)[iFSI]->simTypeString() << ", "
-    //        << "Actual type: " << (*m_fsiVector)[iFSI]->actualType() << ", "
-    //        << "Loc type: " << (*m_fsiVector)[iFSI]->locationType() << ", "
-    //        << "Radius(mm): " << fsiRadius/GeoModelKernelUnits::mm << ", "
-    //        << "Phi(deg): " << fsiPhi/GeoModelKernelUnits::deg << ", "
-    //        << "Thickness(mm): " << m_fsiType[type]->thickness() << ", "
-    //        << "ZOffset(mm): " << m_fsiType[type]->zOffset() << ", "
-    //        << "RPhi(mm): " << m_fsiType[type]->rphi() << ", "
-    //        << "DeltaR(mm): " << m_fsiType[type]->deltaR()
-    //        << std::endl;
-
-
     // Check for clashes on front side
     if (fsiUsualSide < 0) {
       double zMin =  std::abs(fsiZpos) -  0.5*m_fsiType[type]->thickness(); 
@@ -515,7 +470,7 @@ SCT_FwdWheel::build(SCT_Identifier id) const
       // The disc fixations repeat in the four quadrants.
       for (int iRepeat = 0; iRepeat < 4; iRepeat++) {
         // Calculate the location.
-        double discFixationAngle = m_discFixationLocAngle[iLoc] + iRepeat * 90*GeoModelKernelUnits::degree;
+        double discFixationAngle = m_discFixationLocAngle[iLoc] + iRepeat * 90*Gaudi::Units::degree;
         double discFixationR = m_ringMaxRadius + 0.5*m_discFixation->thickness() + m_safety;
         // Check is within wheel
         if (discFixationR + 0.5*m_discFixation->thickness() >= m_outerRadius) {
@@ -524,7 +479,7 @@ SCT_FwdWheel::build(SCT_Identifier id) const
           std::cout << " Wheel outer radius: " << m_outerRadius << std::endl;
         }
        // Add it to the wheel
-        wheel->add(new GeoTransform(GeoTrf::RotateY3D(90.*GeoModelKernelUnits::degree)*GeoTrf::RotateX3D(discFixationAngle)*GeoTrf::TranslateZ3D(discFixationR)));
+        wheel->add(new GeoTransform(GeoTrf::RotateY3D(90.*Gaudi::Units::degree)*GeoTrf::RotateX3D(discFixationAngle)*GeoTrf::TranslateZ3D(discFixationR)));
         wheel->add(m_discFixation->getVolume());
       }
     }
diff --git a/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_GeneralParameters.cxx b/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_GeneralParameters.cxx
index f5ae06e737864ffeb8a0381c10b4e145c0118d10..cd861f5e53325c686e460e3f88f98c6b1a284258 100755
--- a/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_GeneralParameters.cxx
+++ b/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_GeneralParameters.cxx
@@ -6,14 +6,11 @@
 #include "SCT_GeoModel/SCT_DataBase.h"
 #include "RDBAccessSvc/IRDBRecord.h"
 #include "RDBAccessSvc/IRDBRecordset.h"
-#include "GeoModelKernel/Units.h"
+#include "GaudiKernel/SystemOfUnits.h"
 #include "GeoModelKernel/GeoDefinitions.h"
 #include "InDetGeoModelUtils/TopLevelPlacements.h"
 
-#include <iostream>
-
-
-const double SCT_SAFETY = 0.01 * GeoModelKernelUnits::mm; // Used in some places to make envelopes slightly larger to ensure
+const double SCT_SAFETY = 0.01 * Gaudi::Units::mm; // Used in some places to make envelopes slightly larger to ensure
                                      // no overlaps due to rounding errors.
 
 
@@ -62,9 +59,9 @@ double
 SCT_GeneralParameters::temperature() const
 {
   if (m_rdb->conditionsTable()->size() == 0) {
-    return 266.15 * GeoModelKernelUnits::kelvin; // -7 C
+    return 266.15 * Gaudi::Units::kelvin; // -7 C
   }
-  return (m_rdb->conditions()->getDouble("TEMPERATURE") + 273.15) * GeoModelKernelUnits::kelvin;
+  return (m_rdb->conditions()->getDouble("TEMPERATURE") + 273.15) * Gaudi::Units::kelvin;
 }
 
 
@@ -72,18 +69,18 @@ double
 SCT_GeneralParameters::biasVoltage() const
 {
   if (m_rdb->conditionsTable()->size() == 0) {
-    return 100 * GeoModelKernelUnits::volt;
+    return 100 * Gaudi::Units::volt;
   }
-  return m_rdb->conditions()->getDouble("BIASVOLT") * GeoModelKernelUnits::volt;
+  return m_rdb->conditions()->getDouble("BIASVOLT") * Gaudi::Units::volt;
 }
 
 double 
 SCT_GeneralParameters::depletionVoltage() const
 {
   if (m_rdb->conditionsTable()->size() == 0) {
-    return 20 * GeoModelKernelUnits::volt;
+    return 20 * Gaudi::Units::volt;
   }
-  return m_rdb->conditions()->getDouble("DEPLETIONVOLT") * GeoModelKernelUnits::volt;
+  return m_rdb->conditions()->getDouble("DEPLETIONVOLT") * Gaudi::Units::volt;
 }
 
 
diff --git a/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_InnerSide.cxx b/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_InnerSide.cxx
index b30430ed63fc0866dfe37422f720fedbf7f6ce6f..c350e121281a8be185265854862f8fc9344cb7dd 100755
--- a/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_InnerSide.cxx
+++ b/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_InnerSide.cxx
@@ -33,7 +33,7 @@
 #include "GeoModelKernel/GeoShapeUnion.h"
 #include "GeoModelKernel/GeoShapeShift.h"
 #include "GeoModelKernel/GeoDefinitions.h"
-#include "GeoModelKernel/Units.h"
+#include "GaudiKernel/SystemOfUnits.h"
 
 #include <cmath>
 
@@ -141,8 +141,8 @@ SCT_InnerSide::preBuild()
   //
   // Shown is the outer side. The inner side is the same but with a rotation of 180 deg around the z-axis.       
   // 
-  //GeoModelKernelUnits::HepRotation rotSensor;
-  //rotSensor.rotateZ(180*GeoModelKernelUnits::deg);
+  //Gaudi::Units::HepRotation rotSensor;
+  //rotSensor.rotateZ(180*Gaudi::Units::deg);
   //m_outerSidePos = new GeoTrf::Transform3D(rotOuter, GeoTrf::Vector3D(0.5 * (m_sensorGap + sectThickness), 0., 0.));
   //m_sensorPos = new GeoTransform(GeoTrf::Transform3D(rotSensor, GeoTrf::Vector3D(sensorPosX, sensorPosY, sensorPosZ)));
   m_sensorPos             = new GeoTransform(GeoTrf::Translate3D(sensorPosX, sensorPosY, sensorPosZ));
diff --git a/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_InterLink.cxx b/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_InterLink.cxx
index a9694cdbc6893f09724ed807a2bb2ef505c1fa58..d30351c0efc8830695fc7d7b123a3a799379ab36 100755
--- a/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_InterLink.cxx
+++ b/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_InterLink.cxx
@@ -14,7 +14,7 @@
 #include "GeoModelKernel/GeoLogVol.h"
 #include "GeoModelKernel/GeoPhysVol.h"
 #include "GeoModelKernel/GeoTransform.h"
-#include "GeoModelKernel/Units.h"
+#include "GaudiKernel/SystemOfUnits.h"
 
 SCT_InterLink::SCT_InterLink(const std::string & name)
   : SCT_SharedComponentFactory(name),
@@ -109,13 +109,13 @@ SCT_InterLink::build()
     m_interLink->ref();
 
     // Interlink segments:
-    m_interLinkSegShape = new GeoTubs(m_innerRadius, m_outerRadius, 0.5*m_length, - 0.5*m_dPhi*GeoModelKernelUnits::radian, m_dPhi*GeoModelKernelUnits::radian);
+    m_interLinkSegShape = new GeoTubs(m_innerRadius, m_outerRadius, 0.5*m_length, - 0.5*m_dPhi*Gaudi::Units::radian, m_dPhi*Gaudi::Units::radian);
     m_interLinkSegLog = new GeoLogVol("InterlinkSegment", m_interLinkSegShape, materials.getMaterialForVolume(m_materialName, m_interLinkSegShape->volume()));
     m_interLinkSeg = new GeoPhysVol(m_interLinkSegLog);
     m_interLinkSeg->ref();
 
     for(int i=0; i<m_nRepeat; i++) {
-      double interlinkAngle = m_phiPos + (i * 360./m_nRepeat)*GeoModelKernelUnits::deg;
+      double interlinkAngle = m_phiPos + (i * 360./m_nRepeat)*Gaudi::Units::deg;
       GeoTransform* geoTransform = new GeoTransform(GeoTrf::RotateZ3D(interlinkAngle));
       m_geoTransforms.push_back(geoTransform);
       m_interLink->add(geoTransform);
@@ -123,13 +123,13 @@ SCT_InterLink::build()
     }
 
     // B6 bearings
-    m_bearingShape = new GeoTubs(m_innerRadiusBearing, m_outerRadiusBearing, 0.5*m_lengthBearing, - 0.5*m_dPhiBearing*GeoModelKernelUnits::radian, m_dPhiBearing*GeoModelKernelUnits::radian);
+    m_bearingShape = new GeoTubs(m_innerRadiusBearing, m_outerRadiusBearing, 0.5*m_lengthBearing, - 0.5*m_dPhiBearing*Gaudi::Units::radian, m_dPhiBearing*Gaudi::Units::radian);
     m_bearingLog = new GeoLogVol("Bearing", m_bearingShape, materials.getMaterialForVolume(m_materialNameBearing, m_bearingShape->volume()));
     m_bearing = new GeoPhysVol(m_bearingLog);
     m_bearing->ref();
 
     for(int i=0; i<m_nRepeatBearing; i++) {
-      double bearingAngle = m_phiPosBearing + (i * 360./m_nRepeatBearing)*GeoModelKernelUnits::deg;
+      double bearingAngle = m_phiPosBearing + (i * 360./m_nRepeatBearing)*Gaudi::Units::deg;
       GeoTransform* geoTransform = new GeoTransform(GeoTrf::RotateZ3D(bearingAngle));
       m_geoTransforms.push_back(geoTransform);
       m_interLink->add(geoTransform);
@@ -139,15 +139,15 @@ SCT_InterLink::build()
     // FSI Flange segments:
     // These exactly fill gaps between interlink segments, with smaller radial extent
     if(m_includeFSIFlange) {
-      double dPhiFSI = (360./m_nRepeat)*GeoModelKernelUnits::deg - m_dPhi; 
-      m_FSIFlangeShape = new GeoTubs(m_innerRadiusFSIFlange, m_outerRadiusFSIFlange, 0.5*m_length, - 0.5*dPhiFSI*GeoModelKernelUnits::radian, dPhiFSI*GeoModelKernelUnits::radian);
+      double dPhiFSI = (360./m_nRepeat)*Gaudi::Units::deg - m_dPhi; 
+      m_FSIFlangeShape = new GeoTubs(m_innerRadiusFSIFlange, m_outerRadiusFSIFlange, 0.5*m_length, - 0.5*dPhiFSI*Gaudi::Units::radian, dPhiFSI*Gaudi::Units::radian);
       m_FSIFlangeLog = new GeoLogVol("FSIFlangeSegment", m_FSIFlangeShape, materials.getMaterialForVolume(m_materialNameFSIFlange, m_FSIFlangeShape->volume()));
       m_FSIFlange = new GeoPhysVol(m_FSIFlangeLog);
       m_FSIFlange->ref();
 
       for(int i=0; i<m_nRepeat; i++) {
-        double phiPosFSI = m_phiPos + (180./m_nRepeat)*GeoModelKernelUnits::deg;
-        double FSIFlangeAngle = phiPosFSI + (i * 360./m_nRepeat)*GeoModelKernelUnits::deg;
+        double phiPosFSI = m_phiPos + (180./m_nRepeat)*Gaudi::Units::deg;
+        double FSIFlangeAngle = phiPosFSI + (i * 360./m_nRepeat)*Gaudi::Units::deg;
         GeoTransform* geoTransform = new GeoTransform(GeoTrf::RotateZ3D(FSIFlangeAngle));
         m_geoTransforms.push_back(geoTransform);
         m_interLink->add(geoTransform);
diff --git a/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_Layer.cxx b/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_Layer.cxx
index d8fbdccbe6902c355b5320a2f810b84a31c71c04..451ca68a6f01989e7fc82434222c8f2dfa5a2dc7 100755
--- a/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_Layer.cxx
+++ b/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_Layer.cxx
@@ -40,7 +40,7 @@
 #include "GeoModelKernel/GeoMaterial.h"
 #include "GeoModelKernel/GeoShapeSubtraction.h"
 #include "GeoModelKernel/GeoDefinitions.h"
-#include "GeoModelKernel/Units.h"
+#include "GaudiKernel/SystemOfUnits.h"
 
 #include <sstream>
 #include <cmath>
@@ -108,11 +108,6 @@ SCT_Layer::getParameters()
   detectorManager()->numerology().setNumPhiModulesForLayer(m_iLayer,m_skisPerLayer);
   detectorManager()->numerology().setNumEtaModulesForLayer(m_iLayer,parameters->modulesPerSki());
 
-  //  std::cout << "In SCT_Layer:" << std::endl;
-  //  std::cout << " skisPerLayer = " << m_skisPerLayer << std::endl;
-  //  std::cout << " radius = " << m_radius << std::endl;
-  //  std::cout << " tilt = " << m_tilt << std::endl;
-
 }
 
 
@@ -136,7 +131,6 @@ SCT_Layer::preBuild()
     m_endJewel   = new SCT_FSIEndJewel("FSIEndJewel"+layerNumStr);
     m_scorpion   = new SCT_FSIScorpion("FSIScorpion"+layerNumStr);
     double length_mask = 0.5*m_cylinderLength - m_flange->length() - m_zScorpion - 0.5*m_scorpion->length();
-    //    std::cout << "length_mask = " << length_mask << std::endl;
     m_fibreMask = new SCT_FSIFibreMask("FSIFibreMask"+layerNumStr, m_iLayer, length_mask);
   }
   else {
@@ -149,7 +143,7 @@ SCT_Layer::preBuild()
   // Calculations for making active layer components - called ski.
   // This is the modules + doglegs + cooling blocks + coolingpipe 
   // 
-  double divisionAngle  = 360 * GeoModelKernelUnits::degree / m_skisPerLayer;
+  double divisionAngle  = 360 * Gaudi::Units::degree / m_skisPerLayer;
 
   // We define here the first module(id = 0) as the nearest module to phi = 0 with positive phi.
   // We allow slightly negative in case of rounding errors.
@@ -199,7 +193,7 @@ SCT_Layer::preBuild()
   // Build the volume representing the cooling inlets, outlet and U-bends.
   // We cannot do this until we have the dimensions of the clamp
   double coolingInnerRadius = m_clamp->outerRadius();
-  double clearance = 1*GeoModelKernelUnits::mm;
+  double clearance = 1*Gaudi::Units::mm;
   double coolingLength = 0.5*m_cylinderLength - 0.5*m_activeLength - clearance;
   m_coolingEnd = new SCT_CoolingEnd("CoolingEnd"+layerNumStr, m_iLayer, coolingInnerRadius, coolingLength);
 
@@ -247,10 +241,6 @@ SCT_Layer::preBuild()
   //  if (m_iLayer == 0) {length = m_cylinderLength + m_safety;}
   const GeoTube * layerEnvelopeTube = new GeoTube(m_innerRadius, m_outerRadius, 0.5 * length);
 
-  //  std::cout << "Layer " << m_iLayer << " envelope, rmin, rmax, length = " 
-  //       << m_innerRadius << ", " <<m_outerRadius << ", " << length
-  //       << std::endl;
-
   GeoLogVol * layerLog = new GeoLogVol(getName(), layerEnvelopeTube, materials.gasMaterial());
 
 
@@ -271,16 +261,13 @@ SCT_Layer::build(SCT_Identifier id) const
   // We make this a fullPhysVol for alignment code.
   GeoFullPhysVol * layer = new GeoFullPhysVol(m_logVolume);
 
-  double divisionAngle  = 360 * GeoModelKernelUnits::degree / m_skisPerLayer;
+  double divisionAngle  = 360 * Gaudi::Units::degree / m_skisPerLayer;
 
   //
   // Active Layer
   //
   // Make envelope for active layer
   //
-  //  std::cout << "Making Active Layer: rmin,rmax,len = " << m_innerRadiusActive 
-  //       << " " << m_outerRadiusActive << " " << 0.5 * m_cylinderLength 
-  //       << std::endl;
   const GeoTube * activeLayerEnvelopeShape = new GeoTube(m_innerRadiusActive, m_outerRadiusActive, 0.5 * m_cylinderLength);
   GeoLogVol * activeLayerLog = new GeoLogVol(getName()+"Active", activeLayerEnvelopeShape, materials.gasMaterial());
   GeoPhysVol * activeLayer = new GeoPhysVol(activeLayerLog);
@@ -290,8 +277,6 @@ SCT_Layer::build(SCT_Identifier id) const
    
     double phi = m_skiPhiStart + iSki * divisionAngle;
 
-    //    std::cout << "m_skiPhiStart = " << m_skiPhiStart/GeoModelKernelUnits::degree << ", phi = " << phi/GeoModelKernelUnits::degree << std::endl;
-
     GeoTrf::Vector3D pos(m_radius, 0, 0);
     pos = GeoTrf::RotateZ3D(phi)*pos;
     GeoTrf::Transform3D rot = GeoTrf::RotateZ3D(m_tilt)*GeoTrf::RotateZ3D(phi);
@@ -300,8 +285,6 @@ SCT_Layer::build(SCT_Identifier id) const
     // apply the inverse of refPointTransform() of the ski.
     GeoTrf::Transform3D trans(GeoTrf::Transform3D(GeoTrf::Translate3D(pos.x(),pos.y(),pos.z())*rot) * m_ski->getRefPointTransform()->getTransform().inverse());
 
-    //    std::cout << "Adding ski at pos: " << pos << std::endl;
-    //    std::cout << " StereoInner = " << m_module->stereoInner() << std::endl;
     activeLayer->add(new GeoAlignableTransform(trans));
     activeLayer->add(new GeoNameTag(name.str()));
     activeLayer->add(new GeoIdentifierTag(iSki));
@@ -326,9 +309,6 @@ SCT_Layer::build(SCT_Identifier id) const
   // Aux Layer
   // Envelope for brackets and powertapes.
   //
-  //  std::cout << "Making Aux Layer: rmin,rmax,len = " << m_skiAux->innerRadius() 
-  //     << " " << m_skiAux->outerRadius() << " " << 0.5 * m_skiAux->length() 
-  //       << std::endl;
   const GeoTube * auxLayerEnvelopeShape = new GeoTube(m_skiAux->innerRadius(), m_skiAux->outerRadius(),
                                                       0.5*m_skiAux->length());
   GeoLogVol * auxLayerLog = new GeoLogVol(getName()+"Aux", auxLayerEnvelopeShape, materials.gasMaterial());
@@ -349,9 +329,6 @@ SCT_Layer::build(SCT_Identifier id) const
   // Envelope for support cylinder, flanges and FSI.
   // Layer0 no longer needs cut-out 
   //
-  //  std::cout << "Making Support Layer: rmin,rmax,len = " << m_innerRadius 
-  //       << " " << m_outerRadiusOfSupport << " " << 0.5 * m_cylinderLength 
-  //       << std::endl;
   const GeoTube * supportLayerTube = new GeoTube(m_innerRadius, m_outerRadiusOfSupport, 0.5 * m_cylinderLength); 
   GeoLogVol * supportLayerLog = new GeoLogVol(getName()+"Support", supportLayerTube, 
                                               materials.gasMaterial());
@@ -377,10 +354,8 @@ SCT_Layer::build(SCT_Identifier id) const
 
     // Position FSI End jewels
     double jewelRadius = std::sqrt(m_fibreMask->innerRadius()*m_fibreMask->innerRadius() - 0.25 * m_endJewel->rPhiWidth()*m_endJewel->rPhiWidth()) - 0.5 * m_endJewel->radialWidth();
-    //  std::cout << "jewelRadius = " << jewelRadius << std::endl;
     for ( int i=0; i<m_nRepeatEndJewel; i++) {
-      double jewelAngle = m_phiEndJewel + i * 360.*GeoModelKernelUnits::degree/m_nRepeatEndJewel;
-      //    std::cout << "jewelAngle = " << jewelAngle << std::endl;
+      double jewelAngle = m_phiEndJewel + i * 360.*Gaudi::Units::degree/m_nRepeatEndJewel;
       supportLayer->add(new GeoTransform(GeoTrf::RotateZ3D(jewelAngle)*GeoTrf::TranslateX3D(jewelRadius)*GeoTrf::TranslateZ3D(m_zEndJewel)));
       supportLayer->add(m_endJewel->getVolume());
       supportLayer->add(new GeoTransform(GeoTrf::RotateZ3D(jewelAngle)*GeoTrf::TranslateX3D(jewelRadius)*GeoTrf::TranslateZ3D(-m_zEndJewel)));
@@ -389,10 +364,8 @@ SCT_Layer::build(SCT_Identifier id) const
 
     // Position FSI Scorpions
     double scorpionRadius = std::sqrt(m_supportCyl->innerRadius()*m_supportCyl->innerRadius() - 0.25 * m_scorpion->rPhiWidth()*m_scorpion->rPhiWidth()) - 0.5 * m_scorpion->radialWidth();
-    //  std::cout << "scorpionRadius = " << scorpionRadius << std::endl;
     for ( int i=0; i<m_nRepeatScorpion; i++) {
-      double scorpionAngle = m_phiScorpion + i * 360.*GeoModelKernelUnits::degree/m_nRepeatScorpion;
-      //    std::cout << "scorpionAngle = " << scorpionAngle << std::endl;
+      double scorpionAngle = m_phiScorpion + i * 360.*Gaudi::Units::degree/m_nRepeatScorpion;
       supportLayer->add(new GeoTransform(GeoTrf::RotateZ3D(scorpionAngle)*GeoTrf::TranslateX3D(scorpionRadius)*GeoTrf::TranslateZ3D(m_zScorpion)));
       supportLayer->add(m_scorpion->getVolume());
       supportLayer->add(new GeoTransform(GeoTrf::RotateZ3D(scorpionAngle)*GeoTrf::TranslateX3D(scorpionRadius)*GeoTrf::TranslateZ3D(-m_zScorpion)));
@@ -465,7 +438,7 @@ SCT_Layer::calcSkiPhiOffset()
 
   // First calculated for abs(m_tilt). 
 
-  double divisionAngle  = 360 * GeoModelKernelUnits::degree / m_skisPerLayer;
+  double divisionAngle  = 360 * Gaudi::Units::degree / m_skisPerLayer;
 
   // double activeHalfWidth =     0.5 * m_skiAux->ski()->module()->activeWidth();
   // double moduleHalfThickness = 0.5 * m_skiAux->ski()->module()->thickness();
@@ -490,12 +463,5 @@ SCT_Layer::calcSkiPhiOffset()
   // skiPhiOffset < 0 for +ve tilt and > 0 for -ve tilt.
   double skiPhiOffset = tiltSign * (0.5 * divisionAngle - alpha);
 
-  //std::cout << "In Volume: " << getName() << ":" << std::endl;
-  //// std::cout << "  Module width = " << m_skiAux->ski()->module()->width() << std::endl;
-  //// std::cout << "  Active width = " << m_skiAux->ski()->module()->activeWidth() << std::endl;
-  //std::cout << "  Module width = " << m_module->width() << std::endl;
-  //std::cout << "  Active width = " << m_module->activeWidth() << std::endl;
-  //std::cout << "  Division angle = " << divisionAngle/GeoModelKernelUnits::degree << " GeoModelKernelUnits::deg" << std::endl;
-  //std::cout << "  Ski phi offset = " << skiPhiOffset/GeoModelKernelUnits::degree  << " GeoModelKernelUnits::deg" << std::endl;
   return skiPhiOffset;
 }
diff --git a/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_MaterialManager.cxx b/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_MaterialManager.cxx
index d5d853261358a77f7fce44ca38483b0d8dd71c77..09b44a2e14285d8ef50d18e73a5d7a0ae304435a 100755
--- a/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_MaterialManager.cxx
+++ b/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_MaterialManager.cxx
@@ -11,6 +11,7 @@
 #include "StoreGate/StoreGateSvc.h"
 #include "GaudiKernel/Bootstrap.h"
 #include "GaudiKernel/ISvcLocator.h"
+#include "GaudiKernel/SystemOfUnits.h"
 
 #include <iostream>
 
@@ -32,7 +33,6 @@ SCT_MaterialManager::SCT_MaterialManager()
     }
 
     const SCT_DataBase * rdb = SCT_DataBase::instance();
-    //s_materialManager =  new InDetMaterialManager("SCT_MaterialManager", detStore, rdb->weightTable(), "sct")
     s_materialManager =  new InDetMaterialManager("SCT_MaterialManager", rdb->athenaComps());
     s_materialManager->addWeightTable(rdb->weightTable(), "sct");
     s_materialManager->addScalingTable(rdb->scalingTable());
@@ -64,7 +64,7 @@ SCT_MaterialManager::loadMaterials()
   //const GeoMaterial *kapton   = getMaterial("std::Kapton"); // 30th Aug 2005 D.Naito added.
 
   // CuKapton for Low Mass Tapes
-  //GeoMaterial * matCuKapton   = new GeoMaterial("sct::CuKapton",2.94*gram/GeoModelKernelUnits::cm3);
+  //GeoMaterial * matCuKapton   = new GeoMaterial("sct::CuKapton",2.94*gram/Gaudi::Units::cm3);
   //matCuKapton->add(const_cast<GeoElement*>(copper),  0.6142);
   //matCuKapton->add(const_cast<GeoMaterial*>(kapton), 0.3858);
   //addMaterial(matCuKapton);
diff --git a/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_Module.cxx b/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_Module.cxx
index dea79f0f86d192fd3bf633fe878a4c5b0617a4d8..f48ab25d870ed3d8b07f508bee64d91c4fda58ee 100755
--- a/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_Module.cxx
+++ b/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_Module.cxx
@@ -33,7 +33,7 @@
 #include "GeoModelKernel/GeoTransform.h"
 #include "GeoModelKernel/GeoAlignableTransform.h"
 #include "GeoModelKernel/GeoDefinitions.h"
-#include "GeoModelKernel/Units.h"
+#include "GaudiKernel/SystemOfUnits.h"
 // 8th Aug 2005 S.Mima modified.
 #include "GeoModelKernel/GeoShapeSubtraction.h"
 
@@ -41,7 +41,6 @@
 
 SCT_Module::SCT_Module(const std::string & name) 
   : SCT_UniqueComponentFactory(name),
-    //m_stereoSign(0),
     m_innerSide(0),
     m_outerSide(0),
     m_baseBoard(0)
@@ -149,20 +148,6 @@ SCT_Module::preBuild()
   GeoTrf::Vector3D x(0.0, u.y(),w.z());
   
   // for corner of hybrid, connectorouter and pigtail of outer side.
-  //GeoTrf::Vector3D i(0.0, 
-  //        0.5*outerSideHybridWidth,
-  //        m_outerSide->hybridOffsetZ() + 0.5*outerSideHybridLength);
-  //  GeoTrf::Vector3D k(0.0,
-  //        -0.5*outerSideHybridWidth,
-  //        m_outerSide->hybridOffsetZ() + 0.5*outerSidePigtailLength);
-  //GeoTrf::Vector3D l(0.0,
-  //        -0.5*outerSideHybridWidth - m_outerSide->pigtail()->width(), k.z());
-  //GeoTrf::Vector3D m(0.0, l.y(),
-  //        m_outerSide->hybridOffsetZ() - 0.5*outerSidePigtailLength);
-  //GeoTrf::Vector3D n(0.0, k.y(),m.z());
-  //GeoTrf::Vector3D p(0.0, i.y(),
-  //        m_outerSide->hybridOffsetZ() - 0.5*outerSideHybridLength);
-
   GeoTrf::Vector3D i(0.0, 
                       0.5*outerSideHybridWidth,
                       m_outerSide->hybridOffsetZ() + 0.5*outerSidePigtailLength);
@@ -181,28 +166,28 @@ SCT_Module::preBuild()
   GeoTrf::Vector3D s(0.0, r.y(), m_innerSide->hybridOffsetZ() - 0.5*innerSideHybridLength);
   GeoTrf::Vector3D t(0.0, q.y(), s.z());
 
-  // All points turn +-20 mGeoModelKernelUnits::rad around physical center of module.
-  a = GeoTrf::RotateX3D(m_stereoOuter/GeoModelKernelUnits::radian)*a;
-  b = GeoTrf::RotateX3D(m_stereoOuter/GeoModelKernelUnits::radian)*b;
-  c = GeoTrf::RotateX3D(m_stereoOuter/GeoModelKernelUnits::radian)*c;
-  d = GeoTrf::RotateX3D(m_stereoOuter/GeoModelKernelUnits::radian)*d;
-
-  e = GeoTrf::RotateX3D(m_stereoInner/GeoModelKernelUnits::radian)*e;
-  f = GeoTrf::RotateX3D(m_stereoInner/GeoModelKernelUnits::radian)*f;
-  g = GeoTrf::RotateX3D(m_stereoInner/GeoModelKernelUnits::radian)*g;
-  h = GeoTrf::RotateX3D(m_stereoInner/GeoModelKernelUnits::radian)*h;
-
-  i = GeoTrf::RotateX3D(m_stereoOuter/GeoModelKernelUnits::radian)*i;
-  //k.rotateX(m_stereoOuter/GeoModelKernelUnits::radian);
-  l = GeoTrf::RotateX3D(m_stereoOuter/GeoModelKernelUnits::radian)*l;
-  m = GeoTrf::RotateX3D(m_stereoOuter/GeoModelKernelUnits::radian)*m;
-  //n.rotateX(m_stereoOuter/GeoModelKernelUnits::radian);
-  p = GeoTrf::RotateX3D(m_stereoOuter/GeoModelKernelUnits::radian)*p;
-
-  q = GeoTrf::RotateX3D(m_stereoInner/GeoModelKernelUnits::radian)*q;
-  r = GeoTrf::RotateX3D(m_stereoInner/GeoModelKernelUnits::radian)*r;
-  s = GeoTrf::RotateX3D(m_stereoInner/GeoModelKernelUnits::radian)*s;
-  t = GeoTrf::RotateX3D(m_stereoInner/GeoModelKernelUnits::radian)*t;
+  // All points turn +-20 mGaudi::Units::rad around physical center of module.
+  a = GeoTrf::RotateX3D(m_stereoOuter/Gaudi::Units::radian)*a;
+  b = GeoTrf::RotateX3D(m_stereoOuter/Gaudi::Units::radian)*b;
+  c = GeoTrf::RotateX3D(m_stereoOuter/Gaudi::Units::radian)*c;
+  d = GeoTrf::RotateX3D(m_stereoOuter/Gaudi::Units::radian)*d;
+
+  e = GeoTrf::RotateX3D(m_stereoInner/Gaudi::Units::radian)*e;
+  f = GeoTrf::RotateX3D(m_stereoInner/Gaudi::Units::radian)*f;
+  g = GeoTrf::RotateX3D(m_stereoInner/Gaudi::Units::radian)*g;
+  h = GeoTrf::RotateX3D(m_stereoInner/Gaudi::Units::radian)*h;
+
+  i = GeoTrf::RotateX3D(m_stereoOuter/Gaudi::Units::radian)*i;
+  //k.rotateX(m_stereoOuter/Gaudi::Units::radian);
+  l = GeoTrf::RotateX3D(m_stereoOuter/Gaudi::Units::radian)*l;
+  m = GeoTrf::RotateX3D(m_stereoOuter/Gaudi::Units::radian)*m;
+  //n.rotateX(m_stereoOuter/Gaudi::Units::radian);
+  p = GeoTrf::RotateX3D(m_stereoOuter/Gaudi::Units::radian)*p;
+
+  q = GeoTrf::RotateX3D(m_stereoInner/Gaudi::Units::radian)*q;
+  r = GeoTrf::RotateX3D(m_stereoInner/Gaudi::Units::radian)*r;
+  s = GeoTrf::RotateX3D(m_stereoInner/Gaudi::Units::radian)*s;
+  t = GeoTrf::RotateX3D(m_stereoInner/Gaudi::Units::radian)*t;
 
   // Calculate demension of envelope1.
   const double z_ab = std::max(a.z(), b.z());
@@ -215,9 +200,6 @@ SCT_Module::preBuild()
   const double y_bc = std::min(b.y(), c.y());
   const double y_fg = std::min(f.y(), g.y());
 
-  //const double y_ux = std::max(u.y(), x.y());
-  //const double y_vw = std::min(v.y(), w.y());
-
   const double zmaxEnv1 = std::max(z_ab, z_ef);
   const double zminEnv1 = std::min(z_cd, z_gh);
 
@@ -330,7 +312,7 @@ SCT_Module::preBuild()
   //
   // inner side
   //
-  GeoTrf::Transform3D rotInner = GeoTrf::RotateX3D(m_stereoInner) * GeoTrf::RotateZ3D(180*GeoModelKernelUnits::deg);
+  GeoTrf::Transform3D rotInner = GeoTrf::RotateX3D(m_stereoInner) * GeoTrf::RotateZ3D(180*Gaudi::Units::deg);
   m_innerSidePos = new GeoTrf::Transform3D(GeoTrf::Transform3D(GeoTrf::Translation3D(ISPosX, 0.0, 0.0)*rotInner));
 
   //
diff --git a/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_OuterSide.cxx b/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_OuterSide.cxx
index b9b9a7b6e92c13a68e5dfc99e629d6ffd3d1988c..1a4ee321aeba14e8c90aa2d1910caea0616248d3 100755
--- a/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_OuterSide.cxx
+++ b/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_OuterSide.cxx
@@ -27,10 +27,8 @@
 #include "GeoModelKernel/GeoShape.h"
 #include "GeoModelKernel/GeoShapeUnion.h"
 #include "GeoModelKernel/GeoShapeShift.h"
-
-#include "GeoModelKernel/Units.h"
 #include "GeoModelKernel/GeoDefinitions.h"
-
+#include "GaudiKernel/SystemOfUnits.h"
 
 #include <cmath>
 
@@ -148,10 +146,10 @@ SCT_OuterSide::preBuild()
   //        ---   hybrid  | 
   //      ------- sensor  | x-axis
   //
-  // Shown is the outer side. The inner side is the same but with a rotation of 180 GeoModelKernelUnits::deg around the z-axis.       
+  // Shown is the outer side. The inner side is the same but with a rotation of 180 Gaudi::Units::deg around the z-axis.       
   // 
-  //GeoModelKernelUnits::HepRotation rotSensor;
-  //rotSensor.rotateZ(180*GeoModelKernelUnits::deg);
+  //Gaudi::Units::HepRotation rotSensor;
+  //rotSensor.rotateZ(180*Gaudi::Units::deg);
   //m_outerSidePos = new GeoTrf::Transform3D(rotOuter, GeoTrf::Vector3D(0.5 * (m_sensorGap + sectThickness), 0., 0.));
   //m_sensorPos = new GeoTransform(GeoTrf::Transform3D(rotSensor, GeoTrf::Vector3D(sensorPosX, sensorPosY, sensorPosZ)));
   m_sensorPos             = new GeoTransform(GeoTrf::Translate3D(sensorPosX, sensorPosY, sensorPosZ));
diff --git a/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_Sensor.cxx b/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_Sensor.cxx
index 6cc41f4ffb5cbc8dd69d2fbb3753e35de6a7c20c..4a3b15f269e5585be9b93066739a8134f1e1d1ec 100755
--- a/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_Sensor.cxx
+++ b/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_Sensor.cxx
@@ -20,8 +20,7 @@
 #include "InDetReadoutGeometry/InDetDD_Defs.h"
 #include "InDetReadoutGeometry/SiCommonItems.h"
 
-
-#include "GeoModelKernel/Units.h"
+#include "GaudiKernel/SystemOfUnits.h"
 
 using namespace InDetDD;
 
@@ -122,10 +121,10 @@ SCT_Sensor::makeDesign()
   // This is the default and no action is required. 
   // Can force axes not to be swapped by setting to false.
   // 
-  // bool phiSyGeoModelKernelUnits::mmetric = true;
-  // bool etaSyGeoModelKernelUnits::mmetric = true; 
-  // bool depthSyGeoModelKernelUnits::mmetric = true;
-  // m_design->setSyGeoModelKernelUnits::mmetry(phiSyGeoModelKernelUnits::mmetric, etaSyGeoModelKernelUnits::mmetric, depthSyGeoModelKernelUnits::mmetric,
+  // bool phiSyGaudi::Units::mmetric = true;
+  // bool etaSyGaudi::Units::mmetric = true; 
+  // bool depthSyGaudi::Units::mmetric = true;
+  // m_design->setSyGaudi::Units::mmetry(phiSyGaudi::Units::mmetric, etaSyGaudi::Units::mmetric, depthSyGaudi::Units::mmetric,
   //
 }
 
diff --git a/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_Ski.cxx b/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_Ski.cxx
index bae8c9ba459f737137ecc625e981069b4a662a30..bb7405a950f32a2e2742abbdcf79b4b5e43fa499 100755
--- a/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_Ski.cxx
+++ b/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_Ski.cxx
@@ -29,7 +29,7 @@
 #include "GeoModelKernel/GeoShapeUnion.h"
 #include "GeoModelKernel/GeoShapeShift.h"
 #include "GeoModelKernel/GeoDefinitions.h"
-#include "GeoModelKernel/Units.h"
+#include "GaudiKernel/SystemOfUnits.h"
 
 #include <sstream>
 #include <cmath>
@@ -102,8 +102,8 @@ SCT_Ski::getParameters()
 const GeoLogVol * 
 SCT_Ski::preBuild()
 {
-  const double rphiClearance = 0.5*GeoModelKernelUnits::mm;
-  const double radialClearance = 0.5*GeoModelKernelUnits::mm;
+  const double rphiClearance = 0.5*Gaudi::Units::mm;
+  const double radialClearance = 0.5*Gaudi::Units::mm;
 
 
   // Make components.
@@ -134,7 +134,7 @@ SCT_Ski::preBuild()
 
   // *** 18:00 Fri 27th May 2005 D.Naito put some comments.
   // I need to calculate moduleYMax and moduleYMin for yModuleOffset,
-  // because the modules is asyGeoModelKernelUnits::mmetry in y direction.
+  // because the modules is asyGaudi::Units::mmetry in y direction.
 
   //
   // These are coordinates of corners of module's envelopes.
@@ -183,8 +183,6 @@ SCT_Ski::preBuild()
   // *** End of modified lines. ------------------ (12)*********************************
 
 
-  //std::cout << "xPos, yPos = " << xPos << " " << yPos << std::endl;
-   
   //
   // Calculate position of cooling block
   //
@@ -237,8 +235,6 @@ SCT_Ski::preBuild()
   //  double zDoglegOffset = m_module->baseBoardCenter();
   double zDoglegOffset = coolingBlockOffsetZ();
 
-  //std::cout << "Dogleg offset: " << yDoglegOffset << std::endl;
-
   //
   // Calculate position of cooling pipe.
   //
@@ -401,13 +397,11 @@ SCT_Ski::preBuild()
   xmax1 += m_safety;
   ymin1 -= m_safety;
   ymax1 += m_safety;
-  //  std::cout << "xmin1,xmax1,ymin1,ymax1= " << xmin1 << " " << xmax1 << " " << ymin1 << " " << ymax1 << std::endl;
 
   xmin2 -= m_safety;
   xmax2 += m_safety;
   ymin2 -= m_safety;
   ymax2 += m_safety;
-  //  std::cout << "xmin2,xmax2,ymin2,ymax2= " << xmin2 << " " << xmax2 << " " << ymin2 << " " << ymax2 << std::endl;
 
   double xCenter = 0.5*(xmin1+xmax1);
   double yCenter = 0.5*(ymin1+ymax1);
@@ -418,9 +412,6 @@ SCT_Ski::preBuild()
 
   m_refPointTransform = new GeoTransform(GeoTrf::Translate3D(-xCenter, -yCenter, 0));
   m_refPointTransform->ref();
-  //  std::cout << "xCenter, yCenter = " << xCenter << "  " << yCenter << std::endl;
-  //  std::cout << "xShift2, yShift2 = " << xShift2 << "  " << yShift2 << std::endl;
-  //  std::cout << "xCoolingPipePos, yCoolingPipePos = " << xCoolingPipePos << "  " << yCoolingPipePos << std::endl;
 
   // *** 10:00 Tue 31st May 2005 D.Naito modified. (14)*********************************
   // *** -->>                                      (14)*********************************
@@ -470,17 +461,6 @@ SCT_Ski::preBuild()
   // Calculate the clearances. Module envelope1 is the thickness up to the sensors. This is used for the module to 
   // module distance
 
-  //std::cout << "Clearance Module to Module:        " 
-  //     <<  m_radialSep - m_module->env1Thickness() << std::endl;
-  //std::cout << "Clearance Module to Dogleg:        " 
-  //     << std::abs(xDoglegOffset) - 0.5*m_dogleg->thickness() - 0.5*m_module->thickness() << std::endl;
-  //std::cout << "Clearance Module to Cooling Block: " 
-  //     << std::abs(xCoolingBlockOffset) - 0.5*m_coolingBlock->thickness() - 0.5 * m_module->baseBoard()->thickness() - m_safety
-  //     << std::endl;
-  //std::cout << "Cooling block to pipe: " <<  std::abs(-xModuleOffset + xCoolingBlockOffset - xCoolingPipePos) 
-  // - 0.5*m_coolingBlock->thickness() - m_coolingPipe->pipeRadius() 
-  //    << std::endl;
-
   return skiLog;
 
 }
diff --git a/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_SkiPowerTape.cxx b/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_SkiPowerTape.cxx
index 9b11aeb79d5cffaea02bd07a5eed36c749b92de5..b28581610c0c471509cd2225b8835e9c4cc07699 100755
--- a/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_SkiPowerTape.cxx
+++ b/InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_SkiPowerTape.cxx
@@ -13,9 +13,7 @@
 #include "SCT_GeoModel/SCT_GeometryManager.h"
 #include "SCT_GeoModel/SCT_BarrelParameters.h"
 
-//#include "SCT_GeoModel/SCT_Dogleg.h" // Tue 30th Aug 2005 D.Naito removed.
 #include "SCT_GeoModel/SCT_Ski.h"
-//#include "SCT_GeoModel/SCT_PowerTape.h"
 #include "SCT_GeoModel/SCT_PowerTape.h"
 #include "SCT_GeoModel/SCT_Module.h"  // 28th Mar 2005 S.Mima modified.
 
@@ -27,7 +25,7 @@
 #include "GeoModelKernel/GeoMaterial.h"
 #include "GeoModelKernel/Units.h"
 #include "GeoModelKernel/GeoDefinitions.h"
-#include "GeoModelKernel/Units.h"
+#include "GaudiKernel/SystemOfUnits.h"
 #include <iostream>
 #include <sstream>
 #include <cmath>
@@ -94,7 +92,7 @@ SCT_SkiPowerTape::build()
     
     // nPos is used to stack the power tapes. Modules closest to interlink are
     // furthest from support. The positive and negative z positions are 
-    // syGeoModelKernelUnits::mmetric. nPos = 5,4,3,2,1,0,0,1,2,3,4,5 for the 12 modules.
+    // syGaudi::Units::mmetric. nPos = 5,4,3,2,1,0,0,1,2,3,4,5 for the 12 modules.
     int nPos;
 
     // test sign of zpos to determine whether the tape runs to the
@@ -157,13 +155,10 @@ SCT_SkiPowerTape::build()
     // Position the tape
     skiPowerTape->add(new GeoTransform(GeoTrf::Translate3D(xTapePos, yTapePos, tapeMid)));
     skiPowerTape->add(powerTape.getVolume());
-    mass += (powerTape.getVolume()->getLogVol()->getShape()->volume()/GeoModelKernelUnits::cm3)*(powerTape.material()->getDensity()/GeoModelKernelUnits::g/GeoModelKernelUnits::cm3);
+    mass += (powerTape.getVolume()->getLogVol()->getShape()->volume()/Gaudi::Units::cm3)*(powerTape.material()->getDensity()/GeoModelKernelUnits::g/Gaudi::Units::cm3);
     ltot += tapeLength;
 
   }    
 
-  //  std::cout << "Total power tape mass = " << mass << std::endl;
-  //  std::cout << "Total power tape length = " << ltot << std::endl;
   return skiPowerTape;
-
 }
diff --git a/InnerDetector/InDetDetDescr/SCT_SLHC_GeoModel/src/SCT_BarrelModuleParameters.cxx b/InnerDetector/InDetDetDescr/SCT_SLHC_GeoModel/src/SCT_BarrelModuleParameters.cxx
index 5fed24ed9d449a3c992cfb083bbefa27eef3a7d5..f44cbbcca46ff5cf4ccdcf2bab8020c8dc8b3339 100644
--- a/InnerDetector/InDetDetDescr/SCT_SLHC_GeoModel/src/SCT_BarrelModuleParameters.cxx
+++ b/InnerDetector/InDetDetDescr/SCT_SLHC_GeoModel/src/SCT_BarrelModuleParameters.cxx
@@ -6,7 +6,7 @@
 #include "SCT_SLHC_GeoModel/SCT_GeometryManager.h"
 #include "SCT_SLHC_GeoModel/SCT_DataBase.h"
 #include "GeometryDBSvc/IGeometryDBSvc.h"
-#include "GeoModelKernel/Units.h"
+#include "GaudiKernel/SystemOfUnits.h"
 
 #include <cmath>
 
@@ -36,7 +36,7 @@ SCT_BarrelModuleParameters::SCT_BarrelModuleParameters(const SCT_DataBase * sctd
 double 
 SCT_BarrelModuleParameters::sensorThickness(int moduleType) const 
 {
-  double thickness = db()->getDouble(m_SctBrlSensor, "THICKNESS", moduleType) * GeoModelKernelUnits::mm;
+  double thickness = db()->getDouble(m_SctBrlSensor, "THICKNESS", moduleType) * Gaudi::Units::mm;
   if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG) << "-----------2 sensorThickness mod_typ("<<moduleType<<") = "<< thickness << endmsg;
   return thickness;
 }
@@ -44,7 +44,7 @@ SCT_BarrelModuleParameters::sensorThickness(int moduleType) const
 double 
 SCT_BarrelModuleParameters::sensorWidth(int moduleType) const 
 {
-  double width = db()->getDouble(m_SctBrlSensor, "WIDTH", moduleType) * GeoModelKernelUnits::mm;
+  double width = db()->getDouble(m_SctBrlSensor, "WIDTH", moduleType) * Gaudi::Units::mm;
   if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG)<<"-----------2 DXYZ2 sensorWidth mod_typ("<<moduleType<<") = "<< width <<endmsg;
   return width;
 }
@@ -52,7 +52,7 @@ SCT_BarrelModuleParameters::sensorWidth(int moduleType) const
 double 
 SCT_BarrelModuleParameters::sensorLength(int moduleType) const 
 {
-  double sensorLen = db()->getDouble(m_SctBrlSensor, "LENGTH", moduleType) * GeoModelKernelUnits::mm;
+  double sensorLen = db()->getDouble(m_SctBrlSensor, "LENGTH", moduleType) * Gaudi::Units::mm;
   if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG)<<"-----------2 SensorLength DXYZ3 mod_typ("<<moduleType<<") = "<<sensorLen <<endmsg;
   return sensorLen;
 }
@@ -81,7 +81,7 @@ double
 SCT_BarrelModuleParameters::baseBoardThickness(int moduleType) const 
 {
   //sprintf(paraName, "BRL_M%d_BBTHICK", moduleType);
-  double bbthick = db()->getDouble(m_SctBrlModule, "BASEBOARDTHICKNESS", moduleType) * GeoModelKernelUnits::mm;
+  double bbthick = db()->getDouble(m_SctBrlModule, "BASEBOARDTHICKNESS", moduleType) * Gaudi::Units::mm;
   if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG)<<"-----------2 baseBoardThickness BBTHICK mod_typ("<<moduleType<<") = "<< bbthick <<endmsg;
   return bbthick;
 }
@@ -89,13 +89,13 @@ SCT_BarrelModuleParameters::baseBoardThickness(int moduleType) const
 double 
 SCT_BarrelModuleParameters::baseBoardWidth(int moduleType) const 
 {
-  double bbwidth = db()->getDouble(m_SctBrlModule, "BASEBOARDWIDTH", moduleType) * GeoModelKernelUnits::mm;
+  double bbwidth = db()->getDouble(m_SctBrlModule, "BASEBOARDWIDTH", moduleType) * Gaudi::Units::mm;
   if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG)<<"-----------2 baseBoardWidth BBWID mod_typ("<<moduleType<<") = "<< bbwidth <<endmsg;
   return bbwidth;
 }
 
 double SCT_BarrelModuleParameters::baseBoardLength(int moduleType) const{
-  double bblength = db()->getDouble(m_SctBrlModule, "BASEBOARDLENGTH", moduleType) * GeoModelKernelUnits::mm;
+  double bblength = db()->getDouble(m_SctBrlModule, "BASEBOARDLENGTH", moduleType) * Gaudi::Units::mm;
   if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG)<<"-----------2 baseBoardLength BBLEN mod_typ("<<moduleType<<") = "<<bblength <<endmsg;
   return bblength;
 }
@@ -109,16 +109,16 @@ SCT_BarrelModuleParameters::baseBoardMaterial(int moduleType) const
 }
 double SCT_BarrelModuleParameters::baseBoardOffsetY(int /*moduleType*/) const{
   //if(moduleType == 1)
-    return -5.7*GeoModelKernelUnits::mm;
+    return -5.7*Gaudi::Units::mm;
   //else
-  //  return -5.7*GeoModelKernelUnits::mm;
+  //  return -5.7*Gaudi::Units::mm;
 }
 
 double SCT_BarrelModuleParameters::baseBoardOffsetZ(int moduleType) const{
   if(moduleType == 1)
-    return -7.1*GeoModelKernelUnits::mm;
+    return -7.1*Gaudi::Units::mm;
   else
-    return -1.9*GeoModelKernelUnits::mm;
+    return -1.9*Gaudi::Units::mm;
 }
 
 //
@@ -127,13 +127,13 @@ double SCT_BarrelModuleParameters::baseBoardOffsetZ(int moduleType) const{
 double 
 SCT_BarrelModuleParameters::moduleStereoAngle(int moduleType) const
 {
-  return db()->getDouble(m_SctBrlModule, "STEREOANGLE", moduleType) * GeoModelKernelUnits::mrad;
+  return db()->getDouble(m_SctBrlModule, "STEREOANGLE", moduleType) * Gaudi::Units::mrad;
 }
 
 double 
 SCT_BarrelModuleParameters::moduleInterSidesGap(int moduleType) const
 {
-  return db()->getDouble(m_SctBrlModule, "INTERSIDESGAP", moduleType) * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_SctBrlModule, "INTERSIDESGAP", moduleType) * Gaudi::Units::mm;
 }
 
 // Barrel Module Side Design
@@ -141,7 +141,7 @@ SCT_BarrelModuleParameters::moduleInterSidesGap(int moduleType) const
 double 
 SCT_BarrelModuleParameters::barrelModelSideStripPitch(int moduleType) const
 {
-  double pitch = db()->getDouble(m_SctBrlSensor, "STRIPPITCH", moduleType) * GeoModelKernelUnits::mm;
+  double pitch = db()->getDouble(m_SctBrlSensor, "STRIPPITCH", moduleType) * Gaudi::Units::mm;
   if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG)<<"-----------2 barrelModelSideStripPitch PITCH mod_typ("<<moduleType<<") = "<<pitch <<endmsg;
   return pitch;
 }
@@ -149,7 +149,7 @@ SCT_BarrelModuleParameters::barrelModelSideStripPitch(int moduleType) const
 double
 SCT_BarrelModuleParameters::barrelModelSideStripLength(int moduleType) const
 {
-  double stripLen =  db()->getDouble(m_SctBrlSensor, "STRIPLENGTH", moduleType) * GeoModelKernelUnits::mm;
+  double stripLen =  db()->getDouble(m_SctBrlSensor, "STRIPLENGTH", moduleType) * Gaudi::Units::mm;
   if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG)<<"-----------2 barrelModelSideStripLength STRIPLEN mod_typ("<<moduleType<<") = "<<stripLen <<endmsg;
   return stripLen;
 }
@@ -157,7 +157,7 @@ SCT_BarrelModuleParameters::barrelModelSideStripLength(int moduleType) const
 double 
 SCT_BarrelModuleParameters::barrelModelSideTotalDeadLength(int moduleType) const
 {
-  double stripdeadLen = db()->getDouble(m_SctBrlSensor, "STRIPDEADLENGTH", moduleType) * GeoModelKernelUnits::mm;
+  double stripdeadLen = db()->getDouble(m_SctBrlSensor, "STRIPDEADLENGTH", moduleType) * Gaudi::Units::mm;
   if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG)<<"-----------2 barrelModelSideTotalDeadLength STRIPDEADLEN mod_typ("<<moduleType<<") = "<<stripdeadLen<<endmsg;
   return stripdeadLen;
 }
@@ -177,7 +177,7 @@ double
 SCT_BarrelModuleParameters::barrelModelSideSegmentGap(int moduleType) const
 {
   if (m_SctBrlSensor) {
-    return db()->getDouble(m_SctBrlSensor, "SEGMENTGAP", moduleType) * GeoModelKernelUnits::mm;
+    return db()->getDouble(m_SctBrlSensor, "SEGMENTGAP", moduleType) * Gaudi::Units::mm;
   } else { 
     return 0;
   }
diff --git a/InnerDetector/InDetDetDescr/SCT_SLHC_GeoModel/src/SCT_BarrelModuleParametersOld.cxx b/InnerDetector/InDetDetDescr/SCT_SLHC_GeoModel/src/SCT_BarrelModuleParametersOld.cxx
index e71ae56a28a0b1eea1ef97466d38ab2ad5f2668b..7aea7f125809cf9415b34cd771d848b00cda416a 100644
--- a/InnerDetector/InDetDetDescr/SCT_SLHC_GeoModel/src/SCT_BarrelModuleParametersOld.cxx
+++ b/InnerDetector/InDetDetDescr/SCT_SLHC_GeoModel/src/SCT_BarrelModuleParametersOld.cxx
@@ -8,8 +8,7 @@
 #include "GaudiKernel/ISvcLocator.h"
 #include "GaudiKernel/MsgStream.h"
 #include "RDBAccessSvc/IRDBRecord.h"
-
-#include "GeoModelKernel/Units.h"
+#include "GaudiKernel/SystemOfUnits.h"
 
 #include <cmath>
 #include <cstring>
@@ -41,12 +40,12 @@ void barrelModSplitString(const std::string& str, std::vector<std::string>& str_
 //
 
 
-const double PITCH = 80*GeoModelKernelUnits::micrometer;
-const double HALF_ACTIVE_STRIP_LENGTH = 31*GeoModelKernelUnits::mm;
-const double NOMINAL_WAFER_LENGTH = 63.960*GeoModelKernelUnits::mm;
-const double REF_DISTANCE_BETWEEN_FIDUCIALS = 2.19*GeoModelKernelUnits::mm; 
-const double DISTANCE_CORNER_MARK_TO_CENTER = 31.750*GeoModelKernelUnits::mm; 
-const double DISTANCE_CORNER_MARK_TO_FIDUCIAL = 0.8*GeoModelKernelUnits::mm; 
+const double PITCH = 80*Gaudi::Units::micrometer;
+const double HALF_ACTIVE_STRIP_LENGTH = 31*Gaudi::Units::mm;
+const double NOMINAL_WAFER_LENGTH = 63.960*Gaudi::Units::mm;
+const double REF_DISTANCE_BETWEEN_FIDUCIALS = 2.19*Gaudi::Units::mm; 
+const double DISTANCE_CORNER_MARK_TO_CENTER = 31.750*Gaudi::Units::mm; 
+const double DISTANCE_CORNER_MARK_TO_FIDUCIAL = 0.8*Gaudi::Units::mm; 
 const double DISTANCE_CENTER_TO_CENTER = 2*(DISTANCE_CORNER_MARK_TO_CENTER - 
 					      DISTANCE_CORNER_MARK_TO_FIDUCIAL)
                                          + REF_DISTANCE_BETWEEN_FIDUCIALS;
@@ -131,7 +130,7 @@ SCT_BarrelModuleParametersOld::sensorThickness(int moduleType) const
   char paraName[50];
   sprintf(paraName, "BRL_M%d_DXYZ1", moduleType);
   std::cout<<"-----------2 sensorThickness DXYZ1 mod_typ("<<moduleType<<") = "<<(m_SCT_Modules->find(paraName))->second <<std::endl;
-  return (m_SCT_Modules->find(paraName))->second*GeoModelKernelUnits::cm;
+  return (m_SCT_Modules->find(paraName))->second*Gaudi::Units::cm;
 }
 
 double 
@@ -139,8 +138,8 @@ SCT_BarrelModuleParametersOld::sensorWidth(int moduleType) const
 {
   char paraName[50];
   sprintf(paraName, "BRL_M%d_DXYZ2", moduleType);
-  std::cout<<"-----------2 DXYZ2 sensorWidth mod_typ("<<moduleType<<") = "<<(m_SCT_Modules->find(paraName))->second*GeoModelKernelUnits::cm <<std::endl;
-  return (m_SCT_Modules->find(paraName))->second*GeoModelKernelUnits::cm;
+  std::cout<<"-----------2 DXYZ2 sensorWidth mod_typ("<<moduleType<<") = "<<(m_SCT_Modules->find(paraName))->second*Gaudi::Units::cm <<std::endl;
+  return (m_SCT_Modules->find(paraName))->second*Gaudi::Units::cm;
 }
 
 double 
@@ -148,7 +147,7 @@ SCT_BarrelModuleParametersOld::sensorLength(int moduleType) const
 {
   char paraName[50];
   sprintf(paraName, "BRL_M%d_DXYZ3", moduleType);
-  float sensorLen = (m_SCT_Modules->find(paraName))->second*GeoModelKernelUnits::cm;
+  float sensorLen = (m_SCT_Modules->find(paraName))->second*Gaudi::Units::cm;
   std::cout<<"-----------2 SensorLentgh DXYZ3 mod_typ("<<moduleType<<") = "<<sensorLen <<std::endl;
   return sensorLen;
 }
@@ -171,8 +170,8 @@ SCT_BarrelModuleParametersOld::baseBoardThickness(int moduleType) const
 {
   char paraName[50];
   sprintf(paraName, "BRL_M%d_BBTHICK", moduleType);
-  std::cout<<"-----------2 baseBoardThickness BBTHICK mod_typ("<<moduleType<<") = "<<(m_SCT_Modules->find(paraName))->second*GeoModelKernelUnits::cm <<std::endl;
-  return (m_SCT_Modules->find(paraName))->second*GeoModelKernelUnits::cm;
+  std::cout<<"-----------2 baseBoardThickness BBTHICK mod_typ("<<moduleType<<") = "<<(m_SCT_Modules->find(paraName))->second*Gaudi::Units::cm <<std::endl;
+  return (m_SCT_Modules->find(paraName))->second*Gaudi::Units::cm;
 }
 
 double 
@@ -180,15 +179,15 @@ SCT_BarrelModuleParametersOld::baseBoardWidth(int moduleType) const
 {
   char paraName[50];
   sprintf(paraName, "BRL_M%d_BBWID", moduleType);
-  std::cout<<"-----------2 baseBoardWidth BBWID mod_typ("<<moduleType<<") = "<<(m_SCT_Modules->find(paraName))->second*GeoModelKernelUnits::cm <<std::endl;
-  return (m_SCT_Modules->find(paraName))->second*GeoModelKernelUnits::cm;
+  std::cout<<"-----------2 baseBoardWidth BBWID mod_typ("<<moduleType<<") = "<<(m_SCT_Modules->find(paraName))->second*Gaudi::Units::cm <<std::endl;
+  return (m_SCT_Modules->find(paraName))->second*Gaudi::Units::cm;
 }
 
 double SCT_BarrelModuleParametersOld::baseBoardLength(int moduleType) const{
   char paraName[50];  
   sprintf(paraName, "BRL_M%d_BBLEN", moduleType);
   std::cout<<"-----------2 baseBoardLength BBLEN mod_typ("<<moduleType<<") = "<<(m_SCT_Modules->find(paraName))->second <<std::endl;
-  return (m_SCT_Modules->find(paraName))->second*GeoModelKernelUnits::cm;
+  return (m_SCT_Modules->find(paraName))->second*Gaudi::Units::cm;
 }
 
 std::string 
@@ -202,16 +201,16 @@ SCT_BarrelModuleParametersOld::baseBoardMaterial(int moduleType) const
 }
 double SCT_BarrelModuleParametersOld::baseBoardOffsetY(int /*moduleType*/) const{
   //if(moduleType == 1)
-    return -5.7*GeoModelKernelUnits::mm;
+    return -5.7*Gaudi::Units::mm;
   //else
-  //  return -5.7*GeoModelKernelUnits::mm;
+  //  return -5.7*Gaudi::Units::mm;
 }
 
 double SCT_BarrelModuleParametersOld::baseBoardOffsetZ(int moduleType) const{
   if(moduleType == 1)
-    return -7.1*GeoModelKernelUnits::mm;
+    return -7.1*Gaudi::Units::mm;
   else
-    return -1.9*GeoModelKernelUnits::mm;
+    return -1.9*Gaudi::Units::mm;
 }
 
 //
@@ -222,7 +221,7 @@ SCT_BarrelModuleParametersOld::moduleStereoAngle(int moduleType) const
 {
   char paraName[50];
   sprintf(paraName, "BRL_M%d_STEREOANGLE", moduleType);
-  return (m_SCT_Modules->find(paraName))->second*GeoModelKernelUnits::milliradian;
+  return (m_SCT_Modules->find(paraName))->second*Gaudi::Units::milliradian;
 }
 
 double 
@@ -230,7 +229,7 @@ SCT_BarrelModuleParametersOld::moduleInterSidesGap(int moduleType) const
 {
   char paraName[50];
   sprintf(paraName, "BRL_M%d_INTERSIDESGAP", moduleType);
-  return (double)(m_SCT_Modules->find(paraName))->second*GeoModelKernelUnits::mm;
+  return (double)(m_SCT_Modules->find(paraName))->second*Gaudi::Units::mm;
 }
 
 // Barrel Module Side Design
@@ -240,8 +239,8 @@ SCT_BarrelModuleParametersOld::barrelModelSideStripPitch(int moduleType) const
 {
   char paraName[50];
   sprintf(paraName, "BRL_M%d_PITCH", moduleType);
-  std::cout<<"-----------2 barrelModelSideStripPitch PITCH mod_typ("<<moduleType<<") = "<<(m_SCT_Modules->find(paraName))->second*GeoModelKernelUnits::micrometer <<std::endl;
-  return (double)(m_SCT_Modules->find(paraName))->second*GeoModelKernelUnits::micrometer;
+  std::cout<<"-----------2 barrelModelSideStripPitch PITCH mod_typ("<<moduleType<<") = "<<(m_SCT_Modules->find(paraName))->second*Gaudi::Units::micrometer <<std::endl;
+  return (double)(m_SCT_Modules->find(paraName))->second*Gaudi::Units::micrometer;
 }
 
 double
@@ -249,7 +248,7 @@ SCT_BarrelModuleParametersOld::barrelModelSideStripLength(int moduleType) const
 {
   char paraName[50];
   sprintf(paraName, "BRL_M%d_STRIPLEN", moduleType);
-  double stripLen = (m_SCT_Modules->find(paraName))->second*GeoModelKernelUnits::cm;
+  double stripLen = (m_SCT_Modules->find(paraName))->second*Gaudi::Units::cm;
   std::cout<<"-----------2 barrelModelSideStripLength STRIPLEN mod_typ("<<moduleType<<") = "<<stripLen <<std::endl;
   return stripLen;
 }
@@ -259,7 +258,7 @@ SCT_BarrelModuleParametersOld::barrelModelSideTotalDeadLength(int moduleType) co
 {
   char paraName[50];
   sprintf(paraName, "BRL_M%d_STRIPDEADLEN", moduleType);
-  double stripdeadLen = (m_SCT_Modules->find(paraName))->second*GeoModelKernelUnits::cm;
+  double stripdeadLen = (m_SCT_Modules->find(paraName))->second*Gaudi::Units::cm;
   std::cout<<"-----------2 barrelModelSideTotalDeadLength STRIPDEADLEN mod_typ("<<moduleType<<") = "<<stripdeadLen<<std::endl;
   return stripdeadLen;
 }
@@ -300,7 +299,7 @@ SCT_BarrelModuleParametersOld::barrelDeadEdge(int moduleType) const
   char paraName2[50];
   sprintf(paraName1, "BRL_M%d_DXYZ3", moduleType);
   sprintf(paraName2, "BRL_M%d_STRIPLEN", moduleType);
-  float deadEdge = 0.5*((m_SCT_Modules->find(paraName1))->second-(m_SCT_Modules->find(paraName2))->second)*GeoModelKernelUnits::mm;
+  float deadEdge = 0.5*((m_SCT_Modules->find(paraName1))->second-(m_SCT_Modules->find(paraName2))->second)*Gaudi::Units::mm;
   std::cout<<"-----------2 barrelDeadEdge DEADED mod_typ("<<moduleType<<") = "<<deadEdge<<std::endl;
  return deadEdge;
 }
diff --git a/InnerDetector/InDetDetDescr/SCT_SLHC_GeoModel/src/SCT_BarrelParameters.cxx b/InnerDetector/InDetDetDescr/SCT_SLHC_GeoModel/src/SCT_BarrelParameters.cxx
index 75881f23f5062447089e16fcfdaf0a1a5ed31e91..256bb398a8c8f8168111bcaaf11b6abea54933a0 100644
--- a/InnerDetector/InDetDetDescr/SCT_SLHC_GeoModel/src/SCT_BarrelParameters.cxx
+++ b/InnerDetector/InDetDetDescr/SCT_SLHC_GeoModel/src/SCT_BarrelParameters.cxx
@@ -6,7 +6,7 @@
 #include "SCT_SLHC_GeoModel/SCT_DataBase.h"
 #include "RDBAccessSvc/IRDBRecordset.h"
 #include "GeometryDBSvc/IGeometryDBSvc.h"
-#include "GeoModelKernel/Units.h"
+#include "GaudiKernel/SystemOfUnits.h"
 #include <iostream>
 #include <cmath>
 
@@ -56,7 +56,7 @@ SCT_BarrelParameters::SCT_BarrelParameters(const SCT_DataBase * sctdb, const SCT
 	  moduleIdVec = new  std::vector<int>;
 	  m_moduleIdMap[type] = moduleIdVec;
 	}
-	zposVec->push_back(db()->getDouble(m_SctBrlSkiZ,"ZPOSITION",i)*GeoModelKernelUnits::mm);
+	zposVec->push_back(db()->getDouble(m_SctBrlSkiZ,"ZPOSITION",i)*Gaudi::Units::mm);
 	moduleIdVec->push_back(db()->getInt(m_SctBrlSkiZ,"MODULEID",i));
       }
     }
@@ -100,9 +100,9 @@ SCT_BarrelParameters::skiFirstStagger() const{
 
 double 
 SCT_BarrelParameters::skiRadialSep(int ilayer) const{
-  // return 2.8*GeoModelKernelUnits::mm;//GeoModelKernelUnits::mm
+  // return 2.8*Gaudi::Units::mm;//Gaudi::Units::mm
   int ladType = ladderType(ilayer);
-  return db()->getDouble(m_SctBrlLadder,"MODULESRADIALSEP",ladType) * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_SctBrlLadder,"MODULESRADIALSEP",ladType) * Gaudi::Units::mm;
 }
 
 
@@ -145,17 +145,17 @@ SCT_BarrelParameters::skiZPosition(int ilayer, int module) const{
       int break_mod = modulesPerSki(ilayer) / 2;
       double zsep = db()->getDouble(m_SctBrlLadder,"ZSEP",ladType);
       //CALCULATE NEGATIVE END POSITION FIRST, TO KEEP MODULE ORDERING THE SAME
-      double first_pos = (-cylInnerZMin(ilayer) - (break_mod - 0.5)*zsep) * GeoModelKernelUnits::mm;
+      double first_pos = (-cylInnerZMin(ilayer) - (break_mod - 0.5)*zsep) * Gaudi::Units::mm;
       //PSOTION OF FIRST MODULE AFTER THE BREAK
-      double break_pos = cylInnerZMin(ilayer) * GeoModelKernelUnits::mm ;
+      double break_pos = cylInnerZMin(ilayer) * Gaudi::Units::mm ;
       
-      if(module < break_mod ) zpos = first_pos + (zsep * module) * GeoModelKernelUnits::mm;
-      else zpos = (break_pos + (zsep * (module - break_mod + 0.5))) * GeoModelKernelUnits::mm;
+      if(module < break_mod ) zpos = first_pos + (zsep * module) * Gaudi::Units::mm;
+      else zpos = (break_pos + (zsep * (module - break_mod + 0.5))) * Gaudi::Units::mm;
     }
 
     else{
       int ladType = ladderType(ilayer);
-      zpos = db()->getDouble(m_SctBrlLadder,"ZSEP",ladType) * (module - 0.5*(modulesPerSki(ilayer) - 1)) * GeoModelKernelUnits::mm;
+      zpos = db()->getDouble(m_SctBrlLadder,"ZSEP",ladType) * (module - 0.5*(modulesPerSki(ilayer) - 1)) * Gaudi::Units::mm;
     }
     } else {
     std::map<int, std::vector<double> *>::const_iterator iter = m_zpositionMap.find(zpostype);
@@ -208,25 +208,25 @@ SCT_BarrelParameters::skiModuleIdentifier(int ilayer, int module) const{
 //
 double 
 SCT_BarrelParameters::tilt(int ilayer) const{
-  double tilt = db()->getDouble(m_SctBrlLayer,"TILT",ilayer) * GeoModelKernelUnits::degree;
-  if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG)<<"---------2 tilt layer TILT("<<ilayer<<") = "<< tilt/GeoModelKernelUnits::degree << endmsg;
+  double tilt = db()->getDouble(m_SctBrlLayer,"TILT",ilayer) * Gaudi::Units::degree;
+  if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG)<<"---------2 tilt layer TILT("<<ilayer<<") = "<< tilt/Gaudi::Units::degree << endmsg;
   return tilt;
 }
 
 double SCT_BarrelParameters::radius(int ilayer) const{
-  double rlay = db()->getDouble(m_SctBrlLayer,"RADIUS",ilayer) * GeoModelKernelUnits::mm;
+  double rlay = db()->getDouble(m_SctBrlLayer,"RADIUS",ilayer) * Gaudi::Units::mm;
   if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG)<<"---------2 radius layer RLAY("<<ilayer<<") = "<<rlay<<endmsg;
   return rlay;
 }
 
 double 
 SCT_BarrelParameters::cylLength(int ilayer) const{
-  return db()->getDouble(m_SctBrlLayer,"CYLLENGTH",ilayer) * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_SctBrlLayer,"CYLLENGTH",ilayer) * Gaudi::Units::mm;
 }
 
 double 
 SCT_BarrelParameters::cylInnerZMin(int ilayer) const{
-  return db()->getDouble(m_SctBrlLayer,"CYLINNERZMIN",ilayer) * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_SctBrlLayer,"CYLINNERZMIN",ilayer) * Gaudi::Units::mm;
 }
 
 bool SCT_BarrelParameters::doubleSided(int ilayer) const{
@@ -257,7 +257,7 @@ SCT_BarrelParameters::staveLayout(int ilayer) const {
 double 
 SCT_BarrelParameters::stereoOuter(int ilayer) const {
   if (m_SctBrlLayer) {
-    return db()->getDouble(m_SctBrlLayer,"STEREOOUTER",ilayer) * GeoModelKernelUnits::mrad;
+    return db()->getDouble(m_SctBrlLayer,"STEREOOUTER",ilayer) * Gaudi::Units::mrad;
   } else {
     return 0;
   }
@@ -266,7 +266,7 @@ SCT_BarrelParameters::stereoOuter(int ilayer) const {
 double 
 SCT_BarrelParameters::stereoInner(int ilayer) const{
   if (m_SctBrlLayer) {
-    return db()->getDouble(m_SctBrlLayer,"STEREOINNER",ilayer) * GeoModelKernelUnits::mrad;
+    return db()->getDouble(m_SctBrlLayer,"STEREOINNER",ilayer) * Gaudi::Units::mrad;
   } else {
     return 0;
   }
@@ -277,7 +277,7 @@ SCT_BarrelParameters::staveSupportWidth(int ilayer) const{
   if (m_SctBrlLayer) {
     int ladType = ladderType(ilayer);
     if (db()->testField(m_SctBrlLadder,"SUPPORTWIDTH",ladType)) {
-      return db()->getDouble(m_SctBrlLadder,"SUPPORTWIDTH",ladType) * GeoModelKernelUnits::mm;
+      return db()->getDouble(m_SctBrlLadder,"SUPPORTWIDTH",ladType) * Gaudi::Units::mm;
     } 
   }
   return 0;
@@ -289,7 +289,7 @@ SCT_BarrelParameters::staveSupportThickness(int ilayer) const{
   if (m_SctBrlLayer) {
     int ladType = ladderType(ilayer);
     if (db()->testField(m_SctBrlLadder,"SUPPORTTHICK",ladType)) {
-      return db()->getDouble(m_SctBrlLadder,"SUPPORTTHICK",ladType) * GeoModelKernelUnits::mm;
+      return db()->getDouble(m_SctBrlLadder,"SUPPORTTHICK",ladType) * Gaudi::Units::mm;
     }
   }
   return 0;
@@ -308,14 +308,14 @@ SCT_BarrelParameters::staveSupportMaterial(int ilayer) const{
 
 double 
 SCT_BarrelParameters::supportCylInnerRadius(int ilayer) const{
-  double risup = db()->getDouble(m_SctBrlServPerLayer,"SUPPORTCYLINNERRAD",ilayer) * GeoModelKernelUnits::mm;
+  double risup = db()->getDouble(m_SctBrlServPerLayer,"SUPPORTCYLINNERRAD",ilayer) * Gaudi::Units::mm;
   if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG)<<"---------2 supportCylInnerRadius RISUP("<<ilayer<<") = "<< risup <<endmsg;
   return risup;
 }
 
 double 
 SCT_BarrelParameters::supportCylOuterRadius(int ilayer) const{
-  double rosup = db()->getDouble(m_SctBrlServPerLayer,"SUPPORTCYLOUTERRAD",ilayer) * GeoModelKernelUnits::mm;
+  double rosup = db()->getDouble(m_SctBrlServPerLayer,"SUPPORTCYLOUTERRAD",ilayer) * Gaudi::Units::mm;
   if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG)<<"---------2 supportCylOuterRadius ROSUP("<<ilayer<<") = "<<rosup<<endmsg;
   return rosup;
 }
@@ -337,35 +337,35 @@ SCT_BarrelParameters::numLayers() const{
 
 double 
 SCT_BarrelParameters::barrelInnerRadius() const{
-  double rmin = db()->getDouble(m_SctBrlGeneral,"INNERRADIUS") * GeoModelKernelUnits::mm;
+  double rmin = db()->getDouble(m_SctBrlGeneral,"INNERRADIUS") * Gaudi::Units::mm;
   if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG)<<"---------2 barrelInnerRadius RMIN = "<<rmin<<endmsg;
   return rmin;
 }
 
 double 
 SCT_BarrelParameters::barrelIntermediateRadius() const{
-  double rinter = db()->getDouble(m_SctBrlGeneral,"RINTERMEDIATE") * GeoModelKernelUnits::mm;
+  double rinter = db()->getDouble(m_SctBrlGeneral,"RINTERMEDIATE") * Gaudi::Units::mm;
   if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG)<<"---------2 barrelIntermediateRadius RINTERMEDIATE = "<<rinter<<endmsg;
   return  rinter;
 }
 
 double 
 SCT_BarrelParameters::barrelOuterRadius() const{
-  double rmax = db()->getDouble(m_SctBrlGeneral,"OUTERRADIUS") * GeoModelKernelUnits::mm;
+  double rmax = db()->getDouble(m_SctBrlGeneral,"OUTERRADIUS") * Gaudi::Units::mm;
   if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG)<<"---------2 barrelOuterRadius RMAX = "<<rmax<<endmsg;
   return rmax;
 }
 
 double 
 SCT_BarrelParameters::barrelLength() const{
-  double length =  db()->getDouble(m_SctBrlGeneral,"LENGTH") * GeoModelKernelUnits::mm;
+  double length =  db()->getDouble(m_SctBrlGeneral,"LENGTH") * Gaudi::Units::mm;
   if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG)<<"---------2 barrelLength B_LEN = "<<length<<endmsg;
   return length;
 }
 
 double 
 SCT_BarrelParameters::barrelIntermediateLength() const{
-  double interlen =  db()->getDouble(m_SctBrlGeneral,"INTERMEDIATELEN") * GeoModelKernelUnits::mm;
+  double interlen =  db()->getDouble(m_SctBrlGeneral,"INTERMEDIATELEN") * Gaudi::Units::mm;
   if (msgLvl(MSG::DEBUG)) msg(MSG::DEBUG)<<"---------2 barrelIntermediateLength B_IntermediateLEN = "
 	   <<interlen<<endmsg;
   return interlen;
@@ -373,7 +373,7 @@ SCT_BarrelParameters::barrelIntermediateLength() const{
 
 double 
 SCT_BarrelParameters::barrelServicesMaterialCylinderLength() const {
-  return db()->getDouble(m_SctBrlGeneral,"BRLSERVMATTHICK") * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_SctBrlGeneral,"BRLSERVMATTHICK") * Gaudi::Units::mm;
 }
 
 double 
diff --git a/InnerDetector/InDetDetDescr/SCT_SLHC_GeoModel/src/SCT_BarrelParametersOld.cxx b/InnerDetector/InDetDetDescr/SCT_SLHC_GeoModel/src/SCT_BarrelParametersOld.cxx
index d45829122a278293434afb3d042a5be0323420c1..f0390b07e21fb2c603e26226d4673ffc57aa6182 100644
--- a/InnerDetector/InDetDetDescr/SCT_SLHC_GeoModel/src/SCT_BarrelParametersOld.cxx
+++ b/InnerDetector/InDetDetDescr/SCT_SLHC_GeoModel/src/SCT_BarrelParametersOld.cxx
@@ -5,7 +5,7 @@
 #include "SCT_SLHC_GeoModel/SCT_BarrelParametersOld.h"
 #include "SCT_SLHC_GeoModel/SCT_GeometryManager.h"
 #include "RDBAccessSvc/IRDBRecord.h"
-#include "GeoModelKernel/Units.h"
+#include "GaudiKernel/SystemOfUnits.h"
 #include <iostream>
 #include <cmath>
 #include <stdio.h>
@@ -219,10 +219,10 @@ SCT_BarrelParametersOld::skiFirstStagger() const{
 
 double 
 SCT_BarrelParametersOld::skiRadialSep(int ilayer) const{
-  // return 2.8*GeoModelKernelUnits::mm;//mm
+  // return 2.8*Gaudi::Units::mm;//mm
   char paraName[50];
   sprintf(paraName, "L%d_MODULESRADIALSEPARATION", ilayer);
-  return (m_SCT_Parameters->find(paraName))->second * GeoModelKernelUnits::mm;
+  return (m_SCT_Parameters->find(paraName))->second * Gaudi::Units::mm;
 }
 
 int
@@ -256,22 +256,22 @@ double
 SCT_BarrelParametersOld::tilt(int ilayer) const{
   char paraName[50];
  sprintf(paraName, "L%d_TILT", ilayer);
-  std::cout<<"---------2 tilt layer TILT("<<ilayer<<") = "<<(m_SCT_Parameters->find(paraName))->second*GeoModelKernelUnits::degree<<std::endl;
-  return (m_SCT_Parameters->find(paraName))->second * GeoModelKernelUnits::degree;
+  std::cout<<"---------2 tilt layer TILT("<<ilayer<<") = "<<(m_SCT_Parameters->find(paraName))->second*Gaudi::Units::degree<<std::endl;
+  return (m_SCT_Parameters->find(paraName))->second * Gaudi::Units::degree;
 }
 
 double SCT_BarrelParametersOld::radius(int ilayer) const{
   char paraName[50];
   sprintf(paraName, "L%d_RLAY", ilayer);
-  std::cout<<"---------2 radius layer RLAY("<<ilayer<<") = "<<(m_SCT_Parameters->find(paraName))->second*GeoModelKernelUnits::cm<<std::endl;
-  return (m_SCT_Parameters->find(paraName))->second * GeoModelKernelUnits::cm;
+  std::cout<<"---------2 radius layer RLAY("<<ilayer<<") = "<<(m_SCT_Parameters->find(paraName))->second*Gaudi::Units::cm<<std::endl;
+  return (m_SCT_Parameters->find(paraName))->second * Gaudi::Units::cm;
 }
 
 double 
 SCT_BarrelParametersOld::cylLength(int ilayer) const{
   char paraName[50];
   sprintf(paraName, "L%d_CYLLENTGH", ilayer);
-  return (m_SCT_Parameters->find(paraName))->second * GeoModelKernelUnits::cm;
+  return (m_SCT_Parameters->find(paraName))->second * Gaudi::Units::cm;
 }
 
 bool SCT_BarrelParametersOld::doubleSided(int ilayer) const{
@@ -302,16 +302,16 @@ double
 SCT_BarrelParametersOld::supportCylInnerRadius(int ilayer) const{
   char paraName[50];
   sprintf(paraName, "L%d_RISUP", ilayer);
-  std::cout<<"---------2 supportCylInnerRadius RISUP("<<ilayer<<") = "<<(m_SCT_Parameters->find(paraName))->second*GeoModelKernelUnits::cm<<std::endl;
-  return (m_SCT_Parameters->find(paraName))->second * GeoModelKernelUnits::cm;
+  std::cout<<"---------2 supportCylInnerRadius RISUP("<<ilayer<<") = "<<(m_SCT_Parameters->find(paraName))->second*Gaudi::Units::cm<<std::endl;
+  return (m_SCT_Parameters->find(paraName))->second * Gaudi::Units::cm;
 }
 
 double 
 SCT_BarrelParametersOld::supportCylOuterRadius(int ilayer) const{
   char paraName[50];
   sprintf(paraName, "L%d_ROSUP", ilayer);
-  std::cout<<"---------2 supportCylOuterRadius ROSUP("<<ilayer<<") = "<<(m_SCT_Parameters->find(paraName))->second*GeoModelKernelUnits::cm<<std::endl;
-  return (m_SCT_Parameters->find(paraName))->second * GeoModelKernelUnits::cm;
+  std::cout<<"---------2 supportCylOuterRadius ROSUP("<<ilayer<<") = "<<(m_SCT_Parameters->find(paraName))->second*Gaudi::Units::cm<<std::endl;
+  return (m_SCT_Parameters->find(paraName))->second * Gaudi::Units::cm;
 }
 std::string 
 SCT_BarrelParametersOld::supportCylMaterial(int ilayer) const{
@@ -331,45 +331,45 @@ SCT_BarrelParametersOld::numLayers() const{
 
 double 
 SCT_BarrelParametersOld::barrelInnerRadius() const{
-  std::cout<<"---------2 barrelInnerRadius RMIN = "<<(m_SCT_Parameters->find("B_RMIN"))->second * GeoModelKernelUnits::cm<<std::endl;
+  std::cout<<"---------2 barrelInnerRadius RMIN = "<<(m_SCT_Parameters->find("B_RMIN"))->second * Gaudi::Units::cm<<std::endl;
   
-  return (m_SCT_Parameters->find("B_RMIN"))->second * GeoModelKernelUnits::cm;
+  return (m_SCT_Parameters->find("B_RMIN"))->second * Gaudi::Units::cm;
 }
 
 double 
 SCT_BarrelParametersOld::barrelIntermediateRadius() const{
-  std::cout<<"---------2 barrelIntermediateRadius RINTERMEDIATE = "<<(m_SCT_Parameters->find("B_RINTERMEDIATE"))->second * GeoModelKernelUnits::cm<<std::endl;
+  std::cout<<"---------2 barrelIntermediateRadius RINTERMEDIATE = "<<(m_SCT_Parameters->find("B_RINTERMEDIATE"))->second * Gaudi::Units::cm<<std::endl;
   
-  return (m_SCT_Parameters->find("B_RINTERMEDIATE"))->second * GeoModelKernelUnits::cm;
+  return (m_SCT_Parameters->find("B_RINTERMEDIATE"))->second * Gaudi::Units::cm;
 }
 
 double 
 SCT_BarrelParametersOld::barrelOuterRadius() const{
-  std::cout<<"---------2 barrelOuterRadius RMAX = "<<(m_SCT_Parameters->find("B_RMAX"))->second * GeoModelKernelUnits::cm<<std::endl;
+  std::cout<<"---------2 barrelOuterRadius RMAX = "<<(m_SCT_Parameters->find("B_RMAX"))->second * Gaudi::Units::cm<<std::endl;
   
-  return (m_SCT_Parameters->find("B_RMAX"))->second * GeoModelKernelUnits::cm;
+  return (m_SCT_Parameters->find("B_RMAX"))->second * Gaudi::Units::cm;
 }
 
 double 
 SCT_BarrelParametersOld::barrelLength() const{
   std::cout<<"---------2 barrelLength B_LEN = "
-	   <<(m_SCT_Parameters->find("B_LEN"))->second * GeoModelKernelUnits::cm<<std::endl;
+	   <<(m_SCT_Parameters->find("B_LEN"))->second * Gaudi::Units::cm<<std::endl;
   
-  return (m_SCT_Parameters->find("B_LEN"))->second * GeoModelKernelUnits::cm;
+  return (m_SCT_Parameters->find("B_LEN"))->second * Gaudi::Units::cm;
 }
 
 double 
 SCT_BarrelParametersOld::barrelIntermediateLength() const{
   std::cout<<"---------2 barrelIntermediateLength B_IntermediateLEN = "
-	   <<(m_SCT_Parameters->find("B_INTERMEDIATELEN"))->second * GeoModelKernelUnits::cm<<std::endl;
+	   <<(m_SCT_Parameters->find("B_INTERMEDIATELEN"))->second * Gaudi::Units::cm<<std::endl;
   
-  return (m_SCT_Parameters->find("B_INTERMEDIATELEN"))->second * GeoModelKernelUnits::cm;
+  return (m_SCT_Parameters->find("B_INTERMEDIATELEN"))->second * Gaudi::Units::cm;
 }
 
 double SCT_BarrelParametersOld::barrelServicesMaterialCylinderLength() const {
   char paraName[50];
   sprintf(paraName, "BARRELSERVICESMATERIALCYLINDERLENGTH");
-  return (double)(m_SCT_Parameters->find(paraName))->second * GeoModelKernelUnits::cm;
+  return (double)(m_SCT_Parameters->find(paraName))->second * Gaudi::Units::cm;
 }
 
 double SCT_BarrelParametersOld::barrelServicesMaterialIncreaseFactor() const {
diff --git a/InnerDetector/InDetDetDescr/SCT_SLHC_GeoModel/src/SCT_ComponentFactory.cxx b/InnerDetector/InDetDetDescr/SCT_SLHC_GeoModel/src/SCT_ComponentFactory.cxx
index 7b22c81779b154dc456279b4946099cacfe005bb..77d48286700efd716b0ba9f1fdbe944b165869d5 100644
--- a/InnerDetector/InDetDetDescr/SCT_SLHC_GeoModel/src/SCT_ComponentFactory.cxx
+++ b/InnerDetector/InDetDetDescr/SCT_SLHC_GeoModel/src/SCT_ComponentFactory.cxx
@@ -3,7 +3,7 @@
 */
 
 #include "SCT_SLHC_GeoModel/SCT_ComponentFactory.h"
-#include "GeoModelKernel/Units.h"
+#include "GaudiKernel/SystemOfUnits.h"
 
 #include <sstream>
 #include <string>
@@ -15,7 +15,7 @@ namespace InDetDDSLHC {
 SCT_DetectorManager * SCT_ComponentFactory::s_detectorManager = 0;
 const SCT_GeometryManager * SCT_ComponentFactory::s_geometryManager = 0;
 
-double SCT_ComponentFactory::s_epsilon = 1.0e-6 * GeoModelKernelUnits::mm;
+double SCT_ComponentFactory::s_epsilon = 1.0e-6 * Gaudi::Units::mm;
 
 SCT_ComponentFactory::SCT_ComponentFactory(const std::string & name) 
   : m_name(name)
diff --git a/InnerDetector/InDetDetDescr/SCT_SLHC_GeoModel/src/SCT_DetectorFactory.cxx b/InnerDetector/InDetDetDescr/SCT_SLHC_GeoModel/src/SCT_DetectorFactory.cxx
index 3010efc905c8ab30e2d3ee1eed8055a87fdd17d0..8d180d7f56daa243a669e7d024c7f120bd726798 100644
--- a/InnerDetector/InDetDetDescr/SCT_SLHC_GeoModel/src/SCT_DetectorFactory.cxx
+++ b/InnerDetector/InDetDetDescr/SCT_SLHC_GeoModel/src/SCT_DetectorFactory.cxx
@@ -45,7 +45,7 @@
 #include "RDBAccessSvc/IRDBRecord.h"
 
 #include "GeoModelKernel/GeoDefinitions.h"
-
+#include "GaudiKernel/PhysicalConstants.h"
 #include "GeoModelKernel/Units.h"
 
 #include <iostream> 
@@ -169,7 +169,7 @@ void SCT_DetectorFactory::create(GeoPhysVol *world){
     sctEnvelope = sctEnvelopeTmp;
   } else {
     // Build as PCon    
-    GeoPcon* sctEnvelopeTmp  = new GeoPcon(0.,2*GeoModelKernelUnits::pi);
+    GeoPcon* sctEnvelopeTmp  = new GeoPcon(0.,2*Gaudi::Units::pi);
     // table contains +ve z values only and envelope is assumed to be symmetric around z.
     int numPlanes = generalParameters->envelopeNumPlanes();
     for (int i = 0; i < numPlanes * 2; i++) {
@@ -238,7 +238,7 @@ void SCT_DetectorFactory::create(GeoPhysVol *world){
     idFwdMinus.setBarrelEC(-2);
     GeoVPhysVol* forwardMinus = sctForward.build(idFwdMinus);
     GeoTrf::Transform3D rot;
-    rot = GeoTrf::RotateY3D(180*GeoModelKernelUnits::degree);
+    rot = GeoTrf::RotateY3D(180*Gaudi::Units::degree);
     GeoTrf::Transform3D fwdTransformMinus = rot*fwdTransformPlus;
     GeoAlignableTransform* fwdGeoTransformMinus = new GeoAlignableTransform(fwdTransformMinus);
     sct->add(new GeoNameTag("ForwardMinus"));
@@ -246,7 +246,7 @@ void SCT_DetectorFactory::create(GeoPhysVol *world){
     sct->add(forwardMinus);
   
     //services material between barrel and endcap 
-    double safety = 1*GeoModelKernelUnits::mm;//1mm, just to avoid any clash
+    double safety = 1*Gaudi::Units::mm;//1mm, just to avoid any clash
     double length = sctForward.zCenter()-0.5*sctForward.length()-0.5*sctBarrel.length()-safety;//
     double barrelServicesCylinderLength  = barrelParameters->barrelServicesMaterialCylinderLength();
     //use user lenght paramters only if small than the gap
@@ -264,11 +264,11 @@ void SCT_DetectorFactory::create(GeoPhysVol *world){
     double materialIncreaseFactor              = barrelParameters->barrelServicesMaterialIncreaseFactor();
 
     if (barrelServicesCylinderLength > 0 && materialIncreaseFactor > 0 && !barrelParameters->barrelServicesMaterial().empty()) {
-      //double cf_density                          = 0.189*materialIncreaseFactor*GeoModelKernelUnits::g/GeoModelKernelUnits::cm3;
-      //msg(MSG::INFO) <<"----length "<<barrelServicesCylinderLength<<" material "<<barrelParameters->barrelServicesMaterial()<<" IncreaseFactor "<<materialIncreaseFactor<<" cf_density (GeoModelKernelUnits::g/GeoModelKernelUnits::cm3) "<<cf_density/(GeoModelKernelUnits::g/GeoModelKernelUnits::cm3) << endmsg;
+      //double cf_density                          = 0.189*materialIncreaseFactor*GeoModelKernelUnits::g/Gaudi::Units::cm3;
+      //msg(MSG::INFO) <<"----length "<<barrelServicesCylinderLength<<" material "<<barrelParameters->barrelServicesMaterial()<<" IncreaseFactor "<<materialIncreaseFactor<<" cf_density (GeoModelKernelUnits::g/Gaudi::Units::cm3) "<<cf_density/(GeoModelKernelUnits::g/Gaudi::Units::cm3) << endmsg;
       //const GeoMaterial* barrel_serivesMaterial = materials->getMaterial(barrelParameters->barrelServicesMaterial(), cf_density, "UpgradeSCTBarrel_ServicesMaterial");
       const GeoMaterial* barrel_serivesMaterial = materials->getMaterialScaled(barrelParameters->barrelServicesMaterial(), materialIncreaseFactor, "UpgradeSCTBarrel_ServicesMaterial");
-      msg(MSG::INFO) <<"----length "<<barrelServicesCylinderLength<<" material "<<barrelParameters->barrelServicesMaterial()<<" IncreaseFactor "<<materialIncreaseFactor<<" density (GeoModelKernelUnits::g/GeoModelKernelUnits::cm3) "<< barrel_serivesMaterial->getDensity()/(GeoModelKernelUnits::g/GeoModelKernelUnits::cm3) << endmsg;
+      msg(MSG::INFO) <<"----length "<<barrelServicesCylinderLength<<" material "<<barrelParameters->barrelServicesMaterial()<<" IncreaseFactor "<<materialIncreaseFactor<<" density (GeoModelKernelUnits::g/Gaudi::Units::cm3) "<< barrel_serivesMaterial->getDensity()/(GeoModelKernelUnits::g/Gaudi::Units::cm3) << endmsg;
   
     
       const GeoTube*   barrelPos_servicesMaterialShape    = new GeoTube(inner_radius, outer_radius, 0.5*barrelServicesCylinderLength);
diff --git a/InnerDetector/InDetDetDescr/SCT_SLHC_GeoModel/src/SCT_ForwardModuleParameters.cxx b/InnerDetector/InDetDetDescr/SCT_SLHC_GeoModel/src/SCT_ForwardModuleParameters.cxx
index fde5723f681371d9eb720cd24414cba6692e21ec..650b1e4d8729314152fba1f5822c59aee7e24649 100644
--- a/InnerDetector/InDetDetDescr/SCT_SLHC_GeoModel/src/SCT_ForwardModuleParameters.cxx
+++ b/InnerDetector/InDetDetDescr/SCT_SLHC_GeoModel/src/SCT_ForwardModuleParameters.cxx
@@ -6,8 +6,7 @@
 #include "SCT_SLHC_GeoModel/SCT_DataBase.h"
 #include "RDBAccessSvc/IRDBRecordset.h"
 #include "GeometryDBSvc/IGeometryDBSvc.h"
-
-#include "GeoModelKernel/Units.h"
+#include "GaudiKernel/SystemOfUnits.h"
 
 #include <cmath>
 #include <iostream>
@@ -42,55 +41,55 @@ SCT_ForwardModuleParameters::fwdSensorNumWafers(int iModuleType) const
 double 
 SCT_ForwardModuleParameters::moduleInterSidesGap(int iModuleType) const
 {
-  return db()->getDouble(m_SctFwdModule,"INTERSIDESGAP",iModuleType) * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_SctFwdModule,"INTERSIDESGAP",iModuleType) * Gaudi::Units::mm;
 }
 
 double 
 SCT_ForwardModuleParameters::fwdSensorThickness(int iModuleType) const
 {
-  return db()->getDouble(m_SctFwdSensor,"THICKNESS",iModuleType) * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_SctFwdSensor,"THICKNESS",iModuleType) * Gaudi::Units::mm;
 }
 
 double 
 SCT_ForwardModuleParameters::fwdSensorLength(int iModuleType) const
 {
-  return db()->getDouble(m_SctFwdSensor,"LENGTH",iModuleType) * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_SctFwdSensor,"LENGTH",iModuleType) * Gaudi::Units::mm;
 }
 
 double 
 SCT_ForwardModuleParameters::fwdSensorInnerWidth(int iModuleType) const
 {
-  return db()->getDouble(m_SctFwdSensor,"INNERWIDTH",iModuleType) * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_SctFwdSensor,"INNERWIDTH",iModuleType) * Gaudi::Units::mm;
 }
 
 double 
 SCT_ForwardModuleParameters::fwdSensorOuterWidth(int iModuleType) const
 {
-  return db()->getDouble(m_SctFwdSensor,"OUTERWIDTH",iModuleType) * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_SctFwdSensor,"OUTERWIDTH",iModuleType) * Gaudi::Units::mm;
 }
 
 double 
 SCT_ForwardModuleParameters::fwdSensorInnerRadius(int iModuleType) const
 {
-  return db()->getDouble(m_SctFwdSensor,"INNERRADIUS",iModuleType) * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_SctFwdSensor,"INNERRADIUS",iModuleType) * Gaudi::Units::mm;
 }
 
 double 
 SCT_ForwardModuleParameters::fwdSensorOuterRadius(int iModuleType) const
 {
-  return db()->getDouble(m_SctFwdSensor,"OUTERRADIUS",iModuleType) * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_SctFwdSensor,"OUTERRADIUS",iModuleType) * Gaudi::Units::mm;
 }
 
 double 
 SCT_ForwardModuleParameters::fwdSensorMiddleRadius(int iModuleType) const
 {
-  return db()->getDouble(m_SctFwdSensor,"MIDDLERADIUS",iModuleType) * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_SctFwdSensor,"MIDDLERADIUS",iModuleType) * Gaudi::Units::mm;
 }
 
 double 
 SCT_ForwardModuleParameters::fwdSensorDeltaPhi(int iModuleType) const
 {
-   return db()->getDouble(m_SctFwdSensor,"DELTAPHI",iModuleType) * GeoModelKernelUnits::mm;
+   return db()->getDouble(m_SctFwdSensor,"DELTAPHI",iModuleType) * Gaudi::Units::mm;
 }
 
 std::string 
@@ -102,13 +101,13 @@ SCT_ForwardModuleParameters::fwdSensorMaterial(int iModuleType) const
 double 
 SCT_ForwardModuleParameters::fwdSensorActiveHalfLength(int iModuleType) const
 {
-  return db()->getDouble(m_SctFwdSensor,"ACTIVEHALFLENGTH",iModuleType) * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_SctFwdSensor,"ACTIVEHALFLENGTH",iModuleType) * Gaudi::Units::mm;
 }  
 
 double 
 SCT_ForwardModuleParameters::fwdSensorAngularPitch(int iModuleType) const
 {
-  return db()->getDouble(m_SctFwdSensor,"ANGULARPITCH",iModuleType) * GeoModelKernelUnits::radian;
+  return db()->getDouble(m_SctFwdSensor,"ANGULARPITCH",iModuleType) * Gaudi::Units::radian;
 }
 
 int
@@ -120,7 +119,7 @@ SCT_ForwardModuleParameters::fwdSensorNumReadoutStrips(int iModuleType) const
 double 
 SCT_ForwardModuleParameters::fwdModuleStereoAngle(int iModuleType) const
 {
-  return db()->getDouble(m_SctFwdModule,"STEREOANGLE",iModuleType) * GeoModelKernelUnits::milliradian;
+  return db()->getDouble(m_SctFwdModule,"STEREOANGLE",iModuleType) * Gaudi::Units::milliradian;
 }
 
 int 
@@ -138,24 +137,24 @@ SCT_ForwardModuleParameters::fwdSensorChargeCarrier(int iModuleType) const
 double 
 SCT_ForwardModuleParameters::fwdSpineThickness(int iModuleType) const
 {
-  return db()->getDouble(m_SctFwdSpine,"THICKNESS",iModuleType) * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_SctFwdSpine,"THICKNESS",iModuleType) * Gaudi::Units::mm;
 }
 
 double 
 SCT_ForwardModuleParameters::fwdSpineLength(int iModuleType) const
 {
-  return db()->getDouble(m_SctFwdSpine,"LENGTH",iModuleType) * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_SctFwdSpine,"LENGTH",iModuleType) * Gaudi::Units::mm;
 }
 
 double 
 SCT_ForwardModuleParameters::fwdSpineMiddleRadius(int iModuleType) const
 {
-  return db()->getDouble(m_SctFwdSpine,"MIDDLERADIUS",iModuleType) * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_SctFwdSpine,"MIDDLERADIUS",iModuleType) * Gaudi::Units::mm;
 }
 
 double 
 SCT_ForwardModuleParameters::fwdSpineDeltaPhi(int iModuleType) const{
-  return db()->getDouble(m_SctFwdSpine,"DELTAPHI",iModuleType) * GeoModelKernelUnits::radian;
+  return db()->getDouble(m_SctFwdSpine,"DELTAPHI",iModuleType) * Gaudi::Units::radian;
 }
 
 std::string 
diff --git a/InnerDetector/InDetDetDescr/SCT_SLHC_GeoModel/src/SCT_ForwardModuleParametersOld.cxx b/InnerDetector/InDetDetDescr/SCT_SLHC_GeoModel/src/SCT_ForwardModuleParametersOld.cxx
index 07e4cc36fd25602efc74523001e01f60f1c595f1..c822eb747541bceb5af5731f156e9ddc88a63c7a 100644
--- a/InnerDetector/InDetDetDescr/SCT_SLHC_GeoModel/src/SCT_ForwardModuleParametersOld.cxx
+++ b/InnerDetector/InDetDetDescr/SCT_SLHC_GeoModel/src/SCT_ForwardModuleParametersOld.cxx
@@ -6,8 +6,7 @@
 #include "SCT_SLHC_GeoModel/SCT_DataBase.h"
 #include "RDBAccessSvc/IRDBRecordset.h"
 #include "RDBAccessSvc/IRDBRecord.h"
-
-#include "GeoModelKernel/Units.h"
+#include "GaudiKernel/SystemOfUnits.h"
 
 #include <cmath>
 #include <iostream>
@@ -116,7 +115,7 @@ SCT_ForwardModuleParametersOld::moduleInterSidesGap(int iModuleType) const
 {
   char paraName[50];
   sprintf(paraName, "FWD_M%d_INTERSIDESGAP", iModuleType);
-  return (double)(m_SCT_Fwd_Modules->find(paraName))->second*GeoModelKernelUnits::mm;
+  return (double)(m_SCT_Fwd_Modules->find(paraName))->second*Gaudi::Units::mm;
 }
 
 double 
@@ -124,9 +123,9 @@ SCT_ForwardModuleParametersOld::fwdSensorThickness(int iModuleType) const
 {
   char paraName[50];
   sprintf(paraName, "FWD_M%d_SENSORTHICKNESS", iModuleType);
-  return (double)(m_SCT_Fwd_Modules->find(paraName))->second*GeoModelKernelUnits::mm;
-  //---return  2.0 * m_rdb->zsmo()->getDouble("DZSC") * GeoModelKernelUnits::cm;
- //---return  m_rdb->fwdSensor(iModuleType)->getDouble("THICKNESS") * GeoModelKernelUnits::mm;
+  return (double)(m_SCT_Fwd_Modules->find(paraName))->second*Gaudi::Units::mm;
+  //---return  2.0 * m_rdb->zsmo()->getDouble("DZSC") * Gaudi::Units::cm;
+ //---return  m_rdb->fwdSensor(iModuleType)->getDouble("THICKNESS") * Gaudi::Units::mm;
 }
 
 double 
@@ -134,23 +133,23 @@ SCT_ForwardModuleParametersOld::fwdSensorLength(int iModuleType) const
 {
   char paraName[50];
   sprintf(paraName, "FWD_M%d_SENSORLENGTH", iModuleType);
-  return (double)(m_SCT_Fwd_Modules->find(paraName))->second*GeoModelKernelUnits::mm;
-  //---return  m_rdb->zsmi(iModuleType)->getDouble("RLF") * GeoModelKernelUnits::cm;
-//---return  m_rdb->fwdSensor(iModuleType)->getDouble("LENGTHFAR") * GeoModelKernelUnits::mm;
+  return (double)(m_SCT_Fwd_Modules->find(paraName))->second*Gaudi::Units::mm;
+  //---return  m_rdb->zsmi(iModuleType)->getDouble("RLF") * Gaudi::Units::cm;
+//---return  m_rdb->fwdSensor(iModuleType)->getDouble("LENGTHFAR") * Gaudi::Units::mm;
 }
 double 
 SCT_ForwardModuleParametersOld::fwdSensorInnerWidth(int iModuleType) const
 {
   char paraName[50];
   sprintf(paraName, "FWD_M%d_SENSORINNERWIDTH", iModuleType);
-  return (double)(m_SCT_Fwd_Modules->find(paraName))->second*GeoModelKernelUnits::mm;
+  return (double)(m_SCT_Fwd_Modules->find(paraName))->second*Gaudi::Units::mm;
 }
 double 
 SCT_ForwardModuleParametersOld::fwdSensorOuterWidth(int iModuleType) const
 {
   char paraName[50];
   sprintf(paraName, "FWD_M%d_SENSOROUTERWIDTH", iModuleType);
-  return (double)(m_SCT_Fwd_Modules->find(paraName))->second*GeoModelKernelUnits::mm;
+  return (double)(m_SCT_Fwd_Modules->find(paraName))->second*Gaudi::Units::mm;
 }
 
 double 
@@ -158,9 +157,9 @@ SCT_ForwardModuleParametersOld::fwdSensorInnerRadius(int iModuleType) const
 {
   char paraName[50];
   sprintf(paraName, "FWD_M%d_SENSORINNERRADIUS", iModuleType);
-  return (double)(m_SCT_Fwd_Modules->find(paraName))->second*GeoModelKernelUnits::mm;
-  //---return  m_rdb->zsmi(iModuleType)->getDouble("RINNERF") * GeoModelKernelUnits::cm;
-  //---return  m_rdb->fwdSensor(iModuleType)->getDouble("INNERWIDTHFAR") * GeoModelKernelUnits::mm;
+  return (double)(m_SCT_Fwd_Modules->find(paraName))->second*Gaudi::Units::mm;
+  //---return  m_rdb->zsmi(iModuleType)->getDouble("RINNERF") * Gaudi::Units::cm;
+  //---return  m_rdb->fwdSensor(iModuleType)->getDouble("INNERWIDTHFAR") * Gaudi::Units::mm;
 }
 
 double 
@@ -168,9 +167,9 @@ SCT_ForwardModuleParametersOld::fwdSensorOuterRadius(int iModuleType) const
 {
   char paraName[50];
   sprintf(paraName, "FWD_M%d_SENSOROUTERRADIUS", iModuleType);
-  return (double)(m_SCT_Fwd_Modules->find(paraName))->second*GeoModelKernelUnits::mm;
-  //---return  m_rdb->zsmi(iModuleType)->getDouble("ROUTERF") * GeoModelKernelUnits::cm;
-  //---return  m_rdb->fwdSensor(iModuleType)->getDouble("OUTERWIDTHFAR") * GeoModelKernelUnits::mm;
+  return (double)(m_SCT_Fwd_Modules->find(paraName))->second*Gaudi::Units::mm;
+  //---return  m_rdb->zsmi(iModuleType)->getDouble("ROUTERF") * Gaudi::Units::cm;
+  //---return  m_rdb->fwdSensor(iModuleType)->getDouble("OUTERWIDTHFAR") * Gaudi::Units::mm;
 }
 
 double 
@@ -178,15 +177,15 @@ SCT_ForwardModuleParametersOld::fwdSensorMiddleRadius(int iModuleType) const
 {
   char paraName[50];
   sprintf(paraName, "FWD_M%d_SENSORMIDDLERADIUS", iModuleType);
-  return (double)(m_SCT_Fwd_Modules->find(paraName))->second*GeoModelKernelUnits::mm;
-  //---return  m_rdb->zsmi(iModuleType)->getDouble("ROUTERF") * GeoModelKernelUnits::cm;
-//---return  m_rdb->fwdSensor(iModuleType)->getDouble("OUTERWIDTHFAR") * GeoModelKernelUnits::mm;
+  return (double)(m_SCT_Fwd_Modules->find(paraName))->second*Gaudi::Units::mm;
+  //---return  m_rdb->zsmi(iModuleType)->getDouble("ROUTERF") * Gaudi::Units::cm;
+//---return  m_rdb->fwdSensor(iModuleType)->getDouble("OUTERWIDTHFAR") * Gaudi::Units::mm;
 }
 double 
 SCT_ForwardModuleParametersOld::fwdSensorDeltaPhi(int iModuleType) const{
   char paraName[50];
   sprintf(paraName, "FWD_M%d_SENSORDELTAPHI", iModuleType);
-  return (double)(m_SCT_Fwd_Modules->find(paraName))->second*GeoModelKernelUnits::radian;
+  return (double)(m_SCT_Fwd_Modules->find(paraName))->second*Gaudi::Units::radian;
 }
 
 std::string 
@@ -203,9 +202,9 @@ SCT_ForwardModuleParametersOld::fwdSensorActiveHalfLength(int iModuleType) const
 {
   char paraName[50];
   sprintf(paraName, "FWD_M%d_ACTIVEHALFLENGTH", iModuleType);
-  return (double)(m_SCT_Fwd_Modules->find(paraName))->second*GeoModelKernelUnits::mm;
-  //---return  m_rdb->zsmi(iModuleType)->getDouble("RSEF") * GeoModelKernelUnits::cm;
- //---return  m_rdb->fwdSensor(iModuleType)->getDouble("ACTIVEHALFLENGTHFAR") * GeoModelKernelUnits::mm;
+  return (double)(m_SCT_Fwd_Modules->find(paraName))->second*Gaudi::Units::mm;
+  //---return  m_rdb->zsmi(iModuleType)->getDouble("RSEF") * Gaudi::Units::cm;
+ //---return  m_rdb->fwdSensor(iModuleType)->getDouble("ACTIVEHALFLENGTHFAR") * Gaudi::Units::mm;
 }
 
 double 
@@ -213,9 +212,9 @@ SCT_ForwardModuleParametersOld::fwdSensorAngularPitch(int iModuleType) const
 {
   char paraName[50];
   sprintf(paraName, "FWD_M%d_ANGULARPITCH", iModuleType);
-  return (double)(m_SCT_Fwd_Modules->find(paraName))->second*GeoModelKernelUnits::radian;
-  //---return  m_rdb->zsmi(iModuleType)->getDouble("PHISTR") * GeoModelKernelUnits::radian;
-  //---return  m_rdb->fwdSensor(iModuleType)->getDouble("ANGULARPITCH") * GeoModelKernelUnits::radian;
+  return (double)(m_SCT_Fwd_Modules->find(paraName))->second*Gaudi::Units::radian;
+  //---return  m_rdb->zsmi(iModuleType)->getDouble("PHISTR") * Gaudi::Units::radian;
+  //---return  m_rdb->fwdSensor(iModuleType)->getDouble("ANGULARPITCH") * Gaudi::Units::radian;
 }
 
 int
@@ -233,9 +232,9 @@ SCT_ForwardModuleParametersOld::fwdModuleStereoAngle(int iModuleType) const
 {
   char paraName[50];
   sprintf(paraName, "FWD_M%d_STEREOANGLE", iModuleType);
-  return (double)(m_SCT_Fwd_Modules->find(paraName))->second*GeoModelKernelUnits::milliradian;
-  //---return 40 * GeoModelKernelUnits::milliradian;
-  //---return m_rdb->fwdModule(iModuleType)->getDouble("STEREOANGLE") * GeoModelKernelUnits::milliradian;
+  return (double)(m_SCT_Fwd_Modules->find(paraName))->second*Gaudi::Units::milliradian;
+  //---return 40 * Gaudi::Units::milliradian;
+  //---return m_rdb->fwdModule(iModuleType)->getDouble("STEREOANGLE") * Gaudi::Units::milliradian;
 }
 
 //
@@ -246,9 +245,9 @@ SCT_ForwardModuleParametersOld::fwdSpineThickness(int iModuleType) const
 {
   char paraName[50];
   sprintf(paraName, "FWD_M%d_SPINETHICKNESS", iModuleType);
-  return (double)(m_SCT_Fwd_Modules->find(paraName))->second*GeoModelKernelUnits::mm;
-  //---return 1*GeoModelKernelUnits::mm;
-  //---return  m_rdb->fwdSpine(iModuleType)->getDouble("THICKNESS") * GeoModelKernelUnits::mm;
+  return (double)(m_SCT_Fwd_Modules->find(paraName))->second*Gaudi::Units::mm;
+  //---return 1*Gaudi::Units::mm;
+  //---return  m_rdb->fwdSpine(iModuleType)->getDouble("THICKNESS") * Gaudi::Units::mm;
 }
 
 double 
@@ -256,11 +255,11 @@ SCT_ForwardModuleParametersOld::fwdSpineLength(int iModuleType) const
 {
   char paraName[50];
   sprintf(paraName, "FWD_M%d_SPINELENGTH", iModuleType);
-  return (double)(m_SCT_Fwd_Modules->find(paraName))->second*GeoModelKernelUnits::mm;
-  //return 8*GeoModelKernelUnits::cm;
-  //---  return (m_rdb->fwdSensor(iModuleType)->getDouble("LENGTHNEAR") * GeoModelKernelUnits::mm
-  //---	  + m_rdb->fwdSensor(iModuleType)->getDouble("LENGTHFAR") * GeoModelKernelUnits::mm + 2*GeoModelKernelUnits::cm);
-//return  m_rdb->fwdSpine(iModuleType)->getDouble("WIDTH") * GeoModelKernelUnits::mm;
+  return (double)(m_SCT_Fwd_Modules->find(paraName))->second*Gaudi::Units::mm;
+  //return 8*Gaudi::Units::cm;
+  //---  return (m_rdb->fwdSensor(iModuleType)->getDouble("LENGTHNEAR") * Gaudi::Units::mm
+  //---	  + m_rdb->fwdSensor(iModuleType)->getDouble("LENGTHFAR") * Gaudi::Units::mm + 2*Gaudi::Units::cm);
+//return  m_rdb->fwdSpine(iModuleType)->getDouble("WIDTH") * Gaudi::Units::mm;
 }
 
 double 
@@ -268,13 +267,13 @@ SCT_ForwardModuleParametersOld::fwdSpineMiddleRadius(int iModuleType) const
 {
   char paraName[50];
   sprintf(paraName, "FWD_M%d_SPINEMIDDLERADIUS", iModuleType);
-  return (double)(m_SCT_Fwd_Modules->find(paraName))->second*GeoModelKernelUnits::mm;
+  return (double)(m_SCT_Fwd_Modules->find(paraName))->second*Gaudi::Units::mm;
 }
 double 
 SCT_ForwardModuleParametersOld::fwdSpineDeltaPhi(int iModuleType) const{
   char paraName[50];
   sprintf(paraName, "FWD_M%d_SPINEDELTAPHI", iModuleType);
-  return (double)(m_SCT_Fwd_Modules->find(paraName))->second*GeoModelKernelUnits::radian;
+  return (double)(m_SCT_Fwd_Modules->find(paraName))->second*Gaudi::Units::radian;
 }
 
 std::string 
diff --git a/InnerDetector/InDetDetDescr/SCT_SLHC_GeoModel/src/SCT_ForwardParameters.cxx b/InnerDetector/InDetDetDescr/SCT_SLHC_GeoModel/src/SCT_ForwardParameters.cxx
index 7b9d76a7f0bd4def13a4789513cf5d2512dc6ba6..3c7af8b84e5cb0d757502da707dda62092984826 100644
--- a/InnerDetector/InDetDetDescr/SCT_SLHC_GeoModel/src/SCT_ForwardParameters.cxx
+++ b/InnerDetector/InDetDetDescr/SCT_SLHC_GeoModel/src/SCT_ForwardParameters.cxx
@@ -7,9 +7,7 @@
 #include "SCT_SLHC_GeoModel/SCT_DataBase.h"
 #include "RDBAccessSvc/IRDBRecordset.h"
 #include "GeometryDBSvc/IGeometryDBSvc.h"
-
-
-#include "GeoModelKernel/Units.h"
+#include "GaudiKernel/SystemOfUnits.h"
 
 #include <iostream>
 #include <cmath>
@@ -72,7 +70,7 @@ SCT_ForwardParameters::fwdNumWheels() const
 double
 SCT_ForwardParameters::fwdWheelZPosition(int iWheel) const
 {
-  return db()->getDouble(m_SctFwdWheel,"ZPOSITION",iWheel) * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_SctFwdWheel,"ZPOSITION",iWheel) * Gaudi::Units::mm;
 }
 
 int
@@ -107,19 +105,19 @@ SCT_ForwardParameters::getRingMapIndex(int iWheel, int iRingIndex) const
 double
 SCT_ForwardParameters::fwdDiscSupportInnerRadius(int iWheel) const
 {
-  return db()->getDouble(m_SctFwdDiscSupport,"INNERRADIUS",iWheel) * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_SctFwdDiscSupport,"INNERRADIUS",iWheel) * Gaudi::Units::mm;
 } 
 
 double
 SCT_ForwardParameters::fwdDiscSupportOuterRadius(int iWheel) const
 {
-  return db()->getDouble(m_SctFwdDiscSupport,"OUTERRADIUS",iWheel) * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_SctFwdDiscSupport,"OUTERRADIUS",iWheel) * Gaudi::Units::mm;
 }
  
 double
 SCT_ForwardParameters::fwdDiscSupportThickness(int iWheel) const
 {
-  return db()->getDouble(m_SctFwdDiscSupport,"THICKNESS",iWheel) * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_SctFwdDiscSupport,"THICKNESS",iWheel) * Gaudi::Units::mm;
 } 
 
 std::string
@@ -142,37 +140,37 @@ SCT_ForwardParameters::fwdRingNumModules(int iRingType) const
 double
 SCT_ForwardParameters::fwdRingInnerRadius(int iRingType) const
 {
-  return db()->getDouble(m_SctFwdRing,"INNERRADIUS",iRingType) * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_SctFwdRing,"INNERRADIUS",iRingType) * Gaudi::Units::mm;
 }
 
 double
 SCT_ForwardParameters::fwdRingMiddleRadius(int iRingType) const
 {
-  return db()->getDouble(m_SctFwdRing,"MIDDLERADIUS",iRingType) * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_SctFwdRing,"MIDDLERADIUS",iRingType) * Gaudi::Units::mm;
 }
 
 double
 SCT_ForwardParameters::fwdRingOuterRadius(int iRingType) const
 {
-  return db()->getDouble(m_SctFwdRing,"OUTERRADIUS",iRingType) * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_SctFwdRing,"OUTERRADIUS",iRingType) * Gaudi::Units::mm;
 }
 
 double
 SCT_ForwardParameters::fwdRingOffset(int iRingType) const
 {
-  return db()->getDouble(m_SctFwdRing,"OFFSET",iRingType) * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_SctFwdRing,"OFFSET",iRingType) * Gaudi::Units::mm;
 }
 
 double
 SCT_ForwardParameters::fwdRingModuleStagger(int iRingType) const
 {
-  return db()->getDouble(m_SctFwdRing,"MODULESTAGGER",iRingType) * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_SctFwdRing,"MODULESTAGGER",iRingType) * Gaudi::Units::mm;
 }
 
 double
 SCT_ForwardParameters::fwdRingPhiOfRefModule(int iRingType) const
 {
-  return db()->getDouble(m_SctFwdRing,"PHIOFREFMODULE",iRingType) * GeoModelKernelUnits::radian;
+  return db()->getDouble(m_SctFwdRing,"PHIOFREFMODULE",iRingType) * Gaudi::Units::radian;
 }
 
 int
@@ -205,37 +203,37 @@ SCT_ForwardParameters::fwdWheelStereoType(m_iWheel, int iRing) const
 double
 SCT_ForwardParameters::fwdInnerRadius() const
 {
-  return db()->getDouble(m_SctFwdGeneral,"INNERRADIUS") * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_SctFwdGeneral,"INNERRADIUS") * Gaudi::Units::mm;
 }
 
 double
 SCT_ForwardParameters::fwdIntermediateRadius() const
 {
-  return db()->getDouble(m_SctFwdGeneral,"RINTERMEDIATE") * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_SctFwdGeneral,"RINTERMEDIATE") * Gaudi::Units::mm;
 }
 
 double
 SCT_ForwardParameters::fwdOuterRadius() const
 {
-  return db()->getDouble(m_SctFwdGeneral,"OUTERRADIUS") * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_SctFwdGeneral,"OUTERRADIUS") * Gaudi::Units::mm;
 }
 
 double
 SCT_ForwardParameters::fwdZMin() const
 {
-  return db()->getDouble(m_SctFwdGeneral,"ZMIN") * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_SctFwdGeneral,"ZMIN") * Gaudi::Units::mm;
 } 
 
 double
 SCT_ForwardParameters::fwdZIntermediate() const
 {
-  return db()->getDouble(m_SctFwdGeneral,"ZINTERMEDIATE") * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_SctFwdGeneral,"ZINTERMEDIATE") * Gaudi::Units::mm;
 }
 
 double
 SCT_ForwardParameters::fwdZMax() const
 {
-  return db()->getDouble(m_SctFwdGeneral,"ZMAX") * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_SctFwdGeneral,"ZMAX") * Gaudi::Units::mm;
 }
 
 }
diff --git a/InnerDetector/InDetDetDescr/SCT_SLHC_GeoModel/src/SCT_ForwardParametersOld.cxx b/InnerDetector/InDetDetDescr/SCT_SLHC_GeoModel/src/SCT_ForwardParametersOld.cxx
index 71ee405b5f419395574d2d4eafe726f5beb7ee8d..c24a6dbc54085dbdcce694e68dec46e7c48fab20 100644
--- a/InnerDetector/InDetDetDescr/SCT_SLHC_GeoModel/src/SCT_ForwardParametersOld.cxx
+++ b/InnerDetector/InDetDetDescr/SCT_SLHC_GeoModel/src/SCT_ForwardParametersOld.cxx
@@ -8,9 +8,7 @@
 #include "SCT_SLHC_GeoModel/SCT_DataBase.h"
 #include "RDBAccessSvc/IRDBRecordset.h"
 #include "RDBAccessSvc/IRDBRecord.h"
-
-
-#include "GeoModelKernel/Units.h"
+#include "GaudiKernel/SystemOfUnits.h"
 
 #include <iostream>
 #include <cmath>
@@ -190,8 +188,8 @@ SCT_ForwardParametersOld::fwdWheelZPosition(int iWheel) const
 {
   char paraName[50];
   sprintf(paraName, "W%d_DISKZPOSITION", iWheel);
-  return (double)(m_SCT_Fwd_Parameters->find(paraName))->second*GeoModelKernelUnits::mm;
-  //return m_rdb->fwdWheel(iWheel)->getDouble("ZPOSITION") * GeoModelKernelUnits::mm;
+  return (double)(m_SCT_Fwd_Parameters->find(paraName))->second*Gaudi::Units::mm;
+  //return m_rdb->fwdWheel(iWheel)->getDouble("ZPOSITION") * Gaudi::Units::mm;
 }
 
 int
@@ -217,8 +215,8 @@ SCT_ForwardParametersOld::fwdDiscSupportInnerRadius(int iWheel) const
 {
   char paraName[50];
   sprintf(paraName, "W%d_DISKINNERRADIUS", iWheel);
-  return (double)(m_SCT_Fwd_Parameters->find(paraName))->second*GeoModelKernelUnits::mm;
-  //---return m_rdb->fwdDiscSupport()->getDouble("INNERRADIUS") * GeoModelKernelUnits::mm;
+  return (double)(m_SCT_Fwd_Parameters->find(paraName))->second*Gaudi::Units::mm;
+  //---return m_rdb->fwdDiscSupport()->getDouble("INNERRADIUS") * Gaudi::Units::mm;
 }
 
 double
@@ -226,8 +224,8 @@ SCT_ForwardParametersOld::fwdDiscSupportOuterRadius(int iWheel) const
 {
   char paraName[50];
   sprintf(paraName, "W%d_DISKOUTERRADIUS", iWheel);
-  return (double)(m_SCT_Fwd_Parameters->find(paraName))->second*GeoModelKernelUnits::mm;
-  //---return m_rdb->fwdDiscSupport()->getDouble("OUTERRADIUS") * GeoModelKernelUnits::mm;
+  return (double)(m_SCT_Fwd_Parameters->find(paraName))->second*Gaudi::Units::mm;
+  //---return m_rdb->fwdDiscSupport()->getDouble("OUTERRADIUS") * Gaudi::Units::mm;
 }
  
 double
@@ -235,8 +233,8 @@ SCT_ForwardParametersOld::fwdDiscSupportThickness(int iWheel) const
 {
   char paraName[50];
   sprintf(paraName, "W%d_DISKTHICKNESS", iWheel);
-  return (double)(m_SCT_Fwd_Parameters->find(paraName))->second*GeoModelKernelUnits::mm;
-  //---return m_rdb->fwdDiscSupport()->getDouble("THICKNESS") * GeoModelKernelUnits::mm;
+  return (double)(m_SCT_Fwd_Parameters->find(paraName))->second*Gaudi::Units::mm;
+  //---return m_rdb->fwdDiscSupport()->getDouble("THICKNESS") * Gaudi::Units::mm;
 }
 
 std::string
@@ -267,7 +265,7 @@ SCT_ForwardParametersOld::fwdRingInnerRadius(int iRing) const
 {
   char paraName[50];
   sprintf(paraName, "Ring_%d_INNERRADIUS", iRing);
-  return (double)(m_SCT_Fwd_Parameters->find(paraName))->second*GeoModelKernelUnits::mm;
+  return (double)(m_SCT_Fwd_Parameters->find(paraName))->second*Gaudi::Units::mm;
 }
 
 double
@@ -275,14 +273,14 @@ SCT_ForwardParametersOld::fwdRingMiddleRadius(int iRing) const
 {
   char paraName[50];
   sprintf(paraName, "Ring_%d_MIDDLERADIUS", iRing);
-  return (double)(m_SCT_Fwd_Parameters->find(paraName))->second*GeoModelKernelUnits::mm;
+  return (double)(m_SCT_Fwd_Parameters->find(paraName))->second*Gaudi::Units::mm;
 }
 double
 SCT_ForwardParametersOld::fwdRingOuterRadius(int iRing) const
 {
   char paraName[50];
   sprintf(paraName, "Ring_%d_OUTERRADIUS", iRing);
-  return (double)(m_SCT_Fwd_Parameters->find(paraName))->second*GeoModelKernelUnits::mm;
+  return (double)(m_SCT_Fwd_Parameters->find(paraName))->second*Gaudi::Units::mm;
 }
 
 double
@@ -290,7 +288,7 @@ SCT_ForwardParametersOld::fwdRingOffset(int iRing) const
 {
   char paraName[50];
   sprintf(paraName, "Ring_%d_OFFSET", iRing);
-  return (double)(m_SCT_Fwd_Parameters->find(paraName))->second*GeoModelKernelUnits::mm;
+  return (double)(m_SCT_Fwd_Parameters->find(paraName))->second*Gaudi::Units::mm;
 }
 
 double
@@ -298,8 +296,8 @@ SCT_ForwardParametersOld::fwdRingModuleStagger(int iRing) const
 {
   char paraName[50];
   sprintf(paraName, "Ring_%d_MODULESTAGGER", iRing);
-  return (double)(m_SCT_Fwd_Parameters->find(paraName))->second*GeoModelKernelUnits::mm;
-  //---return m_rdb->fwdRing(iRing)->getDouble("MODULESTAGGER") * GeoModelKernelUnits::mm;
+  return (double)(m_SCT_Fwd_Parameters->find(paraName))->second*Gaudi::Units::mm;
+  //---return m_rdb->fwdRing(iRing)->getDouble("MODULESTAGGER") * Gaudi::Units::mm;
 }
 
 double
@@ -307,8 +305,8 @@ SCT_ForwardParametersOld::fwdRingPhiOfRefModule(int iRing) const
 {
   char paraName[50];
   sprintf(paraName, "Ring_%d_PHIOFREFMODULE", iRing);
-  return (double)(m_SCT_Fwd_Parameters->find(paraName))->second*GeoModelKernelUnits::radian;
-  //---return m_rdb->fwdRing(iRing)->getDouble("PHIOFREFMODULE") * GeoModelKernelUnits::deg;
+  return (double)(m_SCT_Fwd_Parameters->find(paraName))->second*Gaudi::Units::radian;
+  //---return m_rdb->fwdRing(iRing)->getDouble("PHIOFREFMODULE") * Gaudi::Units::deg;
 }
 
 int
@@ -348,22 +346,22 @@ SCT_ForwardParametersOld::fwdWheelStereoType(m_iWheel, int iRing) const
 double
 SCT_ForwardParametersOld::fwdInnerRadius() const
 {
-  return (double)(m_SCT_Fwd_Parameters->find("FWD_INNERRADIUS"))->second*GeoModelKernelUnits::mm;
-  // return m_rdb->fwdGeneral()->getDouble("INNERRADIUS") * GeoModelKernelUnits::mm;
+  return (double)(m_SCT_Fwd_Parameters->find("FWD_INNERRADIUS"))->second*Gaudi::Units::mm;
+  // return m_rdb->fwdGeneral()->getDouble("INNERRADIUS") * Gaudi::Units::mm;
 }
 
 double
 SCT_ForwardParametersOld::fwdIntermediateRadius() const
 {
-  return (double)(m_SCT_Fwd_Parameters->find("FWD_INTERMEDIATERADIUS"))->second*GeoModelKernelUnits::mm;
-  // return m_rdb->fwdGeneral()->getDouble("INNERRADIUS") * GeoModelKernelUnits::mm;
+  return (double)(m_SCT_Fwd_Parameters->find("FWD_INTERMEDIATERADIUS"))->second*Gaudi::Units::mm;
+  // return m_rdb->fwdGeneral()->getDouble("INNERRADIUS") * Gaudi::Units::mm;
 }
 
 double
 SCT_ForwardParametersOld::fwdOuterRadius() const
 {
-  return (double)(m_SCT_Fwd_Parameters->find("FWD_OUTERRADIUS"))->second*GeoModelKernelUnits::mm;
-  // return m_rdb->fwdGeneral()->getDouble("OUTERRADIUS") * GeoModelKernelUnits::mm;
+  return (double)(m_SCT_Fwd_Parameters->find("FWD_OUTERRADIUS"))->second*Gaudi::Units::mm;
+  // return m_rdb->fwdGeneral()->getDouble("OUTERRADIUS") * Gaudi::Units::mm;
 }
 
 
@@ -372,22 +370,22 @@ SCT_ForwardParametersOld::fwdOuterRadius() const
 double
 SCT_ForwardParametersOld::fwdZMin() const
 {
-  return (double)(m_SCT_Fwd_Parameters->find("FWD_ZMIN"))->second*GeoModelKernelUnits::mm;
-  //return m_rdb->fwdGeneral()->getDouble("ZMIN") * GeoModelKernelUnits::mm;
+  return (double)(m_SCT_Fwd_Parameters->find("FWD_ZMIN"))->second*Gaudi::Units::mm;
+  //return m_rdb->fwdGeneral()->getDouble("ZMIN") * Gaudi::Units::mm;
 }
 
 double
 SCT_ForwardParametersOld::fwdZIntermediate() const
 {
-  return (double)(m_SCT_Fwd_Parameters->find("FWD_ZINTERMEDIATE"))->second*GeoModelKernelUnits::mm;
-  //return m_rdb->fwdGeneral()->getDouble("ZMIN") * GeoModelKernelUnits::mm;
+  return (double)(m_SCT_Fwd_Parameters->find("FWD_ZINTERMEDIATE"))->second*Gaudi::Units::mm;
+  //return m_rdb->fwdGeneral()->getDouble("ZMIN") * Gaudi::Units::mm;
 }
 
 double
 SCT_ForwardParametersOld::fwdZMax() const
 {
-  return (double)(m_SCT_Fwd_Parameters->find("FWD_ZMAX"))->second*GeoModelKernelUnits::mm;
-  //return m_rdb->fwdGeneral()->getDouble("ZMAX") * GeoModelKernelUnits::mm;
+  return (double)(m_SCT_Fwd_Parameters->find("FWD_ZMAX"))->second*Gaudi::Units::mm;
+  //return m_rdb->fwdGeneral()->getDouble("ZMAX") * Gaudi::Units::mm;
 }
 
 }
diff --git a/InnerDetector/InDetDetDescr/SCT_SLHC_GeoModel/src/SCT_FwdDiscSupport.cxx b/InnerDetector/InDetDetDescr/SCT_SLHC_GeoModel/src/SCT_FwdDiscSupport.cxx
index 7a409fbfa5b0abf1452313d76fe89d5696119030..0637ff63037601438e77b8e3e9a7abe276a2e933 100644
--- a/InnerDetector/InDetDetDescr/SCT_SLHC_GeoModel/src/SCT_FwdDiscSupport.cxx
+++ b/InnerDetector/InDetDetDescr/SCT_SLHC_GeoModel/src/SCT_FwdDiscSupport.cxx
@@ -10,7 +10,7 @@
 #include "GeoModelKernel/GeoTube.h"
 #include "GeoModelKernel/GeoLogVol.h"
 #include "GeoModelKernel/GeoPhysVol.h"
-#include "GeoModelKernel/Units.h"
+#include "GaudiKernel/SystemOfUnits.h"
 
 namespace InDetDDSLHC {
 
@@ -31,7 +31,7 @@ void SCT_FwdDiscSupport::getParameters(){
   //m_material     = materials.getMaterial(parameters->fwdDiscSupportMaterial(m_iWheel));
   //0.1265 is taken from oracle database (DiskSupport)
   double materialIncreaseFactor = parameters->materialIncreaseFactor(m_iWheel);
-  //double cf_density = 0.1265*materialIncreaseFactor*GeoModelKernelUnits::g/GeoModelKernelUnits::cm3;
+  //double cf_density = 0.1265*materialIncreaseFactor*GeoModelKernelUnits::g/Gaudi::Units::cm3;
   //m_material = materials->getMaterial(parameters->fwdDiscSupportMaterial(m_iWheel), cf_density);
   m_material = materials->getMaterialScaled(parameters->fwdDiscSupportMaterial(m_iWheel), materialIncreaseFactor);
 }
diff --git a/InnerDetector/InDetDetDescr/SCT_SLHC_GeoModel/src/SCT_FwdModule.cxx b/InnerDetector/InDetDetDescr/SCT_SLHC_GeoModel/src/SCT_FwdModule.cxx
index a6f5a6354ff77a866024a3a71c64e3da7cc0e69a..5762fe08b4002f4e3bd57f0b7b779906dc31fb6e 100644
--- a/InnerDetector/InDetDetDescr/SCT_SLHC_GeoModel/src/SCT_FwdModule.cxx
+++ b/InnerDetector/InDetDetDescr/SCT_SLHC_GeoModel/src/SCT_FwdModule.cxx
@@ -23,11 +23,8 @@
 #include "GeoModelKernel/GeoTransform.h"
 #include "GeoModelKernel/GeoAlignableTransform.h"
 #include "GeoModelKernel/GeoMaterial.h"
-
-#include "GeoModelKernel/Units.h"
 #include "GeoModelKernel/GeoDefinitions.h"
-
-
+#include "GaudiKernel/SystemOfUnits.h"
 
 #include <cmath>
 #include <sstream>
@@ -71,23 +68,23 @@ const GeoLogVol * SCT_FwdModule::preBuild(){
   m_sensor = new SCT_FwdSensor("ECSensor0", m_ring);
 
   //prepare the module envelope volume
-  m_length       = std::max(m_sensor->length(), m_spine->length()) + 0.50*GeoModelKernelUnits::cm;//0.01mm safety necessary (for stereo angle)
+  m_length       = std::max(m_sensor->length(), m_spine->length()) + 0.50*Gaudi::Units::cm;//0.01mm safety necessary (for stereo angle)
   m_middleRadius = m_sensor->middleRadius();
   m_innerRadius  = m_middleRadius - 0.5*m_length;
   m_outerRadius  = m_middleRadius + 0.5*m_length;
   m_deltaPhi    = std::max(m_sensor->deltaPhi(), m_spine->deltaPhi());
   if(m_doubleSided){
     double interSidesGap = std::max(m_spine->thickness(), m_interSidesGap);
-    m_thickness = 2*m_sensor->thickness() + interSidesGap + 0.01*GeoModelKernelUnits::mm;//0.01mm safety necessary
-    //the term 10*GeoModelKernelUnits::degree*3.14/180, is to accommodate the stereo rotation
-    m_deltaPhi    = m_deltaPhi + 10*GeoModelKernelUnits::degree*3.14/180.;
+    m_thickness = 2*m_sensor->thickness() + interSidesGap + 0.01*Gaudi::Units::mm;//0.01mm safety necessary
+    //the term 10*Gaudi::Units::degree*3.14/180, is to accommodate the stereo rotation
+    m_deltaPhi    = m_deltaPhi + 10*Gaudi::Units::degree*3.14/180.;
     //add 1cm, to accomodate for stereo rotation (to be dealt correctly with later)
-    //m_innerRadius = m_innerRadius - 0.5*GeoModelKernelUnits::cm;
-    //m_outerRadius = m_outerRadius + 0.5*GeoModelKernelUnits::cm;
-    m_innerWidth = std::max(m_sensor->innerWidth(), m_spine->innerWidth()) + 2*GeoModelKernelUnits::cm; 
-    m_outerWidth = std::max(m_sensor->outerWidth(), m_spine->outerWidth()) + 2*GeoModelKernelUnits::cm; 
+    //m_innerRadius = m_innerRadius - 0.5*Gaudi::Units::cm;
+    //m_outerRadius = m_outerRadius + 0.5*Gaudi::Units::cm;
+    m_innerWidth = std::max(m_sensor->innerWidth(), m_spine->innerWidth()) + 2*Gaudi::Units::cm; 
+    m_outerWidth = std::max(m_sensor->outerWidth(), m_spine->outerWidth()) + 2*Gaudi::Units::cm; 
   }else{
-    m_thickness   = m_sensor->thickness() + m_spine->thickness() + 0.01*GeoModelKernelUnits::mm;//0.01mm safety necessary
+    m_thickness   = m_sensor->thickness() + m_spine->thickness() + 0.01*Gaudi::Units::mm;//0.01mm safety necessary
     m_innerWidth = std::max(m_sensor->innerWidth(), m_spine->innerWidth()); 
     m_outerWidth = std::max(m_sensor->outerWidth(), m_spine->outerWidth());
   }
@@ -125,7 +122,7 @@ GeoVPhysVol* SCT_FwdModule::build(SCT_Identifier id) const{
     GeoTrf::Translation3D  inner_Xpos(Xpos, 0.0, 0.0);
     innerSidePos = GeoTrf::Transform3D(inner_Xpos*inner_Rot);
     //outer side (shift towards X positive)
-    GeoTrf::Transform3D outer_Rot = GeoTrf::RotateX3D(-0.5*m_stereoAngle)*GeoTrf::RotateZ3D(180*GeoModelKernelUnits::deg);
+    GeoTrf::Transform3D outer_Rot = GeoTrf::RotateX3D(-0.5*m_stereoAngle)*GeoTrf::RotateZ3D(180*Gaudi::Units::deg);
     Xpos = -0.5*(interSidesGap + m_sensor->thickness());
     //protection
     if(fabs(Xpos)+0.5*m_sensor->thickness() > 0.5*m_thickness){
diff --git a/InnerDetector/InDetDetDescr/SCT_SLHC_GeoModel/src/SCT_FwdRing.cxx b/InnerDetector/InDetDetDescr/SCT_SLHC_GeoModel/src/SCT_FwdRing.cxx
index e1f6a79ada438ef050c2a33be078bffdda490572..e5ea50d2eecc7f70cba8ce7094be633b12d1b1da 100644
--- a/InnerDetector/InDetDetDescr/SCT_SLHC_GeoModel/src/SCT_FwdRing.cxx
+++ b/InnerDetector/InDetDetDescr/SCT_SLHC_GeoModel/src/SCT_FwdRing.cxx
@@ -20,10 +20,8 @@
 #include "GeoModelKernel/GeoAlignableTransform.h"
 #include "GeoModelKernel/GeoMaterial.h"
 #include "GeoModelKernel/GeoShapeShift.h"
-#include "GeoModelKernel/Units.h"
 #include "GeoModelKernel/GeoDefinitions.h"
-
-
+#include "GaudiKernel/PhysicalConstants.h"
 
 #include <sstream>
 #include <cmath>
@@ -68,11 +66,11 @@ const GeoLogVol* SCT_FwdRing::preBuild(){
   m_module = new SCT_FwdModule("FwdModule"+intToString(m_iRing), 
 			       m_iRing, m_doubleSided); 
 
-  //m_innerRadius = m_innerRadius - 0.51*GeoModelKernelUnits::cm;//0.01mm safety necessary
-  //m_outerRadius = m_outerRadius + 0.51*GeoModelKernelUnits::cm;//0.01mm safety necessary
-  m_innerRadius = m_innerRadius - 5*GeoModelKernelUnits::mm;//0.01mm safety necessary
-  m_outerRadius = m_outerRadius + 7*GeoModelKernelUnits::mm;//0.01mm safety necessary
-  m_thickness   = m_module->thickness() + m_moduleStagger + 0.01*GeoModelKernelUnits::mm;//safety necessary
+  //m_innerRadius = m_innerRadius - 0.51*Gaudi::Units::cm;//0.01mm safety necessary
+  //m_outerRadius = m_outerRadius + 0.51*Gaudi::Units::cm;//0.01mm safety necessary
+  m_innerRadius = m_innerRadius - 5*Gaudi::Units::mm;//0.01mm safety necessary
+  m_outerRadius = m_outerRadius + 7*Gaudi::Units::mm;//0.01mm safety necessary
+  m_thickness   = m_module->thickness() + m_moduleStagger + 0.01*Gaudi::Units::mm;//safety necessary
   m_length = m_outerRadius - m_innerRadius;
   //protection along R!
   if(m_length<m_module->length()){
@@ -101,7 +99,7 @@ GeoVPhysVol* SCT_FwdRing::build(SCT_Identifier id) const{
 
   // Physical volume for the half ring
   GeoPhysVol* ring = new GeoPhysVol(m_logVolume);
-  double divisionAngle     = 360*GeoModelKernelUnits::degree/m_numModules;
+  double divisionAngle     = 360*Gaudi::Units::degree/m_numModules;
   bool   negativeEndCap    = (id.getBarrelEC() < 0);
   int    staggerUpperLower = m_firstStagger;
   for(int imod=0; imod<m_numModules; imod++){
@@ -121,15 +119,15 @@ GeoVPhysVol* SCT_FwdRing::build(SCT_Identifier id) const{
     double phi =  m_refStartAngle + imod*divisionAngle;
     //std::cerr<<"endcap "<<id.getBarrelEC()<<", ring "<<m_iRing<<", startAngle"<<m_refStartAngle<<", phi "<<phi<<std::endl;
     //put the module along the radius of the ring, along X for example (remeber, it is along Z)
-    GeoTrf::Transform3D rot = GeoTrf::RotateY3D(90*GeoModelKernelUnits::degree);
+    GeoTrf::Transform3D rot = GeoTrf::RotateY3D(90*Gaudi::Units::degree);
     if (negativeEndCap) {
       //rotate the module so that to keep the local frame orientation as in the positive end
-      //rot.rotateZ(180*GeoModelKernelUnits::degree);    
+      //rot.rotateZ(180*Gaudi::Units::degree);    
       //start in the oppsite phi and turn in the oppsite direction
-      if(phi < GeoModelKernelUnits::pi)
-	phi = GeoModelKernelUnits::pi - phi;
+      if(phi < Gaudi::Units::pi)
+	phi = Gaudi::Units::pi - phi;
       else
-	phi = 3*GeoModelKernelUnits::pi - phi;
+	phi = 3*Gaudi::Units::pi - phi;
     }
     rot = GeoTrf::RotateZ3D(phi) * rot;
     //std::cerr<<"endcap "<<id.getBarrelEC()<<", wheel "<<m_iWheel<<", ring "<<m_iRing<<", mod "<<imod<<", phi "<<phi<<", startAng "<<m_refStartAngle<<std::endl;
@@ -147,7 +145,7 @@ GeoVPhysVol* SCT_FwdRing::build(SCT_Identifier id) const{
     xyz = GeoTrf::RotateZ3D(phi)*xyz;
     GeoTrf::Transform3D modulePos = GeoTrf::Translate3D(xyz.x(),xyz.y(),xyz.z())*rot;
     //protection along R!
-    const double epsilon = 0.0001*GeoModelKernelUnits::mm; //beyound meansurment precision?!
+    const double epsilon = 0.0001*Gaudi::Units::mm; //beyound meansurment precision?!
     if(m_innerRadius-epsilon>m_module->innerRadius() || 
        m_outerRadius+epsilon<m_module->outerRadius()){
       std::cout<<"SCT_FwdRing.cxx: problem with module position along R: "
diff --git a/InnerDetector/InDetDetDescr/SCT_SLHC_GeoModel/src/SCT_FwdWheel.cxx b/InnerDetector/InDetDetDescr/SCT_SLHC_GeoModel/src/SCT_FwdWheel.cxx
index 6ce2e2b667784c33fd1f88ce8fc42851a91ba390..8539f97ffa9b071e615cf04a4a3e61ecf854c84c 100644
--- a/InnerDetector/InDetDetDescr/SCT_SLHC_GeoModel/src/SCT_FwdWheel.cxx
+++ b/InnerDetector/InDetDetDescr/SCT_SLHC_GeoModel/src/SCT_FwdWheel.cxx
@@ -22,11 +22,8 @@
 #include "GeoModelKernel/GeoAlignableTransform.h"
 #include "GeoModelKernel/GeoMaterial.h"
 #include "GeoModelKernel/GeoShapeShift.h"
-#include "GeoModelKernel/Units.h"
 #include "GeoModelKernel/GeoDefinitions.h"
-
-
-
+#include "GaudiKernel/SystemOfUnits.h"
 
 #include <sstream>
 #include <cmath>
@@ -65,7 +62,7 @@ void SCT_FwdWheel::getParameters(){
     m_ringOffset.push_back(parameters->fwdRingOffset(ringType));
     m_ringTypes.push_back(ringType);
   }
-  m_staggerGap = 0.001* GeoModelKernelUnits::mm;
+  m_staggerGap = 0.001* Gaudi::Units::mm;
 
   // Set numerology
   detectorManager()->numerology().setNumRingsForDisk(m_iWheel,m_numRings);  
@@ -85,10 +82,10 @@ const GeoLogVol* SCT_FwdWheel::preBuild(){
   }
   //Calculate the extent of the envelope  
   //start the support disc
-  //m_outerRadius = m_discSupport->outerRadius() + 0.52*GeoModelKernelUnits::cm;//0.01mm safety necessary
-  //m_innerRadius = m_discSupport->innerRadius() - 0.52*GeoModelKernelUnits::cm;//0.01mm safety necessary
-  m_outerRadius = m_discSupport->outerRadius() + 9*GeoModelKernelUnits::mm;//0.01mm safety necessary
-  m_innerRadius = m_discSupport->innerRadius() - 9*GeoModelKernelUnits::mm;//0.01mm safety necessary
+  //m_outerRadius = m_discSupport->outerRadius() + 0.52*Gaudi::Units::cm;//0.01mm safety necessary
+  //m_innerRadius = m_discSupport->innerRadius() - 0.52*Gaudi::Units::cm;//0.01mm safety necessary
+  m_outerRadius = m_discSupport->outerRadius() + 9*Gaudi::Units::mm;//0.01mm safety necessary
+  m_innerRadius = m_discSupport->innerRadius() - 9*Gaudi::Units::mm;//0.01mm safety necessary
   //then comsider rings
   double wheelThickness_neg = -1.0;//negative value! see code below
   double wheelThickness_pos = -1.0;
diff --git a/InnerDetector/InDetDetDescr/SCT_SLHC_GeoModel/src/SCT_GeneralParameters.cxx b/InnerDetector/InDetDetDescr/SCT_SLHC_GeoModel/src/SCT_GeneralParameters.cxx
index 3a3a28a4f8e3d48f1378329e634e90ba39d3c663..811b0068f53e5ff06bbab20449f7a7fef40cea1a 100644
--- a/InnerDetector/InDetDetDescr/SCT_SLHC_GeoModel/src/SCT_GeneralParameters.cxx
+++ b/InnerDetector/InDetDetDescr/SCT_SLHC_GeoModel/src/SCT_GeneralParameters.cxx
@@ -7,7 +7,7 @@
 #include "SCT_SLHC_GeoModel/SCT_DataBase.h"
 #include "RDBAccessSvc/IRDBRecordset.h"
 #include "GeometryDBSvc/IGeometryDBSvc.h"
-#include "GeoModelKernel/Units.h"
+#include "GaudiKernel/SystemOfUnits.h"
 #include "GeoModelKernel/GeoDefinitions.h"
 #include "InDetGeoModelUtils/TopLevelPlacements.h"
 
@@ -15,7 +15,7 @@
 
 namespace InDetDDSLHC {
 
-const double SCT_SAFETY = 0.01 * GeoModelKernelUnits::mm; // Used in some places to make envelopes slightly larger to ensure
+const double SCT_SAFETY = 0.01 * Gaudi::Units::mm; // Used in some places to make envelopes slightly larger to ensure
                                      // no overlaps due to rounding errors.
 
 SCT_GeneralParameters::SCT_GeneralParameters(const SCT_DataBase * sctdb, const SCT_GeoModelAthenaComps * athenaComps)
@@ -124,19 +124,19 @@ unsigned int SCT_GeneralParameters::envelopeNumPlanes() const
 
 double SCT_GeneralParameters::envelopeZ(int i) const 
 {
-  double zmin =  db()->getDouble(m_SctEnvelope,"Z",i) * GeoModelKernelUnits::mm;
+  double zmin =  db()->getDouble(m_SctEnvelope,"Z",i) * Gaudi::Units::mm;
   if (zmin < 0) msg(MSG::ERROR) << "SctEnvelope table should only contain +ve z values" << endmsg;
   return std::abs(zmin);
 }
 
 double SCT_GeneralParameters::envelopeRMin(int i) const 
 {
-  return db()->getDouble(m_SctEnvelope,"RMIN",i) * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_SctEnvelope,"RMIN",i) * Gaudi::Units::mm;
 }
 
 double SCT_GeneralParameters::envelopeRMax(int i) const
 {
-  return db()->getDouble(m_SctEnvelope,"RMAX",i) * GeoModelKernelUnits::mm;
+  return db()->getDouble(m_SctEnvelope,"RMAX",i) * Gaudi::Units::mm;
 }
 
 
diff --git a/InnerDetector/InDetDetDescr/SCT_SLHC_GeoModel/src/SCT_Layer.cxx b/InnerDetector/InDetDetDescr/SCT_SLHC_GeoModel/src/SCT_Layer.cxx
index 83c6076022c600d80139ed453d0dbf3d2e1a3fc4..7643acb8ff9f387c643f0468b984648b1c5a1272 100644
--- a/InnerDetector/InDetDetDescr/SCT_SLHC_GeoModel/src/SCT_Layer.cxx
+++ b/InnerDetector/InDetDetDescr/SCT_SLHC_GeoModel/src/SCT_Layer.cxx
@@ -23,10 +23,8 @@
 #include "GeoModelKernel/GeoAlignableTransform.h"
 #include "GeoModelKernel/GeoMaterial.h"
 #include "GeoModelKernel/GeoShapeSubtraction.h"
-#include "GeoModelKernel/Units.h"
 #include "GeoModelKernel/GeoDefinitions.h"
-
-
+#include "GaudiKernel/SystemOfUnits.h"
 
 #include <sstream>
 #include <cmath>
@@ -72,7 +70,7 @@ void SCT_Layer::getParameters(){
   //---m_supportMaterial = materials->getMaterial(parameters->supportCylMaterial(m_iLayer));
   //0.189 is taken from oracle database (CFiberSupport)
   double materialIncreaseFactor = parameters->materialIncreaseFactor(m_iLayer);
-  //double cf_density = 0.189*materialIncreaseFactor*GeoModelKernelUnits::g/GeoModelKernelUnits::cm3;
+  //double cf_density = 0.189*materialIncreaseFactor*GeoModelKernelUnits::g/Gaudi::Units::cm3;
   //m_supportMaterial = materials->getMaterial(parameters->supportCylMaterial(m_iLayer), cf_density);
   m_supportMaterial = materials->getMaterialScaled(parameters->supportCylMaterial(m_iLayer), materialIncreaseFactor);
 
@@ -93,7 +91,7 @@ const GeoLogVol* SCT_Layer::preBuild(){
   //Create the logical volume: a sphape + material
   std::string layerNumStr = intToString(m_iLayer);
   //Calculations to make the ski(s)
-  double divisionAngle  = 360*GeoModelKernelUnits::degree/m_skisPerLayer;
+  double divisionAngle  = 360*Gaudi::Units::degree/m_skisPerLayer;
   m_skiPhiStart = 0.5*divisionAngle;
   //Make the ski: this is made from modules 
   m_ski = new SCT_Ski("Ski"+layerNumStr, m_modulesPerSki, m_iLayer, 
@@ -134,7 +132,7 @@ GeoVPhysVol* SCT_Layer::build(SCT_Identifier id) const{
   SCT_MaterialManager * materials = geometryManager()->materialManager();
   //We make this a fullPhysVol for alignment code.
   GeoFullPhysVol* layer = new GeoFullPhysVol(m_logVolume);
-  double divisionAngle  = 360*GeoModelKernelUnits::degree/m_skisPerLayer;
+  double divisionAngle  = 360*Gaudi::Units::degree/m_skisPerLayer;
   //Make envelope for active layer
   const GeoTube* activeLayerEnvelope = new GeoTube(m_activeInnerRadius, 
 							m_activeOuterRadius, 0.5*m_cylLength);
@@ -196,9 +194,9 @@ void SCT_Layer::activeEnvelopeExtent(double & rmin, double & rmax){
   double thickness = 0.5*m_ski->thickness();
   double width = 0.5*m_ski->width();
   double tilt = std::abs(m_tilt);
-  double width_rot = width * cos(tilt/GeoModelKernelUnits::radian) - thickness * sin(tilt/GeoModelKernelUnits::radian);
+  double width_rot = width * cos(tilt/Gaudi::Units::radian) - thickness * sin(tilt/Gaudi::Units::radian);
   
-  double thickness_rot = width * sin(tilt/GeoModelKernelUnits::radian) + thickness * cos(tilt/GeoModelKernelUnits::radian);
+  double thickness_rot = width * sin(tilt/Gaudi::Units::radian) + thickness * cos(tilt/Gaudi::Units::radian);
 
   rmax = sqrt(sqr(m_radius + thickness_rot) + sqr(width_rot)); 
   rmin = sqrt(sqr(m_radius - thickness_rot) + sqr(width_rot));
diff --git a/InnerDetector/InDetDetDescr/SCT_SLHC_GeoModel/src/SCT_MaterialManager.cxx b/InnerDetector/InDetDetDescr/SCT_SLHC_GeoModel/src/SCT_MaterialManager.cxx
index ded6eb732035bf5662d89f2ab273a4bbf8c92221..a295ec2a216096a63044ed359208cde43148ff93 100755
--- a/InnerDetector/InDetDetDescr/SCT_SLHC_GeoModel/src/SCT_MaterialManager.cxx
+++ b/InnerDetector/InDetDetDescr/SCT_SLHC_GeoModel/src/SCT_MaterialManager.cxx
@@ -30,16 +30,6 @@ SCT_MaterialManager::SCT_MaterialManager(const SCT_DataBase * sctdb, const SCT_G
 void
 SCT_MaterialManager::loadMaterials()
 {
-  //const GeoElement *copper    = getElement("Copper");
-
-  //const GeoMaterial *kapton   = getMaterial("std::Kapton"); // 30th Aug 2005 D.Naito added.
-
-  // CuKapton for Low Mass Tapes
-  //GeoMaterial * matCuKapton   = new GeoMaterial("sct::CuKapton",2.94*GeoModelKernelUnits::gram/GeoModelKernelUnits::cm3);
-  //matCuKapton->add(const_cast<GeoElement*>(copper),  0.6142);
-  //matCuKapton->add(const_cast<GeoMaterial*>(kapton), 0.3858);
-  //addMaterial(matCuKapton);
-
 }
 
 
diff --git a/InnerDetector/InDetDetDescr/SCT_SLHC_GeoModel/src/SCT_Module.cxx b/InnerDetector/InDetDetDescr/SCT_SLHC_GeoModel/src/SCT_Module.cxx
index e08c43799a20287c925bb88b241d2751befd6a36..4b98d6e0ba45af696b527e513fe3c0a61ac4b41d 100755
--- a/InnerDetector/InDetDetDescr/SCT_SLHC_GeoModel/src/SCT_Module.cxx
+++ b/InnerDetector/InDetDetDescr/SCT_SLHC_GeoModel/src/SCT_Module.cxx
@@ -24,11 +24,8 @@
 #include "GeoModelKernel/GeoTransform.h"
 #include "GeoModelKernel/GeoAlignableTransform.h"
 #include "GeoModelKernel/GeoShapeSubtraction.h"
-
-#include "GeoModelKernel/Units.h"
 #include "GeoModelKernel/GeoDefinitions.h"
-
-
+#include "GaudiKernel/SystemOfUnits.h"
 
 #include <cmath>
 
@@ -83,13 +80,13 @@ const GeoLogVol* SCT_Module::preBuild(){
     // Sensor only if placing sensors directly on stave
     m_width   = m_innerSide->width();
     m_length  = m_innerSide->length();
-    m_thickness = m_innerSide->thickness() + 0.01*GeoModelKernelUnits::mm;// Not really necessary but doesn't hurt
+    m_thickness = m_innerSide->thickness() + 0.01*Gaudi::Units::mm;// Not really necessary but doesn't hurt
   } else if(m_doubleSided){
     sideWidth  = std::max(m_innerSide->width(), m_outerSide->width());
     sideLength = std::max(m_innerSide->length(), m_outerSide->length());
-    m_width    = std::max(sideWidth*cos(half_stereo/GeoModelKernelUnits::radian) + sideLength*sin(half_stereo/GeoModelKernelUnits::radian),
+    m_width    = std::max(sideWidth*cos(half_stereo/Gaudi::Units::radian) + sideLength*sin(half_stereo/Gaudi::Units::radian),
 			  m_baseBoard->width());
-    m_length   = std::max(sideWidth*sin(half_stereo/GeoModelKernelUnits::radian) + sideLength*cos(half_stereo/GeoModelKernelUnits::radian), 
+    m_length   = std::max(sideWidth*sin(half_stereo/Gaudi::Units::radian) + sideLength*cos(half_stereo/Gaudi::Units::radian), 
 			  m_baseBoard->length());
     double interSidesGap = std::max(m_baseBoard->thickness(), m_interSidesGap);
     m_thickness = m_innerSide->thickness() + m_outerSide->thickness() + interSidesGap + 0.01;//0.01mm safety necessary
@@ -127,7 +124,7 @@ GeoVPhysVol* SCT_Module::build(SCT_Identifier id) const{
     GeoTrf::Transform3D outerSidePos(GeoTrf::Transform3D::Identity());
     if (m_doubleSided){
       //inner side position (shift this side towards the intreaction point, ie X negative)
-      GeoTrf::Transform3D inner_Rot = GeoTrf::RotateX3D(-0.5*m_stereoAngle)*GeoTrf::RotateZ3D(180*GeoModelKernelUnits::deg);
+      GeoTrf::Transform3D inner_Rot = GeoTrf::RotateX3D(-0.5*m_stereoAngle)*GeoTrf::RotateZ3D(180*Gaudi::Units::deg);
       double interSidesGap = std::max(m_baseBoard->thickness(), m_interSidesGap);
       double Xpos = -0.5*(interSidesGap + m_innerSide->thickness());
       //std::cerr<<"inner Xpos "<<Xpos<<" thickness "<<m_innerSide->thickness()<<std::endl;
@@ -158,7 +155,7 @@ GeoVPhysVol* SCT_Module::build(SCT_Identifier id) const{
       outerSidePos = GeoTrf::Transform3D(outer_Xpos*outer_Rot);
     } else {
       //inner side position (shift this side towards the intreaction point, ie X negative)
-      GeoTrf::RotateZ3D inner_Rot(180*GeoModelKernelUnits::deg);
+      GeoTrf::RotateZ3D inner_Rot(180*Gaudi::Units::deg);
       double Xpos = -0.5*m_baseBoard->thickness();
       //protection
       if(fabs(Xpos)+0.5*m_innerSide->thickness() > 0.5*m_thickness){
diff --git a/InnerDetector/InDetDetDescr/SCT_SLHC_GeoModel/src/SCT_Sensor.cxx b/InnerDetector/InDetDetDescr/SCT_SLHC_GeoModel/src/SCT_Sensor.cxx
index eeeec98686f7792a56644136a360dc14176fed4c..9af70b5fd442846b0bc76e30eb276871064439b5 100644
--- a/InnerDetector/InDetDetDescr/SCT_SLHC_GeoModel/src/SCT_Sensor.cxx
+++ b/InnerDetector/InDetDetDescr/SCT_SLHC_GeoModel/src/SCT_Sensor.cxx
@@ -21,9 +21,7 @@
 #include "InDetReadoutGeometry/SiDetectorElement.h"
 #include "InDetReadoutGeometry/InDetDD_Defs.h"
 #include "InDetReadoutGeometry/SiCommonItems.h"
-
-
-#include "GeoModelKernel/Units.h"
+#include "GaudiKernel/SystemOfUnits.h"
 
 using namespace InDetDD;
 
@@ -78,7 +76,7 @@ SCT_Sensor::preBuild()
     
     // Build the subsensor logical volume (same for all segments).
     // We reduce the size by a small amount to avoid touching volumes. 
-    double epsilon = 1e-7*GeoModelKernelUnits::mm;
+    double epsilon = 1e-7*Gaudi::Units::mm;
     const GeoBox * subSensorShape = new GeoBox(0.5*m_thickness-epsilon, 0.5*m_width-epsilon, 0.5*m_subSensorLength-epsilon);
     m_subSensorLog = new GeoLogVol(getName(), subSensorShape, m_material);  
     m_subSensorLog->ref();
diff --git a/InnerDetector/InDetDetDescr/SCT_SLHC_GeoModel/src/SCT_Ski.cxx b/InnerDetector/InDetDetDescr/SCT_SLHC_GeoModel/src/SCT_Ski.cxx
index d814453a02f24202d5999dde1d6400c6a5229a65..241fc567a339dd0c25a95cbc258d0c68df9f1407 100644
--- a/InnerDetector/InDetDetDescr/SCT_SLHC_GeoModel/src/SCT_Ski.cxx
+++ b/InnerDetector/InDetDetDescr/SCT_SLHC_GeoModel/src/SCT_Ski.cxx
@@ -24,10 +24,8 @@
 #include "GeoModelKernel/GeoShape.h"
 #include "GeoModelKernel/GeoShapeUnion.h"
 #include "GeoModelKernel/GeoShapeShift.h"
-#include "GeoModelKernel/Units.h"
 #include "GeoModelKernel/GeoDefinitions.h"
-
-
+#include "GaudiKernel/SystemOfUnits.h"
 
 #include <sstream>
 #include <cmath>
@@ -219,7 +217,7 @@ SCT_Ski::placeModule(GeoPhysVol * ski, SCT_Identifier id, int iModule, int side,
   }
   GeoTrf::Transform3D rot = GeoTrf::RotateX3D(stereoAngle);
   //the module is rotated, around X axis, one way or the other (u or v)
-  if (flip) rot = rot * GeoTrf::RotateZ3D(180*GeoModelKernelUnits::deg);
+  if (flip) rot = rot * GeoTrf::RotateZ3D(180*Gaudi::Units::deg);
   GeoTrf::Translation3D pos(xModulePos, 0.0, zModulePos);
   GeoTrf::Transform3D modulePos = GeoTrf::Transform3D(pos*rot);
 
diff --git a/InnerDetector/InDetDigitization/BCM_Digitization/CMakeLists.txt b/InnerDetector/InDetDigitization/BCM_Digitization/CMakeLists.txt
index 62b62dc31802814c55d6cc143b95c93bbd6cbf73..8c4c6016b578de6a6677c0f1affe0d13b24f8794 100644
--- a/InnerDetector/InDetDigitization/BCM_Digitization/CMakeLists.txt
+++ b/InnerDetector/InDetDigitization/BCM_Digitization/CMakeLists.txt
@@ -29,10 +29,10 @@ atlas_add_component( BCM_Digitization
                      LINK_LIBRARIES ${CLHEP_LIBRARIES} GaudiKernel AthenaBaseComps AthenaKernel PileUpToolsLib xAODEventInfo GeneratorObjects InDetBCM_RawData InDetSimData InDetSimEvent )
 
 atlas_add_test( BCM_DigitizationConfigNew_test
-                SCRIPT python/BCM_DigitizationConfigNew_test.py
+                SCRIPT test/BCM_DigitizationConfigNew_test.py
                 PROPERTIES TIMEOUT 300 )
 
 # Install files from the package:
 atlas_install_python_modules( python/*.py )
-atlas_install_joboptions( share/*.py )
+atlas_install_joboptions( share/*.py test/*.py )
 
diff --git a/InnerDetector/InDetDigitization/BCM_Digitization/python/BCM_DigitizationConfig.py b/InnerDetector/InDetDigitization/BCM_Digitization/python/BCM_DigitizationConfig.py
index 240096c810804e0385acc56230734ef252e23368..426a37ff5cf98189cb6a0af0c37d3e004d4683d0 100644
--- a/InnerDetector/InDetDigitization/BCM_Digitization/python/BCM_DigitizationConfig.py
+++ b/InnerDetector/InDetDigitization/BCM_Digitization/python/BCM_DigitizationConfig.py
@@ -29,9 +29,6 @@ def BCM_DigitizationTool(name="BCM_DigitizationTool",**kwargs):
     kwargs.setdefault("MIPDeposit", 0.33) # BCM with diamond
     #kwargs.setdefault("MIPDeposit", 0.25) # BCM with graphite
  
-    kwargs.setdefault("RndmSvc", digitizationFlags.rndmSvc() )
-    digitizationFlags.rndmSeedList.addSeed("BCM_Digitization", 49261510, 105132394)
-   
     if digitizationFlags.doXingByXingPileUp():
         kwargs.setdefault("FirstXing", BCM_FirstXing() )
         kwargs.setdefault("LastXing",  BCM_LastXing()  ) 
diff --git a/InnerDetector/InDetDigitization/BCM_Digitization/python/BCM_DigitizationConfigNew.py b/InnerDetector/InDetDigitization/BCM_Digitization/python/BCM_DigitizationConfigNew.py
index 41f343c39fa17e5b7d1af9a2b94cfc0c95dc21e0..8739b5ee15d52d9244389e664e07342907658a41 100755
--- a/InnerDetector/InDetDigitization/BCM_Digitization/python/BCM_DigitizationConfigNew.py
+++ b/InnerDetector/InDetDigitization/BCM_Digitization/python/BCM_DigitizationConfigNew.py
@@ -5,8 +5,6 @@ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 from AthenaCommon import CfgMgr
 from RngComps.RandomServices import RNG, AthEngines
 from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
-from Digitization.DigitizationFlags import digitizationFlags
-from OverlayCommonAlgs.OverlayFlags import overlayFlags
 
 # The earliest and last bunch crossing times for which interactions will be sent
 # to the BCM Digitization code.
@@ -23,7 +21,7 @@ def BCM_DigitizationToolCfg(configFlags, name="BCM_DigitizationTool", **kwargs):
     Engine = configFlags.Random.Engine
     acc.merge(RNG(Engine))
     # Build the argument dict
-    kwargs.setdefault("RndmSvc", AthEngines[Engine])
+    kwargs.setdefault("RndmSvc", "AthRNGSvc")
     kwargs.setdefault("HitCollName", "BCMHits")
     if configFlags.Digitization.DoInnerDetectorNoise:
         kwargs.setdefault("ModNoise", [90.82] * 8)
diff --git a/InnerDetector/InDetDigitization/BCM_Digitization/src/BCM_DigitizationTool.cxx b/InnerDetector/InDetDigitization/BCM_Digitization/src/BCM_DigitizationTool.cxx
index 72219086b3cf09dbbb1fd9f4b7b50538d7db3064..d484569bc47a6f00ccc4fed90ef6bbd22ffff45c 100644
--- a/InnerDetector/InDetDigitization/BCM_Digitization/src/BCM_DigitizationTool.cxx
+++ b/InnerDetector/InDetDigitization/BCM_Digitization/src/BCM_DigitizationTool.cxx
@@ -5,8 +5,12 @@
 #include "BCM_DigitizationTool.h"
 
 #include "AthenaKernel/errorcheck.h"
-#include "AthenaKernel/IAtRndmGenSvc.h"
+#include "AthenaKernel/RNGWrapper.h"
+
+// CLHEP includes
+#include "CLHEP/Random/RandomEngine.h"
 #include "CLHEP/Random/RandGaussZiggurat.h"
+
 #include "GeneratorObjects/HepMcParticleLink.h"
 #include "InDetBCM_RawData/BCM_RawData.h"
 #include "InDetBCM_RawData/BCM_RDO_Collection.h"
@@ -23,19 +27,15 @@
 //----------------------------------------------------------------------
 BCM_DigitizationTool::BCM_DigitizationTool(const std::string &type, const std::string &name, const IInterface *parent) :
   PileUpToolBase(type,name,parent),
-  m_rndmEngine(NULL),
   m_mipDeposit(0.0f),
   m_effPrmDistance(0.0f),
   m_effPrmSharpness(0.0f),
   m_timeDelay(0.0f),
   m_rdoContainer(NULL),
   m_simDataCollMap(NULL),
-  m_rndmEngineName("BCM_Digitization"),
-  m_mergeSvc(NULL), //("PileUpMergeSvc",name),
-  m_atRndmGenSvc("AtRndmGenSvc",name)
+  m_mergeSvc(NULL) //("PileUpMergeSvc",name)
 {
   //declareProperty("PileupMergeSvc", m_mergeSvc, "Pileup merging service");
-  declareProperty("RndmSvc", m_atRndmGenSvc, "Random number service used in BCM digitization");
   declareProperty("HitCollName", m_hitCollName="BCMHits", "Input simulation hits collection name");
   declareProperty("ModNoise", m_modNoise, "RMS noise averaged over modules");
   declareProperty("ModSignal", m_modSignal, "Average MIP signal in modules");
@@ -54,12 +54,7 @@ StatusCode BCM_DigitizationTool::initialize()
   ATH_MSG_VERBOSE ( "initialize()");
 
   // get random service
-  CHECK(m_atRndmGenSvc.retrieve());
-  m_rndmEngine = m_atRndmGenSvc->GetEngine(m_rndmEngineName) ;
-  if (m_rndmEngine==0) {
-    ATH_MSG_ERROR ( "Could not find RndmEngine : " << m_rndmEngineName );
-    return StatusCode::FAILURE ;
-  }
+  ATH_CHECK(m_rndmGenSvc.retrieve());
 
   return StatusCode::SUCCESS;
 }
@@ -101,19 +96,19 @@ StatusCode BCM_DigitizationTool::createOutputContainers()
 //----------------------------------------------------------------------
 void BCM_DigitizationTool::processSiHit(const SiHit &currentHit, double eventTime, unsigned int evtIndex)
 {
-  int moduleNo = currentHit.getLayerDisk();
-  float enerDep = computeEnergy(currentHit.energyLoss(), currentHit.localStartPosition(), currentHit.localEndPosition());
-  float hitTime = currentHit.meanTime() + eventTime + m_timeDelay;
+  const int moduleNo = currentHit.getLayerDisk();
+  const float enerDep = computeEnergy(currentHit.energyLoss(), currentHit.localStartPosition(), currentHit.localEndPosition());
+  const float hitTime = currentHit.meanTime() + eventTime + m_timeDelay;
   // Fill vectors with hit info
   m_enerVect[moduleNo].push_back(enerDep);
   m_timeVect[moduleNo].push_back(hitTime);
   // Create new deposit and add to vector
-  InDetSimData::Deposit deposit(HepMcParticleLink(currentHit.trackNumber(), evtIndex),currentHit.energyLoss());
-  int barcode = deposit.first.barcode();
+  HepMcParticleLink particleLink(currentHit.trackNumber(), evtIndex);
+  const int barcode = particleLink.barcode();
   if (barcode == 0 || barcode == 10001){
     return;
   }
-  m_depositVect[moduleNo].push_back(deposit);
+  m_depositVect[moduleNo].emplace_back(particleLink,currentHit.energyLoss());
   return;
 }
 
@@ -122,11 +117,15 @@ void BCM_DigitizationTool::processSiHit(const SiHit &currentHit, double eventTim
 //----------------------------------------------------------------------
 void BCM_DigitizationTool::createRDOsAndSDOs()
 {
+  // Set the RNG to use for this event.
+  ATHRNG::RNGWrapper* rngWrapper = m_rndmGenSvc->getEngine(this);
+  rngWrapper->setSeed( name(), Gaudi::Hive::currentContext() );
+
   // Digitize hit info and create RDO for each module
   for (int iMod=0; iMod<8; ++iMod) {
     if (m_depositVect[iMod].size()) m_simDataCollMap->insert(std::make_pair(Identifier(iMod), InDetSimData(m_depositVect[iMod])));
     std::vector<float> analog = createAnalog(iMod,m_enerVect[iMod],m_timeVect[iMod]);
-    addNoise(iMod,analog);
+    addNoise(iMod,analog, *rngWrapper);
     for (int iGain=0; iGain<2; ++iGain) {
       std::bitset<64> digital = applyThreshold(iGain*8+iMod,analog);
       int p1x,p1w,p2x,p2w;
@@ -300,9 +299,9 @@ std::vector<float> BCM_DigitizationTool::createAnalog(int iMod, std::vector<floa
 //----------------------------------------------------------------------
 // AddNoise method:
 //----------------------------------------------------------------------
-void BCM_DigitizationTool::addNoise(int iMod, std::vector<float> &analog)
+void BCM_DigitizationTool::addNoise(int iMod, std::vector<float> &analog, CLHEP::HepRandomEngine* randomEngine)
 {
-  for (unsigned int iBin=0; iBin<analog.size(); ++iBin) analog[iBin]+=CLHEP::RandGaussZiggurat::shoot(m_rndmEngine,0.,m_modNoise[iMod]);
+  for (unsigned int iBin=0; iBin<analog.size(); ++iBin) analog[iBin]+=CLHEP::RandGaussZiggurat::shoot(randomEngine,0.,m_modNoise[iMod]);
 }
 
 //----------------------------------------------------------------------
diff --git a/InnerDetector/InDetDigitization/BCM_Digitization/src/BCM_DigitizationTool.h b/InnerDetector/InDetDigitization/BCM_Digitization/src/BCM_DigitizationTool.h
index 009159db1cfb2d000914de8e0a1152932f9b017e..865eca3c660289bf8460cbe468d0fb5a08f5627c 100644
--- a/InnerDetector/InDetDigitization/BCM_Digitization/src/BCM_DigitizationTool.h
+++ b/InnerDetector/InDetDigitization/BCM_Digitization/src/BCM_DigitizationTool.h
@@ -6,7 +6,7 @@
 #define BCM_DIGITIZATION_BCM_DIGITIZATIONTOOL_H
 
 #include "PileUpTools/PileUpToolBase.h"
-#include "AthenaKernel/IAtRndmGenSvc.h"
+#include "AthenaKernel/IAthRNGSvc.h"
 
 #include "GaudiKernel/ServiceHandle.h"
 
@@ -62,7 +62,7 @@ class BCM_DigitizationTool : public PileUpToolBase {
   std::vector<float> createAnalog(int mod, std::vector<float> enerVect, std::vector<float> timeVect);
 
   /** Add noise to analog waveform */
-  void addNoise(int mod, std::vector<float> &analog);
+  void addNoise(int mod, std::vector<float> &analog, CLHEP::HepRandomEngine *randomEngine);
 
   /** Do ToT digitization */
   std::bitset<64> applyThreshold(int chan, std::vector<float> analog);
@@ -76,7 +76,6 @@ class BCM_DigitizationTool : public PileUpToolBase {
   /** Create raw data object and put it in the container */
   void fillRDO(unsigned int chan, int p1x, int p1w, int p2x, int p2w);
 
-  CLHEP::HepRandomEngine *m_rndmEngine; //!< Random number engine used
   // Digitization parameters
   std::string m_hitCollName;      //!< Input simulation hit collection name
   std::vector<float> m_modNoise;  //!< RMS Gaussian noise
@@ -91,9 +90,8 @@ class BCM_DigitizationTool : public PileUpToolBase {
   BCM_RDO_Container* m_rdoContainer; //!< Output RDO container
   InDetSimDataCollection* m_simDataCollMap; //!< Output SDO map
 
-  std::string m_rndmEngineName;  //!< Name of random engine
   PileUpMergeSvc* m_mergeSvc; //!< Handle for pileup merging service
-  ServiceHandle<IAtRndmGenSvc> m_atRndmGenSvc; //!< Handle for random number service
+  ServiceHandle<IAthRNGSvc> m_rndmGenSvc{this, "RndmSvc", "AthRNGSvc", ""};  //!< Random number service
 
   // Vectors to store G4 hit information
   std::vector<float> m_enerVect[8]; //!< G4 hit energies, weighted
diff --git a/InnerDetector/InDetDigitization/BCM_Digitization/python/BCM_DigitizationConfigNew_test.py b/InnerDetector/InDetDigitization/BCM_Digitization/test/BCM_DigitizationConfigNew_test.py
similarity index 67%
rename from InnerDetector/InDetDigitization/BCM_Digitization/python/BCM_DigitizationConfigNew_test.py
rename to InnerDetector/InDetDigitization/BCM_Digitization/test/BCM_DigitizationConfigNew_test.py
index 77bfe9c49316fa9fafafb8c15dcd745b862d3de4..17b3469e2e681b9cf29b9114c6cb5be07ab71030 100755
--- a/InnerDetector/InDetDigitization/BCM_Digitization/python/BCM_DigitizationConfigNew_test.py
+++ b/InnerDetector/InDetDigitization/BCM_Digitization/test/BCM_DigitizationConfigNew_test.py
@@ -11,28 +11,30 @@ from AthenaConfiguration.AllConfigFlags import ConfigFlags
 from AthenaConfiguration.MainServicesConfig import MainServicesSerialCfg
 from AthenaPoolCnvSvc.PoolReadConfig import PoolReadCfg
 from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
-from BCM_DigitizationConfigFlags import createBCMCfgFlags
-from BCM_DigitizationConfigNew import BCM_DigitizationCfg
+from BCM_Digitization.BCM_DigitizationConfigFlags import createBCMCfgFlags
+from BCM_Digitization.BCM_DigitizationConfigNew import BCM_DigitizationCfg
+from TrigUpgradeTest.InDetConfig import InDetGMConfig # FIXME This module would ideally be located somewhere else
 # Set up logging and new style config
 log.setLevel(DEBUG)
 Configurable.configurableRun3Behavior = True
 # Provide input
 dataDir = "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art"
 inputDir = os.environ.get("ATLAS_REFERENCE_DATA", dataDir)
-fileDir = "/SimCoreTests/e_E50_eta34_49.EVNT.pool.root"
+fileDir = "/Tier0ChainTests/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.simul.HITS.e4993_s3091/HITS.10504490._000425.pool.root.1"
 ConfigFlags.Input.Files = [inputDir + fileDir]
 # Specify output
-ConfigFlags.Output.HITFileName = "myHITS.pool.root"
+ConfigFlags.Output.RDOFileName = "myRDO.pool.root"
 ConfigFlags.lock()
 # Construct ComponentAccumulator
 cfg = MainServicesSerialCfg()
 cfg.merge(PoolReadCfg(ConfigFlags))
+cfg.merge(InDetGMConfig(ConfigFlags)) # FIXME This sets up the whole ID geometry would be nicer just to set up min required for BCM
 # Use BCM tools
 BCMflags = createBCMCfgFlags()
 acc = BCM_DigitizationCfg(BCMflags)
 cfg.merge(acc)
 # Add configuration to write HITS pool file
-outConfig = OutputStreamCfg(ConfigFlags, "HITS",
+outConfig = OutputStreamCfg(ConfigFlags, "RDO",
     ItemList=["InDetSimDataCollection#*", "BCM_RDO_Container#*"])
 cfg.merge(outConfig)
 cfg.getService("StoreGateSvc").Dump=True
diff --git a/InnerDetector/InDetDigitization/TRT_Digitization/python/TRT_DigitizationConfig.py b/InnerDetector/InDetDigitization/TRT_Digitization/python/TRT_DigitizationConfig.py
index d03a56cd92637f4fe84aa1ae1837e4c98820dd5e..7ce6272e8944fab01fd2176370848d45dab89976 100644
--- a/InnerDetector/InDetDigitization/TRT_Digitization/python/TRT_DigitizationConfig.py
+++ b/InnerDetector/InDetDigitization/TRT_Digitization/python/TRT_DigitizationConfig.py
@@ -49,24 +49,6 @@ def BasicTRTDigitizationTool(name, **kwargs):
        kwargs.setdefault("Override_jitterTimeOffset", 0.)
        kwargs.setdefault("Override_timeCorrection", 0)
 
-    #choose random number service
-    kwargs.setdefault("RndmSvc", digitizationFlags.rndmSvc() )
-    if not digitizationFlags.rndmSeedList.checkForExistingSeed("TRT_DigitizationTool"):
-        digitizationFlags.rndmSeedList.addSeed( "TRT_DigitizationTool", 123456, 345123 )
-    if not digitizationFlags.rndmSeedList.checkForExistingSeed("TRT_ElectronicsNoise"):
-        digitizationFlags.rndmSeedList.addSeed( "TRT_ElectronicsNoise", 123, 345 )
-    if not digitizationFlags.rndmSeedList.checkForExistingSeed("TRT_Noise"):
-        digitizationFlags.rndmSeedList.addSeed( "TRT_Noise", 1234, 3456 )
-    if not digitizationFlags.rndmSeedList.checkForExistingSeed("TRT_ThresholdFluctuations"):
-        digitizationFlags.rndmSeedList.addSeed( "TRT_ThresholdFluctuations", 12345, 34567 )
-    if not digitizationFlags.rndmSeedList.checkForExistingSeed("TRT_ProcessStraw"):
-        digitizationFlags.rndmSeedList.addSeed( "TRT_ProcessStraw", 123456, 345678 )
-    if not digitizationFlags.rndmSeedList.checkForExistingSeed("TRT_PAI"):
-        digitizationFlags.rndmSeedList.addSeed( "TRT_PAI", 12345678, 34567890 )
-    if not digitizationFlags.rndmSeedList.checkForExistingSeed("TRT_FakeConditions"):
-        digitizationFlags.rndmSeedList.addSeed( "TRT_FakeConditions", 123456789, 345678901 )
-    #This last one should, however, never be changed (unless you want a different layout of noisy channels etc.):
-
     if digitizationFlags.doXingByXingPileUp():
         kwargs.setdefault("FirstXing", TRT_FirstXing())
         kwargs.setdefault("LastXing",  TRT_LastXing())
diff --git a/InnerDetector/InDetDigitization/TRT_Digitization/src/TRTDigCondBase.cxx b/InnerDetector/InDetDigitization/TRT_Digitization/src/TRTDigCondBase.cxx
index 8d999c867eb2eea5a0fbf57c2e6ae1ba687c72ce..51450fbb17d792ca9dedbcbcf9f22462eac1eca7 100644
--- a/InnerDetector/InDetDigitization/TRT_Digitization/src/TRTDigCondBase.cxx
+++ b/InnerDetector/InDetDigitization/TRT_Digitization/src/TRTDigCondBase.cxx
@@ -61,7 +61,7 @@ float TRTDigCondBase::strawAverageNoiseLevel() const {
 }
 
 //________________________________________________________________________________
-void TRTDigCondBase::initialize() {
+void TRTDigCondBase::initialize(CLHEP::HepRandomEngine* rndmEngine) {
 
   ATH_MSG_INFO ( "TRTDigCondBase::initialize()" );
 
@@ -109,7 +109,7 @@ void TRTDigCondBase::initialize() {
 
       //Get info about the straw conditions, then create and fill the strawstate
       double noiselevel, relative_noiseamplitude;
-      setStrawStateInfo( strawId, strawLength, noiselevel, relative_noiseamplitude );
+      setStrawStateInfo( strawId, strawLength, noiselevel, relative_noiseamplitude, rndmEngine );
       StrawState strawstate;
       strawstate.noiselevel = noiselevel; // same for all gas types
       strawstate.lowthreshold = ( !(hitid & 0x00200000) ) ? m_settings->lowThresholdBar(strawGasType) : m_settings->lowThresholdEC(strawGasType);
diff --git a/InnerDetector/InDetDigitization/TRT_Digitization/src/TRTDigCondBase.h b/InnerDetector/InDetDigitization/TRT_Digitization/src/TRTDigCondBase.h
index 29f0d1cede3ddcbb1153640e4664a9fa579a0344..d746613151d261c68d656c84f2aa170900c0c289 100644
--- a/InnerDetector/InDetDigitization/TRT_Digitization/src/TRTDigCondBase.h
+++ b/InnerDetector/InDetDigitization/TRT_Digitization/src/TRTDigCondBase.h
@@ -42,7 +42,7 @@ public:
   /**
    * @note Must be called exactly once before the class is used for anything.
    */
-  void initialize();
+  void initialize(CLHEP::HepRandomEngine* rndmEngine);
 
   /** Get average noise level in straw */
   float strawAverageNoiseLevel() const;         //[first time slow, else fast]
@@ -138,7 +138,8 @@ public:
   virtual void setStrawStateInfo(Identifier& TRT_Identifier,
 				  const double& strawlength,
 				  double& noiselevel,
-				  double& relative_noiseamplitude ) = 0;
+                                 double& relative_noiseamplitude,
+                                 CLHEP::HepRandomEngine *rndmEngine) = 0;
 
 protected:
   const TRTDigSettings* m_settings;
diff --git a/InnerDetector/InDetDigitization/TRT_Digitization/src/TRTDigCondFakeMap.cxx b/InnerDetector/InDetDigitization/TRT_Digitization/src/TRTDigCondFakeMap.cxx
index c2b87336b0b6931012702ddeffb6474a8ac0087b..d6b974e3450919adca34fc2625e1e5c6bb485588 100644
--- a/InnerDetector/InDetDigitization/TRT_Digitization/src/TRTDigCondFakeMap.cxx
+++ b/InnerDetector/InDetDigitization/TRT_Digitization/src/TRTDigCondFakeMap.cxx
@@ -8,7 +8,7 @@
 // For the Athena-based random numbers.
 #include "CLHEP/Random/RandFlat.h"
 #include "CLHEP/Random/RandGaussZiggurat.h"
-#include "AthenaKernel/IAtRndmGenSvc.h"
+#include "CLHEP/Random/RandomEngine.h"
 
 // Units
 #include "CLHEP/Units/SystemOfUnits.h"
@@ -22,7 +22,6 @@
 //________________________________________________________________________________
 TRTDigCondFakeMap::TRTDigCondFakeMap( const TRTDigSettings* digset,
 				      const InDetDD::TRT_DetectorManager* detmgr,
-				      ServiceHandle <IAtRndmGenSvc> atRndmGenSvc,
 				      const TRT_ID* trt_id,
 				      int UseGasMix,
 				      ServiceHandle<ITRT_StrawStatusSummarySvc> sumSvc
@@ -30,7 +29,6 @@ TRTDigCondFakeMap::TRTDigCondFakeMap( const TRTDigSettings* digset,
   : TRTDigCondBase(digset, detmgr, trt_id, UseGasMix, sumSvc)
 {
   m_average_noiselevel = m_settings->averageNoiseLevel();
-  m_pHRengine = atRndmGenSvc->GetEngine("TRT_FakeConditions");
 }
 
 
@@ -38,13 +36,14 @@ TRTDigCondFakeMap::TRTDigCondFakeMap( const TRTDigSettings* digset,
 void TRTDigCondFakeMap::setStrawStateInfo(Identifier& TRT_Identifier,
                                           const double& strawlength,
 					  double& noiselevel,
-					  double& relative_noiseamplitude ) {
+					  double& relative_noiseamplitude,
+                                          CLHEP::HepRandomEngine* rndmEngine) {
 
   noiselevel = m_average_noiselevel; // Not used here, but returned to caller
 
   // 5% relative fluctuation is hard-coded here
-  double                       relnoiseamp = CLHEP::RandGaussZiggurat::shoot(m_pHRengine, 1.00, 0.05 );
-  while (relnoiseamp < 0.10) { relnoiseamp = CLHEP::RandGaussZiggurat::shoot(m_pHRengine, 1.00, 0.05 ); }
+  double                       relnoiseamp = CLHEP::RandGaussZiggurat::shoot(rndmEngine, 1.00, 0.05 );
+  while (relnoiseamp < 0.10) { relnoiseamp = CLHEP::RandGaussZiggurat::shoot(rndmEngine, 1.00, 0.05 ); }
 
   // Anatoli says we need to scale the noise amplitude of Kr,Ar according to LT_(Kr,Ar)/LT_Xe
   int strawGasType = StrawGasType(TRT_Identifier);
diff --git a/InnerDetector/InDetDigitization/TRT_Digitization/src/TRTDigCondFakeMap.h b/InnerDetector/InDetDigitization/TRT_Digitization/src/TRTDigCondFakeMap.h
index 0d19bb7764a9ac1e75121924416848e74ef7f607..8495a5dc26fbfe226a770ec48822a8294d152026 100644
--- a/InnerDetector/InDetDigitization/TRT_Digitization/src/TRTDigCondFakeMap.h
+++ b/InnerDetector/InDetDigitization/TRT_Digitization/src/TRTDigCondFakeMap.h
@@ -7,8 +7,6 @@
 
 #include "TRTDigCondBase.h"
 #include "CLHEP/Random/RandomEngine.h"
-#include "GaudiKernel/ServiceHandle.h"
-class IAtRndmGenSvc;
 
 /**
  * "Fake" straw map until "real" map is known.
@@ -19,7 +17,6 @@ public:
   /** Constructor */
   TRTDigCondFakeMap( const TRTDigSettings*,
 		     const InDetDD::TRT_DetectorManager*,
-		     ServiceHandle <IAtRndmGenSvc> atRndmGenSvc,
 		     const TRT_ID* trt_id,
 		     int UseGasMix,
 		     ServiceHandle<ITRT_StrawStatusSummarySvc> sumSvc
@@ -28,14 +25,13 @@ public:
 protected:
 
   void setStrawStateInfo(Identifier& TRT_Identifier,
-			  const double& strawlength,
-			  double& noiselevel,
-			  double& relative_noiseamplitude );
+                         const double& strawlength,
+                         double& noiselevel,
+                         double& relative_noiseamplitude,
+                         CLHEP::HepRandomEngine *rndmEngine);
 
 private:
 
-  CLHEP::HepRandomEngine* m_pHRengine;
-
   float m_average_noiselevel; /**< Average noise level     */
 
 };
diff --git a/InnerDetector/InDetDigitization/TRT_Digitization/src/TRTDigitizationTool.cxx b/InnerDetector/InDetDigitization/TRT_Digitization/src/TRTDigitizationTool.cxx
index 98ddbd57957daa345e1dbe4cc598e34220174adb..333f274f7f913457ad111d867b92096132583ed6 100644
--- a/InnerDetector/InDetDigitization/TRT_Digitization/src/TRTDigitizationTool.cxx
+++ b/InnerDetector/InDetDigitization/TRT_Digitization/src/TRTDigitizationTool.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 ///////////////////////////////////////////////////////////////////
@@ -39,10 +39,6 @@
 #include "InDetRawData/TRT_LoLumRawData.h"
 #include "InDetRawData/TRT_RDO_Collection.h"
 
-// Other includes
-#include "PileUpTools/PileUpMergeSvc.h"
-#include "AthenaKernel/IAtRndmGenSvc.h"
-
 // particle table
 #include "HepPDT/ParticleDataTable.hh"
 #include "GaudiKernel/IPartPropSvc.h"
@@ -63,6 +59,9 @@
 static constexpr unsigned int crazyParticleBarcode(std::numeric_limits<int32_t>::max());
 //Barcodes at the HepMC level are int
 
+// Random Number Generation
+#include "AthenaKernel/RNGWrapper.h"
+#include "CLHEP/Random/RandomEngine.h"
 #include "CLHEP/Random/RandGaussZiggurat.h"
 
 //#include "driftCircle.h" // local copy for debugging and development
@@ -81,7 +80,6 @@ TRTDigitizationTool::TRTDigitizationTool(const std::string& type,
     m_pProcessingOfStraw(NULL),
     m_pDigConditions(NULL),
     m_pNoise(NULL),
-    m_atRndmGenSvc ("AtDSFMTGenSvc", name),
     m_TRTStrawNeighbourSvc("TRT_StrawNeighbourSvc",name),
     m_manager(NULL),
     m_trt_id(NULL),
@@ -115,7 +113,6 @@ TRTDigitizationTool::TRTDigitizationTool(const std::string& type,
   declareProperty("PrintDigSettings", m_printUsedDigSettings = true, "Print ditigization settings" );
   m_settings = new TRTDigSettings();
   m_settings->addPropertiesForOverrideableParameters(static_cast<AlgTool*>(this));
-  declareProperty("RndmSvc",                       m_atRndmGenSvc, "Random Number Service used in TRT digitization" );
   declareProperty("TRT_StrawNeighbourSvc",         m_TRTStrawNeighbourSvc);
   declareProperty("InDetTRTStrawStatusSummarySvc", m_sumSvc);
   declareProperty("UseGasMix",                     m_UseGasMix);
@@ -198,12 +195,7 @@ StatusCode TRTDigitizationTool::initialize()
   ATH_CHECK(m_outputSDOCollName.initialize());
 
   // Get Random Service
-  if (!m_atRndmGenSvc.retrieve().isSuccess()) {
-    ATH_MSG_FATAL ( "Could not initialize Random Number Service." );
-    return StatusCode::FAILURE;
-  }
-
-  m_pHRengine = m_atRndmGenSvc->GetEngine("TRT_DigitizationTool"); // For cosmic event phase
+  ATH_CHECK(m_rndmSvc.retrieve());
 
   // Get the Particle Properties Service
   IPartPropSvc* p_PartPropSvc = 0;
@@ -321,7 +313,10 @@ StatusCode TRTDigitizationTool::processBunchXing(int bunchXing,
 }
 
 //_____________________________________________________________________________
-StatusCode TRTDigitizationTool::lateInitialize() {
+StatusCode TRTDigitizationTool::lateInitialize(CLHEP::HepRandomEngine* noiseRndmEngine,
+                                               CLHEP::HepRandomEngine* elecNoiseRndmEngine,
+                                               CLHEP::HepRandomEngine* elecProcRndmEngine,
+                                               CLHEP::HepRandomEngine* fakeCondRndmEngine) {
 
   m_first_event=false;
 
@@ -342,20 +337,19 @@ StatusCode TRTDigitizationTool::lateInitialize() {
 
   TRTElectronicsNoise *electronicsNoise(NULL);
   if ( m_settings->noiseInUnhitStraws() || m_settings->noiseInSimhits() ) {
-    electronicsNoise = new TRTElectronicsNoise(m_settings, m_atRndmGenSvc);
+    electronicsNoise = new TRTElectronicsNoise(m_settings, elecNoiseRndmEngine);
   }
   // ElectronicsProcessing is needed for the regular straw processing,
   // but also for the noise (it assumes ownership of electronicsnoise )
-  m_pElectronicsProcessing = new TRTElectronicsProcessing( m_settings, m_atRndmGenSvc, electronicsNoise );
+  m_pElectronicsProcessing = new TRTElectronicsProcessing( m_settings, electronicsNoise );
 
   m_pDigConditions = new TRTDigCondFakeMap(m_settings,
 					   m_manager,
-					   m_atRndmGenSvc,
 					   m_trt_id,
 					   m_UseGasMix,
 					   m_sumSvc);
 
-  m_pDigConditions->initialize();
+  m_pDigConditions->initialize(fakeCondRndmEngine);
 
   if ( m_settings->noiseInUnhitStraws() || m_settings->noiseInSimhits() ) {
 
@@ -366,7 +360,9 @@ StatusCode TRTDigitizationTool::lateInitialize() {
     //        straw noise-frequencies:
     m_pNoise = new TRTNoise( m_settings,
 			     m_manager,
-			     m_atRndmGenSvc,
+			     noiseRndmEngine,
+                             elecNoiseRndmEngine,
+                             elecProcRndmEngine,
 			     m_pDigConditions,
 			     m_pElectronicsProcessing,
 			     electronicsNoise,
@@ -391,7 +387,6 @@ StatusCode TRTDigitizationTool::lateInitialize() {
 			      m_manager,
 			      TRTpaiToolXe,
 			      pTRTsimdrifttimetool,
-			      m_atRndmGenSvc,
 			      m_pElectronicsProcessing,
 			      m_pNoise,
 			      m_pDigConditions,
@@ -406,7 +401,11 @@ StatusCode TRTDigitizationTool::lateInitialize() {
 }
 
 //_____________________________________________________________________________
-StatusCode TRTDigitizationTool::processStraws(std::set<int>& sim_hitids, std::set<Identifier>& simhitsIdentifiers) {
+StatusCode TRTDigitizationTool::processStraws(std::set<int>& sim_hitids, std::set<Identifier>& simhitsIdentifiers,
+                                              CLHEP::HepRandomEngine *rndmEngine,
+                                              CLHEP::HepRandomEngine *strawRndmEngine,
+                                              CLHEP::HepRandomEngine *elecProcRndmEngine,
+                                              CLHEP::HepRandomEngine *elecNoiseRndmEngine) {
 
   // Create a map for the SDO
   SG::WriteHandle<InDetSimDataCollection> simDataMap(m_outputSDOCollName);
@@ -423,7 +422,7 @@ StatusCode TRTDigitizationTool::processStraws(std::set<int>& sim_hitids, std::se
 
   m_cosmicEventPhase = 0.0;
   if (m_settings->doCosmicTimingPit()) {
-    m_cosmicEventPhase = getCosmicEventPhase();
+    m_cosmicEventPhase = getCosmicEventPhase(rndmEngine);
   };
 
   // Create  a vector of deposits
@@ -508,7 +507,10 @@ StatusCode TRTDigitizationTool::processStraws(std::set<int>& sim_hitids, std::se
                                        m_cosmicEventPhase, //m_ComTime,
                                        StrawGasType(idStraw),
 				       emulateArFlag,
-				       emulateKrFlag);
+				       emulateKrFlag,
+                                       strawRndmEngine,
+                                       elecProcRndmEngine,
+                                       elecNoiseRndmEngine);
 
     // Print out the digits etc (for debugging)
     //int          mstrw = digit_straw.GetStrawID();
@@ -531,8 +533,16 @@ StatusCode TRTDigitizationTool::processStraws(std::set<int>& sim_hitids, std::se
 //_____________________________________________________________________________
 StatusCode TRTDigitizationTool::processAllSubEvents() {
 
+  // Set the RNGs to use for this event.
+  CLHEP::HepRandomEngine *rndmEngine = getRandomEngine("");
+  CLHEP::HepRandomEngine *fakeCondRndmEngine = getRandomEngine("TRT_FakeConditions");
+  CLHEP::HepRandomEngine *elecNoiseRndmEngine = getRandomEngine("TRT_ElectronicsNoise");
+  CLHEP::HepRandomEngine *noiseRndmEngine = getRandomEngine("TRT_Noise");
+  CLHEP::HepRandomEngine *strawRndmEngine = getRandomEngine("TRT_ProcessStraw");
+  CLHEP::HepRandomEngine *elecProcRndmEngine = getRandomEngine("TRT_ThresholdFluctuations");
+
   if (m_first_event) {
-    if(this->lateInitialize().isFailure()) {
+    if(this->lateInitialize(noiseRndmEngine,elecNoiseRndmEngine,elecProcRndmEngine,fakeCondRndmEngine).isFailure()) {
       ATH_MSG_FATAL ( "lateInitialize method failed!" );
       return StatusCode::FAILURE;
     }
@@ -593,10 +603,7 @@ StatusCode TRTDigitizationTool::processAllSubEvents() {
   m_thpctrt = &thpctrt;
 
   // Process the Hits straw by straw: get the iterator pairs for given straw
-  if(this->processStraws(sim_hitids, simhitsIdentifiers).isFailure()) {
-    ATH_MSG_FATAL ( "processStraws method failed!" );
-    return StatusCode::FAILURE;
-  }
+  ATH_CHECK(this->processStraws(sim_hitids, simhitsIdentifiers, rndmEngine, strawRndmEngine, elecProcRndmEngine, elecNoiseRndmEngine));
 
   // no more hits
 
@@ -604,9 +611,9 @@ StatusCode TRTDigitizationTool::processAllSubEvents() {
   if (m_settings->noiseInUnhitStraws()) {
     const int numberOfDigitsBeforeNoise(m_vDigits.size());
 
-    m_pNoise->appendPureNoiseToProperDigits(m_vDigits, sim_hitids);
+    m_pNoise->appendPureNoiseToProperDigits(m_vDigits, sim_hitids, noiseRndmEngine);
     if (m_settings->doCrosstalk()) {
-      m_pNoise->appendCrossTalkNoiseToProperDigits(m_vDigits, simhitsIdentifiers,m_TRTStrawNeighbourSvc);
+      m_pNoise->appendCrossTalkNoiseToProperDigits(m_vDigits, simhitsIdentifiers,m_TRTStrawNeighbourSvc, noiseRndmEngine);
     }
 
     ATH_MSG_DEBUG ( " Number of digits " << m_vDigits.size() << " (" << m_vDigits.size()-numberOfDigitsBeforeNoise << " of those are pure noise)" );
@@ -631,6 +638,14 @@ StatusCode TRTDigitizationTool::processAllSubEvents() {
   return StatusCode::SUCCESS;
 }
 
+CLHEP::HepRandomEngine* TRTDigitizationTool::getRandomEngine(const std::string& streamName) const
+{
+  ATHRNG::RNGWrapper* rngWrapper = m_rndmSvc->getEngine(this, streamName);
+  std::string rngName = name()+streamName;
+  rngWrapper->setSeed( rngName, Gaudi::Hive::currentContext() );
+  return *rngWrapper;
+}
+
 //_____________________________________________________________________________
 StatusCode TRTDigitizationTool::mergeEvent() {
   std::vector<std::pair<unsigned int, int> >::iterator ii(m_seen.begin());
@@ -640,8 +655,16 @@ StatusCode TRTDigitizationTool::mergeEvent() {
     ++ii;
   }
 
+  // Set the RNGs to use for this event.
+  CLHEP::HepRandomEngine *rndmEngine = getRandomEngine("");
+  CLHEP::HepRandomEngine *fakeCondRndmEngine = getRandomEngine("TRT_FakeConditions");
+  CLHEP::HepRandomEngine *elecNoiseRndmEngine = getRandomEngine("TRT_ElectronicsNoise");
+  CLHEP::HepRandomEngine *noiseRndmEngine = getRandomEngine("TRT_Noise");
+  CLHEP::HepRandomEngine *strawRndmEngine = getRandomEngine("TRT_ProcessStraw");
+  CLHEP::HepRandomEngine *elecProcRndmEngine = getRandomEngine("TRT_ThresholdFluctuations");
+
   if (m_first_event) {
-    if(this->lateInitialize().isFailure()) {
+    if(this->lateInitialize(noiseRndmEngine,elecNoiseRndmEngine,elecProcRndmEngine,fakeCondRndmEngine).isFailure()) {
       ATH_MSG_FATAL ( "lateInitialize method failed!" );
       return StatusCode::FAILURE;
     }
@@ -667,10 +690,7 @@ StatusCode TRTDigitizationTool::mergeEvent() {
 
   // Process the Hits straw by straw:
   //   get the iterator pairs for given straw
-  if(this->processStraws(sim_hitids, simhitsIdentifiers).isFailure()) {
-    ATH_MSG_FATAL ( "processStraws method failed!" );
-    return StatusCode::FAILURE;
-  }
+  ATH_CHECK(this->processStraws(sim_hitids, simhitsIdentifiers, rndmEngine, strawRndmEngine, elecProcRndmEngine, elecNoiseRndmEngine));
 
   delete m_thpctrt;
   std::list<TRTUncompressedHitCollection*>::iterator trtHitColl(m_trtHitCollList.begin());
@@ -687,9 +707,9 @@ StatusCode TRTDigitizationTool::mergeEvent() {
   if (m_settings->noiseInUnhitStraws()) {
     const unsigned int numberOfDigitsBeforeNoise(m_vDigits.size());
 
-    m_pNoise->appendPureNoiseToProperDigits(m_vDigits, sim_hitids);
+    m_pNoise->appendPureNoiseToProperDigits(m_vDigits, sim_hitids, noiseRndmEngine);
     if (m_settings->doCrosstalk()) {
-      m_pNoise->appendCrossTalkNoiseToProperDigits(m_vDigits, simhitsIdentifiers,m_TRTStrawNeighbourSvc);
+      m_pNoise->appendCrossTalkNoiseToProperDigits(m_vDigits, simhitsIdentifiers,m_TRTStrawNeighbourSvc, noiseRndmEngine);
     }
 
     ATH_MSG_DEBUG ( " Number of digits " << m_vDigits.size() << " (" << m_vDigits.size()-numberOfDigitsBeforeNoise << " of those are pure noise)" );
@@ -978,9 +998,9 @@ unsigned int TRTDigitizationTool::getRegion(int hitID) {
 
 }
 
-double TRTDigitizationTool::getCosmicEventPhase() {
+double TRTDigitizationTool::getCosmicEventPhase(CLHEP::HepRandomEngine *rndmEngine) {
   // 13th February 2015: replace ComTime with a hack (fixme) based on an
   // event phase distribution from Alex (alejandro.alonso@cern.ch) that
   // is modelled as a Guassian of mean 5.48 ns and sigma 8.91 ns.
-  return CLHEP::RandGaussZiggurat::shoot(m_pHRengine, 5.48, 8.91);
+  return CLHEP::RandGaussZiggurat::shoot(rndmEngine, 5.48, 8.91);
 }
diff --git a/InnerDetector/InDetDigitization/TRT_Digitization/src/TRTDigitizationTool.h b/InnerDetector/InDetDigitization/TRT_Digitization/src/TRTDigitizationTool.h
index 9297d76560144bf455e21845833aeb2b75c50b63..9d82a2936f2e6e208ea12722cf0a5fa6daf59693 100644
--- a/InnerDetector/InDetDigitization/TRT_Digitization/src/TRTDigitizationTool.h
+++ b/InnerDetector/InDetDigitization/TRT_Digitization/src/TRTDigitizationTool.h
@@ -12,6 +12,8 @@
 
 #include "xAODEventInfo/EventInfo.h"  /*SubEvent*/
 #include "PileUpTools/PileUpToolBase.h"
+#include "AthenaKernel/IAthRNGSvc.h"
+#include "PileUpTools/PileUpMergeSvc.h"
 #include "TRTDigit.h"
 #include "GaudiKernel/ServiceHandle.h"
 #include "GaudiKernel/ToolHandle.h"
@@ -25,10 +27,8 @@
 #include <set>
 #include <utility> /* pair */
 
-class PileUpMergeSvc;
 class ITRT_PAITool;
 class ITRT_SimDriftTimeTool;
-class IAtRndmGenSvc;
 class TRT_ID;
 class TRTProcessingOfStraw;
 class TRTElectronicsProcessing;
@@ -94,8 +94,7 @@ public:
   StatusCode finalize();
 
 private:
-
-  CLHEP::HepRandomEngine * m_pHRengine;
+  CLHEP::HepRandomEngine* getRandomEngine(const std::string& streamName) const;
 
   Identifier getIdentifier( int hitID,
 			    IdentifierHash& hashId,
@@ -105,15 +104,22 @@ private:
   StatusCode update( IOVSVC_CALLBACK_ARGS );        // Update of database entries.
   StatusCode ConditionsDependingInitialization();
 
-  StatusCode lateInitialize();
-  StatusCode processStraws(std::set<int>& sim_hitids, std::set<Identifier>& simhitsIdentifiers);
+  StatusCode lateInitialize(CLHEP::HepRandomEngine *noiseRndmEngine,
+                            CLHEP::HepRandomEngine *elecNoiseRndmEngine,
+                            CLHEP::HepRandomEngine *elecProcRndmEngine,
+                            CLHEP::HepRandomEngine *fakeCondRndmEngine);
+  StatusCode processStraws(std::set<int>& sim_hitids, std::set<Identifier>& simhitsIdentifiers,
+                           CLHEP::HepRandomEngine *rndmEngine,
+                           CLHEP::HepRandomEngine *strawRndmEngine,
+                           CLHEP::HepRandomEngine *elecProcRndmEngine,
+                           CLHEP::HepRandomEngine *elecNoiseRndmEngine);
   StatusCode createAndStoreRDOs();
 
   // The straw's gas mix: 1=Xe, 2=Kr, 3=Ar
   int StrawGasType(Identifier& TRT_Identifier) const;
 
   unsigned int getRegion(int hitID);
-  double getCosmicEventPhase();
+  double getCosmicEventPhase(CLHEP::HepRandomEngine *rndmEngine);
 
   std::vector<std::pair<unsigned int, int> > m_seen;
   std::vector<TRTDigit> m_vDigits; /**< Vector of all digits */
@@ -136,7 +142,7 @@ private:
   TRTNoise* m_pNoise;
 
   //unsigned int m_timer_eventcount;
-  ServiceHandle <IAtRndmGenSvc> m_atRndmGenSvc;  /**< Random number service */
+  ServiceHandle<IAthRNGSvc> m_rndmSvc{this, "RndmSvc", "AthRNGSvc", ""};  //!< Random number service
   ServiceHandle<ITRT_StrawNeighbourSvc> m_TRTStrawNeighbourSvc;
 
   const InDetDD::TRT_DetectorManager* m_manager;
diff --git a/InnerDetector/InDetDigitization/TRT_Digitization/src/TRTElectronicsNoise.cxx b/InnerDetector/InDetDigitization/TRT_Digitization/src/TRTElectronicsNoise.cxx
index f46502834fed9e4a9aacbed4b62094d1b2bb82bf..4864549b4149582fe0e338dcc4ec7171393ecf8a 100644
--- a/InnerDetector/InDetDigitization/TRT_Digitization/src/TRTElectronicsNoise.cxx
+++ b/InnerDetector/InDetDigitization/TRT_Digitization/src/TRTElectronicsNoise.cxx
@@ -9,7 +9,7 @@
 // For the Athena-based random numbers.
 #include "CLHEP/Random/RandFlat.h"
 #include "CLHEP/Random/RandGaussZiggurat.h"
-#include "AthenaKernel/IAtRndmGenSvc.h"
+#include "CLHEP/Random/RandomEngine.h"
 
 #include "TRTDigSettings.h"
 
@@ -18,7 +18,7 @@
 
 //_____________________________________________________________________________
 TRTElectronicsNoise::TRTElectronicsNoise(const TRTDigSettings* digset,
-					 ServiceHandle <IAtRndmGenSvc> atRndmGenSvc )
+					 CLHEP::HepRandomEngine *elecNoiseRndmEngine )
   : m_settings(digset),
     m_msg("TRTElectronicsNoise")
 {
@@ -27,10 +27,9 @@ TRTElectronicsNoise::TRTElectronicsNoise(const TRTDigSettings* digset,
 
   //Need to initialize the signal shaping first as it is used in tabulateNoiseSignalShape()!
   this->InitializeNoiseShaping();
-  m_pHRengine = atRndmGenSvc->GetEngine("TRT_ElectronicsNoise");
   m_fractionOfSlowNoise = m_settings->slowPeriodicNoisePulseFraction();
   this->tabulateNoiseSignalShape();
-  this->reinitElectronicsNoise(200);
+  this->reinitElectronicsNoise(200, elecNoiseRndmEngine);
   const double slowPeriod(m_settings->slowPeriodicNoisePulseDistance());
 
   //Must be rounded to nearest multiple of binwidth... (fixme - from options)
@@ -46,7 +45,7 @@ TRTElectronicsNoise::~TRTElectronicsNoise(){}
 
 //_____________________________________________________________________________
 void TRTElectronicsNoise::getSamplesOfMaxLTOverNoiseAmp(std::vector<float>& maxLTOverNoiseAmp,
-							unsigned long nsamplings) {
+							unsigned long nsamplings, CLHEP::HepRandomEngine* rndmEngine) {
 
   // Note: The offset structure is not the same as in
   // addElectronicsNoise(), but that is OK, since it is not the exact
@@ -55,7 +54,7 @@ void TRTElectronicsNoise::getSamplesOfMaxLTOverNoiseAmp(std::vector<float>& maxL
 
   maxLTOverNoiseAmp.resize(nsamplings);
 
-  reinitElectronicsNoise(500);
+  reinitElectronicsNoise(500, rndmEngine);
   unsigned int index         = m_noiseSignalShape.size();
   unsigned int nbinsinperiod = m_settings->numberOfBins();
   unsigned int maxindex      = m_cachedFastNoiseAfterSignalShaping.size() - nbinsinperiod;
@@ -64,7 +63,7 @@ void TRTElectronicsNoise::getSamplesOfMaxLTOverNoiseAmp(std::vector<float>& maxL
     maxLTOverNoiseAmp[i] = getMax(index, index, nbinsinperiod );
     index += nbinsinperiod;
     if ( index  > maxindex ) {
-      reinitElectronicsNoise(500);
+      reinitElectronicsNoise(500, rndmEngine);
       index = m_noiseSignalShape.size();
     }
   }
@@ -93,7 +92,8 @@ double TRTElectronicsNoise::getMax(unsigned int firstbinslowsignal,
 }
 
 //_____________________________________________________________________________
-void TRTElectronicsNoise::reinitElectronicsNoise(const unsigned int& numberOfDigitLengths /*number of 75ns timeslices*/)
+void TRTElectronicsNoise::reinitElectronicsNoise(const unsigned int& numberOfDigitLengths /*number of 75ns timeslices*/,
+                                                 CLHEP::HepRandomEngine* rndmEngine)
 {
   //This method gives the actual physics shape!
   //Model parameters:
@@ -130,7 +130,7 @@ void TRTElectronicsNoise::reinitElectronicsNoise(const unsigned int& numberOfDig
   while ( true ) {
     binindex = static_cast<unsigned int>(timeOfNextPulse*invbinwidth);
     if (binindex >= nbins) break;
-    m_tmpArray[binindex] += CLHEP::RandGaussZiggurat::shoot(m_pHRengine, 0., 1.);
+    m_tmpArray[binindex] += CLHEP::RandGaussZiggurat::shoot(rndmEngine, 0., 1.);
     timeOfNextPulse += fastPeriod;
   };
 
@@ -155,7 +155,7 @@ void TRTElectronicsNoise::reinitElectronicsNoise(const unsigned int& numberOfDig
   while (true) {
     binindex = static_cast<unsigned int>(timeOfNextPulse*invbinwidth);
     if (binindex >= nbins) break;
-    m_tmpArray[binindex] += CLHEP::RandGaussZiggurat::shoot(m_pHRengine, 0., 1.);
+    m_tmpArray[binindex] += CLHEP::RandGaussZiggurat::shoot(rndmEngine, 0., 1.);
     timeOfNextPulse += slowPeriod;
   };
 
@@ -202,7 +202,8 @@ void TRTElectronicsNoise::tabulateNoiseSignalShape() {
 
 //_____________________________________________________________________________
 void TRTElectronicsNoise::addElectronicsNoise(std::vector<double>& signal,
-					      const double& noiseamplitude) {
+					      const double& noiseamplitude,
+                                              CLHEP::HepRandomEngine *rndmEngine) {
 
   // complain if uninitialized? (fixme)
 
@@ -223,10 +224,10 @@ void TRTElectronicsNoise::addElectronicsNoise(std::vector<double>& signal,
 
   //Find array offset for fast signal:
   const unsigned int nsignalbins(signal.size());
-  const unsigned int offset_fast(CLHEP::RandFlat::shootInt(m_pHRengine, m_cachedFastNoiseAfterSignalShaping.size()-nsignalbins));
+  const unsigned int offset_fast(CLHEP::RandFlat::shootInt(rndmEngine, m_cachedFastNoiseAfterSignalShaping.size()-nsignalbins));
 
   //Find array offset for slow periodic signal:
-  int offset_slowperiodic(CLHEP::RandFlat::shootInt(m_pHRengine,
+  int offset_slowperiodic(CLHEP::RandFlat::shootInt(rndmEngine,
                           m_cachedSlowNoiseAfterSignalShaping.size()
                           - nsignalbins-n_slowperiodic_shift
                           - slowperiodic_constshift));
@@ -234,7 +235,7 @@ void TRTElectronicsNoise::addElectronicsNoise(std::vector<double>& signal,
   offset_slowperiodic -= ( offset_slowperiodic % m_nbins_periodic );
   offset_slowperiodic -= slowperiodic_constshift;
 
-  const double rand(CLHEP::RandFlat::shoot(m_pHRengine, 0., 1.));
+  const double rand(CLHEP::RandFlat::shoot(rndmEngine, 0., 1.));
   for (unsigned int i(0); i < n_slowperiodic_shift; ++i) {
     if ( rand < slowperiodic_shift_prob_comul[i] ) {
       offset_slowperiodic -= i;
diff --git a/InnerDetector/InDetDigitization/TRT_Digitization/src/TRTElectronicsNoise.h b/InnerDetector/InDetDigitization/TRT_Digitization/src/TRTElectronicsNoise.h
index 9892b2fe58b6d8e363cae23c2f2c9219c0439192..2962909ed65ca4fc7d639f20e747686e07fb4f81 100644
--- a/InnerDetector/InDetDigitization/TRT_Digitization/src/TRTElectronicsNoise.h
+++ b/InnerDetector/InDetDigitization/TRT_Digitization/src/TRTElectronicsNoise.h
@@ -6,11 +6,9 @@
 #define TRTELECTRONICSNOISE_H
 
 #include <vector>
-#include "GaudiKernel/ServiceHandle.h"
 
 #include "AthenaKernel/MsgStreamMember.h"
 
-class IAtRndmGenSvc;
 #include "CLHEP/Random/RandomEngine.h"
 class TRTDigSettings;
 
@@ -25,7 +23,7 @@ public:
    * Constructor: Calls tabulateNoiseSignalShape()
    */
   TRTElectronicsNoise( const TRTDigSettings*,
-		       ServiceHandle <IAtRndmGenSvc> atRndmGenSvc );
+		       CLHEP::HepRandomEngine *rndmEngine );
   /** Destructor */
   ~TRTElectronicsNoise();
 
@@ -43,7 +41,8 @@ public:
   bool msgLevel (MSG::Level lvl)    { return m_msg.get().level() <= lvl; }
 
   void getSamplesOfMaxLTOverNoiseAmp(std::vector<float>& maxLTOverNoiseAmp,
-				     unsigned long nsamplings);
+				     unsigned long nsamplings,
+                                     CLHEP::HepRandomEngine *rndmEngine);
 
   /**
    * Re-initialize electronics noise table.
@@ -62,7 +61,8 @@ public:
    *                              noise for
    */
   void reinitElectronicsNoise(const unsigned int& numberOfDigitLengths
-			      /*number of 75ns timeslices*/ );
+			      /*number of 75ns timeslices*/,
+                              CLHEP::HepRandomEngine *rndmEngine);
 
   /** Set electronics noise amplitude */
   void setElectronicsNoiseAmplitude(const double&);
@@ -76,14 +76,13 @@ public:
    * @param noiseamplitude: noise amplitude
    */
   void addElectronicsNoise(std::vector<double>& signal,
-			   const double& noiseamplitude /*= 1.0*/ );
+			   const double& noiseamplitude /*= 1.0*/,
+                           CLHEP::HepRandomEngine *rndmEngine);
 
 private:
 
   const TRTDigSettings* m_settings;
 
-  CLHEP::HepRandomEngine * m_pHRengine;
-
   /**
    * Tabulate noise signal shape. Extract signal shape from NoiseShape(time)
    * function and store in table.
diff --git a/InnerDetector/InDetDigitization/TRT_Digitization/src/TRTElectronicsProcessing.cxx b/InnerDetector/InDetDigitization/TRT_Digitization/src/TRTElectronicsProcessing.cxx
index 13ffce949798ae6f1e5f7c54b4e8dd1e4b5d8387..70e8fee0b2049eb7c382b41880583bb64ba644e9 100644
--- a/InnerDetector/InDetDigitization/TRT_Digitization/src/TRTElectronicsProcessing.cxx
+++ b/InnerDetector/InDetDigitization/TRT_Digitization/src/TRTElectronicsProcessing.cxx
@@ -7,9 +7,9 @@
 #include "TRTElectronicsNoise.h"
 #include "TRTDigit.h"
 
-#include "AthenaKernel/IAtRndmGenSvc.h"
 #include "CLHEP/Random/RandGaussZiggurat.h"
 #include "CLHEP/Random/RandFlat.h"
+#include "CLHEP/Random/RandomEngine.h"
 
 #include "TRTDigSettings.h"
 
@@ -18,14 +18,12 @@
 
 //___________________________________________________________________________
 TRTElectronicsProcessing::TRTElectronicsProcessing( const TRTDigSettings* digset,
-						    ServiceHandle <IAtRndmGenSvc> atRndmGenSvc,
 						    TRTElectronicsNoise * electronicsnoise )
   : m_settings(digset),
     m_pElectronicsNoise(electronicsnoise),
     m_msg("TRTElectronicsProcessing")
 {
   if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) <<"TRTElectronicsProcessing::Constructor begin" << endmsg;
-  m_pHRengine  = atRndmGenSvc->GetEngine("TRT_ThresholdFluctuations");
   Initialize();
   if (msgLevel(MSG::VERBOSE)) msg(MSG::VERBOSE) <<"TRTElectronicsProcessing::Constructor done" << endmsg;
 }
@@ -221,6 +219,8 @@ void TRTElectronicsProcessing::ProcessDeposits( const std::vector<TRTElectronics
 						double lowthreshold,
 						const double& noiseamplitude,
 						int strawGasType,
+                                                CLHEP::HepRandomEngine* rndmEngine,
+                                                CLHEP::HepRandomEngine* elecNoiseRndmEngine,
 						double highthreshold
 					      ) {
   ////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -245,11 +245,11 @@ void TRTElectronicsProcessing::ProcessDeposits( const std::vector<TRTElectronics
 
   const double low_threshold_fluctuation(m_settings->relativeLowThresholdFluctuation());
   if ( low_threshold_fluctuation > 0 ) {
-    lowthreshold = lowthreshold*CLHEP::RandGaussZiggurat::shoot(m_pHRengine, 1.0, low_threshold_fluctuation );
+    lowthreshold = lowthreshold*CLHEP::RandGaussZiggurat::shoot(rndmEngine, 1.0, low_threshold_fluctuation );
   }
   const double high_threshold_fluctuation(m_settings->relativeHighThresholdFluctuation());
   if ( high_threshold_fluctuation > 0 ) {
-    highthreshold = highthreshold*CLHEP::RandGaussZiggurat::shoot(m_pHRengine, 1.0, high_threshold_fluctuation );
+    highthreshold = highthreshold*CLHEP::RandGaussZiggurat::shoot(rndmEngine, 1.0, high_threshold_fluctuation );
   }
 
   //Null out arrays: m_totalNumberOfBins=160(125ns)
@@ -278,7 +278,7 @@ void TRTElectronicsProcessing::ProcessDeposits( const std::vector<TRTElectronics
   // Add noise; LT only
   // (though both LT and HT also get fluctuations elsewhere which gives similar effect to noise).
   if ( m_pElectronicsNoise && noiseamplitude>0 ) {
-    m_pElectronicsNoise->addElectronicsNoise(m_lowThresholdSignal,noiseamplitude); // LT signal only
+    m_pElectronicsNoise->addElectronicsNoise(m_lowThresholdSignal,noiseamplitude, elecNoiseRndmEngine); // LT signal only
   }
 
   // Discriminator response (in what fine time bins are the thresholds exceeded)
diff --git a/InnerDetector/InDetDigitization/TRT_Digitization/src/TRTElectronicsProcessing.h b/InnerDetector/InDetDigitization/TRT_Digitization/src/TRTElectronicsProcessing.h
index edea73cc39c200dcbbe866a11d95daac18a11708..d9cc5382db207478abb9420dcbc6ba59c3c8dbc6 100644
--- a/InnerDetector/InDetDigitization/TRT_Digitization/src/TRTElectronicsProcessing.h
+++ b/InnerDetector/InDetDigitization/TRT_Digitization/src/TRTElectronicsProcessing.h
@@ -9,7 +9,6 @@
 
 class TRTDigit;
 class TRTElectronicsNoise;
-class IAtRndmGenSvc;
 #include "CLHEP/Random/RandomEngine.h"
 #include "GaudiKernel/ServiceHandle.h"
 #include "AthenaKernel/MsgStreamMember.h"
@@ -22,7 +21,6 @@ class TRTDigSettings;
 class TRTElectronicsProcessing {
 public:
   TRTElectronicsProcessing( const TRTDigSettings* digset,
-			    ServiceHandle <IAtRndmGenSvc> atRndmGenSvc,
 			    TRTElectronicsNoise * electronicsnoise );
   ~TRTElectronicsProcessing();
 
@@ -69,6 +67,8 @@ public:
 			double lowthreshold,
 			const double& noiseamplitude,
 			int strawGasType,
+                        CLHEP::HepRandomEngine* rndmEngine,
+                        CLHEP::HepRandomEngine* elecNoiseRndmEngine,
 			double highthreshold = -1.0
 		      );
 
@@ -129,7 +129,6 @@ private:
   const TRTDigSettings* m_settings;
 
   TRTElectronicsNoise * m_pElectronicsNoise;
-  CLHEP::HepRandomEngine * m_pHRengine;
 
   double m_timeInterval;       /**< Time interval covered by digit [75 ns] */
 
diff --git a/InnerDetector/InDetDigitization/TRT_Digitization/src/TRTNoise.cxx b/InnerDetector/InDetDigitization/TRT_Digitization/src/TRTNoise.cxx
index 2903ca5e000c042930720c09ca6ff8172ca74462..0d5c6d084de8d75d0f6ca48df255efc7bd3123d3 100644
--- a/InnerDetector/InDetDigitization/TRT_Digitization/src/TRTNoise.cxx
+++ b/InnerDetector/InDetDigitization/TRT_Digitization/src/TRTNoise.cxx
@@ -33,7 +33,9 @@ struct TRTDigitSorter {
 //_____________________________________________________________________________
 TRTNoise::TRTNoise( const TRTDigSettings* digset,
 		    const InDetDD::TRT_DetectorManager* detmgr,
-		    ServiceHandle <IAtRndmGenSvc> atRndmGenSvc,
+                    CLHEP::HepRandomEngine* noiseRndmEngine,
+                    CLHEP::HepRandomEngine* elecNoiseRndmEngine,
+                    CLHEP::HepRandomEngine* elecProcRndmEngine,
 		    TRTDigCondBase* digcond,
 		    TRTElectronicsProcessing * ep,
 		    TRTElectronicsNoise * electronicsnoise,
@@ -54,9 +56,8 @@ TRTNoise::TRTNoise( const TRTDigSettings* digset,
     m_sumSvc(sumSvc)
 {
   if (msgLevel(MSG::VERBOSE)) { msg(MSG::VERBOSE) << "TRTNoise::Constructor begin" << endmsg; }
-  m_noise_randengine = atRndmGenSvc->GetEngine("TRT_Noise");
-  InitThresholdsAndNoiseAmplitudes_and_ProduceNoiseDigitPool();
-  if ( m_settings->noiseInSimhits() ) m_pElectronicsNoise->reinitElectronicsNoise( 1000 );
+  InitThresholdsAndNoiseAmplitudes_and_ProduceNoiseDigitPool(noiseRndmEngine,elecNoiseRndmEngine,elecProcRndmEngine);
+  if ( m_settings->noiseInSimhits() ) m_pElectronicsNoise->reinitElectronicsNoise( 1000, elecNoiseRndmEngine );
   if (msgLevel(MSG::VERBOSE)) { msg(MSG::VERBOSE) << "Constructor done" << endmsg; }
 }
 
@@ -67,7 +68,9 @@ TRTNoise::~TRTNoise() {
 }
 
 //_____________________________________________________________________________
-void TRTNoise::InitThresholdsAndNoiseAmplitudes_and_ProduceNoiseDigitPool() {
+void TRTNoise::InitThresholdsAndNoiseAmplitudes_and_ProduceNoiseDigitPool(CLHEP::HepRandomEngine* noiseRndmEngine,
+                                                                          CLHEP::HepRandomEngine* elecNoiseRndmEngine,
+                                                                          CLHEP::HepRandomEngine* elecProcRndmEngine) {
 
   /////////////////////////////////////////////////////////////////////
   //Strategy:                                                        //
@@ -98,7 +101,7 @@ void TRTNoise::InitThresholdsAndNoiseAmplitudes_and_ProduceNoiseDigitPool() {
   ///////////////////////////////////////////////////////////////////
   // According to Anatoli, the noise shaping function is not very different for Argon and Xenon(and Krypton).
   std::vector<float> maxLTOverNoiseAmp;
-  m_pElectronicsNoise->getSamplesOfMaxLTOverNoiseAmp(maxLTOverNoiseAmp,10000);
+  m_pElectronicsNoise->getSamplesOfMaxLTOverNoiseAmp(maxLTOverNoiseAmp,10000,elecNoiseRndmEngine);
 
   std::stable_sort( maxLTOverNoiseAmp.begin(), maxLTOverNoiseAmp.end() );
   reverse(          maxLTOverNoiseAmp.begin(), maxLTOverNoiseAmp.end() );
@@ -259,7 +262,7 @@ void TRTNoise::InitThresholdsAndNoiseAmplitudes_and_ProduceNoiseDigitPool() {
   // Step 4 - Produce pool of pure noise digits                    //
   ///////////////////////////////////////////////////////////////////
   if ( m_settings->noiseInUnhitStraws() ) {
-    ProduceNoiseDigitPool( actual_LTs, actual_noiseamps, strawTypes );
+    ProduceNoiseDigitPool( actual_LTs, actual_noiseamps, strawTypes, noiseRndmEngine, elecNoiseRndmEngine, elecProcRndmEngine );
   }
   if (msgLevel(MSG::VERBOSE)) { msg(MSG::VERBOSE)
       << "TRTNoise::InitThresholdsAndNoiseAmplitudes_and_ProduceNoiseDigitPool Done" << endmsg;
@@ -270,7 +273,10 @@ void TRTNoise::InitThresholdsAndNoiseAmplitudes_and_ProduceNoiseDigitPool() {
 //_____________________________________________________________________________
 void TRTNoise::ProduceNoiseDigitPool( const std::vector<float>& lowthresholds,
 				      const std::vector<float>& noiseamps,
-				      const std::vector<int>& strawType ) {
+				      const std::vector<int>& strawType,
+                                      CLHEP::HepRandomEngine* noiseRndmEngine,
+                                      CLHEP::HepRandomEngine* elecNoiseRndmEngine,
+                                      CLHEP::HepRandomEngine* elecProcRndmEngine) {
 
   unsigned int nstraw = lowthresholds.size();
   unsigned int istraw;
@@ -291,14 +297,14 @@ void TRTNoise::ProduceNoiseDigitPool( const std::vector<float>& lowthresholds,
     // These are used as inputs to TRTElectronicsProcessing::ProcessDeposits
     // to create noise digits
     if ( ntries%400==0 ) {
-      m_pElectronicsNoise->reinitElectronicsNoise(200);
+      m_pElectronicsNoise->reinitElectronicsNoise(200, elecNoiseRndmEngine);
     }
     // Initialize stuff (is that necessary)?
     digit = TRTDigit();
     deposits.clear();
 
     // Choose straw to simulate
-    istraw = CLHEP::RandFlat::shootInt(m_noise_randengine, nstraw );
+    istraw = CLHEP::RandFlat::shootInt(noiseRndmEngine, nstraw );
 
     // Process deposits this straw. Since there are no deposits, only noise will contrinute
     m_pElectronicsProcessing->ProcessDeposits( deposits,
@@ -306,7 +312,9 @@ void TRTNoise::ProduceNoiseDigitPool( const std::vector<float>& lowthresholds,
 					       digit,
 					       lowthresholds.at(istraw),
 					       noiseamps.at(istraw),
-					       strawType.at(istraw)
+					       strawType.at(istraw),
+                                               elecProcRndmEngine,
+                                               elecNoiseRndmEngine
  					    );
 
     // If this process produced a digit, store in pool
@@ -331,7 +339,8 @@ void TRTNoise::ProduceNoiseDigitPool( const std::vector<float>& lowthresholds,
 }
 
 //_____________________________________________________________________________
-void TRTNoise::appendPureNoiseToProperDigits( std::vector<TRTDigit>& digitVect, const std::set<int>& sim_hitids )
+void TRTNoise::appendPureNoiseToProperDigits( std::vector<TRTDigit>& digitVect, const std::set<int>& sim_hitids,
+                                              CLHEP::HepRandomEngine* noiseRndmEngine )
 {
 
   const std::set<int>::const_iterator sim_hitids_end(sim_hitids.end());
@@ -340,11 +349,11 @@ void TRTNoise::appendPureNoiseToProperDigits( std::vector<TRTDigit>& digitVect,
   int hitid;
   float noiselevel;
 
-  while (m_pDigConditions->getNextNoisyStraw(m_noise_randengine,hitid,noiselevel) ) {
+  while (m_pDigConditions->getNextNoisyStraw(noiseRndmEngine,hitid,noiselevel) ) {
     //returned noiselevel not used for anything right now (fixme?).
     // If this strawID does not have a sim_hit, add a pure noise digit
     if ( sim_hitids.find(hitid) == sim_hitids_end ) {
-      const int ndigit(m_digitPool[CLHEP::RandFlat::shootInt(m_noise_randengine,m_digitPoolLength)]);
+      const int ndigit(m_digitPool[CLHEP::RandFlat::shootInt(noiseRndmEngine,m_digitPoolLength)]);
       digitVect.push_back(TRTDigit(hitid,ndigit));
     }
   };
@@ -358,7 +367,8 @@ void TRTNoise::appendPureNoiseToProperDigits( std::vector<TRTDigit>& digitVect,
 
 void TRTNoise::appendCrossTalkNoiseToProperDigits(std::vector<TRTDigit>& digitVect,
 						  const std::set<Identifier>& simhitsIdentifiers,
-						  ServiceHandle<ITRT_StrawNeighbourSvc> TRTStrawNeighbourSvc) {
+						  ServiceHandle<ITRT_StrawNeighbourSvc> TRTStrawNeighbourSvc,
+                                                  CLHEP::HepRandomEngine* noiseRndmEngine) {
 
   //id helper:
   TRTHitIdHelper* hitid_helper = TRTHitIdHelper::GetHelper();
@@ -388,8 +398,8 @@ void TRTNoise::appendCrossTalkNoiseToProperDigits(std::vector<TRTDigit>& digitVe
     for (unsigned int i=0;i<CrossTalkIds.size();++i) {
 
       if ( simhitsIdentifiers.find(CrossTalkIds[i]) == simhitsIdentifiers_end )  {
-	if (m_pDigConditions->crossTalkNoise(m_noise_randengine)==1 ) {
-	  const int ndigit(m_digitPool[CLHEP::RandFlat::shootInt(m_noise_randengine,
+	if (m_pDigConditions->crossTalkNoise(noiseRndmEngine)==1 ) {
+	  const int ndigit(m_digitPool[CLHEP::RandFlat::shootInt(noiseRndmEngine,
 							  m_digitPoolLength)]);
 	  int barrel_endcap, isneg;
 	  switch ( m_id_helper->barrel_ec(CrossTalkIds[i]) ) {
@@ -414,9 +424,9 @@ void TRTNoise::appendCrossTalkNoiseToProperDigits(std::vector<TRTDigit>& digitVe
 
     for (unsigned int i=0;i<CrossTalkIdsOtherEnd.size();++i) {
       if ( simhitsIdentifiers.find(CrossTalkIdsOtherEnd[i]) == simhitsIdentifiers_end )  {
-	if (m_pDigConditions->crossTalkNoiseOtherEnd(m_noise_randengine)==1 ) {
+	if (m_pDigConditions->crossTalkNoiseOtherEnd(noiseRndmEngine)==1 ) {
 
-	  const int ndigit(m_digitPool[CLHEP::RandFlat::shootInt(m_noise_randengine,m_digitPoolLength)]);
+	  const int ndigit(m_digitPool[CLHEP::RandFlat::shootInt(noiseRndmEngine,m_digitPoolLength)]);
 
 	  int barrel_endcap, isneg;
 	  switch ( m_id_helper->barrel_ec(CrossTalkIdsOtherEnd[i]) ) {
diff --git a/InnerDetector/InDetDigitization/TRT_Digitization/src/TRTNoise.h b/InnerDetector/InDetDigitization/TRT_Digitization/src/TRTNoise.h
index 20d854e9640f0667a34e63067e33da2b57fe537e..422a04b03c6c36a0425167b6a0d6c76088b21e5a 100644
--- a/InnerDetector/InDetDigitization/TRT_Digitization/src/TRTNoise.h
+++ b/InnerDetector/InDetDigitization/TRT_Digitization/src/TRTNoise.h
@@ -42,7 +42,9 @@ public:
    */
   TRTNoise( const TRTDigSettings*,
 	    const InDetDD::TRT_DetectorManager*,
-	    ServiceHandle <IAtRndmGenSvc> atRndmGenSvc,
+            CLHEP::HepRandomEngine* noiseRndmEngine,
+            CLHEP::HepRandomEngine* elecNoiseRndmEngine,
+            CLHEP::HepRandomEngine* elecProcRndmEngine,
 	    TRTDigCondBase* digcond,
 	    TRTElectronicsProcessing * ep,
 	    TRTElectronicsNoise * electronicsnoise,
@@ -63,12 +65,14 @@ public:
    *                    noise digit to already hit straw.
    */
   void appendPureNoiseToProperDigits( std::vector<TRTDigit>& digitVect,
-				      const std::set<int>& sim_hitids) ;
+				      const std::set<int>& sim_hitids,
+                                      CLHEP::HepRandomEngine* noiseRndmEngine) ;
 
 
   void appendCrossTalkNoiseToProperDigits(std::vector<TRTDigit>& digitVect,
 					  const std::set<Identifier>& simhitsIdentifiers,
-					  ServiceHandle<ITRT_StrawNeighbourSvc> m_TRTStrawNeighbourSvc);
+					  ServiceHandle<ITRT_StrawNeighbourSvc> m_TRTStrawNeighbourSvc,
+                                          CLHEP::HepRandomEngine* noiseRndmEngine);
 
   void sortDigits(std::vector<TRTDigit>& digitVect);
 
@@ -109,7 +113,9 @@ public:
    * -# Call method @c ProduceNoiseDigitPool to produce pool of pure noise
    *   digits
    */
-  void InitThresholdsAndNoiseAmplitudes_and_ProduceNoiseDigitPool();
+  void InitThresholdsAndNoiseAmplitudes_and_ProduceNoiseDigitPool(CLHEP::HepRandomEngine* noiseRndmEngine,
+                                                                  CLHEP::HepRandomEngine* elecNoiseRndmEngine,
+                                                                  CLHEP::HepRandomEngine* elecProcRndmEngine);
 
   /**
    * Produce pool of pure noise digits (for simulation of noise in unhit
@@ -125,7 +131,10 @@ public:
    */
   void ProduceNoiseDigitPool( const std::vector<float>& lowthresholds,
 			      const std::vector<float>& noiseamps,
-			      const std::vector<int>& strawType
+			      const std::vector<int>& strawType,
+                              CLHEP::HepRandomEngine* noiseRndmEngine,
+                              CLHEP::HepRandomEngine* elecNoiseRndmEngine,
+                              CLHEP::HepRandomEngine* elecProcRndmEngine
 			    );
 
   const TRT_ID* m_id_helper;
diff --git a/InnerDetector/InDetDigitization/TRT_Digitization/src/TRTProcessingOfStraw.cxx b/InnerDetector/InDetDigitization/TRT_Digitization/src/TRTProcessingOfStraw.cxx
index cb60224e2fd77c3d7920b4da3fb7b1e42f8266d8..c8643caa920dd2ac496353a5cc0847db4aea6f7c 100644
--- a/InnerDetector/InDetDigitization/TRT_Digitization/src/TRTProcessingOfStraw.cxx
+++ b/InnerDetector/InDetDigitization/TRT_Digitization/src/TRTProcessingOfStraw.cxx
@@ -34,7 +34,6 @@
 //#include "HepPDT/ParticleDataTable.hh"
 
 // For the Athena-based random numbers.
-#include "AthenaKernel/IAtRndmGenSvc.h"
 #include "CLHEP/Random/RandPoisson.h"//randpoissonq? (fixme)
 #include "CLHEP/Random/RandFlat.h"
 #include "CLHEP/Random/RandBinomial.h"
@@ -54,7 +53,6 @@ TRTProcessingOfStraw::TRTProcessingOfStraw(const TRTDigSettings* digset,
                                            const InDetDD::TRT_DetectorManager* detmgr,
                                            ITRT_PAITool* paitoolXe,
                                            ITRT_SimDriftTimeTool* simdrifttool,
-                                           ServiceHandle <IAtRndmGenSvc> atRndmGenSvc,
                                            TRTElectronicsProcessing * ep,
                                            TRTNoise * noise,
                                            TRTDigCondBase* digcond,
@@ -83,7 +81,7 @@ TRTProcessingOfStraw::TRTProcessingOfStraw(const TRTDigSettings* digset,
 
 {
   ATH_MSG_VERBOSE ( "TRTProcessingOfStraw::Constructor begin" );
-  Initialize(atRndmGenSvc);
+  Initialize();
   ATH_MSG_VERBOSE ( "Constructor done" );
 }
 
@@ -96,7 +94,7 @@ TRTProcessingOfStraw::~TRTProcessingOfStraw()
 }
 
 //________________________________________________________________________________
-void TRTProcessingOfStraw::Initialize(ServiceHandle <IAtRndmGenSvc> atRndmGenSvc)
+void TRTProcessingOfStraw::Initialize()
 {
 
   m_useMagneticFieldMap    = m_settings->useMagneticFieldMap();
@@ -145,9 +143,6 @@ void TRTProcessingOfStraw::Initialize(ServiceHandle <IAtRndmGenSvc> atRndmGenSvc
   m_maxCrossingTime =    intervalBetweenCrossings * 3. + 1.*CLHEP::ns;
   m_shiftOfZeroPoint = static_cast<double>( m_settings->numberOfCrossingsBeforeMain() ) * intervalBetweenCrossings;
 
-  //Create our own engine with own seeds:
-  m_pHRengine = atRndmGenSvc->GetEngine("TRT_ProcessStraw");
-
   // Tabulate exp(-dist/m_attenuationLength) as a function of dist = time*m_signalPropagationSpeed [0.0 mm, 1500 mm)
   // otherwise we are doing an exp() for every cluster! > 99.9% of output digits are the same, saves 13% CPU time.
   m_expattenuation.reserve(150);
@@ -228,7 +223,8 @@ void TRTProcessingOfStraw::addClustersFromStep ( const double& scaledKineticEner
 						 const double& timeOfHit,
 						 const double& prex, const double& prey, const double& prez,
 						 const double& postx, const double& posty, const double& postz,
-						 std::vector<cluster>& clusterlist, int strawGasType)
+						 std::vector<cluster>& clusterlist, int strawGasType,
+                                                 CLHEP::HepRandomEngine* rndmEngine)
 {
 
   // Choose the appropriate ITRT_PAITool for this straw
@@ -247,14 +243,14 @@ void TRTProcessingOfStraw::addClustersFromStep ( const double& scaledKineticEner
   const double meanFreePath(activePAITool->GetMeanFreePath( scaledKineticEnergy, particleCharge*particleCharge ));
 
   //How many clusters did we actually create:
-  const unsigned int numberOfClusters(CLHEP::RandPoisson::shoot(m_pHRengine,stepLength / meanFreePath));
+  const unsigned int numberOfClusters(CLHEP::RandPoisson::shoot(rndmEngine,stepLength / meanFreePath));
   //fixme: use RandPoissionQ?
 
   //Position each of those randomly along the step, and use PAI to get their energies:
   for (unsigned int iclus(0); iclus<numberOfClusters; ++iclus)
     {
       //How far along the step did the cluster get produced:
-      const double lambda(CLHEP::RandFlat::shoot(m_pHRengine));
+      const double lambda(CLHEP::RandFlat::shoot(rndmEngine));
 
       //Append cluster (the energy is given by the PAI model):
       double clusE(activePAITool->GetEnergyTransfer(scaledKineticEnergy));
@@ -276,7 +272,10 @@ void TRTProcessingOfStraw::ProcessStraw ( hitCollConstIter i,
                                           double cosmicEventPhase, // const ComTime* m_ComTime,
                                           int strawGasType,
 					  bool emulationArflag,
-					  bool emulationKrflag)
+					  bool emulationKrflag,
+                                          CLHEP::HepRandomEngine* rndmEngine,
+                                          CLHEP::HepRandomEngine* elecProcRndmEngine,
+                                          CLHEP::HepRandomEngine* elecNoiseRndmEngine)
 {
 
   //////////////////////////////////////////////////////////
@@ -386,7 +385,7 @@ void TRTProcessingOfStraw::ProcessStraw ( hitCollConstIter i,
 	      // scale down the TR efficiency if we are emulating
 	      if ( strawGasType == 0 && emulationArflag ) { m_trEfficiencyBarrel = m_trEfficiencyBarrel*ArEmulationScaling_BA; }
 	      if ( strawGasType == 0 && emulationKrflag ) { m_trEfficiencyBarrel = m_trEfficiencyBarrel*KrEmulationScaling_BA; }
-              if ( CLHEP::RandFlat::shoot(m_pHRengine) > m_trEfficiencyBarrel ) continue; // Skip this photon
+              if ( CLHEP::RandFlat::shoot(rndmEngine) > m_trEfficiencyBarrel ) continue; // Skip this photon
             } // close if barrel
 	    else { // Endcap - no eta dependence here.
 	      if (isECA) {
@@ -394,14 +393,14 @@ void TRTProcessingOfStraw::ProcessStraw ( hitCollConstIter i,
 		// scale down the TR efficiency if we are emulating
 		if ( strawGasType == 0 && emulationArflag ) { m_trEfficiencyEndCapA = m_trEfficiencyEndCapA*ArEmulationScaling_ECA; }
 		if ( strawGasType == 0 && emulationKrflag ) { m_trEfficiencyEndCapA = m_trEfficiencyEndCapA*KrEmulationScaling_ECA; }
-                if ( CLHEP::RandFlat::shoot(m_pHRengine) > m_trEfficiencyEndCapA ) continue; // Skip this photon
+                if ( CLHEP::RandFlat::shoot(rndmEngine) > m_trEfficiencyEndCapA ) continue; // Skip this photon
 	      }
 	      if (isECB) {
                 m_trEfficiencyEndCapB = m_settings->trEfficiencyEndCapB(strawGasType);
 		// scale down the TR efficiency if we are emulating
 		if ( strawGasType == 0 && emulationArflag ) { m_trEfficiencyEndCapB = m_trEfficiencyEndCapB*ArEmulationScaling_ECB; }
 		if ( strawGasType == 0 && emulationKrflag ) { m_trEfficiencyEndCapB = m_trEfficiencyEndCapB*KrEmulationScaling_ECB; }
-                if ( CLHEP::RandFlat::shoot(m_pHRengine) > m_trEfficiencyEndCapB ) continue; // Skip this photon
+                if ( CLHEP::RandFlat::shoot(rndmEngine) > m_trEfficiencyEndCapB ) continue; // Skip this photon
 	      }
             } // close else (end caps)
           } // energyDeposit < 30.0
@@ -500,7 +499,7 @@ void TRTProcessingOfStraw::ProcessStraw ( hitCollConstIter i,
 	  addClustersFromStep ( scaledKineticEnergy, particleCharge, timeOfHit,
 				(*theHit)->GetPreStepX(),(*theHit)->GetPreStepY(),(*theHit)->GetPreStepZ(),
 				(*theHit)->GetPostStepX(),(*theHit)->GetPostStepY(),(*theHit)->GetPostStepZ(),
-				m_clusterlist, strawGasType);
+				m_clusterlist, strawGasType, rndmEngine);
 
 	}
     }//end of hit loop
@@ -522,7 +521,7 @@ void TRTProcessingOfStraw::ProcessStraw ( hitCollConstIter i,
 
   m_depositList.clear();
   // ClustersToDeposits( hitID, m_clusterlist, m_depositList, TRThitGlobalPos, m_ComTime, strawGasType );
-  ClustersToDeposits( hitID, m_clusterlist, m_depositList, TRThitGlobalPos, cosmicEventPhase, strawGasType );
+  ClustersToDeposits( hitID, m_clusterlist, m_depositList, TRThitGlobalPos, cosmicEventPhase, strawGasType, rndmEngine );
 
   //////////////////////////////////////////////////////////
   //======================================================//
@@ -553,7 +552,7 @@ void TRTProcessingOfStraw::ProcessStraw ( hitCollConstIter i,
   }
 
   //Electronics processing:
-  m_pElectronicsProcessing->ProcessDeposits( m_depositList, hitID, outdigit, lowthreshold, noiseamplitude, strawGasType );
+  m_pElectronicsProcessing->ProcessDeposits( m_depositList, hitID, outdigit, lowthreshold, noiseamplitude, strawGasType, elecProcRndmEngine, elecNoiseRndmEngine );
   return;
 }
 
@@ -563,7 +562,8 @@ void TRTProcessingOfStraw::ClustersToDeposits (const int& hitID,
 					       std::vector<TRTElectronicsProcessing::Deposit>& deposits,
 					       Amg::Vector3D TRThitGlobalPos,
 					       double cosmicEventPhase, // was const ComTime* m_ComTime,
-                                               int strawGasType)
+                                               int strawGasType,
+                                               CLHEP::HepRandomEngine* rndmEngine)
 {
 
   //
@@ -679,18 +679,18 @@ void TRTProcessingOfStraw::ClustersToDeposits (const int& hitID,
 
       if (nprimaryelectrons<m_maxelectrons) // Use the detailed Binomial and Exponential treatment at this low energy.
         {
-          unsigned int nsurvivingprimaryelectrons = static_cast<unsigned int>(CLHEP::RandBinomial::shoot(m_pHRengine,nprimaryelectrons,m_smearingFactor) + 0.5);
+          unsigned int nsurvivingprimaryelectrons = static_cast<unsigned int>(CLHEP::RandBinomial::shoot(rndmEngine,nprimaryelectrons,m_smearingFactor) + 0.5);
           if (nsurvivingprimaryelectrons==0) continue; // no electrons survived; move on to the next cluster.
           const double meanElectronEnergy(m_ionisationPotential/m_smearingFactor);
           for (unsigned int ielec(0); ielec<nsurvivingprimaryelectrons; ++ielec) {
-            depositEnergy += CLHEP::RandExpZiggurat::shoot(m_pHRengine, meanElectronEnergy);
+            depositEnergy += CLHEP::RandExpZiggurat::shoot(rndmEngine, meanElectronEnergy);
           }
         }
       else // Use a Gaussian approximation
         {
           const double fluctSigma(sqrt(cluster_E*m_ionisationPotential*(2-m_smearingFactor)/m_smearingFactor));
           do {
-            depositEnergy = CLHEP::RandGaussZiggurat::shoot(m_pHRengine, cluster_E, fluctSigma);
+            depositEnergy = CLHEP::RandGaussZiggurat::shoot(rndmEngine, cluster_E, fluctSigma);
           } while(depositEnergy<0.0); // very rare.
         }
 
@@ -735,8 +735,8 @@ void TRTProcessingOfStraw::ClustersToDeposits (const int& hitID,
 
       if ( m_settings->doCosmicTimingPit() )
         { // make (x,y) dependent? i.e: + f(x,y).
-          // clusterTime = clusterTime - m_time_y_eq_zero + m_settings->jitterTimeOffset()*( CLHEP::RandFlat::shoot(m_pHRengine) );
-          clusterTime = clusterTime + cosmicEventPhase + m_settings->jitterTimeOffset()*( CLHEP::RandFlat::shoot(m_pHRengine) );
+          // clusterTime = clusterTime - m_time_y_eq_zero + m_settings->jitterTimeOffset()*( CLHEP::RandFlat::shoot(rndmEngine) );
+          clusterTime = clusterTime + cosmicEventPhase + m_settings->jitterTimeOffset()*( CLHEP::RandFlat::shoot(rndmEngine) );
           // yes it is a '+' now. Ask Alex Alonso.
         }
 
diff --git a/InnerDetector/InDetDigitization/TRT_Digitization/src/TRTProcessingOfStraw.h b/InnerDetector/InDetDigitization/TRT_Digitization/src/TRTProcessingOfStraw.h
index ed5fee77821093d69759cacb4e4c1ce076b63a25..ea4b06862f12348041f1b683aca31c78561344ba 100644
--- a/InnerDetector/InDetDigitization/TRT_Digitization/src/TRTProcessingOfStraw.h
+++ b/InnerDetector/InDetDigitization/TRT_Digitization/src/TRTProcessingOfStraw.h
@@ -33,7 +33,6 @@ class TRTNoise;
 class TRTDigCondBase;
 
 class TRTUncompressedHit;
-class IAtRndmGenSvc;
 class ITRT_PAITool;
 class ITRT_SimDriftTimeTool;
 
@@ -55,7 +54,6 @@ public:
 			const InDetDD::TRT_DetectorManager*,
 			ITRT_PAITool*,
 			ITRT_SimDriftTimeTool*,
-			ServiceHandle <IAtRndmGenSvc> atRndmGenSvc,
 			TRTElectronicsProcessing * ep,
 			TRTNoise * noise,
 			TRTDigCondBase* digcond,
@@ -95,7 +93,10 @@ public:
 		     double m_cosmicEventPhase, //const ComTime* m_ComTime,
                      int strawGasType,
 		     bool emulationArflag,
-		     bool emulationKrflag );
+		     bool emulationKrflag,
+                     CLHEP::HepRandomEngine* rndmEngine,
+                     CLHEP::HepRandomEngine* elecProcRndmEngine,
+                     CLHEP::HepRandomEngine* elecNoiseRndmEngine );
 
   MsgStream& msg (MSG::Level lvl) const { return m_msg << lvl; }
   bool msgLvl (MSG::Level lvl) { return m_msg.get().level() <= lvl; }
@@ -107,7 +108,7 @@ private:
   TRTProcessingOfStraw& operator= (const TRTProcessingOfStraw&);
 
   /** Initialize */
-  void Initialize(ServiceHandle <IAtRndmGenSvc> atRndmGenSvc) ;
+  void Initialize();
 
   const TRTDigSettings* m_settings;
   const InDetDD::TRT_DetectorManager* m_detmgr;
@@ -196,7 +197,8 @@ private:
 			     const double& posty,
 			     const double& postz,
 			     std::vector<cluster>& clusterlist,
-			     int strawGasType);
+			     int strawGasType,
+                             CLHEP::HepRandomEngine* rndmEngine);
   /**
    * Transform the ioniation clusters along the particle trajectory inside a
    * straw to energy deposits (i.e. potential fluctuations) reaching the
@@ -218,14 +220,13 @@ private:
 			   std::vector<TRTElectronicsProcessing::Deposit>& deposits,
 			   Amg::Vector3D TRThitGlobalPos,
                            double m_cosmicEventPhase, // const ComTime* m_ComTime
-                           int strawGasType);
+                           int strawGasType,
+                           CLHEP::HepRandomEngine* rndmEngine);
 
   std::vector<double> m_drifttimes;     // electron drift times
   std::vector<double> m_expattenuation; // tabulation of exp()
   unsigned int  m_maxelectrons;         // maximum number of them (minmum is 100 for the Gaussian approx to be ok);
 
-  CLHEP::HepRandomEngine * m_pHRengine;
-
   bool m_alreadywarnedagainstpdg0;
 
   Amg::Vector3D getGlobalPosition( int hitID, const TimedHitPtr<TRTUncompressedHit> *theHit );
diff --git a/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/src/SCT_PrepDataToxAOD.cxx b/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/src/SCT_PrepDataToxAOD.cxx
index 383071250237127d2ed3b71c969b31c879ca84c9..994925b909f9cdf4d64ed0afee333d781089910a 100644
--- a/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/src/SCT_PrepDataToxAOD.cxx
+++ b/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/src/SCT_PrepDataToxAOD.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 ///////////////////////////////////////////////////////////////////
@@ -33,7 +33,7 @@
 //
 /////////////////////////////////////////////////////////////////////
 SCT_PrepDataToxAOD::SCT_PrepDataToxAOD(const std::string &name, ISvcLocator *pSvcLocator) :
-  AthAlgorithm(name,pSvcLocator),
+  AthReentrantAlgorithm(name,pSvcLocator),
   m_SCTHelper{nullptr},
   m_firstEventWarnings{true}
 { 
@@ -72,12 +72,12 @@ StatusCode SCT_PrepDataToxAOD::initialize()
 //        Execute method: 
 //
 /////////////////////////////////////////////////////////////////////
-StatusCode SCT_PrepDataToxAOD::execute() 
-{     
+StatusCode SCT_PrepDataToxAOD::execute(const EventContext& ctx) const
+{
   // the cluster ambiguity map
   std::map< Identifier, const SCT_RDORawData* > idToRAWDataMap;
   if (m_writeRDOinformation.value()) {
-    SG::ReadHandle<SCT_RDO_Container> rdoContainer(m_rdoContainer);
+    SG::ReadHandle<SCT_RDO_Container> rdoContainer(m_rdoContainer, ctx);
     if (rdoContainer.isValid()) {
       // get all the RIO_Collections in the container
       for (const auto& collection: *rdoContainer) {
@@ -101,18 +101,18 @@ StatusCode SCT_PrepDataToxAOD::execute()
   ATH_MSG_DEBUG("Size of RDO map is "<<idToRAWDataMap.size());
 
   // Mandatory. This is needed and required if this algorithm is scheduled.
-  SG::ReadHandle<InDet::SCT_ClusterContainer> sctClusterContainer(m_clustercontainer);
+  SG::ReadHandle<InDet::SCT_ClusterContainer> sctClusterContainer(m_clustercontainer, ctx);
   if (not sctClusterContainer.isValid()) {
     ATH_MSG_FATAL("Cannot retrieve SCT PrepDataContainer " << m_clustercontainer.key());
     return StatusCode::FAILURE;
   }
 
   // Create the xAOD container and its auxiliary store:
-  SG::WriteHandle<xAOD::TrackMeasurementValidationContainer> xaod(m_xAodContainer);
+  SG::WriteHandle<xAOD::TrackMeasurementValidationContainer> xaod(m_xAodContainer, ctx);
   ATH_CHECK( xaod.record(std::make_unique<xAOD::TrackMeasurementValidationContainer>(),
                          std::make_unique<xAOD::TrackMeasurementValidationAuxContainer>()) );
   
-  SG::WriteHandle<std::vector<unsigned int> > offsets(m_xAodOffset);
+  SG::WriteHandle<std::vector<unsigned int> > offsets(m_xAodOffset, ctx);
   ATH_CHECK( offsets.record(std::make_unique<std::vector<unsigned int> >( m_SCTHelper->wafer_hash_max(), 0 )) );
   
   // Loop over the container
@@ -203,7 +203,7 @@ StatusCode SCT_PrepDataToxAOD::execute()
       
       // Use the MultiTruth Collection to get a list of all true particle contributing to the cluster
       if (m_useTruthInfo.value()) {
-        SG::ReadHandle<PRD_MultiTruthCollection> prdmtColl(m_multiTruth);
+        SG::ReadHandle<PRD_MultiTruthCollection> prdmtColl(m_multiTruth, ctx);
         if (prdmtColl.isValid()) {
           std::vector<int> barcodes;
           //std::pair<PRD_MultiTruthCollection::const_iterator,PRD_MultiTruthCollection::const_iterator>;
@@ -218,7 +218,7 @@ StatusCode SCT_PrepDataToxAOD::execute()
       // Use the SDO Collection to get a list of all true particle contributing to the cluster per readout element
       //  Also get the energy deposited by each true particle per readout element   
       if (m_writeSDOs.value()) {
-        SG::ReadHandle<InDetSimDataCollection> sdoCollection(m_SDOcontainer);
+        SG::ReadHandle<InDetSimDataCollection> sdoCollection(m_SDOcontainer, ctx);
         if (sdoCollection.isValid()) {
           addSDOInformation( xprd, prd, &*sdoCollection);
         }
@@ -227,7 +227,7 @@ StatusCode SCT_PrepDataToxAOD::execute()
       // Now Get the most detailed truth from the SiHits
       // Note that this could get really slow if there are a lot of hits and clusters
       if (m_writeSiHits.value()) {
-        SG::ReadHandle<SiHitCollection> sihitCollection(m_sihitContainer);
+        SG::ReadHandle<SiHitCollection> sihitCollection(m_sihitContainer, ctx);
         if (sihitCollection.isValid()) {
           addSiHitInformation( xprd, prd, &*sihitCollection);
         }
diff --git a/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/src/SCT_PrepDataToxAOD.h b/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/src/SCT_PrepDataToxAOD.h
index 0ad7343f69fa57edf33cac4f4d70f8920bd66572..9502572c9815fb6bd445746d29a6423cd21c3b8d 100644
--- a/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/src/SCT_PrepDataToxAOD.h
+++ b/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/src/SCT_PrepDataToxAOD.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 ///////////////////////////////////////////////////////////////////
@@ -10,7 +10,7 @@
 #ifndef SCT_PREPDATATOXAOD_H
 #define SCT_PREPDATATOXAOD_H
 
-#include "AthenaBaseComps/AthAlgorithm.h"
+#include "AthenaBaseComps/AthReentrantAlgorithm.h"
 
 #include "InDetPrepRawData/SCT_ClusterContainer.h"
 #include "InDetReadoutGeometry/SiDetectorElementCollection.h"
@@ -39,7 +39,7 @@ namespace InDet
 }
 
 
-class SCT_PrepDataToxAOD : public AthAlgorithm {
+class SCT_PrepDataToxAOD : public AthReentrantAlgorithm {
 
 public:
   // Constructor with parameters:
@@ -47,7 +47,7 @@ public:
 
   // Basic algorithm methods:
   virtual StatusCode initialize();
-  virtual StatusCode execute();
+  virtual StatusCode execute(const EventContext& ctx) const;
   virtual StatusCode finalize();
 
 private:
@@ -87,7 +87,7 @@ private:
   BooleanProperty m_writeSiHits{this, "WriteSiHits", true};
   
   // --- private members
-  std::atomic_bool m_firstEventWarnings;
+  mutable std::atomic_bool m_firstEventWarnings;
   
 };
 
diff --git a/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/src/SCT_RawDataToxAOD.cxx b/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/src/SCT_RawDataToxAOD.cxx
index 0fbcdfcfe2e7db3d0f4e08b6cc2c2ded1c8a1f9b..2ed5f243cb70d831c57f0bf55524c9f3269eec0f 100644
--- a/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/src/SCT_RawDataToxAOD.cxx
+++ b/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/src/SCT_RawDataToxAOD.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 ///////////////////////////////////////////////////////////////////
@@ -17,7 +17,7 @@
 
 SCT_RawDataToxAOD::SCT_RawDataToxAOD(const std::string &name,
                                      ISvcLocator *pSvcLocator)
-  : AthAlgorithm(name, pSvcLocator),
+  : AthReentrantAlgorithm(name, pSvcLocator),
     m_SCTHelper{nullptr}
 {
 }
@@ -37,11 +37,11 @@ static SG::AuxElement::Accessor<int> phi_module_acc("phi_module");
 static SG::AuxElement::Accessor<int> eta_module_acc("eta_module");
 static SG::AuxElement::Accessor<int> side_acc("side");
 
-StatusCode SCT_RawDataToxAOD::execute() {
-  SG::ReadHandle<SCT_RDO_Container> rdoContainer(m_rdoContainerName);
+StatusCode SCT_RawDataToxAOD::execute(const EventContext& ctx) const {
+  SG::ReadHandle<SCT_RDO_Container> rdoContainer(m_rdoContainerName, ctx);
 
   // Create the output xAOD container and its auxiliary store:
-  SG::WriteHandle<xAOD::SCTRawHitValidationContainer> xaod(m_xAodRawHitContainerName);
+  SG::WriteHandle<xAOD::SCTRawHitValidationContainer> xaod(m_xAodRawHitContainerName, ctx);
   ATH_CHECK(xaod.record(std::make_unique<xAOD::SCTRawHitValidationContainer>(),
                         std::make_unique<xAOD::SCTRawHitValidationAuxContainer>()));
 
diff --git a/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/src/SCT_RawDataToxAOD.h b/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/src/SCT_RawDataToxAOD.h
index 68b635f6c75610c8581d67bfae7868099c0836a8..5cb610854fb93b97ce5b247fa14cf8f5466ce628 100644
--- a/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/src/SCT_RawDataToxAOD.h
+++ b/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/src/SCT_RawDataToxAOD.h
@@ -1,13 +1,13 @@
 // -*- C++ -*-
 
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef SCT_RAWDATATOXAOD_H
 #define SCT_RAWDATATOXAOD_H
 
-#include "AthenaBaseComps/AthAlgorithm.h"
+#include "AthenaBaseComps/AthReentrantAlgorithm.h"
 
 // StoreGate Data Handle Key
 #include "StoreGate/ReadHandleKey.h"
@@ -24,12 +24,12 @@ class SCT_ID;
 
 /** Algorithm to read RDO information from SCT ntuple and write augmented xAOD.
  **/
-class SCT_RawDataToxAOD : public AthAlgorithm {
+class SCT_RawDataToxAOD : public AthReentrantAlgorithm {
 public:
   SCT_RawDataToxAOD(const std::string& name, ISvcLocator* pSvcLocator);
 
   StatusCode initialize();
-  StatusCode execute();
+  StatusCode execute(const EventContext& ctx) const;
   StatusCode finalize();
 
 private:
diff --git a/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/src/SCTEventFlagWriter.cxx b/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/src/SCTEventFlagWriter.cxx
index aac33e7c254e3ac3e5c6fa5f4c2b869baff9b681..7c1a0d70120c8fb3b2fd5ec30a210eacadcb785e 100644
--- a/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/src/SCTEventFlagWriter.cxx
+++ b/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/src/SCTEventFlagWriter.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "SCTEventFlagWriter.h"
@@ -9,7 +9,7 @@
 // Constructor
 
 SCTEventFlagWriter::SCTEventFlagWriter(const std::string& name, ISvcLocator* pSvcLocator) :
-  AthAlgorithm(name, pSvcLocator)
+  AthReentrantAlgorithm(name, pSvcLocator)
 {
 }
 
@@ -25,14 +25,14 @@ StatusCode SCTEventFlagWriter::initialize()
 
 // Execute
 
-StatusCode SCTEventFlagWriter::execute()
+StatusCode SCTEventFlagWriter::execute(const EventContext& ctx) const
 {
-  long unsigned int nLVL1IDErrors{m_bsErrTool->getErrorSet(SCT_ByteStreamErrors::LVL1IDError)->size()};
-  long unsigned int nROBFragmentErrors{m_bsErrTool->getErrorSet(SCT_ByteStreamErrors::ROBFragmentError)->size()};
+  long unsigned int nLVL1IDErrors{m_bsErrTool->getErrorSet(SCT_ByteStreamErrors::LVL1IDError, ctx)->size()};
+  long unsigned int nROBFragmentErrors{m_bsErrTool->getErrorSet(SCT_ByteStreamErrors::ROBFragmentError, ctx)->size()};
 
   if ((nLVL1IDErrors > 500) or (nROBFragmentErrors > 1000)) { // Check if number of errors exceed threshold
     bool setOK_xAOD{false};
-    SG::ReadHandle<xAOD::EventInfo> xAODEvtInfo{m_xAODEvtInfoKey}; // Retrive xAOD EventInfo
+    SG::ReadHandle<xAOD::EventInfo> xAODEvtInfo{m_xAODEvtInfoKey, ctx}; // Retrive xAOD EventInfo
     if (xAODEvtInfo.isValid()) { // Retriving xAOD EventInfo successful
       setOK_xAOD = xAODEvtInfo->updateErrorState(xAOD::EventInfo::SCT, xAOD::EventInfo::Error);
     } 
diff --git a/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/src/SCTEventFlagWriter.h b/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/src/SCTEventFlagWriter.h
index 665085c3611e0592e1f8b95fc69d3dab4ddd1e1b..ad1afd761fd521416c3127a208a24c97f2bddc33 100644
--- a/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/src/SCTEventFlagWriter.h
+++ b/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/src/SCTEventFlagWriter.h
@@ -1,11 +1,11 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef SCT_RAWDATABYTESTREAMCNV_SCTEVENTFLAGWRITER_H
 #define SCT_RAWDATABYTESTREAMCNV_SCTEVENTFLAGWRITER_H
 
-#include "AthenaBaseComps/AthAlgorithm.h"
+#include "AthenaBaseComps/AthReentrantAlgorithm.h"
 
 #include "xAODEventInfo/EventInfo.h"
 #include "StoreGate/ReadHandleKey.h"
@@ -21,7 +21,7 @@ class ISCT_ByteStreamErrorsTool;
  * This algorithm flags an event bad if it has >500 LVL1ID errors or 
  * >1000 ROBFragment errors.
  */
-class SCTEventFlagWriter : public AthAlgorithm
+class SCTEventFlagWriter : public AthReentrantAlgorithm
 {
  public:
 
@@ -35,7 +35,7 @@ class SCTEventFlagWriter : public AthAlgorithm
   virtual StatusCode initialize() override;
 
   /** Execute */
-  virtual StatusCode execute() override;
+  virtual StatusCode execute(const EventContext& ctx) const override;
 
  private:
 
diff --git a/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/src/SCTRawDataProvider.cxx b/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/src/SCTRawDataProvider.cxx
index 32acf01264bac71c6f5c060db9374cd35463c9ad..d1967ada521facbed9a4010cc0e34e5b8ad585f1 100644
--- a/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/src/SCTRawDataProvider.cxx
+++ b/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/src/SCTRawDataProvider.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "SCTRawDataProvider.h"
@@ -17,7 +17,7 @@ using OFFLINE_FRAGMENTS_NAMESPACE::ROBFragment;
 // Constructor
 
 SCTRawDataProvider::SCTRawDataProvider(const std::string& name, ISvcLocator* pSvcLocator) :
-  AthAlgorithm(name, pSvcLocator),
+  AthReentrantAlgorithm(name, pSvcLocator),
   m_regionSelector{"RegSelSvc", name},
   m_robDataProvider{"ROBDataProviderSvc", name},
   m_sctID{nullptr},
@@ -63,41 +63,40 @@ typedef EventContainers::IdentifiableContTemp<InDetRawDataCollection<SCT_RDORawD
 
 // Execute
 
-StatusCode SCTRawDataProvider::execute()
+StatusCode SCTRawDataProvider::execute(const EventContext& ctx) const
 {
   m_rawDataTool->beginNewEvent();
 
-  SG::WriteHandle<SCT_RDO_Container> rdoContainer(m_rdoContainerKey);
+  SG::WriteHandle<SCT_RDO_Container> rdoContainer(m_rdoContainerKey, ctx);
   bool externalCacheRDO = !m_rdoContainerCacheKey.key().empty();
   if (not externalCacheRDO) {
     ATH_CHECK(rdoContainer.record (std::make_unique<SCT_RDO_Container>(m_sctID->wafer_hash_max())));
     ATH_MSG_DEBUG("Created container for " << m_sctID->wafer_hash_max());
   }
   else {
-    SG::UpdateHandle<SCT_RDO_Cache> update(m_rdoContainerCacheKey);
+    SG::UpdateHandle<SCT_RDO_Cache> update(m_rdoContainerCacheKey, ctx);
     ATH_CHECK(update.isValid());
     ATH_CHECK(rdoContainer.record (std::make_unique<SCT_RDO_Container>(update.ptr())));
     ATH_MSG_DEBUG("Created container using cache for " << m_rdoContainerCacheKey.key());
   }
 
-  
-  SG::WriteHandle<InDetBSErrContainer> bsErrContainer(m_bsErrContainerKey);
+  SG::WriteHandle<InDetBSErrContainer> bsErrContainer(m_bsErrContainerKey, ctx);
   ATH_CHECK(bsErrContainer.record(std::make_unique<InDetBSErrContainer>()));
 
-  SG::WriteHandle<SCT_ByteStreamFractionContainer> bsFracContainer(m_bsFracContainerKey);
+  SG::WriteHandle<SCT_ByteStreamFractionContainer> bsFracContainer(m_bsFracContainerKey, ctx);
   ATH_CHECK(bsFracContainer.record(std::make_unique<SCT_ByteStreamFractionContainer>()));
 
   // Ask ROBDataProviderSvc for the vector of ROBFragment for all SCT ROBIDs
   std::vector<const ROBFragment*> vecROBFrags;
   if (not m_roiSeeded.value()) {
     std::vector<uint32_t> rodList;
-    m_cabling->getAllRods(rodList);
+    m_cabling->getAllRods(rodList, ctx);
     m_robDataProvider->getROBData(rodList , vecROBFrags);
   } 
   else {
     // Only load ROBs from RoI
     std::vector<uint32_t> listOfROBs;
-    SG::ReadHandle<TrigRoiDescriptorCollection> roiCollection{m_roiCollectionKey};
+    SG::ReadHandle<TrigRoiDescriptorCollection> roiCollection{m_roiCollectionKey, ctx};
     ATH_CHECK(roiCollection.isValid());
     TrigRoiDescriptor superRoI; // Add all RoIs to a super-RoI
     superRoI.setComposite(true);
@@ -109,14 +108,13 @@ StatusCode SCTRawDataProvider::execute()
     m_robDataProvider->getROBData(listOfROBs, vecROBFrags);
   }
 
-
   ATH_MSG_DEBUG("Number of ROB fragments " << vecROBFrags.size());
 
-  SG::WriteHandle<InDetTimeCollection> lvl1Collection{m_lvl1CollectionKey};
+  SG::WriteHandle<InDetTimeCollection> lvl1Collection{m_lvl1CollectionKey, ctx};
   lvl1Collection = std::make_unique<InDetTimeCollection>(vecROBFrags.size()); 
   ATH_CHECK(lvl1Collection.isValid());
 
-  SG::WriteHandle<InDetTimeCollection> bcIDCollection{m_bcIDCollectionKey};
+  SG::WriteHandle<InDetTimeCollection> bcIDCollection{m_bcIDCollectionKey, ctx};
   bcIDCollection = std::make_unique<InDetTimeCollection>(vecROBFrags.size()); 
   ATH_CHECK(bcIDCollection.isValid());
 
@@ -151,8 +149,7 @@ StatusCode SCTRawDataProvider::execute()
   if (m_rawDataTool->convert(vecROBFrags, 
                              *rdoInterface, 
                              bsErrContainer.ptr(), 
-                             bsFracContainer.ptr()).isFailure()) 
-  {
+                             bsFracContainer.ptr()).isFailure()) {
     ATH_MSG_WARNING("BS conversion into RDOs failed");
   }
 
diff --git a/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/src/SCTRawDataProvider.h b/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/src/SCTRawDataProvider.h
index 58d88c5d7f0c5fe72e410e4949f3f2048728ef64..22b1a18958933620812dc9cebacccdcf773645fd 100644
--- a/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/src/SCTRawDataProvider.h
+++ b/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/src/SCTRawDataProvider.h
@@ -1,11 +1,11 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef SCT_RAWDATABYTESTREAMCNV_SCTRAWDATAPROVIDER_H
 #define SCT_RAWDATABYTESTREAMCNV_SCTRAWDATAPROVIDER_H
 
-#include "AthenaBaseComps/AthAlgorithm.h"
+#include "AthenaBaseComps/AthReentrantAlgorithm.h"
 
 #include "InDetRawData/InDetTimeCollection.h"
 #include "InDetRawData/SCT_RDO_Container.h"
@@ -39,7 +39,7 @@ class SCT_ByteStreamFractionContainer;
  *
  * Class based on TRT equivalent.
  */
-class SCTRawDataProvider : public AthAlgorithm
+class SCTRawDataProvider : public AthReentrantAlgorithm
 {
  public:
 
@@ -53,7 +53,7 @@ class SCTRawDataProvider : public AthAlgorithm
   virtual StatusCode initialize() override;
 
   /** Execute */
-  virtual StatusCode execute() override;
+  virtual StatusCode execute(const EventContext& ctx) const override;
 
  private:
 
diff --git a/InnerDetector/InDetExample/InDetDetDescrExample/InDetDetDescrExample/ReadSiDetectorElements.h b/InnerDetector/InDetExample/InDetDetDescrExample/InDetDetDescrExample/ReadSiDetectorElements.h
index b939863d0d598a79ce3441faeabe795c0d545240..48456cad3a5b533ecf9d10959bdb27637e5ab3c4 100755
--- a/InnerDetector/InDetExample/InDetDetDescrExample/InDetDetDescrExample/ReadSiDetectorElements.h
+++ b/InnerDetector/InDetExample/InDetDetDescrExample/InDetDetDescrExample/ReadSiDetectorElements.h
@@ -16,7 +16,6 @@
 #include "StoreGate/ReadCondHandleKey.h"
 #include "InDetConditionsSummaryService/ISiliconConditionsTool.h"
 #include "InDetCondServices/ISiLorentzAngleTool.h"
-#include "InDetConditionsSummaryService/ISiliconConditionsSvc.h"
 
 #include <vector>
 
diff --git a/InnerDetector/InDetExample/InDetDetDescrExample/src/ReadSiDetectorElements.cxx b/InnerDetector/InDetExample/InDetDetDescrExample/src/ReadSiDetectorElements.cxx
index 35e47b009511e5419aa9aeaec535f361dc795daa..7a9ece0a7ac0c80b21d2f730a84ea49b690f09d6 100755
--- a/InnerDetector/InDetExample/InDetDetDescrExample/src/ReadSiDetectorElements.cxx
+++ b/InnerDetector/InDetExample/InDetDetDescrExample/src/ReadSiDetectorElements.cxx
@@ -17,7 +17,6 @@
 #include "InDetIdentifier/PixelID.h"
 #include "InDetIdentifier/SCT_ID.h"
 #include "Identifier/Identifier.h"
-#include "InDetConditionsSummaryService/ISiliconConditionsSvc.h"
 
 #include "InDetReadoutGeometry/SiLocalPosition.h"
 
diff --git a/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/IDAlignMonResiduals.cxx b/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/IDAlignMonResiduals.cxx
index 8df68f42033f711af565f308a1f56888bbc69fc0..0caa5d55f1951e8d69018b62d916e56e72f64e71 100755
--- a/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/IDAlignMonResiduals.cxx
+++ b/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/IDAlignMonResiduals.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 // ***************************************************************************************
@@ -24,9 +24,8 @@
 #include "TFitResult.h"
 #include "TFitResultPtr.h"
 
-#include "xAODEventInfo/EventInfo.h"
-
 #include "GaudiKernel/IJobOptionsSvc.h"
+#include "StoreGate/ReadHandle.h"
 #include "AtlasDetDescr/AtlasDetectorID.h"
 #include "InDetIdentifier/PixelID.h"
 #include "InDetIdentifier/SCT_ID.h"
@@ -629,6 +628,8 @@ StatusCode IDAlignMonResiduals::initialize()
 	  }
 	}
 
+        ATH_CHECK( m_eventInfoKey.initialize() );
+
 	return StatusCode::SUCCESS;
 }
 
@@ -1061,16 +1062,13 @@ void IDAlignMonResiduals::RegisterHisto(MonGroup& mon, TH2* histo) {
 StatusCode IDAlignMonResiduals::fillHistograms()
 {
 
+  const EventContext& ctx = Gaudi::Hive::currentContext();
   ++m_events;
 
   m_hasBeenCalledThisEvent=false;
   m_mu=0.;
 
-  const DataHandle<xAOD::EventInfo> eventInfo;
-  if (StatusCode::SUCCESS != evtStore()->retrieve( eventInfo ) ){
-    msg(MSG::ERROR) << "Cannot get event info." << endmsg;
-  }
-
+  SG::ReadHandle<xAOD::EventInfo> eventInfo (m_eventInfoKey, ctx);
 
   m_changedlumiblock = false;
   m_lumiblock = eventInfo->lumiBlock();
diff --git a/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/IDAlignMonResiduals.h b/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/IDAlignMonResiduals.h
index d9ceb28f9868434ff16af5a57a6d23a1bc28dd81..1b4e6c38d386b859434d2230c0bdb50bd76da309 100755
--- a/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/IDAlignMonResiduals.h
+++ b/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/IDAlignMonResiduals.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef IDAlignMonResiduals_H
@@ -18,6 +18,8 @@
 #include "AthenaMonitoring/ManagedMonitorToolBase.h"
 #include "EventPrimitives/EventPrimitives.h"
 #include "TrkParameters/TrackParameters.h"
+#include "xAODEventInfo/EventInfo.h"
+#include "StoreGate/ReadHandleKey.h"
 #include "GaudiKernel/ServiceHandle.h"
 #include "GaudiKernel/ServiceHandle.h"
 #include "GaudiKernel/ToolHandle.h"
@@ -71,10 +73,10 @@ class IDAlignMonResiduals : public ManagedMonitorToolBase
 
   virtual ~IDAlignMonResiduals();
 
-  virtual StatusCode initialize();
-  virtual StatusCode bookHistograms();
-  virtual StatusCode fillHistograms();
-  virtual StatusCode procHistograms();
+  virtual StatusCode initialize() override;
+  virtual StatusCode bookHistograms() override;
+  virtual StatusCode fillHistograms() override;
+  virtual StatusCode procHistograms() override;
 
   void MakePIXBarrelHistograms (MonGroup& al_mon);
   void MakePIXEndCapsHistograms (MonGroup& al_mon);
@@ -886,6 +888,9 @@ class IDAlignMonResiduals : public ManagedMonitorToolBase
   float m_z_fix{};
   int m_minIBLhits{};
   bool m_doIBLLBPlots{};
+
+  SG::ReadHandleKey<xAOD::EventInfo> m_eventInfoKey
+  { this, "EventInfoKey", "EventInfo", "" };
 };
 
 #endif
diff --git a/InnerDetector/InDetMonitoring/InDetDiMuonMonitoring/src/DiMuMon.cxx b/InnerDetector/InDetMonitoring/InDetDiMuonMonitoring/src/DiMuMon.cxx
index 56e829944baa733865b184a5fdf99b8feedc5180..23633d5762eaaa4b41732c63936f978b80b6190c 100644
--- a/InnerDetector/InDetMonitoring/InDetDiMuonMonitoring/src/DiMuMon.cxx
+++ b/InnerDetector/InDetMonitoring/InDetDiMuonMonitoring/src/DiMuMon.cxx
@@ -6,7 +6,7 @@
 #include "GaudiKernel/IJobOptionsSvc.h"
 #include "GaudiKernel/MsgStream.h"
 #include "GaudiKernel/StatusCode.h"
-#include "GeoModelKernel/Units.h"
+#include "GaudiKernel/PhysicalConstants.h"
 
 #include "StoreGate/StoreGateSvc.h"
 #include "InDetDiMuonMonitoring/DiMuMon.h"
@@ -103,10 +103,10 @@ StatusCode DiMuMon::initialize(){
 
   //resonance independent
   // for eta these are filled as the histograms are declared due to the dependence between region and eta
-  m_varRanges["phi"] = std::make_pair(-GeoModelKernelUnits::pi,GeoModelKernelUnits::pi);
-  m_varRanges["phiAll"] = std::make_pair(-GeoModelKernelUnits::pi,GeoModelKernelUnits::pi);
-  m_varRanges["phiPos"] = std::make_pair(-GeoModelKernelUnits::pi,GeoModelKernelUnits::pi);
-  m_varRanges["phiNeg"] = std::make_pair(-GeoModelKernelUnits::pi,GeoModelKernelUnits::pi);
+  m_varRanges["phi"] = std::make_pair(-Gaudi::Units::pi,Gaudi::Units::pi);
+  m_varRanges["phiAll"] = std::make_pair(-Gaudi::Units::pi,Gaudi::Units::pi);
+  m_varRanges["phiPos"] = std::make_pair(-Gaudi::Units::pi,Gaudi::Units::pi);
+  m_varRanges["phiNeg"] = std::make_pair(-Gaudi::Units::pi,Gaudi::Units::pi);
   m_varRanges["etaSumm"] = std::make_pair(-5.,5.);
 
   //resonance dependent
@@ -121,7 +121,7 @@ StatusCode DiMuMon::initialize(){
     ptMax = 18.;
   } else if (m_resonName=="Zmumu") {
     m_varRanges["eta"] = std::make_pair(-5.,5.);
-    m_varRanges["phiDiff"] = std::make_pair(0.,GeoModelKernelUnits::pi);
+    m_varRanges["phiDiff"] = std::make_pair(0.,Gaudi::Units::pi);
     m_varRanges["etaDiff"] = std::make_pair(-3.,3.);
     m_varRanges["crtDiff"] = std::make_pair(-0.03,0.03);
     m_varRanges["phiSumm"] = std::make_pair(-3.5,3.5);
@@ -262,7 +262,7 @@ StatusCode DiMuMon::fillHistograms()
 
   //  if (m_lumiBlockNum<402 || m_lumiBlockNum>1330) return StatusCode::SUCCESS;
 
-  double muonMass = 105.66*GeoModelKernelUnits::MeV;
+  double muonMass = 105.66*Gaudi::Units::MeV;
   //retrieve all muons
   const xAOD::MuonContainer* muons(0);
   StatusCode sc = evtStore()->retrieve(muons, m_muonCollection);
@@ -357,15 +357,15 @@ StatusCode DiMuMon::fillHistograms()
 	double phiNeg = idNeg->phi();
 	m_varValues["phiNeg"] = phiNeg;
 	m_varValues["pt"] = getPt(idPos,idNeg);
-	double ptPos = idPos->pt()/GeoModelKernelUnits::GeV;
+	double ptPos = idPos->pt()/Gaudi::Units::GeV;
 	m_varValues["ptPos"] = ptPos;
-	double ptNeg = idNeg->pt()/GeoModelKernelUnits::GeV;
+	double ptNeg = idNeg->pt()/Gaudi::Units::GeV;
 	m_varValues["ptNeg"] = ptNeg;
 
 	m_varValues["crtDiff"] = getCrtDiff(idPos,idNeg);
 	m_varValues["etaDiff"] = etaPos - etaNeg;
 	double phiDiff = fabs(phiPos - phiNeg);
-	if (phiDiff>GeoModelKernelUnits::pi) phiDiff = 2*(GeoModelKernelUnits::pi) - phiDiff;
+	if (phiDiff>Gaudi::Units::pi) phiDiff = 2*(Gaudi::Units::pi) - phiDiff;
 	m_varValues["phiDiff"] = phiDiff;
 	m_varValues["etaSumm"] = etaPos + etaNeg;
 	m_varValues["phiSumm"] = phiPos + phiNeg;
@@ -662,7 +662,7 @@ double DiMuMon::getInvmass(const xAOD::TrackParticle* id1, const xAOD::TrackPart
   particle1.SetPtEtaPhiE(id1->pt(),id1->eta(),id1->phi(),sqrt(pow(Mass,2)+pow(id1->p4().Px(),2)+pow(id1->p4().Py(),2)+pow(id1->p4().Pz(),2)));
   particle2.SetPtEtaPhiE(id2->pt(),id2->eta(),id2->phi(),sqrt(pow(Mass,2)+pow(id2->p4().Px(),2)+pow(id2->p4().Py(),2)+pow(id2->p4().Pz(),2)));
   v=particle1+particle2;
-  double invmass = v.Mag()/GeoModelKernelUnits::GeV;
+  double invmass = v.Mag()/Gaudi::Units::GeV;
   return invmass;
 }
 
@@ -671,7 +671,7 @@ double DiMuMon::getPt(const xAOD::TrackParticle* id1, const xAOD::TrackParticle*
   double px = id1->p4().Px()+id2->p4().Px();
   double py = id1->p4().Py()+id2->p4().Py();
   transmom=sqrt(px*px+py*py);
-  return transmom/GeoModelKernelUnits::GeV;  //Gev
+  return transmom/Gaudi::Units::GeV;  //Gev
 }
 
 double DiMuMon::getEta(const xAOD::TrackParticle* id1, const xAOD::TrackParticle* id2 ) const {
diff --git a/InnerDetector/InDetRecTools/SiClusterizationTool/SiClusterizationTool/TruthClusterizationFactory.h b/InnerDetector/InDetRecTools/SiClusterizationTool/SiClusterizationTool/TruthClusterizationFactory.h
index 7869912dbdc06a4d095bc2eee11b227ed5a4b425..3e4e2834b5b3bb0e063f324ec598ee1ada4b80c4 100644
--- a/InnerDetector/InDetRecTools/SiClusterizationTool/SiClusterizationTool/TruthClusterizationFactory.h
+++ b/InnerDetector/InDetRecTools/SiClusterizationTool/SiClusterizationTool/TruthClusterizationFactory.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
  #ifndef SICLUSTERIZATIONTOOL_TruthClusterizationFactory_C
@@ -65,9 +65,9 @@ namespace InDet {
 	/** handle for incident service */
     virtual void handle(const Incident& inc); 
      
-    std::vector<double> estimateNumberOfParticles(const InDet::PixelCluster& pCluster);
+    std::vector<double> estimateNumberOfParticles(const InDet::PixelCluster& pCluster) const;
 
-    std::vector<Amg::Vector2D> estimatePositions(const InDet::PixelCluster&);
+    std::vector<Amg::Vector2D> estimatePositions(const InDet::PixelCluster&) const;
                                                       
    private:
 	/** IncidentSvc to catch begining of event and end of event */   
diff --git a/InnerDetector/InDetRecTools/SiClusterizationTool/src/TruthClusterizationFactory.cxx b/InnerDetector/InDetRecTools/SiClusterizationTool/src/TruthClusterizationFactory.cxx
index a992b1a8eb2f797d35ada17d78abfb9fd7bc20ec..553db1e479545af03f16bbe5de7a101be4c1d910 100644
--- a/InnerDetector/InDetRecTools/SiClusterizationTool/src/TruthClusterizationFactory.cxx
+++ b/InnerDetector/InDetRecTools/SiClusterizationTool/src/TruthClusterizationFactory.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -100,7 +100,7 @@ namespace InDet {
    }  
   }
 
-  std::vector<double> TruthClusterizationFactory::estimateNumberOfParticles(const InDet::PixelCluster& pCluster)
+  std::vector<double> TruthClusterizationFactory::estimateNumberOfParticles(const InDet::PixelCluster& pCluster) const
   {
 	std::vector<double> probabilities(3,0.);
 	auto rdos = pCluster.rdoList();
@@ -172,7 +172,7 @@ namespace InDet {
 	
   }
 
-   std::vector<Amg::Vector2D> TruthClusterizationFactory::estimatePositions(const InDet::PixelCluster& )
+  std::vector<Amg::Vector2D> TruthClusterizationFactory::estimatePositions(const InDet::PixelCluster& ) const
   { 
 	ATH_MSG_ERROR("TruthClusterizationFactory::estimatePositions called for ITk ambiguity setup, should never happen! Digital clustering should be run for positions & errors.");
     return std::vector<Amg::Vector2D>(2,Amg::Vector2D (2,0.));
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/TrackSelectionTool.cxx b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/TrackSelectionTool.cxx
index c98f26891122fc19bac501459abb36f495cd2cae..0994a3551d9881c99598099b42497dbd9c473a3b 100644
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/TrackSelectionTool.cxx
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/TrackSelectionTool.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 // InDetPhysValMonitoring includes
@@ -157,10 +157,10 @@ TrackSelectionTool::initialize() {
   // Example.
   // if (m_maxEta>-1) m_cuts.push_back(std::make_pair("eta", "Cut on (absolute) particle eta"));
 
-  // Add cuts to the TAccept.
+  // Add cuts to the AcceptInfo.
   for (const auto& cut : m_cuts) {
     if (m_accept.addCut(cut.first, cut.second) < 0) {
-      ATH_MSG_ERROR("Failed to add cut " << cut.first << " because the TAccept object is full.");
+      ATH_MSG_ERROR("Failed to add cut " << cut.first << " because the AcceptInfo object is full.");
       return StatusCode::FAILURE;
     }
   }
@@ -171,26 +171,23 @@ TrackSelectionTool::initialize() {
   return StatusCode::SUCCESS;
 }
 
-const Root::TAccept&
-TrackSelectionTool::getTAccept( ) const {
+const asg::AcceptInfo&
+TrackSelectionTool::getAcceptInfo( ) const {
   return m_accept;
 }
 
-const Root::TAccept&
+asg::AcceptData
 TrackSelectionTool::accept(const xAOD::IParticle* p) const {
   /*Is this perhaps supposed to be xAOD::TrackParticle? */
 
-  // Reset the result.
-  m_accept.clear();
-
   // Check if this is a track.
   if (!p) {
     ATH_MSG_ERROR("accept(...) Function received a null pointer");
-    return m_accept;
+    return asg::AcceptData (&m_accept);
   }
   if (p->type() != xAOD::Type::TrackParticle) {
     ATH_MSG_ERROR("accept(...) Function received a non-TrackParticle");
-    return m_accept;
+    return asg::AcceptData (&m_accept);
   }
 
   // Cast it to a track (we have already checked its type so we do not have to dynamic_cast).
@@ -200,10 +197,9 @@ TrackSelectionTool::accept(const xAOD::IParticle* p) const {
   return accept(track);
 }
 
-const Root::TAccept&
+asg::AcceptData
 TrackSelectionTool::accept(const xAOD::TrackParticle* p) const {
-  // Reset the TAccept.
-  m_accept.clear();
+  asg::AcceptData acceptData (&m_accept);
 
   uint8_t iBLayerHits(0), iBLayerOutliers(0), iBLayerSplitHits(0), iBLayerSharedHits(0);
   uint8_t iPixHits(0), iPixHoles(0), iPixSharedHits(0), iPixOutliers(0), iPixContribLayers(0), iPixSplitHits(0),
@@ -213,182 +209,182 @@ TrackSelectionTool::accept(const xAOD::TrackParticle* p) const {
   uint8_t iTRTHits(0), iTRTHTHits(0), iTRTOutliers(0), iTRTHTOutliers(0);
 
   if (!p->summaryValue(iBLayerHits, xAOD::numberOfInnermostPixelLayerHits)) {
-    return m_accept;
+    return acceptData;
   }
   if (!p->summaryValue(iBLayerOutliers, xAOD::numberOfInnermostPixelLayerOutliers)) {
-    return m_accept;
+    return acceptData;
   }
   if (!p->summaryValue(iBLayerSharedHits, xAOD::numberOfInnermostPixelLayerSharedHits)) {
-    return m_accept;
+    return acceptData;
   }
   if (!p->summaryValue(iBLayerSplitHits, xAOD::numberOfInnermostPixelLayerSplitHits)) {
-    return m_accept;
+    return acceptData;
   }
 
   if (!p->summaryValue(iPixHits, xAOD::numberOfPixelHits)) {
-    return m_accept;
+    return acceptData;
   }
   if (!p->summaryValue(iPixHoles, xAOD::numberOfPixelHoles)) {
-    return m_accept;
+    return acceptData;
   }
   if (!p->summaryValue(iPixOutliers, xAOD::numberOfPixelOutliers)) {
-    return m_accept;
+    return acceptData;
   }
   if (!p->summaryValue(iPixContribLayers, xAOD::numberOfContribPixelLayers)) {
-    return m_accept;
+    return acceptData;
   }
   if (!p->summaryValue(iPixSharedHits, xAOD::numberOfPixelSharedHits)) {
-    return m_accept;
+    return acceptData;
   }
   if (!p->summaryValue(iPixSplitHits, xAOD::numberOfPixelSplitHits)) {
-    return m_accept;
+    return acceptData;
   }
   if (!p->summaryValue(iPixGangedHits, xAOD::numberOfGangedPixels)) {
-    return m_accept;
+    return acceptData;
   }
 
   if (!p->summaryValue(iSCTHits, xAOD::numberOfSCTHits)) {
-    return m_accept;
+    return acceptData;
   }
   if (!p->summaryValue(iSCTHoles, xAOD::numberOfSCTHoles)) {
-    return m_accept;
+    return acceptData;
   }
   if (!p->summaryValue(iSCTOutliers, xAOD::numberOfSCTOutliers)) {
-    return m_accept;
+    return acceptData;
   }
   if (!p->summaryValue(iSCTDoubleHoles, xAOD::numberOfSCTDoubleHoles)) {
-    return m_accept;
+    return acceptData;
   }
   if (!p->summaryValue(iSCTSharedHits, xAOD::numberOfSCTSharedHits)) {
-    return m_accept;
+    return acceptData;
   }
 
   if (!p->summaryValue(iTRTOutliers, xAOD::numberOfTRTOutliers)) {
-    return m_accept;
+    return acceptData;
   }
   if (!p->summaryValue(iTRTHTOutliers, xAOD::numberOfTRTHighThresholdOutliers)) {
-    return m_accept;
+    return acceptData;
   }
   if (!p->summaryValue(iTRTHits, xAOD::numberOfTRTHits)) {
-    return m_accept;
+    return acceptData;
   }
   if (!p->summaryValue(iTRTHTHits, xAOD::numberOfTRTHighThresholdHits)) {
-    return m_accept;
+    return acceptData;
   }
 
   // iSiHits = iPixHits + iSCTHits;
 
   // Check cuts.
   if (m_maxPt > -1) {
-    m_accept.setCutResult("maxPt", p->pt() < m_maxPt);
+    acceptData.setCutResult("maxPt", p->pt() < m_maxPt);
   }
   if (m_minPt > -1) {
-    m_accept.setCutResult("minPt", p->pt() > m_minPt);
+    acceptData.setCutResult("minPt", p->pt() > m_minPt);
   }
   if (m_maxEta > -1) {
-    m_accept.setCutResult("maxEta", p->pt() > 1E-07 ? std::fabs(p->eta()) < m_maxEta : false);
+    acceptData.setCutResult("maxEta", p->pt() > 1E-07 ? std::fabs(p->eta()) < m_maxEta : false);
   }
   if (m_minEta > -1) {
-    m_accept.setCutResult("minEta", p->pt() > 1E-07 ? std::fabs(p->eta()) > m_minEta : false);
+    acceptData.setCutResult("minEta", p->pt() > 1E-07 ? std::fabs(p->eta()) > m_minEta : false);
   }
   if (m_maxPrimaryImpact > -1) {
-    m_accept.setCutResult("maxPrimaryImpact", std::fabs(p->d0()) < m_maxPrimaryImpact);
+    acceptData.setCutResult("maxPrimaryImpact", std::fabs(p->d0()) < m_maxPrimaryImpact);
   }
   if (m_maxZImpact > -1) {
-    m_accept.setCutResult("maxZImpact", std::fabs(p->z0()) < m_maxZImpact);
+    acceptData.setCutResult("maxZImpact", std::fabs(p->z0()) < m_maxZImpact);
   }
   if (m_minPrimaryImpact > -1) {
-    m_accept.setCutResult("minPrimaryImpact", std::fabs(p->d0()) > m_minPrimaryImpact);
+    acceptData.setCutResult("minPrimaryImpact", std::fabs(p->d0()) > m_minPrimaryImpact);
   }
   if (m_minZImpact > -1) {
-    m_accept.setCutResult("minZImpact", std::fabs(p->z0()) > m_minZImpact);
+    acceptData.setCutResult("minZImpact", std::fabs(p->z0()) > m_minZImpact);
   }
   if (m_maxSecondaryImpact > -1) {
-    m_accept.setCutResult("maxSecondaryImpact", true /* nop */);
+    acceptData.setCutResult("maxSecondaryImpact", true /* nop */);
   }
   if (m_minSecondaryPt > -1) {
-    m_accept.setCutResult("minSecondaryPt", true /* nop */);
+    acceptData.setCutResult("minSecondaryPt", true /* nop */);
   }
   if (m_minClusters > -1) {
-    m_accept.setCutResult("minClusters", true /* nop */);
+    acceptData.setCutResult("minClusters", true /* nop */);
   }
   if (m_minSiNotShared > -1) {
-    m_accept.setCutResult("minSiNotShared",
+    acceptData.setCutResult("minSiNotShared",
                           (iBLayerHits + iPixHits + iSCTHits - iBLayerSharedHits - iPixSharedHits - iSCTSharedHits) >=
                           m_minSiNotShared);
   }
   if (m_maxShared > -1) {
-    m_accept.setCutResult("maxShared", iBLayerSharedHits + iPixSharedHits + iSCTSharedHits <= m_maxShared);
+    acceptData.setCutResult("maxShared", iBLayerSharedHits + iPixSharedHits + iSCTSharedHits <= m_maxShared);
   }
   if (m_minPixelHits > -1) {
-    m_accept.setCutResult("minPixelHits", iPixHits >= m_minPixelHits);
+    acceptData.setCutResult("minPixelHits", iPixHits >= m_minPixelHits);
   }
   if (m_maxHoles > -1) {
-    m_accept.setCutResult("maxHoles", iPixHoles + iSCTHoles <= m_maxHoles);
+    acceptData.setCutResult("maxHoles", iPixHoles + iSCTHoles <= m_maxHoles);
   }
   if (m_maxPixelHoles > -1) {
-    m_accept.setCutResult("maxPixelHoles", iPixHoles <= m_maxPixelHoles);
+    acceptData.setCutResult("maxPixelHoles", iPixHoles <= m_maxPixelHoles);
   }
   if (m_maxSctHoles > -1) {
-    m_accept.setCutResult("maxSctHoles", iSCTHoles <= m_maxSctHoles);
+    acceptData.setCutResult("maxSctHoles", iSCTHoles <= m_maxSctHoles);
   }
   if (m_maxDoubleHoles > -1) {
-    m_accept.setCutResult("maxDoubleHoles", iSCTDoubleHoles <= m_maxDoubleHoles);
+    acceptData.setCutResult("maxDoubleHoles", iSCTDoubleHoles <= m_maxDoubleHoles);
   }
   if (m_radMax > -1) {
-    m_accept.setCutResult("radMax", true /* nop */);
+    acceptData.setCutResult("radMax", true /* nop */);
   }
   if (m_nHolesMax > -1) {
-    m_accept.setCutResult("nHolesMax", true /* nop */);
+    acceptData.setCutResult("nHolesMax", true /* nop */);
   }
   if (m_nHolesGapMax > -1) {
-    m_accept.setCutResult("nHolesGapMax", true /* nop */);
+    acceptData.setCutResult("nHolesGapMax", true /* nop */);
   }
   if (m_seedFilterLevel > -1) {
-    m_accept.setCutResult("seedFilterLevel", true /* nop */);
+    acceptData.setCutResult("seedFilterLevel", true /* nop */);
   }
   if (m_maxTRTHighThresholdHits > -1) {
-    m_accept.setCutResult("maxTRTHighThresholdHits", iTRTHTHits <= m_maxTRTHighThresholdHits);
+    acceptData.setCutResult("maxTRTHighThresholdHits", iTRTHTHits <= m_maxTRTHighThresholdHits);
   }
   if (m_minTRTHighThresholdHits > -1) {
-    m_accept.setCutResult("minTRTHighThresholdHits", iTRTHTHits <= m_minTRTHighThresholdHits);
+    acceptData.setCutResult("minTRTHighThresholdHits", iTRTHTHits <= m_minTRTHighThresholdHits);
   }
   if (m_maxTRTHighThresholdOutliers > -1) {
-    m_accept.setCutResult("maxTRTHighThresholdOutliers", iTRTHTOutliers <= m_maxTRTHighThresholdOutliers);
+    acceptData.setCutResult("maxTRTHighThresholdOutliers", iTRTHTOutliers <= m_maxTRTHighThresholdOutliers);
   }
   if (m_maxSCTHits > -1) {
-    m_accept.setCutResult("maxSCTHits", iSCTHits <= m_maxSCTHits);
+    acceptData.setCutResult("maxSCTHits", iSCTHits <= m_maxSCTHits);
   }
   if (m_minSCTHits > -1) {
-    m_accept.setCutResult("minSCTHits", iSCTHits >= m_minSCTHits);
+    acceptData.setCutResult("minSCTHits", iSCTHits >= m_minSCTHits);
   }
   if (m_maxTRTOutliers > -1) {
-    m_accept.setCutResult("maxTRTOutliers", iTRTOutliers <= m_maxTRTOutliers);
+    acceptData.setCutResult("maxTRTOutliers", iTRTOutliers <= m_maxTRTOutliers);
   }
   if (m_maxBLayerSplitHits > -1) {
-    m_accept.setCutResult("maxBLayerSplitHits", iBLayerSplitHits <= m_maxBLayerSplitHits);
+    acceptData.setCutResult("maxBLayerSplitHits", iBLayerSplitHits <= m_maxBLayerSplitHits);
   }
   if (m_maxPixelOutliers > -1) {
-    m_accept.setCutResult("maxPixelOutliers", iPixOutliers <= m_maxPixelOutliers);
+    acceptData.setCutResult("maxPixelOutliers", iPixOutliers <= m_maxPixelOutliers);
   }
 
   // Example.
-  // if (m_maxEta>-1) m_accept.setCutResult("eta", (p->pt()>1e-7 ? (fabs(p->eta()) < m_maxEta) : false) );
+  // if (m_maxEta>-1) acceptData.setCutResult("eta", (p->pt()>1e-7 ? (fabs(p->eta()) < m_maxEta) : false) );
 
   // Book keep cuts
   for (const auto& cut : m_cuts) {
-    unsigned int pos = m_accept.getCutPosition(cut.first);
-    if (m_accept.getCutResult(pos)) {
+    unsigned int pos = acceptData.getCutPosition(cut.first);
+    if (acceptData.getCutResult(pos)) {
       m_numPassedCuts[pos]++;
     }
   }
 
   m_numProcessed++;
-  if (m_accept) {
+  if (acceptData) {
     m_numPassed++;
   }
 
-  return m_accept;
+  return acceptData;
 }
 
 StatusCode
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/TrackSelectionTool.h b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/TrackSelectionTool.h
index 9995fd5097d51b520e9d91484e9d1b0d0715889f..d095fc69e6ef2d3f6b3a16015c651a4f2c96f8b8 100644
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/TrackSelectionTool.h
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/TrackSelectionTool.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef INDETPHYSVALMONITORING_TRACKSELECTORTOOL_H
@@ -20,13 +20,13 @@ public:
   virtual
   ~TrackSelectionTool();
 
-  virtual StatusCode initialize();
-  virtual StatusCode finalize();
-  virtual const Root::TAccept& getTAccept( ) const;
-  virtual const Root::TAccept& accept(const xAOD::IParticle* p) const;
-  virtual const Root::TAccept& accept(const xAOD::TrackParticle* p) const;
+  virtual StatusCode initialize() override;
+  virtual StatusCode finalize() override;
+  virtual const asg::AcceptInfo& getAcceptInfo( ) const override;
+  virtual asg::AcceptData accept(const xAOD::IParticle* p) const override;
+  virtual asg::AcceptData accept(const xAOD::TrackParticle* p) const;
 private:
-  mutable Root::TAccept m_accept;
+  asg::AcceptInfo m_accept;
   std::vector<std::pair<std::string, std::string> > m_cuts;
   mutable ULong64_t m_numProcessed; // !< a counter of the number of tracks proccessed
   mutable ULong64_t m_numPassed; // !< a counter of the number of tracks that passed all cuts
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/TrackTruthSelectionTool.cxx b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/TrackTruthSelectionTool.cxx
index 4a8caf1bd0b54377b327e079ddf0692f6a5f06bc..a2e003ff8cf59a643c2fd2e8eb187aecf1fe0188 100644
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/TrackTruthSelectionTool.cxx
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/TrackTruthSelectionTool.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 // InDetPhysValMonitoring includes
@@ -66,10 +66,10 @@ TrackTruthSelectionTool::initialize() {
   if (m_pdgId > -1) {
     m_cuts.push_back(std::make_pair("pdgId", "Pdg Id cut")); // 3-18-16 normally enabled, disabled for testing
   }
-  // Add cuts to the TAccept
+  // Add cuts to the AcceptInfo
   for (const auto& cut : m_cuts) {
     if (m_accept.addCut(cut.first, cut.second) < 0) {
-      ATH_MSG_ERROR("Failed to add cut " << cut.first << " because the TAccept object is full.");
+      ATH_MSG_ERROR("Failed to add cut " << cut.first << " because the AcceptInfo object is full.");
       return StatusCode::FAILURE;
     }
   }
@@ -80,25 +80,22 @@ TrackTruthSelectionTool::initialize() {
   return StatusCode::SUCCESS;
 }
 
-const Root::TAccept&
-TrackTruthSelectionTool::getTAccept( ) const {
+const asg::AcceptInfo&
+TrackTruthSelectionTool::getAcceptInfo( ) const {
   return m_accept;
 }
 
-const Root::TAccept&
+asg::AcceptData
 TrackTruthSelectionTool::accept(const xAOD::IParticle* p) const// Is this perhaps supposed to be xAOD::TruthParticle?
 {
-  // Reset the result:
-  m_accept.clear();
-
   // Check if this is a track:
   if (!p) {
     ATH_MSG_ERROR("accept(...) Function received a null pointer");
-    return m_accept;
+    return asg::AcceptData (&m_accept);
   }
   if (p->type() != xAOD::Type::TruthParticle) {
     ATH_MSG_ERROR("accept(...) Function received a non-TruthParticle");
-    return m_accept;
+    return asg::AcceptData (&m_accept);
   }
 
   // Cast it to a track (we have already checked its type so we do not have to dynamic_cast):
@@ -108,50 +105,49 @@ TrackTruthSelectionTool::accept(const xAOD::IParticle* p) const// Is this perhap
   return accept(truth);
 }
 
-const Root::TAccept&
+asg::AcceptData
 TrackTruthSelectionTool::accept(const xAOD::TruthParticle* p) const {
-  // Reset the TAccept
-  m_accept.clear();
+  asg::AcceptData acceptData (&m_accept);
 
   // Check cuts
   if (m_maxEta > -1) {
-    m_accept.setCutResult("eta", (p->pt() > 1e-7 ? (std::fabs(p->eta()) < m_maxEta) : false));
+    acceptData.setCutResult("eta", (p->pt() > 1e-7 ? (std::fabs(p->eta()) < m_maxEta) : false));
   }
   if (m_minPt > -1) {
-    m_accept.setCutResult("min_pt", (p->pt() > m_minPt));
+    acceptData.setCutResult("min_pt", (p->pt() > m_minPt));
   }
   if (m_maxPt > -1) {
-    m_accept.setCutResult("max_pt", (p->pt() < m_maxPt));
+    acceptData.setCutResult("max_pt", (p->pt() < m_maxPt));
   }
   if ((m_maxBarcode > -1)) {
-    m_accept.setCutResult("barcode", (p->barcode() < m_maxBarcode));
+    acceptData.setCutResult("barcode", (p->barcode() < m_maxBarcode));
   }
 
   if (m_requireCharged) {
-    m_accept.setCutResult("charged", (not (p->isNeutral())));
+    acceptData.setCutResult("charged", (not (p->isNeutral())));
   }
   if (m_requireStatus1) {
-    m_accept.setCutResult("status_1", (p->status() == 1));
+    acceptData.setCutResult("status_1", (p->status() == 1));
   }
   if (m_maxProdVertRadius > 0.) {
-    m_accept.setCutResult("decay_before_pixel", (!p->hasProdVtx() || p->prodVtx()->perp() < m_maxProdVertRadius));
+    acceptData.setCutResult("decay_before_pixel", (!p->hasProdVtx() || p->prodVtx()->perp() < m_maxProdVertRadius));
   }
   if (m_pdgId > -1) {
-    m_accept.setCutResult("pdgId", (std::fabs(p->pdgId()) == m_pdgId));// 3-18-16 normally on, disabled for testing
+    acceptData.setCutResult("pdgId", (std::fabs(p->pdgId()) == m_pdgId));// 3-18-16 normally on, disabled for testing
   }
   // Book keep cuts
   for (const auto& cut : m_cuts) {
-    unsigned int pos = m_accept.getCutPosition(cut.first);
-    if (m_accept.getCutResult(pos)) {
+    unsigned int pos = acceptData.getCutPosition(cut.first);
+    if (acceptData.getCutResult(pos)) {
       m_numTruthPassedCuts[pos]++;
     }
   }
   m_numTruthProcessed++;
-  if (m_accept) {
+  if (acceptData) {
     m_numTruthPassed++;
   }
 
-  return m_accept;
+  return acceptData;
 }
 
 StatusCode
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/TrackTruthSelectionTool.h b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/TrackTruthSelectionTool.h
index c4cc2369353aacff8090a050e84340e488f766dc..cbb5119fc43ae7e985986ba32848e48f97efe37f 100644
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/TrackTruthSelectionTool.h
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/TrackTruthSelectionTool.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef INDETPHYSVALMONITORING_TRACKTRUTHSELECTORTOOL_H
@@ -21,13 +21,13 @@ public:
   virtual
   ~TrackTruthSelectionTool();
 
-  virtual StatusCode initialize();
-  virtual StatusCode finalize();
-  virtual const Root::TAccept& getTAccept( ) const;
-  virtual const Root::TAccept& accept(const xAOD::IParticle* p) const;
-  virtual const Root::TAccept& accept(const xAOD::TruthParticle* p) const;
+  virtual StatusCode initialize() override;
+  virtual StatusCode finalize() override;
+  virtual const asg::AcceptInfo& getAcceptInfo( ) const override;
+  virtual asg::AcceptData accept(const xAOD::IParticle* p) const override;
+  virtual asg::AcceptData accept(const xAOD::TruthParticle* p) const;
 private:
-  mutable Root::TAccept m_accept;
+  asg::AcceptInfo m_accept;
   std::vector<std::pair<std::string, std::string> > m_cuts;
   mutable ULong64_t m_numTruthProcessed; // !< a counter of the number of tracks proccessed
   mutable ULong64_t m_numTruthPassed; // !< a counter of the number of tracks that passed all cuts
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/dRMatchingTool.cxx b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/dRMatchingTool.cxx
index a72ce659afc4f01d1c0616341b81069d61014453..0a8df2e6578ae5e95177ca435f6c591debde54c2 100644
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/dRMatchingTool.cxx
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/dRMatchingTool.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "dRMatchingTool.h"
@@ -127,10 +127,10 @@ dRMatchingTool::initialize() {
                                     "Cut on maximal, relativ pT difference between track and truth particle."));
   }
 
-  // Add cuts to the TAccept.
+  // Add cuts to the AcceptOmfp.
   for (const auto& cut : m_cuts) {
     if (m_accept.addCut(cut.first, cut.second) < 0) {
-      ATH_MSG_ERROR("Failed to add cut " << cut.first << " because the TAccept object is full.");
+      ATH_MSG_ERROR("Failed to add cut " << cut.first << " because the AcceptInfo object is full.");
       return StatusCode::FAILURE;
     }
   }
@@ -150,19 +150,18 @@ dRMatchingTool::initialize() {
   return StatusCode::SUCCESS;
 }
 
-const Root::TAccept&
-dRMatchingTool::getTAccept( ) const {
+const asg::AcceptInfo&
+dRMatchingTool::getAcceptInfo( ) const {
   return m_accept;
 }
 
-const Root::TAccept&
+asg::AcceptData
 dRMatchingTool::accept(const xAOD::IParticle* /*p*/) const {
-  m_accept.clear();
 
   ATH_MSG_ERROR(
     "accept(...) function called without needed Truth- or TrackParticleContainer. Please use one of the dRMatchingTool-specific accept methods.");
 
-  return m_accept;
+  return asg::AcceptData (&m_accept);
 }
 
 template<class T, class U>
@@ -373,12 +372,11 @@ dRMatchingTool::sortedMatch(const U* p,
   return passes;
 }
 
-const Root::TAccept&
+asg::AcceptData
 dRMatchingTool::accept(const xAOD::TrackParticle* track,
                        const xAOD::TruthParticleContainer* truthParticles,
                        bool (* truthSelectionTool)(const xAOD::TruthParticle*)) const {
-  // Reset the results.
-  m_accept.clear();
+  asg::AcceptData acceptData (&m_accept);
 
   // Determine whether to cache current truth particle container
   checkCacheTruthParticles(truthParticles, truthSelectionTool);
@@ -391,34 +389,33 @@ dRMatchingTool::accept(const xAOD::TrackParticle* track,
 
   // Set cut values.
   if (m_dRmax > -1) {
-    m_accept.setCutResult("dRmax", passes);
+    acceptData.setCutResult("dRmax", passes);
   }
   if (m_pTResMax > -1) {
-    m_accept.setCutResult("pTResMax", passes);
+    acceptData.setCutResult("pTResMax", passes);
   }
 
   // Book keep cuts
   for (const auto& cut : m_cuts) {
-    unsigned int pos = m_accept.getCutPosition(cut.first);
-    if (m_accept.getCutResult(pos)) {
+    unsigned int pos = acceptData.getCutPosition(cut.first);
+    if (acceptData.getCutResult(pos)) {
       m_numPassedCuts[pos]++;
     }
   }
 
   m_numProcessed++;
-  if (m_accept) {
+  if (acceptData) {
     m_numPassed++;
   }
 
-  return m_accept;
+  return acceptData;
 }
 
-const Root::TAccept&
+asg::AcceptData
 dRMatchingTool::accept(const xAOD::TruthParticle* truth,
                        const xAOD::TrackParticleContainer* trackParticles,
                        bool (* trackSelectionTool)(const xAOD::TrackParticle*)) const {
-  // Reset the results.
-  m_accept.clear();
+  asg::AcceptData acceptData (&m_accept);
 
   // Determine whether to cache current track particle container
   checkCacheTrackParticles(trackParticles, trackSelectionTool);
@@ -431,34 +428,33 @@ dRMatchingTool::accept(const xAOD::TruthParticle* truth,
 
   // Set cut values.
   if (m_dRmax > -1) {
-    m_accept.setCutResult("dRmax", passes);
+    acceptData.setCutResult("dRmax", passes);
   }
   if (m_pTResMax > -1) {
-    m_accept.setCutResult("pTResMax", passes);
+    acceptData.setCutResult("pTResMax", passes);
   }
 
   // Book keep cuts
   for (const auto& cut : m_cuts) {
-    unsigned int pos = m_accept.getCutPosition(cut.first);
-    if (m_accept.getCutResult(pos)) {
+    unsigned int pos = acceptData.getCutPosition(cut.first);
+    if (acceptData.getCutResult(pos)) {
       m_numPassedCuts[pos]++;
     }
   }
 
   m_numProcessed++;
-  if (m_accept) {
+  if (acceptData) {
     m_numPassed++;
   }
 
-  return m_accept;
+  return acceptData;
 }
 
-const Root::TAccept&
+asg::AcceptData
 dRMatchingTool::acceptLegacy(const xAOD::TrackParticle* p,
                              const xAOD::TruthParticleContainer* truthParticles,
                              bool (* truthSelectionTool)(const xAOD::TruthParticle*)) const {
-  // Reset the results.
-  m_accept.clear();
+  asg::AcceptData acceptData (&m_accept);
   m_dRmin = 9999.;
 
   // Define variables.
@@ -504,34 +500,34 @@ dRMatchingTool::acceptLegacy(const xAOD::TrackParticle* p,
 
   // Set cut values.
   if (m_dRmax > -1) {
-    m_accept.setCutResult("dRmax", passes);
+    acceptData.setCutResult("dRmax", passes);
   }
   if (m_pTResMax > -1) {
-    m_accept.setCutResult("pTResMax", passes);
+    acceptData.setCutResult("pTResMax", passes);
   }
 
   // Book keep cuts
   for (const auto& cut : m_cuts) {
-    unsigned int pos = m_accept.getCutPosition(cut.first);
-    if (m_accept.getCutResult(pos)) {
+    unsigned int pos = acceptData.getCutPosition(cut.first);
+    if (acceptData.getCutResult(pos)) {
       m_numPassedCuts[pos]++;
     }
   }
 
   m_numProcessed++;
-  if (m_accept) {
+  if (acceptData) {
     m_numPassed++;
   }
 
-  return m_accept;
+  return acceptData;
 }
 
-const Root::TAccept&
+asg::AcceptData
 dRMatchingTool::acceptLegacy(const xAOD::TruthParticle* p,
                              const xAOD::TrackParticleContainer* trackParticles,
                              bool (* trackSelectionTool)(const xAOD::TrackParticle*)) const {
   // Reset the results.
-  m_accept.clear();
+  asg::AcceptData acceptData (&m_accept);
   m_dRmin = 9999.;
 
   // Define variables.
@@ -577,26 +573,26 @@ dRMatchingTool::acceptLegacy(const xAOD::TruthParticle* p,
 
   // Set cut values.
   if (m_dRmax > -1) {
-    m_accept.setCutResult("dRmax", passes);
+    acceptData.setCutResult("dRmax", passes);
   }
   if (m_pTResMax > -1) {
-    m_accept.setCutResult("pTResMax", passes);
+    acceptData.setCutResult("pTResMax", passes);
   }
 
   // Book keep cuts
   for (const auto& cut : m_cuts) {
-    unsigned int pos = m_accept.getCutPosition(cut.first);
-    if (m_accept.getCutResult(pos)) {
+    unsigned int pos = acceptData.getCutPosition(cut.first);
+    if (acceptData.getCutResult(pos)) {
       m_numPassedCuts[pos]++;
     }
   }
 
   m_numProcessed++;
-  if (m_accept) {
+  if (acceptData) {
     m_numPassed++;
   }
 
-  return m_accept;
+  return acceptData;
 }
 
 StatusCode
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/dRMatchingTool.h b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/dRMatchingTool.h
index f487867e7b2c13f3dcdddbfdcc86afe80114182e..b9827c94fcdd486d94ef28d0f5c6b095b86c9965 100644
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/dRMatchingTool.h
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/dRMatchingTool.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef INDETPHYSVALMONITORING_DRMATCHINGTOOL_H
@@ -90,30 +90,30 @@ public:
   ~dRMatchingTool();
 
   /// SelectionTool method(s).
-  virtual StatusCode initialize();
-  virtual StatusCode finalize();
-  virtual const Root::TAccept& getTAccept( ) const;
-  virtual const Root::TAccept& accept(const xAOD::IParticle* p) const;
+  virtual StatusCode initialize() override;
+  virtual StatusCode finalize() override;
+  virtual const asg::AcceptInfo& getAcceptInfo( ) const override;
+  virtual asg::AcceptData accept(const xAOD::IParticle* p) const override;
 
   /// dR-matching specific method(s).
   // For matching single track to set of truth particles.
-  virtual const Root::TAccept&
+  virtual asg::AcceptData
   acceptLegacy(const xAOD::TrackParticle* p,
                const xAOD::TruthParticleContainer* truthParticles,
                bool (* truthSelectionTool)(const xAOD::TruthParticle*) = nullptr) const;
 
-  const Root::TAccept&
+  asg::AcceptData
   accept(const xAOD::TrackParticle* p,
          const xAOD::TruthParticleContainer* truthParticles,
          bool (* truthSelectionTool)(const xAOD::TruthParticle*) = nullptr) const;
 
   // For matching single truth particle to set of tracks.
-  virtual const Root::TAccept&
+  virtual asg::AcceptData
   acceptLegacy(const xAOD::TruthParticle* p,
                const xAOD::TrackParticleContainer* trackParticles,
                bool (* trackSelectionTool)(const xAOD::TrackParticle*) = nullptr) const;
 
-  const Root::TAccept&
+  asg::AcceptData
   accept(const xAOD::TruthParticle* p,
          const xAOD::TrackParticleContainer* trackParticles,
          bool (* trackSelectionTool)(const xAOD::TrackParticle*) = nullptr) const;
@@ -165,8 +165,8 @@ protected:
                    std::vector< const V* >& vec_phi) const;
 private:
   /// Data member(s).
-  // TAccept object.
-  mutable Root::TAccept m_accept;
+  // AcceptInfo object.
+  asg::AcceptInfo m_accept;
   // Vector of stored cut names and descriptions.
   std::vector<std::pair<std::string, std::string> > m_cuts;
 
diff --git a/LArCalorimeter/LArDetDescr/src/LArNumberHelper.cxx b/LArCalorimeter/LArDetDescr/src/LArNumberHelper.cxx
index b2df85629c45e7e3d76d345566cc564ada65ec7b..c983e296b92ed2d627023accf7c47177fd1476c5 100755
--- a/LArCalorimeter/LArDetDescr/src/LArNumberHelper.cxx
+++ b/LArCalorimeter/LArDetDescr/src/LArNumberHelper.cxx
@@ -23,7 +23,7 @@
 #include "LArDetDescr/LArCellVolumes.h"
 #include "GeoModelInterfaces/IGeoModelSvc.h"
 #include "GeoModelUtilities/DecodeVersionKey.h"
-#include "GeoModelKernel/Units.h"
+#include "GaudiKernel/SystemOfUnits.h"
 
 LArNumberHelper::LArNumberHelper(const std::string geometry) :
   m_geometry(geometry),
@@ -495,49 +495,49 @@ LArNumberHelper::db_nb_em()
   //std::cout << " ----- in db_nb_em tags are : " << m_tag << " " << m_node << std::endl;
 
   // PS
-  // m_emb_psin = 141.23*GeoModelKernelUnits::cm;    // this is the TDR number 1385 mm + 27.3 mm   
+  // m_emb_psin = 141.23*Gaudi::Units::cm;    // this is the TDR number 1385 mm + 27.3 mm   
   //  ----> overwritten
 
   m_lar = m_iAccessSvc->getRecordsetPtr("PresamplerGeometry","ATLAS-00","ATLAS");
 
   if (m_lar->size()) {
     m_rec = (*m_lar)[0];
-    m_emb_psin = m_rec->getDouble("RACTIVE")*GeoModelKernelUnits::cm;
+    m_emb_psin = m_rec->getDouble("RACTIVE")*Gaudi::Units::cm;
   }
 
   // ACCG :
-  // m_accg_rin_ac = 144.73*GeoModelKernelUnits::cm; // 1385mm + 27.3mm + 35mm
-  // m_accg_rout_ac = 200.35*GeoModelKernelUnits::cm; // end of active material
+  // m_accg_rin_ac = 144.73*Gaudi::Units::cm; // 1385mm + 27.3mm + 35mm
+  // m_accg_rout_ac = 200.35*Gaudi::Units::cm; // end of active material
   //  ----> overwritten
   m_lar = m_iAccessSvc->getRecordsetPtr("BarrelGeometry",m_tag,m_node);
   if (m_lar->size()) {
     m_rec = (*m_lar)[0];  
-    m_accg_rin_ac = m_rec->getDouble("RMIN") *GeoModelKernelUnits::cm;
-    m_accg_rout_ac = m_rec->getDouble("RMAX") *GeoModelKernelUnits::cm;
+    m_accg_rin_ac = m_rec->getDouble("RMIN") *Gaudi::Units::cm;
+    m_accg_rout_ac = m_rec->getDouble("RMAX") *Gaudi::Units::cm;
   }
 
   // ACCO :
   m_acco_rmx12.resize (8,(double) 0.); 
-  // m_acco_rmx12[0] = 158.6*GeoModelKernelUnits::cm;
-  // m_acco_rmx12[1] = 158.6*GeoModelKernelUnits::cm;
-  // m_acco_rmx12[2] = 157.07*GeoModelKernelUnits::cm;
-  // m_acco_rmx12[3] = 157.07*GeoModelKernelUnits::cm;
-  // m_acco_rmx12[4] = 154.83*GeoModelKernelUnits::cm;
-  // m_acco_rmx12[5] = 154.83*GeoModelKernelUnits::cm;
-  // m_acco_rmx12[6] = 153.23*GeoModelKernelUnits::cm;
-  // m_acco_rmx12[7] = 153.23*GeoModelKernelUnits::cm;
+  // m_acco_rmx12[0] = 158.6*Gaudi::Units::cm;
+  // m_acco_rmx12[1] = 158.6*Gaudi::Units::cm;
+  // m_acco_rmx12[2] = 157.07*Gaudi::Units::cm;
+  // m_acco_rmx12[3] = 157.07*Gaudi::Units::cm;
+  // m_acco_rmx12[4] = 154.83*Gaudi::Units::cm;
+  // m_acco_rmx12[5] = 154.83*Gaudi::Units::cm;
+  // m_acco_rmx12[6] = 153.23*Gaudi::Units::cm;
+  // m_acco_rmx12[7] = 153.23*Gaudi::Units::cm;
   //  ----> overwritten
   m_lar = m_iAccessSvc->getRecordsetPtr("BarrelLongDiv",m_tag,m_node);
   if (m_lar->size()) {
     m_rec = (*m_lar)[0];  
-    m_acco_rmx12[0] = m_rec->getDouble("RMX12_0")*GeoModelKernelUnits::cm;
-    m_acco_rmx12[1] = m_rec->getDouble("RMX12_1")*GeoModelKernelUnits::cm;
-    m_acco_rmx12[2] = m_rec->getDouble("RMX12_2")*GeoModelKernelUnits::cm;
-    m_acco_rmx12[3] = m_rec->getDouble("RMX12_3")*GeoModelKernelUnits::cm;
-    m_acco_rmx12[4] = m_rec->getDouble("RMX12_4")*GeoModelKernelUnits::cm;
-    m_acco_rmx12[5] = m_rec->getDouble("RMX12_5")*GeoModelKernelUnits::cm;
-    m_acco_rmx12[6] = m_rec->getDouble("RMX12_6")*GeoModelKernelUnits::cm;
-    m_acco_rmx12[7] = m_rec->getDouble("RMX12_7")*GeoModelKernelUnits::cm;
+    m_acco_rmx12[0] = m_rec->getDouble("RMX12_0")*Gaudi::Units::cm;
+    m_acco_rmx12[1] = m_rec->getDouble("RMX12_1")*Gaudi::Units::cm;
+    m_acco_rmx12[2] = m_rec->getDouble("RMX12_2")*Gaudi::Units::cm;
+    m_acco_rmx12[3] = m_rec->getDouble("RMX12_3")*Gaudi::Units::cm;
+    m_acco_rmx12[4] = m_rec->getDouble("RMX12_4")*Gaudi::Units::cm;
+    m_acco_rmx12[5] = m_rec->getDouble("RMX12_5")*Gaudi::Units::cm;
+    m_acco_rmx12[6] = m_rec->getDouble("RMX12_6")*Gaudi::Units::cm;
+    m_acco_rmx12[7] = m_rec->getDouble("RMX12_7")*Gaudi::Units::cm;
   }
 
   m_acco_ee12.resize (8,(double) 0.); 
@@ -565,84 +565,84 @@ LArNumberHelper::db_nb_em()
 
   m_acco_rmx23.resize (53,(double) 0.); 
   /*
-    m_acco_rmx23[0] = 192.83*GeoModelKernelUnits::cm;  ... up to :
-    m_acco_rmx23[52] = 178.89*GeoModelKernelUnits::cm;
+    m_acco_rmx23[0] = 192.83*Gaudi::Units::cm;  ... up to :
+    m_acco_rmx23[52] = 178.89*Gaudi::Units::cm;
   */
   //  ----> overwritten
   m_lar = m_iAccessSvc->getRecordsetPtr("BarrelLongDiv",m_tag,m_node);
   if (m_lar->size()) {
     m_rec = (*m_lar)[0];  
-    m_acco_rmx23[0] = m_rec->getDouble("RMX23_0")*GeoModelKernelUnits::cm;
-    m_acco_rmx23[1] = m_rec->getDouble("RMX23_1")*GeoModelKernelUnits::cm;
-    m_acco_rmx23[2] = m_rec->getDouble("RMX23_2")*GeoModelKernelUnits::cm;
-    m_acco_rmx23[3] = m_rec->getDouble("RMX23_3")*GeoModelKernelUnits::cm;
-    m_acco_rmx23[4] = m_rec->getDouble("RMX23_4")*GeoModelKernelUnits::cm;
-    m_acco_rmx23[5] = m_rec->getDouble("RMX23_5")*GeoModelKernelUnits::cm;
-    m_acco_rmx23[6] = m_rec->getDouble("RMX23_6")*GeoModelKernelUnits::cm;
-    m_acco_rmx23[7] = m_rec->getDouble("RMX23_7")*GeoModelKernelUnits::cm;
-    m_acco_rmx23[8] = m_rec->getDouble("RMX23_8")*GeoModelKernelUnits::cm;
-    m_acco_rmx23[9] = m_rec->getDouble("RMX23_9")*GeoModelKernelUnits::cm;
-    m_acco_rmx23[10] = m_rec->getDouble("RMX23_10")*GeoModelKernelUnits::cm;
-    m_acco_rmx23[11] = m_rec->getDouble("RMX23_11")*GeoModelKernelUnits::cm;
-    m_acco_rmx23[12] = m_rec->getDouble("RMX23_12")*GeoModelKernelUnits::cm;
-    m_acco_rmx23[13] = m_rec->getDouble("RMX23_13")*GeoModelKernelUnits::cm;
-    m_acco_rmx23[14] = m_rec->getDouble("RMX23_14")*GeoModelKernelUnits::cm;
-    m_acco_rmx23[15] = m_rec->getDouble("RMX23_15")*GeoModelKernelUnits::cm;
-    m_acco_rmx23[16] = m_rec->getDouble("RMX23_16")*GeoModelKernelUnits::cm;
-    m_acco_rmx23[17] = m_rec->getDouble("RMX23_17")*GeoModelKernelUnits::cm;
-    m_acco_rmx23[18] = m_rec->getDouble("RMX23_18")*GeoModelKernelUnits::cm;
-    m_acco_rmx23[19] = m_rec->getDouble("RMX23_19")*GeoModelKernelUnits::cm;
-    m_acco_rmx23[20] = m_rec->getDouble("RMX23_20")*GeoModelKernelUnits::cm;
-    m_acco_rmx23[21] = m_rec->getDouble("RMX23_21")*GeoModelKernelUnits::cm;
-    m_acco_rmx23[22] = m_rec->getDouble("RMX23_22")*GeoModelKernelUnits::cm;
-    m_acco_rmx23[23] = m_rec->getDouble("RMX23_23")*GeoModelKernelUnits::cm;
-    m_acco_rmx23[24] = m_rec->getDouble("RMX23_24")*GeoModelKernelUnits::cm;
-    m_acco_rmx23[25] = m_rec->getDouble("RMX23_25")*GeoModelKernelUnits::cm;
-    m_acco_rmx23[26] = m_rec->getDouble("RMX23_26")*GeoModelKernelUnits::cm;
-    m_acco_rmx23[27] = m_rec->getDouble("RMX23_27")*GeoModelKernelUnits::cm;
-    m_acco_rmx23[28] = m_rec->getDouble("RMX23_28")*GeoModelKernelUnits::cm;
-    m_acco_rmx23[29] = m_rec->getDouble("RMX23_29")*GeoModelKernelUnits::cm;
-    m_acco_rmx23[30] = m_rec->getDouble("RMX23_30")*GeoModelKernelUnits::cm;
-    m_acco_rmx23[31] = m_rec->getDouble("RMX23_31")*GeoModelKernelUnits::cm;
-    m_acco_rmx23[32] = m_rec->getDouble("RMX23_32")*GeoModelKernelUnits::cm;
-    m_acco_rmx23[33] = m_rec->getDouble("RMX23_33")*GeoModelKernelUnits::cm;
-    m_acco_rmx23[34] = m_rec->getDouble("RMX23_34")*GeoModelKernelUnits::cm;
-    m_acco_rmx23[35] = m_rec->getDouble("RMX23_35")*GeoModelKernelUnits::cm;
-    m_acco_rmx23[36] = m_rec->getDouble("RMX23_36")*GeoModelKernelUnits::cm;
-    m_acco_rmx23[37] = m_rec->getDouble("RMX23_37")*GeoModelKernelUnits::cm;
-    m_acco_rmx23[38] = m_rec->getDouble("RMX23_38")*GeoModelKernelUnits::cm;
-    m_acco_rmx23[39] = m_rec->getDouble("RMX23_39")*GeoModelKernelUnits::cm;
-    m_acco_rmx23[40] = m_rec->getDouble("RMX23_40")*GeoModelKernelUnits::cm;
-    m_acco_rmx23[41] = m_rec->getDouble("RMX23_41")*GeoModelKernelUnits::cm;
-    m_acco_rmx23[42] = m_rec->getDouble("RMX23_42")*GeoModelKernelUnits::cm;
-    m_acco_rmx23[43] = m_rec->getDouble("RMX23_43")*GeoModelKernelUnits::cm;
-    m_acco_rmx23[44] = m_rec->getDouble("RMX23_44")*GeoModelKernelUnits::cm;
-    m_acco_rmx23[45] = m_rec->getDouble("RMX23_45")*GeoModelKernelUnits::cm;
-    m_acco_rmx23[46] = m_rec->getDouble("RMX23_46")*GeoModelKernelUnits::cm;
-    m_acco_rmx23[47] = m_rec->getDouble("RMX23_47")*GeoModelKernelUnits::cm;
-    m_acco_rmx23[48] = m_rec->getDouble("RMX23_48")*GeoModelKernelUnits::cm;
-    m_acco_rmx23[49] = m_rec->getDouble("RMX23_49")*GeoModelKernelUnits::cm;
-    m_acco_rmx23[50] = m_rec->getDouble("RMX23_50")*GeoModelKernelUnits::cm;
-    m_acco_rmx23[51] = m_rec->getDouble("RMX23_51")*GeoModelKernelUnits::cm;
-    m_acco_rmx23[52] = m_rec->getDouble("RMX23_52")*GeoModelKernelUnits::cm;
+    m_acco_rmx23[0] = m_rec->getDouble("RMX23_0")*Gaudi::Units::cm;
+    m_acco_rmx23[1] = m_rec->getDouble("RMX23_1")*Gaudi::Units::cm;
+    m_acco_rmx23[2] = m_rec->getDouble("RMX23_2")*Gaudi::Units::cm;
+    m_acco_rmx23[3] = m_rec->getDouble("RMX23_3")*Gaudi::Units::cm;
+    m_acco_rmx23[4] = m_rec->getDouble("RMX23_4")*Gaudi::Units::cm;
+    m_acco_rmx23[5] = m_rec->getDouble("RMX23_5")*Gaudi::Units::cm;
+    m_acco_rmx23[6] = m_rec->getDouble("RMX23_6")*Gaudi::Units::cm;
+    m_acco_rmx23[7] = m_rec->getDouble("RMX23_7")*Gaudi::Units::cm;
+    m_acco_rmx23[8] = m_rec->getDouble("RMX23_8")*Gaudi::Units::cm;
+    m_acco_rmx23[9] = m_rec->getDouble("RMX23_9")*Gaudi::Units::cm;
+    m_acco_rmx23[10] = m_rec->getDouble("RMX23_10")*Gaudi::Units::cm;
+    m_acco_rmx23[11] = m_rec->getDouble("RMX23_11")*Gaudi::Units::cm;
+    m_acco_rmx23[12] = m_rec->getDouble("RMX23_12")*Gaudi::Units::cm;
+    m_acco_rmx23[13] = m_rec->getDouble("RMX23_13")*Gaudi::Units::cm;
+    m_acco_rmx23[14] = m_rec->getDouble("RMX23_14")*Gaudi::Units::cm;
+    m_acco_rmx23[15] = m_rec->getDouble("RMX23_15")*Gaudi::Units::cm;
+    m_acco_rmx23[16] = m_rec->getDouble("RMX23_16")*Gaudi::Units::cm;
+    m_acco_rmx23[17] = m_rec->getDouble("RMX23_17")*Gaudi::Units::cm;
+    m_acco_rmx23[18] = m_rec->getDouble("RMX23_18")*Gaudi::Units::cm;
+    m_acco_rmx23[19] = m_rec->getDouble("RMX23_19")*Gaudi::Units::cm;
+    m_acco_rmx23[20] = m_rec->getDouble("RMX23_20")*Gaudi::Units::cm;
+    m_acco_rmx23[21] = m_rec->getDouble("RMX23_21")*Gaudi::Units::cm;
+    m_acco_rmx23[22] = m_rec->getDouble("RMX23_22")*Gaudi::Units::cm;
+    m_acco_rmx23[23] = m_rec->getDouble("RMX23_23")*Gaudi::Units::cm;
+    m_acco_rmx23[24] = m_rec->getDouble("RMX23_24")*Gaudi::Units::cm;
+    m_acco_rmx23[25] = m_rec->getDouble("RMX23_25")*Gaudi::Units::cm;
+    m_acco_rmx23[26] = m_rec->getDouble("RMX23_26")*Gaudi::Units::cm;
+    m_acco_rmx23[27] = m_rec->getDouble("RMX23_27")*Gaudi::Units::cm;
+    m_acco_rmx23[28] = m_rec->getDouble("RMX23_28")*Gaudi::Units::cm;
+    m_acco_rmx23[29] = m_rec->getDouble("RMX23_29")*Gaudi::Units::cm;
+    m_acco_rmx23[30] = m_rec->getDouble("RMX23_30")*Gaudi::Units::cm;
+    m_acco_rmx23[31] = m_rec->getDouble("RMX23_31")*Gaudi::Units::cm;
+    m_acco_rmx23[32] = m_rec->getDouble("RMX23_32")*Gaudi::Units::cm;
+    m_acco_rmx23[33] = m_rec->getDouble("RMX23_33")*Gaudi::Units::cm;
+    m_acco_rmx23[34] = m_rec->getDouble("RMX23_34")*Gaudi::Units::cm;
+    m_acco_rmx23[35] = m_rec->getDouble("RMX23_35")*Gaudi::Units::cm;
+    m_acco_rmx23[36] = m_rec->getDouble("RMX23_36")*Gaudi::Units::cm;
+    m_acco_rmx23[37] = m_rec->getDouble("RMX23_37")*Gaudi::Units::cm;
+    m_acco_rmx23[38] = m_rec->getDouble("RMX23_38")*Gaudi::Units::cm;
+    m_acco_rmx23[39] = m_rec->getDouble("RMX23_39")*Gaudi::Units::cm;
+    m_acco_rmx23[40] = m_rec->getDouble("RMX23_40")*Gaudi::Units::cm;
+    m_acco_rmx23[41] = m_rec->getDouble("RMX23_41")*Gaudi::Units::cm;
+    m_acco_rmx23[42] = m_rec->getDouble("RMX23_42")*Gaudi::Units::cm;
+    m_acco_rmx23[43] = m_rec->getDouble("RMX23_43")*Gaudi::Units::cm;
+    m_acco_rmx23[44] = m_rec->getDouble("RMX23_44")*Gaudi::Units::cm;
+    m_acco_rmx23[45] = m_rec->getDouble("RMX23_45")*Gaudi::Units::cm;
+    m_acco_rmx23[46] = m_rec->getDouble("RMX23_46")*Gaudi::Units::cm;
+    m_acco_rmx23[47] = m_rec->getDouble("RMX23_47")*Gaudi::Units::cm;
+    m_acco_rmx23[48] = m_rec->getDouble("RMX23_48")*Gaudi::Units::cm;
+    m_acco_rmx23[49] = m_rec->getDouble("RMX23_49")*Gaudi::Units::cm;
+    m_acco_rmx23[50] = m_rec->getDouble("RMX23_50")*Gaudi::Units::cm;
+    m_acco_rmx23[51] = m_rec->getDouble("RMX23_51")*Gaudi::Units::cm;
+    m_acco_rmx23[52] = m_rec->getDouble("RMX23_52")*Gaudi::Units::cm;
   }
 
   // ENDG
-  // m_endg_zorig = 369.1*GeoModelKernelUnits::cm; // this is the NOVA/Oracle number
-  // m_emb_iwout = 422.7*GeoModelKernelUnits::cm;  // 369.1*GeoModelKernelUnits::cm + 53.6*GeoModelKernelUnits::cm is the end of the active part
-  // m_emec_out = 422.7*GeoModelKernelUnits::cm;  // 369.1*GeoModelKernelUnits::cm + 53.6*GeoModelKernelUnits::cm is the end of the active part
+  // m_endg_zorig = 369.1*Gaudi::Units::cm; // this is the NOVA/Oracle number
+  // m_emb_iwout = 422.7*Gaudi::Units::cm;  // 369.1*Gaudi::Units::cm + 53.6*Gaudi::Units::cm is the end of the active part
+  // m_emec_out = 422.7*Gaudi::Units::cm;  // 369.1*Gaudi::Units::cm + 53.6*Gaudi::Units::cm is the end of the active part
   m_lar = m_iAccessSvc->getRecordsetPtr("EmecGeometry",m_tag,m_node);
   if (m_lar->size()) {
     m_rec = (*m_lar)[0];
-    m_endg_zorig = m_rec->getDouble("Z1")*GeoModelKernelUnits::cm;
-    double epaisseurTotale =  m_rec->getDouble("ETOT")*GeoModelKernelUnits::cm;
+    m_endg_zorig = m_rec->getDouble("Z1")*Gaudi::Units::cm;
+    double epaisseurTotale =  m_rec->getDouble("ETOT")*Gaudi::Units::cm;
     m_emb_iwout = m_endg_zorig + epaisseurTotale;
     m_emec_out  = m_endg_zorig + epaisseurTotale;
 
   } 
 
   // Cryostat
-  // m_emec_psin = 362.5*GeoModelKernelUnits::cm; // notch in cold wall of cryostat
+  // m_emec_psin = 362.5*Gaudi::Units::cm; // notch in cold wall of cryostat
   if ( m_geometry == "Atlas" ) {
     DecodeVersionKey detectorKeyAtl = DecodeVersionKey(m_geoModelSvc, "ATLAS");
     m_lar = m_iAccessSvc->getRecordsetPtr("PresamplerPosition",detectorKeyAtl.tag(),detectorKeyAtl.node());
@@ -652,74 +652,74 @@ LArNumberHelper::db_nb_em()
   }
   if (m_lar->size()) {
     m_rec = (*m_lar)[0];
-    m_emec_psin = m_rec->getDouble("ZPOS")*GeoModelKernelUnits::cm;
+    m_emec_psin = m_rec->getDouble("ZPOS")*Gaudi::Units::cm;
   } 
 
   // ESEP
   m_esep_iw23.resize(7, (double) 0.); 
-  // m_esep_iw23[0] = 413.934*GeoModelKernelUnits::cm;
-  // m_esep_iw23[1] = 412.518*GeoModelKernelUnits::cm;
-  // m_esep_iw23[2] = 411.792*GeoModelKernelUnits::cm;
-  // m_esep_iw23[3] = 409.545*GeoModelKernelUnits::cm;
-  // m_esep_iw23[4] = 407.987*GeoModelKernelUnits::cm;
-  // m_esep_iw23[5] = 407.510*GeoModelKernelUnits::cm;
-  // m_esep_iw23[6] = 404.730*GeoModelKernelUnits::cm;
+  // m_esep_iw23[0] = 413.934*Gaudi::Units::cm;
+  // m_esep_iw23[1] = 412.518*Gaudi::Units::cm;
+  // m_esep_iw23[2] = 411.792*Gaudi::Units::cm;
+  // m_esep_iw23[3] = 409.545*Gaudi::Units::cm;
+  // m_esep_iw23[4] = 407.987*Gaudi::Units::cm;
+  // m_esep_iw23[5] = 407.510*Gaudi::Units::cm;
+  // m_esep_iw23[6] = 404.730*Gaudi::Units::cm;
   //  ----> overwritten
   m_lar = m_iAccessSvc->getRecordsetPtr("EmecSamplingSep",m_tag,m_node);
   if (m_lar->size()) {
     m_rec = (*m_lar)[0];  
-    m_esep_iw23[0] = m_rec->getDouble("ZIW_0")*GeoModelKernelUnits::cm;
-    m_esep_iw23[1] = m_rec->getDouble("ZIW_1")*GeoModelKernelUnits::cm;
-    m_esep_iw23[2] = m_rec->getDouble("ZIW_2")*GeoModelKernelUnits::cm;
-    m_esep_iw23[3] = m_rec->getDouble("ZIW_3")*GeoModelKernelUnits::cm;
-    m_esep_iw23[4] = m_rec->getDouble("ZIW_4")*GeoModelKernelUnits::cm;
-    m_esep_iw23[5] = m_rec->getDouble("ZIW_5")*GeoModelKernelUnits::cm;
-    m_esep_iw23[6] = m_rec->getDouble("ZIW_6")*GeoModelKernelUnits::cm;
+    m_esep_iw23[0] = m_rec->getDouble("ZIW_0")*Gaudi::Units::cm;
+    m_esep_iw23[1] = m_rec->getDouble("ZIW_1")*Gaudi::Units::cm;
+    m_esep_iw23[2] = m_rec->getDouble("ZIW_2")*Gaudi::Units::cm;
+    m_esep_iw23[3] = m_rec->getDouble("ZIW_3")*Gaudi::Units::cm;
+    m_esep_iw23[4] = m_rec->getDouble("ZIW_4")*Gaudi::Units::cm;
+    m_esep_iw23[5] = m_rec->getDouble("ZIW_5")*Gaudi::Units::cm;
+    m_esep_iw23[6] = m_rec->getDouble("ZIW_6")*Gaudi::Units::cm;
 }
 
-  // m_esep_zsep12 = 378.398*GeoModelKernelUnits::cm;   
+  // m_esep_zsep12 = 378.398*Gaudi::Units::cm;   
   // Note that in the gometryDB this is an array, but
   // of very similar numbers -> Zebra was using 1rst value only
   //  ----> overwritten
   m_lar = m_iAccessSvc->getRecordsetPtr("EmecSamplingSep",m_tag,m_node);
   if (m_lar->size()) {
     m_rec = (*m_lar)[0];  
-    m_esep_zsep12 = m_rec->getDouble("ZSEP12_0")*GeoModelKernelUnits::cm;
+    m_esep_zsep12 = m_rec->getDouble("ZSEP12_0")*Gaudi::Units::cm;
   }
 
   m_esep_zsep23.resize(22, (double) 0.); 
   /*
-  m_esep_zsep23 [0] = 999.999*GeoModelKernelUnits::cm;       // inheritance from Zebra.
-  m_esep_zsep23 [1] = 999.999*GeoModelKernelUnits::cm;       // will be skipped in hard_em
-  m_esep_zsep23 [2] = 413.205*GeoModelKernelUnits::cm;   ... up to :
-  m_esep_zsep23 [21] = 401.153*GeoModelKernelUnits::cm;
+  m_esep_zsep23 [0] = 999.999*Gaudi::Units::cm;       // inheritance from Zebra.
+  m_esep_zsep23 [1] = 999.999*Gaudi::Units::cm;       // will be skipped in hard_em
+  m_esep_zsep23 [2] = 413.205*Gaudi::Units::cm;   ... up to :
+  m_esep_zsep23 [21] = 401.153*Gaudi::Units::cm;
   */
   //  ----> overwritten
   m_lar = m_iAccessSvc->getRecordsetPtr("EmecSamplingSep",m_tag,m_node);
   if (m_lar->size()) {
     m_rec = (*m_lar)[0];  
-    m_esep_zsep23 [0] = m_rec->getDouble("ZSEP23_0")*GeoModelKernelUnits::cm;
-    m_esep_zsep23 [1] = m_rec->getDouble("ZSEP23_1")*GeoModelKernelUnits::cm;
-    m_esep_zsep23 [2] = m_rec->getDouble("ZSEP23_2")*GeoModelKernelUnits::cm;
-    m_esep_zsep23 [3] = m_rec->getDouble("ZSEP23_3")*GeoModelKernelUnits::cm;
-    m_esep_zsep23 [4] = m_rec->getDouble("ZSEP23_4")*GeoModelKernelUnits::cm;
-    m_esep_zsep23 [5] = m_rec->getDouble("ZSEP23_5")*GeoModelKernelUnits::cm;
-    m_esep_zsep23 [6] = m_rec->getDouble("ZSEP23_6")*GeoModelKernelUnits::cm;
-    m_esep_zsep23 [7] = m_rec->getDouble("ZSEP23_7")*GeoModelKernelUnits::cm;
-    m_esep_zsep23 [8] = m_rec->getDouble("ZSEP23_8")*GeoModelKernelUnits::cm;
-    m_esep_zsep23 [9] = m_rec->getDouble("ZSEP23_9")*GeoModelKernelUnits::cm;
-    m_esep_zsep23 [10] = m_rec->getDouble("ZSEP23_10")*GeoModelKernelUnits::cm;
-    m_esep_zsep23 [11] = m_rec->getDouble("ZSEP23_11")*GeoModelKernelUnits::cm;
-    m_esep_zsep23 [12] = m_rec->getDouble("ZSEP23_12")*GeoModelKernelUnits::cm;
-    m_esep_zsep23 [13] = m_rec->getDouble("ZSEP23_13")*GeoModelKernelUnits::cm;
-    m_esep_zsep23 [14] = m_rec->getDouble("ZSEP23_14")*GeoModelKernelUnits::cm;
-    m_esep_zsep23 [15] = m_rec->getDouble("ZSEP23_15")*GeoModelKernelUnits::cm;
-    m_esep_zsep23 [16] = m_rec->getDouble("ZSEP23_16")*GeoModelKernelUnits::cm;
-    m_esep_zsep23 [17] = m_rec->getDouble("ZSEP23_17")*GeoModelKernelUnits::cm;
-    m_esep_zsep23 [18] = m_rec->getDouble("ZSEP23_18")*GeoModelKernelUnits::cm;
-    m_esep_zsep23 [19] = m_rec->getDouble("ZSEP23_19")*GeoModelKernelUnits::cm;
-    m_esep_zsep23 [20] = m_rec->getDouble("ZSEP23_20")*GeoModelKernelUnits::cm;
-    m_esep_zsep23 [21] = m_rec->getDouble("ZSEP23_21")*GeoModelKernelUnits::cm;
+    m_esep_zsep23 [0] = m_rec->getDouble("ZSEP23_0")*Gaudi::Units::cm;
+    m_esep_zsep23 [1] = m_rec->getDouble("ZSEP23_1")*Gaudi::Units::cm;
+    m_esep_zsep23 [2] = m_rec->getDouble("ZSEP23_2")*Gaudi::Units::cm;
+    m_esep_zsep23 [3] = m_rec->getDouble("ZSEP23_3")*Gaudi::Units::cm;
+    m_esep_zsep23 [4] = m_rec->getDouble("ZSEP23_4")*Gaudi::Units::cm;
+    m_esep_zsep23 [5] = m_rec->getDouble("ZSEP23_5")*Gaudi::Units::cm;
+    m_esep_zsep23 [6] = m_rec->getDouble("ZSEP23_6")*Gaudi::Units::cm;
+    m_esep_zsep23 [7] = m_rec->getDouble("ZSEP23_7")*Gaudi::Units::cm;
+    m_esep_zsep23 [8] = m_rec->getDouble("ZSEP23_8")*Gaudi::Units::cm;
+    m_esep_zsep23 [9] = m_rec->getDouble("ZSEP23_9")*Gaudi::Units::cm;
+    m_esep_zsep23 [10] = m_rec->getDouble("ZSEP23_10")*Gaudi::Units::cm;
+    m_esep_zsep23 [11] = m_rec->getDouble("ZSEP23_11")*Gaudi::Units::cm;
+    m_esep_zsep23 [12] = m_rec->getDouble("ZSEP23_12")*Gaudi::Units::cm;
+    m_esep_zsep23 [13] = m_rec->getDouble("ZSEP23_13")*Gaudi::Units::cm;
+    m_esep_zsep23 [14] = m_rec->getDouble("ZSEP23_14")*Gaudi::Units::cm;
+    m_esep_zsep23 [15] = m_rec->getDouble("ZSEP23_15")*Gaudi::Units::cm;
+    m_esep_zsep23 [16] = m_rec->getDouble("ZSEP23_16")*Gaudi::Units::cm;
+    m_esep_zsep23 [17] = m_rec->getDouble("ZSEP23_17")*Gaudi::Units::cm;
+    m_esep_zsep23 [18] = m_rec->getDouble("ZSEP23_18")*Gaudi::Units::cm;
+    m_esep_zsep23 [19] = m_rec->getDouble("ZSEP23_19")*Gaudi::Units::cm;
+    m_esep_zsep23 [20] = m_rec->getDouble("ZSEP23_20")*Gaudi::Units::cm;
+    m_esep_zsep23 [21] = m_rec->getDouble("ZSEP23_21")*Gaudi::Units::cm;
   }
 
 }
@@ -730,17 +730,17 @@ LArNumberHelper::db_nb_hec()
   
   // ---- Set default :
   /*  
-  m_hec_in0 = 427.70*GeoModelKernelUnits::cm;  // z_start
-  m_hec_in1 = 455.75*GeoModelKernelUnits::cm;  // z_start+ 28.05*GeoModelKernelUnits::cm
-  m_hec_in2 = 513.40*GeoModelKernelUnits::cm;  // z_start + 28.05*GeoModelKernelUnits::cm + 26.8*GeoModelKernelUnits::cm + 26.8*GeoModelKernelUnits::cm + 4.05*GeoModelKernelUnits::cm
-  m_hec_in3 = 562.70*GeoModelKernelUnits::cm;  // z_start + 28.05*GeoModelKernelUnits::cm + 26.8*GeoModelKernelUnits::cm + 26.8*GeoModelKernelUnits::cm + 4.05*GeoModelKernelUnits::cm 
-                          //        + 25.9*GeoModelKernelUnits::cm + 23.4*GeoModelKernelUnits::cm
-  m_hec_gap = 4.05*GeoModelKernelUnits::cm;    // gap between the two HEC wheels  
+  m_hec_in0 = 427.70*Gaudi::Units::cm;  // z_start
+  m_hec_in1 = 455.75*Gaudi::Units::cm;  // z_start+ 28.05*Gaudi::Units::cm
+  m_hec_in2 = 513.40*Gaudi::Units::cm;  // z_start + 28.05*Gaudi::Units::cm + 26.8*Gaudi::Units::cm + 26.8*Gaudi::Units::cm + 4.05*Gaudi::Units::cm
+  m_hec_in3 = 562.70*Gaudi::Units::cm;  // z_start + 28.05*Gaudi::Units::cm + 26.8*Gaudi::Units::cm + 26.8*Gaudi::Units::cm + 4.05*Gaudi::Units::cm 
+                          //        + 25.9*Gaudi::Units::cm + 23.4*Gaudi::Units::cm
+  m_hec_gap = 4.05*Gaudi::Units::cm;    // gap between the two HEC wheels  
   
   // Comment from Sven Menke :
   // I don't know why the the Nova Z_end is 2.5cm more, but the active
   // volume must be the sum of all blocks plus the gap - thus it's 609.5*cm
-  m_hec_out = 609.5*GeoModelKernelUnits::cm;  // z_end - 2.5*GeoModelKernelUnits::cm (or z_orig + all blocks)
+  m_hec_out = 609.5*Gaudi::Units::cm;  // z_end - 2.5*Gaudi::Units::cm (or z_orig + all blocks)
   */
 
   //std::cout << " ----- in db_nb_hec tags are : " << m_tag << " " << m_node << std::endl;
@@ -757,31 +757,31 @@ LArNumberHelper::db_nb_hec()
     // Block0 = 1.25 cm Front Plate + 
     //          8 times (0.85 cm LAr gap + 2.50 cm Plate) = 28.05 cm 
     double Block0 = ( m_rec->getDouble("PLATE_0")/2. 
-		      + 8*(m_rec->getDouble("LARG") + m_rec->getDouble("PLATE_0")))*GeoModelKernelUnits::cm;
+		      + 8*(m_rec->getDouble("LARG") + m_rec->getDouble("PLATE_0")))*Gaudi::Units::cm;
     
     // HEC1 is Block1 + Block2
     // Block1 = 8 times (0.85 cm LAr gap + 2.50 cm Plate) 
     //         = 26.80 cm
-    double Block1 = 8*(m_rec->getDouble("LARG") + m_rec->getDouble("PLATE_0"))*GeoModelKernelUnits::cm;
+    double Block1 = 8*(m_rec->getDouble("LARG") + m_rec->getDouble("PLATE_0"))*Gaudi::Units::cm;
     double Block2 = Block1 ;
 
     // Gap     = 4.05 cm
-    m_hec_gap = m_rec->getDouble("GAPWHL") *GeoModelKernelUnits::cm;
+    m_hec_gap = m_rec->getDouble("GAPWHL") *Gaudi::Units::cm;
     
     // HEC2 is  Block 3 + Block 4
     // Block3 = 2.5 cm Front Plate + 
     //      4 times (0.85 cm LAr gap + 5.00 cm Plate) = 25.90 cm 
     double Block3 =  ( m_rec->getDouble("PLATE_1")/2. 
-		       + 4*(m_rec->getDouble("LARG") + m_rec->getDouble("PLATE_1")))*GeoModelKernelUnits::cm;
+		       + 4*(m_rec->getDouble("LARG") + m_rec->getDouble("PLATE_1")))*Gaudi::Units::cm;
     
     // Block4 = 4 times (0.85 cm LAr gap + 5.00 cm Plate) = 23.40 cm 
-    double Block4 = 4*(m_rec->getDouble("LARG") + m_rec->getDouble("PLATE_1"))*GeoModelKernelUnits::cm;
+    double Block4 = 4*(m_rec->getDouble("LARG") + m_rec->getDouble("PLATE_1"))*Gaudi::Units::cm;
     
     // HEC3 is  Block 5 + Block 6
     double Block5 = Block4 ;
     double Block6 = Block4;
     
-    double zstart =  m_rec->getDouble("ZSTART") *GeoModelKernelUnits::cm;
+    double zstart =  m_rec->getDouble("ZSTART") *Gaudi::Units::cm;
     
     m_hec_in0 = zstart;
     m_hec_in1 = m_hec_in0 + Block0  ;
@@ -1056,10 +1056,10 @@ LArNumberHelper::hard_fcal()
 
   // x and y are taken from drawings in the TDR
   for ( unsigned int i=0; i < m_fcal_id->module_hash_max(); i++ ) {
-    m_x_min_fcal [i] = 8.6*GeoModelKernelUnits::cm;
-    m_x_max_fcal [i] = 47.5*GeoModelKernelUnits::cm;
+    m_x_min_fcal [i] = 8.6*Gaudi::Units::cm;
+    m_x_max_fcal [i] = 47.5*Gaudi::Units::cm;
     m_y_min_fcal [i] = 8.6;
-    m_y_max_fcal [i] = 47.5*GeoModelKernelUnits::cm;
+    m_y_max_fcal [i] = 47.5*Gaudi::Units::cm;
     m_phi_min_fcal[i] = 0.;
     m_phi_max_fcal[i] = 6.28;   // when too close to 2pi pb
 
@@ -1069,35 +1069,35 @@ LArNumberHelper::hard_fcal()
     //int pos_neg = m_fcal_id->pos_neg (m_region_id_fcal[i]);
     
     if ( mod == 1 ) {
-      m_dx_fcal [i] = 3.*GeoModelKernelUnits::cm;
-      m_dy_fcal [i] = 2.598*GeoModelKernelUnits::cm;
-      z_loc_in [0] = 466.85*GeoModelKernelUnits::cm;
-      z_loc_out [0] = z_loc_in [0]+45.*GeoModelKernelUnits::cm;
+      m_dx_fcal [i] = 3.*Gaudi::Units::cm;
+      m_dy_fcal [i] = 2.598*Gaudi::Units::cm;
+      z_loc_in [0] = 466.85*Gaudi::Units::cm;
+      z_loc_out [0] = z_loc_in [0]+45.*Gaudi::Units::cm;
 
     }
     else if ( mod == 2 ) {
-      m_dx_fcal [i] = 3.272*GeoModelKernelUnits::cm;
-      m_dy_fcal [i] = 4.25*GeoModelKernelUnits::cm;
-      z_loc_in [0] = 512.3*GeoModelKernelUnits::cm;
-      z_loc_out [0] = z_loc_in [0]+45.*GeoModelKernelUnits::cm;
+      m_dx_fcal [i] = 3.272*Gaudi::Units::cm;
+      m_dy_fcal [i] = 4.25*Gaudi::Units::cm;
+      z_loc_in [0] = 512.3*Gaudi::Units::cm;
+      z_loc_out [0] = z_loc_in [0]+45.*Gaudi::Units::cm;
 
     }
     else if ( mod == 3 ) {
-      m_dx_fcal [i] = 5.4*GeoModelKernelUnits::cm;
-      m_dy_fcal [i] = 4.677*GeoModelKernelUnits::cm;
-      z_loc_in [0] = 559.75*GeoModelKernelUnits::cm;
-      z_loc_out [0] = z_loc_in [0]+45.*GeoModelKernelUnits::cm;
+      m_dx_fcal [i] = 5.4*Gaudi::Units::cm;
+      m_dy_fcal [i] = 4.677*Gaudi::Units::cm;
+      z_loc_in [0] = 559.75*Gaudi::Units::cm;
+      z_loc_out [0] = z_loc_in [0]+45.*Gaudi::Units::cm;
 
     }
     else  {
       m_dx_fcal [i] = 0.;
       m_dy_fcal [i] = 0.;
       z_loc_in [0] = 0.;
-      z_loc_out [0] = z_loc_in [0]+45.*GeoModelKernelUnits::cm;
+      z_loc_out [0] = z_loc_in [0]+45.*Gaudi::Units::cm;
     }
 
     m_z_min_fcal [i] = z_loc_in [0];
-    m_z_max_fcal [i] = m_z_min_fcal [i] + 45.*GeoModelKernelUnits::cm ;
+    m_z_max_fcal [i] = m_z_min_fcal [i] + 45.*Gaudi::Units::cm ;
 
     double z = m_z_min_fcal [i];
     double r = m_x_max_fcal [i];
@@ -1124,21 +1124,21 @@ LArNumberHelper::sagging_param( std::vector<double>& Rhocen, std::vector<double>
   if (m_lar->size()) {
     m_rec = (*m_lar)[0];
 
-    Rhocen.push_back(m_rec->getDouble("RHOCEN_0")*GeoModelKernelUnits::cm);
-    Rhocen.push_back(m_rec->getDouble("RHOCEN_1")*GeoModelKernelUnits::cm);
-    Rhocen.push_back(m_rec->getDouble("RHOCEN_2")*GeoModelKernelUnits::cm);
-    Rhocen.push_back(m_rec->getDouble("RHOCEN_3")*GeoModelKernelUnits::cm);
-    Rhocen.push_back(m_rec->getDouble("RHOCEN_4")*GeoModelKernelUnits::cm);
-    Rhocen.push_back(m_rec->getDouble("RHOCEN_5")*GeoModelKernelUnits::cm);
-    Rhocen.push_back(m_rec->getDouble("RHOCEN_6")*GeoModelKernelUnits::cm);
-    Rhocen.push_back(m_rec->getDouble("RHOCEN_7")*GeoModelKernelUnits::cm);
-    Rhocen.push_back(m_rec->getDouble("RHOCEN_8")*GeoModelKernelUnits::cm);
-    Rhocen.push_back(m_rec->getDouble("RHOCEN_9")*GeoModelKernelUnits::cm);
-    Rhocen.push_back(m_rec->getDouble("RHOCEN_10")*GeoModelKernelUnits::cm);
-    Rhocen.push_back(m_rec->getDouble("RHOCEN_11")*GeoModelKernelUnits::cm);
-    Rhocen.push_back(m_rec->getDouble("RHOCEN_12")*GeoModelKernelUnits::cm);
-    Rhocen.push_back(m_rec->getDouble("RHOCEN_13")*GeoModelKernelUnits::cm);
-    Rhocen.push_back(m_rec->getDouble("RHOCEN_14")*GeoModelKernelUnits::cm);
+    Rhocen.push_back(m_rec->getDouble("RHOCEN_0")*Gaudi::Units::cm);
+    Rhocen.push_back(m_rec->getDouble("RHOCEN_1")*Gaudi::Units::cm);
+    Rhocen.push_back(m_rec->getDouble("RHOCEN_2")*Gaudi::Units::cm);
+    Rhocen.push_back(m_rec->getDouble("RHOCEN_3")*Gaudi::Units::cm);
+    Rhocen.push_back(m_rec->getDouble("RHOCEN_4")*Gaudi::Units::cm);
+    Rhocen.push_back(m_rec->getDouble("RHOCEN_5")*Gaudi::Units::cm);
+    Rhocen.push_back(m_rec->getDouble("RHOCEN_6")*Gaudi::Units::cm);
+    Rhocen.push_back(m_rec->getDouble("RHOCEN_7")*Gaudi::Units::cm);
+    Rhocen.push_back(m_rec->getDouble("RHOCEN_8")*Gaudi::Units::cm);
+    Rhocen.push_back(m_rec->getDouble("RHOCEN_9")*Gaudi::Units::cm);
+    Rhocen.push_back(m_rec->getDouble("RHOCEN_10")*Gaudi::Units::cm);
+    Rhocen.push_back(m_rec->getDouble("RHOCEN_11")*Gaudi::Units::cm);
+    Rhocen.push_back(m_rec->getDouble("RHOCEN_12")*Gaudi::Units::cm);
+    Rhocen.push_back(m_rec->getDouble("RHOCEN_13")*Gaudi::Units::cm);
+    Rhocen.push_back(m_rec->getDouble("RHOCEN_14")*Gaudi::Units::cm);
   }
  
   m_lar = m_iAccessSvc->getRecordsetPtr("BarrelSagging",m_tag,m_node);
@@ -1146,21 +1146,21 @@ LArNumberHelper::sagging_param( std::vector<double>& Rhocen, std::vector<double>
   if (m_lar->size()) {
     m_rec = (*m_lar)[0];
 
-    Sag.push_back(m_rec->getDouble("SAG_0")*GeoModelKernelUnits::cm);
-    Sag.push_back(m_rec->getDouble("SAG_1")*GeoModelKernelUnits::cm);
-    Sag.push_back(m_rec->getDouble("SAG_2")*GeoModelKernelUnits::cm);
-    Sag.push_back(m_rec->getDouble("SAG_3")*GeoModelKernelUnits::cm);
-    Sag.push_back(m_rec->getDouble("SAG_4")*GeoModelKernelUnits::cm);
-    Sag.push_back(m_rec->getDouble("SAG_5")*GeoModelKernelUnits::cm);
-    Sag.push_back(m_rec->getDouble("SAG_6")*GeoModelKernelUnits::cm);
-    Sag.push_back(m_rec->getDouble("SAG_7")*GeoModelKernelUnits::cm);
-    Sag.push_back(m_rec->getDouble("SAG_8")*GeoModelKernelUnits::cm);
-    Sag.push_back(m_rec->getDouble("SAG_9")*GeoModelKernelUnits::cm);
-    Sag.push_back(m_rec->getDouble("SAG_10")*GeoModelKernelUnits::cm);
-    Sag.push_back(m_rec->getDouble("SAG_11")*GeoModelKernelUnits::cm);
-    Sag.push_back(m_rec->getDouble("SAG_12")*GeoModelKernelUnits::cm);
-    Sag.push_back(m_rec->getDouble("SAG_13")*GeoModelKernelUnits::cm);
-    Sag.push_back(m_rec->getDouble("SAG_14")*GeoModelKernelUnits::cm);
+    Sag.push_back(m_rec->getDouble("SAG_0")*Gaudi::Units::cm);
+    Sag.push_back(m_rec->getDouble("SAG_1")*Gaudi::Units::cm);
+    Sag.push_back(m_rec->getDouble("SAG_2")*Gaudi::Units::cm);
+    Sag.push_back(m_rec->getDouble("SAG_3")*Gaudi::Units::cm);
+    Sag.push_back(m_rec->getDouble("SAG_4")*Gaudi::Units::cm);
+    Sag.push_back(m_rec->getDouble("SAG_5")*Gaudi::Units::cm);
+    Sag.push_back(m_rec->getDouble("SAG_6")*Gaudi::Units::cm);
+    Sag.push_back(m_rec->getDouble("SAG_7")*Gaudi::Units::cm);
+    Sag.push_back(m_rec->getDouble("SAG_8")*Gaudi::Units::cm);
+    Sag.push_back(m_rec->getDouble("SAG_9")*Gaudi::Units::cm);
+    Sag.push_back(m_rec->getDouble("SAG_10")*Gaudi::Units::cm);
+    Sag.push_back(m_rec->getDouble("SAG_11")*Gaudi::Units::cm);
+    Sag.push_back(m_rec->getDouble("SAG_12")*Gaudi::Units::cm);
+    Sag.push_back(m_rec->getDouble("SAG_13")*Gaudi::Units::cm);
+    Sag.push_back(m_rec->getDouble("SAG_14")*Gaudi::Units::cm);
 
   }
 
diff --git a/LArCalorimeter/LArDetDescr/src/LArRecoMaterialTool.cxx b/LArCalorimeter/LArDetDescr/src/LArRecoMaterialTool.cxx
index c2ce91bbfa0186359e50e138e096c90d80d2e852..94b6277869a7f5a098cd9d2179de8cd110afd784 100755
--- a/LArCalorimeter/LArDetDescr/src/LArRecoMaterialTool.cxx
+++ b/LArCalorimeter/LArDetDescr/src/LArRecoMaterialTool.cxx
@@ -20,6 +20,7 @@
 #include "GeoModelUtilities/StoredPhysVol.h"
 #include "GeoModelKernel/GeoFullPhysVol.h"
 #include "GeoModelKernel/Units.h"
+#include "GaudiKernel/SystemOfUnits.h"
 
 #include "CaloIdentifier/CaloIdManager.h"
 #include "CaloIdentifier/CaloCell_ID.h"
diff --git a/LArCalorimeter/LArDetDescr/src/LArRecoSimpleGeomTool.cxx b/LArCalorimeter/LArDetDescr/src/LArRecoSimpleGeomTool.cxx
index 7019b56fcf54085ca14c9febdc5e2fa79fe2c89a..7fd73c48e248926d1256a6a139620b3d5a40d9da 100755
--- a/LArCalorimeter/LArDetDescr/src/LArRecoSimpleGeomTool.cxx
+++ b/LArCalorimeter/LArDetDescr/src/LArRecoSimpleGeomTool.cxx
@@ -28,7 +28,7 @@
 #include "GeoModelUtilities/StoredPhysVol.h"
 #include "GeoModelKernel/GeoFullPhysVol.h"
 #include "GeoModelKernel/GeoDefinitions.h"
-#include "GeoModelKernel/Units.h"
+#include "GaudiKernel/SystemOfUnits.h"
 
 #include "GeoPrimitives/CLHEPtoEigenConverter.h"
 
@@ -170,17 +170,17 @@ LArRecoSimpleGeomTool::get_cylinder_surface (CaloSubdetNames::ALIGNVOL alvol,
     if (lar->size()<14) return false;
 
     const IRDBRecord* rec = (*lar)[11];
-    rad =  rec->getDouble("RMIN")*GeoModelKernelUnits::cm;
-    len =  rec->getDouble("DZ")*GeoModelKernelUnits::cm /2.;
-    dep =  rec->getDouble("DR")*GeoModelKernelUnits::cm;
+    rad =  rec->getDouble("RMIN")*Gaudi::Units::cm;
+    len =  rec->getDouble("DZ")*Gaudi::Units::cm /2.;
+    dep =  rec->getDouble("DR")*Gaudi::Units::cm;
     rec = (*lar)[12];
-    dep =  dep +rec->getDouble("DR")*GeoModelKernelUnits::cm;
+    dep =  dep +rec->getDouble("DR")*Gaudi::Units::cm;
     rec = (*lar)[13];
-    dep =  dep +rec->getDouble("DR")*GeoModelKernelUnits::cm;
+    dep =  dep +rec->getDouble("DR")*Gaudi::Units::cm;
 
-    //rad = 124.18*GeoModelKernelUnits::cm;
-    //dep = (.305 + 1.38 + .47 )*GeoModelKernelUnits::cm;
-    //len = 270.*GeoModelKernelUnits::cm;
+    //rad = 124.18*Gaudi::Units::cm;
+    //dep = (.305 + 1.38 + .47 )*Gaudi::Units::cm;
+    //len = 270.*Gaudi::Units::cm;
     
     radius.push_back( rad + dep/2.);
     depth.push_back( dep/2. );
@@ -197,13 +197,13 @@ LArRecoSimpleGeomTool::get_cylinder_surface (CaloSubdetNames::ALIGNVOL alvol,
 
     //  CryoMother nb 10
     const IRDBRecord* rec = (*lar)[10];
-    rad =  rec->getDouble("RMIN")*GeoModelKernelUnits::cm;
-    len =  rec->getDouble("DZ")*GeoModelKernelUnits::cm /2.;
-    dep =  rec->getDouble("DR")*GeoModelKernelUnits::cm;
+    rad =  rec->getDouble("RMIN")*Gaudi::Units::cm;
+    len =  rec->getDouble("DZ")*Gaudi::Units::cm /2.;
+    dep =  rec->getDouble("DR")*Gaudi::Units::cm;
 
-    //rad = 122.9*GeoModelKernelUnits::cm;
-    //dep = 1.28*GeoModelKernelUnits::cm;
-    //len = 270.*GeoModelKernelUnits::cm;
+    //rad = 122.9*Gaudi::Units::cm;
+    //dep = 1.28*Gaudi::Units::cm;
+    //len = 270.*Gaudi::Units::cm;
 
     radius.push_back( rad + dep/2. );
     depth.push_back( dep /2.);
@@ -211,13 +211,13 @@ LArRecoSimpleGeomTool::get_cylinder_surface (CaloSubdetNames::ALIGNVOL alvol,
 
     //  CryoMother nb 14
     rec = (*lar)[14];
-    rad =  rec->getDouble("RMIN")*GeoModelKernelUnits::cm;
-    len =  rec->getDouble("DZ")*GeoModelKernelUnits::cm /2.;
-    dep =  rec->getDouble("DR")*GeoModelKernelUnits::cm;
+    rad =  rec->getDouble("RMIN")*Gaudi::Units::cm;
+    len =  rec->getDouble("DZ")*Gaudi::Units::cm /2.;
+    dep =  rec->getDouble("DR")*Gaudi::Units::cm;
 
-    //rad = 126.335*GeoModelKernelUnits::cm;
-    //dep = 1.2*GeoModelKernelUnits::cm;
-    //len = 284.*GeoModelKernelUnits::cm;
+    //rad = 126.335*Gaudi::Units::cm;
+    //dep = 1.2*Gaudi::Units::cm;
+    //len = 284.*Gaudi::Units::cm;
 
     radius.push_back( rad  + dep/2.);
     depth.push_back( dep /2.);
@@ -225,13 +225,13 @@ LArRecoSimpleGeomTool::get_cylinder_surface (CaloSubdetNames::ALIGNVOL alvol,
 
     // CryoMother nb 0
     rec = (*lar)[0];
-    rad =  rec->getDouble("RMIN")*GeoModelKernelUnits::cm;
-    len =  rec->getDouble("DZ")*GeoModelKernelUnits::cm /2.;
-    dep =  rec->getDouble("DR")*GeoModelKernelUnits::cm;
+    rad =  rec->getDouble("RMIN")*Gaudi::Units::cm;
+    len =  rec->getDouble("DZ")*Gaudi::Units::cm /2.;
+    dep =  rec->getDouble("DR")*Gaudi::Units::cm;
 
     //rad = 2140*mm;
     //dep = 30*mm;
-    //len = 299.6*GeoModelKernelUnits::cm;
+    //len = 299.6*Gaudi::Units::cm;
 
     radius.push_back( rad + dep/2. );
     depth.push_back( dep /2.);
@@ -239,13 +239,13 @@ LArRecoSimpleGeomTool::get_cylinder_surface (CaloSubdetNames::ALIGNVOL alvol,
 
     //  CryoMother nb 5
     rec = (*lar)[5];
-    rad =  rec->getDouble("RMIN")*GeoModelKernelUnits::cm;
-    len =  rec->getDouble("DZ")*GeoModelKernelUnits::cm /2.;
-    dep =  rec->getDouble("DR")*GeoModelKernelUnits::cm;
+    rad =  rec->getDouble("RMIN")*Gaudi::Units::cm;
+    len =  rec->getDouble("DZ")*Gaudi::Units::cm /2.;
+    dep =  rec->getDouble("DR")*Gaudi::Units::cm;
 
     //rad = 2220*mm;
     //dep = 30*mm;
-    //len = 285*GeoModelKernelUnits::cm;
+    //len = 285*Gaudi::Units::cm;
 
     radius.push_back( rad + dep/2. );
     depth.push_back( dep /2.);
@@ -262,18 +262,18 @@ LArRecoSimpleGeomTool::get_cylinder_surface (CaloSubdetNames::ALIGNVOL alvol,
     if (lar->size()==0) return false;
     
     const IRDBRecord* rec = (*lar)[0];
-    rad =  rec->getDouble("RMIN")*GeoModelKernelUnits::cm;
-    dep =  rec->getDouble("RMAX")*GeoModelKernelUnits::cm - rad;
+    rad =  rec->getDouble("RMIN")*Gaudi::Units::cm;
+    dep =  rec->getDouble("RMAX")*Gaudi::Units::cm - rad;
 	
     lar = m_recBarrGeo;
     if ( !lar || lar->size()==0) return false;
 
     rec = (*lar)[0];
-    len =  rec->getDouble("ZMAX")*GeoModelKernelUnits::cm;
+    len =  rec->getDouble("ZMAX")*Gaudi::Units::cm;
 
-    //rad = 138.5*GeoModelKernelUnits::cm;
-    //dep = (144.7 - 138.5)*GeoModelKernelUnits::cm;
-    //len = 316.5*GeoModelKernelUnits::cm;
+    //rad = 138.5*Gaudi::Units::cm;
+    //dep = (144.7 - 138.5)*Gaudi::Units::cm;
+    //len = 316.5*Gaudi::Units::cm;
 
     radius.push_back( rad  + dep/2.);
     depth.push_back( dep /2.);
@@ -290,13 +290,13 @@ LArRecoSimpleGeomTool::get_cylinder_surface (CaloSubdetNames::ALIGNVOL alvol,
     if (lar->size()==0) return false;
 
     const IRDBRecord* rec = (*lar)[0];
-    rad =  rec->getDouble("RMIN")*GeoModelKernelUnits::cm;
-    dep =  rec->getDouble("RMAX")*GeoModelKernelUnits::cm - rad;
-    len =  rec->getDouble("ZMAX")*GeoModelKernelUnits::cm;
+    rad =  rec->getDouble("RMIN")*Gaudi::Units::cm;
+    dep =  rec->getDouble("RMAX")*Gaudi::Units::cm - rad;
+    len =  rec->getDouble("ZMAX")*Gaudi::Units::cm;
 
-    //rad = 1447.3*GeoModelKernelUnits::cm;
-    //dep = (2003.35 - 1447.3)*GeoModelKernelUnits::cm;
-    //len = 316.5*GeoModelKernelUnits::cm;
+    //rad = 1447.3*Gaudi::Units::cm;
+    //dep = (2003.35 - 1447.3)*Gaudi::Units::cm;
+    //len = 316.5*Gaudi::Units::cm;
 
     radius.push_back( rad  + dep/2.);
     depth.push_back( dep /2.);
@@ -353,16 +353,16 @@ LArRecoSimpleGeomTool::get_disk_surface (CaloSubdetNames::ALIGNVOL alvol,
 
     const IRDBRecord* rec = (*lar)[49];
 
-    ri = rec->getDouble("RMIN")*GeoModelKernelUnits::cm;
-    ra = ri + rec->getDouble("DR")*GeoModelKernelUnits::cm;
-    dep = rec->getDouble("DZ")*GeoModelKernelUnits::cm;
-    zcent = rec->getDouble("ZMIN")*GeoModelKernelUnits::cm + dep/2.;
+    ri = rec->getDouble("RMIN")*Gaudi::Units::cm;
+    ra = ri + rec->getDouble("DR")*Gaudi::Units::cm;
+    dep = rec->getDouble("DZ")*Gaudi::Units::cm;
+    zcent = rec->getDouble("ZMIN")*Gaudi::Units::cm + dep/2.;
     if (alvol == CaloSubdetNames::LARCRYO_EC_NEG) zcent = -1. * zcent;
 
-    //ri = 22.1*GeoModelKernelUnits::cm;
-    //ra = (22.1 + 194.4)*GeoModelKernelUnits::cm;
-    //dep = 6.5*GeoModelKernelUnits::cm;
-    //zcent = (356.1 + dep/2.)*GeoModelKernelUnits::cm;
+    //ri = 22.1*Gaudi::Units::cm;
+    //ra = (22.1 + 194.4)*Gaudi::Units::cm;
+    //dep = 6.5*Gaudi::Units::cm;
+    //zcent = (356.1 + dep/2.)*Gaudi::Units::cm;
 
     rmin.push_back( ri );
     rmax.push_back( ra );
@@ -372,16 +372,16 @@ LArRecoSimpleGeomTool::get_disk_surface (CaloSubdetNames::ALIGNVOL alvol,
     // DDDb : LAr / CryoCylinders / Endcap nb 6
     rec = (*lar)[44];
 
-    ri = rec->getDouble("RMIN")*GeoModelKernelUnits::cm;
-    ra = ri + rec->getDouble("DR")*GeoModelKernelUnits::cm;
-    dep = rec->getDouble("DZ")*GeoModelKernelUnits::cm;
-    zcent = rec->getDouble("ZMIN")*GeoModelKernelUnits::cm + dep/2.;
+    ri = rec->getDouble("RMIN")*Gaudi::Units::cm;
+    ra = ri + rec->getDouble("DR")*Gaudi::Units::cm;
+    dep = rec->getDouble("DZ")*Gaudi::Units::cm;
+    zcent = rec->getDouble("ZMIN")*Gaudi::Units::cm + dep/2.;
     if (alvol == CaloSubdetNames::LARCRYO_EC_NEG) zcent = -1. * zcent;
 
-    //ri = 79.*GeoModelKernelUnits::cm;
-    //ra = (ri + 173.)*GeoModelKernelUnits::cm;
-    //dep = 6.*GeoModelKernelUnits::cm;
-    //zcent = (660.5 + dep/2.)*GeoModelKernelUnits::cm;
+    //ri = 79.*Gaudi::Units::cm;
+    //ra = (ri + 173.)*Gaudi::Units::cm;
+    //dep = 6.*Gaudi::Units::cm;
+    //zcent = (660.5 + dep/2.)*Gaudi::Units::cm;
 
     rmin.push_back( ri );
     rmax.push_back( ra );
@@ -399,16 +399,16 @@ LArRecoSimpleGeomTool::get_disk_surface (CaloSubdetNames::ALIGNVOL alvol,
 
     const IRDBRecord* rec = (*lar)[0];
 
-    ri = rec->getDouble("RMIN")*GeoModelKernelUnits::cm;
-    ra = rec->getDouble("RMAX")*GeoModelKernelUnits::cm;
-    dep = rec->getDouble("TCK")*GeoModelKernelUnits::cm;
-    zcent = rec->getDouble("ZPOS")*GeoModelKernelUnits::cm + dep/2.;
+    ri = rec->getDouble("RMIN")*Gaudi::Units::cm;
+    ra = rec->getDouble("RMAX")*Gaudi::Units::cm;
+    dep = rec->getDouble("TCK")*Gaudi::Units::cm;
+    zcent = rec->getDouble("ZPOS")*Gaudi::Units::cm + dep/2.;
     if (alvol == CaloSubdetNames::PRESAMPLER_EC_NEG) zcent = -1. * zcent;
 
-    //ri = 123.174*GeoModelKernelUnits::cm;
-    //ra = 170.2*GeoModelKernelUnits::cm;
-    //dep = 0.4*GeoModelKernelUnits::cm;
-    //zcent = (362.4 + dep/2.)*GeoModelKernelUnits::cm;
+    //ri = 123.174*Gaudi::Units::cm;
+    //ra = 170.2*Gaudi::Units::cm;
+    //dep = 0.4*Gaudi::Units::cm;
+    //zcent = (362.4 + dep/2.)*Gaudi::Units::cm;
 
     rmin.push_back( ri );
     rmax.push_back( ra );
@@ -426,16 +426,16 @@ LArRecoSimpleGeomTool::get_disk_surface (CaloSubdetNames::ALIGNVOL alvol,
 
     const IRDBRecord* rec = (*lar)[0];
 
-    ri = rec->getDouble("RMIN")*GeoModelKernelUnits::cm;
-    ra = rec->getDouble("RMAX")*GeoModelKernelUnits::cm;
-    dep = rec->getDouble("ETOT")*GeoModelKernelUnits::cm;
-    zcent = rec->getDouble("Z1")*GeoModelKernelUnits::cm + dep/2.;
+    ri = rec->getDouble("RMIN")*Gaudi::Units::cm;
+    ra = rec->getDouble("RMAX")*Gaudi::Units::cm;
+    dep = rec->getDouble("ETOT")*Gaudi::Units::cm;
+    zcent = rec->getDouble("Z1")*Gaudi::Units::cm + dep/2.;
     if (alvol == CaloSubdetNames::EMEC_NEG) zcent = -1. * zcent;
 
-    //ri = 29.*GeoModelKernelUnits::cm;
-    //ra = 210.*GeoModelKernelUnits::cm;
-    //dep = 53.6*GeoModelKernelUnits::cm;
-    //zcent = (369.1 + dep/2.)*GeoModelKernelUnits::cm;
+    //ri = 29.*Gaudi::Units::cm;
+    //ra = 210.*Gaudi::Units::cm;
+    //dep = 53.6*Gaudi::Units::cm;
+    //zcent = (369.1 + dep/2.)*Gaudi::Units::cm;
 
     rmin.push_back( ri );
     rmax.push_back( ra );
@@ -454,19 +454,19 @@ LArRecoSimpleGeomTool::get_disk_surface (CaloSubdetNames::ALIGNVOL alvol,
 
     const IRDBRecord* rec = (*lar)[0];
 
-    ri = rec->getDouble("ROORIG")*GeoModelKernelUnits::cm;
-    ra = rec->getDouble("REND")*GeoModelKernelUnits::cm;
+    ri = rec->getDouble("ROORIG")*Gaudi::Units::cm;
+    ra = rec->getDouble("REND")*Gaudi::Units::cm;
     // Block0+Block1+Block2
     dep = rec->getDouble("PLATE_0")/2. 
       + 3*8*(rec->getDouble("LARG") + rec->getDouble("PLATE_0"));
-    dep = dep*GeoModelKernelUnits::cm;
-    zcent = rec->getDouble("ZSTART")*GeoModelKernelUnits::cm + dep/2.;
+    dep = dep*Gaudi::Units::cm;
+    zcent = rec->getDouble("ZSTART")*Gaudi::Units::cm + dep/2.;
     if (alvol == CaloSubdetNames::HEC1_NEG) zcent = -1. * zcent;
 
-    //ri = 37.2*GeoModelKernelUnits::cm;
-    //ra = 213.0*GeoModelKernelUnits::cm;
-    //dep = (513.4 - 4.05 - 427.7)*GeoModelKernelUnits::cm;
-    //zcent = 427.7*GeoModelKernelUnits::cm;
+    //ri = 37.2*Gaudi::Units::cm;
+    //ra = 213.0*Gaudi::Units::cm;
+    //dep = (513.4 - 4.05 - 427.7)*Gaudi::Units::cm;
+    //zcent = 427.7*Gaudi::Units::cm;
 
     rmin.push_back( ri );
     rmax.push_back( ra );
@@ -486,24 +486,24 @@ LArRecoSimpleGeomTool::get_disk_surface (CaloSubdetNames::ALIGNVOL alvol,
 
     const IRDBRecord* rec = (*lar)[0];
 
-    ri = rec->getDouble("ROORIG")*GeoModelKernelUnits::cm;
-    ra = rec->getDouble("REND")*GeoModelKernelUnits::cm;
+    ri = rec->getDouble("ROORIG")*Gaudi::Units::cm;
+    ra = rec->getDouble("REND")*Gaudi::Units::cm;
     // Block 3 + Block 4 + Block 5 + Block 6
     dep =  rec->getDouble("PLATE_1")/2. 
       + 4*4*(rec->getDouble("LARG") + rec->getDouble("PLATE_1"));
-    dep = dep*GeoModelKernelUnits::cm;
+    dep = dep*Gaudi::Units::cm;
     // start+depth of HEC1 + gap
     zcent =  rec->getDouble("ZSTART") 
       + rec->getDouble("PLATE_0")/2. 
       + 3*8*(rec->getDouble("LARG") + rec->getDouble("PLATE_0"))
       +  rec->getDouble("GAPWHL") ;
-    zcent = zcent*GeoModelKernelUnits::cm + dep/2.;
+    zcent = zcent*Gaudi::Units::cm + dep/2.;
     if (alvol == CaloSubdetNames::HEC2_NEG) zcent = -1. * zcent;
 
-    //ri = 37.2*GeoModelKernelUnits::cm;
-    //ra = 213.0*GeoModelKernelUnits::cm;
-    //dep = (609.5 - 513.4)*GeoModelKernelUnits::cm;
-    //zcent = (513.4 + dep/2.)*GeoModelKernelUnits::cm;
+    //ri = 37.2*Gaudi::Units::cm;
+    //ra = 213.0*Gaudi::Units::cm;
+    //dep = (609.5 - 513.4)*Gaudi::Units::cm;
+    //zcent = (513.4 + dep/2.)*Gaudi::Units::cm;
 
     rmin.push_back( ri );
     rmax.push_back( ra );
@@ -517,15 +517,15 @@ LArRecoSimpleGeomTool::get_disk_surface (CaloSubdetNames::ALIGNVOL alvol,
     
     // see LArNumberHelper
 
-    nb = 8.6*GeoModelKernelUnits::cm;
+    nb = 8.6*Gaudi::Units::cm;
     rmin.push_back( nb );
-    nb = 47.5*GeoModelKernelUnits::cm;
+    nb = 47.5*Gaudi::Units::cm;
     rmax.push_back( nb );
 
-    nb = 45.*GeoModelKernelUnits::cm;
+    nb = 45.*Gaudi::Units::cm;
     depth.push_back( nb/2. );
 
-    nb = (466.85 + nb/2. )*GeoModelKernelUnits::cm;
+    nb = (466.85 + nb/2. )*Gaudi::Units::cm;
     if (alvol == CaloSubdetNames::FCAL1_NEG) nb = -1. * nb;
     z.push_back( nb );
 
@@ -536,15 +536,15 @@ LArRecoSimpleGeomTool::get_disk_surface (CaloSubdetNames::ALIGNVOL alvol,
     
     // see LArNumberHelper
 
-    nb = 8.6*GeoModelKernelUnits::cm;
+    nb = 8.6*Gaudi::Units::cm;
     rmin.push_back( nb );
-    nb = 47.5*GeoModelKernelUnits::cm;
+    nb = 47.5*Gaudi::Units::cm;
     rmax.push_back( nb );
 
-    nb = 45.*GeoModelKernelUnits::cm;
+    nb = 45.*Gaudi::Units::cm;
     depth.push_back( nb/2. );
 
-    nb = (512.3 + nb/2. )*GeoModelKernelUnits::cm;
+    nb = (512.3 + nb/2. )*Gaudi::Units::cm;
     if (alvol == CaloSubdetNames::FCAL2_NEG) nb = -1. * nb;
     z.push_back( nb );
 
@@ -555,15 +555,15 @@ LArRecoSimpleGeomTool::get_disk_surface (CaloSubdetNames::ALIGNVOL alvol,
     
     // see LArNumberHelper
 
-    nb = 8.6*GeoModelKernelUnits::cm;
+    nb = 8.6*Gaudi::Units::cm;
     rmin.push_back( nb );
-    nb = 47.5*GeoModelKernelUnits::cm;
+    nb = 47.5*Gaudi::Units::cm;
     rmax.push_back( nb );
 
-    nb = 45.*GeoModelKernelUnits::cm;
+    nb = 45.*Gaudi::Units::cm;
     depth.push_back( nb/2. );
 
-    nb = (559.75 + nb/2. )*GeoModelKernelUnits::cm;
+    nb = (559.75 + nb/2. )*Gaudi::Units::cm;
     if (alvol == CaloSubdetNames::FCAL3_NEG) nb = -1. * nb;
     z.push_back( nb );
 
diff --git a/LArCalorimeter/LArGeoModel/LArGeoAlgsNV/src/LArDetectorFactory.cxx b/LArCalorimeter/LArGeoModel/LArGeoAlgsNV/src/LArDetectorFactory.cxx
index 3ff752ce74b884a6e5be9e2a56bae3a07a4c9e9a..cc101e02c612ffd8535a3dbd9d6ef639422bee08 100755
--- a/LArCalorimeter/LArGeoModel/LArGeoAlgsNV/src/LArDetectorFactory.cxx
+++ b/LArCalorimeter/LArGeoModel/LArGeoAlgsNV/src/LArDetectorFactory.cxx
@@ -17,7 +17,7 @@
 #include "GeoModelKernel/GeoNameTag.h"
 #include "GeoModelKernel/GeoShapeUnion.h"
 #include "GeoModelKernel/GeoDefinitions.h"
-#include "GeoModelKernel/Units.h"
+#include "GaudiKernel/SystemOfUnits.h"
 
 #include "CLHEP/Geometry/Transform3D.h" 
 
@@ -237,7 +237,7 @@ void LArGeo::LArDetectorFactory::create( GeoPhysVol* a_container )
 	    a_container->add(endcapEnvelopePos);
 	    a_container->add( new GeoNameTag("LArEndcapNeg"));
 	    a_container->add(xfEndcapNeg);
-	    a_container->add( new GeoTransform(GeoTrf::RotateY3D(180.0*GeoModelKernelUnits::deg)));
+	    a_container->add( new GeoTransform(GeoTrf::RotateY3D(180.0*Gaudi::Units::deg)));
 	    a_container->add(endcapEnvelopeNeg);
 	  }
 	else if(!m_buildEndcap)
@@ -302,7 +302,7 @@ void LArGeo::LArDetectorFactory::create( GeoPhysVol* a_container )
 	    a_container->add(endcapEnvelopePos);
 	    a_container->add( new GeoNameTag("LArEndcapNeg"));
 	    a_container->add(xfEndcapNeg);
-	    a_container->add( new GeoTransform(GeoTrf::RotateY3D(180.0*GeoModelKernelUnits::deg)));
+	    a_container->add( new GeoTransform(GeoTrf::RotateY3D(180.0*Gaudi::Units::deg)));
 	    a_container->add(endcapEnvelopeNeg);
       
 	  }
diff --git a/LArCalorimeter/LArGeoModel/LArGeoBarrel/src/BarrelConstruction.cxx b/LArCalorimeter/LArGeoModel/LArGeoBarrel/src/BarrelConstruction.cxx
index 25ca516e9cda1bf94cda8cf3c9ec136f8ad31ea7..7d4c3146179ab5715d72d00c25b0d5a4f4f8aa95 100755
--- a/LArCalorimeter/LArGeoModel/LArGeoBarrel/src/BarrelConstruction.cxx
+++ b/LArCalorimeter/LArGeoModel/LArGeoBarrel/src/BarrelConstruction.cxx
@@ -15,9 +15,6 @@
 
 #include "LArGeoCode/VDetectorParameters.h"
 
-//#include "LArDetDescr/LArDetDescrManager.h"
-//#include "CaloDetDescr/CaloSubdetNames.h"
-
 #include "GeoModelKernel/GeoElement.h"
 #include "GeoModelKernel/GeoMaterial.h"
 #include "GeoModelKernel/GeoFullPhysVol.h"
@@ -55,7 +52,7 @@
 #include "GeoGenericFunctions/Variable.h"
 #include "GeoGenericFunctions/FixedConstant.h"
 // For units:
-#include "CLHEP/Units/PhysicalConstants.h"
+#include "GaudiKernel/PhysicalConstants.h"
 #include "GaudiKernel/MsgStream.h"
 #include "GaudiKernel/Bootstrap.h"
 
@@ -201,7 +198,7 @@ void LArGeo::BarrelConstruction::MakeEnvelope()
   GeoGenfun::Sqrt Sqrt;
   GeoGenfun::ATan ATan;
 
-  double twopi64 = GeoModelKernelUnits::pi/32.;
+  double twopi64 = Gaudi::Units::pi/32.;
   double twopi32 = 2.*twopi64;  
 
 
@@ -316,13 +313,13 @@ void LArGeo::BarrelConstruction::MakeEnvelope()
   double Moth_outer_radius = m_parameters->GetValue("LArEMBMotherRmax");
 
   double Moth_Phi_Min = 0.;
-  double Moth_Phi_Max = m_parameters->GetValue("LArEMBphiMaxBarrel")*GeoModelKernelUnits::deg;
+  double Moth_Phi_Max = m_parameters->GetValue("LArEMBphiMaxBarrel")*Gaudi::Units::deg;
 
 #ifdef DEBUGGEO
   std::cout << " *** Mother volume (Ecam) parameters " << std::endl;
   std::cout << "  Rmin/Rmax " << Moth_inner_radius << " " << Moth_outer_radius << std::endl;
   std::cout << "  Zmin/Zmax " << Moth_Z_min << " " << Moth_Z_max << std::endl;
-  std::cout << "  phi1,Dphi (GeoModelKernelUnits::deg)" << Moth_Phi_Min/GeoModelKernelUnits::deg << " " << Moth_Phi_Max/GeoModelKernelUnits::deg << std::endl;
+  std::cout << "  phi1,Dphi (Gaudi::Units::deg)" << Moth_Phi_Min/Gaudi::Units::deg << " " << Moth_Phi_Max/Gaudi::Units::deg << std::endl;
 #endif
 
   // number of zigs for accordion
@@ -371,9 +368,9 @@ void LArGeo::BarrelConstruction::MakeEnvelope()
 	(double) (m_parameters->GetValue("LArEMBPhiAtCurvature",idat));
       Delta[idat]  =
 	(double) (m_parameters->GetValue("LArEMBDeltaZigAngle",idat));
-      if(idat == 14) Delta[idat]  = (90.0) * GeoModelKernelUnits::deg; 
+      if(idat == 14) Delta[idat]  = (90.0) * Gaudi::Units::deg; 
 
-  // Maximum SAGGING displacement for each of the fifteen folds in GeoModelKernelUnits::mm
+  // Maximum SAGGING displacement for each of the fifteen folds in Gaudi::Units::mm
   // (should be 0.0, 0.17, 0.30, 0.63, 0.78, 1.06, 1.09, 1.21, 1.07, 1.03, 0.74, 0.61, 0.27, 0.20, 0.0)
 //GUtmp sagging amplied by 10
       if (m_A_SAGGING)  {
@@ -393,8 +390,8 @@ void LArGeo::BarrelConstruction::MakeEnvelope()
 
 // #ifdef DEBUGGEO
        log << MSG::DEBUG << "idat " << idat << " Rhocen/Phice/Delta/deltay/deltax/etatrans "
-	   << Rhocen[idat] << " " << Phicen[idat]*(1./GeoModelKernelUnits::deg) << " "
-	   << Delta[idat]*(1./GeoModelKernelUnits::deg) << " " << deltay[idat] << " " << deltax[idat]
+	   << Rhocen[idat] << " " << Phicen[idat]*(1./Gaudi::Units::deg) << " "
+	   << Delta[idat]*(1./Gaudi::Units::deg) << " " << deltay[idat] << " " << deltax[idat]
 	   << " " << etaTrans << endmsg;
 // #endif
 
@@ -452,10 +449,10 @@ void LArGeo::BarrelConstruction::MakeEnvelope()
   //  very confused at the common surface between ECAM and STAC)
   //-----------------ECAM---------------------------------------------------------//
   {                                                                               //
-    double Moth_Phi_Min2 = (Ncell == 64) ? -1.555*GeoModelKernelUnits::deg : 0.;                       //
-    double Moth_Phi_Max2 = (Ncell == 64) ? 25.61*GeoModelKernelUnits::deg  : 2*M_PI;                   //
+    double Moth_Phi_Min2 = (Ncell == 64) ? -1.555*Gaudi::Units::deg : 0.;                       //
+    double Moth_Phi_Max2 = (Ncell == 64) ? 25.61*Gaudi::Units::deg  : 2*M_PI;                   //
                                                                                   //
-    double safety_rhocen1 = 0.040*GeoModelKernelUnits::mm;                                             //
+    double safety_rhocen1 = 0.040*Gaudi::Units::mm;                                             //
     double Zplan[] = {Bar_Z_min-Zp0,Bar_Z_cut-Zp0,Bar_Z_max-Zp0};                 //
     double Riacc[] = {Moth_inner_radius,Moth_inner_radius, Rhocen1-safety_rhocen1};  //
     double Roacc[] = {Moth_outer_radius,Moth_outer_radius,Moth_outer_radius};     //
@@ -465,7 +462,7 @@ void LArGeo::BarrelConstruction::MakeEnvelope()
      std::cout << "  Zplan " << Zplan[0] << " " << Zplan[1] << " " << Zplan[2] << std::endl;
      std::cout << "  Rin   " << Riacc[0] << " " << Riacc[1] << " " << Riacc[2] << std::endl;
      std::cout << "  Rout  " << Roacc[0] << " " << Roacc[1] << " " << Roacc[2] << std::endl;
-     std::cout << " PhiMin,Dphi " << Moth_Phi_Min2/GeoModelKernelUnits::deg << " " << Moth_Phi_Max2/GeoModelKernelUnits::deg << std::endl;
+     std::cout << " PhiMin,Dphi " << Moth_Phi_Min2/Gaudi::Units::deg << " " << Moth_Phi_Max2/Gaudi::Units::deg << std::endl;
 #endif
     int ecamArraySize = sizeof(Zplan) / sizeof(double);                           //
     std::string name = baseName + "ECAM";                                         //
@@ -510,19 +507,19 @@ void LArGeo::BarrelConstruction::MakeEnvelope()
   GeoPhysVol *Elnicsf_phys=NULL;
   double Xel1f;
   {
-    // WARNING : this "hard_coded" 0.010*GeoModelKernelUnits::mm is a "security" to avoid
+    // WARNING : this "hard_coded" 0.010*Gaudi::Units::mm is a "security" to avoid
     //           fake "overlapping" diagnostics with "DAVID"
-    Xel1f = m_parameters->GetValue("LArEMBInnerElectronics");       // 23.*GeoModelKernelUnits::mm
+    Xel1f = m_parameters->GetValue("LArEMBInnerElectronics");       // 23.*Gaudi::Units::mm
     double DeltaZ = Zhalfc;
     double Zpos = Zhalfc+Bar_Z_min; 
-    double Rmini =  Moth_inner_radius + 0.010*GeoModelKernelUnits::mm;
-    double Rmaxi = Rmini+Xel1f - 0.010*GeoModelKernelUnits::mm;
+    double Rmini =  Moth_inner_radius + 0.010*Gaudi::Units::mm;
+    double Rmaxi = Rmini+Xel1f - 0.010*Gaudi::Units::mm;
     std::string name = baseName + "TELF";
 #ifdef DEBUGGEO
     std::cout << " *** parameters for TELF tubs " << std::endl;
     std::cout << " DeltaZ      " << DeltaZ << std::endl;
     std::cout << " Rmin/Rmax   " << Rmini << " " << Rmaxi << std::endl,
-    std::cout << " PhiMin,Dphi " << Moth_Phi_Min/GeoModelKernelUnits::deg << " " << Moth_Phi_Max/GeoModelKernelUnits::deg << std::endl;
+    std::cout << " PhiMin,Dphi " << Moth_Phi_Min/Gaudi::Units::deg << " " << Moth_Phi_Max/Gaudi::Units::deg << std::endl;
     std::cout << " Zpos in ECAM " << Zpos << std::endl;
 #endif
     GeoTubs* tubs = new GeoTubs(Rmini,          // rmin
@@ -545,9 +542,9 @@ void LArGeo::BarrelConstruction::MakeEnvelope()
   //  (follow mixture described in Pascal Perrodo note
   GeoPhysVol *Sumb_phys=NULL;
   {
-    double ThickSum = 10.*GeoModelKernelUnits::mm;    // FIXME should be in geometry database
+    double ThickSum = 10.*Gaudi::Units::mm;    // FIXME should be in geometry database
     double Rmini = Moth_inner_radius+Xel1f-ThickSum;
-    double Rmaxi = Moth_inner_radius+Xel1f -0.020*GeoModelKernelUnits::mm;    // safety margin
+    double Rmaxi = Moth_inner_radius+Xel1f -0.020*Gaudi::Units::mm;    // safety margin
     double DeltaZ = Zhalfc;
     double Zpos=0.;
     std::string name = baseName + "SUMB";
@@ -555,7 +552,7 @@ void LArGeo::BarrelConstruction::MakeEnvelope()
     std::cout << " *** parameters for SUMB tubs " << std::endl;
     std::cout << " DeltaZ      " << DeltaZ << std::endl;
     std::cout << " Rmin/Rmax   " << Rmini << " " << Rmaxi << std::endl,
-    std::cout << " PhiMin,Dphi " << Moth_Phi_Min/GeoModelKernelUnits::deg << " " << Moth_Phi_Max/GeoModelKernelUnits::deg << std::endl;
+    std::cout << " PhiMin,Dphi " << Moth_Phi_Min/Gaudi::Units::deg << " " << Moth_Phi_Max/Gaudi::Units::deg << std::endl;
     std::cout << " Zpos in TELF " << Zpos << std::endl;
 #endif
 
@@ -571,9 +568,9 @@ void LArGeo::BarrelConstruction::MakeEnvelope()
   {
     double ClearancePS = m_parameters->GetValue("LArEMBMoBoclearfrPS");
     double RhoPosB = Moth_inner_radius + ClearancePS;
-    double bdx = .5*(m_parameters->GetValue("LArEMBMoBoTchickness")); // 4.3/2.*GeoModelKernelUnits::mm
-    double bdy = .5*(m_parameters->GetValue("LArEMBMoBoHeight"));     // 72.3/2.*GeoModelKernelUnits::mm;
-    double bdz = Zhalfc - 0.007*GeoModelKernelUnits::mm;
+    double bdx = .5*(m_parameters->GetValue("LArEMBMoBoTchickness")); // 4.3/2.*Gaudi::Units::mm
+    double bdy = .5*(m_parameters->GetValue("LArEMBMoBoHeight"));     // 72.3/2.*Gaudi::Units::mm;
+    double bdz = Zhalfc - 0.007*Gaudi::Units::mm;
     
     //------------------------MOTHERBOARDS--------------------------------------------//
     // JFB Make & Place the motherboards inside overall tube                          //
@@ -587,7 +584,7 @@ void LArGeo::BarrelConstruction::MakeEnvelope()
       std::cout << " *** parameters for MotherBoard (box)" << std::endl;
       std::cout << "  dx,dy,dz  " << bdx << " " << bdy << " " << bdz << std::endl;
       std::cout << " Radius pos " << RhoPosB << std::endl;
-      std::cout << " Phi0,Dphi  " << PhiPos0/GeoModelKernelUnits::deg << " " << twopi32/GeoModelKernelUnits::deg << std::endl;
+      std::cout << " Phi0,Dphi  " << PhiPos0/Gaudi::Units::deg << " " << twopi32/Gaudi::Units::deg << std::endl;
 #endif
       GeoBox               * box    = new GeoBox(bdx,bdy,bdz);                        //
       const GeoLogVol      * logVol = new GeoLogVol(name,box,Moth_elect);             //
@@ -616,11 +613,11 @@ void LArGeo::BarrelConstruction::MakeEnvelope()
     // JFB Place the cables                                                           //
     {                                                                                 //
       //                                                                              //
-      double Dzc = Zhalfc - 0.007*GeoModelKernelUnits::mm;                                                 //
-      double Dx1 = .5*(m_parameters->GetValue("LArEMBCablethickat0"));                // 1./2.*GeoModelKernelUnits::mm
+      double Dzc = Zhalfc - 0.007*Gaudi::Units::mm;                                                 //
+      double Dx1 = .5*(m_parameters->GetValue("LArEMBCablethickat0"));                // 1./2.*Gaudi::Units::mm
       double Dx2 = .5*Bar_Eta_cut*(m_parameters->GetValue("LArEMBthickincrfac"));     //
-      // Dx2 should be  5.17/2.*Bar_Eta_cut*GeoModelKernelUnits::mm Trapezoid's side linear with Eta       //
-      double Dy1 = .5*(m_parameters->GetValue("LArEMBCableEtaheight"));               // 70./2.*GeoModelKernelUnits::mm
+      // Dx2 should be  5.17/2.*Bar_Eta_cut*Gaudi::Units::mm Trapezoid's side linear with Eta       //
+      double Dy1 = .5*(m_parameters->GetValue("LArEMBCableEtaheight"));               // 70./2.*Gaudi::Units::mm
       double Dy2 = Dy1;                                                               //
       //                                                                              //
       int NoOFcable = (int) m_parameters->GetValue("LArEMBnoOFcableBundle");          // 64
@@ -658,7 +655,7 @@ void LArGeo::BarrelConstruction::MakeEnvelope()
       GeoGenfun::Mod Mod1(1.0),Mod2(2.0),Mod4(4.0);                                      //
       GeoGenfun::GENFUNCTION Int = I - Mod1;                                             //
       GeoGenfun::GENFUNCTION Ccopy    = Int(I + 0.5);                                    //
-      GeoGenfun::GENFUNCTION PhiOrig  = 22.5*GeoModelKernelUnits::deg*Int(Ccopy/4);                           //
+      GeoGenfun::GENFUNCTION PhiOrig  = 22.5*Gaudi::Units::deg*Int(Ccopy/4);                           //
       GeoGenfun::GENFUNCTION PhiPos1  = PhiPos0 + PhiOrig;                               //
       GeoGenfun::GENFUNCTION PhiPos2  = twopi32 - PhiPos0 + PhiOrig;                     //
       GeoGenfun::GENFUNCTION PhiPos00 =                                                  //
@@ -672,7 +669,7 @@ void LArGeo::BarrelConstruction::MakeEnvelope()
       GeoSerialTransformer *st = new GeoSerialTransformer(pV, &TX, NoOFcable);        //
 #ifdef DEBUGGEO
       for (int ii=0;ii<NoOFcable;ii++) {
-       std::cout << "copy, phi " << ii << " " << PhiPos(ii)/GeoModelKernelUnits::deg << std::endl;
+       std::cout << "copy, phi " << ii << " " << PhiPos(ii)/Gaudi::Units::deg << std::endl;
       }
 #endif
       Elnicsf_phys->add(iD);                                                          //
@@ -683,10 +680,10 @@ void LArGeo::BarrelConstruction::MakeEnvelope()
   }
 #endif // BUILD_FRONT_ELECTRONICS
 
-    // add 1.3 GeoModelKernelUnits::mm in z to allow cleareance for absorber with non                    //
+    // add 1.3 Gaudi::Units::mm in z to allow cleareance for absorber with non                    //
     // 0 thickness, at eta=1.475, low r part of the barrel                          //
     // this affects STAC and TELB volumes                                           //
-    double clearance = 1.3*GeoModelKernelUnits::mm;     
+    double clearance = 1.3*Gaudi::Units::mm;     
 
 #ifdef BUILD_HIGHETA_ELECTRONICS
 
@@ -702,20 +699,20 @@ void LArGeo::BarrelConstruction::MakeEnvelope()
     // GU fix of TELB                                                               //
     double ze1=  zmax1_Stac+clearance;                                              //
     double ze2 = Bar_Z_max;                                                         //
-    double safety = 0.05*GeoModelKernelUnits::mm;
+    double safety = 0.05*Gaudi::Units::mm;
     double DeltaZ = 0.5*(ze2-ze1)-safety;                           // 50 micron for safety.
     double Zpos = ze1+DeltaZ+0.5*safety;                                            // 
-    double Rmini1 = Rhocen[0] - .030*GeoModelKernelUnits::mm;                                            //
-    double Rmaxi1 = Rhocen[0] - .020*GeoModelKernelUnits::mm;                                            //
-    double Rmini2 = Rhocen[0] - .030*GeoModelKernelUnits::mm;                                            //
-    double Rmaxi2 = Bar_Rcmx - clearance - .070*GeoModelKernelUnits::mm;                                 //
+    double Rmini1 = Rhocen[0] - .030*Gaudi::Units::mm;                                            //
+    double Rmaxi1 = Rhocen[0] - .020*Gaudi::Units::mm;                                            //
+    double Rmini2 = Rhocen[0] - .030*Gaudi::Units::mm;                                            //
+    double Rmaxi2 = Bar_Rcmx - clearance - .070*Gaudi::Units::mm;                                 //
     std::string name = baseName + "TELB";                                           //
 #ifdef DEBUGGEO
     std::cout << " *** Parameters for high eta electronics (Cons) " <<std::endl;
     std::cout << " Rmini1,Rmini2,Rmaxi1,Rmaxi2 " << Rmini1 << " " << Rmini2 << " "
        << Rmaxi1 << " " << Rmaxi2 << std::endl,
     std::cout << " DeltaZ " << DeltaZ << std::endl;
-    std::cout << " Phi_Min,Dphi " << Moth_Phi_Min/GeoModelKernelUnits::deg << " " << Moth_Phi_Max/GeoModelKernelUnits::deg << std::endl;
+    std::cout << " Phi_Min,Dphi " << Moth_Phi_Min/Gaudi::Units::deg << " " << Moth_Phi_Max/Gaudi::Units::deg << std::endl;
     std::cout << " Zpos " << Zpos << std::endl;
 #endif
     GeoCons* cons = new GeoCons(Rmini1,Rmini2,Rmaxi1,Rmaxi2,                        //
@@ -742,8 +739,8 @@ void LArGeo::BarrelConstruction::MakeEnvelope()
   
   //---------------------------------FRONT G10-------------------------------------//
   {                                                                                //
-    double Xel1f = m_parameters->GetValue("LArEMBInnerElectronics");               // 23.*GeoModelKernelUnits::mm
-    double Xg10f = m_parameters->GetValue("LArEMBG10SupportBarsIn");               // 20.*GeoModelKernelUnits::mm
+    double Xel1f = m_parameters->GetValue("LArEMBInnerElectronics");               // 23.*Gaudi::Units::mm
+    double Xg10f = m_parameters->GetValue("LArEMBG10SupportBarsIn");               // 20.*Gaudi::Units::mm
     double DeltaZ = 0.5* m_parameters->GetValue("LArEMBG10FrontDeltaZ");           //
     double Zpos = DeltaZ+Bar_Z_min;                                                //
     double Rmini = Moth_inner_radius + Xel1f;                                      //
@@ -753,7 +750,7 @@ void LArGeo::BarrelConstruction::MakeEnvelope()
     std::cout << " *** parameters for front G10 ring (tubs) " << std::endl;
     std::cout << " Rmini,Rmaxi " << Rmini << " " << Rmaxi << std::endl;
     std::cout << " DeltaZ " << DeltaZ << std::endl;
-    std::cout << " phimin,dphi " << Moth_Phi_Min/GeoModelKernelUnits::deg << " " << Moth_Phi_Max/GeoModelKernelUnits::deg << std::endl;
+    std::cout << " phimin,dphi " << Moth_Phi_Min/Gaudi::Units::deg << " " << Moth_Phi_Max/Gaudi::Units::deg << std::endl;
     std::cout << " Zpos " << Zpos << std::endl;
 #endif
     GeoTubs* tubs = new GeoTubs(Rmini,Rmaxi,DeltaZ,Moth_Phi_Min,Moth_Phi_Max);     //
@@ -806,18 +803,18 @@ void LArGeo::BarrelConstruction::MakeEnvelope()
   {                                                                               //
     double DeltaZ = Zhalf;                                                        //
     double Zpos = Zhalf+Bar_Z_min;                                                //
-    double Xtal  = m_parameters->GetValue("LArEMBLArGapTail")+ 0.1*GeoModelKernelUnits::mm;            // 13.*GeoModelKernelUnits::mm
+    double Xtal  = m_parameters->GetValue("LArEMBLArGapTail")+ 0.1*Gaudi::Units::mm;            // 13.*Gaudi::Units::mm
     double Rmini = Rhocen[Nbrt]+Xtal; //                                          //
     // GU to be sure that GTENB does not go outside mother ECAM volume            //
     //  Rmaxi = Rmini+Xg10b;                                                      //
-    double   Rmaxi = Moth_outer_radius-0.01*GeoModelKernelUnits::mm;   // 10 microns for more safety.. //
+    double   Rmaxi = Moth_outer_radius-0.01*Gaudi::Units::mm;   // 10 microns for more safety.. //
     //                                                                            //
     std::string name = baseName +"GTENB";                                         //
 #ifdef DEBUGGEO 
     std::cout << " *** parameters for back G10 ring (tubs) " << std::endl;
     std::cout << " Rmini,Rmaxi " << Rmini << " " << Rmaxi << std::endl;
     std::cout << " DeltaZ  " << DeltaZ << std::endl;
-    std::cout << " phimin,dphi " << Moth_Phi_Min/GeoModelKernelUnits::deg << " " << Moth_Phi_Max/GeoModelKernelUnits::deg << std::endl;
+    std::cout << " phimin,dphi " << Moth_Phi_Min/Gaudi::Units::deg << " " << Moth_Phi_Max/Gaudi::Units::deg << std::endl;
     std::cout << " Zpos " << Zpos << std::endl;
 #endif
 
@@ -841,8 +838,8 @@ void LArGeo::BarrelConstruction::MakeEnvelope()
   //  (i.e. a little bit wider than one calorimeter module)
   {                                                                             //
 
-    double Moth_Phi_Min2 = (Ncell == 64) ? -1.055*GeoModelKernelUnits::deg : 0.;                     //
-    double Moth_Phi_Max2 = (Ncell == 64) ? 24.61*GeoModelKernelUnits::deg  : 2*M_PI;                 //
+    double Moth_Phi_Min2 = (Ncell == 64) ? -1.055*Gaudi::Units::deg : 0.;                     //
+    double Moth_Phi_Max2 = (Ncell == 64) ? 24.61*Gaudi::Units::deg  : 2*M_PI;                 //
 
     double Zplan1[] = {Bar_Z_min,zmax1_Stac+clearance,Bar_Z_max};                //
     double Riacc1[] = {Rhocen[0],Rhocen[0], Bar_Rcmx-clearance};                //
@@ -854,7 +851,7 @@ void LArGeo::BarrelConstruction::MakeEnvelope()
      std::cout << "  Zplan " << Zplan1[0] << " " << Zplan1[1] << " " << Zplan1[2] << std::endl;
      std::cout << "  Rin   " << Riacc1[0] << " " << Riacc1[1] << " " << Riacc1[2] << std::endl;
      std::cout << "  Rout  " << Roacc1[0] << " " << Roacc1[1] << " " << Roacc1[2] << std::endl;
-     std::cout << " PhiMin,Dphi " << Moth_Phi_Min2/GeoModelKernelUnits::deg << " " << Moth_Phi_Max2/GeoModelKernelUnits::deg << std::endl;
+     std::cout << " PhiMin,Dphi " << Moth_Phi_Min2/Gaudi::Units::deg << " " << Moth_Phi_Max2/Gaudi::Units::deg << std::endl;
      std::cout << " Zpos " << -Zp0 << std::endl;
 #endif
     GeoPcon* pCone = new GeoPcon(Moth_Phi_Min2,Moth_Phi_Max2);                  //
@@ -882,7 +879,7 @@ void LArGeo::BarrelConstruction::MakeEnvelope()
     double Thpb_thin  = m_parameters->GetValue("LArEMBThinAbsLead");
     double Thcu       = m_parameters->GetValue("LArEMBThickElecCopper");
     double Thfg       = m_parameters->GetValue("LArEMBThickElecKapton");
-    double Psi        = m_parameters->GetValue("LArEMBPhiGapAperture");   // 360.*GeoModelKernelUnits::deg/1024
+    double Psi        = m_parameters->GetValue("LArEMBPhiGapAperture");   // 360.*Gaudi::Units::deg/1024
     double Contract   = m_parameters->GetValue("LArEMBAbsorberContraction");
 
     double Thce = (Thpb+Thgl+Thfe)*Contract;
@@ -906,7 +903,7 @@ void LArGeo::BarrelConstruction::MakeEnvelope()
     double Zcp1l[14],Zcp1h[14],Zcp2l[14],Zcp2h[14];
     double Rhol[14],Rhoh[14];
 
-    double safety_along = 0.007*GeoModelKernelUnits::mm;
+    double safety_along = 0.007*Gaudi::Units::mm;
  
    
     // Compute centers of curvature coordinates in a local frame.
@@ -999,7 +996,7 @@ void LArGeo::BarrelConstruction::MakeEnvelope()
 	// Absorber (thick, thin)
 	{
 	  double radius =  fb==FRONT ? Cenx[0] - Xtip_pb/2    : Cenx[Nbrt] + Xtipt/2;
-	  double Xhalfb  = fb==FRONT ? Xtip_pb/2 -0.002*GeoModelKernelUnits::mm    : Xtipt/2 - .004*GeoModelKernelUnits::mm;
+	  double Xhalfb  = fb==FRONT ? Xtip_pb/2 -0.002*Gaudi::Units::mm    : Xtipt/2 - .004*Gaudi::Units::mm;
 	  double Zhalfb  = fb==FRONT ? (Bar_Z_cut-Zmin)/2. : (Zmax-Zmin)/2.;
 	  double dz01 = (std::min(Zcp1[irl],Zmax)-Zmin)/2.;  // half lenght for thick lead
 
@@ -1032,14 +1029,14 @@ void LArGeo::BarrelConstruction::MakeEnvelope()
           std::cout << " Thick Abs Box " << Xhalfb << " " << Thce/2. << " " << dz01 << std::endl;
           std::cout << " Z position thick in thin " << dz01-Zhalfb << std::endl;
           std::cout << " Radial position " << radius << std::endl;
-          std::cout << " Phi0 (GeoModelKernelUnits::deg) " << Gama(0)/GeoModelKernelUnits::deg << std::endl;
+          std::cout << " Phi0 (Gaudi::Units::deg) " << Gama(0)/Gaudi::Units::deg << std::endl;
           std::cout << " Z position in ECAM " << Zmin+Zhalfb << std::endl;
 #endif
 	}
 	// G10 (only for front part)
 	if (fb==FRONT)
 	{
-	  double Xhalfbg = Xtip_gt/2-0.002*GeoModelKernelUnits::mm;
+	  double Xhalfbg = Xtip_gt/2-0.002*Gaudi::Units::mm;
 	  double radiusg = Cenx[0]-Xtip_pb/2. - Xtips/2   ;   
 	  double Zhalfbg = (Bar_Z_cut-Zmin)/2.    ;
 	  std::string name        = baseName + "FrontBack::G10";
@@ -1086,14 +1083,14 @@ void LArGeo::BarrelConstruction::MakeEnvelope()
 	  m_ecamPhysicalNeg->add(st);
 #ifdef DEBUGGEO
           std::cout << "  Radial position G10 tip " << radiusg << std::endl;
-          std::cout << "  Phi0 (GeoModelKernelUnits::deg)" << Gama(0)/GeoModelKernelUnits::deg << std::endl;
+          std::cout << "  Phi0 (Gaudi::Units::deg)" << Gama(0)/Gaudi::Units::deg << std::endl;
           std::cout << "  Zposition in ECAM " << Zmin+Zhalfbg << std::endl;
 #endif
 
 	}
 	// Electrode
 	{
-	  double Xhalfbe = fb==FRONT ? Xtips/2 -0.002*GeoModelKernelUnits::mm      : Xtipt/2 - .004*GeoModelKernelUnits::mm;
+	  double Xhalfbe = fb==FRONT ? Xtips/2 -0.002*Gaudi::Units::mm      : Xtipt/2 - .004*Gaudi::Units::mm;
 	  double Zhalfbe = fb==FRONT ? (Bar_Z_cut-Zmin)/2.    : (Zmax - Zmin)/2;
 	  double radiuse = fb==FRONT ? Cenx[0] - Xtips/2   : Cenx[Nbrt] + Xtipt/2;
 	  std::string name        = baseName + "FrontBack::Electrode";
@@ -1119,7 +1116,7 @@ void LArGeo::BarrelConstruction::MakeEnvelope()
           else           std::cout << " *** Back  tip electrode " << std::endl;
           std::cout << " Box " << Xhalfbe << " " << Thel/2. << " " << Zhalfbe << std::endl;
           std::cout << " Radial position " << radiuse << std::endl;
-          std::cout << " Phi0 (GeoModelKernelUnits::deg)" << Game(0)/GeoModelKernelUnits::deg << std::endl;
+          std::cout << " Phi0 (Gaudi::Units::deg)" << Game(0)/Gaudi::Units::deg << std::endl;
           std::cout << " Z position in ECAM " << Zmin+Zhalfbe << std::endl;
 #endif
 
@@ -1136,7 +1133,7 @@ void LArGeo::BarrelConstruction::MakeEnvelope()
     //
 
 // GU 09/06/2004 add some safety in z size
-    double safety_zlen=0.050*GeoModelKernelUnits::mm;
+    double safety_zlen=0.050*Gaudi::Units::mm;
    
     for(int irl=0; irl<Nbrt; irl++)   // loop over zig-zag in radius
       {
@@ -1237,7 +1234,7 @@ void LArGeo::BarrelConstruction::MakeEnvelope()
 	      GeoGenfun::GENFUNCTION sinalfa = (da*dy +iparit*2.*Rint*dx)/Da/Da;
 	      GeoGenfun::GENFUNCTION newalpha = ATan2(sinalfa,cosalfa);       
 	   
-	      GeoGenfun::GENFUNCTION h1 = da/2. * frac  - .007*GeoModelKernelUnits::mm;
+	      GeoGenfun::GENFUNCTION h1 = da/2. * frac  - .007*Gaudi::Units::mm;
 	   
 	      double Zx0 = (tl1+bl1)/2.;
 // thick absorber pieces
@@ -1259,7 +1256,7 @@ void LArGeo::BarrelConstruction::MakeEnvelope()
                 } 
               }
 	    // translation in x to include thick absorber into thin absorber
-	      double Xtrans = (Xb1+Xt1)/2.-Zx0 + .007*GeoModelKernelUnits::mm;    
+	      double Xtrans = (Xb1+Xt1)/2.-Zx0 + .007*Gaudi::Units::mm;    
 
             // lengths that remain to be covered with the thin absorber
               double Xt2 = tl1-Xt1;
@@ -1267,8 +1264,8 @@ void LArGeo::BarrelConstruction::MakeEnvelope()
 
              // trabslation that would be needed to include think absorber only into overall thin+thick volume
               double Xtrans2 =  Zx0 - (Xb2+Xt2)/2.;
-              Xt2 = Xt2 -0.007*GeoModelKernelUnits::mm;
-              Xb2 = Xb2 -0.007*GeoModelKernelUnits::mm;
+              Xt2 = Xt2 -0.007*Gaudi::Units::mm;
+              Xb2 = Xb2 -0.007*Gaudi::Units::mm;
            
 	   
 	      GeoGenfun::GENFUNCTION alpha = ATan(0.5*(bl1-tl1)/h1);
@@ -1301,7 +1298,7 @@ void LArGeo::BarrelConstruction::MakeEnvelope()
 	        GeoXF::Pow(GeoTrf::TranslateY3D(1.0),Ycd) *
 	        GeoXF::Pow(GeoTrf::TranslateZ3D(1.0),Zcd) * 
 	        GeoXF::Pow(GeoTrf::RotateZ3D(1.0),-alfrot)*
-	        GeoTrf::RotateY3D(-90*GeoModelKernelUnits::deg);                    
+	        GeoTrf::RotateY3D(-90*Gaudi::Units::deg);                    
 
 	    // 
 
@@ -1739,7 +1736,7 @@ void LArGeo::BarrelConstruction::MakeEnvelope()
 	      GeoGenfun::GENFUNCTION Zcde       = GeoGenfun::FixedConstant(Zmin+(tl1+bl1)/2.+safety_zlen);
 	   
 	   
-	      GeoGenfun::GENFUNCTION h1e      = de/2.*frac - .007*GeoModelKernelUnits::mm;
+	      GeoGenfun::GENFUNCTION h1e      = de/2.*frac - .007*Gaudi::Units::mm;
 	      GeoGenfun::GENFUNCTION alpha_e  = ATan(0.5*(bl1-tl1)/h1e); 
 	   
 	   
@@ -1748,7 +1745,7 @@ void LArGeo::BarrelConstruction::MakeEnvelope()
 	        GeoXF::Pow(GeoTrf::TranslateY3D(1.0),Ycde) *
 	        GeoXF::Pow(GeoTrf::TranslateZ3D(1.0),Zcde) * 
 	        GeoXF::Pow(GeoTrf::RotateZ3D(1.0),-alfrote)*
-	        GeoTrf::RotateY3D(-90*GeoModelKernelUnits::deg);                    
+	        GeoTrf::RotateY3D(-90*Gaudi::Units::deg);                    
 	   
 	   
 	      for (int instance = 0; instance < Nelectrode; instance++) 
@@ -2111,7 +2108,7 @@ void LArGeo::BarrelConstruction::printParams()
        m_parameters->GetValue("LArEMBphiMaxBarrel") << std::endl;
   std::cout << "Number of zigs          " <<  
      m_parameters->GetValue("LArEMBnoOFAccZigs") << std::endl;
-  std::cout << "Fold GeoModelKernelUnits::rad of curvature   " << 
+  std::cout << "Fold Gaudi::Units::rad of curvature   " << 
      m_parameters->GetValue("LArEMBNeutFiberRadius") << std::endl;
   for (int i=0;i<15;i++) {
     std::cout << "Fold " << i << " radius " <<  
diff --git a/LArCalorimeter/LArGeoModel/LArGeoBarrel/src/BarrelCryostatConstruction.cxx b/LArCalorimeter/LArGeoModel/LArGeoBarrel/src/BarrelCryostatConstruction.cxx
index 9aeeec35266d8d4cdbf685e3e7a93286e1042956..08dbdb8dbc5205a46ba16d51df1f62fa3132f2a2 100755
--- a/LArCalorimeter/LArGeoModel/LArGeoBarrel/src/BarrelCryostatConstruction.cxx
+++ b/LArCalorimeter/LArGeoModel/LArGeoBarrel/src/BarrelCryostatConstruction.cxx
@@ -49,7 +49,7 @@
 // For transforms:
 #include "CLHEP/Geometry/Transform3D.h" 
 // For units:
-#include "CLHEP/Units/PhysicalConstants.h"
+#include "GaudiKernel/PhysicalConstants.h"
 // For Transformation Fields:
 #include "GeoGenericFunctions/Abs.h" 
 #include "GeoGenericFunctions/Mod.h"
@@ -243,9 +243,9 @@ GeoFullPhysVol* LArGeo::BarrelCryostatConstruction::GetEnvelope()
   // (LArVDetectorParameters) and adjust the volume geometry
   // accordingly.
 
-  //  double cryoMotherRin[]   = {1149.8*GeoModelKernelUnits::mm, 1149.8*GeoModelKernelUnits::mm,1149.8*GeoModelKernelUnits::mm,1149.8*GeoModelKernelUnits::mm,1149.8*GeoModelKernelUnits::mm,1149.8*GeoModelKernelUnits::mm};
-  //  double cryoMotherRout[]  = {2890. *GeoModelKernelUnits::mm, 2890. *GeoModelKernelUnits::mm,2250. *GeoModelKernelUnits::mm,2250. *GeoModelKernelUnits::mm,2890. *GeoModelKernelUnits::mm,2890. *GeoModelKernelUnits::mm};  
-  //  double cryoMotherZplan[] = {-3490.*GeoModelKernelUnits::mm,-2850.*GeoModelKernelUnits::mm,-2849.*GeoModelKernelUnits::mm, 2849.*GeoModelKernelUnits::mm, 2850.*GeoModelKernelUnits::mm, 3490.*GeoModelKernelUnits::mm};
+  //  double cryoMotherRin[]   = {1149.8*Gaudi::Units::mm, 1149.8*Gaudi::Units::mm,1149.8*Gaudi::Units::mm,1149.8*Gaudi::Units::mm,1149.8*Gaudi::Units::mm,1149.8*Gaudi::Units::mm};
+  //  double cryoMotherRout[]  = {2890. *Gaudi::Units::mm, 2890. *Gaudi::Units::mm,2250. *Gaudi::Units::mm,2250. *Gaudi::Units::mm,2890. *Gaudi::Units::mm,2890. *Gaudi::Units::mm};  
+  //  double cryoMotherZplan[] = {-3490.*Gaudi::Units::mm,-2850.*Gaudi::Units::mm,-2849.*Gaudi::Units::mm, 2849.*Gaudi::Units::mm, 2850.*Gaudi::Units::mm, 3490.*Gaudi::Units::mm};
 
   // Access source of detector parameters.
   //  VDetectorParameters* parameters = VDetectorParameters::GetInstance();
@@ -322,8 +322,8 @@ GeoFullPhysVol* LArGeo::BarrelCryostatConstruction::GetEnvelope()
       std::string cylName= cylStream.str();
 
       int cylNumber = currentRecord->getInt("CYL_NUMBER");
-      double zMin = currentRecord->getDouble("ZMIN")*GeoModelKernelUnits::cm;
-      double dZ   = currentRecord->getDouble("DZ")*GeoModelKernelUnits::cm;
+      double zMin = currentRecord->getDouble("ZMIN")*Gaudi::Units::cm;
+      double dZ   = currentRecord->getDouble("DZ")*Gaudi::Units::cm;
       double zInCryostat = zMin + dZ / 2.;
       
       if(m_fullGeo){
@@ -395,9 +395,9 @@ GeoFullPhysVol* LArGeo::BarrelCryostatConstruction::GetEnvelope()
       // For Reco Geometry construct only solenoid cylinders
       if(m_fullGeo || (10<=cylID && cylID<=14)) {
 	solidBarrelCylinder
-	  = new GeoTubs(currentRecord->getDouble("RMIN")*GeoModelKernelUnits::cm,
-			currentRecord->getDouble("RMIN")*GeoModelKernelUnits::cm + currentRecord->getDouble("DR")*GeoModelKernelUnits::cm,
-			currentRecord->getDouble("DZ")*GeoModelKernelUnits::cm / 2.,
+	  = new GeoTubs(currentRecord->getDouble("RMIN")*Gaudi::Units::cm,
+			currentRecord->getDouble("RMIN")*Gaudi::Units::cm + currentRecord->getDouble("DR")*Gaudi::Units::cm,
+			currentRecord->getDouble("DZ")*Gaudi::Units::cm / 2.,
 			(double) 0.,
 			dphi_all);
 
@@ -722,9 +722,9 @@ GeoFullPhysVol* LArGeo::BarrelCryostatConstruction::GetEnvelope()
   // sub-divided into sensitive-detector regions in the detector
   // routine.
 
-  //  double totalLArRin[]   = { 1565.5*GeoModelKernelUnits::mm, 1385.*GeoModelKernelUnits::mm, 1385.*GeoModelKernelUnits::mm, 1565.5*GeoModelKernelUnits::mm };
-  //  double totalLArRout[]  = { 2140. *GeoModelKernelUnits::mm, 2140.*GeoModelKernelUnits::mm, 2140.*GeoModelKernelUnits::mm, 2140. *GeoModelKernelUnits::mm };  
-  //  double totalLArZplan[] = {-3267. *GeoModelKernelUnits::mm,-3101.*GeoModelKernelUnits::mm, 3101.*GeoModelKernelUnits::mm, 3267. *GeoModelKernelUnits::mm };
+  //  double totalLArRin[]   = { 1565.5*Gaudi::Units::mm, 1385.*Gaudi::Units::mm, 1385.*Gaudi::Units::mm, 1565.5*Gaudi::Units::mm };
+  //  double totalLArRout[]  = { 2140. *Gaudi::Units::mm, 2140.*Gaudi::Units::mm, 2140.*Gaudi::Units::mm, 2140. *Gaudi::Units::mm };  
+  //  double totalLArZplan[] = {-3267. *Gaudi::Units::mm,-3101.*Gaudi::Units::mm, 3101.*Gaudi::Units::mm, 3267. *Gaudi::Units::mm };
     
   GeoPcon* totalLArShape =
     new GeoPcon(0.,                     // starting phi
@@ -763,11 +763,11 @@ GeoFullPhysVol* LArGeo::BarrelCryostatConstruction::GetEnvelope()
   // to this shape to allow for mis-alignments in other dimensions.)
 
   // increase internal radius to allow misalignments
-  // -----------------------------------------------  double rInShift = 0.*GeoModelKernelUnits::mm;
+  // -----------------------------------------------  double rInShift = 0.*Gaudi::Units::mm;
 
-  //  double halfLArZplan[] = { 3.0 *GeoModelKernelUnits::mm, 3101.*GeoModelKernelUnits::mm, 3267. *GeoModelKernelUnits::mm };
-  //  double halfLArRin[]   = {1385.*GeoModelKernelUnits::mm + rInShift, 1385.*GeoModelKernelUnits::mm + rInShift, 1565.5*GeoModelKernelUnits::mm  + rInShift};
-  //  double halfLArRout[]  = {2140.*GeoModelKernelUnits::mm, 2140.*GeoModelKernelUnits::mm, 2140. *GeoModelKernelUnits::mm };  
+  //  double halfLArZplan[] = { 3.0 *Gaudi::Units::mm, 3101.*Gaudi::Units::mm, 3267. *Gaudi::Units::mm };
+  //  double halfLArRin[]   = {1385.*Gaudi::Units::mm + rInShift, 1385.*Gaudi::Units::mm + rInShift, 1565.5*Gaudi::Units::mm  + rInShift};
+  //  double halfLArRout[]  = {2140.*Gaudi::Units::mm, 2140.*Gaudi::Units::mm, 2140. *Gaudi::Units::mm };  
     
   std::string halfLArName = "LAr::Barrel::Cryostat::HalfLAr";
   GeoPcon* halfLArShape =
@@ -810,7 +810,7 @@ GeoFullPhysVol* LArGeo::BarrelCryostatConstruction::GetEnvelope()
 
   // add alignable transform
   totalLArPhysical->add(xfHalfLArNeg);
-  totalLArPhysical->add( new GeoTransform(GeoTrf::RotateY3D(180.*GeoModelKernelUnits::deg)) );
+  totalLArPhysical->add( new GeoTransform(GeoTrf::RotateY3D(180.*Gaudi::Units::deg)) );
   totalLArPhysical->add(halfLArPhysicalNeg);
   
   {
@@ -865,9 +865,9 @@ GeoFullPhysVol* LArGeo::BarrelCryostatConstruction::GetEnvelope()
 	  std::string cylName= cylStream.str(); 
 
 	  GeoTubs* solidBarrelCylinder 
-	  = new GeoTubs(currentRecord->getDouble("RMIN")*GeoModelKernelUnits::cm,
-			currentRecord->getDouble("RMIN")*GeoModelKernelUnits::cm + currentRecord->getDouble("DR")*GeoModelKernelUnits::cm,
-			currentRecord->getDouble("DZ")*GeoModelKernelUnits::cm / 2.,
+	  = new GeoTubs(currentRecord->getDouble("RMIN")*Gaudi::Units::cm,
+			currentRecord->getDouble("RMIN")*Gaudi::Units::cm + currentRecord->getDouble("DR")*Gaudi::Units::cm,
+			currentRecord->getDouble("DZ")*Gaudi::Units::cm / 2.,
 			(double) 0.,
 			dphi_all);
     
@@ -876,7 +876,7 @@ GeoFullPhysVol* LArGeo::BarrelCryostatConstruction::GetEnvelope()
 	  
 	  GeoPhysVol* physBarrelCylinder = new GeoPhysVol(logicBarrelCylinder);
 	  
-	  double zInCryostat = currentRecord->getDouble("ZMIN")*GeoModelKernelUnits::cm + currentRecord->getDouble("DZ")*GeoModelKernelUnits::cm / 2.;
+	  double zInCryostat = currentRecord->getDouble("ZMIN")*Gaudi::Units::cm + currentRecord->getDouble("DZ")*Gaudi::Units::cm / 2.;
 	  
 	  int cylNumber = currentRecord->getInt("CYL_NUMBER");
 	  
@@ -913,8 +913,8 @@ GeoFullPhysVol* LArGeo::BarrelCryostatConstruction::GetEnvelope()
   }
   {
     // ----- Presampler ------    
-    double PresamplerMother_length = 1549.0*GeoModelKernelUnits::mm;  // Copied from PresParameterDef.icc
-    double presamplerShift = 3.*GeoModelKernelUnits::mm;
+    double PresamplerMother_length = 1549.0*Gaudi::Units::mm;  // Copied from PresParameterDef.icc
+    double presamplerShift = 3.*Gaudi::Units::mm;
     BarrelPresamplerConstruction barrelPSConstruction(m_fullGeo);
     
     // The "envelope" determined by the EMB should be a GeoFullPhysVol.
@@ -957,7 +957,7 @@ GeoFullPhysVol* LArGeo::BarrelCryostatConstruction::GetEnvelope()
       throw std::runtime_error(message.c_str());
     }
 
-    GeoPcon* pcon = new GeoPcon(startPhi*GeoModelKernelUnits::deg,dPhi*GeoModelKernelUnits::deg);
+    GeoPcon* pcon = new GeoPcon(startPhi*Gaudi::Units::deg,dPhi*Gaudi::Units::deg);
 
     for(unsigned int ii=0; ii<sctEcCoolingPlanes.size(); ii++) {
       iter = sctEcCoolingPlanes.find(ii);
@@ -979,9 +979,9 @@ GeoFullPhysVol* LArGeo::BarrelCryostatConstruction::GetEnvelope()
     GeoPhysVol* sctCiCoolingPhys = new GeoPhysVol(sctCiCoolingLog);
 
     GeoTransform* xfPos1 = new GeoTransform(GeoTrf::Transform3D::Identity());
-    GeoTransform* xfPos2 = new GeoTransform(GeoTrf::RotateZ3D(180*GeoModelKernelUnits::deg));
-    GeoTransform* xfNeg1 = new GeoTransform(GeoTrf::RotateZ3D((180+2*centerPhi)*GeoModelKernelUnits::deg)*GeoTrf::RotateY3D(180*GeoModelKernelUnits::deg));
-    GeoTransform* xfNeg2 = new GeoTransform(GeoTrf::RotateZ3D(2*centerPhi*GeoModelKernelUnits::deg)*GeoTrf::RotateY3D(180*GeoModelKernelUnits::deg));
+    GeoTransform* xfPos2 = new GeoTransform(GeoTrf::RotateZ3D(180*Gaudi::Units::deg));
+    GeoTransform* xfNeg1 = new GeoTransform(GeoTrf::RotateZ3D((180+2*centerPhi)*Gaudi::Units::deg)*GeoTrf::RotateY3D(180*Gaudi::Units::deg));
+    GeoTransform* xfNeg2 = new GeoTransform(GeoTrf::RotateZ3D(2*centerPhi*Gaudi::Units::deg)*GeoTrf::RotateY3D(180*Gaudi::Units::deg));
     
     m_cryoMotherPhysical->add(xfPos1);
     m_cryoMotherPhysical->add(sctCiCoolingPhys);
diff --git a/LArCalorimeter/LArGeoModel/LArGeoBarrel/src/BarrelDMConstruction.cxx b/LArCalorimeter/LArGeoModel/LArGeoBarrel/src/BarrelDMConstruction.cxx
index eb57b265ddd48c77297c26686ca6a3601b92985f..22939866b91c31a2301511bf17011b1740006221 100755
--- a/LArCalorimeter/LArGeoModel/LArGeoBarrel/src/BarrelDMConstruction.cxx
+++ b/LArCalorimeter/LArGeoModel/LArGeoBarrel/src/BarrelDMConstruction.cxx
@@ -30,6 +30,7 @@
 #include "GeoModelKernel/GeoShapeUnion.h"
 #include "GeoModelKernel/GeoShapeShift.h"
 #include "GeoModelKernel/GeoShapeSubtraction.h"
+#include "GeoModelKernel/Units.h"
 #include "StoreGate/StoreGateSvc.h"
 #include "GeoModelInterfaces/AbsMaterialManager.h"
 #include "GeoModelInterfaces/StoredMaterialManager.h"
@@ -44,7 +45,7 @@
 #include "CLHEP/Vector/Rotation.h"
 
 // For units:
-#include "CLHEP/Units/PhysicalConstants.h"
+#include "GaudiKernel/PhysicalConstants.h"
 #include "GaudiKernel/MsgStream.h"
 #include "GaudiKernel/Bootstrap.h"
 
@@ -71,7 +72,7 @@ namespace BarrelDM {
 
 
 static const unsigned int NCrates=16;
-static const double Alfa=360*GeoModelKernelUnits::deg/NCrates;
+static const double Alfa=360*Gaudi::Units::deg/NCrates;
 static const double Enda=1155;
 static const double Endb=1695.2;
 static const double Endc=2771.6;
@@ -176,8 +177,8 @@ createSectorEnvelopes2FromDB (GeoFullPhysVol* envelope,
   const GeoMaterial *alu               = materialManager.getMaterial("std::Aluminium"); //2.7 g/cm3
   const GeoMaterial *air               = materialManager.getMaterial("std::Air"); //0.001214 g/cm3
 
-  GeoTrf::Transform3D Cut3Boxe  = GeoTrf::Translate3D(Boxxtr, Boxytr, Boxztr)*GeoTrf::RotateX3D(-20*GeoModelKernelUnits::deg)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg);
-  GeoTrf::Transform3D Cut4Boxe  = GeoTrf::Translate3D(Boxxtr, -Boxytr,Boxztr)*GeoTrf::RotateX3D(20*GeoModelKernelUnits::deg)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg);
+  GeoTrf::Transform3D Cut3Boxe  = GeoTrf::Translate3D(Boxxtr, Boxytr, Boxztr)*GeoTrf::RotateX3D(-20*Gaudi::Units::deg)*GeoTrf::RotateY3D(90*Gaudi::Units::deg);
+  GeoTrf::Transform3D Cut4Boxe  = GeoTrf::Translate3D(Boxxtr, -Boxytr,Boxztr)*GeoTrf::RotateX3D(20*Gaudi::Units::deg)*GeoTrf::RotateY3D(90*Gaudi::Units::deg);
 
   // build 5 instances of SectorEnvelopes1 with 3 different materials!
   GeoTrd   *Trdair2  = new GeoTrd(SecE2xhlen1, SecE2xhlen2, DYb, DYc, (Endc-Endb)/2);
@@ -195,28 +196,28 @@ createSectorEnvelopes2FromDB (GeoFullPhysVol* envelope,
   GeoPhysVol *sectorenvelopes2l    = new GeoPhysVol(lvse2l);  // for left-handed splice boxes
     
   GeoLogVol  *lvse2h          = new GeoLogVol("LAr::DM::SectorEnvelopes2h",&SectorEnvelopes,matLArServices19);
-  GeoPhysVol *sectorenvelopes2h    = new GeoPhysVol(lvse2h);  // no splice boxes horizontal at 0 & 180 GeoModelKernelUnits::deg.
+  GeoPhysVol *sectorenvelopes2h    = new GeoPhysVol(lvse2h);  // no splice boxes horizontal at 0 & 180 Gaudi::Units::deg.
     
   GeoLogVol  *lvse2vup          = new GeoLogVol("LAr::DM::SectorEnvelopes2vup",&SectorEnvelopes,matLArServices17);
-  GeoPhysVol *sectorenvelopes2vup    = new GeoPhysVol(lvse2vup);  // no splice boxes vertical up at 90 GeoModelKernelUnits::deg
+  GeoPhysVol *sectorenvelopes2vup    = new GeoPhysVol(lvse2vup);  // no splice boxes vertical up at 90 Gaudi::Units::deg
     
   GeoLogVol  *lvse2vd          = new GeoLogVol("LAr::DM::SectorEnvelopes2Vd",&SectorEnvelopes,matLArServices18);
-  GeoPhysVol *sectorenvelopes2vd    = new GeoPhysVol(lvse2vd);  // no splice boxes vertical down at 270 GeoModelKernelUnits::deg
+  GeoPhysVol *sectorenvelopes2vd    = new GeoPhysVol(lvse2vd);  // no splice boxes vertical down at 270 Gaudi::Units::deg
 
   //---------- Build Splice boxes for InDet optical fibers--------
     
   GeoTrap  *GeoTrap1  = new GeoTrap(Spb1zhlen, Spb1theta, Spb1phi, Spb1yzn, Spb1xynzn, Spb1xypzn, Spb1angn, Spb1yzp, Spb1xynzp, Spb1xypzp, Spb1angp);
   GeoBox   *Box1   = new GeoBox(SplBoxhlen, SplBoxhwdt, SplBoxhhgt);  
   const GeoShape & SpliceBox = ((*GeoTrap1).
-                                subtract(*Box1 << GeoTrf::TranslateZ3D(SplBoxztr)*GeoTrf::TranslateY3D(-SplBoxytr)*GeoTrf::RotateX3D(SplBoxxrot*GeoModelKernelUnits::deg)));
+                                subtract(*Box1 << GeoTrf::TranslateZ3D(SplBoxztr)*GeoTrf::TranslateY3D(-SplBoxytr)*GeoTrf::RotateX3D(SplBoxxrot*Gaudi::Units::deg)));
     
-  GeoTransform *xtr = new GeoTransform (GeoTrf::TranslateZ3D(Spb1ztr)*GeoTrf::TranslateY3D(-Spb1ytr)*GeoTrf::TranslateX3D(Spb1xtr)*GeoTrf::RotateX3D(Spb1xrot*GeoModelKernelUnits::deg));
+  GeoTransform *xtr = new GeoTransform (GeoTrf::TranslateZ3D(Spb1ztr)*GeoTrf::TranslateY3D(-Spb1ytr)*GeoTrf::TranslateX3D(Spb1xtr)*GeoTrf::RotateX3D(Spb1xrot*Gaudi::Units::deg));
   sectorenvelopes2r->add(xtr);
   GeoLogVol  *lvspbr     = new GeoLogVol("LAr::DM::SPliceBoxr",&SpliceBox,alu); 
   GeoPhysVol *spliceboxr       = new GeoPhysVol(lvspbr);
   sectorenvelopes2r->add(spliceboxr);
     
-  GeoTransform *xtl = new GeoTransform (GeoTrf::TranslateZ3D(Spb1ztr)*GeoTrf::TranslateY3D(-Spb1ytr)*GeoTrf::TranslateX3D(Spb1xtr)*GeoTrf::RotateY3D(-180*GeoModelKernelUnits::deg)*GeoTrf::RotateX3D(-(Alfa/2)));
+  GeoTransform *xtl = new GeoTransform (GeoTrf::TranslateZ3D(Spb1ztr)*GeoTrf::TranslateY3D(-Spb1ytr)*GeoTrf::TranslateX3D(Spb1xtr)*GeoTrf::RotateY3D(-180*Gaudi::Units::deg)*GeoTrf::RotateX3D(-(Alfa/2)));
   sectorenvelopes2l->add(xtl);
   GeoLogVol  *lvspbl     = new GeoLogVol("LAr::DM::SpliceBoxl",&SpliceBox,alu);  
   GeoPhysVol *spliceboxl       = new GeoPhysVol(lvspbl);
@@ -227,7 +228,7 @@ createSectorEnvelopes2FromDB (GeoFullPhysVol* envelope,
   GeoTrap  *GeoTrap2  = new GeoTrap(Spb2zhlen, Spb2theta, Spb2phi, Spb2yzn, Spb2xynzn, Spb2xypzn, Spb2angn, Spb2yzp, Spb2xynzp, Spb2xypzp, Spb2angp);
   GeoTrap  *GeoTrap3  = new GeoTrap(Spb3zhlen, Spb3theta, Spb3phi, Spb3yzn, Spb3xynzn, Spb3xypzn, Spb3angn, Spb3yzp, Spb3xynzp, Spb3xypzp, Spb3angp);
     
-  GeoTransform *xt1 = new GeoTransform (GeoTrf::TranslateY3D(-Spb0ytr)*GeoTrf::RotateX3D(Spb0xrot*GeoModelKernelUnits::deg));
+  GeoTransform *xt1 = new GeoTransform (GeoTrf::TranslateY3D(-Spb0ytr)*GeoTrf::RotateX3D(Spb0xrot*Gaudi::Units::deg));
   spliceboxr->add(xt1);
   spliceboxl->add(xt1);
   GeoLogVol  *lt1     = new GeoLogVol("LAr::DM::TBox1",Trd1,air);
@@ -253,16 +254,16 @@ createSectorEnvelopes2FromDB (GeoFullPhysVol* envelope,
 
   //-------------- Place volumes in LAr Envelope -------------------
 
-  TRANSFUNCTION seA2r = Pow(GeoTrf::RotateZ3D(1.0),8*f-(3*Alfa/2))*GeoTrf::TranslateX3D((Endb+Endc)/2)*GeoTrf::TranslateZ3D(SecE2ztr)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg);
-  TRANSFUNCTION seA2l = Pow(GeoTrf::RotateZ3D(1.0),8*f+(5*Alfa/2))*GeoTrf::TranslateX3D((Endb+Endc)/2)*GeoTrf::TranslateZ3D(SecE2ztr)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg);
-  TRANSFUNCTION seC2r = Pow(GeoTrf::RotateZ3D(1.0),8*f-(3*Alfa/2))*GeoTrf::TranslateX3D((Endb+Endc)/2)*GeoTrf::TranslateZ3D(-SecE2ztr)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg);
-  TRANSFUNCTION seC2l = Pow(GeoTrf::RotateZ3D(1.0),8*f+(5*Alfa/2))*GeoTrf::TranslateX3D((Endb+Endc)/2)*GeoTrf::TranslateZ3D(-SecE2ztr)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg);
-  TRANSFUNCTION seA2Vup = Pow(GeoTrf::RotateZ3D(1.0),f+(9*Alfa/2))*GeoTrf::TranslateX3D((Endb+Endc)/2)*GeoTrf::TranslateZ3D(SecE2ztr)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg);
-  TRANSFUNCTION seA2Vd = Pow(GeoTrf::RotateZ3D(1.0),f-(7*Alfa/2))*GeoTrf::TranslateX3D((Endb+Endc)/2)*GeoTrf::TranslateZ3D(SecE2ztr)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg);
-  TRANSFUNCTION seA2H = Pow(GeoTrf::RotateZ3D(1.0),8*f+(Alfa/2))*GeoTrf::TranslateX3D((Endb+Endc)/2)*GeoTrf::TranslateZ3D(SecE2ztr)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg);
-  TRANSFUNCTION seC2Vup = Pow(GeoTrf::RotateZ3D(1.0),f+(9*Alfa/2))*GeoTrf::TranslateX3D((Endb+Endc)/2)*GeoTrf::TranslateZ3D(-SecE2ztr)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg);
-  TRANSFUNCTION seC2Vd = Pow(GeoTrf::RotateZ3D(1.0),f-(7*Alfa/2))*GeoTrf::TranslateX3D((Endb+Endc)/2)*GeoTrf::TranslateZ3D(-SecE2ztr)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg);
-  TRANSFUNCTION seC2H = Pow(GeoTrf::RotateZ3D(1.0),8*f+(Alfa/2))*GeoTrf::TranslateX3D((Endb+Endc)/2)*GeoTrf::TranslateZ3D(-SecE2ztr)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg);
+  TRANSFUNCTION seA2r = Pow(GeoTrf::RotateZ3D(1.0),8*f-(3*Alfa/2))*GeoTrf::TranslateX3D((Endb+Endc)/2)*GeoTrf::TranslateZ3D(SecE2ztr)*GeoTrf::RotateY3D(90*Gaudi::Units::deg);
+  TRANSFUNCTION seA2l = Pow(GeoTrf::RotateZ3D(1.0),8*f+(5*Alfa/2))*GeoTrf::TranslateX3D((Endb+Endc)/2)*GeoTrf::TranslateZ3D(SecE2ztr)*GeoTrf::RotateY3D(90*Gaudi::Units::deg);
+  TRANSFUNCTION seC2r = Pow(GeoTrf::RotateZ3D(1.0),8*f-(3*Alfa/2))*GeoTrf::TranslateX3D((Endb+Endc)/2)*GeoTrf::TranslateZ3D(-SecE2ztr)*GeoTrf::RotateY3D(90*Gaudi::Units::deg);
+  TRANSFUNCTION seC2l = Pow(GeoTrf::RotateZ3D(1.0),8*f+(5*Alfa/2))*GeoTrf::TranslateX3D((Endb+Endc)/2)*GeoTrf::TranslateZ3D(-SecE2ztr)*GeoTrf::RotateY3D(90*Gaudi::Units::deg);
+  TRANSFUNCTION seA2Vup = Pow(GeoTrf::RotateZ3D(1.0),f+(9*Alfa/2))*GeoTrf::TranslateX3D((Endb+Endc)/2)*GeoTrf::TranslateZ3D(SecE2ztr)*GeoTrf::RotateY3D(90*Gaudi::Units::deg);
+  TRANSFUNCTION seA2Vd = Pow(GeoTrf::RotateZ3D(1.0),f-(7*Alfa/2))*GeoTrf::TranslateX3D((Endb+Endc)/2)*GeoTrf::TranslateZ3D(SecE2ztr)*GeoTrf::RotateY3D(90*Gaudi::Units::deg);
+  TRANSFUNCTION seA2H = Pow(GeoTrf::RotateZ3D(1.0),8*f+(Alfa/2))*GeoTrf::TranslateX3D((Endb+Endc)/2)*GeoTrf::TranslateZ3D(SecE2ztr)*GeoTrf::RotateY3D(90*Gaudi::Units::deg);
+  TRANSFUNCTION seC2Vup = Pow(GeoTrf::RotateZ3D(1.0),f+(9*Alfa/2))*GeoTrf::TranslateX3D((Endb+Endc)/2)*GeoTrf::TranslateZ3D(-SecE2ztr)*GeoTrf::RotateY3D(90*Gaudi::Units::deg);
+  TRANSFUNCTION seC2Vd = Pow(GeoTrf::RotateZ3D(1.0),f-(7*Alfa/2))*GeoTrf::TranslateX3D((Endb+Endc)/2)*GeoTrf::TranslateZ3D(-SecE2ztr)*GeoTrf::RotateY3D(90*Gaudi::Units::deg);
+  TRANSFUNCTION seC2H = Pow(GeoTrf::RotateZ3D(1.0),8*f+(Alfa/2))*GeoTrf::TranslateX3D((Endb+Endc)/2)*GeoTrf::TranslateZ3D(-SecE2ztr)*GeoTrf::RotateY3D(90*Gaudi::Units::deg);
     
   GeoSerialTransformer *setA2r = new GeoSerialTransformer(sectorenvelopes2r,&seA2r, 2);
   GeoSerialTransformer *setA2l = new GeoSerialTransformer(sectorenvelopes2l,&seA2l, 2);
@@ -311,12 +312,12 @@ createBridgeEnvelopesFromDB (GeoFullPhysVol* envelope,
   double BridgeExtr = r->getDouble("XTR");
   double BridgeEztr = r->getDouble("ZTR");
 
-  GeoTrap  *Trapair  = new GeoTrap(BridgeEzhlen, BridgeEtheta*GeoModelKernelUnits::deg, BridgeEphi, BridgeEyzn, BridgeExynzn, BridgeExypzn, BridgeEangn, BridgeEyzp, BridgeExynzp, BridgeExypzp, BridgeEangp);
+  GeoTrap  *Trapair  = new GeoTrap(BridgeEzhlen, BridgeEtheta*Gaudi::Units::deg, BridgeEphi, BridgeEyzn, BridgeExynzn, BridgeExypzn, BridgeEangn, BridgeEyzp, BridgeExynzp, BridgeExypzp, BridgeEangp);
   GeoLogVol  *lvbre        = new GeoLogVol("LAr::DM::BridgeEnvelopes",Trapair,matLArServices8);//In the end Density at least >= than SE1 because of Cryo Pipes
   GeoPhysVol *bridgeenvelopes    = new GeoPhysVol(lvbre);
 
-  TRANSFUNCTION breA = Pow(GeoTrf::RotateZ3D(1.0),f-(Alfa/2))*GeoTrf::TranslateX3D(BridgeExtr)*GeoTrf::TranslateZ3D(BridgeEztr)*GeoTrf::RotateZ3D(90*GeoModelKernelUnits::deg)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg)*GeoTrf::RotateX3D(90*GeoModelKernelUnits::deg);
-  TRANSFUNCTION breC = Pow(GeoTrf::RotateZ3D(1.0),f-(Alfa/2))*GeoTrf::TranslateX3D(BridgeExtr)*GeoTrf::TranslateZ3D(-BridgeEztr)*GeoTrf::RotateZ3D(-90*GeoModelKernelUnits::deg)*GeoTrf::RotateY3D(-90*GeoModelKernelUnits::deg)*GeoTrf::RotateX3D(-90*GeoModelKernelUnits::deg);
+  TRANSFUNCTION breA = Pow(GeoTrf::RotateZ3D(1.0),f-(Alfa/2))*GeoTrf::TranslateX3D(BridgeExtr)*GeoTrf::TranslateZ3D(BridgeEztr)*GeoTrf::RotateZ3D(90*Gaudi::Units::deg)*GeoTrf::RotateY3D(90*Gaudi::Units::deg)*GeoTrf::RotateX3D(90*Gaudi::Units::deg);
+  TRANSFUNCTION breC = Pow(GeoTrf::RotateZ3D(1.0),f-(Alfa/2))*GeoTrf::TranslateX3D(BridgeExtr)*GeoTrf::TranslateZ3D(-BridgeEztr)*GeoTrf::RotateZ3D(-90*Gaudi::Units::deg)*GeoTrf::RotateY3D(-90*Gaudi::Units::deg)*GeoTrf::RotateX3D(-90*Gaudi::Units::deg);
   GeoSerialTransformer *bretA = new GeoSerialTransformer(bridgeenvelopes,&breA, NCrates);
   GeoSerialTransformer *bretC = new GeoSerialTransformer(bridgeenvelopes,&breC, NCrates);
   envelope->add(bretA);
@@ -345,8 +346,8 @@ createBaseEnvelopesFromDB (GeoFullPhysVol* envelope,
   GeoLogVol  *lvbe          = new GeoLogVol("LAr::DM::BaseEnvelopes",Trd1air,matLArServices8); //In the end Density at least >= than SE1 because of Cryo Pipes
   GeoPhysVol *baseenvelopes    = new GeoPhysVol(lvbe);
 
-  TRANSFUNCTION beA = Pow(GeoTrf::RotateZ3D(1.0),f-(Alfa/2))*GeoTrf::TranslateX3D(BaseExtr)*GeoTrf::TranslateZ3D(BaseEztr)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg); 
-  TRANSFUNCTION beC = Pow(GeoTrf::RotateZ3D(1.0),f+(Alfa/2))*GeoTrf::TranslateX3D(BaseExtr)*GeoTrf::TranslateZ3D(-BaseEztr)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg);
+  TRANSFUNCTION beA = Pow(GeoTrf::RotateZ3D(1.0),f-(Alfa/2))*GeoTrf::TranslateX3D(BaseExtr)*GeoTrf::TranslateZ3D(BaseEztr)*GeoTrf::RotateY3D(90*Gaudi::Units::deg); 
+  TRANSFUNCTION beC = Pow(GeoTrf::RotateZ3D(1.0),f+(Alfa/2))*GeoTrf::TranslateX3D(BaseExtr)*GeoTrf::TranslateZ3D(-BaseEztr)*GeoTrf::RotateY3D(90*Gaudi::Units::deg);
   GeoSerialTransformer *betA = new GeoSerialTransformer(baseenvelopes,&beA, NCrates);
   GeoSerialTransformer *betC = new GeoSerialTransformer(baseenvelopes,&beC, NCrates);
   envelope->add(betA);
@@ -476,9 +477,9 @@ void createFromDB (GeoFullPhysVol* envelope,
   GeoTube    *Ped2     = new GeoTube(ped2minr, ped2maxr, ped2zhlen);
   GeoTube    *Ped3     = new GeoTube(ped3minr,ped3maxr , ped3zhlen);  
   const GeoShape & CratePed=((*Pedestal).subtract(*Ped1).
-                             subtract((*Ped2)  <<GeoTrf::TranslateY3D(-ped2ytr)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg)).
+                             subtract((*Ped2)  <<GeoTrf::TranslateY3D(-ped2ytr)*GeoTrf::RotateY3D(90*Gaudi::Units::deg)).
                              subtract((*Ped3)  <<GeoTrf::TranslateX3D(-ped3xtr)).
-                             subtract((*Ped2)  <<GeoTrf::TranslateY3D(ped2ytr)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg)));
+                             subtract((*Ped2)  <<GeoTrf::TranslateY3D(ped2ytr)*GeoTrf::RotateY3D(90*Gaudi::Units::deg)));
   
   GeoLogVol  *lvped   = new GeoLogVol("LAr::DM::Ped",&CratePed,alu);
   GeoPhysVol *pedestal   = new GeoPhysVol(lvped);
@@ -568,8 +569,8 @@ void createFromDB (GeoFullPhysVol* envelope,
   // transforms
   GeoBox   *Box   = new GeoBox(Boxhlen, Boxhwdt, Boxhhgt);
  
-  GeoTrf::Transform3D Cut3Boxp  = GeoTrf::Translate3D(Boxxtr, Boxytr, Boxxrot)*GeoTrf::RotateX3D(-20*GeoModelKernelUnits::deg)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg);
-  GeoTrf::Transform3D Cut4Boxp  = GeoTrf::Translate3D(Boxxtr, -Boxytr,Boxxrot)*GeoTrf::RotateX3D(20*GeoModelKernelUnits::deg)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg);
+  GeoTrf::Transform3D Cut3Boxp  = GeoTrf::Translate3D(Boxxtr, Boxytr, Boxxrot)*GeoTrf::RotateX3D(-20*Gaudi::Units::deg)*GeoTrf::RotateY3D(90*Gaudi::Units::deg);
+  GeoTrf::Transform3D Cut4Boxp  = GeoTrf::Translate3D(Boxxtr, -Boxytr,Boxxrot)*GeoTrf::RotateX3D(20*Gaudi::Units::deg)*GeoTrf::RotateY3D(90*Gaudi::Units::deg);
     
   // ----- build sector envelopes -----
   // build 16 instances of SectorEnvelopes1 each with its own material!
@@ -723,7 +724,7 @@ void createFromDB (GeoFullPhysVol* envelope,
   GeoPhysVol *baseplates    = new GeoPhysVol(lvbp);
     
   // ----- build bridge plates -----
-  GeoTrap  *Trapalu  = new GeoTrap(BridgePzhlen, BridgePtheta*GeoModelKernelUnits::deg, BridgePphi, BridgePyzn, BridgePxynzn, BridgePxypzn, BridgePangn, BridgePyzp, BridgePxynzp, BridgePxypzp, BridgePangp); 
+  GeoTrap  *Trapalu  = new GeoTrap(BridgePzhlen, BridgePtheta*Gaudi::Units::deg, BridgePphi, BridgePyzn, BridgePxynzn, BridgePxypzn, BridgePangn, BridgePyzp, BridgePxynzp, BridgePxypzp, BridgePangp); 
   GeoLogVol  *lvbrp          = new GeoLogVol("LAr::DM::BridgePlates",Trapalu,alu);
   GeoPhysVol *bridgeplates    = new GeoPhysVol(lvbrp);
     
@@ -740,18 +741,18 @@ void createFromDB (GeoFullPhysVol* envelope,
   //-------------- Place volumes in LAr Envelope -------------------
     
   //sectorPlates
-  TRANSFUNCTION spA = Pow(GeoTrf::RotateZ3D(1.0),f-(Alfa/2))*GeoTrf::TranslateX3D(SecPxtr)*GeoTrf::TranslateZ3D(SecPztr)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg);///
-  TRANSFUNCTION spC = Pow(GeoTrf::RotateZ3D(1.0),f+(Alfa/2))*GeoTrf::TranslateX3D(SecPxtr)*GeoTrf::TranslateZ3D(-SecPztr)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg);///
+  TRANSFUNCTION spA = Pow(GeoTrf::RotateZ3D(1.0),f-(Alfa/2))*GeoTrf::TranslateX3D(SecPxtr)*GeoTrf::TranslateZ3D(SecPztr)*GeoTrf::RotateY3D(90*Gaudi::Units::deg);///
+  TRANSFUNCTION spC = Pow(GeoTrf::RotateZ3D(1.0),f+(Alfa/2))*GeoTrf::TranslateX3D(SecPxtr)*GeoTrf::TranslateZ3D(-SecPztr)*GeoTrf::RotateY3D(90*Gaudi::Units::deg);///
   GeoSerialTransformer *sptA = new GeoSerialTransformer(sectorplates,&spA, NCrates);
   GeoSerialTransformer *sptC = new GeoSerialTransformer(sectorplates,&spC, NCrates);
   envelope->add(sptA);
   envelope->add(sptC);
     
   //bridgePlates
-  TRANSFUNCTION brpA1 = Pow(GeoTrf::RotateZ3D(1.0),f-(5*Alfa/2))*GeoTrf::TranslateX3D(BridgePxtr)*GeoTrf::TranslateZ3D(BridgePztr)*GeoTrf::RotateZ3D(90*GeoModelKernelUnits::deg)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg)*GeoTrf::RotateX3D(90*GeoModelKernelUnits::deg);
-  TRANSFUNCTION brpA2 = Pow(GeoTrf::RotateZ3D(1.0),f+(13*Alfa/2))*GeoTrf::TranslateX3D(BridgePxtr)*GeoTrf::TranslateZ3D(BridgePztr)*GeoTrf::RotateZ3D(90*GeoModelKernelUnits::deg)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg)*GeoTrf::RotateX3D(90*GeoModelKernelUnits::deg); 
-  TRANSFUNCTION brpC1 = Pow(GeoTrf::RotateZ3D(1.0),f-(5*Alfa/2))*GeoTrf::TranslateX3D(BridgePxtr)*GeoTrf::TranslateZ3D(-BridgePztr)*GeoTrf::RotateZ3D(-90*GeoModelKernelUnits::deg)*GeoTrf::RotateY3D(-90*GeoModelKernelUnits::deg)*GeoTrf::RotateX3D(-90*GeoModelKernelUnits::deg);
-  TRANSFUNCTION brpC2 = Pow(GeoTrf::RotateZ3D(1.0),f+(13*Alfa/2))*GeoTrf::TranslateX3D(BridgePxtr)*GeoTrf::TranslateZ3D(-BridgePztr)*GeoTrf::RotateZ3D(-90*GeoModelKernelUnits::deg)*GeoTrf::RotateY3D(-90*GeoModelKernelUnits::deg)*GeoTrf::RotateX3D(-90*GeoModelKernelUnits::deg);   GeoSerialTransformer *brptA1 = new GeoSerialTransformer(bridgeplates,&brpA1, 5);
+  TRANSFUNCTION brpA1 = Pow(GeoTrf::RotateZ3D(1.0),f-(5*Alfa/2))*GeoTrf::TranslateX3D(BridgePxtr)*GeoTrf::TranslateZ3D(BridgePztr)*GeoTrf::RotateZ3D(90*Gaudi::Units::deg)*GeoTrf::RotateY3D(90*Gaudi::Units::deg)*GeoTrf::RotateX3D(90*Gaudi::Units::deg);
+  TRANSFUNCTION brpA2 = Pow(GeoTrf::RotateZ3D(1.0),f+(13*Alfa/2))*GeoTrf::TranslateX3D(BridgePxtr)*GeoTrf::TranslateZ3D(BridgePztr)*GeoTrf::RotateZ3D(90*Gaudi::Units::deg)*GeoTrf::RotateY3D(90*Gaudi::Units::deg)*GeoTrf::RotateX3D(90*Gaudi::Units::deg); 
+  TRANSFUNCTION brpC1 = Pow(GeoTrf::RotateZ3D(1.0),f-(5*Alfa/2))*GeoTrf::TranslateX3D(BridgePxtr)*GeoTrf::TranslateZ3D(-BridgePztr)*GeoTrf::RotateZ3D(-90*Gaudi::Units::deg)*GeoTrf::RotateY3D(-90*Gaudi::Units::deg)*GeoTrf::RotateX3D(-90*Gaudi::Units::deg);
+  TRANSFUNCTION brpC2 = Pow(GeoTrf::RotateZ3D(1.0),f+(13*Alfa/2))*GeoTrf::TranslateX3D(BridgePxtr)*GeoTrf::TranslateZ3D(-BridgePztr)*GeoTrf::RotateZ3D(-90*Gaudi::Units::deg)*GeoTrf::RotateY3D(-90*Gaudi::Units::deg)*GeoTrf::RotateX3D(-90*Gaudi::Units::deg);   GeoSerialTransformer *brptA1 = new GeoSerialTransformer(bridgeplates,&brpA1, 5);
   GeoSerialTransformer *brptA2 = new GeoSerialTransformer(bridgeplates,&brpA2, 5);
   GeoSerialTransformer *brptC1 = new GeoSerialTransformer(bridgeplates,&brpC1, 5);
   GeoSerialTransformer *brptC2 = new GeoSerialTransformer(bridgeplates,&brpC2, 5);
@@ -761,8 +762,8 @@ void createFromDB (GeoFullPhysVol* envelope,
   envelope->add(brptC2);
     
   //basePlates
-  TRANSFUNCTION bpA = Pow(GeoTrf::RotateZ3D(1.0),f-(Alfa/2))*GeoTrf::TranslateX3D(BasePxtr)*GeoTrf::TranslateZ3D(BasePztr)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg); 
-  TRANSFUNCTION bpC = Pow(GeoTrf::RotateZ3D(1.0),f+(Alfa/2))*GeoTrf::TranslateX3D(BasePxtr)*GeoTrf::TranslateZ3D(-BasePztr)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg);
+  TRANSFUNCTION bpA = Pow(GeoTrf::RotateZ3D(1.0),f-(Alfa/2))*GeoTrf::TranslateX3D(BasePxtr)*GeoTrf::TranslateZ3D(BasePztr)*GeoTrf::RotateY3D(90*Gaudi::Units::deg); 
+  TRANSFUNCTION bpC = Pow(GeoTrf::RotateZ3D(1.0),f+(Alfa/2))*GeoTrf::TranslateX3D(BasePxtr)*GeoTrf::TranslateZ3D(-BasePztr)*GeoTrf::RotateY3D(90*Gaudi::Units::deg);
   GeoSerialTransformer *bptA = new GeoSerialTransformer(baseplates,&bpA, NCrates);
   GeoSerialTransformer *bptC = new GeoSerialTransformer(baseplates,&bpC, NCrates);
   envelope->add(bptA);
@@ -770,39 +771,39 @@ void createFromDB (GeoFullPhysVol* envelope,
     
   //sectorEnvelopes1
   //counter-clockwise from top if taking sideA for reference (clockwise for sideC)
-  TRANSFUNCTION seA1G5 = Pow(GeoTrf::RotateZ3D(1.0),f+(9*Alfa/2))*GeoTrf::TranslateX3D((Endb+Enda)/2)*GeoTrf::TranslateZ3D(SecE1ztr)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg);
-  TRANSFUNCTION seC1G5 = Pow(GeoTrf::RotateZ3D(1.0),f+(9*Alfa/2))*GeoTrf::TranslateX3D((Endb+Enda)/2)*GeoTrf::TranslateZ3D(-SecE1ztr)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg);
-  TRANSFUNCTION seA1G6 = Pow(GeoTrf::RotateZ3D(1.0),f+(11*Alfa/2))*GeoTrf::TranslateX3D((Endb+Enda)/2)*GeoTrf::TranslateZ3D(SecE1ztr)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg);
-  TRANSFUNCTION seC1G6 = Pow(GeoTrf::RotateZ3D(1.0),f+(11*Alfa/2))*GeoTrf::TranslateX3D((Endb+Enda)/2)*GeoTrf::TranslateZ3D(-SecE1ztr)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg);
-  TRANSFUNCTION seA1G7 = Pow(GeoTrf::RotateZ3D(1.0),f+(13*Alfa/2))*GeoTrf::TranslateX3D((Endb+Enda)/2)*GeoTrf::TranslateZ3D(SecE1ztr)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg);
-  TRANSFUNCTION seC1G7 = Pow(GeoTrf::RotateZ3D(1.0),f+(13*Alfa/2))*GeoTrf::TranslateX3D((Endb+Enda)/2)*GeoTrf::TranslateZ3D(-SecE1ztr)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg);
-  TRANSFUNCTION seA1G8 = Pow(GeoTrf::RotateZ3D(1.0),f+(15*Alfa/2))*GeoTrf::TranslateX3D((Endb+Enda)/2)*GeoTrf::TranslateZ3D(SecE1ztr)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg);
-  TRANSFUNCTION seC1G8 = Pow(GeoTrf::RotateZ3D(1.0),f+(15*Alfa/2))*GeoTrf::TranslateX3D((Endb+Enda)/2)*GeoTrf::TranslateZ3D(-SecE1ztr)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg);
-  TRANSFUNCTION seA1G9 = Pow(GeoTrf::RotateZ3D(1.0),f+(17*Alfa/2))*GeoTrf::TranslateX3D((Endb+Enda)/2)*GeoTrf::TranslateZ3D(SecE1ztr)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg);
-  TRANSFUNCTION seC1G9 = Pow(GeoTrf::RotateZ3D(1.0),f+(17*Alfa/2))*GeoTrf::TranslateX3D((Endb+Enda)/2)*GeoTrf::TranslateZ3D(-SecE1ztr)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg);
-  TRANSFUNCTION seA1G10 = Pow(GeoTrf::RotateZ3D(1.0),f+(19*Alfa/2))*GeoTrf::TranslateX3D((Endb+Enda)/2)*GeoTrf::TranslateZ3D(SecE1ztr)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg);
-  TRANSFUNCTION seC1G10 = Pow(GeoTrf::RotateZ3D(1.0),f+(19*Alfa/2))*GeoTrf::TranslateX3D((Endb+Enda)/2)*GeoTrf::TranslateZ3D(-SecE1ztr)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg);
-  TRANSFUNCTION seA1G11 = Pow(GeoTrf::RotateZ3D(1.0),f+(21*Alfa/2))*GeoTrf::TranslateX3D((Endb+Enda)/2)*GeoTrf::TranslateZ3D(SecE1ztr)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg);
-  TRANSFUNCTION seC1G11 = Pow(GeoTrf::RotateZ3D(1.0),f+(21*Alfa/2))*GeoTrf::TranslateX3D((Endb+Enda)/2)*GeoTrf::TranslateZ3D(-SecE1ztr)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg);
-  TRANSFUNCTION seA1G12 = Pow(GeoTrf::RotateZ3D(1.0),f+(23*Alfa/2))*GeoTrf::TranslateX3D((Endb+Enda)/2)*GeoTrf::TranslateZ3D(SecE1ztr)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg);
-  TRANSFUNCTION seC1G12 = Pow(GeoTrf::RotateZ3D(1.0),f+(23*Alfa/2))*GeoTrf::TranslateX3D((Endb+Enda)/2)*GeoTrf::TranslateZ3D(-SecE1ztr)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg);
+  TRANSFUNCTION seA1G5 = Pow(GeoTrf::RotateZ3D(1.0),f+(9*Alfa/2))*GeoTrf::TranslateX3D((Endb+Enda)/2)*GeoTrf::TranslateZ3D(SecE1ztr)*GeoTrf::RotateY3D(90*Gaudi::Units::deg);
+  TRANSFUNCTION seC1G5 = Pow(GeoTrf::RotateZ3D(1.0),f+(9*Alfa/2))*GeoTrf::TranslateX3D((Endb+Enda)/2)*GeoTrf::TranslateZ3D(-SecE1ztr)*GeoTrf::RotateY3D(90*Gaudi::Units::deg);
+  TRANSFUNCTION seA1G6 = Pow(GeoTrf::RotateZ3D(1.0),f+(11*Alfa/2))*GeoTrf::TranslateX3D((Endb+Enda)/2)*GeoTrf::TranslateZ3D(SecE1ztr)*GeoTrf::RotateY3D(90*Gaudi::Units::deg);
+  TRANSFUNCTION seC1G6 = Pow(GeoTrf::RotateZ3D(1.0),f+(11*Alfa/2))*GeoTrf::TranslateX3D((Endb+Enda)/2)*GeoTrf::TranslateZ3D(-SecE1ztr)*GeoTrf::RotateY3D(90*Gaudi::Units::deg);
+  TRANSFUNCTION seA1G7 = Pow(GeoTrf::RotateZ3D(1.0),f+(13*Alfa/2))*GeoTrf::TranslateX3D((Endb+Enda)/2)*GeoTrf::TranslateZ3D(SecE1ztr)*GeoTrf::RotateY3D(90*Gaudi::Units::deg);
+  TRANSFUNCTION seC1G7 = Pow(GeoTrf::RotateZ3D(1.0),f+(13*Alfa/2))*GeoTrf::TranslateX3D((Endb+Enda)/2)*GeoTrf::TranslateZ3D(-SecE1ztr)*GeoTrf::RotateY3D(90*Gaudi::Units::deg);
+  TRANSFUNCTION seA1G8 = Pow(GeoTrf::RotateZ3D(1.0),f+(15*Alfa/2))*GeoTrf::TranslateX3D((Endb+Enda)/2)*GeoTrf::TranslateZ3D(SecE1ztr)*GeoTrf::RotateY3D(90*Gaudi::Units::deg);
+  TRANSFUNCTION seC1G8 = Pow(GeoTrf::RotateZ3D(1.0),f+(15*Alfa/2))*GeoTrf::TranslateX3D((Endb+Enda)/2)*GeoTrf::TranslateZ3D(-SecE1ztr)*GeoTrf::RotateY3D(90*Gaudi::Units::deg);
+  TRANSFUNCTION seA1G9 = Pow(GeoTrf::RotateZ3D(1.0),f+(17*Alfa/2))*GeoTrf::TranslateX3D((Endb+Enda)/2)*GeoTrf::TranslateZ3D(SecE1ztr)*GeoTrf::RotateY3D(90*Gaudi::Units::deg);
+  TRANSFUNCTION seC1G9 = Pow(GeoTrf::RotateZ3D(1.0),f+(17*Alfa/2))*GeoTrf::TranslateX3D((Endb+Enda)/2)*GeoTrf::TranslateZ3D(-SecE1ztr)*GeoTrf::RotateY3D(90*Gaudi::Units::deg);
+  TRANSFUNCTION seA1G10 = Pow(GeoTrf::RotateZ3D(1.0),f+(19*Alfa/2))*GeoTrf::TranslateX3D((Endb+Enda)/2)*GeoTrf::TranslateZ3D(SecE1ztr)*GeoTrf::RotateY3D(90*Gaudi::Units::deg);
+  TRANSFUNCTION seC1G10 = Pow(GeoTrf::RotateZ3D(1.0),f+(19*Alfa/2))*GeoTrf::TranslateX3D((Endb+Enda)/2)*GeoTrf::TranslateZ3D(-SecE1ztr)*GeoTrf::RotateY3D(90*Gaudi::Units::deg);
+  TRANSFUNCTION seA1G11 = Pow(GeoTrf::RotateZ3D(1.0),f+(21*Alfa/2))*GeoTrf::TranslateX3D((Endb+Enda)/2)*GeoTrf::TranslateZ3D(SecE1ztr)*GeoTrf::RotateY3D(90*Gaudi::Units::deg);
+  TRANSFUNCTION seC1G11 = Pow(GeoTrf::RotateZ3D(1.0),f+(21*Alfa/2))*GeoTrf::TranslateX3D((Endb+Enda)/2)*GeoTrf::TranslateZ3D(-SecE1ztr)*GeoTrf::RotateY3D(90*Gaudi::Units::deg);
+  TRANSFUNCTION seA1G12 = Pow(GeoTrf::RotateZ3D(1.0),f+(23*Alfa/2))*GeoTrf::TranslateX3D((Endb+Enda)/2)*GeoTrf::TranslateZ3D(SecE1ztr)*GeoTrf::RotateY3D(90*Gaudi::Units::deg);
+  TRANSFUNCTION seC1G12 = Pow(GeoTrf::RotateZ3D(1.0),f+(23*Alfa/2))*GeoTrf::TranslateX3D((Endb+Enda)/2)*GeoTrf::TranslateZ3D(-SecE1ztr)*GeoTrf::RotateY3D(90*Gaudi::Units::deg);
   //clockwise from top if taking sideA for reference (counter-clockwise for sideC)
-  TRANSFUNCTION seA1G4 = Pow(GeoTrf::RotateZ3D(1.0),f+(7*Alfa/2))*GeoTrf::TranslateX3D((Endb+Enda)/2)*GeoTrf::TranslateZ3D(SecE1ztr)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg);
-  TRANSFUNCTION seC1G4 = Pow(GeoTrf::RotateZ3D(1.0),f+(7*Alfa/2))*GeoTrf::TranslateX3D((Endb+Enda)/2)*GeoTrf::TranslateZ3D(-SecE1ztr)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg);
-  TRANSFUNCTION seA1G3 = Pow(GeoTrf::RotateZ3D(1.0),f+(5*Alfa/2))*GeoTrf::TranslateX3D((Endb+Enda)/2)*GeoTrf::TranslateZ3D(SecE1ztr)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg);
-  TRANSFUNCTION seC1G3 = Pow(GeoTrf::RotateZ3D(1.0),f+(5*Alfa/2))*GeoTrf::TranslateX3D((Endb+Enda)/2)*GeoTrf::TranslateZ3D(-SecE1ztr)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg);
-  TRANSFUNCTION seA1G2 = Pow(GeoTrf::RotateZ3D(1.0),f+(3*Alfa/2))*GeoTrf::TranslateX3D((Endb+Enda)/2)*GeoTrf::TranslateZ3D(SecE1ztr)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg);
-  TRANSFUNCTION seC1G2 = Pow(GeoTrf::RotateZ3D(1.0),f+(3*Alfa/2))*GeoTrf::TranslateX3D((Endb+Enda)/2)*GeoTrf::TranslateZ3D(-SecE1ztr)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg);
-  TRANSFUNCTION seA1G1 = Pow(GeoTrf::RotateZ3D(1.0),f+(1*Alfa/2))*GeoTrf::TranslateX3D((Endb+Enda)/2)*GeoTrf::TranslateZ3D(SecE1ztr)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg);
-  TRANSFUNCTION seC1G1 = Pow(GeoTrf::RotateZ3D(1.0),f+(1*Alfa/2))*GeoTrf::TranslateX3D((Endb+Enda)/2)*GeoTrf::TranslateZ3D(-SecE1ztr)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg);
-  TRANSFUNCTION seA1G16 = Pow(GeoTrf::RotateZ3D(1.0),f-(1*Alfa/2))*GeoTrf::TranslateX3D((Endb+Enda)/2)*GeoTrf::TranslateZ3D(SecE1ztr)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg);
-  TRANSFUNCTION seC1G16 = Pow(GeoTrf::RotateZ3D(1.0),f-(1*Alfa/2))*GeoTrf::TranslateX3D((Endb+Enda)/2)*GeoTrf::TranslateZ3D(-SecE1ztr)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg);
-  TRANSFUNCTION seA1G15 = Pow(GeoTrf::RotateZ3D(1.0),f-(3*Alfa/2))*GeoTrf::TranslateX3D((Endb+Enda)/2)*GeoTrf::TranslateZ3D(SecE1ztr)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg);
-  TRANSFUNCTION seC1G15 = Pow(GeoTrf::RotateZ3D(1.0),f-(3*Alfa/2))*GeoTrf::TranslateX3D((Endb+Enda)/2)*GeoTrf::TranslateZ3D(-SecE1ztr)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg);
-  TRANSFUNCTION seA1G14 = Pow(GeoTrf::RotateZ3D(1.0),f-(5*Alfa/2))*GeoTrf::TranslateX3D((Endb+Enda)/2)*GeoTrf::TranslateZ3D(SecE1ztr)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg);
-  TRANSFUNCTION seC1G14 = Pow(GeoTrf::RotateZ3D(1.0),f-(5*Alfa/2))*GeoTrf::TranslateX3D((Endb+Enda)/2)*GeoTrf::TranslateZ3D(-SecE1ztr)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg);
-  TRANSFUNCTION seA1G13 = Pow(GeoTrf::RotateZ3D(1.0),f-(7*Alfa/2))*GeoTrf::TranslateX3D((Endb+Enda)/2)*GeoTrf::TranslateZ3D(SecE1ztr)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg);
-  TRANSFUNCTION seC1G13 = Pow(GeoTrf::RotateZ3D(1.0),f-(7*Alfa/2))*GeoTrf::TranslateX3D((Endb+Enda)/2)*GeoTrf::TranslateZ3D(-SecE1ztr)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg);
+  TRANSFUNCTION seA1G4 = Pow(GeoTrf::RotateZ3D(1.0),f+(7*Alfa/2))*GeoTrf::TranslateX3D((Endb+Enda)/2)*GeoTrf::TranslateZ3D(SecE1ztr)*GeoTrf::RotateY3D(90*Gaudi::Units::deg);
+  TRANSFUNCTION seC1G4 = Pow(GeoTrf::RotateZ3D(1.0),f+(7*Alfa/2))*GeoTrf::TranslateX3D((Endb+Enda)/2)*GeoTrf::TranslateZ3D(-SecE1ztr)*GeoTrf::RotateY3D(90*Gaudi::Units::deg);
+  TRANSFUNCTION seA1G3 = Pow(GeoTrf::RotateZ3D(1.0),f+(5*Alfa/2))*GeoTrf::TranslateX3D((Endb+Enda)/2)*GeoTrf::TranslateZ3D(SecE1ztr)*GeoTrf::RotateY3D(90*Gaudi::Units::deg);
+  TRANSFUNCTION seC1G3 = Pow(GeoTrf::RotateZ3D(1.0),f+(5*Alfa/2))*GeoTrf::TranslateX3D((Endb+Enda)/2)*GeoTrf::TranslateZ3D(-SecE1ztr)*GeoTrf::RotateY3D(90*Gaudi::Units::deg);
+  TRANSFUNCTION seA1G2 = Pow(GeoTrf::RotateZ3D(1.0),f+(3*Alfa/2))*GeoTrf::TranslateX3D((Endb+Enda)/2)*GeoTrf::TranslateZ3D(SecE1ztr)*GeoTrf::RotateY3D(90*Gaudi::Units::deg);
+  TRANSFUNCTION seC1G2 = Pow(GeoTrf::RotateZ3D(1.0),f+(3*Alfa/2))*GeoTrf::TranslateX3D((Endb+Enda)/2)*GeoTrf::TranslateZ3D(-SecE1ztr)*GeoTrf::RotateY3D(90*Gaudi::Units::deg);
+  TRANSFUNCTION seA1G1 = Pow(GeoTrf::RotateZ3D(1.0),f+(1*Alfa/2))*GeoTrf::TranslateX3D((Endb+Enda)/2)*GeoTrf::TranslateZ3D(SecE1ztr)*GeoTrf::RotateY3D(90*Gaudi::Units::deg);
+  TRANSFUNCTION seC1G1 = Pow(GeoTrf::RotateZ3D(1.0),f+(1*Alfa/2))*GeoTrf::TranslateX3D((Endb+Enda)/2)*GeoTrf::TranslateZ3D(-SecE1ztr)*GeoTrf::RotateY3D(90*Gaudi::Units::deg);
+  TRANSFUNCTION seA1G16 = Pow(GeoTrf::RotateZ3D(1.0),f-(1*Alfa/2))*GeoTrf::TranslateX3D((Endb+Enda)/2)*GeoTrf::TranslateZ3D(SecE1ztr)*GeoTrf::RotateY3D(90*Gaudi::Units::deg);
+  TRANSFUNCTION seC1G16 = Pow(GeoTrf::RotateZ3D(1.0),f-(1*Alfa/2))*GeoTrf::TranslateX3D((Endb+Enda)/2)*GeoTrf::TranslateZ3D(-SecE1ztr)*GeoTrf::RotateY3D(90*Gaudi::Units::deg);
+  TRANSFUNCTION seA1G15 = Pow(GeoTrf::RotateZ3D(1.0),f-(3*Alfa/2))*GeoTrf::TranslateX3D((Endb+Enda)/2)*GeoTrf::TranslateZ3D(SecE1ztr)*GeoTrf::RotateY3D(90*Gaudi::Units::deg);
+  TRANSFUNCTION seC1G15 = Pow(GeoTrf::RotateZ3D(1.0),f-(3*Alfa/2))*GeoTrf::TranslateX3D((Endb+Enda)/2)*GeoTrf::TranslateZ3D(-SecE1ztr)*GeoTrf::RotateY3D(90*Gaudi::Units::deg);
+  TRANSFUNCTION seA1G14 = Pow(GeoTrf::RotateZ3D(1.0),f-(5*Alfa/2))*GeoTrf::TranslateX3D((Endb+Enda)/2)*GeoTrf::TranslateZ3D(SecE1ztr)*GeoTrf::RotateY3D(90*Gaudi::Units::deg);
+  TRANSFUNCTION seC1G14 = Pow(GeoTrf::RotateZ3D(1.0),f-(5*Alfa/2))*GeoTrf::TranslateX3D((Endb+Enda)/2)*GeoTrf::TranslateZ3D(-SecE1ztr)*GeoTrf::RotateY3D(90*Gaudi::Units::deg);
+  TRANSFUNCTION seA1G13 = Pow(GeoTrf::RotateZ3D(1.0),f-(7*Alfa/2))*GeoTrf::TranslateX3D((Endb+Enda)/2)*GeoTrf::TranslateZ3D(SecE1ztr)*GeoTrf::RotateY3D(90*Gaudi::Units::deg);
+  TRANSFUNCTION seC1G13 = Pow(GeoTrf::RotateZ3D(1.0),f-(7*Alfa/2))*GeoTrf::TranslateX3D((Endb+Enda)/2)*GeoTrf::TranslateZ3D(-SecE1ztr)*GeoTrf::RotateY3D(90*Gaudi::Units::deg);
     
   GeoSerialTransformer *setA1G5 = new GeoSerialTransformer(sectorenvelopes1g5,&seA1G5, 1);
   GeoSerialTransformer *setC1G5 = new GeoSerialTransformer(sectorenvelopes1g5,&seC1G5, 1);
@@ -976,13 +977,13 @@ void LArGeo::BarrelDMConstruction::create(GeoFullPhysVol* envelope)
     
     // Define some custom materials - That will move to the GeomDB
     //Fiberglass
-    GeoMaterial *matFiberglass = new GeoMaterial("SiO2",2.20*GeoModelKernelUnits::gram/GeoModelKernelUnits::cm3);
+    GeoMaterial *matFiberglass = new GeoMaterial("SiO2",2.20*GeoModelKernelUnits::gram/Gaudi::Units::cm3);
     matFiberglass->add(silicon,silicon->getA()/(silicon->getA()+2*oxygen->getA()));
     matFiberglass->add(oxygen,2*oxygen->getA()/(silicon->getA()+2*oxygen->getA()));
     matFiberglass->lock();
     
     //Epoxy Resin
-    GeoMaterial *matEpoxyResin = new GeoMaterial("Epoxy", 1.9*GeoModelKernelUnits::gram/GeoModelKernelUnits::cm3);
+    GeoMaterial *matEpoxyResin = new GeoMaterial("Epoxy", 1.9*GeoModelKernelUnits::gram/Gaudi::Units::cm3);
     matEpoxyResin->add(hydrogen,     14*hydrogen->getA()   / (14*hydrogen->getA() + 4*oxygen->getA()+ 8*carbon->getA()));
     matEpoxyResin->add(oxygen,        4*oxygen->getA()     / (14*hydrogen->getA() + 4*oxygen->getA()+ 8*carbon->getA()));
     matEpoxyResin->add(carbon,        8*carbon->getA()     / (14*hydrogen->getA() + 4*oxygen->getA()+ 8*carbon->getA()));
@@ -990,7 +991,7 @@ void LArGeo::BarrelDMConstruction::create(GeoFullPhysVol* envelope)
     matEpoxyResin->lock();
 
     //FEBBoards
-    GeoMaterial *matFEBBoards = new GeoMaterial("FEBBoards", 4.03*GeoModelKernelUnits::gram/GeoModelKernelUnits::cm3);
+    GeoMaterial *matFEBBoards = new GeoMaterial("FEBBoards", 4.03*GeoModelKernelUnits::gram/Gaudi::Units::cm3);
     matFEBBoards->add(matFiberglass, 0.52);
     matFEBBoards->add(copper, 0.28);
     matFEBBoards->add(matEpoxyResin, 0.20);
@@ -999,13 +1000,13 @@ void LArGeo::BarrelDMConstruction::create(GeoFullPhysVol* envelope)
     //SERVICES:CABLES, TUBES ETC...//
     
     //Water
-    GeoMaterial *matWater = new GeoMaterial("Water", 1*GeoModelKernelUnits::gram/GeoModelKernelUnits::cm3);
+    GeoMaterial *matWater = new GeoMaterial("Water", 1*GeoModelKernelUnits::gram/Gaudi::Units::cm3);
     matWater->add(hydrogen,     2*hydrogen->getA()   / (2*hydrogen->getA() + 1*oxygen->getA()));
     matWater->add(oxygen,       1*oxygen->getA()     / (2*hydrogen->getA() + 1*oxygen->getA()));
     matWater->lock();
     
     //InDetServices
-    GeoMaterial* matLArServices = new GeoMaterial("LArServices", 4.03*GeoModelKernelUnits::gram/GeoModelKernelUnits::cm3);
+    GeoMaterial* matLArServices = new GeoMaterial("LArServices", 4.03*GeoModelKernelUnits::gram/Gaudi::Units::cm3);
     matLArServices->add(shieldSteel, 0.20);
     matLArServices->add(copper, 0.60);
     matLArServices->add(matRubber, 0.10);
@@ -1021,16 +1022,16 @@ void LArGeo::BarrelDMConstruction::create(GeoFullPhysVol* envelope)
     GeoBox     *Pedestal = new GeoBox(71, 400.05, 248.65);
     GeoBox     *Ped1     = new GeoBox(67, 397.05, 245.65);
     GeoTube    *Ped2     = new GeoTube(0, 150, 75);
-    GeoTube    *Ped3     = new GeoTube(0, 2775, 300);   //, -75*GeoModelKernelUnits::deg, 150*GeoModelKernelUnits::deg); // 0, 2775, 300, -8.2*GeoModelKernelUnits::deg, 16.4*GeoModelKernelUnits::deg)
+    GeoTube    *Ped3     = new GeoTube(0, 2775, 300);   //, -75*Gaudi::Units::deg, 150*Gaudi::Units::deg); // 0, 2775, 300, -8.2*Gaudi::Units::deg, 16.4*Gaudi::Units::deg)
     
     //GeoLogVol  *lvped3   = new GeoLogVol("LAr::DM::PED3",Ped3,air);
     //GeoPhysVol *ped3   = new GeoPhysVol(lvped3);
     //envelope->add(ped3);
     
     const GeoShape & CratePed=((*Pedestal).subtract(*Ped1).
-			       subtract((*Ped2)  <<GeoTrf::TranslateY3D(-200.025)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg)).
+			       subtract((*Ped2)  <<GeoTrf::TranslateY3D(-200.025)*GeoTrf::RotateY3D(90*Gaudi::Units::deg)).
 			       subtract((*Ped3)  <<GeoTrf::TranslateX3D(-2815)).
-			       subtract((*Ped2)  <<GeoTrf::TranslateY3D(200.025)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg)));
+			       subtract((*Ped2)  <<GeoTrf::TranslateY3D(200.025)*GeoTrf::RotateY3D(90*Gaudi::Units::deg)));
     
     
     GeoLogVol  *lvped   = new GeoLogVol("LAr::DM::PED",&CratePed,air);
@@ -1072,9 +1073,9 @@ void LArGeo::BarrelDMConstruction::create(GeoFullPhysVol* envelope)
     
     const unsigned int NCrates=16;
     Variable       i;
-    GENFUNCTION    f = (360*GeoModelKernelUnits::deg/NCrates)*i;
-    GENFUNCTION    f1 = (360*GeoModelKernelUnits::deg/NCrates)*i+315*GeoModelKernelUnits::deg;
-    GENFUNCTION    f2 = (360*GeoModelKernelUnits::deg/NCrates)*i+157.5*GeoModelKernelUnits::deg;
+    GENFUNCTION    f = (360*Gaudi::Units::deg/NCrates)*i;
+    GENFUNCTION    f1 = (360*Gaudi::Units::deg/NCrates)*i+315*Gaudi::Units::deg;
+    GENFUNCTION    f2 = (360*Gaudi::Units::deg/NCrates)*i+157.5*Gaudi::Units::deg;
     GENFUNCTION    g = i*19.685;
     
     //(f=22.5|| f=45|| f=67.5|| f=180|| f=203.5|| f=225|| f=247.5|| f=270|| f=337.5|| f=360)
@@ -1133,16 +1134,16 @@ void LArGeo::BarrelDMConstruction::create(GeoFullPhysVol* envelope)
     //----------- Building envelope for Cables and Tubes --------------
     
     GeoTrd   *Trd1air  = new GeoTrd(123.5, 123.5, 167, 245.43, 117.65);
-    GeoTrap  *Trapair  = new GeoTrap(178.33, 39.596*GeoModelKernelUnits::deg, 0, 167, 53.5, 53.5, 0, 167, 123.5, 123.5, 0);
+    GeoTrap  *Trapair  = new GeoTrap(178.33, 39.596*Gaudi::Units::deg, 0, 167, 53.5, 53.5, 0, 167, 123.5, 123.5, 0);
     GeoTrd   *Trd2air  = new GeoTrd(53.5, 53.5, 280, 548, 677.5); 
     GeoBox   *Box   = new GeoBox(280, 280, 100); 
     
     GeoTrd   *Trd1alu  = new GeoTrd(5, 5, 167, 245.43, 117.65);
-    GeoTrap  *Trapalu  = new GeoTrap(178.33, 45.5*GeoModelKernelUnits::deg, 0, 167, 5, 5, 0, 167, 5, 5, 0);
+    GeoTrap  *Trapalu  = new GeoTrap(178.33, 45.5*Gaudi::Units::deg, 0, 167, 5, 5, 0, 167, 5, 5, 0);
     GeoTrd   *Trd2alu  = new GeoTrd(5, 5, 280, 548, 677.5);
     
-    GeoTrf::Transform3D Cut1Box  = GeoTrf::Translate3D(-295.5, 500, -473.563)*GeoTrf::RotateX3D(-20*GeoModelKernelUnits::deg);
-    GeoTrf::Transform3D Cut2Box  = GeoTrf::Translate3D(-295.5, -500, -473.563)*GeoTrf::RotateX3D(20*GeoModelKernelUnits::deg);
+    GeoTrf::Transform3D Cut1Box  = GeoTrf::Translate3D(-295.5, 500, -473.563)*GeoTrf::RotateX3D(-20*Gaudi::Units::deg);
+    GeoTrf::Transform3D Cut2Box  = GeoTrf::Translate3D(-295.5, -500, -473.563)*GeoTrf::RotateX3D(20*Gaudi::Units::deg);
     
     
     
@@ -1167,31 +1168,31 @@ void LArGeo::BarrelDMConstruction::create(GeoFullPhysVol* envelope)
     
     
     //envelopes
-    TRANSFUNCTION xf3a = Pow(GeoTrf::RotateZ3D(1.0),f)*GeoTrf::TranslateY3D(-631.63)*GeoTrf::TranslateX3D(3175.44)*GeoTrf::TranslateZ3D(3165.5)*GeoTrf::RotateZ3D(-11.25*GeoModelKernelUnits::deg)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg);
-    TRANSFUNCTION xf4a = Pow(GeoTrf::RotateZ3D(1.0),f)*GeoTrf::TranslateY3D(631.63)*GeoTrf::TranslateX3D(-3175.44)*GeoTrf::TranslateZ3D(-3165.5)*GeoTrf::RotateZ3D(-11.25*GeoModelKernelUnits::deg)*GeoTrf::RotateY3D(-90*GeoModelKernelUnits::deg);
+    TRANSFUNCTION xf3a = Pow(GeoTrf::RotateZ3D(1.0),f)*GeoTrf::TranslateY3D(-631.63)*GeoTrf::TranslateX3D(3175.44)*GeoTrf::TranslateZ3D(3165.5)*GeoTrf::RotateZ3D(-11.25*Gaudi::Units::deg)*GeoTrf::RotateY3D(90*Gaudi::Units::deg);
+    TRANSFUNCTION xf4a = Pow(GeoTrf::RotateZ3D(1.0),f)*GeoTrf::TranslateY3D(631.63)*GeoTrf::TranslateX3D(-3175.44)*GeoTrf::TranslateZ3D(-3165.5)*GeoTrf::RotateZ3D(-11.25*Gaudi::Units::deg)*GeoTrf::RotateY3D(-90*Gaudi::Units::deg);
     GeoSerialTransformer *st3 = new GeoSerialTransformer(envelopes,&xf3a, NCrates);
     GeoSerialTransformer *st4 = new GeoSerialTransformer(envelopes,&xf4a, NCrates);
     envelope->add(st3);
     envelope->add(st4);
     
     //baseplates
-    TRANSFUNCTION xf3b = Pow(GeoTrf::RotateZ3D(1.0),f1)*GeoTrf::TranslateY3D(-631.63)*GeoTrf::TranslateX3D(3175.44)*GeoTrf::TranslateZ3D(3044.5)*GeoTrf::RotateZ3D(-11.25*GeoModelKernelUnits::deg)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg);
-    TRANSFUNCTION xf4b = Pow(GeoTrf::RotateZ3D(1.0),(f1+22.5*GeoModelKernelUnits::deg))*GeoTrf::TranslateY3D(631.63)*GeoTrf::TranslateX3D(-3175.44)*GeoTrf::TranslateZ3D(-3044.5)*GeoTrf::RotateZ3D(-11.25*GeoModelKernelUnits::deg)*GeoTrf::RotateY3D(-90*GeoModelKernelUnits::deg);
+    TRANSFUNCTION xf3b = Pow(GeoTrf::RotateZ3D(1.0),f1)*GeoTrf::TranslateY3D(-631.63)*GeoTrf::TranslateX3D(3175.44)*GeoTrf::TranslateZ3D(3044.5)*GeoTrf::RotateZ3D(-11.25*Gaudi::Units::deg)*GeoTrf::RotateY3D(90*Gaudi::Units::deg);
+    TRANSFUNCTION xf4b = Pow(GeoTrf::RotateZ3D(1.0),(f1+22.5*Gaudi::Units::deg))*GeoTrf::TranslateY3D(631.63)*GeoTrf::TranslateX3D(-3175.44)*GeoTrf::TranslateZ3D(-3044.5)*GeoTrf::RotateZ3D(-11.25*Gaudi::Units::deg)*GeoTrf::RotateY3D(-90*Gaudi::Units::deg);
     GeoSerialTransformer *st3bis = new GeoSerialTransformer(baseplates,&xf3b, (NCrates-11));
     GeoSerialTransformer *st4bis = new GeoSerialTransformer(baseplates,&xf4b, (NCrates-11));
     envelope->add(st3bis);
     envelope->add(st4bis);
     
-    TRANSFUNCTION xf5b = Pow(GeoTrf::RotateZ3D(1.0),f2)*GeoTrf::TranslateY3D(-631.63)*GeoTrf::TranslateX3D(3175.44)*GeoTrf::TranslateZ3D(3044.5)*GeoTrf::RotateZ3D(-11.25*GeoModelKernelUnits::deg)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg);
-    TRANSFUNCTION xf6b = Pow(GeoTrf::RotateZ3D(1.0),(f2-22.5*GeoModelKernelUnits::deg))*GeoTrf::TranslateY3D(631.63)*GeoTrf::TranslateX3D(-3175.44)*GeoTrf::TranslateZ3D(-3044.5)*GeoTrf::RotateZ3D(-11.25*GeoModelKernelUnits::deg)*GeoTrf::RotateY3D(-90*GeoModelKernelUnits::deg);
+    TRANSFUNCTION xf5b = Pow(GeoTrf::RotateZ3D(1.0),f2)*GeoTrf::TranslateY3D(-631.63)*GeoTrf::TranslateX3D(3175.44)*GeoTrf::TranslateZ3D(3044.5)*GeoTrf::RotateZ3D(-11.25*Gaudi::Units::deg)*GeoTrf::RotateY3D(90*Gaudi::Units::deg);
+    TRANSFUNCTION xf6b = Pow(GeoTrf::RotateZ3D(1.0),(f2-22.5*Gaudi::Units::deg))*GeoTrf::TranslateY3D(631.63)*GeoTrf::TranslateX3D(-3175.44)*GeoTrf::TranslateZ3D(-3044.5)*GeoTrf::RotateZ3D(-11.25*Gaudi::Units::deg)*GeoTrf::RotateY3D(-90*Gaudi::Units::deg);
     GeoSerialTransformer *st5bis = new GeoSerialTransformer(baseplates,&xf5b, (NCrates-11));
     GeoSerialTransformer *st6bis = new GeoSerialTransformer(baseplates,&xf6b, (NCrates-11));
     envelope->add(st5bis);
     envelope->add(st6bis);
     
     //sectorplates
-    TRANSFUNCTION xf3bb = Pow(GeoTrf::RotateZ3D(1.0),f)*GeoTrf::TranslateY3D(-631.63)*GeoTrf::TranslateX3D(3175.44)*GeoTrf::TranslateZ3D(3044.5)*GeoTrf::RotateZ3D(-11.25*GeoModelKernelUnits::deg)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg);
-    TRANSFUNCTION xf4bb = Pow(GeoTrf::RotateZ3D(1.0),f)*GeoTrf::TranslateY3D(631.63)*GeoTrf::TranslateX3D(-3175.44)*GeoTrf::TranslateZ3D(-3044.5)*GeoTrf::RotateZ3D(-11.25*GeoModelKernelUnits::deg)*GeoTrf::RotateY3D(-90*GeoModelKernelUnits::deg);
+    TRANSFUNCTION xf3bb = Pow(GeoTrf::RotateZ3D(1.0),f)*GeoTrf::TranslateY3D(-631.63)*GeoTrf::TranslateX3D(3175.44)*GeoTrf::TranslateZ3D(3044.5)*GeoTrf::RotateZ3D(-11.25*Gaudi::Units::deg)*GeoTrf::RotateY3D(90*Gaudi::Units::deg);
+    TRANSFUNCTION xf4bb = Pow(GeoTrf::RotateZ3D(1.0),f)*GeoTrf::TranslateY3D(631.63)*GeoTrf::TranslateX3D(-3175.44)*GeoTrf::TranslateZ3D(-3044.5)*GeoTrf::RotateZ3D(-11.25*Gaudi::Units::deg)*GeoTrf::RotateY3D(-90*Gaudi::Units::deg);
     GeoSerialTransformer *st3biss = new GeoSerialTransformer(sectorplates,&xf3bb, NCrates);
     GeoSerialTransformer *st4biss = new GeoSerialTransformer(sectorplates,&xf4bb, NCrates);
     envelope->add(st3biss);
@@ -1220,30 +1221,30 @@ void LArGeo::BarrelDMConstruction::create(GeoFullPhysVol* envelope)
 
   
   //C6F14
-  GeoMaterial *matC6F14 = new GeoMaterial("C6F14",1.68*GeoModelKernelUnits::gram/GeoModelKernelUnits::cm3);
+  GeoMaterial *matC6F14 = new GeoMaterial("C6F14",1.68*GeoModelKernelUnits::gram/Gaudi::Units::cm3);
   matC6F14->add(carbon,   6*carbon->getA()   / (6*carbon->getA() + 14*fluorine->getA()));
   matC6F14->add(fluorine, 14*fluorine->getA() / (6*carbon->getA() + 14*fluorine->getA()));
   matC6F14->lock();
     
   //Water
-  GeoMaterial *matWater = new GeoMaterial("Water", 1*GeoModelKernelUnits::gram/GeoModelKernelUnits::cm3);
+  GeoMaterial *matWater = new GeoMaterial("Water", 1*GeoModelKernelUnits::gram/Gaudi::Units::cm3);
   matWater->add(hydrogen,     2*hydrogen->getA()   / (2*hydrogen->getA() + 1*oxygen->getA()));
   matWater->add(oxygen,       1*oxygen->getA()     / (2*hydrogen->getA() + 1*oxygen->getA()));
   matWater->lock();
 
   //Nitrogen
-  GeoMaterial *matN2 = new GeoMaterial("N2", 0.0012506*GeoModelKernelUnits::gram/GeoModelKernelUnits::cm3);
+  GeoMaterial *matN2 = new GeoMaterial("N2", 0.0012506*GeoModelKernelUnits::gram/Gaudi::Units::cm3);
   matN2->add(nitrogen,1);
   matN2->lock();
 
   //Fiberglass
-  GeoMaterial *matFiberglass = new GeoMaterial("SiO2",2.20*GeoModelKernelUnits::gram/GeoModelKernelUnits::cm3);
+  GeoMaterial *matFiberglass = new GeoMaterial("SiO2",2.20*GeoModelKernelUnits::gram/Gaudi::Units::cm3);
   matFiberglass->add(silicon,silicon->getA()/(silicon->getA()+2*oxygen->getA()));
   matFiberglass->add(oxygen,2*oxygen->getA()/(silicon->getA()+2*oxygen->getA()));
   matFiberglass->lock();
 
   //Epoxy Resin
-  GeoMaterial *matEpoxyResin = new GeoMaterial("Epoxy:C8H14O4Si", 1.9*GeoModelKernelUnits::gram/GeoModelKernelUnits::cm3);
+  GeoMaterial *matEpoxyResin = new GeoMaterial("Epoxy:C8H14O4Si", 1.9*GeoModelKernelUnits::gram/Gaudi::Units::cm3);
   matEpoxyResin->add(hydrogen,     14*hydrogen->getA()   / (14*hydrogen->getA() + 4*oxygen->getA()+ 8*carbon->getA()+ 1*silicon->getA()));
   matEpoxyResin->add(oxygen,        4*oxygen->getA()     / (14*hydrogen->getA() + 4*oxygen->getA()+ 8*carbon->getA()+ 1*silicon->getA()));
   matEpoxyResin->add(carbon,        8*carbon->getA()     / (14*hydrogen->getA() + 4*oxygen->getA()+ 8*carbon->getA()+ 1*silicon->getA()));
@@ -1251,14 +1252,14 @@ void LArGeo::BarrelDMConstruction::create(GeoFullPhysVol* envelope)
   matEpoxyResin->lock();
 
   //FEBoards
-  GeoMaterial *matFEBoards = new GeoMaterial("FEBoards", 4.03*GeoModelKernelUnits::gram/GeoModelKernelUnits::cm3);
+  GeoMaterial *matFEBoards = new GeoMaterial("FEBoards", 4.03*GeoModelKernelUnits::gram/Gaudi::Units::cm3);
   matFEBoards->add(matFiberglass, 0.52);
   matFEBoards->add(copper, 0.28);
   matFEBoards->add(matEpoxyResin, 0.20);
   matFEBoards->lock();
 
   //BoardsEnvelope (FEBoards + Cooling Plates + Water + Air)
-  GeoMaterial* matBoardsEnvelope = new GeoMaterial("BoardsEnvelope", 0.932*GeoModelKernelUnits::gram/GeoModelKernelUnits::cm3);
+  GeoMaterial* matBoardsEnvelope = new GeoMaterial("BoardsEnvelope", 0.932*GeoModelKernelUnits::gram/Gaudi::Units::cm3);
   matBoardsEnvelope->add(matFEBoards, 0.4147);
   matBoardsEnvelope->add(matWater, 0.0736);
   matBoardsEnvelope->add(air, 0.0008);
@@ -1266,8 +1267,8 @@ void LArGeo::BarrelDMConstruction::create(GeoFullPhysVol* envelope)
   matBoardsEnvelope->lock();
   
   //InDetServices !!! Provisoire !!!
-  double density1 = 1.*GeoModelKernelUnits::gram/GeoModelKernelUnits::cm3;
-  if (strDMTopTag=="LArBarrelDM-02") density1 = 1.7*GeoModelKernelUnits::gram/GeoModelKernelUnits::cm3;
+  double density1 = 1.*GeoModelKernelUnits::gram/Gaudi::Units::cm3;
+  if (strDMTopTag=="LArBarrelDM-02") density1 = 1.7*GeoModelKernelUnits::gram/Gaudi::Units::cm3;
   GeoMaterial* matLArServices1 = new GeoMaterial("LArServices1", density1);
   matLArServices1->add(copper, .60);
   matLArServices1->add(shieldSteel, .05);
@@ -1280,8 +1281,8 @@ void LArGeo::BarrelDMConstruction::create(GeoFullPhysVol* envelope)
   matLArServices1->lock();
 
   //InDetServices !!! Provisoire !!!
-  double density2 = 2.*GeoModelKernelUnits::gram/GeoModelKernelUnits::cm3;
-  if (strDMTopTag=="LArBarrelDM-02") density2 = 3.4*GeoModelKernelUnits::gram/GeoModelKernelUnits::cm3;
+  double density2 = 2.*GeoModelKernelUnits::gram/Gaudi::Units::cm3;
+  if (strDMTopTag=="LArBarrelDM-02") density2 = 3.4*GeoModelKernelUnits::gram/Gaudi::Units::cm3;
   GeoMaterial* matLArServices2 = new GeoMaterial("LArServices2", density2);
   matLArServices2->add(copper, .60);
   matLArServices2->add(shieldSteel, .05);
@@ -1299,7 +1300,7 @@ void LArGeo::BarrelDMConstruction::create(GeoFullPhysVol* envelope)
 //     << matLArServices2->getRadLength() << " " << matLArServices2->getIntLength() << std::endl;
   
   const unsigned int NCrates=16;
-  const double Alfa=360*GeoModelKernelUnits::deg/NCrates;
+  const double Alfa=360*Gaudi::Units::deg/NCrates;
   const double Enda=1155;
   const double Endb=1695.2;
   const double Endc=2771.6;
@@ -1318,9 +1319,9 @@ void LArGeo::BarrelDMConstruction::create(GeoFullPhysVol* envelope)
   GeoTube    *Ped2     = new GeoTube(0, 150, 75);
   GeoTube    *Ped3     = new GeoTube(0, 2775, 300);  
   const GeoShape & CratePed=((*Pedestal).subtract(*Ped1).
-			     subtract((*Ped2)  <<GeoTrf::TranslateY3D(-200.025)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg)).
+			     subtract((*Ped2)  <<GeoTrf::TranslateY3D(-200.025)*GeoTrf::RotateY3D(90*Gaudi::Units::deg)).
 			     subtract((*Ped3)  <<GeoTrf::TranslateX3D(-2800)).
-		             subtract((*Ped2)  <<GeoTrf::TranslateY3D(200.025)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg)));
+		             subtract((*Ped2)  <<GeoTrf::TranslateY3D(200.025)*GeoTrf::RotateY3D(90*Gaudi::Units::deg)));
   
   GeoLogVol  *lvped   = new GeoLogVol("LAr::DM::Ped",&CratePed,alu);
   GeoPhysVol *pedestal   = new GeoPhysVol(lvped);
@@ -1377,10 +1378,10 @@ void LArGeo::BarrelDMConstruction::create(GeoFullPhysVol* envelope)
   // transforms
   GeoBox   *Box   = new GeoBox(280, 280, 100);
  
-  GeoTrf::Transform3D Cut3Boxe  = GeoTrf::Translate3D(0, 548, 711)*GeoTrf::RotateX3D(-20*GeoModelKernelUnits::deg)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg);
-  GeoTrf::Transform3D Cut4Boxe  = GeoTrf::Translate3D(0, -548,711)*GeoTrf::RotateX3D(20*GeoModelKernelUnits::deg)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg);
-  GeoTrf::Transform3D Cut3Boxp  = GeoTrf::Translate3D(0, 548, 850)*GeoTrf::RotateX3D(-20*GeoModelKernelUnits::deg)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg);
-  GeoTrf::Transform3D Cut4Boxp  = GeoTrf::Translate3D(0, -548,850)*GeoTrf::RotateX3D(20*GeoModelKernelUnits::deg)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg);
+  GeoTrf::Transform3D Cut3Boxe  = GeoTrf::Translate3D(0, 548, 711)*GeoTrf::RotateX3D(-20*Gaudi::Units::deg)*GeoTrf::RotateY3D(90*Gaudi::Units::deg);
+  GeoTrf::Transform3D Cut4Boxe  = GeoTrf::Translate3D(0, -548,711)*GeoTrf::RotateX3D(20*Gaudi::Units::deg)*GeoTrf::RotateY3D(90*Gaudi::Units::deg);
+  GeoTrf::Transform3D Cut3Boxp  = GeoTrf::Translate3D(0, 548, 850)*GeoTrf::RotateX3D(-20*Gaudi::Units::deg)*GeoTrf::RotateY3D(90*Gaudi::Units::deg);
+  GeoTrf::Transform3D Cut4Boxp  = GeoTrf::Translate3D(0, -548,850)*GeoTrf::RotateX3D(20*Gaudi::Units::deg)*GeoTrf::RotateY3D(90*Gaudi::Units::deg);
 
   // ----- build base envelopes -----
   GeoTrd   *Trd1air  = new GeoTrd(123.5, 123.5, 167, 305, 287.5); 
@@ -1388,7 +1389,7 @@ void LArGeo::BarrelDMConstruction::create(GeoFullPhysVol* envelope)
   GeoPhysVol *baseenvelopes    = new GeoPhysVol(lvbe);
 
   // ----- build bridge envelopes -----
-  GeoTrap  *Trapair  = new GeoTrap(201.70, 45.35*GeoModelKernelUnits::deg, 0, 160, 52.95, 52.95, 0, 160, 123.5, 123.5, 0);
+  GeoTrap  *Trapair  = new GeoTrap(201.70, 45.35*Gaudi::Units::deg, 0, 160, 52.95, 52.95, 0, 160, 123.5, 123.5, 0);
   GeoLogVol  *lvbre          = new GeoLogVol("LAr::DM::BridgeEnvelopes",Trapair,matLArServices1);
   GeoPhysVol *bridgeenvelopes    = new GeoPhysVol(lvbre);
 
@@ -1421,7 +1422,7 @@ void LArGeo::BarrelDMConstruction::create(GeoFullPhysVol* envelope)
   GeoPhysVol *baseplates    = new GeoPhysVol(lvbp);
 
   // ----- build bridge plates -----
-  GeoTrap  *Trapalu  = new GeoTrap(201.70, 49.92*GeoModelKernelUnits::deg, 0, 160, 5, 5, 0, 160, 5, 5, 0); 
+  GeoTrap  *Trapalu  = new GeoTrap(201.70, 49.92*Gaudi::Units::deg, 0, 160, 5, 5, 0, 160, 5, 5, 0); 
   GeoLogVol  *lvbrp          = new GeoLogVol("LAr::DM::BridgePlates",Trapalu,alu);
   GeoPhysVol *bridgeplates    = new GeoPhysVol(lvbrp);
   
@@ -1439,15 +1440,15 @@ void LArGeo::BarrelDMConstruction::create(GeoFullPhysVol* envelope)
   GeoTrap  *GeoTrap1  = new GeoTrap(237.5, 0, 0, 307, 47.5, 47.5, 0, 259.17, 47.5, 47.5, 0);
   GeoBox   *Box1   = new GeoBox(50, 244.80, 150);  
   const GeoShape & SpliceBox = ((*GeoTrap1).
-				subtract(*Box1 << GeoTrf::TranslateZ3D(193.88)*GeoTrf::TranslateY3D(-223.49)*GeoTrf::RotateX3D(41.592*GeoModelKernelUnits::deg)));
+				subtract(*Box1 << GeoTrf::TranslateZ3D(193.88)*GeoTrf::TranslateY3D(-223.49)*GeoTrf::RotateX3D(41.592*Gaudi::Units::deg)));
 
-  GeoTransform *xtr = new GeoTransform (GeoTrf::TranslateZ3D(39.57)*GeoTrf::TranslateY3D(-452.12)*GeoTrf::TranslateX3D(5.40)*GeoTrf::RotateX3D(191.25*GeoModelKernelUnits::deg));
+  GeoTransform *xtr = new GeoTransform (GeoTrf::TranslateZ3D(39.57)*GeoTrf::TranslateY3D(-452.12)*GeoTrf::TranslateX3D(5.40)*GeoTrf::RotateX3D(191.25*Gaudi::Units::deg));
   sectorenvelopes2r->add(xtr);
   GeoLogVol  *lvspbr     = new GeoLogVol("LAr::DM::SPliceBoxr",&SpliceBox,alu); 
   GeoPhysVol *spliceboxr       = new GeoPhysVol(lvspbr);
   sectorenvelopes2r->add(spliceboxr);
   
-  GeoTransform *xtl = new GeoTransform (GeoTrf::TranslateZ3D(39.57)*GeoTrf::TranslateY3D(-452.12)*GeoTrf::TranslateX3D(5.40)*GeoTrf::RotateY3D(-180*GeoModelKernelUnits::deg)*GeoTrf::RotateX3D(-(Alfa/2)));
+  GeoTransform *xtl = new GeoTransform (GeoTrf::TranslateZ3D(39.57)*GeoTrf::TranslateY3D(-452.12)*GeoTrf::TranslateX3D(5.40)*GeoTrf::RotateY3D(-180*Gaudi::Units::deg)*GeoTrf::RotateX3D(-(Alfa/2)));
   sectorenvelopes2l->add(xtl);
   GeoLogVol  *lvspbl     = new GeoLogVol("LAr::DM::SpliceBoxl",&SpliceBox,alu);  
   GeoPhysVol *spliceboxl       = new GeoPhysVol(lvspbl);
@@ -1459,7 +1460,7 @@ void LArGeo::BarrelDMConstruction::create(GeoFullPhysVol* envelope)
   GeoTrap  *GeoTrap2  = new GeoTrap(149, 0, 0, 126.215, 44.5, 44.5, 0, 95, 44.5, 44.5, 0);
   GeoTrap  *GeoTrap3  = new GeoTrap(72, 0, 0, 294.5, 44.5, 44.5, 0, 279.396, 44.5, 44.5, 0);
   
-  GeoTransform *xt1 = new GeoTransform (GeoTrf::TranslateY3D(-53)*GeoTrf::RotateX3D(42.25*GeoModelKernelUnits::deg));
+  GeoTransform *xt1 = new GeoTransform (GeoTrf::TranslateY3D(-53)*GeoTrf::RotateX3D(42.25*Gaudi::Units::deg));
   spliceboxr->add(xt1);
   spliceboxl->add(xt1);
   GeoLogVol  *lt1     = new GeoLogVol("LAr::DM::TBox1",Trd1,air);
@@ -1487,18 +1488,18 @@ void LArGeo::BarrelDMConstruction::create(GeoFullPhysVol* envelope)
   //-------------- Place volumes in LAr Envelope -------------------
  
   //sectorPlates
-  TRANSFUNCTION spA = Pow(GeoTrf::RotateZ3D(1.0),f-(Alfa/2))*GeoTrf::TranslateX3D(2095)*GeoTrf::TranslateZ3D(3410.1)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg);
-  TRANSFUNCTION spC = Pow(GeoTrf::RotateZ3D(1.0),f+(Alfa/2))*GeoTrf::TranslateX3D(2095)*GeoTrf::TranslateZ3D(-3410.1)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg);
+  TRANSFUNCTION spA = Pow(GeoTrf::RotateZ3D(1.0),f-(Alfa/2))*GeoTrf::TranslateX3D(2095)*GeoTrf::TranslateZ3D(3410.1)*GeoTrf::RotateY3D(90*Gaudi::Units::deg);
+  TRANSFUNCTION spC = Pow(GeoTrf::RotateZ3D(1.0),f+(Alfa/2))*GeoTrf::TranslateX3D(2095)*GeoTrf::TranslateZ3D(-3410.1)*GeoTrf::RotateY3D(90*Gaudi::Units::deg);
   GeoSerialTransformer *sptA = new GeoSerialTransformer(sectorplates,&spA, NCrates);
   GeoSerialTransformer *sptC = new GeoSerialTransformer(sectorplates,&spC, NCrates);
   envelope->add(sptA);
   envelope->add(sptC);
 
   //bridgePlates
-  TRANSFUNCTION brpA1 = Pow(GeoTrf::RotateZ3D(1.0),f-(5*Alfa/2))*GeoTrf::TranslateX3D(2974.5)*GeoTrf::TranslateZ3D(3170.1)*GeoTrf::RotateZ3D(90*GeoModelKernelUnits::deg)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg)*GeoTrf::RotateX3D(90*GeoModelKernelUnits::deg);
-  TRANSFUNCTION brpA2 = Pow(GeoTrf::RotateZ3D(1.0),f+(13*Alfa/2))*GeoTrf::TranslateX3D(2974.5)*GeoTrf::TranslateZ3D(3170.1)*GeoTrf::RotateZ3D(90*GeoModelKernelUnits::deg)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg)*GeoTrf::RotateX3D(90*GeoModelKernelUnits::deg); 
-  TRANSFUNCTION brpC1 = Pow(GeoTrf::RotateZ3D(1.0),f-(5*Alfa/2))*GeoTrf::TranslateX3D(2974.5)*GeoTrf::TranslateZ3D(-3170.1)*GeoTrf::RotateZ3D(-90*GeoModelKernelUnits::deg)*GeoTrf::RotateY3D(-90*GeoModelKernelUnits::deg)*GeoTrf::RotateX3D(-90*GeoModelKernelUnits::deg);
-  TRANSFUNCTION brpC2 = Pow(GeoTrf::RotateZ3D(1.0),f+(13*Alfa/2))*GeoTrf::TranslateX3D(2974.5)*GeoTrf::TranslateZ3D(-3170.1)*GeoTrf::RotateZ3D(-90*GeoModelKernelUnits::deg)*GeoTrf::RotateY3D(-90*GeoModelKernelUnits::deg)*GeoTrf::RotateX3D(-90*GeoModelKernelUnits::deg);   GeoSerialTransformer *brptA1 = new GeoSerialTransformer(bridgeplates,&brpA1, 5);
+  TRANSFUNCTION brpA1 = Pow(GeoTrf::RotateZ3D(1.0),f-(5*Alfa/2))*GeoTrf::TranslateX3D(2974.5)*GeoTrf::TranslateZ3D(3170.1)*GeoTrf::RotateZ3D(90*Gaudi::Units::deg)*GeoTrf::RotateY3D(90*Gaudi::Units::deg)*GeoTrf::RotateX3D(90*Gaudi::Units::deg);
+  TRANSFUNCTION brpA2 = Pow(GeoTrf::RotateZ3D(1.0),f+(13*Alfa/2))*GeoTrf::TranslateX3D(2974.5)*GeoTrf::TranslateZ3D(3170.1)*GeoTrf::RotateZ3D(90*Gaudi::Units::deg)*GeoTrf::RotateY3D(90*Gaudi::Units::deg)*GeoTrf::RotateX3D(90*Gaudi::Units::deg); 
+  TRANSFUNCTION brpC1 = Pow(GeoTrf::RotateZ3D(1.0),f-(5*Alfa/2))*GeoTrf::TranslateX3D(2974.5)*GeoTrf::TranslateZ3D(-3170.1)*GeoTrf::RotateZ3D(-90*Gaudi::Units::deg)*GeoTrf::RotateY3D(-90*Gaudi::Units::deg)*GeoTrf::RotateX3D(-90*Gaudi::Units::deg);
+  TRANSFUNCTION brpC2 = Pow(GeoTrf::RotateZ3D(1.0),f+(13*Alfa/2))*GeoTrf::TranslateX3D(2974.5)*GeoTrf::TranslateZ3D(-3170.1)*GeoTrf::RotateZ3D(-90*Gaudi::Units::deg)*GeoTrf::RotateY3D(-90*Gaudi::Units::deg)*GeoTrf::RotateX3D(-90*Gaudi::Units::deg);   GeoSerialTransformer *brptA1 = new GeoSerialTransformer(bridgeplates,&brpA1, 5);
   GeoSerialTransformer *brptA2 = new GeoSerialTransformer(bridgeplates,&brpA2, 5);
   GeoSerialTransformer *brptC1 = new GeoSerialTransformer(bridgeplates,&brpC1, 5);
   GeoSerialTransformer *brptC2 = new GeoSerialTransformer(bridgeplates,&brpC2, 5);
@@ -1508,27 +1509,27 @@ void LArGeo::BarrelDMConstruction::create(GeoFullPhysVol* envelope)
   envelope->add(brptC2);
 
   //basePlates
-  TRANSFUNCTION bpA = Pow(GeoTrf::RotateZ3D(1.0),f-(Alfa/2))*GeoTrf::TranslateX3D(3464)*GeoTrf::TranslateZ3D(2930.6)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg); 
-  TRANSFUNCTION bpC = Pow(GeoTrf::RotateZ3D(1.0),f+(Alfa/2))*GeoTrf::TranslateX3D(3464)*GeoTrf::TranslateZ3D(-2930.6)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg);
+  TRANSFUNCTION bpA = Pow(GeoTrf::RotateZ3D(1.0),f-(Alfa/2))*GeoTrf::TranslateX3D(3464)*GeoTrf::TranslateZ3D(2930.6)*GeoTrf::RotateY3D(90*Gaudi::Units::deg); 
+  TRANSFUNCTION bpC = Pow(GeoTrf::RotateZ3D(1.0),f+(Alfa/2))*GeoTrf::TranslateX3D(3464)*GeoTrf::TranslateZ3D(-2930.6)*GeoTrf::RotateY3D(90*Gaudi::Units::deg);
   GeoSerialTransformer *bptA = new GeoSerialTransformer(baseplates,&bpA, NCrates);
   GeoSerialTransformer *bptC = new GeoSerialTransformer(baseplates,&bpC, NCrates);
   envelope->add(bptA);
   envelope->add(bptC);
 
   //sectorEnvelopes
-  TRANSFUNCTION seA1 = Pow(GeoTrf::RotateZ3D(1.0),f-(Alfa/2))*GeoTrf::TranslateX3D((Endb+Enda)/2)*GeoTrf::TranslateZ3D(3468.05)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg);
-  TRANSFUNCTION seC1 = Pow(GeoTrf::RotateZ3D(1.0),f-(Alfa/2))*GeoTrf::TranslateX3D((Endb+Enda)/2)*GeoTrf::TranslateZ3D(-3468.05)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg);
+  TRANSFUNCTION seA1 = Pow(GeoTrf::RotateZ3D(1.0),f-(Alfa/2))*GeoTrf::TranslateX3D((Endb+Enda)/2)*GeoTrf::TranslateZ3D(3468.05)*GeoTrf::RotateY3D(90*Gaudi::Units::deg);
+  TRANSFUNCTION seC1 = Pow(GeoTrf::RotateZ3D(1.0),f-(Alfa/2))*GeoTrf::TranslateX3D((Endb+Enda)/2)*GeoTrf::TranslateZ3D(-3468.05)*GeoTrf::RotateY3D(90*Gaudi::Units::deg);
   GeoSerialTransformer *setA1 = new GeoSerialTransformer(sectorenvelopes1,&seA1, NCrates);
   GeoSerialTransformer *setC1 = new GeoSerialTransformer(sectorenvelopes1,&seC1, NCrates);
   envelope->add(setA1); 
   envelope->add(setC1);
   
-  TRANSFUNCTION seA2r = Pow(GeoTrf::RotateZ3D(1.0),8*f-(3*Alfa/2))*GeoTrf::TranslateX3D((Endb+Endc)/2)*GeoTrf::TranslateZ3D(3468.05)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg);
-  TRANSFUNCTION seA2l = Pow(GeoTrf::RotateZ3D(1.0),8*f+(5*Alfa/2))*GeoTrf::TranslateX3D((Endb+Endc)/2)*GeoTrf::TranslateZ3D(3468.05)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg);
-  TRANSFUNCTION seA2 = Pow(GeoTrf::RotateZ3D(1.0),4*f+(Alfa/2))*GeoTrf::TranslateX3D((Endb+Endc)/2)*GeoTrf::TranslateZ3D(3468.05)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg);
-  TRANSFUNCTION seC2 = Pow(GeoTrf::RotateZ3D(1.0),4*f+(Alfa/2))*GeoTrf::TranslateX3D((Endb+Endc)/2)*GeoTrf::TranslateZ3D(-3468.05)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg);
-  TRANSFUNCTION seC2r = Pow(GeoTrf::RotateZ3D(1.0),8*f-(3*Alfa/2))*GeoTrf::TranslateX3D((Endb+Endc)/2)*GeoTrf::TranslateZ3D(-3468.05)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg);
-  TRANSFUNCTION seC2l = Pow(GeoTrf::RotateZ3D(1.0),8*f+(5*Alfa/2))*GeoTrf::TranslateX3D((Endb+Endc)/2)*GeoTrf::TranslateZ3D(-3468.05)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg);
+  TRANSFUNCTION seA2r = Pow(GeoTrf::RotateZ3D(1.0),8*f-(3*Alfa/2))*GeoTrf::TranslateX3D((Endb+Endc)/2)*GeoTrf::TranslateZ3D(3468.05)*GeoTrf::RotateY3D(90*Gaudi::Units::deg);
+  TRANSFUNCTION seA2l = Pow(GeoTrf::RotateZ3D(1.0),8*f+(5*Alfa/2))*GeoTrf::TranslateX3D((Endb+Endc)/2)*GeoTrf::TranslateZ3D(3468.05)*GeoTrf::RotateY3D(90*Gaudi::Units::deg);
+  TRANSFUNCTION seA2 = Pow(GeoTrf::RotateZ3D(1.0),4*f+(Alfa/2))*GeoTrf::TranslateX3D((Endb+Endc)/2)*GeoTrf::TranslateZ3D(3468.05)*GeoTrf::RotateY3D(90*Gaudi::Units::deg);
+  TRANSFUNCTION seC2 = Pow(GeoTrf::RotateZ3D(1.0),4*f+(Alfa/2))*GeoTrf::TranslateX3D((Endb+Endc)/2)*GeoTrf::TranslateZ3D(-3468.05)*GeoTrf::RotateY3D(90*Gaudi::Units::deg);
+  TRANSFUNCTION seC2r = Pow(GeoTrf::RotateZ3D(1.0),8*f-(3*Alfa/2))*GeoTrf::TranslateX3D((Endb+Endc)/2)*GeoTrf::TranslateZ3D(-3468.05)*GeoTrf::RotateY3D(90*Gaudi::Units::deg);
+  TRANSFUNCTION seC2l = Pow(GeoTrf::RotateZ3D(1.0),8*f+(5*Alfa/2))*GeoTrf::TranslateX3D((Endb+Endc)/2)*GeoTrf::TranslateZ3D(-3468.05)*GeoTrf::RotateY3D(90*Gaudi::Units::deg);
   GeoSerialTransformer *setA2r = new GeoSerialTransformer(sectorenvelopes2r,&seA2r, 2);
   GeoSerialTransformer *setA2l = new GeoSerialTransformer(sectorenvelopes2l,&seA2l, 2);
   GeoSerialTransformer *setA2 = new GeoSerialTransformer(sectorenvelopes2,&seA2, 4);
@@ -1543,16 +1544,16 @@ void LArGeo::BarrelDMConstruction::create(GeoFullPhysVol* envelope)
   envelope->add(setC2l);
 
   //bridgeEnvelopes
-  TRANSFUNCTION breA = Pow(GeoTrf::RotateZ3D(1.0),f-(Alfa/2))*GeoTrf::TranslateX3D(2974.532)*GeoTrf::TranslateZ3D(3263.65)*GeoTrf::RotateZ3D(90*GeoModelKernelUnits::deg)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg)*GeoTrf::RotateX3D(90*GeoModelKernelUnits::deg);
-  TRANSFUNCTION breC = Pow(GeoTrf::RotateZ3D(1.0),f-(Alfa/2))*GeoTrf::TranslateX3D(2974.532)*GeoTrf::TranslateZ3D(-3263.65)*GeoTrf::RotateZ3D(-90*GeoModelKernelUnits::deg)*GeoTrf::RotateY3D(-90*GeoModelKernelUnits::deg)*GeoTrf::RotateX3D(-90*GeoModelKernelUnits::deg);
+  TRANSFUNCTION breA = Pow(GeoTrf::RotateZ3D(1.0),f-(Alfa/2))*GeoTrf::TranslateX3D(2974.532)*GeoTrf::TranslateZ3D(3263.65)*GeoTrf::RotateZ3D(90*Gaudi::Units::deg)*GeoTrf::RotateY3D(90*Gaudi::Units::deg)*GeoTrf::RotateX3D(90*Gaudi::Units::deg);
+  TRANSFUNCTION breC = Pow(GeoTrf::RotateZ3D(1.0),f-(Alfa/2))*GeoTrf::TranslateX3D(2974.532)*GeoTrf::TranslateZ3D(-3263.65)*GeoTrf::RotateZ3D(-90*Gaudi::Units::deg)*GeoTrf::RotateY3D(-90*Gaudi::Units::deg)*GeoTrf::RotateX3D(-90*Gaudi::Units::deg);
   GeoSerialTransformer *bretA = new GeoSerialTransformer(bridgeenvelopes,&breA, NCrates);
   GeoSerialTransformer *bretC = new GeoSerialTransformer(bridgeenvelopes,&breC, NCrates);
   envelope->add(bretA);
   envelope->add(bretC);
 
   //baseEnvelopes
-  TRANSFUNCTION beA = Pow(GeoTrf::RotateZ3D(1.0),f-(Alfa/2))*GeoTrf::TranslateX3D(3464)*GeoTrf::TranslateZ3D(3059.2)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg); 
-  TRANSFUNCTION beC = Pow(GeoTrf::RotateZ3D(1.0),f+(Alfa/2))*GeoTrf::TranslateX3D(3464)*GeoTrf::TranslateZ3D(-3059.2)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg);
+  TRANSFUNCTION beA = Pow(GeoTrf::RotateZ3D(1.0),f-(Alfa/2))*GeoTrf::TranslateX3D(3464)*GeoTrf::TranslateZ3D(3059.2)*GeoTrf::RotateY3D(90*Gaudi::Units::deg); 
+  TRANSFUNCTION beC = Pow(GeoTrf::RotateZ3D(1.0),f+(Alfa/2))*GeoTrf::TranslateX3D(3464)*GeoTrf::TranslateZ3D(-3059.2)*GeoTrf::RotateY3D(90*Gaudi::Units::deg);
   GeoSerialTransformer *betA = new GeoSerialTransformer(baseenvelopes,&beA, NCrates);
   GeoSerialTransformer *betC = new GeoSerialTransformer(baseenvelopes,&beC, NCrates);
   envelope->add(betA);
diff --git a/LArCalorimeter/LArGeoModel/LArGeoBarrel/src/BarrelPresamplerConstruction.cxx b/LArCalorimeter/LArGeoModel/LArGeoBarrel/src/BarrelPresamplerConstruction.cxx
index 8d31d8851e2c164165da862cbe4437edabeb0dfc..06c574fc72603ea8f9958f5ddf994ac4b88224cd 100755
--- a/LArCalorimeter/LArGeoModel/LArGeoBarrel/src/BarrelPresamplerConstruction.cxx
+++ b/LArCalorimeter/LArGeoModel/LArGeoBarrel/src/BarrelPresamplerConstruction.cxx
@@ -34,7 +34,7 @@
 #include "CLHEP/Vector/Rotation.h"
 
 // For units:
-#include "CLHEP/Units/PhysicalConstants.h"
+#include "GaudiKernel/PhysicalConstants.h"
 #include "GaudiKernel/MsgStream.h"
 #include "GaudiKernel/Bootstrap.h"
 
@@ -123,17 +123,17 @@ LArGeo::BarrelPresamplerConstruction ::BarrelPresamplerConstruction(bool fullGeo
 
   const GeoMaterial *ConnecMat  = materialManager->getMaterial("LAr::ConnecMat");
   if (!ConnecMat) throw std::runtime_error("Error in BarrelPresamplerConstruction, LAr::ConnecMat is not found.");
-  //  double rMinPresamplerMother   =1385*GeoModelKernelUnits::mm;
-  double rMinPresamplerMother   =1410*GeoModelKernelUnits::mm;
-  double rMaxPresamplerMother   =1447*GeoModelKernelUnits::mm-0.001*GeoModelKernelUnits::mm;
-  double presamplerMother_length=1549*GeoModelKernelUnits::mm;
-  double Phi_min=0.*GeoModelKernelUnits::deg;
-  double Phi_span=360.*GeoModelKernelUnits::deg;
+  //  double rMinPresamplerMother   =1385*Gaudi::Units::mm;
+  double rMinPresamplerMother   =1410*Gaudi::Units::mm;
+  double rMaxPresamplerMother   =1447*Gaudi::Units::mm-0.001*Gaudi::Units::mm;
+  double presamplerMother_length=1549*Gaudi::Units::mm;
+  double Phi_min=0.*Gaudi::Units::deg;
+  double Phi_span=360.*Gaudi::Units::deg;
   int nbsectors=32;
 
   if (itb==1) {
-     Phi_min=-0.5*GeoModelKernelUnits::deg;
-     Phi_span=23.5*GeoModelKernelUnits::deg;
+     Phi_min=-0.5*Gaudi::Units::deg;
+     Phi_span=23.5*Gaudi::Units::deg;
      nbsectors=2;
   }
 
@@ -209,42 +209,42 @@ LArGeo::BarrelPresamplerConstruction ::BarrelPresamplerConstruction(bool fullGeo
   // Make a presampler sector:
   if(m_fullGeo){
     // ?    
-    double  epsil = 0.007*GeoModelKernelUnits::mm;
+    double  epsil = 0.007*Gaudi::Units::mm;
 
     //  contraction factor 
-    double  cmm = (1-0.0026)*GeoModelKernelUnits::mm;
+    double  cmm = (1-0.0026)*Gaudi::Units::mm;
  
     double  mod_leng[8];
     for(int ii=0; ii<8; ii++ ) mod_leng[ii]=mod[ii][0]*cmm+2*epsil;
 
     double  mod_heig[8];
-    double larheight = 13*GeoModelKernelUnits::mm;
+    double larheight = 13*Gaudi::Units::mm;
 
-    double prep1_th = 1.*GeoModelKernelUnits::mm;                 // bottom prepreg layer 
-    double prep2_th = 4.5*GeoModelKernelUnits::mm;   
-    double smallLength = 275.6*GeoModelKernelUnits::mm;
+    double prep1_th = 1.*Gaudi::Units::mm;                 // bottom prepreg layer 
+    double prep2_th = 4.5*Gaudi::Units::mm;   
+    double smallLength = 275.6*Gaudi::Units::mm;
     double bigLength = 277.5;
     double prep1_height = (smallLength/2+1.)*cmm;
-    double larheight2 = larheight*cos(-mod[1][3]*GeoModelKernelUnits::deg)*GeoModelKernelUnits::mm;
+    double larheight2 = larheight*cos(-mod[1][3]*Gaudi::Units::deg)*Gaudi::Units::mm;
     mod_heig[0]= (larheight+prep1_th+prep2_th)*cmm+4*epsil;
     mod_heig[1]= (larheight2+prep1_th+prep2_th)*cmm+5.*epsil;
     for(int  i=2; i<8; i++ ) mod_heig[i] = mod_heig[0];
 
-    double shell_th = 0.4*GeoModelKernelUnits::mm; 
-    double rail_th  = 8.6*GeoModelKernelUnits::mm;
-    double mech_clear = 0.5*GeoModelKernelUnits::mm;
+    double shell_th = 0.4*Gaudi::Units::mm; 
+    double rail_th  = 8.6*Gaudi::Units::mm;
+    double mech_clear = 0.5*Gaudi::Units::mm;
 
 
     double  mb_length = 3100.3;
     double  sector_length =  mb_length*cmm +9.*epsil;
-    double  sector_height =  mod_heig[0]+(shell_th+rail_th)*cmm+mech_clear*GeoModelKernelUnits::mm+3*epsil; 
+    double  sector_height =  mod_heig[0]+(shell_th+rail_th)*cmm+mech_clear*Gaudi::Units::mm+3*epsil; 
 
     unsigned int nsectors=32;
     double mod_xm = prep1_height+epsil;
-    double mod_xp = (bigLength/2+1.+prep2_th*tan((360./(2*nsectors))*GeoModelKernelUnits::deg))*cmm;
+    double mod_xp = (bigLength/2+1.+prep2_th*tan((360./(2*nsectors))*Gaudi::Units::deg))*cmm;
     double sect_xm = mod_xm+epsil;
-    double sect_xp = sect_xm+sector_height*tan((360./(2*nsectors))*GeoModelKernelUnits::deg);	    
-    double rpres = 1426.*GeoModelKernelUnits::mm;
+    double sect_xp = sect_xm+sector_height*tan((360./(2*nsectors))*Gaudi::Units::deg);	    
+    double rpres = 1426.*Gaudi::Units::mm;
 
     double zpres = -presamplerMother_length+sector_length/2+epsil;
 
@@ -254,9 +254,9 @@ LArGeo::BarrelPresamplerConstruction ::BarrelPresamplerConstruction(bool fullGeo
     GeoPhysVol  *sectorPhysVol = new GeoPhysVol(logVol);
 
     GeoGenfun::Variable I;
-    double dphiSector = (360.*GeoModelKernelUnits::deg)/nsectors;
+    double dphiSector = (360.*Gaudi::Units::deg)/nsectors;
     GeoGenfun::GENFUNCTION  f = dphiSector*I+0.5*dphiSector;
-    GeoXF::TRANSFUNCTION t = GeoXF::Pow(GeoTrf::RotateZ3D(1.0),f)*GeoTrf::TranslateX3D(rpres)*GeoTrf::TranslateZ3D(zpres)*GeoTrf::RotateZ3D(90*GeoModelKernelUnits::deg)*GeoTrf::RotateX3D(90*GeoModelKernelUnits::deg);
+    GeoXF::TRANSFUNCTION t = GeoXF::Pow(GeoTrf::RotateZ3D(1.0),f)*GeoTrf::TranslateX3D(rpres)*GeoTrf::TranslateZ3D(zpres)*GeoTrf::RotateZ3D(90*Gaudi::Units::deg)*GeoTrf::RotateX3D(90*Gaudi::Units::deg);
     GeoSerialTransformer *st = new GeoSerialTransformer(sectorPhysVol,&t, nbsectors);
 
     m_psPhysicalPos->add(st);
@@ -271,7 +271,7 @@ LArGeo::BarrelPresamplerConstruction ::BarrelPresamplerConstruction(bool fullGeo
     // recompute length of module 0 and 1 to have avoid overshoorting of first cathode of module 1
     // into module 0  => reduce module 0 length by 0.5*lar_height*tan(tilt angle)
     //                    and increase module 1 length by same amount
-    double delta01 =  0.5*larheight*tan(-mod[1][3]*GeoModelKernelUnits::deg);   // delta01 is >0
+    double delta01 =  0.5*larheight*tan(-mod[1][3]*Gaudi::Units::deg);   // delta01 is >0
     mod_leng[0]=mod_leng[0]-delta01; 
     mod_leng[1]=mod_leng[1]+delta01; 
     GeoPhysVol* pvModule[8];
@@ -303,7 +303,7 @@ LArGeo::BarrelPresamplerConstruction ::BarrelPresamplerConstruction(bool fullGeo
 
     double shell_leng = mod[0][0]+mod[1][0]+mod[2][0]+mod[3][0]+mod[4][0]+mod[5][0]+mod[6][0]+mod[7][0];
     double prot_y = (shell_leng/2)*cmm;
-    double glX = 0.*GeoModelKernelUnits::mm;
+    double glX = 0.*Gaudi::Units::mm;
     double glY = -sector_length/2+prot_y+epsil;
 
     //-----------------------------A Protection Shell--------------------------//
@@ -379,7 +379,7 @@ LArGeo::BarrelPresamplerConstruction ::BarrelPresamplerConstruction(bool fullGeo
 
       double connZ = mbZ+(mb_th/2+heightOut/2)*cmm+epsil;
       GeoTransform* xf1 = new GeoTransform(GeoTrf::TranslateZ3D(connZ));
-      GeoTransform* xf2 = new GeoTransform(GeoTrf::RotateX3D(-90*GeoModelKernelUnits::deg));
+      GeoTransform* xf2 = new GeoTransform(GeoTrf::RotateX3D(-90*Gaudi::Units::deg));
 
       sectorPhysVol->add(xf1);
       sectorPhysVol->add(xf2);
@@ -413,8 +413,8 @@ LArGeo::BarrelPresamplerConstruction ::BarrelPresamplerConstruction(bool fullGeo
     double anode_th = 0.330;
     double cathode_th = 0.270;
 
-    double heig_elec1 = (larheight/cos(-mod[0][3]*GeoModelKernelUnits::deg)-0.5*anode_th/cos(mod[0][3]*GeoModelKernelUnits::deg))*cmm;
-    double heig_elec3 = (larheight-0.5*cathode_th/cos(mod[1][3]*GeoModelKernelUnits::deg))*cmm;
+    double heig_elec1 = (larheight/cos(-mod[0][3]*Gaudi::Units::deg)-0.5*anode_th/cos(mod[0][3]*Gaudi::Units::deg))*cmm;
+    double heig_elec3 = (larheight-0.5*cathode_th/cos(mod[1][3]*Gaudi::Units::deg))*cmm;
 
     GeoTrd* catho1 = new GeoTrd(smallLength/2*cmm,bigLength/2*cmm,cathode_th/2*cmm,cathode_th/2*cmm,heig_elec1/2*cmm);
     GeoLogVol* LV_catho1 = new GeoLogVol(basename+"::Cathode1",catho1,CathodeMat);
@@ -492,8 +492,8 @@ LArGeo::BarrelPresamplerConstruction ::BarrelPresamplerConstruction(bool fullGeo
       GeoGenfun::GENFUNCTION cathoGF = YStartC[i]+I*mod[i][4]*cmm;
       GeoGenfun::GENFUNCTION anoGF = YStartA[i]+I*mod[i][4]*cmm;
 
-      GeoXF::TRANSFUNCTION cathoTF = GeoXF::Pow(GeoTrf::TranslateY3D(1.),cathoGF)*GeoTrf::TranslateZ3D(elec_trans)*GeoTrf::RotateX3D(-mod[i][3]*GeoModelKernelUnits::deg);
-      GeoXF::TRANSFUNCTION anoTF = GeoXF::Pow(GeoTrf::TranslateY3D(1.),anoGF)*GeoTrf::TranslateZ3D(elec_trans)*GeoTrf::RotateX3D(-mod[i][3]*GeoModelKernelUnits::deg);
+      GeoXF::TRANSFUNCTION cathoTF = GeoXF::Pow(GeoTrf::TranslateY3D(1.),cathoGF)*GeoTrf::TranslateZ3D(elec_trans)*GeoTrf::RotateX3D(-mod[i][3]*Gaudi::Units::deg);
+      GeoXF::TRANSFUNCTION anoTF = GeoXF::Pow(GeoTrf::TranslateY3D(1.),anoGF)*GeoTrf::TranslateZ3D(elec_trans)*GeoTrf::RotateX3D(-mod[i][3]*Gaudi::Units::deg);
 
 
       GeoSerialTransformer *cathoST,*anoST;
diff --git a/LArCalorimeter/LArGeoModel/LArGeoCode/src/LArMaterialManager.cxx b/LArCalorimeter/LArGeoModel/LArGeoCode/src/LArMaterialManager.cxx
index 967131032979dab160b98a89da730fff6f1672d1..5b7e6ed8dd7ad3c3601ec5c9aeac4b86f89bd89a 100755
--- a/LArCalorimeter/LArGeoModel/LArGeoCode/src/LArMaterialManager.cxx
+++ b/LArCalorimeter/LArGeoModel/LArGeoCode/src/LArMaterialManager.cxx
@@ -9,6 +9,7 @@
 #include "StoreGate/StoreGate.h"
 #include "StoreGate/StoreGateSvc.h"
 #include "GaudiKernel/Bootstrap.h"
+#include "GaudiKernel/PhysicalConstants.h"
 #include "GeoModelInterfaces/IGeoModelSvc.h"
 #include "GeoModelInterfaces/StoredMaterialManager.h"
 #include "GaudiKernel/ISvcLocator.h"
@@ -49,7 +50,7 @@ void LArMaterialManager::buildMaterials()
   if (!Copper) throw std::runtime_error("Error in LArMaterialManager, std::Copper is not found.");
 #ifdef DEBUGGEO
   msg << "Copper radiation length " << Copper->getRadLength() << " "
-            << Copper->getDensity()/(GeoModelKernelUnits::g/GeoModelKernelUnits::cm3) << endmsg;
+            << Copper->getDensity()/(GeoModelKernelUnits::g/Gaudi::Units::cm3) << endmsg;
 #endif
 
 
@@ -60,7 +61,7 @@ void LArMaterialManager::buildMaterials()
   if (!Lead) throw std::runtime_error("Error in LArMaterialManager, std::Lead is not found.");
 #ifdef DEBUGGEO
   msg << MSG::INFO<< "Lead radiation length " << Lead->getRadLength() << " "
-             << Lead->getDensity()/(GeoModelKernelUnits::g/GeoModelKernelUnits::cm3) << endmsg;
+             << Lead->getDensity()/(GeoModelKernelUnits::g/Gaudi::Units::cm3) << endmsg;
 #endif
 
 
@@ -69,7 +70,7 @@ void LArMaterialManager::buildMaterials()
 
 #ifdef DEBUGGEO
   msg << MSG::INFO<< "LAr radiation length " << LAr->getRadLength() << " "
-            << LAr->getDensity()/(GeoModelKernelUnits::g/GeoModelKernelUnits::cm3) << endmsg;
+            << LAr->getDensity()/(GeoModelKernelUnits::g/Gaudi::Units::cm3) << endmsg;
 #endif
 
   const GeoMaterial *Air  = m_storedManager->getMaterial("std::Air");
@@ -79,7 +80,7 @@ void LArMaterialManager::buildMaterials()
   if (!Kapton) throw std::runtime_error("Error in LArMaterialManager, std::Kapton is not found.");
 #ifdef DEBUGGEO
   msg << MSG::INFO<< "Kapton radiation length " << Kapton->getRadLength() <<  " "
-            << Kapton->getDensity()/(GeoModelKernelUnits::g/GeoModelKernelUnits::cm3) << endmsg;
+            << Kapton->getDensity()/(GeoModelKernelUnits::g/Gaudi::Units::cm3) << endmsg;
   for (size_t i = 0; i< Kapton->getNumElements();i++) {
     msg << MSG::INFO << int (Kapton->getFraction(i)*100) << "% \t"  << Kapton->getElement(i)->getName() << endmsg;
     }
@@ -91,7 +92,7 @@ void LArMaterialManager::buildMaterials()
   if (!Glue) throw std::runtime_error("Error in LArMaterialManager, LAr::Glue is not found.");
 #ifdef DEBUGGEO
   msg << MSG::INFO<< "Glue   radiation length " << Glue->getRadLength() << " "
-            << Glue->getDensity()/(GeoModelKernelUnits::g/GeoModelKernelUnits::cm3) << endmsg;
+            << Glue->getDensity()/(GeoModelKernelUnits::g/Gaudi::Units::cm3) << endmsg;
   for (size_t i = 0; i< Glue->getNumElements();i++) {
     msg << MSG::INFO << int (Glue->getFraction(i)*100) << "% \t"  << Glue->getElement(i)->getName() << endmsg;
     }
@@ -102,7 +103,7 @@ void LArMaterialManager::buildMaterials()
   if (!G10) throw std::runtime_error("Error in LArMaterialManager, LAr::G10 is not found.");
 #ifdef DEBUGGEO
   msg << MSG::INFO<< "G10    radiation length " << G10->getRadLength() << " "
-            << G10->getDensity()/(GeoModelKernelUnits::g/GeoModelKernelUnits::cm3) << endmsg;
+            << G10->getDensity()/(GeoModelKernelUnits::g/Gaudi::Units::cm3) << endmsg;
   for (size_t i = 0; i< G10->getNumElements();i++) {
     msg << MSG::INFO << int (G10->getFraction(i)*100) << "% \t"  << G10->getElement(i)->getName() << endmsg;
     }
@@ -128,9 +129,9 @@ void LArMaterialManager::buildMaterials()
     double contract=dB.getDouble("ColdContraction","ColdContraction-00", "ABSORBERCONTRACTION"); // LArEMBAbsorberContraction
 
     // first thin absorbers
-    Tggl=dB.getDouble("BarrelGeometry","BarrelGeometry-00","TGGL")*GeoModelKernelUnits::cm*contract; // LArEMBThinAbsGlue
-    Tgfe=dB.getDouble("BarrelGeometry","BarrelGeometry-00","TGFE")*GeoModelKernelUnits::cm*contract; // LArEMBThinAbsIron
-    Tgpb=dB.getDouble("BarrelGeometry","BarrelGeometry-00","TGPB")*GeoModelKernelUnits::cm*contract; // LArEMBThinAbsLead
+    Tggl=dB.getDouble("BarrelGeometry","BarrelGeometry-00","TGGL")*Gaudi::Units::cm*contract; // LArEMBThinAbsGlue
+    Tgfe=dB.getDouble("BarrelGeometry","BarrelGeometry-00","TGFE")*Gaudi::Units::cm*contract; // LArEMBThinAbsIron
+    Tgpb=dB.getDouble("BarrelGeometry","BarrelGeometry-00","TGPB")*Gaudi::Units::cm*contract; // LArEMBThinAbsLead
     Totalthick = Tggl+Tgfe+Tgpb;
     Totalmass = (Tgpb*Lead->getDensity()+Tgfe*Iron->getDensity()+Tggl*Glue->getDensity());
     //***GU below are the fraction per mass
@@ -143,7 +144,7 @@ void LArMaterialManager::buildMaterials()
     msg << MSG::DEBUG <<"  Fraction pb,fe,gl: "<<Fracpb<<","<<Fracfe<<"," <<Fracgl<< endmsg;
     msg << MSG::DEBUG <<"  Total mass, Thickness: "<<Totalmass<<" ," <<Totalthick<< endmsg;
     msg << MSG::DEBUG<<" Contraction " << contract << endmsg;
-    msg << MSG::DEBUG <<"  Thinabs Density =  "<< density*(GeoModelKernelUnits::cm3/GeoModelKernelUnits::g) << endmsg;
+    msg << MSG::DEBUG <<"  Thinabs Density =  "<< density*(Gaudi::Units::cm3/GeoModelKernelUnits::g) << endmsg;
 
     GeoMaterial* Thin_abs = new GeoMaterial("Thinabs",density);
     Thin_abs->add(Lead,Fracpb);
@@ -156,9 +157,9 @@ void LArMaterialManager::buildMaterials()
 #endif
 
     // then thick absorbers
-    Thgl=dB.getDouble("BarrelGeometry","BarrelGeometry-00","THGL")*GeoModelKernelUnits::cm*contract; // LArEMBThickAbsGlue
-    Thfe=dB.getDouble("BarrelGeometry","BarrelGeometry-00","THFE")*GeoModelKernelUnits::cm*contract; // LArEMBThickAbsIron
-    Thpb=dB.getDouble("BarrelGeometry","BarrelGeometry-00","THPB")*GeoModelKernelUnits::cm*contract; // LArEMBThickAbsLead
+    Thgl=dB.getDouble("BarrelGeometry","BarrelGeometry-00","THGL")*Gaudi::Units::cm*contract; // LArEMBThickAbsGlue
+    Thfe=dB.getDouble("BarrelGeometry","BarrelGeometry-00","THFE")*Gaudi::Units::cm*contract; // LArEMBThickAbsIron
+    Thpb=dB.getDouble("BarrelGeometry","BarrelGeometry-00","THPB")*Gaudi::Units::cm*contract; // LArEMBThickAbsLead
 
     Totalthick = Thgl+Thfe+Thpb;
     Totalmass = (Thpb*Lead->getDensity()+Thfe*Iron->getDensity()+Thgl*Glue->getDensity());
@@ -171,7 +172,7 @@ void LArMaterialManager::buildMaterials()
     msg << MSG::DEBUG <<"---- THICK absorber characteristics: ----" << endmsg;
     msg << MSG::DEBUG <<"  Fraction pb,fe,gl: "<<Fracpb<<","<<Fracfe<<","<<Fracgl << endmsg;
     msg << MSG::DEBUG <<"  Total mass, Thickness: "<<Totalmass<<" ,"<<Totalthick << endmsg;
-    msg << MSG::DEBUG <<"  Thickabs Density =  " << density*(GeoModelKernelUnits::cm3/GeoModelKernelUnits::g) << endmsg;
+    msg << MSG::DEBUG <<"  Thickabs Density =  " << density*(Gaudi::Units::cm3/GeoModelKernelUnits::g) << endmsg;
 
     GeoMaterial* Thick_abs = new GeoMaterial("Thickabs",density);
     Thick_abs->add(Lead,Fracpb);
@@ -183,8 +184,8 @@ void LArMaterialManager::buildMaterials()
 #endif
 
     // electrode =mixture Kapton+Cu
-    Thcu=dB.getDouble("BarrelGeometry","BarrelGeometry-00","THCU")*GeoModelKernelUnits::cm; // LArEMBThickElecCopper
-    Thfg=dB.getDouble("BarrelGeometry","BarrelGeometry-00","THFG")*GeoModelKernelUnits::cm; // LArEMBThickElecKapton
+    Thcu=dB.getDouble("BarrelGeometry","BarrelGeometry-00","THCU")*Gaudi::Units::cm; // LArEMBThickElecCopper
+    Thfg=dB.getDouble("BarrelGeometry","BarrelGeometry-00","THFG")*Gaudi::Units::cm; // LArEMBThickElecKapton
     Totalthicke = Thcu+Thfg;
     Totalmasse = (Thcu*Copper->getDensity()+Thfg*Kapton->getDensity());
     //**GU below are the fractions per mass
@@ -198,7 +199,7 @@ void LArMaterialManager::buildMaterials()
     msg << MSG::DEBUG <<"---- Electrode characteristics: ----" << endmsg;
     msg << MSG::DEBUG <<"  Fraction Cu, Kapton: " << FracCu << ","<< FracKap << endmsg;
     msg << MSG::DEBUG <<"  Total mass, Thickness:"<<Totalmasse<<" ,"<<Totalthicke<< endmsg;
-    msg << MSG::DEBUG <<"  Electrode Density =  " << density*(GeoModelKernelUnits::cm3/GeoModelKernelUnits::g) << endmsg;
+    msg << MSG::DEBUG <<"  Electrode Density =  " << density*(Gaudi::Units::cm3/GeoModelKernelUnits::g) << endmsg;
 
     GeoMaterial* Kapton_Cu = new GeoMaterial("KaptonC",density);
     Kapton_Cu->add(Copper,FracCu);
@@ -209,7 +210,7 @@ void LArMaterialManager::buildMaterials()
 #endif
 
     //  material for Cables/electronics (mixture of Kapton and copper)
-    //  density = 2.440*GeoModelKernelUnits::g/GeoModelKernelUnits::cm3;
+    //  density = 2.440*Gaudi::Units::g/Gaudi::Units::cm3;
     //**GU get fractions per mass
     double frmassCu = dB.getDouble("BarrelAccordionCables","BarrelAccordionCables-00","PERCU");  // LArEMBmasspercentCu
     double frmassKap= dB.getDouble("BarrelAccordionCables","BarrelAccordionCables-00","PERKAP"); // LArEMBmasspercentKap
@@ -219,8 +220,8 @@ void LArMaterialManager::buildMaterials()
              /(1.+frmassKapOverCu*Copper->getDensity()/Kapton->getDensity());
     GeoMaterial* Cable_elect = new GeoMaterial("Cables",density);
     double fractionmass;
-    Cable_elect->add(Copper, fractionmass=frmassCu*GeoModelKernelUnits::perCent);
-    Cable_elect->add(Kapton, fractionmass=frmassKap*GeoModelKernelUnits::perCent);
+    Cable_elect->add(Copper, fractionmass=frmassCu*Gaudi::Units::perCent);
+    Cable_elect->add(Kapton, fractionmass=frmassKap*Gaudi::Units::perCent);
     m_storedManager->addMaterial("LAr", Cable_elect);
 #ifdef DEBUGGEO
   msg << MSG::INFO<< "Cable radiation length " << Cable_elect->getRadLength() << endmsg;
@@ -228,8 +229,8 @@ void LArMaterialManager::buildMaterials()
 
     // material for motherboard
     // Mother_board is defined as a mixture of epox_G10 (C8 H14 O4) and Copper
-    ThMBcu  = dB.getDouble("BarrelMotherboards","BarrelMotherboards-00","THICU")*GeoModelKernelUnits::cm;  // LArEMBCuThickness
-    ThMBG10 = dB.getDouble("BarrelMotherboards","BarrelMotherboards-00","THIG10")*GeoModelKernelUnits::cm; // LArEMBG10Thickness
+    ThMBcu  = dB.getDouble("BarrelMotherboards","BarrelMotherboards-00","THICU")*Gaudi::Units::cm;  // LArEMBCuThickness
+    ThMBG10 = dB.getDouble("BarrelMotherboards","BarrelMotherboards-00","THIG10")*Gaudi::Units::cm; // LArEMBG10Thickness
     double TotalthickMBe = ThMBcu+ThMBG10;
     double TotalmassMBe = (ThMBcu*Copper->getDensity()+ThMBG10*G10->getDensity());
     double FracMBCu = (ThMBcu*Copper->getDensity())/TotalmassMBe;
@@ -240,7 +241,7 @@ void LArMaterialManager::buildMaterials()
 	             << FracMBG10 << endmsg;
     msg << MSG::DEBUG <<"  Total mass, Thickness:"
 	             << TotalmassMBe <<" ," <<TotalthickMBe<< endmsg;
-    msg << MSG::DEBUG <<"  M_board Density =  "<<density*(GeoModelKernelUnits::cm3/GeoModelKernelUnits::g) << endmsg;
+    msg << MSG::DEBUG <<"  M_board Density =  "<<density*(Gaudi::Units::cm3/GeoModelKernelUnits::g) << endmsg;
     GeoMaterial*  Moth_elect = new GeoMaterial("MBoards",density);
     // ****GU:   use fraction per masses of G10 and Cu
     Moth_elect->add(G10,FracMBG10);
@@ -255,7 +256,7 @@ void LArMaterialManager::buildMaterials()
     const GeoElement* Si = m_storedManager->getElement("Silicon");
     const GeoElement *O = m_storedManager->getElement("Oxygen");
 
-    density = dB.getDouble("BarrelMotherboards", "BarrelMotherboards-00", "DG10")*(GeoModelKernelUnits::g/GeoModelKernelUnits::cm3);   //LArEMBEpoxyVolumicMass
+    density = dB.getDouble("BarrelMotherboards", "BarrelMotherboards-00", "DG10")*(GeoModelKernelUnits::g/Gaudi::Units::cm3);   //LArEMBEpoxyVolumicMass
     GeoMaterial* SiO2 = new GeoMaterial("SiO2",density);
     double fractionSi=28.09/(28.09+2*16.0);
     SiO2->add(Si,fractionSi);
@@ -263,21 +264,21 @@ void LArMaterialManager::buildMaterials()
     SiO2->add(O,fractionO);
     SiO2->lock();
 // Gten for the bars of the calorimeter= mixture of regular G10 and SiO2
-    density=1.72*GeoModelKernelUnits::g/GeoModelKernelUnits::cm3;    // should be replaced by number from database
+    density=1.72*GeoModelKernelUnits::g/Gaudi::Units::cm3;    // should be replaced by number from database
     GeoMaterial* Gten_bar = new GeoMaterial("G10_bar",density);
     Gten_bar->add(G10,0.38);    // should be replaced by number from database
     Gten_bar->add(SiO2,0.62);   // should be replaced by number from database
     m_storedManager->addMaterial("LAr",Gten_bar);
 #ifdef DEBUGGEO
   msg << MSG::INFO<< "fracionSi,fracionO2 " << fractionSi << " " << fractionO << endmsg;
-  msg << MSG::INFO<< "SiO2 density " << SiO2->getDensity()/(GeoModelKernelUnits::g/GeoModelKernelUnits::cm3) << endmsg;
+  msg << MSG::INFO<< "SiO2 density " << SiO2->getDensity()/(GeoModelKernelUnits::g/Gaudi::Units::cm3) << endmsg;
   msg << MSG::INFO<< "SiO2   radiation length " << SiO2->getRadLength() << endmsg;
   msg << MSG::INFO<< "G10bar radiation length " << Gten_bar->getRadLength() << endmsg;
 #endif
 
 // material for the effective M_PIn+summing board effect
-    double ThSBCu = 0.28*GeoModelKernelUnits::mm;      // should be replaced by number from database
-    double ThSBAr = 9.72*GeoModelKernelUnits::mm;      // should be replaced by number from database
+    double ThSBCu = 0.28*Gaudi::Units::mm;      // should be replaced by number from database
+    double ThSBAr = 9.72*Gaudi::Units::mm;      // should be replaced by number from database
     double TotalThickSB = ThSBCu+ThSBAr;
     double dcu = Copper->getDensity();
     double dar = LAr->getDensity();
@@ -312,12 +313,12 @@ void LArMaterialManager::buildMaterials()
 
     const GeoElement *H = m_storedManager->getElement( "Hydrogen" );
 
-    GeoMaterial *Vacuum = new GeoMaterial( "Vacuum", GeoModelKernelUnits::universe_mean_density );
+    GeoMaterial *Vacuum = new GeoMaterial( "Vacuum", Gaudi::Units::universe_mean_density );
     Vacuum->add( H, 1. );
     m_storedManager->addMaterial("LAr", Vacuum );
 #ifdef DEBUGGEO
     msg << MSG::INFO<< "Vacuum radiation length " << Vacuum->getRadLength() << " "
-                    << Vacuum->getDensity()/(GeoModelKernelUnits::g/GeoModelKernelUnits::cm3) << endmsg;
+                    << Vacuum->getDensity()/(GeoModelKernelUnits::g/Gaudi::Units::cm3) << endmsg;
 #endif
 
 
@@ -335,13 +336,13 @@ void LArMaterialManager::buildMaterials()
     // EMEC thin absorbers
     //
 
-/*  Tggl = 0.30 * GeoModelKernelUnits::mm;
-    Tgfe = 0.40 * GeoModelKernelUnits::mm;
-    Tgpb = 1.70 * GeoModelKernelUnits::mm; */
+/*  Tggl = 0.30 * Gaudi::Units::mm;
+    Tgfe = 0.40 * Gaudi::Units::mm;
+    Tgpb = 1.70 * Gaudi::Units::mm; */
 
-    Tggl = 0.20 * GeoModelKernelUnits::mm;
-    Tgfe = 0.40 * GeoModelKernelUnits::mm;
-    Tgpb = 1.69 * GeoModelKernelUnits::mm;
+    Tggl = 0.20 * Gaudi::Units::mm;
+    Tgfe = 0.40 * Gaudi::Units::mm;
+    Tgpb = 1.69 * Gaudi::Units::mm;
 
     Totalthick = Tggl+Tgfe+Tgpb;
     Totalmass = (Tgpb*Lead->getDensity()+Tgfe*Iron->getDensity()+Tggl*Glue->getDensity());
@@ -354,13 +355,13 @@ void LArMaterialManager::buildMaterials()
     msg << MSG::DEBUG <<"  Thickness pb,fe,gl,[mm]="<<Tgpb<<" "<<Tgfe<<" "<<Tggl << endmsg;
     msg << MSG::DEBUG <<"  Fraction  pb,fe,gl     ="<<Fracpb<<","<<Fracfe<<"," <<Fracgl << endmsg;
     msg << MSG::DEBUG <<"  Total mass, Thickness  ="<<Totalmass<<" ," <<Totalthick << endmsg;
-    msg << MSG::DEBUG <<"  Thinabs Density        ="<< density*(GeoModelKernelUnits::cm3/GeoModelKernelUnits::g) << endmsg;
+    msg << MSG::DEBUG <<"  Thinabs Density        ="<< density*(Gaudi::Units::cm3/GeoModelKernelUnits::g) << endmsg;
 
     msg << MSG::DEBUG << "---- EMEC THIN absorber characteristics: ----" << endmsg;
     msg << MSG::DEBUG <<"  Thickness pb,fe,gl,[mm]="<<Tgpb<<" "<<Tgfe<<" "<<Tggl  << endmsg;
     msg << MSG::DEBUG <<"  Fraction  pb,fe,gl     ="<<Fracpb<<","<<Fracfe<<"," <<Fracgl  << endmsg;
     msg << MSG::DEBUG <<"  Total mass, Thickness  ="<<Totalmass<<" ," <<Totalthick  << endmsg;
-    msg << MSG::DEBUG <<"  Thinabs Density        ="<< density*(GeoModelKernelUnits::cm3/GeoModelKernelUnits::g)  << endmsg;
+    msg << MSG::DEBUG <<"  Thinabs Density        ="<< density*(Gaudi::Units::cm3/GeoModelKernelUnits::g)  << endmsg;
 
 
     GeoMaterial* Thin_abs = new GeoMaterial("EMEC_Thinabs",density);
@@ -377,13 +378,13 @@ void LArMaterialManager::buildMaterials()
     // EMEC thick absorbers
     //
 
-/*    Thgl = 0.30 * GeoModelKernelUnits::mm;
-    Thfe = 0.40 * GeoModelKernelUnits::mm;
-    Thpb = 2.20 * GeoModelKernelUnits::mm; */
+/*    Thgl = 0.30 * Gaudi::Units::mm;
+    Thfe = 0.40 * Gaudi::Units::mm;
+    Thpb = 2.20 * Gaudi::Units::mm; */
 
-    Thgl = 0.20 * GeoModelKernelUnits::mm;
-    Thfe = 0.40 * GeoModelKernelUnits::mm;
-    Thpb = 2.20 * GeoModelKernelUnits::mm;
+    Thgl = 0.20 * Gaudi::Units::mm;
+    Thfe = 0.40 * Gaudi::Units::mm;
+    Thpb = 2.20 * Gaudi::Units::mm;
 
     Totalthick = Thgl+Thfe+Thpb;
     Totalmass = (Thpb*Lead->getDensity()+Thfe*Iron->getDensity()+Thgl*Glue->getDensity());
@@ -397,7 +398,7 @@ void LArMaterialManager::buildMaterials()
     msg << MSG::DEBUG <<"  Thickness pb,fe,gl[mm]="<<Thpb<<" "<<Thfe<<" "<<Thgl<<endmsg;
     msg << MSG::DEBUG <<"  Fraction  pb,fe,gl:    "<<Fracpb<<","<<Fracfe<<","<<Fracgl<<endmsg;
     msg << MSG::DEBUG <<"  Total mass, Thickness: "<<Totalmass<<" ,"<<Totalthick<<endmsg;
-    msg << MSG::DEBUG <<"  Thickabs Density =     "<<density*(GeoModelKernelUnits::cm3/GeoModelKernelUnits::g) <<endmsg;
+    msg << MSG::DEBUG <<"  Thickabs Density =     "<<density*(Gaudi::Units::cm3/GeoModelKernelUnits::g) <<endmsg;
 
     GeoMaterial* Thick_abs = new GeoMaterial("EMEC_Thickabs",density);
     Thick_abs->add(Lead,Fracpb);
@@ -411,8 +412,8 @@ void LArMaterialManager::buildMaterials()
 	//
 	// EMEC shell = iron + glue, identical for inner and outer absorbers
 	//
-    Thgl = 0.20 * GeoModelKernelUnits::mm;
-    Thfe = 0.40 * GeoModelKernelUnits::mm;
+    Thgl = 0.20 * Gaudi::Units::mm;
+    Thfe = 0.40 * Gaudi::Units::mm;
 
     Totalthick = Thgl+Thfe;
     Totalmass = (Thfe*Iron->getDensity()+Thgl*Glue->getDensity());
@@ -425,7 +426,7 @@ void LArMaterialManager::buildMaterials()
     msg << MSG::DEBUG <<"  Thickness fe,gl[mm]="<<Thfe<<" "<<Thgl<<endmsg;
     msg << MSG::DEBUG <<"  Fraction  fe,gl:    "<<Fracfe<<","<<Fracgl<<endmsg;
     msg << MSG::DEBUG <<"  Total mass, Thickness: "<<Totalmass<<" ,"<<Totalthick<<endmsg;
-    msg << MSG::DEBUG <<"  Thickabs Density =     "<<density*(GeoModelKernelUnits::cm3/GeoModelKernelUnits::g) <<endmsg;
+    msg << MSG::DEBUG <<"  Thickabs Density =     "<<density*(Gaudi::Units::cm3/GeoModelKernelUnits::g) <<endmsg;
 
     GeoMaterial* EMEC_shell = new GeoMaterial("EMEC_shell",density);
     EMEC_shell->add(Iron,Fracfe);
@@ -446,13 +447,13 @@ void LArMaterialManager::buildMaterials()
 
     //!! Check whether G10 or G10_bar is to be used!!!!
 
-/*    Tggl = 0.30 * GeoModelKernelUnits::mm;
-    Tgfe = 0.40 * GeoModelKernelUnits::mm;
-    TgG10 =1.70 * GeoModelKernelUnits::mm;*/
+/*    Tggl = 0.30 * Gaudi::Units::mm;
+    Tgfe = 0.40 * Gaudi::Units::mm;
+    TgG10 =1.70 * Gaudi::Units::mm;*/
 
-    Tggl = 0.20 * GeoModelKernelUnits::mm;
-    Tgfe = 0.40 * GeoModelKernelUnits::mm;
-    TgG10 =1.69 * GeoModelKernelUnits::mm;
+    Tggl = 0.20 * Gaudi::Units::mm;
+    Tgfe = 0.40 * Gaudi::Units::mm;
+    TgG10 =1.69 * Gaudi::Units::mm;
 
     Totalthick = Tggl+Tgfe+TgG10;
     Totalmass = (TgG10*G10->getDensity()+Tgfe*Iron->getDensity()+Tggl*Glue->getDensity());
@@ -477,13 +478,13 @@ void LArMaterialManager::buildMaterials()
     // EMEC Inner Wheel barrette
     //
 
-/*    Thgl = 0.30 * GeoModelKernelUnits::mm;
-    Thfe = 0.40 * GeoModelKernelUnits::mm;
-    ThG10 =2.20 * GeoModelKernelUnits::mm;*/
+/*    Thgl = 0.30 * Gaudi::Units::mm;
+    Thfe = 0.40 * Gaudi::Units::mm;
+    ThG10 =2.20 * Gaudi::Units::mm;*/
 
-    Thgl = 0.20 * GeoModelKernelUnits::mm;
-    Thfe = 0.40 * GeoModelKernelUnits::mm;
-    ThG10 =2.20 * GeoModelKernelUnits::mm;
+    Thgl = 0.20 * Gaudi::Units::mm;
+    Thfe = 0.40 * Gaudi::Units::mm;
+    ThG10 =2.20 * Gaudi::Units::mm;
 
     Totalthick = Thgl+Thfe+ThG10;
     Totalmass = (ThG10*G10->getDensity()+Thfe*Iron->getDensity()+Thgl*Glue->getDensity());
diff --git a/LArCalorimeter/LArGeoModel/LArGeoEndcap/LArGeoEndcap/EndcapPresamplerGeometryHelper.h b/LArCalorimeter/LArGeoModel/LArGeoEndcap/LArGeoEndcap/EndcapPresamplerGeometryHelper.h
index e7da0ad2f4dafd86ae435d54e7dcc071452cb8b4..3031eb28baece447b53749f0dc5d3f1f8de6197a 100755
--- a/LArCalorimeter/LArGeoModel/LArGeoEndcap/LArGeoEndcap/EndcapPresamplerGeometryHelper.h
+++ b/LArCalorimeter/LArGeoModel/LArGeoEndcap/LArGeoEndcap/EndcapPresamplerGeometryHelper.h
@@ -24,7 +24,7 @@ namespace LArGeo {
     // Accessor for pointer to the singleton.
     static EndcapPresamplerGeometryHelper* GetInstance();
 
-    // "zShift" is the z-distance (GeoModelKernelUnits::cm) that the EM endcap is shifted
+    // "zShift" is the z-distance (cm) that the EM endcap is shifted
     // (due to cabling, etc.)
     float zShift() const { return m_zShift; }
 
diff --git a/LArCalorimeter/LArGeoModel/LArGeoEndcap/src/EMECConstruction.cxx b/LArCalorimeter/LArGeoModel/LArGeoEndcap/src/EMECConstruction.cxx
index 3f4ea5cacf40d53131a833284f5ad41712912331..99348afb50e2576576abd26743086d63f61a69d3 100755
--- a/LArCalorimeter/LArGeoModel/LArGeoEndcap/src/EMECConstruction.cxx
+++ b/LArCalorimeter/LArGeoModel/LArGeoEndcap/src/EMECConstruction.cxx
@@ -61,7 +61,6 @@
 #include "GeoModelKernel/GeoTransform.h"
 #include "GeoModelKernel/GeoIdentifierTag.h"
 #include "GeoModelKernel/GeoDefinitions.h"
-#include "GeoModelKernel/Units.h"
 #include "GeoModelInterfaces/IGeoModelSvc.h"
 #include "GeoModelUtilities/StoredPhysVol.h"
 #include "GeoModelInterfaces/StoredMaterialManager.h"
@@ -69,7 +68,7 @@
 #include "StoreGate/StoreGateSvc.h"
 #include "GaudiKernel/IService.h"
 #include "GaudiKernel/ISvcLocator.h"
-
+#include "GaudiKernel/PhysicalConstants.h"
 
 #include "RDBAccessSvc/IRDBAccessSvc.h"
 #include "RDBAccessSvc/IRDBRecord.h"
@@ -219,19 +218,19 @@ GeoFullPhysVol* LArGeo::EMECConstruction::GetEnvelope(bool bPos)
   double phiPosition, phiSize;
 
   if(m_isTB) {
-    phiPosition = GeoModelKernelUnits::halfpi*GeoModelKernelUnits::rad;
-    phiSize = M_PI*GeoModelKernelUnits::rad / 8. + 0.065*GeoModelKernelUnits::rad; // half-angle of inner part of module
+    phiPosition = Gaudi::Units::halfpi*Gaudi::Units::rad;
+    phiSize = M_PI*Gaudi::Units::rad / 8. + 0.065*Gaudi::Units::rad; // half-angle of inner part of module
   }
   else {
-    phiPosition = M_PI*GeoModelKernelUnits::rad;
-    phiSize = M_PI*GeoModelKernelUnits::rad; // half-angle of a full wheel
+    phiPosition = M_PI*Gaudi::Units::rad;
+    phiSize = M_PI*Gaudi::Units::rad; // half-angle of a full wheel
   }
 
   // Define the mother volume for the emec.  Everything
   // else in the emec (wheels,structure, etc.) should be
   // placed inside here.
 
-   //double emecMotherZplan[] = {3641.*GeoModelKernelUnits::mm,4273.*GeoModelKernelUnits::mm};           //warm
+   //double emecMotherZplan[] = {3641.*Gaudi::Units::mm,4273.*Gaudi::Units::mm};           //warm
 
   // 21-Jul-2005, C.S. : above line valid in warm, below is in cold.
   // The latter one should apply, othervise SupportMotherVolumes cross
@@ -246,17 +245,17 @@ GeoFullPhysVol* LArGeo::EMECConstruction::GetEnvelope(bool bPos)
 	  cryoPcons = pAccessSvc->getRecordsetPtr("CryoPcons", "CryoPcons-EMEC-00");
 	}
 
-  //double emecMotherZplan[] = {3639.5*GeoModelKernelUnits::mm,3639.5*GeoModelKernelUnits::mm+630.*GeoModelKernelUnits::mm};    //cold (J.T)
-  //                                  // Zplane[0]=endg_z0*GeoModelKernelUnits::cm-50*GeoModelKernelUnits::mm
-  //                                  // Zplane[1]=Zplane[0]+endg_dzende*GeoModelKernelUnits::cm-2.GeoModelKernelUnits::mm
-  //double emecMotherRin[]   = { 279.*GeoModelKernelUnits::mm, 324*GeoModelKernelUnits::mm};	//{  302.*GeoModelKernelUnits::mm,  302.*GeoModelKernelUnits::mm };
-  //double emecMotherRout[]  = {(2077.-7)*GeoModelKernelUnits::mm,(2077.-7)*GeoModelKernelUnits::mm};  	// -7 for cold
+  //double emecMotherZplan[] = {3639.5*Gaudi::Units::mm,3639.5*Gaudi::Units::mm+630.*Gaudi::Units::mm};    //cold (J.T)
+  //                                  // Zplane[0]=endg_z0*Gaudi::Units::cm-50*Gaudi::Units::mm
+  //                                  // Zplane[1]=Zplane[0]+endg_dzende*Gaudi::Units::cm-2.Gaudi::Units::mm
+  //double emecMotherRin[]   = { 279.*Gaudi::Units::mm, 324*Gaudi::Units::mm};	//{  302.*Gaudi::Units::mm,  302.*Gaudi::Units::mm };
+  //double emecMotherRout[]  = {(2077.-7)*Gaudi::Units::mm,(2077.-7)*Gaudi::Units::mm};  	// -7 for cold
   //int lastPlaneEmec = (sizeof(emecMotherZplan) / sizeof(double));
 
 	std::string emecMotherName = baseName + "::Mother"; //+ extension;
 
 	GeoTransform *refSystemTransform = 0;
-	double zTrans = 0.*GeoModelKernelUnits::mm, zMSTrans = 0.*GeoModelKernelUnits::mm;
+	double zTrans = 0.*Gaudi::Units::mm, zMSTrans = 0.*Gaudi::Units::mm;
 
 	GeoPcon* emecMotherShape = new GeoPcon(phiPosition - phiSize, 2.*phiSize);  //start phi,total phi
 	for(unsigned int i = 0; i < cryoPcons->size(); ++ i){
@@ -264,11 +263,11 @@ GeoFullPhysVol* LArGeo::EMECConstruction::GetEnvelope(bool bPos)
 		if(currentRecord->getString("PCON") == "EMEC::Mother"){
 			if(!refSystemTransform){
 				if(m_isTB){
-					zTrans = -3700.5*GeoModelKernelUnits::mm;
+					zTrans = -3700.5*Gaudi::Units::mm;
 					zMSTrans = zTrans;
 				} else {
-					zTrans = currentRecord->getDouble("ZPLANE") - 3639.5*GeoModelKernelUnits::mm;
-					zMSTrans = 0.*GeoModelKernelUnits::mm;
+					zTrans = currentRecord->getDouble("ZPLANE") - 3639.5*Gaudi::Units::mm;
+					zMSTrans = 0.*Gaudi::Units::mm;
 				}
 				refSystemTransform =  new GeoTransform(GeoTrf::TranslateZ3D(zTrans));
 			}
@@ -283,8 +282,8 @@ GeoFullPhysVol* LArGeo::EMECConstruction::GetEnvelope(bool bPos)
 	if(DB_EmecGeometry->size() == 0){
 		DB_EmecGeometry = pAccessSvc->getRecordsetPtr("EmecGeometry", "EmecGeometry-00");
 	}
-	double zWheelRefPoint = (*DB_EmecGeometry)[0]->getDouble("Z0")*GeoModelKernelUnits::cm;
-	double LArTotalThickness = (*DB_EmecGeometry)[0]->getDouble("ETOT") *GeoModelKernelUnits::cm;
+	double zWheelRefPoint = (*DB_EmecGeometry)[0]->getDouble("Z0")*Gaudi::Units::cm;
+	double LArTotalThickness = (*DB_EmecGeometry)[0]->getDouble("ETOT") *Gaudi::Units::cm;
 
   const GeoLogVol* emecMotherLogical =
     new GeoLogVol(emecMotherName, emecMotherShape, LAr);
@@ -311,7 +310,7 @@ GeoFullPhysVol* LArGeo::EMECConstruction::GetEnvelope(bool bPos)
 	double zWheelFrontFace = zWheelRefPoint + lwc->GetdWRPtoFrontFace();
 
     GeoPcon* innerShape= new GeoPcon(phiPosition - phiSize, 2.*phiSize);
-    innerShape->addPlane(   0.*GeoModelKernelUnits::mm, rMinInner[0], rMaxInner[0]);
+    innerShape->addPlane(   0.*Gaudi::Units::mm, rMinInner[0], rMaxInner[0]);
     innerShape->addPlane(zBack   , rMinInner[1], rMaxInner[1]);
 
     GeoLogVol*  innerLogical  = new GeoLogVol (innerName,innerShape, LAr);
@@ -387,7 +386,7 @@ GeoFullPhysVol* LArGeo::EMECConstruction::GetEnvelope(bool bPos)
 	double zWheelFrontFace = zWheelRefPoint + lwc->GetdWRPtoFrontFace();
 
     GeoPcon* outerShape= new GeoPcon(phiPosition - phiSize, 2.*phiSize);
-    outerShape->addPlane(   0.*GeoModelKernelUnits::mm, rMinOuter[0], rMaxOuter[0]);
+    outerShape->addPlane(   0.*Gaudi::Units::mm, rMinOuter[0], rMaxOuter[0]);
     outerShape->addPlane( zMid   , rMinOuter[1], rMaxOuter[1]);
     outerShape->addPlane(zBack   , rMinOuter[2], rMaxOuter[2]);
 
@@ -471,36 +470,36 @@ GeoFullPhysVol* LArGeo::EMECConstruction::GetEnvelope(bool bPos)
 	if(DB_EMECmn->size() == 0)
 		DB_EMECmn = pAccessSvc->getRecordsetPtr("EmecMagicNumbers","EMECMagigNumbers-00");
 
-	double front_shift = 0.*GeoModelKernelUnits::mm, back_shift = 0.*GeoModelKernelUnits::mm;
+	double front_shift = 0.*Gaudi::Units::mm, back_shift = 0.*Gaudi::Units::mm;
 	try {
 		for(unsigned int i = 0; i < DMpcons->size(); ++ i){
 			std::string object = (*DMpcons)[i]->getString("PCONNAME");
 			if(object == "FrontSupportMother"){
 				int zplane = (*DMpcons)[i]->getInt("NZPLANE");
-				if(zplane == 0) front_shift += (*DMpcons)[i]->getDouble("ZPOS")*GeoModelKernelUnits::mm;
-				else if(zplane == 1) front_shift -= (*DMpcons)[i]->getDouble("ZPOS")*GeoModelKernelUnits::mm;
+				if(zplane == 0) front_shift += (*DMpcons)[i]->getDouble("ZPOS")*Gaudi::Units::mm;
+				else if(zplane == 1) front_shift -= (*DMpcons)[i]->getDouble("ZPOS")*Gaudi::Units::mm;
 				else continue;
 			} else if(object == "BackSupportMother"){
 				int zplane = (*DMpcons)[i]->getInt("NZPLANE");
-				if(zplane == 0) back_shift -= 0.;//(*DMpcons)[i]->getDouble("ZPOS")*GeoModelKernelUnits::mm;
-				else if(zplane == 1) back_shift += (*DMpcons)[i]->getDouble("ZPOS")*GeoModelKernelUnits::mm;
+				if(zplane == 0) back_shift -= 0.;//(*DMpcons)[i]->getDouble("ZPOS")*Gaudi::Units::mm;
+				else if(zplane == 1) back_shift += (*DMpcons)[i]->getDouble("ZPOS")*Gaudi::Units::mm;
 				else continue;
 			}
 		}
-		double reftoactive = (*DB_EMECmn)[0]->getDouble("REFTOACTIVE")*GeoModelKernelUnits::mm;
+		double reftoactive = (*DB_EMECmn)[0]->getDouble("REFTOACTIVE")*Gaudi::Units::mm;
 		front_shift += reftoactive;
 		back_shift += LArTotalThickness - reftoactive;
 	}
 	catch (...){
-		front_shift = -50.*GeoModelKernelUnits::mm; // start of EMEC envelop in the cryo.(length of env=630.)
-		back_shift = 580.*GeoModelKernelUnits::mm;
+		front_shift = -50.*Gaudi::Units::mm; // start of EMEC envelop in the cryo.(length of env=630.)
+		back_shift = 580.*Gaudi::Units::mm;
 		std::cout << "EMECConstruction: WARNING: cannot get front|back_shift from DB"
 		          << std::endl;
 	}
 //std::cout << "EMECConstruction : " << front_shift << " " << back_shift << std::endl;
     z0 = zWheelRefPoint + front_shift;
     EMECSupportConstruction *fsc = 0;
-    if(m_isTB) fsc = new EMECSupportConstruction(FrontIndx, true, "LAr::EMEC::", GeoModelKernelUnits::halfpi*GeoModelKernelUnits::rad);
+    if(m_isTB) fsc = new EMECSupportConstruction(FrontIndx, true, "LAr::EMEC::", Gaudi::Units::halfpi*Gaudi::Units::rad);
     else fsc = new EMECSupportConstruction(FrontIndx);
     GeoPhysVol* physicalFSM = fsc->GetEnvelope();
     emecMotherPhysical->add(new GeoTransform(GeoTrf::TranslateZ3D(z0)));
@@ -510,7 +509,7 @@ GeoFullPhysVol* LArGeo::EMECConstruction::GetEnvelope(bool bPos)
 
     z0 = zWheelRefPoint + back_shift; // end of EMEC envelop in the cryo.
     EMECSupportConstruction *bsc = 0;
-    if(m_isTB) bsc = new EMECSupportConstruction(BackIndx, true, "LAr::EMEC::", GeoModelKernelUnits::halfpi*GeoModelKernelUnits::rad);
+    if(m_isTB) bsc = new EMECSupportConstruction(BackIndx, true, "LAr::EMEC::", Gaudi::Units::halfpi*Gaudi::Units::rad);
     else bsc = new EMECSupportConstruction(BackIndx);
     GeoPhysVol *physicalBSM = bsc->GetEnvelope();
     GeoTrf::Transform3D rotBSM(GeoTrf::RotateX3D(-M_PI));
@@ -523,7 +522,7 @@ GeoFullPhysVol* LArGeo::EMECConstruction::GetEnvelope(bool bPos)
 
     z0 = zWheelRefPoint + LArTotalThickness * 0.5; //dist. to middle of sens vol. along z  from WRP
     EMECSupportConstruction *osc = 0;
-    if(m_isTB) osc = new EMECSupportConstruction(2, true, "LAr::EMEC::", GeoModelKernelUnits::halfpi*GeoModelKernelUnits::rad);
+    if(m_isTB) osc = new EMECSupportConstruction(2, true, "LAr::EMEC::", Gaudi::Units::halfpi*Gaudi::Units::rad);
     else osc = new EMECSupportConstruction(2);
     GeoPhysVol *physicalOSM = osc->GetEnvelope();
     emecMotherPhysical->add(refSystemTransform);
@@ -534,7 +533,7 @@ GeoFullPhysVol* LArGeo::EMECConstruction::GetEnvelope(bool bPos)
 
     z0 = zWheelRefPoint + LArTotalThickness * 0.5;
     EMECSupportConstruction *isc = 0;
-    if(m_isTB) isc = new EMECSupportConstruction(3, true, "LAr::EMEC::", GeoModelKernelUnits::halfpi*GeoModelKernelUnits::rad);
+    if(m_isTB) isc = new EMECSupportConstruction(3, true, "LAr::EMEC::", Gaudi::Units::halfpi*Gaudi::Units::rad);
     else isc = new EMECSupportConstruction(3);
     GeoPhysVol *physicalISM = isc->GetEnvelope();
     emecMotherPhysical->add(refSystemTransform);
@@ -544,7 +543,7 @@ GeoFullPhysVol* LArGeo::EMECConstruction::GetEnvelope(bool bPos)
 
     z0 = zWheelRefPoint + LArTotalThickness * 0.5;
     EMECSupportConstruction *msc = 0;
-    if(m_isTB) msc = new EMECSupportConstruction(4, true, "LAr::EMEC::", GeoModelKernelUnits::halfpi*GeoModelKernelUnits::rad);
+    if(m_isTB) msc = new EMECSupportConstruction(4, true, "LAr::EMEC::", Gaudi::Units::halfpi*Gaudi::Units::rad);
     else msc = new EMECSupportConstruction(4);
     GeoPhysVol *physicalMSM = msc->GetEnvelope();
     emecMotherPhysical->add(refSystemTransform);
diff --git a/LArCalorimeter/LArGeoModel/LArGeoEndcap/src/EMECSupportConstruction.cxx b/LArCalorimeter/LArGeoModel/LArGeoEndcap/src/EMECSupportConstruction.cxx
index 23ebc8306eb04ad66dc6423fd07de70c58a81d00..c46de7bf338f0888ad3f465f054eda540f705b33 100755
--- a/LArCalorimeter/LArGeoModel/LArGeoEndcap/src/EMECSupportConstruction.cxx
+++ b/LArCalorimeter/LArGeoModel/LArGeoEndcap/src/EMECSupportConstruction.cxx
@@ -72,7 +72,6 @@
 #include "GeoModelKernel/GeoAlignableTransform.h"
 #include "GeoModelKernel/GeoIdentifierTag.h"
 #include "GeoModelKernel/GeoDefinitions.h"
-#include "GeoModelKernel/Units.h"
 
 #include "GeoModelInterfaces/AbsMaterialManager.h"
 #include "GeoModelInterfaces/StoredMaterialManager.h"
@@ -80,6 +79,7 @@
 #include "StoreGate/StoreGateSvc.h"
 #include "GaudiKernel/MsgStream.h"
 #include "GaudiKernel/ISvcLocator.h"
+#include "GaudiKernel/PhysicalConstants.h"
 
 #include "GeoModelUtilities/DecodeVersionKey.h"
 #include "RDBAccessSvc/IRDBRecord.h"
@@ -110,11 +110,11 @@ EMECSupportConstruction::EMECSupportConstruction
         }
 
 	m_PhiStart = 0.;
-	m_PhiSize = GeoModelKernelUnits::twopi*GeoModelKernelUnits::rad;
+	m_PhiSize = Gaudi::Units::twopi*Gaudi::Units::rad;
 
 	if(m_isModule){
-		m_PhiStart = m_Position - M_PI*GeoModelKernelUnits::rad / 8.;
-		m_PhiSize = M_PI*GeoModelKernelUnits::rad / 4.;
+		m_PhiStart = m_Position - M_PI*Gaudi::Units::rad / 8.;
+		m_PhiSize = M_PI*Gaudi::Units::rad / 4.;
 	}
 
   // Get the materials from the manager 
@@ -338,24 +338,24 @@ GeoPcon* EMECSupportConstruction::getPcon(std::string id) const
 			}
 			pcone[key] = i;
 			if(key >= 0) ++ nzplanes;
-			else R0 = (*m_DB_pcons)[i]->getDouble("RMIN")*GeoModelKernelUnits::mm;
+			else R0 = (*m_DB_pcons)[i]->getDouble("RMIN")*Gaudi::Units::mm;
 		}
 	}
 	if(nzplanes > 0){
 		zplane.resize(nzplanes); rmin.resize(nzplanes); rmax.resize(nzplanes);
 		for(int n = 0; n < nzplanes; ++ n){
-			zplane[n] = (*m_DB_pcons)[pcone[n]]->getDouble("ZPOS")*GeoModelKernelUnits::mm;
-			rmin[n] = R0 + (*m_DB_pcons)[pcone[n]]->getDouble("RMIN")*GeoModelKernelUnits::mm;
-			rmax[n] = R0 + (*m_DB_pcons)[pcone[n]]->getDouble("RMAX")*GeoModelKernelUnits::mm;
+			zplane[n] = (*m_DB_pcons)[pcone[n]]->getDouble("ZPOS")*Gaudi::Units::mm;
+			rmin[n] = R0 + (*m_DB_pcons)[pcone[n]]->getDouble("RMIN")*Gaudi::Units::mm;
+			rmax[n] = R0 + (*m_DB_pcons)[pcone[n]]->getDouble("RMAX")*Gaudi::Units::mm;
 		}
 		if(id1 == "FrontSupportMother"){
 			if(id.find("Inner") != std::string::npos){
 				zplane.resize(2); rmin.resize(2); rmax.resize(2);
-				double rlim = getNumber(m_DB_numbers, id, "Inner", 614.)*GeoModelKernelUnits::mm;
+				double rlim = getNumber(m_DB_numbers, id, "Inner", 614.)*Gaudi::Units::mm;
 				rmax[0] = rlim;
 				rmax[1] = rlim;
 			} else if(id.find("Outer") != std::string::npos){
-				double rlim = getNumber(m_DB_numbers, id, "Outer", 603.-1.)*GeoModelKernelUnits::mm;
+				double rlim = getNumber(m_DB_numbers, id, "Outer", 603.-1.)*Gaudi::Units::mm;
 				rmin[0] = rlim;
 				rmin[1] = rlim;
 			}
@@ -363,24 +363,24 @@ GeoPcon* EMECSupportConstruction::getPcon(std::string id) const
 		if(id1 == "BackSupportMother"){
 			if(id.find("Inner") != std::string::npos){
 				zplane.resize(2); rmin.resize(2); rmax.resize(2);
-				double rlim = getNumber(m_DB_numbers, id, "Inner", 699.)*GeoModelKernelUnits::mm;
+				double rlim = getNumber(m_DB_numbers, id, "Inner", 699.)*Gaudi::Units::mm;
 				rmax[0] = rlim;
 				rmax[1] = rlim;
 			} else if(id.find("Outer") != std::string::npos){
-				double rlim = getNumber(m_DB_numbers, id, "Outer", 687.-1.)*GeoModelKernelUnits::mm;
+				double rlim = getNumber(m_DB_numbers, id, "Outer", 687.-1.)*Gaudi::Units::mm;
 				rmin[0] = rlim;
 				rmin[1] = rlim;
 			}
 		}
 		if(id1 == "Stretchers"){
 			if(id == "WideStretchers"){
-				double dfiWS = 360./3./256.*24.*GeoModelKernelUnits::deg; //this is the design variable for WS
+				double dfiWS = 360./3./256.*24.*Gaudi::Units::deg; //this is the design variable for WS
 				phi_start = m_Position - dfiWS*0.5;
 				phi_size = dfiWS;
 			}
 			if(id == "NarrowStretchers"){
-			        double lengthNS = getNumber(m_DB_numbers, id, "Width", 200.)*GeoModelKernelUnits::mm; // transversal length of NS
-				double dfiNS = lengthNS / rmax[0] * GeoModelKernelUnits::rad;
+			        double lengthNS = getNumber(m_DB_numbers, id, "Width", 200.)*Gaudi::Units::mm; // transversal length of NS
+				double dfiNS = lengthNS / rmax[0] * Gaudi::Units::rad;
 				phi_start = m_Position - dfiNS*0.5;
 				phi_size = dfiNS;
 			}
@@ -395,42 +395,42 @@ for(int i = 0; i < nzplanes; ++ i){
 	} else {
 	if(id.find("FrontSupportMother") == 0){
 		zplane.resize(6);  rmin.resize(6);    rmax.resize(6);
-		zplane[0] =   0. *GeoModelKernelUnits::mm; rmin[0] =  292.*GeoModelKernelUnits::mm-1.*GeoModelKernelUnits::mm; rmax[0] = 2077.*GeoModelKernelUnits::mm-7.*GeoModelKernelUnits::mm;
-		zplane[1] =  61. *GeoModelKernelUnits::mm; rmin[1] =  292.*GeoModelKernelUnits::mm-1.*GeoModelKernelUnits::mm; rmax[1] = 2077.*GeoModelKernelUnits::mm-7.*GeoModelKernelUnits::mm;
-		zplane[2] =  61. *GeoModelKernelUnits::mm; rmin[2] = 2023.*GeoModelKernelUnits::mm-7.*GeoModelKernelUnits::mm; rmax[2] = 2077.*GeoModelKernelUnits::mm-7.*GeoModelKernelUnits::mm;
-		zplane[3] =  72.3*GeoModelKernelUnits::mm; rmin[3] = 2023.*GeoModelKernelUnits::mm-7.*GeoModelKernelUnits::mm; rmax[3] = 2077.*GeoModelKernelUnits::mm-7.*GeoModelKernelUnits::mm;
-		zplane[4] = 124.2*GeoModelKernelUnits::mm; rmin[4] = 2051.*GeoModelKernelUnits::mm-7.*GeoModelKernelUnits::mm; rmax[4] = 2077.*GeoModelKernelUnits::mm-7.*GeoModelKernelUnits::mm;
-		zplane[5] = 153. *GeoModelKernelUnits::mm; rmin[5] = 2051.*GeoModelKernelUnits::mm-7.*GeoModelKernelUnits::mm; rmax[5] = 2077.*GeoModelKernelUnits::mm-7.*GeoModelKernelUnits::mm;
+		zplane[0] =   0. *Gaudi::Units::mm; rmin[0] =  292.*Gaudi::Units::mm-1.*Gaudi::Units::mm; rmax[0] = 2077.*Gaudi::Units::mm-7.*Gaudi::Units::mm;
+		zplane[1] =  61. *Gaudi::Units::mm; rmin[1] =  292.*Gaudi::Units::mm-1.*Gaudi::Units::mm; rmax[1] = 2077.*Gaudi::Units::mm-7.*Gaudi::Units::mm;
+		zplane[2] =  61. *Gaudi::Units::mm; rmin[2] = 2023.*Gaudi::Units::mm-7.*Gaudi::Units::mm; rmax[2] = 2077.*Gaudi::Units::mm-7.*Gaudi::Units::mm;
+		zplane[3] =  72.3*Gaudi::Units::mm; rmin[3] = 2023.*Gaudi::Units::mm-7.*Gaudi::Units::mm; rmax[3] = 2077.*Gaudi::Units::mm-7.*Gaudi::Units::mm;
+		zplane[4] = 124.2*Gaudi::Units::mm; rmin[4] = 2051.*Gaudi::Units::mm-7.*Gaudi::Units::mm; rmax[4] = 2077.*Gaudi::Units::mm-7.*Gaudi::Units::mm;
+		zplane[5] = 153. *Gaudi::Units::mm; rmin[5] = 2051.*Gaudi::Units::mm-7.*Gaudi::Units::mm; rmax[5] = 2077.*Gaudi::Units::mm-7.*Gaudi::Units::mm;
 		if(id == "FrontSupportMother::Outer"){
-			rmin[0] = 603.*GeoModelKernelUnits::mm-1.*GeoModelKernelUnits::mm;
-			rmin[1] = 603.*GeoModelKernelUnits::mm-1.*GeoModelKernelUnits::mm;
+			rmin[0] = 603.*Gaudi::Units::mm-1.*Gaudi::Units::mm;
+			rmin[1] = 603.*Gaudi::Units::mm-1.*Gaudi::Units::mm;
 		}
 		if(id == "FrontSupportMother::Inner"){
 			zplane.resize(2); rmin.resize(2); rmax.resize(2);
-			rmax[0] = 614.*GeoModelKernelUnits::mm;
-			rmax[1] = 614.*GeoModelKernelUnits::mm;
+			rmax[0] = 614.*Gaudi::Units::mm;
+			rmax[1] = 614.*Gaudi::Units::mm;
 		}
 	} else if(id.find("BackSupportMother") == 0){
 		zplane.resize(4);  rmin.resize(4);    rmax.resize(4);
-		zplane[0] =   0.001*GeoModelKernelUnits::mm; rmin[0] =  333.*GeoModelKernelUnits::mm-1.*GeoModelKernelUnits::mm; rmax[0] = 2077.*GeoModelKernelUnits::mm-7.*GeoModelKernelUnits::mm;
-		zplane[1] =  55.   *GeoModelKernelUnits::mm; rmin[1] =  333.*GeoModelKernelUnits::mm-1.*GeoModelKernelUnits::mm; rmax[1] = 2077.*GeoModelKernelUnits::mm-7.*GeoModelKernelUnits::mm;
-		zplane[2] =  55.   *GeoModelKernelUnits::mm; rmin[2] = 2051.*GeoModelKernelUnits::mm-7.*GeoModelKernelUnits::mm; rmax[2] = 2077.*GeoModelKernelUnits::mm-7.*GeoModelKernelUnits::mm;
-		zplane[3] =  147.  *GeoModelKernelUnits::mm; rmin[3] = 2051.*GeoModelKernelUnits::mm-7.*GeoModelKernelUnits::mm; rmax[3] = 2077.*GeoModelKernelUnits::mm-7.*GeoModelKernelUnits::mm;
+		zplane[0] =   0.001*Gaudi::Units::mm; rmin[0] =  333.*Gaudi::Units::mm-1.*Gaudi::Units::mm; rmax[0] = 2077.*Gaudi::Units::mm-7.*Gaudi::Units::mm;
+		zplane[1] =  55.   *Gaudi::Units::mm; rmin[1] =  333.*Gaudi::Units::mm-1.*Gaudi::Units::mm; rmax[1] = 2077.*Gaudi::Units::mm-7.*Gaudi::Units::mm;
+		zplane[2] =  55.   *Gaudi::Units::mm; rmin[2] = 2051.*Gaudi::Units::mm-7.*Gaudi::Units::mm; rmax[2] = 2077.*Gaudi::Units::mm-7.*Gaudi::Units::mm;
+		zplane[3] =  147.  *Gaudi::Units::mm; rmin[3] = 2051.*Gaudi::Units::mm-7.*Gaudi::Units::mm; rmax[3] = 2077.*Gaudi::Units::mm-7.*Gaudi::Units::mm;
 		if(id == "BackSupportMother::Outer"){
-			rmin[0] = 687.*GeoModelKernelUnits::mm-1.*GeoModelKernelUnits::mm;
-			rmin[1] = 687.*GeoModelKernelUnits::mm-1.*GeoModelKernelUnits::mm;
+			rmin[0] = 687.*Gaudi::Units::mm-1.*Gaudi::Units::mm;
+			rmin[1] = 687.*Gaudi::Units::mm-1.*Gaudi::Units::mm;
 		}
 		if(id == "BackSupportMother::Inner"){
 			zplane.resize(2); rmin.resize(2); rmax.resize(2);
-			rmax[0] = 699.*GeoModelKernelUnits::mm;
-			rmax[1] = 699.*GeoModelKernelUnits::mm;
+			rmax[0] = 699.*Gaudi::Units::mm;
+			rmax[1] = 699.*Gaudi::Units::mm;
 		}
 	} else if(id == "WideStretchers" || id == "NarrowStretchers"){
-		double dzS = 165.*GeoModelKernelUnits::mm;
-		double dznotch = 10.*GeoModelKernelUnits::mm; // half z extent of the notch
-		double drnotch = 6.5*GeoModelKernelUnits::mm; // deepness of the noth in radial direction
-		double rmaxS = (2077. - 7.)*GeoModelKernelUnits::mm;//ROuter+116. // -7 for cold
-		double rminS = rmaxS - 26.*GeoModelKernelUnits::mm;
+		double dzS = 165.*Gaudi::Units::mm;
+		double dznotch = 10.*Gaudi::Units::mm; // half z extent of the notch
+		double drnotch = 6.5*Gaudi::Units::mm; // deepness of the noth in radial direction
+		double rmaxS = (2077. - 7.)*Gaudi::Units::mm;//ROuter+116. // -7 for cold
+		double rminS = rmaxS - 26.*Gaudi::Units::mm;
 		double rmidS = rminS + drnotch;
 		zplane.resize(6);  rmin.resize(6);    rmax.resize(6);
 		zplane[0] = -dzS ; rmin[0] = rminS; rmax[0] = rmaxS;
@@ -440,22 +440,22 @@ for(int i = 0; i < nzplanes; ++ i){
 		zplane[4] = dznotch; rmin[4] = rminS; rmax[4] = rmaxS;
 		zplane[5] = dzS  ; rmin[5] = rminS; rmax[5] = rmaxS;
 		if(id == "WideStretchers"){
-			double dfiWS = 360./3./256.*24.*GeoModelKernelUnits::deg; //this is the design variable for WS
+			double dfiWS = 360./3./256.*24.*Gaudi::Units::deg; //this is the design variable for WS
 			phi_start = m_Position - dfiWS*0.5;
 			phi_size = dfiWS;
 		}
 		if(id == "NarrowStretchers"){
-			double lengthNS = 200.*GeoModelKernelUnits::mm; // transversal length of NS
-			double dfiNS = lengthNS / rmaxS * GeoModelKernelUnits::rad;
+			double lengthNS = 200.*Gaudi::Units::mm; // transversal length of NS
+			double dfiNS = lengthNS / rmaxS * Gaudi::Units::rad;
 			phi_start = m_Position - dfiNS*0.5;
 			phi_size = dfiNS;
 		}
 	} else if(id == "OuterSupportMother"){
-		double dzS = 165.*GeoModelKernelUnits::mm;
-		double rmaxS = (2077. - 7.)*GeoModelKernelUnits::mm;//ROuter+116. // -7 for cold
-		double rminOTB = (2034. + 2.)*GeoModelKernelUnits::mm;
-		double rmaxOTB = rminOTB + 3.*GeoModelKernelUnits::mm;
-		double dzOTB = 201.*GeoModelKernelUnits::mm;
+		double dzS = 165.*Gaudi::Units::mm;
+		double rmaxS = (2077. - 7.)*Gaudi::Units::mm;//ROuter+116. // -7 for cold
+		double rminOTB = (2034. + 2.)*Gaudi::Units::mm;
+		double rmaxOTB = rminOTB + 3.*Gaudi::Units::mm;
+		double dzOTB = 201.*Gaudi::Units::mm;
 		zplane.resize(6);  rmin.resize(6);    rmax.resize(6);
 		zplane[0] = -dzOTB ; rmin[0] = rminOTB; rmax[0] = rmaxOTB;
 		zplane[1] = -dzS; rmin[1] = rminOTB; rmax[1] = rmaxOTB;
@@ -464,176 +464,176 @@ for(int i = 0; i < nzplanes; ++ i){
 		zplane[4] = dzS; rmin[4] = rminOTB; rmax[4] = rmaxOTB;
 		zplane[5] = dzOTB  ; rmin[5] = rminOTB; rmax[5] = rmaxOTB;
 	} else if(id == "FrontMiddleRing"){
-		double r0       =614.*GeoModelKernelUnits::mm-2.*GeoModelKernelUnits::mm ; // RMiddle=middle radius of the ring
+		double r0       =614.*Gaudi::Units::mm-2.*Gaudi::Units::mm ; // RMiddle=middle radius of the ring
 		zplane.resize(4);  rmin.resize(4);    rmax.resize(4);
-		zplane[0] =   0. *GeoModelKernelUnits::mm; rmin[0] = r0 - 57.*GeoModelKernelUnits::mm; rmax[0] = r0 + 57.*GeoModelKernelUnits::mm;
-		zplane[1] =  27.5*GeoModelKernelUnits::mm; rmin[1] = r0 - 57.*GeoModelKernelUnits::mm; rmax[1] = r0 + 57.*GeoModelKernelUnits::mm;
-		zplane[2] =  27.5*GeoModelKernelUnits::mm; rmin[2] = r0 - 40.*GeoModelKernelUnits::mm; rmax[2] = r0 + 40.*GeoModelKernelUnits::mm;
-		zplane[3] =  59. *GeoModelKernelUnits::mm; rmin[3] = r0 - 40.*GeoModelKernelUnits::mm; rmax[3] = r0 + 40.*GeoModelKernelUnits::mm;
+		zplane[0] =   0. *Gaudi::Units::mm; rmin[0] = r0 - 57.*Gaudi::Units::mm; rmax[0] = r0 + 57.*Gaudi::Units::mm;
+		zplane[1] =  27.5*Gaudi::Units::mm; rmin[1] = r0 - 57.*Gaudi::Units::mm; rmax[1] = r0 + 57.*Gaudi::Units::mm;
+		zplane[2] =  27.5*Gaudi::Units::mm; rmin[2] = r0 - 40.*Gaudi::Units::mm; rmax[2] = r0 + 40.*Gaudi::Units::mm;
+		zplane[3] =  59. *Gaudi::Units::mm; rmin[3] = r0 - 40.*Gaudi::Units::mm; rmax[3] = r0 + 40.*Gaudi::Units::mm;
 	} else if(id == "FrontMiddleRing::LowerHole"){
-		double r0 = 614.*GeoModelKernelUnits::mm-2.*GeoModelKernelUnits::mm; // RMiddle=middle radius of the ring
+		double r0 = 614.*Gaudi::Units::mm-2.*Gaudi::Units::mm; // RMiddle=middle radius of the ring
 		zplane.resize(6);  rmin.resize(6);    rmax.resize(6);
-		zplane[0] = 23. *GeoModelKernelUnits::mm; rmin[0] = r0 - 28.3*GeoModelKernelUnits::mm; rmax[0] = r0 - 8.*GeoModelKernelUnits::mm;
-		zplane[1] = 27.5*GeoModelKernelUnits::mm; rmin[1] = r0 - 28.3*GeoModelKernelUnits::mm; rmax[1] = r0 - 8.*GeoModelKernelUnits::mm;
-		zplane[2] = 27.5*GeoModelKernelUnits::mm; rmin[2] = r0 - 40. *GeoModelKernelUnits::mm; rmax[2] = r0 - 8.*GeoModelKernelUnits::mm;
-		zplane[3] = 48.5*GeoModelKernelUnits::mm; rmin[3] = r0 - 40. *GeoModelKernelUnits::mm; rmax[3] = r0 - 8.*GeoModelKernelUnits::mm;
-		zplane[4] = 48.5*GeoModelKernelUnits::mm; rmin[4] = r0 - 28.3*GeoModelKernelUnits::mm; rmax[4] = r0 - 8.*GeoModelKernelUnits::mm;
-		zplane[5] = 53. *GeoModelKernelUnits::mm; rmin[5] = r0 - 28.3*GeoModelKernelUnits::mm; rmax[5] = r0 - 8.*GeoModelKernelUnits::mm;
+		zplane[0] = 23. *Gaudi::Units::mm; rmin[0] = r0 - 28.3*Gaudi::Units::mm; rmax[0] = r0 - 8.*Gaudi::Units::mm;
+		zplane[1] = 27.5*Gaudi::Units::mm; rmin[1] = r0 - 28.3*Gaudi::Units::mm; rmax[1] = r0 - 8.*Gaudi::Units::mm;
+		zplane[2] = 27.5*Gaudi::Units::mm; rmin[2] = r0 - 40. *Gaudi::Units::mm; rmax[2] = r0 - 8.*Gaudi::Units::mm;
+		zplane[3] = 48.5*Gaudi::Units::mm; rmin[3] = r0 - 40. *Gaudi::Units::mm; rmax[3] = r0 - 8.*Gaudi::Units::mm;
+		zplane[4] = 48.5*Gaudi::Units::mm; rmin[4] = r0 - 28.3*Gaudi::Units::mm; rmax[4] = r0 - 8.*Gaudi::Units::mm;
+		zplane[5] = 53. *Gaudi::Units::mm; rmin[5] = r0 - 28.3*Gaudi::Units::mm; rmax[5] = r0 - 8.*Gaudi::Units::mm;
 	} else if(id == "FrontMiddleRing::LowerGTen"){
-		double r0 = 614.*GeoModelKernelUnits::mm - 2.*GeoModelKernelUnits::mm; // RMiddle=middle radius of the ring
+		double r0 = 614.*Gaudi::Units::mm - 2.*Gaudi::Units::mm; // RMiddle=middle radius of the ring
 		zplane.resize(6);  rmin.resize(6);    rmax.resize(6);
-		zplane[0] = 23.*GeoModelKernelUnits::mm; rmin[0] = r0 - 28.*GeoModelKernelUnits::mm; rmax[0] = r0 - 8.*GeoModelKernelUnits::mm;
-		zplane[1] = 28.*GeoModelKernelUnits::mm; rmin[1] = r0 - 28.*GeoModelKernelUnits::mm; rmax[1] = r0 - 8.*GeoModelKernelUnits::mm;
-		zplane[2] = 28.*GeoModelKernelUnits::mm; rmin[2] = r0 - 40.*GeoModelKernelUnits::mm; rmax[2] = r0 - 8.*GeoModelKernelUnits::mm;
-		zplane[3] = 48.*GeoModelKernelUnits::mm; rmin[3] = r0 - 40.*GeoModelKernelUnits::mm; rmax[3] = r0 - 8.*GeoModelKernelUnits::mm;
-		zplane[4] = 48.*GeoModelKernelUnits::mm; rmin[4] = r0 - 28.*GeoModelKernelUnits::mm; rmax[4] = r0 - 8.*GeoModelKernelUnits::mm;
-		zplane[5] = 53.*GeoModelKernelUnits::mm; rmin[5] = r0 - 28.*GeoModelKernelUnits::mm; rmax[5] = r0 - 8.*GeoModelKernelUnits::mm;
+		zplane[0] = 23.*Gaudi::Units::mm; rmin[0] = r0 - 28.*Gaudi::Units::mm; rmax[0] = r0 - 8.*Gaudi::Units::mm;
+		zplane[1] = 28.*Gaudi::Units::mm; rmin[1] = r0 - 28.*Gaudi::Units::mm; rmax[1] = r0 - 8.*Gaudi::Units::mm;
+		zplane[2] = 28.*Gaudi::Units::mm; rmin[2] = r0 - 40.*Gaudi::Units::mm; rmax[2] = r0 - 8.*Gaudi::Units::mm;
+		zplane[3] = 48.*Gaudi::Units::mm; rmin[3] = r0 - 40.*Gaudi::Units::mm; rmax[3] = r0 - 8.*Gaudi::Units::mm;
+		zplane[4] = 48.*Gaudi::Units::mm; rmin[4] = r0 - 28.*Gaudi::Units::mm; rmax[4] = r0 - 8.*Gaudi::Units::mm;
+		zplane[5] = 53.*Gaudi::Units::mm; rmin[5] = r0 - 28.*Gaudi::Units::mm; rmax[5] = r0 - 8.*Gaudi::Units::mm;
 	} else if(id == "FrontMiddleRing::UpperHole"){
-		double r0       =614.*GeoModelKernelUnits::mm-2.*GeoModelKernelUnits::mm ; // RMiddle=middle radius of the ring
+		double r0       =614.*Gaudi::Units::mm-2.*Gaudi::Units::mm ; // RMiddle=middle radius of the ring
 		zplane.resize(6);  rmin.resize(6);    rmax.resize(6);
-		zplane[0] = 23. *GeoModelKernelUnits::mm; rmin[0] = r0 + 8.*GeoModelKernelUnits::mm; rmax[0] = r0 + 28.3*GeoModelKernelUnits::mm;
-		zplane[1] = 27.5*GeoModelKernelUnits::mm; rmin[1] = r0 + 8.*GeoModelKernelUnits::mm; rmax[1] = r0 + 28.3*GeoModelKernelUnits::mm;
-		zplane[2] = 27.5*GeoModelKernelUnits::mm; rmin[2] = r0 + 8.*GeoModelKernelUnits::mm; rmax[2] = r0 + 40. *GeoModelKernelUnits::mm;
-		zplane[3] = 48.5*GeoModelKernelUnits::mm; rmin[3] = r0 + 8.*GeoModelKernelUnits::mm; rmax[3] = r0 + 40. *GeoModelKernelUnits::mm;
-		zplane[4] = 48.5*GeoModelKernelUnits::mm; rmin[4] = r0 + 8.*GeoModelKernelUnits::mm; rmax[4] = r0 + 28.3*GeoModelKernelUnits::mm;
-		zplane[5] = 53. *GeoModelKernelUnits::mm; rmin[5] = r0 + 8.*GeoModelKernelUnits::mm; rmax[5] = r0 + 28.3*GeoModelKernelUnits::mm;
+		zplane[0] = 23. *Gaudi::Units::mm; rmin[0] = r0 + 8.*Gaudi::Units::mm; rmax[0] = r0 + 28.3*Gaudi::Units::mm;
+		zplane[1] = 27.5*Gaudi::Units::mm; rmin[1] = r0 + 8.*Gaudi::Units::mm; rmax[1] = r0 + 28.3*Gaudi::Units::mm;
+		zplane[2] = 27.5*Gaudi::Units::mm; rmin[2] = r0 + 8.*Gaudi::Units::mm; rmax[2] = r0 + 40. *Gaudi::Units::mm;
+		zplane[3] = 48.5*Gaudi::Units::mm; rmin[3] = r0 + 8.*Gaudi::Units::mm; rmax[3] = r0 + 40. *Gaudi::Units::mm;
+		zplane[4] = 48.5*Gaudi::Units::mm; rmin[4] = r0 + 8.*Gaudi::Units::mm; rmax[4] = r0 + 28.3*Gaudi::Units::mm;
+		zplane[5] = 53. *Gaudi::Units::mm; rmin[5] = r0 + 8.*Gaudi::Units::mm; rmax[5] = r0 + 28.3*Gaudi::Units::mm;
 	} else if(id == "FrontMiddleRing::UpperGTen"){
-		double r0       =614.*GeoModelKernelUnits::mm-2.*GeoModelKernelUnits::mm ; // RMiddle=middle radius of the ring
+		double r0       =614.*Gaudi::Units::mm-2.*Gaudi::Units::mm ; // RMiddle=middle radius of the ring
 		zplane.resize(6);  rmin.resize(6);    rmax.resize(6);
-		zplane[0] = 23.*GeoModelKernelUnits::mm; rmin[0] = r0 + 8.*GeoModelKernelUnits::mm; rmax[0] = r0 + 28.*GeoModelKernelUnits::mm;
-		zplane[1] = 28.*GeoModelKernelUnits::mm; rmin[1] = r0 + 8.*GeoModelKernelUnits::mm; rmax[1] = r0 + 28.*GeoModelKernelUnits::mm;
-		zplane[2] = 28.*GeoModelKernelUnits::mm; rmin[2] = r0 + 8.*GeoModelKernelUnits::mm; rmax[2] = r0 + 40.*GeoModelKernelUnits::mm;
-		zplane[3] = 48.*GeoModelKernelUnits::mm; rmin[3] = r0 + 8.*GeoModelKernelUnits::mm; rmax[3] = r0 + 40.*GeoModelKernelUnits::mm;
-		zplane[4] = 48.*GeoModelKernelUnits::mm; rmin[4] = r0 + 8.*GeoModelKernelUnits::mm; rmax[4] = r0 + 28.*GeoModelKernelUnits::mm;
-		zplane[5] = 53.*GeoModelKernelUnits::mm; rmin[5] = r0 + 8.*GeoModelKernelUnits::mm; rmax[5] = r0 + 28.*GeoModelKernelUnits::mm;
+		zplane[0] = 23.*Gaudi::Units::mm; rmin[0] = r0 + 8.*Gaudi::Units::mm; rmax[0] = r0 + 28.*Gaudi::Units::mm;
+		zplane[1] = 28.*Gaudi::Units::mm; rmin[1] = r0 + 8.*Gaudi::Units::mm; rmax[1] = r0 + 28.*Gaudi::Units::mm;
+		zplane[2] = 28.*Gaudi::Units::mm; rmin[2] = r0 + 8.*Gaudi::Units::mm; rmax[2] = r0 + 40.*Gaudi::Units::mm;
+		zplane[3] = 48.*Gaudi::Units::mm; rmin[3] = r0 + 8.*Gaudi::Units::mm; rmax[3] = r0 + 40.*Gaudi::Units::mm;
+		zplane[4] = 48.*Gaudi::Units::mm; rmin[4] = r0 + 8.*Gaudi::Units::mm; rmax[4] = r0 + 28.*Gaudi::Units::mm;
+		zplane[5] = 53.*Gaudi::Units::mm; rmin[5] = r0 + 8.*Gaudi::Units::mm; rmax[5] = r0 + 28.*Gaudi::Units::mm;
 	} else if(id == "FrontInnerRing"){
-		double r0 = 335.5*GeoModelKernelUnits::mm-1.*GeoModelKernelUnits::mm;  // RInner = reference radius of the inner ring
+		double r0 = 335.5*Gaudi::Units::mm-1.*Gaudi::Units::mm;  // RInner = reference radius of the inner ring
 		zplane.resize(5);  rmin.resize(5);    rmax.resize(5);
-		zplane[0] =  0. *GeoModelKernelUnits::mm; rmin[0] = r0 - 22.5*GeoModelKernelUnits::mm; rmax[0] = r0 + 51.5*GeoModelKernelUnits::mm;
-		zplane[1] =  6. *GeoModelKernelUnits::mm; rmin[1] = r0 - 28.5*GeoModelKernelUnits::mm; rmax[1] = r0 + 51.5*GeoModelKernelUnits::mm;
-		zplane[2] = 27.5*GeoModelKernelUnits::mm; rmin[2] = r0 - 28.5*GeoModelKernelUnits::mm; rmax[2] = r0 + 51.5*GeoModelKernelUnits::mm;
-		zplane[3] = 27.5*GeoModelKernelUnits::mm; rmin[3] = r0 - 43.5*GeoModelKernelUnits::mm; rmax[3] = r0 + 40.5*GeoModelKernelUnits::mm;
-		zplane[4] = 59. *GeoModelKernelUnits::mm; rmin[4] = r0 - 43.5*GeoModelKernelUnits::mm; rmax[4] = r0 + 40.5*GeoModelKernelUnits::mm;
+		zplane[0] =  0. *Gaudi::Units::mm; rmin[0] = r0 - 22.5*Gaudi::Units::mm; rmax[0] = r0 + 51.5*Gaudi::Units::mm;
+		zplane[1] =  6. *Gaudi::Units::mm; rmin[1] = r0 - 28.5*Gaudi::Units::mm; rmax[1] = r0 + 51.5*Gaudi::Units::mm;
+		zplane[2] = 27.5*Gaudi::Units::mm; rmin[2] = r0 - 28.5*Gaudi::Units::mm; rmax[2] = r0 + 51.5*Gaudi::Units::mm;
+		zplane[3] = 27.5*Gaudi::Units::mm; rmin[3] = r0 - 43.5*Gaudi::Units::mm; rmax[3] = r0 + 40.5*Gaudi::Units::mm;
+		zplane[4] = 59. *Gaudi::Units::mm; rmin[4] = r0 - 43.5*Gaudi::Units::mm; rmax[4] = r0 + 40.5*Gaudi::Units::mm;
 	} else if(id == "FrontInnerRing::Hole"){
-		double r0 = 335.5*GeoModelKernelUnits::mm-1.*GeoModelKernelUnits::mm;  // RInner = reference radius of the inner ring
+		double r0 = 335.5*Gaudi::Units::mm-1.*Gaudi::Units::mm;  // RInner = reference radius of the inner ring
 		zplane.resize(6);  rmin.resize(6);    rmax.resize(6);
-		zplane[0] = 23. *GeoModelKernelUnits::mm; rmin[0] = r0 + 6.5*GeoModelKernelUnits::mm; rmax[0] = r0 + 29.5*GeoModelKernelUnits::mm;
-		zplane[1] = 27.5*GeoModelKernelUnits::mm; rmin[1] = r0 + 6.5*GeoModelKernelUnits::mm; rmax[1] = r0 + 29.5*GeoModelKernelUnits::mm;
-		zplane[2] = 27.5*GeoModelKernelUnits::mm; rmin[2] = r0 + 6.5*GeoModelKernelUnits::mm; rmax[2] = r0 + 40.5*GeoModelKernelUnits::mm;
-		zplane[3] = 48.5*GeoModelKernelUnits::mm; rmin[3] = r0 + 6.5*GeoModelKernelUnits::mm; rmax[3] = r0 + 40.5*GeoModelKernelUnits::mm;
-		zplane[4] = 48.5*GeoModelKernelUnits::mm; rmin[4] = r0 + 6.5*GeoModelKernelUnits::mm; rmax[4] = r0 + 29.5*GeoModelKernelUnits::mm;
-		zplane[5] = 53. *GeoModelKernelUnits::mm; rmin[5] = r0 + 6.5*GeoModelKernelUnits::mm; rmax[5] = r0 + 29.5*GeoModelKernelUnits::mm;
+		zplane[0] = 23. *Gaudi::Units::mm; rmin[0] = r0 + 6.5*Gaudi::Units::mm; rmax[0] = r0 + 29.5*Gaudi::Units::mm;
+		zplane[1] = 27.5*Gaudi::Units::mm; rmin[1] = r0 + 6.5*Gaudi::Units::mm; rmax[1] = r0 + 29.5*Gaudi::Units::mm;
+		zplane[2] = 27.5*Gaudi::Units::mm; rmin[2] = r0 + 6.5*Gaudi::Units::mm; rmax[2] = r0 + 40.5*Gaudi::Units::mm;
+		zplane[3] = 48.5*Gaudi::Units::mm; rmin[3] = r0 + 6.5*Gaudi::Units::mm; rmax[3] = r0 + 40.5*Gaudi::Units::mm;
+		zplane[4] = 48.5*Gaudi::Units::mm; rmin[4] = r0 + 6.5*Gaudi::Units::mm; rmax[4] = r0 + 29.5*Gaudi::Units::mm;
+		zplane[5] = 53. *Gaudi::Units::mm; rmin[5] = r0 + 6.5*Gaudi::Units::mm; rmax[5] = r0 + 29.5*Gaudi::Units::mm;
 	} else if(id == "FrontInnerRing::GTen"){
-		double r0 = 335.5*GeoModelKernelUnits::mm-1.*GeoModelKernelUnits::mm;  // RInner = reference radius of the inner ring
+		double r0 = 335.5*Gaudi::Units::mm-1.*Gaudi::Units::mm;  // RInner = reference radius of the inner ring
 		zplane.resize(6);  rmin.resize(6);    rmax.resize(6);
-		zplane[0] = 23.*GeoModelKernelUnits::mm; rmin[0] = r0 + 8.5*GeoModelKernelUnits::mm; rmax[0] = r0 + 28.5*GeoModelKernelUnits::mm;
-		zplane[1] = 28.*GeoModelKernelUnits::mm; rmin[1] = r0 + 8.5*GeoModelKernelUnits::mm; rmax[1] = r0 + 28.5*GeoModelKernelUnits::mm;
-		zplane[2] = 28.*GeoModelKernelUnits::mm; rmin[2] = r0 + 8.5*GeoModelKernelUnits::mm; rmax[2] = r0 + 40.5*GeoModelKernelUnits::mm;
-		zplane[3] = 48.*GeoModelKernelUnits::mm; rmin[3] = r0 + 8.5*GeoModelKernelUnits::mm; rmax[3] = r0 + 40.5*GeoModelKernelUnits::mm;
-		zplane[4] = 48.*GeoModelKernelUnits::mm; rmin[4] = r0 + 8.5*GeoModelKernelUnits::mm; rmax[4] = r0 + 28.5*GeoModelKernelUnits::mm;
-		zplane[5] = 53.*GeoModelKernelUnits::mm; rmin[5] = r0 + 8.5*GeoModelKernelUnits::mm; rmax[5] = r0 + 28.5*GeoModelKernelUnits::mm;
+		zplane[0] = 23.*Gaudi::Units::mm; rmin[0] = r0 + 8.5*Gaudi::Units::mm; rmax[0] = r0 + 28.5*Gaudi::Units::mm;
+		zplane[1] = 28.*Gaudi::Units::mm; rmin[1] = r0 + 8.5*Gaudi::Units::mm; rmax[1] = r0 + 28.5*Gaudi::Units::mm;
+		zplane[2] = 28.*Gaudi::Units::mm; rmin[2] = r0 + 8.5*Gaudi::Units::mm; rmax[2] = r0 + 40.5*Gaudi::Units::mm;
+		zplane[3] = 48.*Gaudi::Units::mm; rmin[3] = r0 + 8.5*Gaudi::Units::mm; rmax[3] = r0 + 40.5*Gaudi::Units::mm;
+		zplane[4] = 48.*Gaudi::Units::mm; rmin[4] = r0 + 8.5*Gaudi::Units::mm; rmax[4] = r0 + 28.5*Gaudi::Units::mm;
+		zplane[5] = 53.*Gaudi::Units::mm; rmin[5] = r0 + 8.5*Gaudi::Units::mm; rmax[5] = r0 + 28.5*Gaudi::Units::mm;
 	} else if(id == "BackMiddleRing"){
-		double r0       =  699.*GeoModelKernelUnits::mm-2.5*GeoModelKernelUnits::mm; // RMiddle radius of the ring
+		double r0       =  699.*Gaudi::Units::mm-2.5*Gaudi::Units::mm; // RMiddle radius of the ring
 		zplane.resize(4);  rmin.resize(4);    rmax.resize(4);
-		zplane[0] =   0. *GeoModelKernelUnits::mm; rmin[0] = r0 - 57.*GeoModelKernelUnits::mm; rmax[0] = r0 + 57.*GeoModelKernelUnits::mm;
-		zplane[1] =  21. *GeoModelKernelUnits::mm; rmin[1] = r0 - 57.*GeoModelKernelUnits::mm; rmax[1] = r0 + 57.*GeoModelKernelUnits::mm;
-		zplane[2] =  21. *GeoModelKernelUnits::mm; rmin[2] = r0 - 40.*GeoModelKernelUnits::mm; rmax[2] = r0 + 40.*GeoModelKernelUnits::mm;
-		zplane[3] =  52.5*GeoModelKernelUnits::mm; rmin[3] = r0 - 40.*GeoModelKernelUnits::mm; rmax[3] = r0 + 40.*GeoModelKernelUnits::mm;
+		zplane[0] =   0. *Gaudi::Units::mm; rmin[0] = r0 - 57.*Gaudi::Units::mm; rmax[0] = r0 + 57.*Gaudi::Units::mm;
+		zplane[1] =  21. *Gaudi::Units::mm; rmin[1] = r0 - 57.*Gaudi::Units::mm; rmax[1] = r0 + 57.*Gaudi::Units::mm;
+		zplane[2] =  21. *Gaudi::Units::mm; rmin[2] = r0 - 40.*Gaudi::Units::mm; rmax[2] = r0 + 40.*Gaudi::Units::mm;
+		zplane[3] =  52.5*Gaudi::Units::mm; rmin[3] = r0 - 40.*Gaudi::Units::mm; rmax[3] = r0 + 40.*Gaudi::Units::mm;
 	} else if(id == "BackMiddleRing::LowerHole"){
-		double r0       =  699.*GeoModelKernelUnits::mm-2.5*GeoModelKernelUnits::mm; // RMiddle radius of the ring
+		double r0       =  699.*Gaudi::Units::mm-2.5*Gaudi::Units::mm; // RMiddle radius of the ring
 		zplane.resize(6);  rmin.resize(6);    rmax.resize(6);
-		zplane[0] = 16.5*GeoModelKernelUnits::mm; rmin[0] = r0 - 28.3*GeoModelKernelUnits::mm; rmax[0] = r0 - 8.*GeoModelKernelUnits::mm;
-		zplane[1] = 21. *GeoModelKernelUnits::mm; rmin[1] = r0 - 28.3*GeoModelKernelUnits::mm; rmax[1] = r0 - 8.*GeoModelKernelUnits::mm;
-		zplane[2] = 21. *GeoModelKernelUnits::mm; rmin[2] = r0 - 40. *GeoModelKernelUnits::mm; rmax[2] = r0 - 8.*GeoModelKernelUnits::mm;
-		zplane[3] = 42. *GeoModelKernelUnits::mm; rmin[3] = r0 - 40. *GeoModelKernelUnits::mm; rmax[3] = r0 - 8.*GeoModelKernelUnits::mm;
-		zplane[4] = 42. *GeoModelKernelUnits::mm; rmin[4] = r0 - 28.3*GeoModelKernelUnits::mm; rmax[4] = r0 - 8.*GeoModelKernelUnits::mm;
-//		zplane[5] = 56.5*GeoModelKernelUnits::mm; rmin[5] = r0 - 28.3*GeoModelKernelUnits::mm; rmax[5] = r0 - 8.*GeoModelKernelUnits::mm;
-		zplane[5] = 46.5*GeoModelKernelUnits::mm; rmin[5] = r0 - 28.3*GeoModelKernelUnits::mm; rmax[5] = r0 - 8.*GeoModelKernelUnits::mm;
+		zplane[0] = 16.5*Gaudi::Units::mm; rmin[0] = r0 - 28.3*Gaudi::Units::mm; rmax[0] = r0 - 8.*Gaudi::Units::mm;
+		zplane[1] = 21. *Gaudi::Units::mm; rmin[1] = r0 - 28.3*Gaudi::Units::mm; rmax[1] = r0 - 8.*Gaudi::Units::mm;
+		zplane[2] = 21. *Gaudi::Units::mm; rmin[2] = r0 - 40. *Gaudi::Units::mm; rmax[2] = r0 - 8.*Gaudi::Units::mm;
+		zplane[3] = 42. *Gaudi::Units::mm; rmin[3] = r0 - 40. *Gaudi::Units::mm; rmax[3] = r0 - 8.*Gaudi::Units::mm;
+		zplane[4] = 42. *Gaudi::Units::mm; rmin[4] = r0 - 28.3*Gaudi::Units::mm; rmax[4] = r0 - 8.*Gaudi::Units::mm;
+//		zplane[5] = 56.5*Gaudi::Units::mm; rmin[5] = r0 - 28.3*Gaudi::Units::mm; rmax[5] = r0 - 8.*Gaudi::Units::mm;
+		zplane[5] = 46.5*Gaudi::Units::mm; rmin[5] = r0 - 28.3*Gaudi::Units::mm; rmax[5] = r0 - 8.*Gaudi::Units::mm;
 	} else if(id == "BackMiddleRing::LowerGTen"){
-		double r0       =  699.*GeoModelKernelUnits::mm-2.5*GeoModelKernelUnits::mm; // RMiddle radius of the ring
+		double r0       =  699.*Gaudi::Units::mm-2.5*Gaudi::Units::mm; // RMiddle radius of the ring
 		zplane.resize(6);  rmin.resize(6);    rmax.resize(6);
-		zplane[0] = 16.5*GeoModelKernelUnits::mm; rmin[0] = r0 - 28.*GeoModelKernelUnits::mm; rmax[0] = r0 - 8.*GeoModelKernelUnits::mm;
-		zplane[1] = 21.5*GeoModelKernelUnits::mm; rmin[1] = r0 - 28.*GeoModelKernelUnits::mm; rmax[1] = r0 - 8.*GeoModelKernelUnits::mm;
-		zplane[2] = 21.5*GeoModelKernelUnits::mm; rmin[2] = r0 - 40.*GeoModelKernelUnits::mm; rmax[2] = r0 - 8.*GeoModelKernelUnits::mm;
-		zplane[3] = 41.5*GeoModelKernelUnits::mm; rmin[3] = r0 - 40.*GeoModelKernelUnits::mm; rmax[3] = r0 - 8.*GeoModelKernelUnits::mm;
-		zplane[4] = 41.5*GeoModelKernelUnits::mm; rmin[4] = r0 - 28.*GeoModelKernelUnits::mm; rmax[4] = r0 - 8.*GeoModelKernelUnits::mm;
-		zplane[5] = 46.5*GeoModelKernelUnits::mm; rmin[5] = r0 - 28.*GeoModelKernelUnits::mm; rmax[5] = r0 - 8.*GeoModelKernelUnits::mm;
+		zplane[0] = 16.5*Gaudi::Units::mm; rmin[0] = r0 - 28.*Gaudi::Units::mm; rmax[0] = r0 - 8.*Gaudi::Units::mm;
+		zplane[1] = 21.5*Gaudi::Units::mm; rmin[1] = r0 - 28.*Gaudi::Units::mm; rmax[1] = r0 - 8.*Gaudi::Units::mm;
+		zplane[2] = 21.5*Gaudi::Units::mm; rmin[2] = r0 - 40.*Gaudi::Units::mm; rmax[2] = r0 - 8.*Gaudi::Units::mm;
+		zplane[3] = 41.5*Gaudi::Units::mm; rmin[3] = r0 - 40.*Gaudi::Units::mm; rmax[3] = r0 - 8.*Gaudi::Units::mm;
+		zplane[4] = 41.5*Gaudi::Units::mm; rmin[4] = r0 - 28.*Gaudi::Units::mm; rmax[4] = r0 - 8.*Gaudi::Units::mm;
+		zplane[5] = 46.5*Gaudi::Units::mm; rmin[5] = r0 - 28.*Gaudi::Units::mm; rmax[5] = r0 - 8.*Gaudi::Units::mm;
 	} else if(id == "BackMiddleRing::UpperHole"){
-		double r0       =  699.*GeoModelKernelUnits::mm-2.5*GeoModelKernelUnits::mm; // RMiddle radius of the ring
+		double r0       =  699.*Gaudi::Units::mm-2.5*Gaudi::Units::mm; // RMiddle radius of the ring
 		zplane.resize(6);  rmin.resize(6);    rmax.resize(6);
-		zplane[0] = 16.5*GeoModelKernelUnits::mm; rmin[0] = r0 + 8.*GeoModelKernelUnits::mm; rmax[0] = r0 + 28.3*GeoModelKernelUnits::mm;
-		zplane[1] = 21. *GeoModelKernelUnits::mm; rmin[1] = r0 + 8.*GeoModelKernelUnits::mm; rmax[1] = r0 + 28.3*GeoModelKernelUnits::mm;
-		zplane[2] = 21. *GeoModelKernelUnits::mm; rmin[2] = r0 + 8.*GeoModelKernelUnits::mm; rmax[2] = r0 + 40. *GeoModelKernelUnits::mm;
-		zplane[3] = 42. *GeoModelKernelUnits::mm; rmin[3] = r0 + 8.*GeoModelKernelUnits::mm; rmax[3] = r0 + 40. *GeoModelKernelUnits::mm;
-		zplane[4] = 42. *GeoModelKernelUnits::mm; rmin[4] = r0 + 8.*GeoModelKernelUnits::mm; rmax[4] = r0 + 28.3*GeoModelKernelUnits::mm;
-		zplane[5] = 46.5*GeoModelKernelUnits::mm; rmin[5] = r0 + 8.*GeoModelKernelUnits::mm; rmax[5] = r0 + 28.3*GeoModelKernelUnits::mm;
+		zplane[0] = 16.5*Gaudi::Units::mm; rmin[0] = r0 + 8.*Gaudi::Units::mm; rmax[0] = r0 + 28.3*Gaudi::Units::mm;
+		zplane[1] = 21. *Gaudi::Units::mm; rmin[1] = r0 + 8.*Gaudi::Units::mm; rmax[1] = r0 + 28.3*Gaudi::Units::mm;
+		zplane[2] = 21. *Gaudi::Units::mm; rmin[2] = r0 + 8.*Gaudi::Units::mm; rmax[2] = r0 + 40. *Gaudi::Units::mm;
+		zplane[3] = 42. *Gaudi::Units::mm; rmin[3] = r0 + 8.*Gaudi::Units::mm; rmax[3] = r0 + 40. *Gaudi::Units::mm;
+		zplane[4] = 42. *Gaudi::Units::mm; rmin[4] = r0 + 8.*Gaudi::Units::mm; rmax[4] = r0 + 28.3*Gaudi::Units::mm;
+		zplane[5] = 46.5*Gaudi::Units::mm; rmin[5] = r0 + 8.*Gaudi::Units::mm; rmax[5] = r0 + 28.3*Gaudi::Units::mm;
 	} else if(id == "BackMiddleRing::UpperGTen"){
-		double r0       =  699.*GeoModelKernelUnits::mm-2.5*GeoModelKernelUnits::mm; // RMiddle radius of the ring
+		double r0       =  699.*Gaudi::Units::mm-2.5*Gaudi::Units::mm; // RMiddle radius of the ring
 		zplane.resize(6);  rmin.resize(6);    rmax.resize(6);
-		zplane[0] = 16.5*GeoModelKernelUnits::mm; rmin[0] = r0 + 8.*GeoModelKernelUnits::mm; rmax[0] = r0 + 28.*GeoModelKernelUnits::mm;
-		zplane[1] = 21.5*GeoModelKernelUnits::mm; rmin[1] = r0 + 8.*GeoModelKernelUnits::mm; rmax[1] = r0 + 28.*GeoModelKernelUnits::mm;
-		zplane[2] = 21.5*GeoModelKernelUnits::mm; rmin[2] = r0 + 8.*GeoModelKernelUnits::mm; rmax[2] = r0 + 40.*GeoModelKernelUnits::mm;
-		zplane[3] = 41.5*GeoModelKernelUnits::mm; rmin[3] = r0 + 8.*GeoModelKernelUnits::mm; rmax[3] = r0 + 40.*GeoModelKernelUnits::mm;
-		zplane[4] = 41.5*GeoModelKernelUnits::mm; rmin[4] = r0 + 8.*GeoModelKernelUnits::mm; rmax[4] = r0 + 28.*GeoModelKernelUnits::mm;
-		zplane[5] = 46.5*GeoModelKernelUnits::mm; rmin[5] = r0 + 8.*GeoModelKernelUnits::mm; rmax[5] = r0 + 28.*GeoModelKernelUnits::mm;
+		zplane[0] = 16.5*Gaudi::Units::mm; rmin[0] = r0 + 8.*Gaudi::Units::mm; rmax[0] = r0 + 28.*Gaudi::Units::mm;
+		zplane[1] = 21.5*Gaudi::Units::mm; rmin[1] = r0 + 8.*Gaudi::Units::mm; rmax[1] = r0 + 28.*Gaudi::Units::mm;
+		zplane[2] = 21.5*Gaudi::Units::mm; rmin[2] = r0 + 8.*Gaudi::Units::mm; rmax[2] = r0 + 40.*Gaudi::Units::mm;
+		zplane[3] = 41.5*Gaudi::Units::mm; rmin[3] = r0 + 8.*Gaudi::Units::mm; rmax[3] = r0 + 40.*Gaudi::Units::mm;
+		zplane[4] = 41.5*Gaudi::Units::mm; rmin[4] = r0 + 8.*Gaudi::Units::mm; rmax[4] = r0 + 28.*Gaudi::Units::mm;
+		zplane[5] = 46.5*Gaudi::Units::mm; rmin[5] = r0 + 8.*Gaudi::Units::mm; rmax[5] = r0 + 28.*Gaudi::Units::mm;
 	} else if(id == "BackInnerRing"){
-		double r0       =357.5*GeoModelKernelUnits::mm-1.*GeoModelKernelUnits::mm;  // RInner = reference radius of the ring
+		double r0       =357.5*Gaudi::Units::mm-1.*Gaudi::Units::mm;  // RInner = reference radius of the ring
 		zplane.resize(4);  rmin.resize(4);    rmax.resize(4);
-		zplane[0] =   0. *GeoModelKernelUnits::mm; rmin[0] = r0 - 22.5*GeoModelKernelUnits::mm; rmax[0] = r0 + 53.5*GeoModelKernelUnits::mm;
-		zplane[1] =  22.5*GeoModelKernelUnits::mm; rmin[1] = r0 - 22.5*GeoModelKernelUnits::mm; rmax[1] = r0 + 53.5*GeoModelKernelUnits::mm;
-		zplane[2] =  22.5*GeoModelKernelUnits::mm; rmin[2] = r0 - 24.5*GeoModelKernelUnits::mm; rmax[2] = r0 + 40.5*GeoModelKernelUnits::mm;
-		zplane[3] =  54. *GeoModelKernelUnits::mm; rmin[3] = r0 - 24.5*GeoModelKernelUnits::mm; rmax[3] = r0 + 40.5*GeoModelKernelUnits::mm;
+		zplane[0] =   0. *Gaudi::Units::mm; rmin[0] = r0 - 22.5*Gaudi::Units::mm; rmax[0] = r0 + 53.5*Gaudi::Units::mm;
+		zplane[1] =  22.5*Gaudi::Units::mm; rmin[1] = r0 - 22.5*Gaudi::Units::mm; rmax[1] = r0 + 53.5*Gaudi::Units::mm;
+		zplane[2] =  22.5*Gaudi::Units::mm; rmin[2] = r0 - 24.5*Gaudi::Units::mm; rmax[2] = r0 + 40.5*Gaudi::Units::mm;
+		zplane[3] =  54. *Gaudi::Units::mm; rmin[3] = r0 - 24.5*Gaudi::Units::mm; rmax[3] = r0 + 40.5*Gaudi::Units::mm;
 	} else if(id == "BackInnerRing::Hole"){
-		double r0       =357.5*GeoModelKernelUnits::mm-1.*GeoModelKernelUnits::mm;  // RInner = reference radius of the ring
+		double r0       =357.5*Gaudi::Units::mm-1.*Gaudi::Units::mm;  // RInner = reference radius of the ring
  		zplane.resize(6);  rmin.resize(6);    rmax.resize(6);
-		zplane[0] = 18. *GeoModelKernelUnits::mm; rmin[0] = r0 + 6.5*GeoModelKernelUnits::mm; rmax[0] = r0 + 29.5*GeoModelKernelUnits::mm;
-		zplane[1] = 22.5*GeoModelKernelUnits::mm; rmin[1] = r0 + 6.5*GeoModelKernelUnits::mm; rmax[1] = r0 + 29.5*GeoModelKernelUnits::mm;
-		zplane[2] = 22.5*GeoModelKernelUnits::mm; rmin[2] = r0 + 6.5*GeoModelKernelUnits::mm; rmax[2] = r0 + 40.5*GeoModelKernelUnits::mm;
-		zplane[3] = 43.5*GeoModelKernelUnits::mm; rmin[3] = r0 + 6.5*GeoModelKernelUnits::mm; rmax[3] = r0 + 40.5*GeoModelKernelUnits::mm;
-		zplane[4] = 43.5*GeoModelKernelUnits::mm; rmin[4] = r0 + 6.5*GeoModelKernelUnits::mm; rmax[4] = r0 + 29.5*GeoModelKernelUnits::mm;
-		zplane[5] = 48. *GeoModelKernelUnits::mm; rmin[5] = r0 + 6.5*GeoModelKernelUnits::mm; rmax[5] = r0 + 29.5*GeoModelKernelUnits::mm;
+		zplane[0] = 18. *Gaudi::Units::mm; rmin[0] = r0 + 6.5*Gaudi::Units::mm; rmax[0] = r0 + 29.5*Gaudi::Units::mm;
+		zplane[1] = 22.5*Gaudi::Units::mm; rmin[1] = r0 + 6.5*Gaudi::Units::mm; rmax[1] = r0 + 29.5*Gaudi::Units::mm;
+		zplane[2] = 22.5*Gaudi::Units::mm; rmin[2] = r0 + 6.5*Gaudi::Units::mm; rmax[2] = r0 + 40.5*Gaudi::Units::mm;
+		zplane[3] = 43.5*Gaudi::Units::mm; rmin[3] = r0 + 6.5*Gaudi::Units::mm; rmax[3] = r0 + 40.5*Gaudi::Units::mm;
+		zplane[4] = 43.5*Gaudi::Units::mm; rmin[4] = r0 + 6.5*Gaudi::Units::mm; rmax[4] = r0 + 29.5*Gaudi::Units::mm;
+		zplane[5] = 48. *Gaudi::Units::mm; rmin[5] = r0 + 6.5*Gaudi::Units::mm; rmax[5] = r0 + 29.5*Gaudi::Units::mm;
 	} else if(id == "BackInnerRing::GTen"){
-		double r0       =357.5*GeoModelKernelUnits::mm-1.*GeoModelKernelUnits::mm;  // RInner = reference radius of the ring
+		double r0       =357.5*Gaudi::Units::mm-1.*Gaudi::Units::mm;  // RInner = reference radius of the ring
 		zplane.resize(6);  rmin.resize(6);    rmax.resize(6);
-		zplane[0] = 18.*GeoModelKernelUnits::mm; rmin[0] = r0 + 8.5*GeoModelKernelUnits::mm; rmax[0] = r0 + 28.5*GeoModelKernelUnits::mm;
-		zplane[1] = 23.*GeoModelKernelUnits::mm; rmin[1] = r0 + 8.5*GeoModelKernelUnits::mm; rmax[1] = r0 + 28.5*GeoModelKernelUnits::mm;
-		zplane[2] = 23.*GeoModelKernelUnits::mm; rmin[2] = r0 + 8.5*GeoModelKernelUnits::mm; rmax[2] = r0 + 40.5*GeoModelKernelUnits::mm;
-		zplane[3] = 43.*GeoModelKernelUnits::mm; rmin[3] = r0 + 8.5*GeoModelKernelUnits::mm; rmax[3] = r0 + 40.5*GeoModelKernelUnits::mm;
-		zplane[4] = 43.*GeoModelKernelUnits::mm; rmin[4] = r0 + 8.5*GeoModelKernelUnits::mm; rmax[4] = r0 + 28.5*GeoModelKernelUnits::mm;
-		zplane[5] = 48.*GeoModelKernelUnits::mm; rmin[5] = r0 + 8.5*GeoModelKernelUnits::mm; rmax[5] = r0 + 28.5*GeoModelKernelUnits::mm;
+		zplane[0] = 18.*Gaudi::Units::mm; rmin[0] = r0 + 8.5*Gaudi::Units::mm; rmax[0] = r0 + 28.5*Gaudi::Units::mm;
+		zplane[1] = 23.*Gaudi::Units::mm; rmin[1] = r0 + 8.5*Gaudi::Units::mm; rmax[1] = r0 + 28.5*Gaudi::Units::mm;
+		zplane[2] = 23.*Gaudi::Units::mm; rmin[2] = r0 + 8.5*Gaudi::Units::mm; rmax[2] = r0 + 40.5*Gaudi::Units::mm;
+		zplane[3] = 43.*Gaudi::Units::mm; rmin[3] = r0 + 8.5*Gaudi::Units::mm; rmax[3] = r0 + 40.5*Gaudi::Units::mm;
+		zplane[4] = 43.*Gaudi::Units::mm; rmin[4] = r0 + 8.5*Gaudi::Units::mm; rmax[4] = r0 + 28.5*Gaudi::Units::mm;
+		zplane[5] = 48.*Gaudi::Units::mm; rmin[5] = r0 + 8.5*Gaudi::Units::mm; rmax[5] = r0 + 28.5*Gaudi::Units::mm;
 	} else if(id == "FrontOuterRing"){
-		double r0 = 1961.*GeoModelKernelUnits::mm-7.*GeoModelKernelUnits::mm; // ROuter = inner radius of the outer ring
+		double r0 = 1961.*Gaudi::Units::mm-7.*Gaudi::Units::mm; // ROuter = inner radius of the outer ring
 		zplane.resize(7);  rmin.resize(7);    rmax.resize(7);
-		zplane[0] =   0. *GeoModelKernelUnits::mm; rmin[0] = r0 +  0.*GeoModelKernelUnits::mm; rmax[0] = r0 + 111.*GeoModelKernelUnits::mm;
-		zplane[1] =   5. *GeoModelKernelUnits::mm; rmin[1] = r0 +  0.*GeoModelKernelUnits::mm; rmax[1] = r0 + 116.*GeoModelKernelUnits::mm;
-		zplane[2] =  20. *GeoModelKernelUnits::mm; rmin[2] = r0 +  0.*GeoModelKernelUnits::mm; rmax[2] = r0 + 116.*GeoModelKernelUnits::mm;
-		zplane[3] =  20. *GeoModelKernelUnits::mm; rmin[3] = r0 + 62.*GeoModelKernelUnits::mm; rmax[3] = r0 + 116.*GeoModelKernelUnits::mm;
-		zplane[4] =  63.3*GeoModelKernelUnits::mm; rmin[4] = r0 + 62.*GeoModelKernelUnits::mm; rmax[4] = r0 + 116.*GeoModelKernelUnits::mm;
-		zplane[5] = 115.2*GeoModelKernelUnits::mm; rmin[5] = r0 + 90.*GeoModelKernelUnits::mm; rmax[5] = r0 + 116.*GeoModelKernelUnits::mm;
-		zplane[6] = 144. *GeoModelKernelUnits::mm; rmin[6] = r0 + 90.*GeoModelKernelUnits::mm; rmax[6] = r0 + 116.*GeoModelKernelUnits::mm;
+		zplane[0] =   0. *Gaudi::Units::mm; rmin[0] = r0 +  0.*Gaudi::Units::mm; rmax[0] = r0 + 111.*Gaudi::Units::mm;
+		zplane[1] =   5. *Gaudi::Units::mm; rmin[1] = r0 +  0.*Gaudi::Units::mm; rmax[1] = r0 + 116.*Gaudi::Units::mm;
+		zplane[2] =  20. *Gaudi::Units::mm; rmin[2] = r0 +  0.*Gaudi::Units::mm; rmax[2] = r0 + 116.*Gaudi::Units::mm;
+		zplane[3] =  20. *Gaudi::Units::mm; rmin[3] = r0 + 62.*Gaudi::Units::mm; rmax[3] = r0 + 116.*Gaudi::Units::mm;
+		zplane[4] =  63.3*Gaudi::Units::mm; rmin[4] = r0 + 62.*Gaudi::Units::mm; rmax[4] = r0 + 116.*Gaudi::Units::mm;
+		zplane[5] = 115.2*Gaudi::Units::mm; rmin[5] = r0 + 90.*Gaudi::Units::mm; rmax[5] = r0 + 116.*Gaudi::Units::mm;
+		zplane[6] = 144. *Gaudi::Units::mm; rmin[6] = r0 + 90.*Gaudi::Units::mm; rmax[6] = r0 + 116.*Gaudi::Units::mm;
 	} else if(id == "FrontOuterLongBar"){
 		zplane.resize(4);  rmin.resize(4);    rmax.resize(4);
-		zplane[0] =  0.*GeoModelKernelUnits::mm; rmin[0] = 1969.7*GeoModelKernelUnits::mm; rmax[0] = 2016.*GeoModelKernelUnits::mm;
-		zplane[1] =  1.*GeoModelKernelUnits::mm; rmin[1] = 1969.7*GeoModelKernelUnits::mm; rmax[1] = 2016.*GeoModelKernelUnits::mm;
-		zplane[2] =  1.*GeoModelKernelUnits::mm; rmin[2] =  652. *GeoModelKernelUnits::mm; rmax[2] = 2016.*GeoModelKernelUnits::mm;
-		zplane[3] = 21.*GeoModelKernelUnits::mm; rmin[3] =  652. *GeoModelKernelUnits::mm; rmax[3] = 2016.*GeoModelKernelUnits::mm;
+		zplane[0] =  0.*Gaudi::Units::mm; rmin[0] = 1969.7*Gaudi::Units::mm; rmax[0] = 2016.*Gaudi::Units::mm;
+		zplane[1] =  1.*Gaudi::Units::mm; rmin[1] = 1969.7*Gaudi::Units::mm; rmax[1] = 2016.*Gaudi::Units::mm;
+		zplane[2] =  1.*Gaudi::Units::mm; rmin[2] =  652. *Gaudi::Units::mm; rmax[2] = 2016.*Gaudi::Units::mm;
+		zplane[3] = 21.*Gaudi::Units::mm; rmin[3] =  652. *Gaudi::Units::mm; rmax[3] = 2016.*Gaudi::Units::mm;
                     //2020-46.3 ; RMiddle+40.//RMiddle+8+(lengthofbar=1398)
 	} else if(id == "BackOuterRing"){
-		double r0 = 1961.*GeoModelKernelUnits::mm-7.*GeoModelKernelUnits::mm;
+		double r0 = 1961.*Gaudi::Units::mm-7.*Gaudi::Units::mm;
 		zplane.resize(7);  rmin.resize(7);    rmax.resize(7);
-		zplane[0] =   0.*GeoModelKernelUnits::mm; rmin[0] = r0 +  0.*GeoModelKernelUnits::mm; rmax[0] = r0 + 111.*GeoModelKernelUnits::mm;
-		zplane[1] =   5.*GeoModelKernelUnits::mm; rmin[1] = r0 +  0.*GeoModelKernelUnits::mm; rmax[1] = r0 + 116.*GeoModelKernelUnits::mm;
-		zplane[2] =  15.*GeoModelKernelUnits::mm; rmin[2] = r0 +  0.*GeoModelKernelUnits::mm; rmax[2] = r0 + 116.*GeoModelKernelUnits::mm;
-		zplane[3] =  15.*GeoModelKernelUnits::mm; rmin[3] = r0 + 62.*GeoModelKernelUnits::mm; rmax[3] = r0 + 116.*GeoModelKernelUnits::mm;
-		zplane[4] =  41.*GeoModelKernelUnits::mm; rmin[4] = r0 + 62.*GeoModelKernelUnits::mm; rmax[4] = r0 + 116.*GeoModelKernelUnits::mm;
-		zplane[5] =  41.*GeoModelKernelUnits::mm; rmin[5] = r0 + 90.*GeoModelKernelUnits::mm; rmax[5] = r0 + 116.*GeoModelKernelUnits::mm;
-		zplane[6] = 139.*GeoModelKernelUnits::mm; rmin[6] = r0 + 90.*GeoModelKernelUnits::mm; rmax[6] = r0 + 116.*GeoModelKernelUnits::mm;
+		zplane[0] =   0.*Gaudi::Units::mm; rmin[0] = r0 +  0.*Gaudi::Units::mm; rmax[0] = r0 + 111.*Gaudi::Units::mm;
+		zplane[1] =   5.*Gaudi::Units::mm; rmin[1] = r0 +  0.*Gaudi::Units::mm; rmax[1] = r0 + 116.*Gaudi::Units::mm;
+		zplane[2] =  15.*Gaudi::Units::mm; rmin[2] = r0 +  0.*Gaudi::Units::mm; rmax[2] = r0 + 116.*Gaudi::Units::mm;
+		zplane[3] =  15.*Gaudi::Units::mm; rmin[3] = r0 + 62.*Gaudi::Units::mm; rmax[3] = r0 + 116.*Gaudi::Units::mm;
+		zplane[4] =  41.*Gaudi::Units::mm; rmin[4] = r0 + 62.*Gaudi::Units::mm; rmax[4] = r0 + 116.*Gaudi::Units::mm;
+		zplane[5] =  41.*Gaudi::Units::mm; rmin[5] = r0 + 90.*Gaudi::Units::mm; rmax[5] = r0 + 116.*Gaudi::Units::mm;
+		zplane[6] = 139.*Gaudi::Units::mm; rmin[6] = r0 + 90.*Gaudi::Units::mm; rmax[6] = r0 + 116.*Gaudi::Units::mm;
 	} else if(id == "BackOuterLongBar"){
 		zplane.resize(4);  rmin.resize(4);    rmax.resize(4);
-		zplane[0] =  0.*GeoModelKernelUnits::mm; rmin[0] = 1969.7*GeoModelKernelUnits::mm; rmax[0] = 2016.*GeoModelKernelUnits::mm;
-		zplane[1] =  1.*GeoModelKernelUnits::mm; rmin[1] = 1969.7*GeoModelKernelUnits::mm; rmax[1] = 2016.*GeoModelKernelUnits::mm;
-		zplane[2] =  1.*GeoModelKernelUnits::mm; rmin[2] =  736.5*GeoModelKernelUnits::mm; rmax[2] = 2016.*GeoModelKernelUnits::mm;
-		zplane[3] = 21.*GeoModelKernelUnits::mm; rmin[3] =  736.5*GeoModelKernelUnits::mm; rmax[3] = 2016.*GeoModelKernelUnits::mm;
+		zplane[0] =  0.*Gaudi::Units::mm; rmin[0] = 1969.7*Gaudi::Units::mm; rmax[0] = 2016.*Gaudi::Units::mm;
+		zplane[1] =  1.*Gaudi::Units::mm; rmin[1] = 1969.7*Gaudi::Units::mm; rmax[1] = 2016.*Gaudi::Units::mm;
+		zplane[2] =  1.*Gaudi::Units::mm; rmin[2] =  736.5*Gaudi::Units::mm; rmax[2] = 2016.*Gaudi::Units::mm;
+		zplane[3] = 21.*Gaudi::Units::mm; rmin[3] =  736.5*Gaudi::Units::mm; rmax[3] = 2016.*Gaudi::Units::mm;
 	} else {
 		throw std::runtime_error("EMECSupportConstruction: wrong Pcone id");
 	}
@@ -710,10 +710,10 @@ void EMECSupportConstruction::put_front_outer_barettes(GeoPhysVol *motherPhysica
 	motherPhysical->add(physFOB);
 
 	const int number_of_modules = 8;
-	const double moduldfi = GeoModelKernelUnits::twopi / number_of_modules;
+	const double moduldfi = Gaudi::Units::twopi / number_of_modules;
 	const int nofabs = (*m_DB_EmecWheelParameters)[1]->getInt("NABS");
 	const int nofdiv = nofabs / number_of_modules;
-	const double dfi = GeoModelKernelUnits::twopi / nofabs;
+	const double dfi = Gaudi::Units::twopi / nofabs;
   //define a fi section including one absorber and electrode
 	name = m_BaseName + "FrontOuterBarrette::Module::Phidiv";
 	GeoTubs *shapeFOBMP = new GeoTubs(rminFOB, rmaxFOB, dzFOB, -dfi/4., dfi);
@@ -808,10 +808,10 @@ void EMECSupportConstruction::put_front_inner_barettes(GeoPhysVol *motherPhysica
 	motherPhysical->add(physFIB);
 
 	const int number_of_modules = 8;
-	const double moduldfi = GeoModelKernelUnits::twopi / number_of_modules;
+	const double moduldfi = Gaudi::Units::twopi / number_of_modules;
 	const int nofabs = (*m_DB_EmecWheelParameters)[0]->getInt("NABS");
 	const int nofdiv = nofabs / number_of_modules;
-	const double dfi = GeoModelKernelUnits::twopi / nofabs;
+	const double dfi = Gaudi::Units::twopi / nofabs;
 
 	name = m_BaseName + "FrontInnerBarrette::Module::Phidiv";
 	GeoTubs *shapeFIBMP = new GeoTubs(rminFIB,rmaxFIB,dzFIB, -dfi/4., dfi);
@@ -905,10 +905,10 @@ void EMECSupportConstruction::put_back_outer_barettes(GeoPhysVol *motherPhysical
 	motherPhysical->add(physBOB);
 
 	const int number_of_modules = 8;
-	const double moduldfi = GeoModelKernelUnits::twopi / number_of_modules;
+	const double moduldfi = Gaudi::Units::twopi / number_of_modules;
 	int nofabs = (*m_DB_EmecWheelParameters)[1]->getInt("NABS");
 	int nofdiv = nofabs / number_of_modules;
-	double dfi = GeoModelKernelUnits::twopi / nofabs;
+	double dfi = Gaudi::Units::twopi / nofabs;
 
 	name = m_BaseName + "BackOuterBarrette::Module::Phidiv";
 	GeoTubs *shapeBOBMP = new GeoTubs(rminBOB, rmaxBOB, dzBOB, -dfi/4., dfi);
@@ -992,7 +992,7 @@ void EMECSupportConstruction::put_back_inner_barettes(GeoPhysVol *motherPhysical
 	map_t numbers = getNumbersMap(m_DB_numbers, id);
 
 	std::string name = m_BaseName + id;
-	double rminBIB = getNumber(m_DB_tubes, tubes, id, "RMIN", 357.5-1.+40.5);    //RInner +40.5// -1.GeoModelKernelUnits::mm for cold
+	double rminBIB = getNumber(m_DB_tubes, tubes, id, "RMIN", 357.5-1.+40.5);    //RInner +40.5// -1.Gaudi::Units::mm for cold
 	double rmaxBIB = getNumber(m_DB_tubes, tubes, id, "RMAX", 699.-2.5-40.);     //RMiddle-40   //-2.5mm for cold
 	double dzBIB = getNumber(m_DB_tubes, tubes, id, "DZ", 11. / 2);
 	double zposBIB = getNumber(m_DB_numbers, numbers, "Z0", "PARVALUE", 44.) + dzBIB;
@@ -1003,10 +1003,10 @@ void EMECSupportConstruction::put_back_inner_barettes(GeoPhysVol *motherPhysical
 	motherPhysical->add(physBIB);
 
 	const int number_of_modules = 8;
-	const double moduldfi = GeoModelKernelUnits::twopi / number_of_modules;
+	const double moduldfi = Gaudi::Units::twopi / number_of_modules;
 	const int nofabs = (*m_DB_EmecWheelParameters)[0]->getInt("NABS");
 	const int nofdiv = nofabs / number_of_modules;
-	const double dfi = GeoModelKernelUnits::twopi / nofabs;
+	const double dfi = Gaudi::Units::twopi / nofabs;
 
 	name = m_BaseName + "BackInnerBarrette::Module::Phidiv";
 	GeoTubs *shapeBIBMP = new GeoTubs(rminBIB, rmaxBIB, dzBIB, -dfi/4., dfi);
@@ -1101,9 +1101,9 @@ GeoPhysVol* EMECSupportConstruction::outer_envelope(void) const
 	map_t tubes = getMap(m_DB_tubes, "TUBENAME");
 	std::string id = "OuterTransversalBars";
 	std::string name = m_BaseName + id;
-	double rminOTB = getNumber(m_DB_tubes, tubes, id, "RMIN", (2034. + 2.)*GeoModelKernelUnits::mm);
-	double rmaxOTB = getNumber(m_DB_tubes, tubes, id, "RMAX", rminOTB + 3.*GeoModelKernelUnits::mm);
-	double dzOTB = getNumber(m_DB_tubes, tubes, id, "DZ", 201.*GeoModelKernelUnits::mm);
+	double rminOTB = getNumber(m_DB_tubes, tubes, id, "RMIN", (2034. + 2.)*Gaudi::Units::mm);
+	double rmaxOTB = getNumber(m_DB_tubes, tubes, id, "RMAX", rminOTB + 3.*Gaudi::Units::mm);
+	double dzOTB = getNumber(m_DB_tubes, tubes, id, "DZ", 201.*Gaudi::Units::mm);
 	GeoTubs* shapeOTB = new GeoTubs(rminOTB, rmaxOTB, dzOTB, m_PhiStart, m_PhiSize);
 	GeoLogVol* logicalOTB = new GeoLogVol(name, shapeOTB, m_Gten);
 	GeoPhysVol* physOTB = new GeoPhysVol(logicalOTB);
@@ -1111,16 +1111,16 @@ GeoPhysVol* EMECSupportConstruction::outer_envelope(void) const
 	id = "TopIndexingRing";
 	name = m_BaseName + id;
 	double rminTIR = getNumber(m_DB_tubes, tubes, id, "RMIN", rmaxOTB);
-	double rmaxTIR = getNumber(m_DB_tubes, tubes, id, "RMAX", rminTIR + 9.*GeoModelKernelUnits::mm);
-	double dzTIR = getNumber(m_DB_tubes, tubes, id, "DZ", 10.*GeoModelKernelUnits::mm);
+	double rmaxTIR = getNumber(m_DB_tubes, tubes, id, "RMAX", rminTIR + 9.*Gaudi::Units::mm);
+	double dzTIR = getNumber(m_DB_tubes, tubes, id, "DZ", 10.*Gaudi::Units::mm);
 	GeoTubs* shapeTIR = new GeoTubs(rminTIR, rmaxTIR, dzTIR, m_PhiStart, m_PhiSize);
 	GeoLogVol* logicalTIR = new GeoLogVol(name, shapeTIR, m_Alu);
 	GeoPhysVol* physTIR = new GeoPhysVol(logicalTIR);
 	id += "::Hole";
 	name = m_BaseName + id;
-	double dzTIRH = getNumber(m_DB_tubes, tubes, id, "DZ", 4.5*GeoModelKernelUnits::mm);
+	double dzTIRH = getNumber(m_DB_tubes, tubes, id, "DZ", 4.5*Gaudi::Units::mm);
 	double rmaxTIRH = getNumber(m_DB_tubes, tubes, id, "RMAX", rmaxTIR);
-	double rminTIRH = getNumber(m_DB_tubes, tubes, id, "RMIN", rmaxTIRH - 2.*GeoModelKernelUnits::mm);
+	double rminTIRH = getNumber(m_DB_tubes, tubes, id, "RMIN", rmaxTIRH - 2.*Gaudi::Units::mm);
 	GeoTubs* shapeTIRH = new GeoTubs(rminTIRH, rmaxTIRH, dzTIRH, m_PhiStart, m_PhiSize);
 	GeoLogVol* logicalTIRH = new GeoLogVol(name, shapeTIRH, m_LAr);
 	GeoPhysVol* physTIRH = new GeoPhysVol(logicalTIRH);
@@ -1161,7 +1161,7 @@ GeoPhysVol* EMECSupportConstruction::outer_envelope(void) const
 		motherPhysical->add(new GeoTransform(GeoTrf::RotateZ3D(-dfi + dfiNS*0.5)));
 		motherPhysical->add(physNS);
 	} else {
-		double dfi = GeoModelKernelUnits::twopi / number_of_stretchers;
+		double dfi = Gaudi::Units::twopi / number_of_stretchers;
 		int copyno = 0;
 		for(int i = 0; i < number_of_stretchers; ++ i, ++ copyno){
 			double fiW = i * dfi;
@@ -1184,26 +1184,26 @@ GeoPhysVol* EMECSupportConstruction::inner_envelope(void) const
 	map_t numbers = getNumbersMap(m_DB_numbers, id);
 	std::string name0 = m_BaseName + id;
 
-//	double dz = LArWheelCalculator::GetWheelThickness() * 0.5; //257.*GeoModelKernelUnits::mm;     //zWheelThickness/2.
-	double dz = 0.5 * (*m_DB_mn)[0]->getDouble("ACTIVELENGTH")*GeoModelKernelUnits::mm;
+//	double dz = LArWheelCalculator::GetWheelThickness() * 0.5; //257.*Gaudi::Units::mm;     //zWheelThickness/2.
+	double dz = 0.5 * (*m_DB_mn)[0]->getDouble("ACTIVELENGTH")*Gaudi::Units::mm;
 	try {
-		dz += (*m_DB_mn)[0]->getDouble("STRAIGHTSTARTSECTION")*GeoModelKernelUnits::mm;
+		dz += (*m_DB_mn)[0]->getDouble("STRAIGHTSTARTSECTION")*Gaudi::Units::mm;
 	}
 	catch(...){
-		dz += 2.*GeoModelKernelUnits::mm;
+		dz += 2.*Gaudi::Units::mm;
 		std::ostringstream tmp("cannot get STRAIGHTSTARTSECTION from DB");
 		printWarning(tmp);
 	}
 
-	double r1min = getNumber(m_DB_numbers, numbers, "R1MIN", "PARVALUE", (292.-1.)*GeoModelKernelUnits::mm); //lower radius of front inner ring, -1mm for cold
-	double r2min = getNumber(m_DB_numbers, numbers, "R2MIN", "PARVALUE", (333.-1.)*GeoModelKernelUnits::mm); //lower radius of back  inner ring, -1mm for cold
+	double r1min = getNumber(m_DB_numbers, numbers, "R1MIN", "PARVALUE", (292.-1.)*Gaudi::Units::mm); //lower radius of front inner ring, -1mm for cold
+	double r2min = getNumber(m_DB_numbers, numbers, "R2MIN", "PARVALUE", (333.-1.)*Gaudi::Units::mm); //lower radius of back  inner ring, -1mm for cold
                                   //RInnerFront-43.5;RInnerBack-24.5
 	const double talpha = (r2min - r1min)*0.5/dz;
 	const double calpha = 2.*dz/sqrt(pow(2.*dz,2.)+pow(r2min-r1min,2.));
         const double inv_calpha = 1. / calpha;
 	const double alpha = atan(talpha);
-	double surfthick = getNumber(m_DB_numbers, numbers, "surfthick", "PARVALUE", 1.*GeoModelKernelUnits::mm);       // thickness of the cone shell
-	double barthick = getNumber(m_DB_numbers, numbers, "barthick", "PARVALUE", 5.*GeoModelKernelUnits::mm);       // thickness of the Alu bars
+	double surfthick = getNumber(m_DB_numbers, numbers, "surfthick", "PARVALUE", 1.*Gaudi::Units::mm);       // thickness of the cone shell
+	double barthick = getNumber(m_DB_numbers, numbers, "barthick", "PARVALUE", 5.*Gaudi::Units::mm);       // thickness of the Alu bars
 	double r1max     = pow(barthick/2.,2.)+ pow(r1min+(surfthick+barthick)*inv_calpha,2.);
 			r1max     = sqrt(r1max)+surfthick*inv_calpha;
 	double r2max     = r2min+(r1max-r1min);
@@ -1243,7 +1243,7 @@ GeoPhysVol* EMECSupportConstruction::inner_envelope(void) const
 //-------------------------/
 
 	const int    nofmodul  =   8;
-	const double moduldphi = GeoModelKernelUnits::twopi / nofmodul;
+	const double moduldphi = Gaudi::Units::twopi / nofmodul;
   GeoCons*     shapeIACP  = new GeoCons(
        	                      r1min+surfthick*inv_calpha,r2min+surfthick*inv_calpha,
                               r1max-surfthick*inv_calpha,r2max-surfthick*inv_calpha,
@@ -1260,7 +1260,7 @@ GeoPhysVol* EMECSupportConstruction::inner_envelope(void) const
   GeoLogVol* logicalIACAB= new GeoLogVol (name,shapeIACAB, m_Alu);
   GeoPhysVol*   physIACAB= new GeoPhysVol(logicalIACAB);
 
-  const double dphi = GeoModelKernelUnits::twopi / 256.;
+  const double dphi = Gaudi::Units::twopi / 256.;
   const int    nbar = 9;
   const double phi[9]={-15.,-11.,-7.5,-4.,0.,4.,7.5,11.,15.}; // phipos of the bars
   const double r0=r1min+(surfthick+barthick/2.)*inv_calpha+dz*talpha;
@@ -1287,9 +1287,9 @@ GeoPhysVol* EMECSupportConstruction::inner_envelope(void) const
 //!!!!
 GeoPhysVol* EMECSupportConstruction::middle_envelope(void) const
 {
-	double dMechFocaltoWRP = (*m_DB_EmecGeometry)[0]->getDouble("Z1") *GeoModelKernelUnits::cm;
-	double LArEMECHalfCrack = (*m_DB_EmecGeometry)[0]->getDouble("DCRACK") *GeoModelKernelUnits::cm;
-	double LArTotalThickness = (*m_DB_EmecGeometry)[0]->getDouble("ETOT") *GeoModelKernelUnits::cm;
+	double dMechFocaltoWRP = (*m_DB_EmecGeometry)[0]->getDouble("Z1") *Gaudi::Units::cm;
+	double LArEMECHalfCrack = (*m_DB_EmecGeometry)[0]->getDouble("DCRACK") *Gaudi::Units::cm;
+	double LArTotalThickness = (*m_DB_EmecGeometry)[0]->getDouble("ETOT") *Gaudi::Units::cm;
 
 	double eta_mid = (*m_DB_EmecWheelParameters)[0]->getDouble("ETAEXT");
 
@@ -1298,8 +1298,8 @@ GeoPhysVol* EMECSupportConstruction::middle_envelope(void) const
         const double inv_cosThetaMid = 1. / cosThetaMid;
 
 	double z0 = LArTotalThickness * 0.5 + dMechFocaltoWRP;
-	double length = 462.*GeoModelKernelUnits::mm;
-	double rthickness = 1.5*GeoModelKernelUnits::mm * inv_cosThetaMid;
+	double length = 462.*Gaudi::Units::mm;
+	double rthickness = 1.5*Gaudi::Units::mm * inv_cosThetaMid;
 
 	std::string name = m_BaseName + "InnerTransversalBars";
 	double dz = length * cosThetaMid * 0.5;
diff --git a/LArCalorimeter/LArGeoModel/LArGeoEndcap/src/EndcapCryostatConstruction.cxx b/LArCalorimeter/LArGeoModel/LArGeoEndcap/src/EndcapCryostatConstruction.cxx
index 50a89f47d88a1504359fb161f96e336f08cdcae6..cd0b45fea19a8985946b8faa28c7e70a150048ec 100755
--- a/LArCalorimeter/LArGeoModel/LArGeoEndcap/src/EndcapCryostatConstruction.cxx
+++ b/LArCalorimeter/LArGeoModel/LArGeoEndcap/src/EndcapCryostatConstruction.cxx
@@ -33,7 +33,6 @@
 #include "GeoModelKernel/GeoXF.h"
 #include "GeoModelKernel/GeoSerialTransformer.h"
 #include "GeoModelKernel/GeoDefinitions.h"
-#include "GeoModelKernel/Units.h"
 #include "StoreGate/StoreGateSvc.h"
 #include "GeoModelInterfaces/AbsMaterialManager.h"
 #include "GeoModelInterfaces/StoredMaterialManager.h"
@@ -62,6 +61,7 @@
 
 #include "GaudiKernel/MsgStream.h"
 #include "GaudiKernel/Bootstrap.h"
+#include "GaudiKernel/SystemOfUnits.h"
 
 #include <string>
 #include <cmath>
@@ -299,18 +299,18 @@ GeoFullPhysVol* LArGeo::EndcapCryostatConstruction::createEnvelope(bool bPos)
                 if(currentRecord->getString("CYL_LOCATION")=="Endcap"){
                   if(cylNumber  == 3 )
                     {
-                      rmin_warm=currentRecord->getDouble("RMIN")*GeoModelKernelUnits::cm;
-                      rmax_warm=currentRecord->getDouble("RMIN")*GeoModelKernelUnits::cm + currentRecord->getDouble("DR")*GeoModelKernelUnits::cm;
-                      dz_warm=currentRecord->getDouble("DZ")*GeoModelKernelUnits::cm / 2.;
-                      zInCryostat_warm = currentRecord->getDouble("ZMIN")*GeoModelKernelUnits::cm + currentRecord->getDouble("DZ")*GeoModelKernelUnits::cm / 2.;
+                      rmin_warm=currentRecord->getDouble("RMIN")*Gaudi::Units::cm;
+                      rmax_warm=currentRecord->getDouble("RMIN")*Gaudi::Units::cm + currentRecord->getDouble("DR")*Gaudi::Units::cm;
+                      dz_warm=currentRecord->getDouble("DZ")*Gaudi::Units::cm / 2.;
+                      zInCryostat_warm = currentRecord->getDouble("ZMIN")*Gaudi::Units::cm + currentRecord->getDouble("DZ")*Gaudi::Units::cm / 2.;
                       wallfind=wallfind+1;
                     }
                   if(cylNumber  == 14 )
                     {
-                      rmin_cold=currentRecord->getDouble("RMIN")*GeoModelKernelUnits::cm;
-                      rmax_cold=currentRecord->getDouble("RMIN")*GeoModelKernelUnits::cm + currentRecord->getDouble("DR")*GeoModelKernelUnits::cm;
-                      dz_cold=currentRecord->getDouble("DZ")*GeoModelKernelUnits::cm / 2.;
-                      zInCryostat_cold = currentRecord->getDouble("ZMIN")*GeoModelKernelUnits::cm + currentRecord->getDouble("DZ")*GeoModelKernelUnits::cm / 2.;
+                      rmin_cold=currentRecord->getDouble("RMIN")*Gaudi::Units::cm;
+                      rmax_cold=currentRecord->getDouble("RMIN")*Gaudi::Units::cm + currentRecord->getDouble("DR")*Gaudi::Units::cm;
+                      dz_cold=currentRecord->getDouble("DZ")*Gaudi::Units::cm / 2.;
+                      zInCryostat_cold = currentRecord->getDouble("ZMIN")*Gaudi::Units::cm + currentRecord->getDouble("DZ")*Gaudi::Units::cm / 2.;
                       wallfind=wallfind+1;
                     }
                 }
@@ -388,11 +388,11 @@ GeoFullPhysVol* LArGeo::EndcapCryostatConstruction::createEnvelope(bool bPos)
 	}
       
 	GeoTubs* solidCyl
-	  = new GeoTubs(currentRecord->getDouble("RMIN")*GeoModelKernelUnits::cm,
-			currentRecord->getDouble("RMIN")*GeoModelKernelUnits::cm + currentRecord->getDouble("DR")*GeoModelKernelUnits::cm,
-			currentRecord->getDouble("DZ")*GeoModelKernelUnits::cm / 2.,
+	  = new GeoTubs(currentRecord->getDouble("RMIN")*Gaudi::Units::cm,
+			currentRecord->getDouble("RMIN")*Gaudi::Units::cm + currentRecord->getDouble("DR")*Gaudi::Units::cm,
+			currentRecord->getDouble("DZ")*Gaudi::Units::cm / 2.,
 			(double) 0.,
-			(double) 2.*M_PI*GeoModelKernelUnits::rad);
+			(double) 2.*M_PI*Gaudi::Units::rad);
 	const GeoMaterial *material  = materialManager->getMaterial(currentRecord->getString("MATERIAL"));
       
 	if (!material) {
@@ -407,7 +407,7 @@ GeoFullPhysVol* LArGeo::EndcapCryostatConstruction::createEnvelope(bool bPos)
       
 	GeoPhysVol* physCyl = new GeoPhysVol(logicCyl);
       
-	double zInCryostat = currentRecord->getDouble("ZMIN")*GeoModelKernelUnits::cm + currentRecord->getDouble("DZ")*GeoModelKernelUnits::cm / 2.;
+	double zInCryostat = currentRecord->getDouble("ZMIN")*Gaudi::Units::cm + currentRecord->getDouble("DZ")*Gaudi::Units::cm / 2.;
 	// Don't move the pump even if the rest of the cryostat moves.
 
 	//if ( cylNumber == 33 ) zInCryostat -= zEmec;
@@ -427,7 +427,7 @@ GeoFullPhysVol* LArGeo::EndcapCryostatConstruction::createEnvelope(bool bPos)
 	  GeoFullPhysVol* emecPSEnvelope = endcapPresamplerConstruction.Envelope();
 	  if ( emecPSEnvelope != 0 ) {
 	    // Get the position of the presampler from the geometry helper.
-	    double Zpos = 30.5*GeoModelKernelUnits::mm; 
+	    double Zpos = 30.5*Gaudi::Units::mm; 
 	    
 	    // It is highly debateable whether the endcap presampler is 
 	    // alignable, but in any case we shall not align it here because
@@ -727,10 +727,10 @@ GeoFullPhysVol* LArGeo::EndcapCryostatConstruction::createEnvelope(bool bPos)
 	}
 
 	// Build mother volume
-	double rminMM = (*itMother)->getDouble("RMIN")*GeoModelKernelUnits::mm; 
-	double rmaxMM = (*itMother)->getDouble("RMAX")*GeoModelKernelUnits::mm;
-	double dzMM = (*itMother)->getDouble("DZ")*GeoModelKernelUnits::mm;
-	zposMM = (*itMother)->getDouble("ZPOS")*GeoModelKernelUnits::mm;
+	double rminMM = (*itMother)->getDouble("RMIN")*Gaudi::Units::mm; 
+	double rmaxMM = (*itMother)->getDouble("RMAX")*Gaudi::Units::mm;
+	double dzMM = (*itMother)->getDouble("DZ")*Gaudi::Units::mm;
+	zposMM = (*itMother)->getDouble("ZPOS")*Gaudi::Units::mm;
 	
 	const GeoMaterial *matMM  = materialManager->getMaterial((*itMother)->getString("MATERIAL"));
 	
@@ -739,8 +739,8 @@ GeoFullPhysVol* LArGeo::EndcapCryostatConstruction::createEnvelope(bool bPos)
 	GeoTube *tubeJM=NULL;
 	const GeoShape *solidMM=NULL;
 	if (itTube!=mbtsTubs->end()) {
-	  double dzMod   = (*itTube)->getDouble("DZ")*GeoModelKernelUnits::mm;
-	  double rMaxMod = (*itTube)->getDouble("RMAX")*GeoModelKernelUnits::mm;
+	  double dzMod   = (*itTube)->getDouble("DZ")*Gaudi::Units::mm;
+	  double rMaxMod = (*itTube)->getDouble("RMAX")*Gaudi::Units::mm;
 	  
 	  GeoPcon *pcon = new GeoPcon(0,2*M_PI);
 	  pcon->addPlane(-dzMM,rminMM,rmaxMM);
@@ -760,10 +760,10 @@ GeoFullPhysVol* LArGeo::EndcapCryostatConstruction::createEnvelope(bool bPos)
 	cryoMotherPhysical->add(pvMM);
 
 	// Moderator cylinder
-	//double rminMod  = (*itModerator)->getDouble("RMIN")*GeoModelKernelUnits::mm; 
-	//double rmaxMod = (*itModerator)->getDouble("RMAX")*GeoModelKernelUnits::mm;
-	double dzMod = (*itModerator)->getDouble("DZ")*GeoModelKernelUnits::mm;
-	double zposMod = (*itModerator)->getDouble("ZPOS")*GeoModelKernelUnits::mm;
+	//double rminMod  = (*itModerator)->getDouble("RMIN")*Gaudi::Units::mm; 
+	//double rmaxMod = (*itModerator)->getDouble("RMAX")*Gaudi::Units::mm;
+	double dzMod = (*itModerator)->getDouble("DZ")*Gaudi::Units::mm;
+	double zposMod = (*itModerator)->getDouble("ZPOS")*Gaudi::Units::mm;
 	
 	const GeoMaterial *matMod  = materialManager->getMaterial((*itModerator)->getString("MATERIAL"));
 	
@@ -870,13 +870,13 @@ GeoFullPhysVol* LArGeo::EndcapCryostatConstruction::createEnvelope(bool bPos)
 	  const IRDBRecord* curScin = (*mbtsScin)[scinId];
 	
 	  int nScin = curScin->getInt("SCINNUM");
-	  double dx1Scin = curScin->getDouble("DX1")*GeoModelKernelUnits::mm;
-	  double dx2Scin = curScin->getDouble("DX2")*GeoModelKernelUnits::mm;
-	  double dy1Scin = curScin->getDouble("DY1")*GeoModelKernelUnits::mm;
-	  double dy2Scin = curScin->getDouble("DY2")*GeoModelKernelUnits::mm;
-	  double dzScin  = curScin->getDouble("DZ")*GeoModelKernelUnits::mm;
-	  double zposScin = curScin->getDouble("ZPOS")*GeoModelKernelUnits::mm;
-	  double rposScin = curScin->getDouble("RPOS")*GeoModelKernelUnits::mm;
+	  double dx1Scin = curScin->getDouble("DX1")*Gaudi::Units::mm;
+	  double dx2Scin = curScin->getDouble("DX2")*Gaudi::Units::mm;
+	  double dy1Scin = curScin->getDouble("DY1")*Gaudi::Units::mm;
+	  double dy2Scin = curScin->getDouble("DY2")*Gaudi::Units::mm;
+	  double dzScin  = curScin->getDouble("DZ")*Gaudi::Units::mm;
+	  double zposScin = curScin->getDouble("ZPOS")*Gaudi::Units::mm;
+	  double rposScin = curScin->getDouble("RPOS")*Gaudi::Units::mm;
 
 	  double startPhi = 0.;
 	  try {
@@ -901,12 +901,12 @@ GeoFullPhysVol* LArGeo::EndcapCryostatConstruction::createEnvelope(bool bPos)
 	  GeoSerialTransformer* stScin = 0;
 	  
 	  if(bPos) {
-	    GENFUNCTION phiInd = deltaPhi*(varInd + startPhi)*GeoModelKernelUnits::deg;
-	    TRANSFUNCTION xfScin = Pow(GeoTrf::RotateZ3D(1.0),phiInd)*GeoTrf::TranslateZ3D(zposScin)*GeoTrf::TranslateX3D(rposScin)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg);
+	    GENFUNCTION phiInd = deltaPhi*(varInd + startPhi)*Gaudi::Units::deg;
+	    TRANSFUNCTION xfScin = Pow(GeoTrf::RotateZ3D(1.0),phiInd)*GeoTrf::TranslateZ3D(zposScin)*GeoTrf::TranslateX3D(rposScin)*GeoTrf::RotateY3D(90*Gaudi::Units::deg);
 	    stScin = new GeoSerialTransformer(pvScin,&xfScin,nScin);
 	  } else {
-	    GENFUNCTION phiInd = (180 - deltaPhi*(varInd + startPhi))*GeoModelKernelUnits::deg;
-	    TRANSFUNCTION xfScin = Pow(GeoTrf::RotateZ3D(1.0),phiInd)*GeoTrf::TranslateZ3D(zposScin)*GeoTrf::TranslateX3D(rposScin)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg);
+	    GENFUNCTION phiInd = (180 - deltaPhi*(varInd + startPhi))*Gaudi::Units::deg;
+	    TRANSFUNCTION xfScin = Pow(GeoTrf::RotateZ3D(1.0),phiInd)*GeoTrf::TranslateZ3D(zposScin)*GeoTrf::TranslateX3D(rposScin)*GeoTrf::RotateY3D(90*Gaudi::Units::deg);
 	    stScin = new GeoSerialTransformer(pvScin,&xfScin,nScin);
 	  }
 	  
@@ -966,12 +966,12 @@ GeoFullPhysVol* LArGeo::EndcapCryostatConstruction::createEnvelope(bool bPos)
 	Variable varInd;
 	GeoSerialTransformer* stAirEnv = 0;
 	if(bPos) {
-	  GENFUNCTION phiInd = deltaPhi*(varInd + startPhi)*GeoModelKernelUnits::deg;
-	  TRANSFUNCTION xfAirEnv = Pow(GeoTrf::RotateZ3D(1.0),phiInd)*GeoTrf::TranslateZ3D(zposAirEnv)*GeoTrf::TranslateX3D(rposAirEnv)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg);
+	  GENFUNCTION phiInd = deltaPhi*(varInd + startPhi)*Gaudi::Units::deg;
+	  TRANSFUNCTION xfAirEnv = Pow(GeoTrf::RotateZ3D(1.0),phiInd)*GeoTrf::TranslateZ3D(zposAirEnv)*GeoTrf::TranslateX3D(rposAirEnv)*GeoTrf::RotateY3D(90*Gaudi::Units::deg);
 	  stAirEnv = new GeoSerialTransformer(pvAirEnv,&xfAirEnv,nAirEnv);
 	} else {
-	  GENFUNCTION phiInd = (180 - deltaPhi*(varInd + startPhi))*GeoModelKernelUnits::deg;
-	  TRANSFUNCTION xfAirEnv = Pow(GeoTrf::RotateZ3D(1.0),phiInd)*GeoTrf::TranslateZ3D(zposAirEnv)*GeoTrf::TranslateX3D(rposAirEnv)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg);
+	  GENFUNCTION phiInd = (180 - deltaPhi*(varInd + startPhi))*Gaudi::Units::deg;
+	  TRANSFUNCTION xfAirEnv = Pow(GeoTrf::RotateZ3D(1.0),phiInd)*GeoTrf::TranslateZ3D(zposAirEnv)*GeoTrf::TranslateX3D(rposAirEnv)*GeoTrf::RotateY3D(90*Gaudi::Units::deg);
 	  stAirEnv = new GeoSerialTransformer(pvAirEnv,&xfAirEnv,nAirEnv);
 	}
 
@@ -1015,15 +1015,15 @@ GeoFullPhysVol* LArGeo::EndcapCryostatConstruction::createEnvelope(bool bPos)
 	
 		nScin = curScin->getInt("SCINNUM");
 		eta = curScin->getInt("SCIN_ID")-1;
-		dx1Scin = curScin->getDouble("DX1")*GeoModelKernelUnits::mm;
-		dzScin  = curScin->getDouble("DZ")*GeoModelKernelUnits::mm;
-		zposScin = curScin->getDouble("ZPOS")*GeoModelKernelUnits::mm;
-		rposScin = curScin->getDouble("RPOS")*GeoModelKernelUnits::mm;
+		dx1Scin = curScin->getDouble("DX1")*Gaudi::Units::mm;
+		dzScin  = curScin->getDouble("DZ")*Gaudi::Units::mm;
+		zposScin = curScin->getDouble("ZPOS")*Gaudi::Units::mm;
+		rposScin = curScin->getDouble("RPOS")*Gaudi::Units::mm;
 		if(!curScin->isFieldNull("ETA"))
 		  scineta = curScin->getDouble("ETA");
 		if(!curScin->isFieldNull("DETA"))
 		  scindeta = curScin->getDouble("DETA");
-		deltaPhi = 360.*GeoModelKernelUnits::deg/nScin;
+		deltaPhi = 360.*Gaudi::Units::deg/nScin;
 		try {
 		  if(!curScin->isFieldNull("STARTPHI"))
 		    startPhi = curScin->getDouble("STARTPHI");
@@ -1036,14 +1036,14 @@ GeoFullPhysVol* LArGeo::EndcapCryostatConstruction::createEnvelope(bool bPos)
 		const IRDBRecord* curScin = (*mbtsTrds)[trdMap[scinName]];
 		nScin = (*mbtsGen)[0]->getInt("NSCIN");
 		eta = curScin->getInt("SCIN_ID")-1;
-		dx1Scin = curScin->getDouble("DX1")*GeoModelKernelUnits::mm;
-		dzScin  = curScin->getDouble("DZ")*GeoModelKernelUnits::mm;
-		zposScin = (*mbtsGen)[0]->getDouble("ZPOSENV")*GeoModelKernelUnits::mm;
-		rposScin = ((*mbtsGen)[0]->getDouble("RPOSENV")+curScin->getDouble("ZPOS"))*GeoModelKernelUnits::mm;
+		dx1Scin = curScin->getDouble("DX1")*Gaudi::Units::mm;
+		dzScin  = curScin->getDouble("DZ")*Gaudi::Units::mm;
+		zposScin = (*mbtsGen)[0]->getDouble("ZPOSENV")*Gaudi::Units::mm;
+		rposScin = ((*mbtsGen)[0]->getDouble("RPOSENV")+curScin->getDouble("ZPOS"))*Gaudi::Units::mm;
 		scineta = curScin->getDouble("ETA");
 		scindeta = curScin->getDouble("DETA");
 		startPhi = (*mbtsGen)[0]->getDouble("STARTPHI");
-		deltaPhi = 360.*GeoModelKernelUnits::deg/nScin;
+		deltaPhi = 360.*Gaudi::Units::deg/nScin;
 	      }
 
 	    for(int phi=0; phi<nScin; phi++) {
diff --git a/LArCalorimeter/LArGeoModel/LArGeoEndcap/src/EndcapDMConstruction.cxx b/LArCalorimeter/LArGeoModel/LArGeoEndcap/src/EndcapDMConstruction.cxx
index 768040c298b7576dfbe511adaf17a36041959e10..ebba1c54f910a2234ffcd954d115edb4e92c0303 100644
--- a/LArCalorimeter/LArGeoModel/LArGeoEndcap/src/EndcapDMConstruction.cxx
+++ b/LArCalorimeter/LArGeoModel/LArGeoEndcap/src/EndcapDMConstruction.cxx
@@ -7,6 +7,7 @@
 #include "GaudiKernel/ISvcLocator.h"
 #include "GaudiKernel/MsgStream.h"
 #include "GaudiKernel/IMessageSvc.h"
+#include "GaudiKernel/SystemOfUnits.h"
 #include "StoreGate/StoreGateSvc.h"
 
 #include "GeoModelKernel/GeoMaterial.h"
@@ -23,7 +24,6 @@
 #include "GeoModelKernel/GeoShapeShift.h"
 #include "GeoModelKernel/GeoShapeSubtraction.h"
 #include "GeoModelKernel/GeoDefinitions.h"
-#include "GeoModelKernel/Units.h"
 #include "GeoModelInterfaces/IGeoModelSvc.h"
 #include "GeoModelInterfaces/StoredMaterialManager.h"
 #include "GeoModelUtilities/DecodeVersionKey.h"
@@ -107,8 +107,8 @@ void LArGeo::EndcapDMConstruction::create(GeoFullPhysVol* envelope)
   unsigned int recordIndex;
 
   // Get materials
-  const GeoMaterial *alu               = materialManager->getMaterial("std::Aluminium"); //2.7 GeoModelKernelUnits::g/GeoModelKernelUnits::cm3
-  const GeoMaterial* matBoardsEnvelope = materialManager->getMaterial("LAr::BoardsEnvelope");// 0.932*GeoModelKernelUnits::gram/GeoModelKernelUnits::cm3);
+  const GeoMaterial *alu               = materialManager->getMaterial("std::Aluminium");
+  const GeoMaterial* matBoardsEnvelope = materialManager->getMaterial("LAr::BoardsEnvelope");
 
   ////----------- Building Front-end crates --------------------
   recordIndex = tubeMap["Ped2"];
@@ -185,9 +185,9 @@ void LArGeo::EndcapDMConstruction::create(GeoFullPhysVol* envelope)
   GeoTube    *Ped2     = new GeoTube(ped2minr, ped2maxr, ped2zhlen);
   GeoTube    *Ped3     = new GeoTube(ped3minr,ped3maxr , ped3zhlen);
   const GeoShape & CratePed=((*Pedestal).subtract(*Ped1).
-			     subtract((*Ped2)  <<GeoTrf::TranslateY3D(-ped2ytr)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg)).
+			     subtract((*Ped2)  <<GeoTrf::TranslateY3D(-ped2ytr)*GeoTrf::RotateY3D(90*Gaudi::Units::deg)).
 			     subtract((*Ped3)  <<GeoTrf::TranslateX3D(-ped3xtr)).
-			     subtract((*Ped2)  <<GeoTrf::TranslateY3D(ped2ytr)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg)));
+			     subtract((*Ped2)  <<GeoTrf::TranslateY3D(ped2ytr)*GeoTrf::RotateY3D(90*Gaudi::Units::deg)));
 
   GeoLogVol  *lvped   = new GeoLogVol("LAr::DM::Ped",&CratePed,alu);
   GeoPhysVol *pedestal   = new GeoPhysVol(lvped);
@@ -213,7 +213,7 @@ void LArGeo::EndcapDMConstruction::create(GeoFullPhysVol* envelope)
   GeoTransform* xfBoardEBase2(new GeoTransform(GeoTrf::TranslateY3D(-BoardEytr)*GeoTrf::TranslateX3D(BoardExtr)*GeoTrf::TranslateZ3D(BoardEztr)));
 
   for(unsigned i(0); i<LArEndcapCratePhiPos->size(); ++i) {
-    double phiPos = (*LArEndcapCratePhiPos)[i]->getDouble("PHIPOS")*GeoModelKernelUnits::deg;
+    double phiPos = (*LArEndcapCratePhiPos)[i]->getDouble("PHIPOS")*Gaudi::Units::deg;
     GeoTransform* xfPhiPos(new GeoTransform(GeoTrf::RotateZ3D(phiPos)));
 
     envelope->add(xfPhiPos);
diff --git a/LArCalorimeter/LArGeoModel/LArGeoEndcap/src/EndcapPresamplerConstruction.cxx b/LArCalorimeter/LArGeoModel/LArGeoEndcap/src/EndcapPresamplerConstruction.cxx
index b89f9c4d31cce88c0305f9a2a178e4132591dd78..2ca1d36710a0e5e4052edd739f07356fb13a929a 100755
--- a/LArCalorimeter/LArGeoModel/LArGeoEndcap/src/EndcapPresamplerConstruction.cxx
+++ b/LArCalorimeter/LArGeoModel/LArGeoEndcap/src/EndcapPresamplerConstruction.cxx
@@ -13,7 +13,6 @@
 #include "GeoModelKernel/GeoNameTag.h"  
 #include "GeoModelKernel/GeoIdentifierTag.h"  
 #include "GeoModelKernel/GeoDefinitions.h"
-#include "GeoModelKernel/Units.h"
 #include "StoreGate/StoreGateSvc.h"
 #include "GeoModelInterfaces/AbsMaterialManager.h"
 #include "GeoModelInterfaces/StoredMaterialManager.h"
@@ -23,6 +22,7 @@
 #include "StoreGate/StoreGateSvc.h"
 #include "GaudiKernel/MsgStream.h"
 #include "GaudiKernel/Bootstrap.h"
+#include "GaudiKernel/SystemOfUnits.h"
 
 // For the database:
 
@@ -103,14 +103,14 @@ GeoFullPhysVol* EndcapPresamplerConstruction::Envelope()
   ///////////////////////////////////////////////////////////////////
   // LAr Endcap Presampler GEOMETRY
   ///////////////////////////////////////////////////////////////////
-  double Rmin = 1231.74*GeoModelKernelUnits::mm;
-  double Rmax = 1701.98*GeoModelKernelUnits::mm;
-  double HalfZ = ((*presamplerPosition)[0]->getDouble("TCK")/2.)*GeoModelKernelUnits::cm;  
+  double Rmin = 1231.74*Gaudi::Units::mm;
+  double Rmax = 1701.98*Gaudi::Units::mm;
+  double HalfZ = ((*presamplerPosition)[0]->getDouble("TCK")/2.)*Gaudi::Units::cm;  
 
 
   std::string name = "LAr::Endcap::Presampler::LiquidArgon";
 
-  double phi_size = 360.*GeoModelKernelUnits::deg;
+  double phi_size = 360.*Gaudi::Units::deg;
   double start_phi = 0.;
   
   if( m_isModule ){
diff --git a/LArCalorimeter/LArGeoModel/LArGeoEndcap/src/EndcapPresamplerGeometryHelper.cxx b/LArCalorimeter/LArGeoModel/LArGeoEndcap/src/EndcapPresamplerGeometryHelper.cxx
index df188ef362243e6bc1c9c67626915bfd6e020172..f10e0d28d8b3d29ac54bfb17913ee18219d285be 100755
--- a/LArCalorimeter/LArGeoModel/LArGeoEndcap/src/EndcapPresamplerGeometryHelper.cxx
+++ b/LArCalorimeter/LArGeoModel/LArGeoEndcap/src/EndcapPresamplerGeometryHelper.cxx
@@ -11,7 +11,7 @@
 // 2-July-2003 Mikhail Leltchouk: local coordinates for determination
 // of etaBin, phiBin at any Endcap Presamplerposition. 
 
-#include "GeoModelKernel/Units.h"
+#include "GaudiKernel/SystemOfUnits.h"
 #include "LArGeoEndcap/EndcapPresamplerGeometryHelper.h"
 #include "LArGeoCode/VDetectorParameters.h"
 
@@ -48,22 +48,22 @@ double LArGeo::EndcapPresamplerGeometryHelper::GetValue(const kValue a_valueType
   switch (a_valueType)
     {
     case rMinEndcapPresampler:
-      //return 1231.74 * GeoModelKernelUnits::mm;
+      //return 1231.74 * mm;
       return  m_parameters->GetValue("LArEMECPreMinRadius");
       break;
     case rMaxEndcapPresampler:
-      //return 1701.98 * GeoModelKernelUnits::mm;
+      //return 1701.98 * mm;
       return  m_parameters->GetValue("LArEMECPreMaxRadius");
       break;
       // At nominal (zShift=0) endcap position absolute z-coordinates: 
       // of the faces of the EndcapPresampler
     case zEndcapPresamplerFrontFace:
-      //return 3622. * GeoModelKernelUnits::mm;
+      //return 3622. * mm;
       return (m_parameters->GetValue("LArEMECPreNomPos")
 	      - GetValue(EndcapPresamplerHalfThickness));
       break;
     case zEndcapPresamplerBackFace:
-      //return 3626. * GeoModelKernelUnits::mm;
+      //return 3626. * mm;
       return (m_parameters->GetValue("LArEMECPreNomPos")
 	      + GetValue(EndcapPresamplerHalfThickness)); 
       break;
@@ -73,8 +73,8 @@ double LArGeo::EndcapPresamplerGeometryHelper::GetValue(const kValue a_valueType
       break;
     case EndcapPresamplerZpositionInMother:
       // between cold wall center and presampler center which is at
-      // 3624 GeoModelKernelUnits::mm nominal (zShift=0) absolute position
-      return 30.5 * GeoModelKernelUnits::mm;
+      // 3624 Gaudi::Units::mm nominal (zShift=0) absolute position
+      return 30.5 * Gaudi::Units::mm;
       break;
     default:
       std::cerr << "EndcapPresamplerGeometryHelper::GetValue -- type '"
diff --git a/LArCalorimeter/LArGeoModel/LArGeoFcal/src/FCALConstruction.cxx b/LArCalorimeter/LArGeoModel/LArGeoFcal/src/FCALConstruction.cxx
index 90b09c85679eae970aa6421dd86aab84bc277683..f1f9135c090161be89ec2f870e966faf635a04e6 100755
--- a/LArCalorimeter/LArGeoModel/LArGeoFcal/src/FCALConstruction.cxx
+++ b/LArCalorimeter/LArGeoModel/LArGeoFcal/src/FCALConstruction.cxx
@@ -23,7 +23,6 @@
 #include "GeoModelKernel/GeoBox.h"
 #include "GeoModelKernel/GeoTrap.h"
 #include "GeoModelKernel/GeoDefinitions.h"
-#include "GeoModelKernel/Units.h"
 #include "StoreGate/StoreGateSvc.h"
 #include "GeoModelUtilities/DecodeVersionKey.h"
 #include "GeoModelInterfaces/StoredMaterialManager.h"
@@ -44,6 +43,7 @@
 #include "GaudiKernel/ISvcLocator.h"
 #include "GaudiKernel/MsgStream.h"
 #include "GaudiKernel/Bootstrap.h"
+#include "GaudiKernel/SystemOfUnits.h"
 #include <string>
 #include <cmath>
 #include <cfloat>
@@ -163,9 +163,9 @@ GeoVFullPhysVol* LArGeo::FCALConstruction::GetEnvelope(bool bPos)
 
   std::string baseName = "LAr::FCAL::";
 
-  double startZFCal1 = (*m_fcalMod)[0]->getDouble("STARTPOSITION"); //466.85 * GeoModelKernelUnits::cm;
-  //double startZFCal2 = (*m_fcalMod)[1]->getDouble("STARTPOSITION"); //512.83 * GeoModelKernelUnits::cm;
-  double startZFCal3 = (*m_fcalMod)[2]->getDouble("STARTPOSITION"); //560.28 * GeoModelKernelUnits::cm;
+  double startZFCal1 = (*m_fcalMod)[0]->getDouble("STARTPOSITION"); //466.85 * cm;
+  //double startZFCal2 = (*m_fcalMod)[1]->getDouble("STARTPOSITION"); //512.83 * cm;
+  double startZFCal3 = (*m_fcalMod)[2]->getDouble("STARTPOSITION"); //560.28 * cm;
 
   double outerModuleRadius1=(*m_fcalMod)[0]->getDouble("OUTERMODULERADIUS");
   double outerModuleRadius2=(*m_fcalMod)[1]->getDouble("OUTERMODULERADIUS");
@@ -199,7 +199,7 @@ GeoVFullPhysVol* LArGeo::FCALConstruction::GetEnvelope(bool bPos)
     double halfDepth   = totalDepth/2.;
 
     std::string name = baseName + "LiquidArgonC";
-    GeoTubs *tubs = new GeoTubs(innerRadius,outerRadius,halfDepth,0,360*GeoModelKernelUnits::deg);
+    GeoTubs *tubs = new GeoTubs(innerRadius,outerRadius,halfDepth,0,360*Gaudi::Units::deg);
     GeoLogVol *logVol= new GeoLogVol(name, tubs, LAr);
     fcalPhysical = new GeoFullPhysVol(logVol);
   }
@@ -234,7 +234,7 @@ GeoVFullPhysVol* LArGeo::FCALConstruction::GetEnvelope(bool bPos)
 	GeoAlignableTransform *xfAbs1 = new GeoAlignableTransform(xfPos);
 	
 	fcalPhysical->add(xfAbs1);
-	if (!bPos)  fcalPhysical->add(new GeoTransform(GeoTrf::RotateY3D(180*GeoModelKernelUnits::deg)));
+	if (!bPos)  fcalPhysical->add(new GeoTransform(GeoTrf::RotateY3D(180*Gaudi::Units::deg)));
 	fcalPhysical->add(physVol);
 	modPhysical = physVol;
 	
@@ -253,17 +253,17 @@ GeoVFullPhysVol* LArGeo::FCALConstruction::GetEnvelope(bool bPos)
       // 16 Troughs representing  Cable Harnesses:
       if(m_fullGeo)
 	if(m_absPhysical1==0) {
-	  double troughDepth       = 1.0 * GeoModelKernelUnits::cm;
+	  double troughDepth       = 1.0 * Gaudi::Units::cm;
 	  double outerRadius       = outerModuleRadius1;
 	  double innerRadius       = outerRadius - troughDepth;
 	  double halfLength        = fullModuleDepth1/ 2.0;
-	  double deltaPhi          = 5.625 * GeoModelKernelUnits::deg;
-	  double startPhi          = 11.25 * GeoModelKernelUnits::deg - deltaPhi/2.0;
+	  double deltaPhi          = 5.625 * Gaudi::Units::deg;
+	  double startPhi          = 11.25 * Gaudi::Units::deg - deltaPhi/2.0;
 	  GeoTubs * tubs = new GeoTubs(innerRadius,outerRadius,halfLength,startPhi,deltaPhi );
 	  GeoLogVol *logVol = new GeoLogVol(baseName+"Module1::CableTrough",tubs,FCalCableHarness);
 	  GeoPhysVol *physVol = new GeoPhysVol(logVol);
 	  GeoGenfun::Variable i;
-	  GeoGenfun::GENFUNCTION rotationAngle = 22.5*GeoModelKernelUnits::deg*i;
+	  GeoGenfun::GENFUNCTION rotationAngle = 22.5*Gaudi::Units::deg*i;
 	  GeoXF::TRANSFUNCTION xf = GeoXF::Pow(GeoTrf::RotateZ3D(1.0),rotationAngle);
 	  GeoSerialTransformer *st = new GeoSerialTransformer(physVol,&xf,16);
 	  modPhysical->add(st);
@@ -329,7 +329,7 @@ GeoVFullPhysVol* LArGeo::FCALConstruction::GetEnvelope(bool bPos)
 	    
 	    if (m_VisLimit != -1 && (counter++ > m_VisLimit)) continue;
 	    if(m_fullGeo) {	      
-	      GeoTransform *xf = new GeoTransform(GeoTrf::Translate3D(thisTubeX*GeoModelKernelUnits::cm, thisTubeY*GeoModelKernelUnits::cm,0));
+	      GeoTransform *xf = new GeoTransform(GeoTrf::Translate3D(thisTubeX*Gaudi::Units::cm, thisTubeY*Gaudi::Units::cm,0));
 	      modPhysical->add(xf);
 	      modPhysical->add(physVol);
 	    }
@@ -366,7 +366,7 @@ GeoVFullPhysVol* LArGeo::FCALConstruction::GetEnvelope(bool bPos)
 	GeoAlignableTransform *xfAbs2 = new GeoAlignableTransform(xfPos);
 	
 	fcalPhysical->add(xfAbs2);
-	if (!bPos)  fcalPhysical->add(new GeoTransform(GeoTrf::RotateY3D(180*GeoModelKernelUnits::deg)));
+	if (!bPos)  fcalPhysical->add(new GeoTransform(GeoTrf::RotateY3D(180*Gaudi::Units::deg)));
 	fcalPhysical->add(physVol);
 	modPhysical = physVol;
 	
@@ -385,17 +385,17 @@ GeoVFullPhysVol* LArGeo::FCALConstruction::GetEnvelope(bool bPos)
       // 16 Troughs representing  Cable Harnesses:
       if(m_fullGeo)
 	if(m_absPhysical2==0) {
-	  double troughDepth       = 1.0 * GeoModelKernelUnits::cm;
+	  double troughDepth       = 1.0 * Gaudi::Units::cm;
 	  double outerRadius       = outerModuleRadius2;
 	  double innerRadius       = outerRadius - troughDepth;
 	  double halfLength        = fullModuleDepth2/ 2.0;
-	  double deltaPhi          = 5.625 * GeoModelKernelUnits::deg;
-	  double startPhi          = 11.25 * GeoModelKernelUnits::deg - deltaPhi/2.0;
+	  double deltaPhi          = 5.625 * Gaudi::Units::deg;
+	  double startPhi          = 11.25 * Gaudi::Units::deg - deltaPhi/2.0;
 	  GeoTubs * tubs = new GeoTubs(innerRadius,outerRadius,halfLength,startPhi,deltaPhi );
 	  GeoLogVol *logVol = new GeoLogVol(baseName+"Module2::CableTrough",tubs,FCalCableHarness);
 	  GeoPhysVol *physVol = new GeoPhysVol(logVol);
 	  GeoGenfun::Variable i;
-	  GeoGenfun::GENFUNCTION rotationAngle = 22.5*GeoModelKernelUnits::deg*i;
+	  GeoGenfun::GENFUNCTION rotationAngle = 22.5*Gaudi::Units::deg*i;
 	  GeoXF::TRANSFUNCTION xf = GeoXF::Pow(GeoTrf::RotateZ3D(1.0),rotationAngle);
 	  GeoSerialTransformer *st = new GeoSerialTransformer(physVol,&xf,16);
 	  modPhysical->add(st);
@@ -469,7 +469,7 @@ GeoVFullPhysVol* LArGeo::FCALConstruction::GetEnvelope(bool bPos)
 	    
 	    if (m_VisLimit != -1 && (counter++ > m_VisLimit)) continue;
 	    if(m_fullGeo) {	      
-	      GeoTransform *xf = new GeoTransform(GeoTrf::Translate3D(thisTubeX*GeoModelKernelUnits::cm, thisTubeY*GeoModelKernelUnits::cm,0));
+	      GeoTransform *xf = new GeoTransform(GeoTrf::Translate3D(thisTubeX*Gaudi::Units::cm, thisTubeY*Gaudi::Units::cm,0));
 	      modPhysical->add(xf);
 	      modPhysical->add(gapPhys);
 	    }
@@ -506,7 +506,7 @@ GeoVFullPhysVol* LArGeo::FCALConstruction::GetEnvelope(bool bPos)
 	GeoAlignableTransform *xfAbs3 = new GeoAlignableTransform(xfPos);
 	
 	fcalPhysical->add(xfAbs3);
-	if (!bPos)  fcalPhysical->add(new GeoTransform(GeoTrf::RotateY3D(180*GeoModelKernelUnits::deg)));
+	if (!bPos)  fcalPhysical->add(new GeoTransform(GeoTrf::RotateY3D(180*Gaudi::Units::deg)));
 	fcalPhysical->add(physVol);
 	modPhysical = physVol;
 
@@ -527,38 +527,38 @@ GeoVFullPhysVol* LArGeo::FCALConstruction::GetEnvelope(bool bPos)
       if(m_fullGeo)
 	if(m_absPhysical3==0) {
 	  static double rotAngles[] =
-	    { 11.25 * GeoModelKernelUnits::deg,
-	      22.50 * GeoModelKernelUnits::deg,
-	      45.00 * GeoModelKernelUnits::deg,
-	      56.25 * GeoModelKernelUnits::deg,
-	      67.50 * GeoModelKernelUnits::deg,
-	      90.00 * GeoModelKernelUnits::deg,  // first quarter
-	      101.25 * GeoModelKernelUnits::deg,
-	      112.50 * GeoModelKernelUnits::deg,
-	      135.00 * GeoModelKernelUnits::deg,
-	      146.25 * GeoModelKernelUnits::deg,
-	      157.50 * GeoModelKernelUnits::deg,
-	      180.00 * GeoModelKernelUnits::deg,  // second quarter
-	      191.25 * GeoModelKernelUnits::deg,
-	      202.50 * GeoModelKernelUnits::deg,
-	      225.00 * GeoModelKernelUnits::deg,
-	      236.25 * GeoModelKernelUnits::deg,
-	      247.50 * GeoModelKernelUnits::deg,
-	      270.00 * GeoModelKernelUnits::deg,  // third quarter
-	      281.25 * GeoModelKernelUnits::deg,
-	      292.50 * GeoModelKernelUnits::deg,
-	      315.00 * GeoModelKernelUnits::deg,
-	      326.25 * GeoModelKernelUnits::deg,
-	      337.50 * GeoModelKernelUnits::deg,
-	      360.00 * GeoModelKernelUnits::deg };
+	    { 11.25 * Gaudi::Units::deg,
+	      22.50 * Gaudi::Units::deg,
+	      45.00 * Gaudi::Units::deg,
+	      56.25 * Gaudi::Units::deg,
+	      67.50 * Gaudi::Units::deg,
+	      90.00 * Gaudi::Units::deg,  // first quarter
+	      101.25 * Gaudi::Units::deg,
+	      112.50 * Gaudi::Units::deg,
+	      135.00 * Gaudi::Units::deg,
+	      146.25 * Gaudi::Units::deg,
+	      157.50 * Gaudi::Units::deg,
+	      180.00 * Gaudi::Units::deg,  // second quarter
+	      191.25 * Gaudi::Units::deg,
+	      202.50 * Gaudi::Units::deg,
+	      225.00 * Gaudi::Units::deg,
+	      236.25 * Gaudi::Units::deg,
+	      247.50 * Gaudi::Units::deg,
+	      270.00 * Gaudi::Units::deg,  // third quarter
+	      281.25 * Gaudi::Units::deg,
+	      292.50 * Gaudi::Units::deg,
+	      315.00 * Gaudi::Units::deg,
+	      326.25 * Gaudi::Units::deg,
+	      337.50 * Gaudi::Units::deg,
+	      360.00 * Gaudi::Units::deg };
 	
 	  GeoGenfun::ArrayFunction rotationAngle(rotAngles,rotAngles+24);
-	  double troughDepth       = 1.0 * GeoModelKernelUnits::cm;
+	  double troughDepth       = 1.0 * Gaudi::Units::cm;
 	  double outerRadius       = outerModuleRadius3;
 	  double innerRadius       = outerRadius - troughDepth;
 	  double halfLength        = fullModuleDepth3/ 2.0;
-	  double deltaPhi          = 5.625 * GeoModelKernelUnits::deg;
-	  double startPhi          = 11.25 * GeoModelKernelUnits::deg - deltaPhi/2.0;
+	  double deltaPhi          = 5.625 * Gaudi::Units::deg;
+	  double startPhi          = 11.25 * Gaudi::Units::deg - deltaPhi/2.0;
 	  GeoTubs * tubs = new GeoTubs(innerRadius,outerRadius,halfLength,startPhi,deltaPhi );
 	  GeoLogVol *logVol = new GeoLogVol(baseName+"Module3::CableTrough",tubs,FCalCableHarness);
 	  GeoPhysVol *physVol = new GeoPhysVol(logVol);
@@ -637,7 +637,7 @@ GeoVFullPhysVol* LArGeo::FCALConstruction::GetEnvelope(bool bPos)
 	    
 	    if (m_VisLimit != -1 && (counter++ > m_VisLimit)) continue;
 	    if(m_fullGeo) {	      
-	      GeoTransform *xf = new GeoTransform(GeoTrf::Translate3D(thisTubeX*GeoModelKernelUnits::cm, thisTubeY*GeoModelKernelUnits::cm,0));
+	      GeoTransform *xf = new GeoTransform(GeoTrf::Translate3D(thisTubeX*Gaudi::Units::cm, thisTubeY*Gaudi::Units::cm,0));
 	      modPhysical->add(xf);
 	      modPhysical->add(gapPhys);
 	    }
diff --git a/LArCalorimeter/LArGeoModel/LArGeoH62002Algs/src/ExcluderConstruction.cxx b/LArCalorimeter/LArGeoModel/LArGeoH62002Algs/src/ExcluderConstruction.cxx
index 6786c4e35f3153f5b3196a006b9d65569e1d6041..b5421fc8b63cef82347dff4f3041010f59917b92 100755
--- a/LArCalorimeter/LArGeoModel/LArGeoH62002Algs/src/ExcluderConstruction.cxx
+++ b/LArCalorimeter/LArGeoModel/LArGeoH62002Algs/src/ExcluderConstruction.cxx
@@ -42,6 +42,7 @@
 #include "StoreGate/StoreGateSvc.h"
 #include "GaudiKernel/MsgStream.h"
 #include "GaudiKernel/Bootstrap.h"
+#include "GaudiKernel/SystemOfUnits.h"
 
 #include <string>
 #include <cmath>
@@ -88,7 +89,7 @@ GeoPhysVol* LArGeo::ExcluderConstruction::GetEnvelope()
   const GeoElement*  H=materialManager->getElement("Hydrogen");
   const GeoElement*  O=materialManager->getElement("Oxygen");
   const GeoElement*  N=materialManager->getElement("Nitrogen");
-  GeoMaterial* Rohacell = new GeoMaterial(name="Rohacell", density=0.11*GeoModelKernelUnits::g/GeoModelKernelUnits::cm3);
+  GeoMaterial* Rohacell = new GeoMaterial(name="Rohacell", density=0.11*GeoModelKernelUnits::g/Gaudi::Units::cm3);
   Rohacell->add(C,0.6465);
   Rohacell->add(H,0.07836);
   Rohacell->add(O,0.19137);
@@ -111,25 +112,25 @@ GeoPhysVol* LArGeo::ExcluderConstruction::GetEnvelope()
 
   // It is a Union out of a GeoBox and a GeoTubs.
   // Box Dimensions:
-  double   xbox  =  300.0 *GeoModelKernelUnits::mm;
-  double   ybox  =  160.0 *GeoModelKernelUnits::mm;
-  double   zbox  =  300.7 *GeoModelKernelUnits::mm;
+  double   xbox  =  300.0 *Gaudi::Units::mm;
+  double   ybox  =  160.0 *Gaudi::Units::mm;
+  double   zbox  =  300.7 *Gaudi::Units::mm;
   //
   // Tubs Dimensions:
-  double   ztubs =  300.0 *GeoModelKernelUnits::mm;
-  double  phitubs=   76.2 *GeoModelKernelUnits::deg;
-  double  delphi =   27.6 *GeoModelKernelUnits::deg;
-  double   rcold = 1249.5 *GeoModelKernelUnits::mm;
-  double   rmin  = 1220.0 *GeoModelKernelUnits::mm;
+  double   ztubs =  300.0 *Gaudi::Units::mm;
+  double  phitubs=   76.2 *Gaudi::Units::deg;
+  double  delphi =   27.6 *Gaudi::Units::deg;
+  double   rcold = 1249.5 *Gaudi::Units::mm;
+  double   rmin  = 1220.0 *Gaudi::Units::mm;
 
-  // The radius of the cryostat cold wall is: 1250 GeoModelKernelUnits::mm
+  // The radius of the cryostat cold wall is: 1250 Gaudi::Units::mm
   // Before we make the union, we have to shift the box in y (that actually along the beam axis)
   //        and there, positive y goes from the cryostat centre towards the beam window.
 
   std::string ExcluderName = "LAr::H6::Cryostat::Excluder";
 
   GeoBox* rohaBox   = new GeoBox(xbox, ybox, zbox);                      //  The rectangular part of the excluder
-  const GeoShapeShift & rohaBoxShift = (*rohaBox << GeoTrf::TranslateY3D(1062.85*GeoModelKernelUnits::mm) );
+  const GeoShapeShift & rohaBoxShift = (*rohaBox << GeoTrf::TranslateY3D(1062.85*Gaudi::Units::mm) );
   GeoTubs* rohaTubs = new GeoTubs(rmin, rcold, ztubs, phitubs, delphi);  //  The round part of the excluder  
 
   // Combine the two parts to make one excluder of the correct shape:
diff --git a/LArCalorimeter/LArGeoModel/LArGeoH62002Algs/src/FrontBeamConstructionH62002.cxx b/LArCalorimeter/LArGeoModel/LArGeoH62002Algs/src/FrontBeamConstructionH62002.cxx
index bd3ac799fc918b496c8f69e6516dfd5546542e83..9adb356ca56666601c67edb0797a42061e341b78 100755
--- a/LArCalorimeter/LArGeoModel/LArGeoH62002Algs/src/FrontBeamConstructionH62002.cxx
+++ b/LArCalorimeter/LArGeoModel/LArGeoH62002Algs/src/FrontBeamConstructionH62002.cxx
@@ -24,7 +24,6 @@
 #include "GeoModelKernel/GeoIdentifierTag.h"  
 #include "GeoModelKernel/GeoSerialDenominator.h"
 #include "GeoModelKernel/GeoDefinitions.h"
-#include "GeoModelKernel/Units.h"
 #include "StoreGate/StoreGateSvc.h"
 #include "GeoModelInterfaces/AbsMaterialManager.h"
 #include "GeoModelInterfaces/StoredMaterialManager.h"
@@ -42,6 +41,7 @@
 #include "StoreGate/StoreGateSvc.h"
 #include "GaudiKernel/MsgStream.h"
 #include "GaudiKernel/Bootstrap.h"
+#include "GaudiKernel/SystemOfUnits.h"
 
 #include <string>
 #include <cmath>
@@ -140,8 +140,8 @@ GeoVPhysVol* LArGeo::FrontBeamConstructionH62002::GetEnvelope()
   std::string baseName = "LAr::TBH62002";
   std::string H62002FrontBeamName = baseName + "::FrontBeam";
 
-  const double H62002FrontBeamXY  = 2000.*GeoModelKernelUnits::mm;
-  const double H62002FrontBeamZ   =  350.*GeoModelKernelUnits::mm;
+  const double H62002FrontBeamXY  = 2000.*Gaudi::Units::mm;
+  const double H62002FrontBeamZ   =  350.*Gaudi::Units::mm;
 
 
   GeoBox* H62002FrontBeamShape = new GeoBox( H62002FrontBeamXY, H62002FrontBeamXY, H62002FrontBeamZ );   
@@ -158,27 +158,27 @@ GeoVPhysVol* LArGeo::FrontBeamConstructionH62002::GetEnvelope()
   //   In the old stand-alone code, all three were round with a radius of 5cm 
   //   and 7.5mm thickness.
   //   Logbooks in the control-room say that their xyz sizes are:
-  //   B1   : 30 x 30 x 10 GeoModelKernelUnits::mm
-  //   W1,2 : 150 x 150 x 10 GeoModelKernelUnits::mm
+  //   B1   : 30 x 30 x 10 Gaudi::Units::mm
+  //   W1,2 : 150 x 150 x 10 Gaudi::Units::mm
   // They are certainly not round, so stick with the logbook values 
   // The beam sees the instrumentation in the following order:
   // W1, W2, B1, MWPC5
 
   log << "Create Front Scintillators ..." << std::endl;
   
-  const double Wxy=  75.0*GeoModelKernelUnits::mm;
-  const double Wz =   5.0*GeoModelKernelUnits::mm;
-  const double Bxy=  15.0*GeoModelKernelUnits::mm;
-  const double Bz =   5.0*GeoModelKernelUnits::mm;
+  const double Wxy=  75.0*Gaudi::Units::mm;
+  const double Wz =   5.0*Gaudi::Units::mm;
+  const double Bxy=  15.0*Gaudi::Units::mm;
+  const double Bz =   5.0*Gaudi::Units::mm;
 
   std::vector<double> v_ScintXY;
   std::vector<double> v_ScintZ;
   v_ScintXY.push_back(Wxy);
   v_ScintXY.push_back(Wxy); 
   v_ScintXY.push_back(Bxy); 
-  v_ScintZ.push_back(170.*GeoModelKernelUnits::mm); 
-  v_ScintZ.push_back(200.*GeoModelKernelUnits::mm); 
-  v_ScintZ.push_back(340.*GeoModelKernelUnits::mm);
+  v_ScintZ.push_back(170.*Gaudi::Units::mm); 
+  v_ScintZ.push_back(200.*Gaudi::Units::mm); 
+  v_ScintZ.push_back(340.*Gaudi::Units::mm);
 
    // Create one Scintillator and place it twice along z:
  
@@ -193,7 +193,7 @@ GeoVPhysVol* LArGeo::FrontBeamConstructionH62002::GetEnvelope()
   //BScintPhysical->add( new GeoNameTag(ScintName) );
   for ( unsigned int i = 0; i < v_ScintZ.size(); i++ ) {
     m_H62002FrontBeamPhysical->add( new GeoIdentifierTag(i) );
-    m_H62002FrontBeamPhysical->add( new GeoTransform( GeoTrf::Translate3D( 0.*GeoModelKernelUnits::cm, 0.*GeoModelKernelUnits::cm, (v_ScintZ[ i ]-H62002FrontBeamZ) ) ) ) ;     m_H62002FrontBeamPhysical->add( new GeoNameTag(ScintName) );
+    m_H62002FrontBeamPhysical->add( new GeoTransform( GeoTrf::Translate3D( 0.*Gaudi::Units::cm, 0.*Gaudi::Units::cm, (v_ScintZ[ i ]-H62002FrontBeamZ) ) ) ) ;     m_H62002FrontBeamPhysical->add( new GeoNameTag(ScintName) );
 
     switch(i) {
     case 0: case 1: { m_H62002FrontBeamPhysical->add( WScintPhysical ); break; }
@@ -208,12 +208,12 @@ GeoVPhysVol* LArGeo::FrontBeamConstructionH62002::GetEnvelope()
 
 
   //------ Get MWPC number 5 from LArGeoH6Cryostats
-  const double MwpcPos = 605.*GeoModelKernelUnits::mm;
-  double WireStep = 2.*GeoModelKernelUnits::mm;
+  const double MwpcPos = 605.*Gaudi::Units::mm;
+  double WireStep = 2.*Gaudi::Units::mm;
   MWPCConstruction  mwpcXConstruction (WireStep);
   GeoVPhysVol* mwpcEnvelope = mwpcXConstruction.GetEnvelope();
   m_H62002FrontBeamPhysical->add(new GeoIdentifierTag(5));
-  m_H62002FrontBeamPhysical->add( new GeoTransform(GeoTrf::Translate3D( 0.*GeoModelKernelUnits::cm, 0.*GeoModelKernelUnits::cm, (MwpcPos-H62002FrontBeamZ) ) ) );
+  m_H62002FrontBeamPhysical->add( new GeoTransform(GeoTrf::Translate3D( 0.*Gaudi::Units::cm, 0.*Gaudi::Units::cm, (MwpcPos-H62002FrontBeamZ) ) ) );
   m_H62002FrontBeamPhysical->add(mwpcEnvelope);    
   //------ Done with creating an MWPC from LArGeoH6Cryostats
 
diff --git a/LArCalorimeter/LArGeoModel/LArGeoH62002Algs/src/HECConstructionH62002.cxx b/LArCalorimeter/LArGeoModel/LArGeoH62002Algs/src/HECConstructionH62002.cxx
index 44c6937ad57a9f267f79ee977c0fd148d105acf8..71dabd2d398c52d99b5c97db6f92321fe349191a 100755
--- a/LArCalorimeter/LArGeoModel/LArGeoH62002Algs/src/HECConstructionH62002.cxx
+++ b/LArCalorimeter/LArGeoModel/LArGeoH62002Algs/src/HECConstructionH62002.cxx
@@ -23,7 +23,6 @@
 #include "GeoModelKernel/GeoIdentifierTag.h"  
 #include "GeoModelKernel/GeoShapeUnion.h"  
 #include "GeoModelKernel/GeoDefinitions.h"
-#include "GeoModelKernel/Units.h"
 #include "GeoGenericFunctions/AbsFunction.h"
 #include "GeoGenericFunctions/Variable.h"
 #include "GeoGenericFunctions/Sin.h"
@@ -36,6 +35,7 @@
 
 #include "GaudiKernel/MsgStream.h"
 #include "GaudiKernel/Bootstrap.h"
+#include "GaudiKernel/SystemOfUnits.h"
 #include "RDBAccessSvc/IRDBAccessSvc.h"
 #include "RDBAccessSvc/IRDBRecord.h"
 #include "RDBAccessSvc/IRDBRecordset.h"
@@ -151,7 +151,7 @@ GeoVFullPhysVol* LArGeo::HECConstructionH62002::GetEnvelope()
   int lastPlaneHEC = ( sizeof(HECMotherZplan) / sizeof(double) );
 
 
-  double moduleDeltaPhi =  2.*M_PI/32. ;  //  = 11.25*GeoModelKernelUnits::deg; 
+  double moduleDeltaPhi =  2.*M_PI/32. ;  //  = 11.25*Gaudi::Units::deg; 
   double phiStart []  = {-19. , -18. } ;
   double hecPhistart[]  = { phiStart[0]*M_PI/32  ,   phiStart[1]*M_PI/32 } ;
   double modulePhistart[]  = { (phiStart[0]+2.)*M_PI/32  ,   (phiStart[1]+2.)*M_PI/32 } ;
@@ -212,9 +212,9 @@ GeoVFullPhysVol* LArGeo::HECConstructionH62002::GetEnvelope()
   double             spacerDiameter[2];
 
   double ztie[2];   // This is the +/- z length of the tie rod in the LAr gap
-  ztie[0]=-0.227825*GeoModelKernelUnits::cm;
-  ztie[1]= 0.227825*GeoModelKernelUnits::cm;
-  double rodSize = 0.39435*GeoModelKernelUnits::cm;
+  ztie[0]=-0.227825*Gaudi::Units::cm;
+  ztie[1]= 0.227825*Gaudi::Units::cm;
+  double rodSize = 0.39435*Gaudi::Units::cm;
 
 
 
@@ -225,7 +225,7 @@ GeoVFullPhysVol* LArGeo::HECConstructionH62002::GetEnvelope()
   const GeoLogVol*   logiSlice[3];
   GeoPhysVol*        physiSlice[3];
   // Absorber
-  double             radialShift = 1.02*GeoModelKernelUnits::cm;  // absorbers are adjusted by this amount          
+  double             radialShift = 1.02*Gaudi::Units::cm;  // absorbers are adjusted by this amount          
   GeoTubs*           solidFrontAbsorber[2];
   const GeoLogVol*   logiFrontAbsorber[2];
   GeoPhysVol*        physiFrontAbsorber[2];
@@ -272,19 +272,19 @@ GeoVFullPhysVol* LArGeo::HECConstructionH62002::GetEnvelope()
   int    moduleNumberFront   = 3;             
   int    moduleNumberRear    = 2;              
   // radial dimensions of the modules:
-  double moduleRinner1  = (*hecLongitudinalBlock)[0]->getDouble("BLRMN")*GeoModelKernelUnits::cm;   
-  double moduleRinner2  = (*hecLongitudinalBlock)[1]->getDouble("BLRMN")*GeoModelKernelUnits::cm;   
-  double moduleRouter   = (*hecLongitudinalBlock)[0]->getDouble("BLRMX")*GeoModelKernelUnits::cm;   
+  double moduleRinner1  = (*hecLongitudinalBlock)[0]->getDouble("BLRMN")*Gaudi::Units::cm;   
+  double moduleRinner2  = (*hecLongitudinalBlock)[1]->getDouble("BLRMN")*Gaudi::Units::cm;   
+  double moduleRouter   = (*hecLongitudinalBlock)[0]->getDouble("BLRMX")*Gaudi::Units::cm;   
   // thickness of Cu pads, LAr gaps and inter-wheel gap:
-  double copperPad      = (*hadronicEndcap)[0]->getDouble("COPPER")*GeoModelKernelUnits::cm;
-  double gapSize        = (*hadronicEndcap)[0]->getDouble("LARG")*GeoModelKernelUnits::cm;
-  double betweenWheel   = (*hadronicEndcap)[0]->getDouble("GAPWHL")*GeoModelKernelUnits::cm; 
+  double copperPad      = (*hadronicEndcap)[0]->getDouble("COPPER")*Gaudi::Units::cm;
+  double gapSize        = (*hadronicEndcap)[0]->getDouble("LARG")*Gaudi::Units::cm;
+  double betweenWheel   = (*hadronicEndcap)[0]->getDouble("GAPWHL")*Gaudi::Units::cm; 
 
 
   for (int idepth=0; idepth < depthNumber; ++idepth)
     {
-      depthSize[idepth]    = (*hecLongitudinalBlock)[idepth]->getDouble("BLDPTH")*GeoModelKernelUnits::cm;
-      firstAbsorber[idepth]= (*hecLongitudinalBlock)[idepth]->getDouble("PLATE0")*GeoModelKernelUnits::cm;
+      depthSize[idepth]    = (*hecLongitudinalBlock)[idepth]->getDouble("BLDPTH")*Gaudi::Units::cm;
+      firstAbsorber[idepth]= (*hecLongitudinalBlock)[idepth]->getDouble("PLATE0")*Gaudi::Units::cm;
       gapNumber[idepth]    = (int) (*hecLongitudinalBlock)[idepth]->getDouble("BLMOD");
     }
 
@@ -293,8 +293,8 @@ GeoVFullPhysVol* LArGeo::HECConstructionH62002::GetEnvelope()
       std::ostringstream A0STR;
       A0STR << "_" << ikapton;
       const std::string A0 = A0STR.str();
-      kaptonPosition[ikapton] = (*hadronicEndcap)[0]->getDouble("KPTPOS"+A0)*GeoModelKernelUnits::cm;
-      kaptonWidth[ikapton]    = (*hadronicEndcap)[0]->getDouble("KPTWID"+A0)*GeoModelKernelUnits::cm;
+      kaptonPosition[ikapton] = (*hadronicEndcap)[0]->getDouble("KPTPOS"+A0)*Gaudi::Units::cm;
+      kaptonWidth[ikapton]    = (*hadronicEndcap)[0]->getDouble("KPTWID"+A0)*Gaudi::Units::cm;
     }
 
   for (int itie=0; itie < 4; ++itie)
@@ -302,8 +302,8 @@ GeoVFullPhysVol* LArGeo::HECConstructionH62002::GetEnvelope()
       std::ostringstream A0STR;
       A0STR << "_" << itie;
       const std::string A0 = A0STR.str(); 
-      tieRodPositionX[itie] = (*hadronicEndcap)[0]->getDouble("RODPOSX"+A0)*GeoModelKernelUnits::cm;
-      tieRodPositionY[itie] = (*hadronicEndcap)[0]->getDouble("RODPOSR"+A0)*GeoModelKernelUnits::cm;
+      tieRodPositionX[itie] = (*hadronicEndcap)[0]->getDouble("RODPOSX"+A0)*Gaudi::Units::cm;
+      tieRodPositionY[itie] = (*hadronicEndcap)[0]->getDouble("RODPOSR"+A0)*Gaudi::Units::cm;
     }
 
   for (int i=0; i < 2; ++i)
@@ -311,16 +311,16 @@ GeoVFullPhysVol* LArGeo::HECConstructionH62002::GetEnvelope()
       std::ostringstream A0STR;
       A0STR << "_" << i;
       const std::string A0 = A0STR.str();  
-      tieRodDiameter[i] = (*hadronicEndcap)[0]->getDouble("RODDIM"+A0)*GeoModelKernelUnits::cm;
-      spacerDiameter[i] = (*hadronicEndcap)[0]->getDouble("SPCDIM"+A0)*GeoModelKernelUnits::cm;
+      tieRodDiameter[i] = (*hadronicEndcap)[0]->getDouble("RODDIM"+A0)*Gaudi::Units::cm;
+      spacerDiameter[i] = (*hadronicEndcap)[0]->getDouble("SPCDIM"+A0)*Gaudi::Units::cm;
     }
 
 
-  double frontAbsThickness = (*hadronicEndcap)[0]->getDouble("PLATE_0")*GeoModelKernelUnits::cm;
-  double rearAbsThickness  = (*hadronicEndcap)[0]->getDouble("PLATE_1")*GeoModelKernelUnits::cm;
+  double frontAbsThickness = (*hadronicEndcap)[0]->getDouble("PLATE_0")*Gaudi::Units::cm;
+  double rearAbsThickness  = (*hadronicEndcap)[0]->getDouble("PLATE_1")*Gaudi::Units::cm;
   
   // Radial dimensions and z-plane locations
-  double zCoordinate[] = {0.0*GeoModelKernelUnits::cm, depthSize[0], depthSize[0], 816.51*GeoModelKernelUnits::mm, 816.51*GeoModelKernelUnits::mm, 1350.*GeoModelKernelUnits::mm };
+  double zCoordinate[] = {0.0*Gaudi::Units::cm, depthSize[0], depthSize[0], 816.51*Gaudi::Units::mm, 816.51*Gaudi::Units::mm, 1350.*Gaudi::Units::mm };
   double innerRadius[] = {moduleRinner1,moduleRinner1,
                          moduleRinner2,moduleRinner2,moduleRinner2,moduleRinner2,};   
 
@@ -490,7 +490,7 @@ GeoVFullPhysVol* LArGeo::HECConstructionH62002::GetEnvelope()
   //----------------------------------------------------------------
   //    Absorbers , the inner and outer Radius are smaller by radialShift
   //                but positionned in the center of depth. this alows
-  //                to have 2 GeoModelKernelUnits::mm gap between the copper plates of neighbor FrontModules 
+  //                to have 2 Gaudi::Units::mm gap between the copper plates of neighbor FrontModules 
   //----------------------------------------------------------------
 
   // Two different Absorbers for the front depths: 
@@ -703,10 +703,10 @@ GeoVFullPhysVol* LArGeo::HECConstructionH62002::GetEnvelope()
   //    Tie rods in Slice
   //----------------------------------------------------------------
 
-  //  double rodSize = 0.85*GeoModelKernelUnits::cm;
+  //  double rodSize = 0.85*Gaudi::Units::cm;
   for (int iwheel=0; iwheel<2; iwheel++) 
     { 
-      solidTieRod[iwheel] = new GeoTubs(0.*GeoModelKernelUnits::cm,spacerDiameter[iwheel]/2.,rodSize/2., 0.*GeoModelKernelUnits::deg,360.*GeoModelKernelUnits::deg); 
+      solidTieRod[iwheel] = new GeoTubs(0.*Gaudi::Units::cm,spacerDiameter[iwheel]/2.,rodSize/2., 0.*Gaudi::Units::deg,360.*Gaudi::Units::deg); 
       logiTieRod[iwheel] = new GeoLogVol(tieRodName, solidTieRod[iwheel], Iron);     
     }
 
@@ -747,12 +747,12 @@ GeoVFullPhysVol* LArGeo::HECConstructionH62002::GetEnvelope()
   //----------------------------------------------------------------
   //    Tie rods in Absorbers
   //----------------------------------------------------------------
-  solidAbsorberTieRod[0] = new GeoTubs(0.*GeoModelKernelUnits::cm,tieRodDiameter[0]/2.,frontAbsThickness/2.,0.*GeoModelKernelUnits::deg,360.*GeoModelKernelUnits::deg);
-  solidAbsorberTieRod[1] = new GeoTubs(0.*GeoModelKernelUnits::cm,tieRodDiameter[1]/2.,rearAbsThickness/2.,0.*GeoModelKernelUnits::deg,360.*GeoModelKernelUnits::deg); 
+  solidAbsorberTieRod[0] = new GeoTubs(0.*Gaudi::Units::cm,tieRodDiameter[0]/2.,frontAbsThickness/2.,0.*Gaudi::Units::deg,360.*Gaudi::Units::deg);
+  solidAbsorberTieRod[1] = new GeoTubs(0.*Gaudi::Units::cm,tieRodDiameter[1]/2.,rearAbsThickness/2.,0.*Gaudi::Units::deg,360.*Gaudi::Units::deg); 
   logiAbsorberTieRod[0]  = new GeoLogVol(tieRodName,solidAbsorberTieRod[0],Iron);  //,0,0,0);
   logiAbsorberTieRod[1]  = new GeoLogVol(tieRodName,solidAbsorberTieRod[1],Iron);  //,0,0,0);
-  solidAbsorberTieRodRear[0] = new GeoTubs(0.*GeoModelKernelUnits::cm,tieRodDiameter[0]/2.,frontAbsThickness/2.,0.*GeoModelKernelUnits::deg,360.*GeoModelKernelUnits::deg);
-  solidAbsorberTieRodRear[1] = new GeoTubs(0.*GeoModelKernelUnits::cm,tieRodDiameter[1]/2.,rearAbsThickness/2.,0.*GeoModelKernelUnits::deg,360.*GeoModelKernelUnits::deg); 
+  solidAbsorberTieRodRear[0] = new GeoTubs(0.*Gaudi::Units::cm,tieRodDiameter[0]/2.,frontAbsThickness/2.,0.*Gaudi::Units::deg,360.*Gaudi::Units::deg);
+  solidAbsorberTieRodRear[1] = new GeoTubs(0.*Gaudi::Units::cm,tieRodDiameter[1]/2.,rearAbsThickness/2.,0.*Gaudi::Units::deg,360.*Gaudi::Units::deg); 
   logiAbsorberTieRodRear[0]  = new GeoLogVol(tieRodRearName,solidAbsorberTieRodRear[0],Iron);  //,0,0,0);
   logiAbsorberTieRodRear[1]  = new GeoLogVol(tieRodRearName,solidAbsorberTieRodRear[1],Iron);  //,0,0,0);
 
diff --git a/LArCalorimeter/LArGeoModel/LArGeoH62002Algs/src/LArDetectorFactoryH62002.cxx b/LArCalorimeter/LArGeoModel/LArGeoH62002Algs/src/LArDetectorFactoryH62002.cxx
index 64849d9ef750e7c1e4f4739369e253bea3e9e710..9e656fe86677714a078af83306daa804253564c9 100755
--- a/LArCalorimeter/LArGeoModel/LArGeoH62002Algs/src/LArDetectorFactoryH62002.cxx
+++ b/LArCalorimeter/LArGeoModel/LArGeoH62002Algs/src/LArDetectorFactoryH62002.cxx
@@ -27,7 +27,6 @@
 #include "GeoModelKernel/GeoAlignableTransform.h"  
 #include "GeoModelKernel/GeoSerialTransformer.h"
 #include "GeoModelKernel/GeoDefinitions.h"
-#include "GeoModelKernel/Units.h"
 #include "GeoGenericFunctions/AbsFunction.h"
 #include "GeoGenericFunctions/Variable.h"
 #include "GeoGenericFunctions/Sin.h"
@@ -43,6 +42,7 @@
 
 #include "GaudiKernel/MsgStream.h"
 #include "GaudiKernel/Bootstrap.h"
+#include "GaudiKernel/SystemOfUnits.h"
 
 #include "RDBAccessSvc/IRDBRecord.h"
 #include "RDBAccessSvc/IRDBRecordset.h"
@@ -128,8 +128,8 @@ void LArGeo::LArDetectorFactoryH62002::getSimulationParameters()
   }
 
  (*log)<< MSG::INFO<< endmsg;
- (*log)<< MSG::INFO << " Use cryo X : " <<  m_cryoXpos << " GeoModelKernelUnits::mm" << endmsg;
- (*log)<< MSG::INFO << " Use table Y : " <<  m_tableYpos << " GeoModelKernelUnits::mm" << endmsg;
+ (*log)<< MSG::INFO << " Use cryo X : " <<  m_cryoXpos << " Gaudi::Units::mm" << endmsg;
+ (*log)<< MSG::INFO << " Use table Y : " <<  m_tableYpos << " Gaudi::Units::mm" << endmsg;
 
 
 }
@@ -162,13 +162,13 @@ void LArGeo::LArDetectorFactoryH62002::create(GeoPhysVol *world)
 
   // 4databa :  // numbers taken from LArCalorimeter/LArG4TB/LArG4TBExpHall/src/LArG4TBEmecHecDetectorConstruction.cc
   // (That's a mighty big hall.....)
-  double expHallX = 14000.*GeoModelKernelUnits::mm;
-  double expHallY = 14000.*GeoModelKernelUnits::mm;
-  double expHallZ = 50000.*GeoModelKernelUnits::mm;
-  //double cryoZpos = 12250.*GeoModelKernelUnits::mm;
-  //double cryoXrot = -90.*GeoModelKernelUnits::deg; 
-  //double cryoXpos = m_cryoXpos * GeoModelKernelUnits::mm ;
-  //double cryoXpos = 0.*GeoModelKernelUnits::mm;  // <-- Should be made available in RunOptions! (Perhaps default in DB...)
+  double expHallX = 14000.*Gaudi::Units::mm;
+  double expHallY = 14000.*Gaudi::Units::mm;
+  double expHallZ = 50000.*Gaudi::Units::mm;
+  //double cryoZpos = 12250.*Gaudi::Units::mm;
+  //double cryoXrot = -90.*Gaudi::Units::deg; 
+  //double cryoXpos = m_cryoXpos * Gaudi::Units::mm ;
+  //double cryoXpos = 0.*Gaudi::Units::mm;  // <-- Should be made available in RunOptions! (Perhaps default in DB...)
 
   //-----------------------------------------------------------------------------------//  
   // Next make the box that describes the shape of the expHall volume:                 //  
@@ -193,11 +193,11 @@ void LArGeo::LArDetectorFactoryH62002::create(GeoPhysVol *world)
   // the element we want to position in the following order:
 
 
-  double Theta = -90. * GeoModelKernelUnits::deg;
-  double Phi   = 0.  * GeoModelKernelUnits::deg;
+  double Theta = -90. * Gaudi::Units::deg;
+  double Phi   = 0.  * Gaudi::Units::deg;
 
   GeoTrf::Transform3D Mrot(GeoTrf::RotateZ3D(Phi)*GeoTrf::RotateX3D(Theta));
-  GeoTrf::Translate3D pos3Vector(    m_cryoXpos*GeoModelKernelUnits::mm,    0.*GeoModelKernelUnits::mm,   12250.*GeoModelKernelUnits::mm );
+  GeoTrf::Translate3D pos3Vector(    m_cryoXpos*Gaudi::Units::mm,    0.*Gaudi::Units::mm,   12250.*Gaudi::Units::mm );
 
   H6CryostatConstruction  H6CryoCons;
   GeoVPhysVol* Envelope = 0;
@@ -211,7 +211,7 @@ void LArGeo::LArDetectorFactoryH62002::create(GeoPhysVol *world)
 
   //Add the walls in front of the cryostat:
   {
-    const double H62002WallsPos = 10182.*GeoModelKernelUnits::mm;  // A wild guess at the moment.....
+    const double H62002WallsPos = 10182.*Gaudi::Units::mm;  // A wild guess at the moment.....
     WallsConstruction  WallsConstruction2002;
     GeoVPhysVol* frontwalls = WallsConstruction2002.GetEnvelope();
     if(frontwalls !=0 && expHallPhys !=0){
@@ -224,7 +224,7 @@ void LArGeo::LArDetectorFactoryH62002::create(GeoPhysVol *world)
 
   //Add the table instrumentation:
   {    
-    const double H62002TablePos = 8320.*GeoModelKernelUnits::mm;  
+    const double H62002TablePos = 8320.*Gaudi::Units::mm;  
     TableConstructionH62002  TableConstruction;
     GeoVPhysVol* table = TableConstruction.GetEnvelope();
     if(table !=0 && expHallPhys !=0){
@@ -237,8 +237,8 @@ void LArGeo::LArDetectorFactoryH62002::create(GeoPhysVol *world)
 
   //Add the front beam instrumentation:
   {
-    const double H62002FrontBeamPos = -20215.5*GeoModelKernelUnits::mm;  // (Use this to get the Front dets. in Peter Schacht's position)   
-    //const double H62002FrontBeamPos = -20439.*GeoModelKernelUnits::mm; // (according to old code: [-21600+801+350]*GeoModelKernelUnits::mm)   
+    const double H62002FrontBeamPos = -20215.5*Gaudi::Units::mm;  // (Use this to get the Front dets. in Peter Schacht's position)   
+    //const double H62002FrontBeamPos = -20439.*Gaudi::Units::mm; // (according to old code: [-21600+801+350]*Gaudi::Units::mm)   
     // (with 350=1/2 length of FrontBeam volume)
     FrontBeamConstructionH62002  FrontBeamConstruction;
     GeoVPhysVol* front = FrontBeamConstruction.GetEnvelope();
@@ -263,10 +263,10 @@ void LArGeo::LArDetectorFactoryH62002::create(GeoPhysVol *world)
   // For the moment it is still commented out until I have
   // its true geometry confirmed; But really it is ready to go:
   // Add Rohacell Excluder 
-  // double ThetaRoha = 0. * GeoModelKernelUnits::deg;
-  // double PhiRoha   = 0.  * GeoModelKernelUnits::deg;
+  // double ThetaRoha = 0. * Gaudi::Units::deg;
+  // double PhiRoha   = 0.  * Gaudi::Units::deg;
   // GeoTrf::Transform3D MrotRoha(GeoTrf::RotateZ3D(PhiRoha)*GeoTrf::RotateX3D(ThetaRoha));
-  // GeoTrf::Translate3D pos3Roha(    0*GeoModelKernelUnits::mm,   0.0*GeoModelKernelUnits::mm ,   0.*GeoModelKernelUnits::mm);
+  // GeoTrf::Translate3D pos3Roha(    0*Gaudi::Units::mm,   0.0*Gaudi::Units::mm ,   0.*Gaudi::Units::mm);
 
   {    
     ExcluderConstruction excluderConstruction;
@@ -286,12 +286,12 @@ void LArGeo::LArDetectorFactoryH62002::create(GeoPhysVol *world)
   EMECDetectorManager *emecDetectorManager  = new EMECDetectorManager();
 
 
-  double ThetaEmec = -90. * GeoModelKernelUnits::deg;
-  double PhiEmec   = 180.  * GeoModelKernelUnits::deg;
+  double ThetaEmec = -90. * Gaudi::Units::deg;
+  double PhiEmec   = 180.  * Gaudi::Units::deg;
 
   GeoTrf::Transform3D MrotEmec(GeoTrf::RotateZ3D(PhiEmec)*GeoTrf::RotateX3D(ThetaEmec));
-  //  GeoTrf::Vector3D pos3Emec(    0*GeoModelKernelUnits::mm,   869.0*GeoModelKernelUnits::mm ,   1720.*GeoModelKernelUnits::mm);
-  GeoTrf::Translate3D pos3Emec(    0*GeoModelKernelUnits::mm,   808.0*GeoModelKernelUnits::mm ,   1720.*GeoModelKernelUnits::mm);
+  //  GeoTrf::Vector3D pos3Emec(    0*Gaudi::Units::mm,   869.0*Gaudi::Units::mm ,   1720.*Gaudi::Units::mm);
+  GeoTrf::Translate3D pos3Emec(    0*Gaudi::Units::mm,   808.0*Gaudi::Units::mm ,   1720.*Gaudi::Units::mm);
 
   //use this line for physical construction of the EMEC outer wheel only:
   EMECConstruction emecConstruction(true, true, true);
@@ -392,11 +392,11 @@ void LArGeo::LArDetectorFactoryH62002::create(GeoPhysVol *world)
   }
   
   
-  double ThetaPS = -90. * GeoModelKernelUnits::deg;
-  double PhiPS   = 180.  * GeoModelKernelUnits::deg;
+  double ThetaPS = -90. * Gaudi::Units::deg;
+  double PhiPS   = 180.  * Gaudi::Units::deg;
   GeoTrf::Transform3D MrotPS(GeoTrf::RotateZ3D(PhiPS)*GeoTrf::RotateX3D(ThetaPS));
-  //GeoTrf::Vector3D pos3PS(    0*GeoModelKernelUnits::mm,   945.5*GeoModelKernelUnits::mm ,   1720.*GeoModelKernelUnits::mm);
-  GeoTrf::Translate3D pos3PS(    0*GeoModelKernelUnits::mm,   888.5*GeoModelKernelUnits::mm ,   1720.*GeoModelKernelUnits::mm);
+  //GeoTrf::Vector3D pos3PS(    0*Gaudi::Units::mm,   945.5*Gaudi::Units::mm ,   1720.*Gaudi::Units::mm);
+  GeoTrf::Translate3D pos3PS(    0*Gaudi::Units::mm,   888.5*Gaudi::Units::mm ,   1720.*Gaudi::Units::mm);
   
   //double zPSpos = -869. -(61. +2. +13.5);
   //std::string PresamplerName = baseName + "::Presampler::";
@@ -420,10 +420,10 @@ void LArGeo::LArDetectorFactoryH62002::create(GeoPhysVol *world)
 
 
   // Add HEC 
-  double ThetaHec = 90. * GeoModelKernelUnits::deg;
-  double PhiHec   = 0.  * GeoModelKernelUnits::deg;
+  double ThetaHec = 90. * Gaudi::Units::deg;
+  double PhiHec   = 0.  * Gaudi::Units::deg;
   GeoTrf::Transform3D MrotHec(GeoTrf::RotateZ3D(PhiHec)*GeoTrf::RotateX3D(ThetaHec));
-  GeoTrf::Translate3D pos3Hec(    0*GeoModelKernelUnits::mm,   233.0*GeoModelKernelUnits::mm ,   1720.*GeoModelKernelUnits::mm);
+  GeoTrf::Translate3D pos3Hec(    0*Gaudi::Units::mm,   233.0*Gaudi::Units::mm ,   1720.*Gaudi::Units::mm);
 
   {    
     HECConstructionH62002 hecConstruction;
diff --git a/LArCalorimeter/LArGeoModel/LArGeoH62002Algs/src/TableConstructionH62002.cxx b/LArCalorimeter/LArGeoModel/LArGeoH62002Algs/src/TableConstructionH62002.cxx
index 8b2d56e9cbf4090da79159c36eb34b74ac318980..ad4bd0b4743dd40f8f43d0aa9e50803461313ad4 100755
--- a/LArCalorimeter/LArGeoModel/LArGeoH62002Algs/src/TableConstructionH62002.cxx
+++ b/LArCalorimeter/LArGeoModel/LArGeoH62002Algs/src/TableConstructionH62002.cxx
@@ -24,7 +24,6 @@
 #include "GeoModelKernel/GeoIdentifierTag.h"  
 #include "GeoModelKernel/GeoSerialDenominator.h"
 #include "GeoModelKernel/GeoDefinitions.h"
-#include "GeoModelKernel/Units.h"
 #include "StoreGate/StoreGateSvc.h"
 #include "GeoModelInterfaces/AbsMaterialManager.h"
 #include "GeoModelInterfaces/StoredMaterialManager.h"
@@ -42,6 +41,7 @@
 #include "StoreGate/StoreGateSvc.h"
 #include "GaudiKernel/MsgStream.h"
 #include "GaudiKernel/Bootstrap.h"
+#include "GaudiKernel/SystemOfUnits.h"
 
 #include <string>
 #include <cmath>
@@ -138,8 +138,8 @@ GeoVPhysVol* LArGeo::TableConstructionH62002::GetEnvelope()
   std::string baseName = "LAr::TBH62002";
   std::string H62002TableName = baseName + "::Table";
 
-  const double H62002TableXY  =  150.*GeoModelKernelUnits::mm;
-  const double H62002TableZ   = 1200.*GeoModelKernelUnits::mm;
+  const double H62002TableXY  =  150.*Gaudi::Units::mm;
+  const double H62002TableZ   = 1200.*Gaudi::Units::mm;
 
 
   GeoBox* H62002TableShape = new GeoBox( H62002TableXY, H62002TableXY, H62002TableZ );   
@@ -156,13 +156,13 @@ GeoVPhysVol* LArGeo::TableConstructionH62002::GetEnvelope()
   log << "Create F1/F2 Scintillators ..." << std::endl;
   
   // Universal size:
-  const double Fx = 10.0*GeoModelKernelUnits::mm;
-  const double Fy = 10.0*GeoModelKernelUnits::mm;
-  const double Fz = 10.0*GeoModelKernelUnits::mm;
+  const double Fx = 10.0*Gaudi::Units::mm;
+  const double Fy = 10.0*Gaudi::Units::mm;
+  const double Fz = 10.0*Gaudi::Units::mm;
 
   std::vector<double> v_ScintZ;
-  v_ScintZ.push_back(2195.*GeoModelKernelUnits::mm); // <--  = btas_pos
-  v_ScintZ.push_back(2320.*GeoModelKernelUnits::mm);
+  v_ScintZ.push_back(2195.*Gaudi::Units::mm); // <--  = btas_pos
+  v_ScintZ.push_back(2320.*Gaudi::Units::mm);
   const double ScintDx = Fx;
   const double ScintDy = Fy;
   const double ScintDz = Fz;
@@ -175,7 +175,7 @@ GeoVPhysVol* LArGeo::TableConstructionH62002::GetEnvelope()
   GeoPhysVol* ScintPhysical = new GeoPhysVol( ScintLogical );    
   for ( unsigned int i = 0; i < v_ScintZ.size(); i++ ) {
     m_H62002TablePhysical->add( new GeoIdentifierTag(i) );
-    m_H62002TablePhysical->add( new GeoTransform( GeoTrf::Translate3D( 0.*GeoModelKernelUnits::cm, 0.*GeoModelKernelUnits::cm, (v_ScintZ[ i ]-H62002TableZ) ) ) );
+    m_H62002TablePhysical->add( new GeoTransform( GeoTrf::Translate3D( 0.*Gaudi::Units::cm, 0.*Gaudi::Units::cm, (v_ScintZ[ i ]-H62002TableZ) ) ) );
     log << MSG::INFO << " Position the F Scintillator at: " << v_ScintZ[ i ] << endmsg ;
     m_H62002TablePhysical->add( ScintPhysical );
   } 
@@ -190,16 +190,16 @@ GeoVPhysVol* LArGeo::TableConstructionH62002::GetEnvelope()
   //------ Get the MWPCs from LArGeoH6Cryostats
   const int MwpcNumber = 3;
   std::vector<double> v_MwpcPos;
-  v_MwpcPos.push_back(105.*GeoModelKernelUnits::mm);
-  v_MwpcPos.push_back(825.*GeoModelKernelUnits::mm); 
-  v_MwpcPos.push_back(1815.*GeoModelKernelUnits::mm);
-  double WireStep = 1.*GeoModelKernelUnits::mm;
+  v_MwpcPos.push_back(105.*Gaudi::Units::mm);
+  v_MwpcPos.push_back(825.*Gaudi::Units::mm); 
+  v_MwpcPos.push_back(1815.*Gaudi::Units::mm);
+  double WireStep = 1.*Gaudi::Units::mm;
   MWPCConstruction mwpcXConstruction (WireStep);
   GeoVPhysVol* mwpcEnvelope = mwpcXConstruction.GetEnvelope();
   for ( int imwpc = 0; imwpc<MwpcNumber ; imwpc++)
     { 
       m_H62002TablePhysical->add(new GeoIdentifierTag(imwpc+2));
-      m_H62002TablePhysical->add( new GeoTransform(GeoTrf::Translate3D( 0.*GeoModelKernelUnits::cm, 0.*GeoModelKernelUnits::cm, (v_MwpcPos[imwpc]-H62002TableZ) ) ) );
+      m_H62002TablePhysical->add( new GeoTransform(GeoTrf::Translate3D( 0.*Gaudi::Units::cm, 0.*Gaudi::Units::cm, (v_MwpcPos[imwpc]-H62002TableZ) ) ) );
       m_H62002TablePhysical->add(mwpcEnvelope);    
     }
   //------ Done with creating an MWPC from LArGeoH6Cryostats
diff --git a/LArCalorimeter/LArGeoModel/LArGeoH62003Algs/src/LArDetectorConstructionH62003.cxx b/LArCalorimeter/LArGeoModel/LArGeoH62003Algs/src/LArDetectorConstructionH62003.cxx
index e613b8c86a7ff588f46474b905402a45b8c941d6..af8b3736e3906ded985fec071d29bd83f6237901 100755
--- a/LArCalorimeter/LArGeoModel/LArGeoH62003Algs/src/LArDetectorConstructionH62003.cxx
+++ b/LArCalorimeter/LArGeoModel/LArGeoH62003Algs/src/LArDetectorConstructionH62003.cxx
@@ -49,17 +49,18 @@
 #include "StoreGate/StoreGateSvc.h"
 #include "GaudiKernel/MsgStream.h"
 #include "GaudiKernel/Bootstrap.h"
+#include "GaudiKernel/SystemOfUnits.h"
 
 #include <string>
 #include <cmath>
 #include <iostream>
 
 using GeoModelKernelUnits::g;
-using GeoModelKernelUnits::cm3;
-using GeoModelKernelUnits::mm;
-using GeoModelKernelUnits::cm;
-using GeoModelKernelUnits::m;
-using GeoModelKernelUnits::deg;
+using Gaudi::Units::cm3;
+using Gaudi::Units::mm;
+using Gaudi::Units::cm;
+using Gaudi::Units::m;
+using Gaudi::Units::deg;
 using GeoTrf::Vector3D;
 using GeoTrf::Transform3D;
 using GeoTrf::Translate3D;
diff --git a/LArCalorimeter/LArGeoModel/LArGeoH62004Algs/src/ExcluderConstructionH62004.cxx b/LArCalorimeter/LArGeoModel/LArGeoH62004Algs/src/ExcluderConstructionH62004.cxx
index 5320788f5ff33c0e9f684a4b686392a49dc511a2..8f7f0914e60b1d69e93b1b20e60d55df7df204dd 100755
--- a/LArCalorimeter/LArGeoModel/LArGeoH62004Algs/src/ExcluderConstructionH62004.cxx
+++ b/LArCalorimeter/LArGeoModel/LArGeoH62004Algs/src/ExcluderConstructionH62004.cxx
@@ -36,6 +36,7 @@
 
 #include "GaudiKernel/MsgStream.h"
 #include "GaudiKernel/Bootstrap.h"
+#include "GaudiKernel/SystemOfUnits.h"
 #include "RDBAccessSvc/IRDBAccessSvc.h"
 #include "RDBAccessSvc/IRDBRecord.h"
 #include "RDBAccessSvc/IRDBRecordset.h"
@@ -99,7 +100,7 @@ GeoVFullPhysVol*  LArGeo::ExcluderConstructionH62004::GetEnvelope() {
   const GeoElement*  H=materialManager->getElement("Hydrogen");
   const GeoElement*  O=materialManager->getElement("Oxygen");
   const GeoElement*  N=materialManager->getElement("Nitrogen");
-  GeoMaterial* Rohacell = new GeoMaterial(name="Rohacell", density=0.112*GeoModelKernelUnits::g/GeoModelKernelUnits::cm3);
+  GeoMaterial* Rohacell = new GeoMaterial(name="Rohacell", density=0.112*GeoModelKernelUnits::g/Gaudi::Units::cm3);
   Rohacell->add(C,0.6465);
   Rohacell->add(H,0.07836);
   Rohacell->add(O,0.19137);
@@ -107,7 +108,7 @@ GeoVFullPhysVol*  LArGeo::ExcluderConstructionH62004::GetEnvelope() {
   Rohacell->lock();
 
   /*
-  a = 12.957*GeoModelKernelUnits::g/GeoModelKernelUnits::mole;                                                       
+  a = 12.957*GeoModelKernelUnits::g/Gaudi::Units::mole;                                                       
   density = 0.112*g/cm3;                                              
   z = 6.18;
   G4Material* Rohacell = new G4Material(name="Rohacell",z, a, density);
@@ -138,20 +139,20 @@ GeoVFullPhysVol*  LArGeo::ExcluderConstructionH62004::GetEnvelope() {
   switch(m_which) {
      case 0: { // EMEC excluder
      // DB values
-     double Rmin = 725.*GeoModelKernelUnits::mm;
-     double Rmin_2 = 780.*GeoModelKernelUnits::mm;
-     double Rmax = 980.*GeoModelKernelUnits::mm;
+     double Rmin = 725.*Gaudi::Units::mm;
+     double Rmin_2 = 780.*Gaudi::Units::mm;
+     double Rmax = 980.*Gaudi::Units::mm;
 
-     double Zall = 626*GeoModelKernelUnits::mm;
-     double Zback = 91*GeoModelKernelUnits::mm;
-     double Zfront = 60*GeoModelKernelUnits::mm;
+     double Zall = 626*Gaudi::Units::mm;
+     double Zback = 91*Gaudi::Units::mm;
+     double Zfront = 60*Gaudi::Units::mm;
 
-     double alpha = 22.5*GeoModelKernelUnits::degree;
-     double beta  = 6.375*GeoModelKernelUnits::degree; 
+     double alpha = 22.5*Gaudi::Units::degree;
+     double beta  = 6.375*Gaudi::Units::degree; 
 
 
 //     double gamma = 8.589*degree;
-     double delta = 2.720*GeoModelKernelUnits::degree;
+     double delta = 2.720*Gaudi::Units::degree;
 
 //  solidEx = new GeoTubs("MotherEx",Rmin,Rmax,Zall/2.,-(alpha+gamma), 2*(alpha+gamma));
 //     GeoTubs* solidEx = new GeoTubs(Rmin,Rmax,Zall/2.,-(alpha+beta), 2*(alpha+beta));
@@ -209,30 +210,30 @@ GeoVFullPhysVol*  LArGeo::ExcluderConstructionH62004::GetEnvelope() {
 	     }
      case 1 : { // FCAL excluder
 
-                double Rmax = 335.*GeoModelKernelUnits::mm;
-//                double Rmax_1 = 253.*GeoModelKernelUnits::mm;
-                double bepo_Beta = 4.668*GeoModelKernelUnits::degree; // DB !!!
-		double bepo_ty = 90.0*GeoModelKernelUnits::degree; // DB !!
-
-//                double Zall = (1021.4/2.)*GeoModelKernelUnits::mm;
-                double Zall = (912./2.)*GeoModelKernelUnits::mm;
-//		double Zpara = (168.47/2.)*GeoModelKernelUnits::mm;
-//		double Zpara = (247.87/2.)*GeoModelKernelUnits::mm;
-		double Xall = (171./2.)*GeoModelKernelUnits::mm;
-		double Yall = (300./2.)*GeoModelKernelUnits::mm;
+                double Rmax = 335.*Gaudi::Units::mm;
+//                double Rmax_1 = 253.*Gaudi::Units::mm;
+                double bepo_Beta = 4.668*Gaudi::Units::degree; // DB !!!
+		double bepo_ty = 90.0*Gaudi::Units::degree; // DB !!
+
+//                double Zall = (1021.4/2.)*Gaudi::Units::mm;
+                double Zall = (912./2.)*Gaudi::Units::mm;
+//		double Zpara = (168.47/2.)*Gaudi::Units::mm;
+//		double Zpara = (247.87/2.)*Gaudi::Units::mm;
+		double Xall = (171./2.)*Gaudi::Units::mm;
+		double Yall = (300./2.)*Gaudi::Units::mm;
 		double Rmax_1 = Rmax - 2.*Zall*tan(bepo_Beta);
 
-		GeoPara *pEx = new GeoPara(Zall,Yall,Xall,0*GeoModelKernelUnits::degree,bepo_Beta,0.*GeoModelKernelUnits::degree);
+		GeoPara *pEx = new GeoPara(Zall,Yall,Xall,0*Gaudi::Units::degree,bepo_Beta,0.*Gaudi::Units::degree);
 		GeoCons *tEx = new GeoCons(0.,0.,Rmax,Rmax_1,Zall,0.,M_PI);
 		GeoBox  *box = new GeoBox(Yall,Xall,Zall);
                 GeoTrf::RotateX3D Rot(bepo_Beta);
-		GeoTrf::Translation3D  trans1(0., sqrt(Rmax_1*Rmax_1 - Yall*Yall) + Xall + Zall*tan(bepo_Beta),  0*GeoModelKernelUnits::mm);
+		GeoTrf::Translation3D  trans1(0., sqrt(Rmax_1*Rmax_1 - Yall*Yall) + Xall + Zall*tan(bepo_Beta),  0*Gaudi::Units::mm);
 		GeoTrf::Transform3D offset = trans1 * Rot;
 		const GeoShapeIntersection  &is = (*tEx).intersect(*box<<offset);
 
 		GeoTrf::Transform3D Rot1 = GeoTrf::RotateX3D(bepo_Beta) * GeoTrf::RotateZ3D(bepo_ty) * GeoTrf::RotateY3D(bepo_ty);
-//		G4ThreeVector  translation(0., (203.74-168.47/2.)*GeoModelKernelUnits::mm, 0.*GeoModelKernelUnits::mm);
-		GeoTrf::Translation3D  translation(0., sqrt(Rmax_1*Rmax_1 - Yall*Yall)-Xall+Zall*tan(bepo_Beta),0.*GeoModelKernelUnits::mm);
+//		G4ThreeVector  translation(0., (203.74-168.47/2.)*Gaudi::Units::mm, 0.*Gaudi::Units::mm);
+		GeoTrf::Translation3D  translation(0., sqrt(Rmax_1*Rmax_1 - Yall*Yall)-Xall+Zall*tan(bepo_Beta),0.*Gaudi::Units::mm);
 		GeoTrf::Transform3D offset1 = translation * Rot1;
 		const GeoShapeUnion  &us = is.add(*pEx<<offset1);  
 		std::string bExName = "LArGeoTB::FCAL::Excluder";
@@ -245,19 +246,19 @@ GeoVFullPhysVol*  LArGeo::ExcluderConstructionH62004::GetEnvelope() {
 
 
 //                double Rmax = bcry_rlar;
-                double Rmax =  125.5*GeoModelKernelUnits::cm; // DB !!!
-		double bepo_Beta = 4.668*GeoModelKernelUnits::degree; // DB !!!
+                double Rmax =  125.5*Gaudi::Units::cm; // DB !!!
+		double bepo_Beta = 4.668*Gaudi::Units::degree; // DB !!!
 
-                double Zall = (1200./2.)*GeoModelKernelUnits::mm;
-		double angle = 32.*GeoModelKernelUnits::degree;
-//		double Xall = 119.35*GeoModelKernelUnits::cm;
+                double Zall = (1200./2.)*Gaudi::Units::mm;
+		double angle = 32.*Gaudi::Units::degree;
+//		double Xall = 119.35*Gaudi::Units::cm;
 		double Xall = Rmax*cos(angle/2);
 		double Yall = Rmax*sin(angle/2);
 
 		GeoTubs *tEx = new GeoTubs(0.,Rmax,Zall,-angle/2.,angle);
 		GeoPara  *box = new GeoPara(Xall,Yall,1.1*Zall,0.,-bepo_Beta,0.);
 
-		GeoTrf::Translate3D offset(0., 0.*GeoModelKernelUnits::mm, 0*GeoModelKernelUnits::mm);
+		GeoTrf::Translate3D offset(0., 0.*Gaudi::Units::mm, 0*Gaudi::Units::mm);
 		const GeoShapeSubtraction &is = (*tEx).subtract((*box)<<(offset));
 //		G4UnionSolid *is = new G4UnionSolid("isEx",tEx,box,Rot,trans1);
 		std::string FrontExName = "LArGeoTB::Front::Excluder";
@@ -268,18 +269,18 @@ GeoVFullPhysVol*  LArGeo::ExcluderConstructionH62004::GetEnvelope() {
      case 3 : { // Back excluder
 
 //                double Rmax = bcry_rlar;
-		double Rmax =  125.5*GeoModelKernelUnits::cm; // DB !!!
+		double Rmax =  125.5*Gaudi::Units::cm; // DB !!!
 
 
-                double Zall = (1600./2.)*GeoModelKernelUnits::mm;
-		double angle = 58.*GeoModelKernelUnits::degree;
+                double Zall = (1600./2.)*Gaudi::Units::mm;
+		double angle = 58.*Gaudi::Units::degree;
 		double Xall = Rmax*cos(angle/2.);
 		double Yall = Rmax*sin(angle/2.);
 
 		GeoTubs *tEx = new GeoTubs(0.,Rmax,Zall,0.,angle);
 		GeoBox  *box = new GeoBox(Xall,Yall,1.1*Zall);
 		GeoTrf::RotateZ3D Rot(angle/2.);
-		GeoTrf::Translation3D  trans1(0., 0.*GeoModelKernelUnits::mm,  0*GeoModelKernelUnits::mm);
+		GeoTrf::Translation3D  trans1(0., 0.*Gaudi::Units::mm,  0*Gaudi::Units::mm);
 		GeoTrf::Transform3D offset = trans1 * Rot;
 		const GeoShapeSubtraction &is = (*tEx).subtract((*box)<<(offset));
 		std::string BackExName = "LArGeoTB::Back::Excluder";
diff --git a/LArCalorimeter/LArGeoModel/LArGeoH62004Algs/src/FCALConstructionH62004.cxx b/LArCalorimeter/LArGeoModel/LArGeoH62004Algs/src/FCALConstructionH62004.cxx
index 3413f1c2bab43dd879dac6153bd1154e59c17736..37f0b782c25138cb3e569316ba9b07bba4ecb522 100755
--- a/LArCalorimeter/LArGeoModel/LArGeoH62004Algs/src/FCALConstructionH62004.cxx
+++ b/LArCalorimeter/LArGeoModel/LArGeoH62004Algs/src/FCALConstructionH62004.cxx
@@ -55,6 +55,7 @@
 // For units:
 #include "GaudiKernel/MsgStream.h"
 #include "GaudiKernel/Bootstrap.h"
+#include "GaudiKernel/SystemOfUnits.h"
 #include <string>
 #include <cmath>
 #include <cfloat>
@@ -214,13 +215,13 @@ GeoVFullPhysVol* LArGeo::FCALConstructionH62004::GetEnvelope()
   std::string baseName = "LAr::FCAL::";
 
   double fcalHalfDepth=0;
-  double startZFCal1 = (*m_fcalMod)[0]->getDouble("STARTPOSITION"); //466.85 * GeoModelKernelUnits::cm;
-  double startZFCal2 = (*m_fcalMod)[1]->getDouble("STARTPOSITION"); //512.83 * GeoModelKernelUnits::cm;
-  double startZFCal3 = (*m_fcalMod)[2]->getDouble("STARTPOSITION"); //560.28 * GeoModelKernelUnits::cm;
+  double startZFCal1 = (*m_fcalMod)[0]->getDouble("STARTPOSITION"); //466.85 * Gaudi::Units::cm;
+  double startZFCal2 = (*m_fcalMod)[1]->getDouble("STARTPOSITION"); //512.83 * Gaudi::Units::cm;
+  double startZFCal3 = (*m_fcalMod)[2]->getDouble("STARTPOSITION"); //560.28 * Gaudi::Units::cm;
 
   // Should go to Db (change FCalNominals ????)
-  double fcalstartPhi = 90.*GeoModelKernelUnits::deg;
-  double fcaldeltaPhi = 90.*GeoModelKernelUnits::deg;
+  double fcalstartPhi = 90.*Gaudi::Units::deg;
+  double fcaldeltaPhi = 90.*Gaudi::Units::deg;
   // FCAL VOLUME.  IT DOES NOT INCLUDE THE COPPER PLUG, ONLY THE LAR AND MODS 1-3
   {
 
@@ -275,17 +276,17 @@ GeoVFullPhysVol* LArGeo::FCALConstructionH62004::GetEnvelope()
       // 16 Troughs representing  Cable Harnesses:
       if(m_absPhysical1==0)
 	{
-	  double troughDepth       = 0.9999 * GeoModelKernelUnits::cm;
+	  double troughDepth       = 0.9999 * Gaudi::Units::cm;
 	  double outerRadius       = fcalData[0].outerModuleRadius;
 	  double innerRadius       = outerRadius - troughDepth;
 	  double halfLength        = fcalData[0].fullModuleDepth/ 2.0;
-	  double deltaPhi          = 5.625 * GeoModelKernelUnits::deg;
-	  double startPhi          = 11.25 * GeoModelKernelUnits::deg - deltaPhi/2.0;
+	  double deltaPhi          = 5.625 * Gaudi::Units::deg;
+	  double startPhi          = 11.25 * Gaudi::Units::deg - deltaPhi/2.0;
 	  GeoTubs * tubs = new GeoTubs(innerRadius,outerRadius,halfLength,startPhi,deltaPhi );
 	  GeoLogVol *logVol = new GeoLogVol(baseName+"Module1::CableTrough",tubs,FCalCableHarness);
 	  GeoPhysVol *physVol = new GeoPhysVol(logVol);
 	  GeoGenfun::Variable i;
-	  GeoGenfun::GENFUNCTION rotationAngle = fcalstartPhi + 22.5*GeoModelKernelUnits::deg*i;
+	  GeoGenfun::GENFUNCTION rotationAngle = fcalstartPhi + 22.5*Gaudi::Units::deg*i;
 	  GeoXF::TRANSFUNCTION xf = GeoXF::Pow(GeoTrf::RotateZ3D(1.0),rotationAngle);
 	  GeoSerialTransformer *st = new GeoSerialTransformer(physVol,&xf,4);
 	  modPhysical->add(st);
@@ -296,7 +297,7 @@ GeoVFullPhysVol* LArGeo::FCALConstructionH62004::GetEnvelope()
 	  double halfDepth    = fcalData[0].fullGapDepth/2.0;
 	  double innerRadius  = fcalData[0].innerGapRadius;
 	  double outerRadius  = fcalData[0].outerGapRadius;
-	  GeoTubs *tubs       = new GeoTubs(innerRadius,outerRadius,halfDepth, 0.*GeoModelKernelUnits::deg, 360.*GeoModelKernelUnits::deg);
+	  GeoTubs *tubs       = new GeoTubs(innerRadius,outerRadius,halfDepth, 0.*Gaudi::Units::deg, 360.*Gaudi::Units::deg);
 	  GeoLogVol *logVol   = new GeoLogVol(baseName + "Module1::Gap",tubs, LAr);
 	  GeoPhysVol *physVol = new GeoPhysVol(logVol);
 	  
@@ -327,7 +328,7 @@ GeoVFullPhysVol* LArGeo::FCALConstructionH62004::GetEnvelope()
 	      if (m_VisLimit != -1 && (counter++ > m_VisLimit)) continue;
 	      //std::cout<<thisTileStr<<" "<<thisTubeX<<" "<<thisTubeY<<std::endl;
 	      
-	      GeoTransform *xf = new GeoTransform(GeoTrf::Translate3D(thisTubeX*GeoModelKernelUnits::cm, thisTubeY*GeoModelKernelUnits::cm,0));
+	      GeoTransform *xf = new GeoTransform(GeoTrf::Translate3D(thisTubeX*Gaudi::Units::cm, thisTubeY*Gaudi::Units::cm,0));
 	      modPhysical->add(xf);
 	      modPhysical->add(physVol);
 	    }
@@ -371,17 +372,17 @@ GeoVFullPhysVol* LArGeo::FCALConstructionH62004::GetEnvelope()
       // 16 Troughs representing  Cable Harnesses:
       if(m_absPhysical2==0)
 	{
-	  double troughDepth       = 1.0 * GeoModelKernelUnits::cm;
+	  double troughDepth       = 1.0 * Gaudi::Units::cm;
 	  double outerRadius       = fcalData[1].outerModuleRadius;
 	  double innerRadius       = outerRadius - troughDepth;
 	  double halfLength        = fcalData[1].fullModuleDepth/ 2.0;
-	  double deltaPhi          = 5.625 * GeoModelKernelUnits::deg;
-	  double startPhi          = 11.25 * GeoModelKernelUnits::deg - deltaPhi/2.0;
+	  double deltaPhi          = 5.625 * Gaudi::Units::deg;
+	  double startPhi          = 11.25 * Gaudi::Units::deg - deltaPhi/2.0;
 	  GeoTubs * tubs = new GeoTubs(innerRadius,outerRadius,halfLength,startPhi,deltaPhi );
 	  GeoLogVol *logVol = new GeoLogVol(baseName+"Module2::CableTrough",tubs,FCalCableHarness);
 	  GeoPhysVol *physVol = new GeoPhysVol(logVol);
 	  GeoGenfun::Variable i;
-	  GeoGenfun::GENFUNCTION rotationAngle = fcalstartPhi + 22.5*GeoModelKernelUnits::deg*i;
+	  GeoGenfun::GENFUNCTION rotationAngle = fcalstartPhi + 22.5*Gaudi::Units::deg*i;
 	  GeoXF::TRANSFUNCTION xf = GeoXF::Pow(GeoTrf::RotateZ3D(1.0),rotationAngle);
 	  GeoSerialTransformer *st = new GeoSerialTransformer(physVol,&xf,4);
 	  modPhysical->add(st);
@@ -431,7 +432,7 @@ GeoVFullPhysVol* LArGeo::FCALConstructionH62004::GetEnvelope()
 	    
 	    if (m_VisLimit!=-1 && (counter++ > m_VisLimit)) continue;
 	    
-	    GeoTransform *xf = new GeoTransform(GeoTrf::Translate3D(thisTubeX*GeoModelKernelUnits::cm, thisTubeY*GeoModelKernelUnits::cm,0));
+	    GeoTransform *xf = new GeoTransform(GeoTrf::Translate3D(thisTubeX*Gaudi::Units::cm, thisTubeY*Gaudi::Units::cm,0));
 	    modPhysical->add(xf);
 	    modPhysical->add(gapPhys);
 	  }
@@ -452,7 +453,7 @@ GeoVFullPhysVol* LArGeo::FCALConstructionH62004::GetEnvelope()
 
 	// We need few more materials
 	// ColdTC effective absorber: Cu with a little bit of inactive argon
-	GeoMaterial *thisAbsorber = new GeoMaterial("ColdTCAbsorber",8.701*GeoModelKernelUnits::g/GeoModelKernelUnits::cm3);
+	GeoMaterial *thisAbsorber = new GeoMaterial("ColdTCAbsorber",8.701*GeoModelKernelUnits::g/Gaudi::Units::cm3);
 	thisAbsorber->add(Copper,0.994);
 	thisAbsorber->add(LAr,0.006);
 	thisAbsorber->lock();
@@ -487,8 +488,8 @@ GeoVFullPhysVol* LArGeo::FCALConstructionH62004::GetEnvelope()
 	double outerRadius     = fcalData[2].outerGapRadius;
 
 	// Where in DB should go this ?
-	double ElectrodeDepth = 0.85*GeoModelKernelUnits::cm;
-        double ActiveDepth = 0.2*GeoModelKernelUnits::cm;
+	double ElectrodeDepth = 0.85*Gaudi::Units::cm;
+        double ActiveDepth = 0.2*Gaudi::Units::cm;
 
 	// big argon gap solid
 	GeoTubs *gapSolid = new GeoTubs(innerRadius,outerRadius,halfDepth, fcalstartPhi, fcaldeltaPhi);
@@ -506,13 +507,13 @@ GeoVFullPhysVol* LArGeo::FCALConstructionH62004::GetEnvelope()
 
 	// active gaps in electrode
 	int iCopy = 1;
-	double zPos = -ElectrodeDepth/2. + 1.5 * GeoModelKernelUnits::mm + ActiveDepth/2.;
+	double zPos = -ElectrodeDepth/2. + 1.5 * Gaudi::Units::mm + ActiveDepth/2.;
 	GeoTransform *t1 = new GeoTransform(GeoTrf::Translate3D(0.,0.,zPos));
 	electrodePhys->add(new GeoSerialIdentifier(iCopy));
 	electrodePhys->add(t1);
 	electrodePhys->add(activePhys);
 	++iCopy;
-	zPos += 3.5 * GeoModelKernelUnits::mm;
+	zPos += 3.5 * Gaudi::Units::mm;
 	electrodePhys->add(new GeoSerialIdentifier(iCopy));
 	electrodePhys->add(t1);
 	electrodePhys->add(activePhys);
@@ -523,12 +524,12 @@ GeoVFullPhysVol* LArGeo::FCALConstructionH62004::GetEnvelope()
 	gapPhys->add(t2);
 	gapPhys->add(electrodePhys);
 	// big gaps in copper block
-        zPos = -fcalData[2].fullModuleDepth/2. + 2.2 * GeoModelKernelUnits::cm + halfDepth; 
+        zPos = -fcalData[2].fullModuleDepth/2. + 2.2 * Gaudi::Units::cm + halfDepth; 
         for ( iCopy = 1; iCopy < 9; ++iCopy ){
 	  modPhysical->add(new GeoSerialIdentifier(iCopy)); 
 	  modPhysical->add(new GeoTransform(GeoTrf::Translate3D(0.,0.,zPos)));
 	  modPhysical->add(gapPhys);
-	  zPos += 3.5*GeoModelKernelUnits::cm;
+	  zPos += 3.5*Gaudi::Units::cm;
 	}
 	m_absPhysical3 = modPhysical;
      }
diff --git a/LArCalorimeter/LArGeoModel/LArGeoH62004Algs/src/FrontBeamConstructionH62004.cxx b/LArCalorimeter/LArGeoModel/LArGeoH62004Algs/src/FrontBeamConstructionH62004.cxx
index fa4dba728df4fde477ac82380e3d1d48da1665b2..0a61111efd353160515d833c3cd8281c63d61908 100755
--- a/LArCalorimeter/LArGeoModel/LArGeoH62004Algs/src/FrontBeamConstructionH62004.cxx
+++ b/LArCalorimeter/LArGeoModel/LArGeoH62004Algs/src/FrontBeamConstructionH62004.cxx
@@ -24,7 +24,6 @@
 #include "GeoModelKernel/GeoAlignableTransform.h"  
 #include "GeoModelKernel/GeoIdentifierTag.h"  
 #include "GeoModelKernel/GeoDefinitions.h"
-#include "GeoModelKernel/Units.h"
 #include "StoreGate/StoreGateSvc.h"
 #include "GeoModelInterfaces/AbsMaterialManager.h"
 #include "GeoModelInterfaces/StoredMaterialManager.h"
@@ -40,6 +39,7 @@
 
 #include "GaudiKernel/MsgStream.h"
 #include "GaudiKernel/Bootstrap.h"
+#include "GaudiKernel/SystemOfUnits.h"
 
 #include <string>
 #include <cmath>
@@ -123,14 +123,14 @@ GeoVPhysVol* LArGeo::FrontBeamConstructionH62004::GetEnvelope()
   // Define dimension of Front part & position of Front part
   //
   // DB ?
-  const double bard_x = 20.0*GeoModelKernelUnits::cm;
-  const double bard_y = 20.0*GeoModelKernelUnits::cm;
-  //const double bard_z = 35.0*GeoModelKernelUnits::cm;
-  const double bard_z = 100.0*GeoModelKernelUnits::cm;
-  const double fbpc_z[2] = {60.4*GeoModelKernelUnits::cm,112.7*GeoModelKernelUnits::cm};
+  const double bard_x = 20.0*Gaudi::Units::cm;
+  const double bard_y = 20.0*Gaudi::Units::cm;
+  //const double bard_z = 35.0*Gaudi::Units::cm;
+  const double bard_z = 100.0*Gaudi::Units::cm;
+  const double fbpc_z[2] = {60.4*Gaudi::Units::cm,112.7*Gaudi::Units::cm};
   // Position in exp_hall
-  //const double z_bard=-2160.0*GeoModelKernelUnits::cm+80.1*GeoModelKernelUnits::cm+16.*GeoModelKernelUnits::cm+bard_z;
-  //const double z_bardm=-2160.0*GeoModelKernelUnits::cm+1362.3*GeoModelKernelUnits::cm;
+  //const double z_bard=-2160.0*Gaudi::Units::cm+80.1*Gaudi::Units::cm+16.*Gaudi::Units::cm+bard_z;
+  //const double z_bardm=-2160.0*Gaudi::Units::cm+1362.3*Gaudi::Units::cm;
 
 
 
@@ -144,27 +144,27 @@ GeoVPhysVol* LArGeo::FrontBeamConstructionH62004::GetEnvelope()
   //   In the old stand-alone code, all three were round with a radius of 5cm 
   //   and 7.5mm thickness.
   //   Logbooks in the control-room say that their xyz sizes are:
-  //   B1   : 30 x 30 x 10 GeoModelKernelUnits::mm
-  //   W1,2 : 150 x 150 x 10 GeoModelKernelUnits::mm
+  //   B1   : 30 x 30 x 10 Gaudi::Units::mm
+  //   W1,2 : 150 x 150 x 10 Gaudi::Units::mm
   // They are certainly not round, so stick with the logbook values 
   // The beam sees the instrumentation in the following order:
   // W1, W2, B1, MWPC5
 
   log << MSG::INFO << "Create Front Scintillators ..." << endmsg;
   
-  const double Wxy=  75.0*GeoModelKernelUnits::mm;
-  const double Wz =   5.0*GeoModelKernelUnits::mm;
-  const double Bxy=  15.0*GeoModelKernelUnits::mm;
-  const double Bz =   5.0*GeoModelKernelUnits::mm;
+  const double Wxy=  75.0*Gaudi::Units::mm;
+  const double Wz =   5.0*Gaudi::Units::mm;
+  const double Bxy=  15.0*Gaudi::Units::mm;
+  const double Bz =   5.0*Gaudi::Units::mm;
 
   std::vector<double> v_ScintXY;
   std::vector<double> v_ScintZ;
   v_ScintXY.push_back(Wxy);
   v_ScintXY.push_back(Wxy); 
   v_ScintXY.push_back(Bxy); 
-  v_ScintZ.push_back(10.*GeoModelKernelUnits::mm); 
-  v_ScintZ.push_back(40.*GeoModelKernelUnits::mm); 
-  v_ScintZ.push_back(180.*GeoModelKernelUnits::mm);
+  v_ScintZ.push_back(10.*Gaudi::Units::mm); 
+  v_ScintZ.push_back(40.*Gaudi::Units::mm); 
+  v_ScintZ.push_back(180.*Gaudi::Units::mm);
 
    // Create one Scintillator and place it twice along z:
  
@@ -179,7 +179,7 @@ GeoVPhysVol* LArGeo::FrontBeamConstructionH62004::GetEnvelope()
   //BScintPhysical->add( new GeoNameTag(ScintName) );
   for ( unsigned int i = 0; i < v_ScintZ.size(); i++ ) {
     m_H62004FrontBeamPhysical->add( new GeoIdentifierTag(i+1) );
-    m_H62004FrontBeamPhysical->add( new GeoTransform( GeoTrf::Translate3D( 0.*GeoModelKernelUnits::cm, 0.*GeoModelKernelUnits::cm, (v_ScintZ[ i ]-bard_z) ) ) ) ;     m_H62004FrontBeamPhysical->add( new GeoNameTag(ScintName) );
+    m_H62004FrontBeamPhysical->add( new GeoTransform( GeoTrf::Translate3D( 0.*Gaudi::Units::cm, 0.*Gaudi::Units::cm, (v_ScintZ[ i ]-bard_z) ) ) ) ;     m_H62004FrontBeamPhysical->add( new GeoNameTag(ScintName) );
 
     switch(i) {
     case 0: case 1: { m_H62004FrontBeamPhysical->add( WScintPhysical ); break; }
@@ -195,13 +195,13 @@ GeoVPhysVol* LArGeo::FrontBeamConstructionH62004::GetEnvelope()
   //------ Now create MWPC5 
   log << MSG::INFO << " Create MWPC5 " << endmsg;
   
-  MWPCConstruction MWPC5 (2.*GeoModelKernelUnits::mm);
+  MWPCConstruction MWPC5 (2.*Gaudi::Units::mm);
   GeoVPhysVol* MwpcPhysical = MWPC5.GetEnvelope();
 
-  const double MwpcPos = 445.*GeoModelKernelUnits::mm;
+  const double MwpcPos = 445.*Gaudi::Units::mm;
 
   m_H62004FrontBeamPhysical->add( new GeoIdentifierTag(5) );
-  m_H62004FrontBeamPhysical->add( new GeoTransform(GeoTrf::Translate3D( 0.*GeoModelKernelUnits::cm, 0.*GeoModelKernelUnits::cm, (MwpcPos-bard_z) ) ) );
+  m_H62004FrontBeamPhysical->add( new GeoTransform(GeoTrf::Translate3D( 0.*Gaudi::Units::cm, 0.*Gaudi::Units::cm, (MwpcPos-bard_z) ) ) );
   m_H62004FrontBeamPhysical->add( MwpcPhysical );
 
   //----- Done with the MWPC
@@ -213,7 +213,7 @@ GeoVPhysVol* LArGeo::FrontBeamConstructionH62004::GetEnvelope()
   GeoVPhysVol* BPCPhysical = BPC.GetEnvelope();
   for(int i=1; i<3; ++i) {
      m_H62004FrontBeamPhysical->add( new GeoIdentifierTag(i) );
-     m_H62004FrontBeamPhysical->add( new GeoTransform(GeoTrf::Translate3D( 0.*GeoModelKernelUnits::cm, 0.*GeoModelKernelUnits::cm, (MwpcPos-bard_z) + fbpc_z[i-1]) ) );
+     m_H62004FrontBeamPhysical->add( new GeoTransform(GeoTrf::Translate3D( 0.*Gaudi::Units::cm, 0.*Gaudi::Units::cm, (MwpcPos-bard_z) + fbpc_z[i-1]) ) );
      m_H62004FrontBeamPhysical->add(BPCPhysical);
   }
 
diff --git a/LArCalorimeter/LArGeoModel/LArGeoH62004Algs/src/HECConstructionH62004.cxx b/LArCalorimeter/LArGeoModel/LArGeoH62004Algs/src/HECConstructionH62004.cxx
index d1c4ba5bb72c6e02ec9197999be33191e584c0ea..ad4fdaa39c1a3da4f7a3e6b16662580af1ac0470 100755
--- a/LArCalorimeter/LArGeoModel/LArGeoH62004Algs/src/HECConstructionH62004.cxx
+++ b/LArCalorimeter/LArGeoModel/LArGeoH62004Algs/src/HECConstructionH62004.cxx
@@ -23,7 +23,6 @@
 #include "GeoModelKernel/GeoIdentifierTag.h"  
 #include "GeoModelKernel/GeoShapeUnion.h"  
 #include "GeoModelKernel/GeoDefinitions.h"  
-#include "GeoModelKernel/Units.h"  
 #include "GeoGenericFunctions/AbsFunction.h"
 #include "GeoGenericFunctions/Variable.h"
 #include "GeoGenericFunctions/Sin.h"
@@ -36,6 +35,7 @@
 
 #include "GaudiKernel/MsgStream.h"
 #include "GaudiKernel/Bootstrap.h"
+#include "GaudiKernel/SystemOfUnits.h"
 #include "RDBAccessSvc/IRDBAccessSvc.h"
 #include "RDBAccessSvc/IRDBRecord.h"
 #include "RDBAccessSvc/IRDBRecordset.h"
@@ -146,57 +146,57 @@ GeoVFullPhysVol* LArGeo::HECConstructionH62004::GetEnvelope()
 
   double zCoordinate[6],innerRadius[6],outerRadius[6];
 
-  double absorberPosY = 1.02*GeoModelKernelUnits::cm;            
-  double PosYcorr = 0.005*GeoModelKernelUnits::cm;            
+  double absorberPosY = 1.02*Gaudi::Units::cm;            
+  double PosYcorr = 0.005*Gaudi::Units::cm;            
 
   const double moduleNumber   = (*hadronicEndcap)[0]->getInt("NSCT"); // 32 Modules
   unsigned int TBmoduleNumber = 8;
-  double moduleRinner1  = (*hecLongitudinalBlock)[0]->getDouble("BLRMN")*GeoModelKernelUnits::cm; // 37.2*GeoModelKernelUnits::cm Inner Radius 
-  double moduleRinner2  = (*hecLongitudinalBlock)[1]->getDouble("BLRMN")*GeoModelKernelUnits::cm; // 47.5*GeoModelKernelUnits::cm
-  //double moduleRouter   = (*hecLongitudinalBlock)[0]->getDouble("BLRMX")*GeoModelKernelUnits::cm; //203.*GeoModelKernelUnits::cm Outer Radius
-  double copperPad      = (*hadronicEndcap)[0]->getDouble("COPPER")*GeoModelKernelUnits::cm; // 0.003.*GeoModelKernelUnits::cm 
-  double gapSize        = (*hadronicEndcap)[0]->getDouble("LARG")*GeoModelKernelUnits::cm; // 8.5*GeoModelKernelUnits::mm
-  double betweenWheel   = (*hadronicEndcap)[0]->getDouble("GAPWHL")*GeoModelKernelUnits::cm-0.001*GeoModelKernelUnits::cm; //40.5*GeoModelKernelUnits::mm
+  double moduleRinner1  = (*hecLongitudinalBlock)[0]->getDouble("BLRMN")*Gaudi::Units::cm; // 37.2*Gaudi::Units::cm Inner Radius 
+  double moduleRinner2  = (*hecLongitudinalBlock)[1]->getDouble("BLRMN")*Gaudi::Units::cm; // 47.5*Gaudi::Units::cm
+  //double moduleRouter   = (*hecLongitudinalBlock)[0]->getDouble("BLRMX")*Gaudi::Units::cm; //203.*Gaudi::Units::cm Outer Radius
+  double copperPad      = (*hadronicEndcap)[0]->getDouble("COPPER")*Gaudi::Units::cm; // 0.003.*Gaudi::Units::cm 
+  double gapSize        = (*hadronicEndcap)[0]->getDouble("LARG")*Gaudi::Units::cm; // 8.5*Gaudi::Units::mm
+  double betweenWheel   = (*hadronicEndcap)[0]->getDouble("GAPWHL")*Gaudi::Units::cm-0.001*Gaudi::Units::cm; //40.5*Gaudi::Units::mm
   int indexloop,index;
   for (indexloop=0; indexloop < depthNumber; ++indexloop){
-    depthSize[indexloop]    = (*hecLongitudinalBlock)[indexloop]->getDouble("BLDPTH")*GeoModelKernelUnits::cm; 
-    firstAbsorber[indexloop]= (*hecLongitudinalBlock)[indexloop]->getDouble("PLATE0")*GeoModelKernelUnits::cm; 
+    depthSize[indexloop]    = (*hecLongitudinalBlock)[indexloop]->getDouble("BLDPTH")*Gaudi::Units::cm; 
+    firstAbsorber[indexloop]= (*hecLongitudinalBlock)[indexloop]->getDouble("PLATE0")*Gaudi::Units::cm; 
     gapNumber[indexloop]    = (int) (*hecLongitudinalBlock)[indexloop]->getDouble("BLMOD"); // 4 or 8 
   }
 
   std::string sidx[4]={"_0","_1","_2","_3"};
 
   for (indexloop=0; indexloop < 3; ++indexloop){
-    kaptonPosition[indexloop] = (*hadronicEndcap)[0]->getDouble("KPTPOS" + sidx[indexloop])*GeoModelKernelUnits::cm; 
-    kaptonWidth[indexloop]    = (*hadronicEndcap)[0]->getDouble("KPTWID" + sidx[indexloop])*GeoModelKernelUnits::cm; 
+    kaptonPosition[indexloop] = (*hadronicEndcap)[0]->getDouble("KPTPOS" + sidx[indexloop])*Gaudi::Units::cm; 
+    kaptonWidth[indexloop]    = (*hadronicEndcap)[0]->getDouble("KPTWID" + sidx[indexloop])*Gaudi::Units::cm; 
   }
 
   for (indexloop=0; indexloop < 4; ++indexloop){
-    tieRodPositionX[indexloop] = (*hadronicEndcap)[0]->getDouble("RODPOSX" + sidx[indexloop])*GeoModelKernelUnits::cm; 
-    tieRodPositionY[indexloop] = (*hadronicEndcap)[0]->getDouble("RODPOSR" + sidx[indexloop])*GeoModelKernelUnits::cm; 
+    tieRodPositionX[indexloop] = (*hadronicEndcap)[0]->getDouble("RODPOSX" + sidx[indexloop])*Gaudi::Units::cm; 
+    tieRodPositionY[indexloop] = (*hadronicEndcap)[0]->getDouble("RODPOSR" + sidx[indexloop])*Gaudi::Units::cm; 
   }
 
   for (indexloop=0; indexloop < 2; ++indexloop){
-    tieRodDiameter[indexloop] = (*hadronicEndcap)[0]->getDouble("RODDIM" + sidx[indexloop])*GeoModelKernelUnits::cm; 
-    spacerDiameter[indexloop] = (*hadronicEndcap)[0]->getDouble("SPCDIM" + sidx[indexloop])*GeoModelKernelUnits::cm; 
+    tieRodDiameter[indexloop] = (*hadronicEndcap)[0]->getDouble("RODDIM" + sidx[indexloop])*Gaudi::Units::cm; 
+    spacerDiameter[indexloop] = (*hadronicEndcap)[0]->getDouble("SPCDIM" + sidx[indexloop])*Gaudi::Units::cm; 
   }
 
-  double absorberZ1 = (*hadronicEndcap)[0]->getDouble("PLATE_0")*GeoModelKernelUnits::cm; // 2.5*GeoModelKernelUnits::cm;
-  double absorberZ2 = (*hadronicEndcap)[0]->getDouble("PLATE_1")*GeoModelKernelUnits::cm; //5.0*GeoModelKernelUnits::cm;
+  double absorberZ1 = (*hadronicEndcap)[0]->getDouble("PLATE_0")*Gaudi::Units::cm; // 2.5*Gaudi::Units::cm;
+  double absorberZ2 = (*hadronicEndcap)[0]->getDouble("PLATE_1")*Gaudi::Units::cm; //5.0*Gaudi::Units::cm;
 
-  const double moduleDeltaPhi   = 2*M_PI/moduleNumber; //11.25*GeoModelKernelUnits::deg;  
+  const double moduleDeltaPhi   = 2*M_PI/moduleNumber; //11.25*Gaudi::Units::deg;  
   double modulePhistart = -moduleDeltaPhi/2.; 
-  //double modulePhistart   = 0.0*GeoModelKernelUnits::deg;
-  zCoordinate[0]=0.0*GeoModelKernelUnits::cm; 
-  zCoordinate[1]=depthSize[0]; //28.05*GeoModelKernelUnits::cm; 
-  zCoordinate[2]=depthSize[0]+0.001*GeoModelKernelUnits::cm; //28.051*GeoModelKernelUnits::cm; 
+  //double modulePhistart   = 0.0*Gaudi::Units::deg;
+  zCoordinate[0]=0.0*Gaudi::Units::cm; 
+  zCoordinate[1]=depthSize[0]; //28.05*Gaudi::Units::cm; 
+  zCoordinate[2]=depthSize[0]+0.001*Gaudi::Units::cm; //28.051*Gaudi::Units::cm; 
   zCoordinate[3]=zCoordinate[2]+depthSize[1]+depthSize[2]+betweenWheel/2;
   zCoordinate[4]=zCoordinate[3]+depthSize[3]+depthSize[4]+betweenWheel/2;
-  zCoordinate[5]=181.8*GeoModelKernelUnits::cm;
+  zCoordinate[5]=181.8*Gaudi::Units::cm;
   innerRadius[0]=moduleRinner1;
   innerRadius[1]=moduleRinner1;
   for (index=2; index<numberZplane;++index) {innerRadius[index]=moduleRinner2;}
-  for (index=0; index<numberZplane;++index) {outerRadius[index]=innerRadius[0] + 78.7*GeoModelKernelUnits::cm; } 
+  for (index=0; index<numberZplane;++index) {outerRadius[index]=innerRadius[0] + 78.7*Gaudi::Units::cm; } 
 
 
 //----------------------------------------------------------------
@@ -299,9 +299,9 @@ GeoVFullPhysVol* LArGeo::HECConstructionH62004::GetEnvelope()
   }  
 
 //----------------------------------------------------------------
-//    Absorbers , the inner and outer Radius are smaller on 1.02*GeoModelKernelUnits::cm
+//    Absorbers , the inner and outer Radius are smaller on 1.02*Gaudi::Units::cm
 //                but positionned in the center of depth. this alows
-//                to have 2 GeoModelKernelUnits::mm gap between the copper plates of neighbor Modules 
+//                to have 2 Gaudi::Units::mm gap between the copper plates of neighbor Modules 
 //----------------------------------------------------------------
   std::string absorberName = depthName + "::Absorber";
   double absorberRinner1 = moduleRinner1-absorberPosY;
@@ -334,7 +334,7 @@ GeoVFullPhysVol* LArGeo::HECConstructionH62004::GetEnvelope()
   double depthPositionZ = 0.;
   for(int indexDepth=0; indexDepth<5; indexDepth++){
       depthPositionZ +=depthSize[indexDepth]/2.;
-      if (indexDepth==1) depthPositionZ +=0.001*GeoModelKernelUnits::cm;
+      if (indexDepth==1) depthPositionZ +=0.001*Gaudi::Units::cm;
       moduleRinner = moduleRinner2;
       if (indexDepth==0) moduleRinner = moduleRinner1; //for first depth
       //Absorber size and position
@@ -432,12 +432,12 @@ GeoVFullPhysVol* LArGeo::HECConstructionH62004::GetEnvelope()
   
   std::string tieRodName = sliceName + "::TieRod";
   double ztie[2];
-  ztie[0]=-0.227825*GeoModelKernelUnits::cm;
-  ztie[1]= 0.227825*GeoModelKernelUnits::cm;
-  double rodSize = 0.39435*GeoModelKernelUnits::cm;
+  ztie[0]=-0.227825*Gaudi::Units::cm;
+  ztie[1]= 0.227825*Gaudi::Units::cm;
+  double rodSize = 0.39435*Gaudi::Units::cm;
   for (int indexWheel=0; indexWheel<2; indexWheel++) { 
-     solidTieRod[indexWheel] = new GeoTubs(0.*GeoModelKernelUnits::cm,spacerDiameter[indexWheel]/2.,rodSize/2.,
-		                           0.*GeoModelKernelUnits::deg,360.*GeoModelKernelUnits::deg);         //size                 
+     solidTieRod[indexWheel] = new GeoTubs(0.*Gaudi::Units::cm,spacerDiameter[indexWheel]/2.,rodSize/2.,
+		                           0.*Gaudi::Units::deg,360.*Gaudi::Units::deg);         //size                 
      logiTieRod[indexWheel] = new GeoLogVol(tieRodName,solidTieRod[indexWheel], Iron);
   }
   for(int numberSlice=0; numberSlice<3; numberSlice++){
@@ -471,8 +471,8 @@ GeoVFullPhysVol* LArGeo::HECConstructionH62004::GetEnvelope()
 //    Tie rods in Absorbers
 //----------------------------------------------------------------
       
-  solidAbsorberTieRod[0] = new GeoTubs(0.*GeoModelKernelUnits::cm,tieRodDiameter[0]/2.,absorberZ1/2.,0.*GeoModelKernelUnits::deg,360.*GeoModelKernelUnits::deg);                 
-  solidAbsorberTieRod[1] = new GeoTubs(0.*GeoModelKernelUnits::cm,tieRodDiameter[1]/2.,absorberZ2/2.,0.*GeoModelKernelUnits::deg,360.*GeoModelKernelUnits::deg);                 
+  solidAbsorberTieRod[0] = new GeoTubs(0.*Gaudi::Units::cm,tieRodDiameter[0]/2.,absorberZ1/2.,0.*Gaudi::Units::deg,360.*Gaudi::Units::deg);                 
+  solidAbsorberTieRod[1] = new GeoTubs(0.*Gaudi::Units::cm,tieRodDiameter[1]/2.,absorberZ2/2.,0.*Gaudi::Units::deg,360.*Gaudi::Units::deg);                 
   logiAbsorberTieRod[0] = new GeoLogVol(tieRodName, solidAbsorberTieRod[0], Iron);
   logiAbsorberTieRod[1] = new GeoLogVol(tieRodName, solidAbsorberTieRod[1], Iron);
   for(int indexA=0; indexA<3; indexA++){  
diff --git a/LArCalorimeter/LArGeoModel/LArGeoH62004Algs/src/LArDetectorFactoryH62004.cxx b/LArCalorimeter/LArGeoModel/LArGeoH62004Algs/src/LArDetectorFactoryH62004.cxx
index 0fafefd9cfd043492be6c866db9a040f46bd474a..739009b695bd13b3c9e596d0f2060e45d9a828ed 100755
--- a/LArCalorimeter/LArGeoModel/LArGeoH62004Algs/src/LArDetectorFactoryH62004.cxx
+++ b/LArCalorimeter/LArGeoModel/LArGeoH62004Algs/src/LArDetectorFactoryH62004.cxx
@@ -26,7 +26,6 @@
 #include "GeoModelKernel/GeoAlignableTransform.h"  
 #include "GeoModelKernel/GeoSerialTransformer.h"
 #include "GeoModelKernel/GeoDefinitions.h"
-#include "GeoModelKernel/Units.h"
 #include "GeoGenericFunctions/AbsFunction.h"
 #include "GeoGenericFunctions/Variable.h"
 #include "GeoGenericFunctions/Sin.h"
@@ -44,6 +43,7 @@
 
 #include "GaudiKernel/MsgStream.h"
 #include "GaudiKernel/Bootstrap.h"
+#include "GaudiKernel/SystemOfUnits.h"
 
 #include "RDBAccessSvc/IRDBRecord.h"
 #include "RDBAccessSvc/IRDBRecordset.h"
@@ -117,8 +117,8 @@ void LArGeo::LArDetectorFactoryH62004::getSimulationParameters()
     m_tableYpos = 70.;
   }
 
-  std::cout << " Use cryo X : " <<  m_cryoXpos << " GeoModelKernelUnits::mm" << std::endl;
-  std::cout << " Use table Y : " <<  m_tableYpos << " GeoModelKernelUnits::mm" << std::endl;
+  std::cout << " Use cryo X : " <<  m_cryoXpos << " Gaudi::Units::mm" << std::endl;
+  std::cout << " Use table Y : " <<  m_tableYpos << " Gaudi::Units::mm" << std::endl;
   const_cast<LArGeoTB2004Options*>(largeoTB2004Options)->printMe();
 
 
@@ -156,9 +156,9 @@ void LArGeo::LArDetectorFactoryH62004::create(GeoPhysVol *world)
   
   const GeoMaterial *air        = materialManager->getMaterial("std::Air");
 
-  double expHallX = 14000.*GeoModelKernelUnits::mm;
-  double expHallY = 14000.*GeoModelKernelUnits::mm;
-  double expHallZ = 50000.*GeoModelKernelUnits::mm;
+  double expHallX = 14000.*Gaudi::Units::mm;
+  double expHallY = 14000.*Gaudi::Units::mm;
+  double expHallZ = 50000.*Gaudi::Units::mm;
 
   //-----------------------------------------------------------------------------------//  
   // Next make the box that describes the shape of the expHall volume:                 //  
@@ -183,13 +183,13 @@ void LArGeo::LArDetectorFactoryH62004::create(GeoPhysVol *world)
   // the element we want to position in the following order:
 
 
-  double Theta = -90. * GeoModelKernelUnits::deg;
-  double Phi   = 0.  * GeoModelKernelUnits::deg;
+  double Theta = -90. * Gaudi::Units::deg;
+  double Phi   = 0.  * Gaudi::Units::deg;
 
   GeoTrf::Transform3D Mrot = GeoTrf::RotateZ3D(Phi) * GeoTrf::RotateX3D(Theta);
-  GeoTrf::Translation3D pos3Vector(- m_cryoXpos*GeoModelKernelUnits::mm
-				   , 0.*GeoModelKernelUnits::mm
-				   , 12250.*GeoModelKernelUnits::mm );
+  GeoTrf::Translation3D pos3Vector(- m_cryoXpos*Gaudi::Units::mm
+				   , 0.*Gaudi::Units::mm
+				   , 12250.*Gaudi::Units::mm );
 
   H6CryostatConstruction  H6CryoCons;
   GeoVPhysVol* CryoEnvelope = 0;
@@ -207,8 +207,8 @@ void LArGeo::LArDetectorFactoryH62004::create(GeoPhysVol *world)
   // Add the front beam instrumentation:
   FrontBeamConstructionH62004 FrontBeamConstruction;
   // DB ?
-  const double bard_z = 100.0*GeoModelKernelUnits::cm;
-  const double z_bard=-2160.0*GeoModelKernelUnits::cm+80.1*GeoModelKernelUnits::cm+16.*GeoModelKernelUnits::cm+bard_z;
+  const double bard_z = 100.0*Gaudi::Units::cm;
+  const double z_bard=-2160.0*Gaudi::Units::cm+80.1*Gaudi::Units::cm+16.*Gaudi::Units::cm+bard_z;
   {                                             // (with 350=1/2 length of FrontBeam volume)
     GeoVPhysVol* front = 0;
     front = FrontBeamConstruction.GetEnvelope();
@@ -220,13 +220,13 @@ void LArGeo::LArDetectorFactoryH62004::create(GeoPhysVol *world)
   }
   // Add middle chambers
   MiddleBeamConstructionH62004 MiddleBeamConstruction;
-  const double z_bardm=-2160.0*GeoModelKernelUnits::cm+1362.3*GeoModelKernelUnits::cm;
-  const double bttb_pos = 833.5*GeoModelKernelUnits::cm;
+  const double z_bardm=-2160.0*Gaudi::Units::cm+1362.3*Gaudi::Units::cm;
+  const double bttb_pos = 833.5*Gaudi::Units::cm;
   {
      GeoVPhysVol* middle = 0;
      middle = MiddleBeamConstruction.GetEnvelope();
      if(middle != 0 && expHallPhys !=0){
-        double ym_pos = m_tableYpos  * (z_bardm + 2160*GeoModelKernelUnits::cm) * (1./(bttb_pos + 2160*GeoModelKernelUnits::cm));
+        double ym_pos = m_tableYpos  * (z_bardm + 2160*Gaudi::Units::cm) * (1./(bttb_pos + 2160*Gaudi::Units::cm));
 	expHallPhys->add( new GeoNameTag("H62004::Middle"));
 	expHallPhys->add( new GeoTransform( GeoTrf::TranslateY3D(ym_pos) * GeoTrf::TranslateZ3D(z_bardm) ) );
 	expHallPhys->add(middle);
@@ -246,17 +246,17 @@ void LArGeo::LArDetectorFactoryH62004::create(GeoPhysVol *world)
 
 
    // WarmTC after the cryostat
-   double WTC_tild = -1.1*GeoModelKernelUnits::deg;   // 24 GeoModelKernelUnits::mm tild on 1250 GeoModelKernelUnits::mm length !! should go to DB ?
-   double WTC_len = 591.5*GeoModelKernelUnits::mm;
-   double WTC_sci_z = 12.7*GeoModelKernelUnits::mm;
-   double Muon_dist = 120.0*GeoModelKernelUnits::mm;
-   double Muon_z = 1.0*GeoModelKernelUnits::cm;
-   double bcry_zpos = 1225.0*GeoModelKernelUnits::cm;
-   double bcry_rwarm = 129.55*GeoModelKernelUnits::cm;
-   double WTC_x = 0.0*GeoModelKernelUnits::mm;
-   double WTC_y = 0.0*GeoModelKernelUnits::mm;
-   double WTC_z = 460.0*GeoModelKernelUnits::mm - 120.*GeoModelKernelUnits::mm - 10.*GeoModelKernelUnits::mm;
-   double z_m = (86.0*GeoModelKernelUnits::mm + WTC_len + WTC_sci_z + Muon_dist + Muon_z) / 2;
+   double WTC_tild = -1.1*Gaudi::Units::deg;   // 24 Gaudi::Units::mm tild on 1250 Gaudi::Units::mm length !! should go to DB ?
+   double WTC_len = 591.5*Gaudi::Units::mm;
+   double WTC_sci_z = 12.7*Gaudi::Units::mm;
+   double Muon_dist = 120.0*Gaudi::Units::mm;
+   double Muon_z = 1.0*Gaudi::Units::cm;
+   double bcry_zpos = 1225.0*Gaudi::Units::cm;
+   double bcry_rwarm = 129.55*Gaudi::Units::cm;
+   double WTC_x = 0.0*Gaudi::Units::mm;
+   double WTC_y = 0.0*Gaudi::Units::mm;
+   double WTC_z = 460.0*Gaudi::Units::mm - 120.*Gaudi::Units::mm - 10.*Gaudi::Units::mm;
+   double z_m = (86.0*Gaudi::Units::mm + WTC_len + WTC_sci_z + Muon_dist + Muon_z) / 2;
 
    WarmTCConstructionH62004 wtcConstruction;
    {
diff --git a/LArCalorimeter/LArGeoModel/LArGeoH62004Algs/src/MiddleBeamConstructionH62004.cxx b/LArCalorimeter/LArGeoModel/LArGeoH62004Algs/src/MiddleBeamConstructionH62004.cxx
index 8101631899ddc80ce73402ae4ec9a353eab60309..c366cd57b988435f183ffa07a5b8b0411d75a1e8 100755
--- a/LArCalorimeter/LArGeoModel/LArGeoH62004Algs/src/MiddleBeamConstructionH62004.cxx
+++ b/LArCalorimeter/LArGeoModel/LArGeoH62004Algs/src/MiddleBeamConstructionH62004.cxx
@@ -24,7 +24,6 @@
 #include "GeoModelKernel/GeoIdentifierTag.h"  
 #include "GeoModelKernel/GeoSerialDenominator.h"
 #include "GeoModelKernel/GeoDefinitions.h"
-#include "GeoModelKernel/Units.h"
 #include "StoreGate/StoreGateSvc.h"
 #include "GeoModelInterfaces/AbsMaterialManager.h"
 #include "GeoModelInterfaces/StoredMaterialManager.h"
@@ -41,6 +40,7 @@
 
 #include "GaudiKernel/MsgStream.h"
 #include "GaudiKernel/Bootstrap.h"
+#include "GaudiKernel/SystemOfUnits.h"
 
 #include <string>
 #include <cmath>
@@ -114,13 +114,13 @@ GeoVPhysVol* LArGeo::MiddleBeamConstructionH62004::GetEnvelope()
   //
   // Define dimension of Middle part & position of Front part
   //
-  double bmtb_x = 12.0*GeoModelKernelUnits::cm;
-  double bmtb_y = 12.0*GeoModelKernelUnits::cm;
-  double bmtb_z = 25.0*GeoModelKernelUnits::cm;
-  //double bmtb_pos = 10.0*GeoModelKernelUnits::cm;
-  double bpco_pos[4] =  {1.*GeoModelKernelUnits::cm, 1.*GeoModelKernelUnits::cm, 15.3*GeoModelKernelUnits::cm, 15.3*GeoModelKernelUnits::cm};
-  double bpco_shift[4] =  {0.*GeoModelKernelUnits::cm, 7.8*GeoModelKernelUnits::cm, 0.*GeoModelKernelUnits::cm, 7.5*GeoModelKernelUnits::cm};
-  double bpc_old_z = (5.100/2)*GeoModelKernelUnits::cm;
+  double bmtb_x = 12.0*Gaudi::Units::cm;
+  double bmtb_y = 12.0*Gaudi::Units::cm;
+  double bmtb_z = 25.0*Gaudi::Units::cm;
+  //double bmtb_pos = 10.0*Gaudi::Units::cm;
+  double bpco_pos[4] =  {1.*Gaudi::Units::cm, 1.*Gaudi::Units::cm, 15.3*Gaudi::Units::cm, 15.3*Gaudi::Units::cm};
+  double bpco_shift[4] =  {0.*Gaudi::Units::cm, 7.8*Gaudi::Units::cm, 0.*Gaudi::Units::cm, 7.5*Gaudi::Units::cm};
+  double bpc_old_z = (5.100/2)*Gaudi::Units::cm;
 
   GeoBox* H62004MiddleBeamShape = new GeoBox( bmtb_x, bmtb_y, bmtb_z );   
   const GeoLogVol* H62004MiddleBeamLogical = new GeoLogVol( H62004MiddleBeamName, H62004MiddleBeamShape, Air );
@@ -137,11 +137,11 @@ GeoVPhysVol* LArGeo::MiddleBeamConstructionH62004::GetEnvelope()
      m_H62004MiddleBeamPhysical->add( new GeoIdentifierTag((3+i/2)*10+i) );
      switch(i) {
 	  case 0: case 2: {
-			     m_H62004MiddleBeamPhysical->add( new GeoTransform(GeoTrf::Translate3D( 0.*GeoModelKernelUnits::cm, 0.*GeoModelKernelUnits::cm, bpco_pos[i]+bpco_shift[i]+bpc_old_z-bmtb_z) ) );
+			     m_H62004MiddleBeamPhysical->add( new GeoTransform(GeoTrf::Translate3D( 0.*Gaudi::Units::cm, 0.*Gaudi::Units::cm, bpco_pos[i]+bpco_shift[i]+bpc_old_z-bmtb_z) ) );
                             m_H62004MiddleBeamPhysical->add(BPCPhysical);
 			    break;}
 	  case 1: case 3: { 
-                            m_H62004MiddleBeamPhysical->add( new GeoTransform(GeoTrf::RotateZ3D(90.*GeoModelKernelUnits::deg) *  GeoTrf::Translate3D( 0.*GeoModelKernelUnits::cm, 0.*GeoModelKernelUnits::cm, bpco_pos[i]+bpco_shift[i]+bpc_old_z-bmtb_z) ) );
+                            m_H62004MiddleBeamPhysical->add( new GeoTransform(GeoTrf::RotateZ3D(90.*Gaudi::Units::deg) *  GeoTrf::Translate3D( 0.*Gaudi::Units::cm, 0.*Gaudi::Units::cm, bpco_pos[i]+bpco_shift[i]+bpc_old_z-bmtb_z) ) );
                             m_H62004MiddleBeamPhysical->add(BPCPhysical);
 			    break;}
     }
diff --git a/LArCalorimeter/LArGeoModel/LArGeoH62004Algs/src/ModulesConstructionH62004.cxx b/LArCalorimeter/LArGeoModel/LArGeoH62004Algs/src/ModulesConstructionH62004.cxx
index f2ffab36b2b3536c5ddc336df45ef9d532e19469..e72da4124032539697f9086b7049e06f8f394d7d 100755
--- a/LArCalorimeter/LArGeoModel/LArGeoH62004Algs/src/ModulesConstructionH62004.cxx
+++ b/LArCalorimeter/LArGeoModel/LArGeoH62004Algs/src/ModulesConstructionH62004.cxx
@@ -49,6 +49,7 @@
 
 #include "GaudiKernel/MsgStream.h"
 #include "GaudiKernel/Bootstrap.h"
+#include "GaudiKernel/SystemOfUnits.h"
 #include "RDBAccessSvc/IRDBAccessSvc.h"
 #include "RDBAccessSvc/IRDBRecord.h"
 #include "RDBAccessSvc/IRDBRecordset.h"
@@ -72,7 +73,7 @@ LArGeo::ModulesConstructionH62004::ModulesConstructionH62004():m_ModulesPhys(0),
 {
 // fill the static arrays, if called first time
 //
-  //const double thick = 1.*GeoModelKernelUnits::cm;
+  //const double thick = 1.*Gaudi::Units::cm;
   static bool first = true;
   if(first){
     first = false;
@@ -82,65 +83,65 @@ LArGeo::ModulesConstructionH62004::ModulesConstructionH62004():m_ModulesPhys(0),
        s_angleX[i] = s_angleY[i] = s_angleZ[i] = 0.;
     }
 
-    s_dX[0] = s_dX[1] = 1.*GeoModelKernelUnits::cm; s_dY[0]= s_dY[1] = 31.6*GeoModelKernelUnits::cm; s_dZ[0] = s_dZ[1] = 50.*GeoModelKernelUnits::cm; 
-    s_shiftX[0] = -26.*GeoModelKernelUnits::cm; s_shiftX[1] = -s_shiftX[0];
-    s_shiftY[0] = s_shiftY[1] = 85.1*GeoModelKernelUnits::cm; s_shiftZ[0] = s_shiftZ[1] = -3.*GeoModelKernelUnits::cm;
-    s_angleX[0] = s_angleX[1] = 4.668*GeoModelKernelUnits::deg; s_angleZ[0] = s_angleZ[1] = 0.*GeoModelKernelUnits::deg;
-    s_angleY[0] = -30.*GeoModelKernelUnits::deg; s_angleY[1] = -s_angleY[0]; 
-    s_dX[2] = 98.1*GeoModelKernelUnits::cm; s_dY[2] = 98.2*GeoModelKernelUnits::cm; s_dZ[2] = 30.6*GeoModelKernelUnits::cm;
-    s_shiftX[2] = 0.*GeoModelKernelUnits::cm; s_shiftY[2] = 89.7*GeoModelKernelUnits::cm; s_shiftZ[2] = -42.*GeoModelKernelUnits::cm;
-    s_angleX[2] = 94.668*GeoModelKernelUnits::deg; s_angleY[2] = 0.; s_angleZ[2] = 90.*GeoModelKernelUnits::degree;
+    s_dX[0] = s_dX[1] = 1.*Gaudi::Units::cm; s_dY[0]= s_dY[1] = 31.6*Gaudi::Units::cm; s_dZ[0] = s_dZ[1] = 50.*Gaudi::Units::cm; 
+    s_shiftX[0] = -26.*Gaudi::Units::cm; s_shiftX[1] = -s_shiftX[0];
+    s_shiftY[0] = s_shiftY[1] = 85.1*Gaudi::Units::cm; s_shiftZ[0] = s_shiftZ[1] = -3.*Gaudi::Units::cm;
+    s_angleX[0] = s_angleX[1] = 4.668*Gaudi::Units::deg; s_angleZ[0] = s_angleZ[1] = 0.*Gaudi::Units::deg;
+    s_angleY[0] = -30.*Gaudi::Units::deg; s_angleY[1] = -s_angleY[0]; 
+    s_dX[2] = 98.1*Gaudi::Units::cm; s_dY[2] = 98.2*Gaudi::Units::cm; s_dZ[2] = 30.6*Gaudi::Units::cm;
+    s_shiftX[2] = 0.*Gaudi::Units::cm; s_shiftY[2] = 89.7*Gaudi::Units::cm; s_shiftZ[2] = -42.*Gaudi::Units::cm;
+    s_angleX[2] = 94.668*Gaudi::Units::deg; s_angleY[2] = 0.; s_angleZ[2] = 90.*Gaudi::Units::degree;
     
     
-    s_dX[3] = 1.*GeoModelKernelUnits::cm; s_dY[3] = 43.*GeoModelKernelUnits::cm; s_dZ[3] = 40.*GeoModelKernelUnits::cm;
+    s_dX[3] = 1.*Gaudi::Units::cm; s_dY[3] = 43.*Gaudi::Units::cm; s_dZ[3] = 40.*Gaudi::Units::cm;
     s_dX[4] = s_dX[3]; s_dY[4] = s_dY[3]; s_dZ[4] = s_dZ[3];
-    s_shiftX[3] = -58.5*GeoModelKernelUnits::cm; s_shiftY[3] = 12.2*GeoModelKernelUnits::cm; s_shiftZ[3] = 5.*GeoModelKernelUnits::cm;
+    s_shiftX[3] = -58.5*Gaudi::Units::cm; s_shiftY[3] = 12.2*Gaudi::Units::cm; s_shiftZ[3] = 5.*Gaudi::Units::cm;
     s_shiftX[4] = -s_shiftX[3]; s_shiftY[4] = s_shiftY[3]; s_shiftZ[4] = s_shiftZ[3];
-    s_angleX[3] = s_angleX[4] = 4.668*GeoModelKernelUnits::deg; s_angleY[3] = -45.*GeoModelKernelUnits::deg; 
+    s_angleX[3] = s_angleX[4] = 4.668*Gaudi::Units::deg; s_angleY[3] = -45.*Gaudi::Units::deg; 
     s_angleY[4] = -s_angleY[3]; 
-    s_angleZ[3] = 0.*GeoModelKernelUnits::deg; 
+    s_angleZ[3] = 0.*Gaudi::Units::deg; 
     s_angleZ[4] = -s_angleZ[3];
-    s_dX[5] = 130.*GeoModelKernelUnits::cm; s_dY[5] = 131.*GeoModelKernelUnits::cm; s_dZ[5] = 43.*GeoModelKernelUnits::cm; 
-    s_shiftX[5] = 0.*GeoModelKernelUnits::cm; s_shiftY[5] = 18.1*GeoModelKernelUnits::cm; s_shiftZ[5] = -62.*GeoModelKernelUnits::cm;
-    s_angleX[5] = 94.668*GeoModelKernelUnits::deg; s_angleY[5] = 0.*GeoModelKernelUnits::deg;
-    s_angleZ[5] = 90.*GeoModelKernelUnits::deg;
+    s_dX[5] = 130.*Gaudi::Units::cm; s_dY[5] = 131.*Gaudi::Units::cm; s_dZ[5] = 43.*Gaudi::Units::cm; 
+    s_shiftX[5] = 0.*Gaudi::Units::cm; s_shiftY[5] = 18.1*Gaudi::Units::cm; s_shiftZ[5] = -62.*Gaudi::Units::cm;
+    s_angleX[5] = 94.668*Gaudi::Units::deg; s_angleY[5] = 0.*Gaudi::Units::deg;
+    s_angleZ[5] = 90.*Gaudi::Units::deg;
 
-    s_dX[6] = s_dX[7] = 1.*GeoModelKernelUnits::cm; s_dY[6] = s_dY[7] = 27.*GeoModelKernelUnits::cm; s_dZ[6] = s_dZ[7] = 40.*GeoModelKernelUnits::cm; 
-    s_shiftX[6] = -58.*GeoModelKernelUnits::cm; s_shiftY[6] = s_shiftY[7] = -57.85*GeoModelKernelUnits::cm; s_shiftZ[6] = s_shiftZ[7] = -1.*GeoModelKernelUnits::cm;
+    s_dX[6] = s_dX[7] = 1.*Gaudi::Units::cm; s_dY[6] = s_dY[7] = 27.*Gaudi::Units::cm; s_dZ[6] = s_dZ[7] = 40.*Gaudi::Units::cm; 
+    s_shiftX[6] = -58.*Gaudi::Units::cm; s_shiftY[6] = s_shiftY[7] = -57.85*Gaudi::Units::cm; s_shiftZ[6] = s_shiftZ[7] = -1.*Gaudi::Units::cm;
     s_shiftX[7] = - s_shiftX[6]; 
-    s_angleX[6] = s_angleX[7] = 4.668*GeoModelKernelUnits::deg; s_angleY[6] = -45.*GeoModelKernelUnits::deg; s_angleZ[6] = s_angleZ[7] = 0.*GeoModelKernelUnits::deg;
+    s_angleX[6] = s_angleX[7] = 4.668*Gaudi::Units::deg; s_angleY[6] = -45.*Gaudi::Units::deg; s_angleZ[6] = s_angleZ[7] = 0.*Gaudi::Units::deg;
     s_angleY[7] = -s_angleY[6];
-    s_dX[8] = 130.*GeoModelKernelUnits::cm; s_dY[8] = 131.*GeoModelKernelUnits::cm; s_dZ[8] = 27.*GeoModelKernelUnits::cm;
-    s_shiftX[8] = 0.*GeoModelKernelUnits::cm; s_shiftY[8] = -51.9*GeoModelKernelUnits::cm; s_shiftZ[8] = -67.*GeoModelKernelUnits::cm;
-    s_angleX[8] = 94.668*GeoModelKernelUnits::degree; s_angleY[8] = 0.*GeoModelKernelUnits::degree; s_angleZ[8] = 90.*GeoModelKernelUnits::degree;
-    s_dX[9] = 1.*GeoModelKernelUnits::cm; s_dY[9] = 82.*GeoModelKernelUnits::cm; s_dZ[9] = 44.5*GeoModelKernelUnits::cm;
-    s_shiftX[9] = 0.*GeoModelKernelUnits::cm; s_shiftY[9] = -89.0*GeoModelKernelUnits::cm; s_shiftZ[9] = 32.5*GeoModelKernelUnits::cm;
-    s_angleX[9] = 4.668*GeoModelKernelUnits::degree; s_angleY[9] = 0.*GeoModelKernelUnits::degree; s_angleZ[9] = 90.*GeoModelKernelUnits::degree;    
+    s_dX[8] = 130.*Gaudi::Units::cm; s_dY[8] = 131.*Gaudi::Units::cm; s_dZ[8] = 27.*Gaudi::Units::cm;
+    s_shiftX[8] = 0.*Gaudi::Units::cm; s_shiftY[8] = -51.9*Gaudi::Units::cm; s_shiftZ[8] = -67.*Gaudi::Units::cm;
+    s_angleX[8] = 94.668*Gaudi::Units::degree; s_angleY[8] = 0.*Gaudi::Units::degree; s_angleZ[8] = 90.*Gaudi::Units::degree;
+    s_dX[9] = 1.*Gaudi::Units::cm; s_dY[9] = 82.*Gaudi::Units::cm; s_dZ[9] = 44.5*Gaudi::Units::cm;
+    s_shiftX[9] = 0.*Gaudi::Units::cm; s_shiftY[9] = -89.0*Gaudi::Units::cm; s_shiftZ[9] = 32.5*Gaudi::Units::cm;
+    s_angleX[9] = 4.668*Gaudi::Units::degree; s_angleY[9] = 0.*Gaudi::Units::degree; s_angleZ[9] = 90.*Gaudi::Units::degree;    
     
-    s_dX[10] = s_dX[11] =  1.*GeoModelKernelUnits::cm; s_dY[10] = s_dY[11] = 41.5*GeoModelKernelUnits::cm; s_dZ[10] = s_dZ[11] = 20.3*GeoModelKernelUnits::cm;
-    s_shiftX[10] = -15.4*GeoModelKernelUnits::cm; s_shiftY[10] = s_shiftY[11] = 14.50*GeoModelKernelUnits::cm; s_shiftZ[10] = s_shiftZ[11] = -39.*GeoModelKernelUnits::cm;
+    s_dX[10] = s_dX[11] =  1.*Gaudi::Units::cm; s_dY[10] = s_dY[11] = 41.5*Gaudi::Units::cm; s_dZ[10] = s_dZ[11] = 20.3*Gaudi::Units::cm;
+    s_shiftX[10] = -15.4*Gaudi::Units::cm; s_shiftY[10] = s_shiftY[11] = 14.50*Gaudi::Units::cm; s_shiftZ[10] = s_shiftZ[11] = -39.*Gaudi::Units::cm;
     s_shiftX[11] = - s_shiftX[10];
-    s_angleX[10] = s_angleX[11] = 4.668*GeoModelKernelUnits::degree; s_angleY[10] = -45.*GeoModelKernelUnits::degree; s_angleZ[10] = 0.*GeoModelKernelUnits::degree;    
+    s_angleX[10] = s_angleX[11] = 4.668*Gaudi::Units::degree; s_angleY[10] = -45.*Gaudi::Units::degree; s_angleZ[10] = 0.*Gaudi::Units::degree;    
     s_angleY[11] = -s_angleY[10]; s_angleZ[11] = -s_angleZ[10];    
   
-    s_dX[12] = s_dX[13] = 1.*GeoModelKernelUnits::cm; s_dY[12] = s_dY[13] = 27.*GeoModelKernelUnits::cm; s_dZ[12] = s_dZ[13] = 20.3*GeoModelKernelUnits::cm;
-    s_shiftX[12] = -15.4*GeoModelKernelUnits::cm; s_shiftY[12] = s_shiftY[13] = -54.4*GeoModelKernelUnits::cm; s_shiftZ[12] = s_shiftZ[13] = -43.8*GeoModelKernelUnits::cm;
+    s_dX[12] = s_dX[13] = 1.*Gaudi::Units::cm; s_dY[12] = s_dY[13] = 27.*Gaudi::Units::cm; s_dZ[12] = s_dZ[13] = 20.3*Gaudi::Units::cm;
+    s_shiftX[12] = -15.4*Gaudi::Units::cm; s_shiftY[12] = s_shiftY[13] = -54.4*Gaudi::Units::cm; s_shiftZ[12] = s_shiftZ[13] = -43.8*Gaudi::Units::cm;
     s_shiftX[13] = -s_shiftX[12];
-    s_angleX[12]  = s_angleX[13] = 4.668*GeoModelKernelUnits::degree; s_angleY[12] = -45.*GeoModelKernelUnits::degree; s_angleZ[12] = 0.*GeoModelKernelUnits::degree;
+    s_angleX[12]  = s_angleX[13] = 4.668*Gaudi::Units::degree; s_angleY[12] = -45.*Gaudi::Units::degree; s_angleZ[12] = 0.*Gaudi::Units::degree;
     s_angleY[13] = -s_angleY[12]; s_angleZ[13] = -s_angleZ[12];
       
-    s_dX[14] = s_dX[15] = 1.*GeoModelKernelUnits::cm; s_dY[14] = s_dY[15] = 12.*GeoModelKernelUnits::cm; s_dZ[14] = s_dZ[15] = 25.3*GeoModelKernelUnits::cm;
-    s_shiftX[14] = -19.5*GeoModelKernelUnits::cm; s_shiftY[14] = s_shiftY[15] = -93.5*GeoModelKernelUnits::cm; s_shiftZ[14] = s_shiftZ[15] = -46.5*GeoModelKernelUnits::cm;
+    s_dX[14] = s_dX[15] = 1.*Gaudi::Units::cm; s_dY[14] = s_dY[15] = 12.*Gaudi::Units::cm; s_dZ[14] = s_dZ[15] = 25.3*Gaudi::Units::cm;
+    s_shiftX[14] = -19.5*Gaudi::Units::cm; s_shiftY[14] = s_shiftY[15] = -93.5*Gaudi::Units::cm; s_shiftZ[14] = s_shiftZ[15] = -46.5*Gaudi::Units::cm;
     s_shiftX[15] = -s_shiftX[14];
-    s_angleX[14] = s_angleX[15] = 4.668*GeoModelKernelUnits::degree; s_angleY[14] = -45.*GeoModelKernelUnits::degree; s_angleZ[14] = s_angleZ[15] = 0.*GeoModelKernelUnits::degree;
+    s_angleX[14] = s_angleX[15] = 4.668*Gaudi::Units::degree; s_angleY[14] = -45.*Gaudi::Units::degree; s_angleZ[14] = s_angleZ[15] = 0.*Gaudi::Units::degree;
     s_angleY[15] = -s_angleY[14]; 
     
-    s_dX[16] = 59.5*GeoModelKernelUnits::cm; s_dY[16] = 60.0*GeoModelKernelUnits::cm; s_dZ[16] = 12.0*GeoModelKernelUnits::cm;
-    s_shiftX[16] = 0.*GeoModelKernelUnits::cm; s_shiftY[16] = -91.5*GeoModelKernelUnits::cm; s_shiftZ[16] = -73.5*GeoModelKernelUnits::cm;
-    s_angleX[16] = 94.668*GeoModelKernelUnits::degree; s_angleY[16] = 0.*GeoModelKernelUnits::degree; s_angleZ[16] = 90.*GeoModelKernelUnits::degree;
-    s_dX[17] = 0.3*GeoModelKernelUnits::cm; s_dY[17] = 35.*GeoModelKernelUnits::cm; s_dZ[17] = 25.*GeoModelKernelUnits::cm;
-    s_shiftX[17] = 0.*GeoModelKernelUnits::cm; s_shiftY[17] = -107.0*GeoModelKernelUnits::cm; s_shiftZ[17] = -40.*GeoModelKernelUnits::cm;
-    s_angleX[17] = 4.668*GeoModelKernelUnits::degree; s_angleY[17] = 0.*GeoModelKernelUnits::degree; s_angleZ[17] = 90.*GeoModelKernelUnits::degree;
+    s_dX[16] = 59.5*Gaudi::Units::cm; s_dY[16] = 60.0*Gaudi::Units::cm; s_dZ[16] = 12.0*Gaudi::Units::cm;
+    s_shiftX[16] = 0.*Gaudi::Units::cm; s_shiftY[16] = -91.5*Gaudi::Units::cm; s_shiftZ[16] = -73.5*Gaudi::Units::cm;
+    s_angleX[16] = 94.668*Gaudi::Units::degree; s_angleY[16] = 0.*Gaudi::Units::degree; s_angleZ[16] = 90.*Gaudi::Units::degree;
+    s_dX[17] = 0.3*Gaudi::Units::cm; s_dY[17] = 35.*Gaudi::Units::cm; s_dZ[17] = 25.*Gaudi::Units::cm;
+    s_shiftX[17] = 0.*Gaudi::Units::cm; s_shiftY[17] = -107.0*Gaudi::Units::cm; s_shiftZ[17] = -40.*Gaudi::Units::cm;
+    s_angleX[17] = 4.668*Gaudi::Units::degree; s_angleY[17] = 0.*Gaudi::Units::degree; s_angleZ[17] = 90.*Gaudi::Units::degree;
      
   }
   //StoreGateSvc* detStore;
@@ -195,7 +196,7 @@ GeoVFullPhysVol* LArGeo::ModulesConstructionH62004::GetEnvelope()
   const GeoElement*  H=materialManager->getElement("Hydrogen");
   const GeoElement*  O=materialManager->getElement("Oxygen");
   const GeoElement*  N=materialManager->getElement("Nitrogen");
-  GeoMaterial* Rohacell = new GeoMaterial(name="Rohacell", density=0.112*GeoModelKernelUnits::g/GeoModelKernelUnits::cm3);
+  GeoMaterial* Rohacell = new GeoMaterial(name="Rohacell", density=0.112*GeoModelKernelUnits::g/Gaudi::Units::cm3);
   Rohacell->add(C,0.6465);
   Rohacell->add(H,0.07836);
   Rohacell->add(O,0.19137);
@@ -203,7 +204,7 @@ GeoVFullPhysVol* LArGeo::ModulesConstructionH62004::GetEnvelope()
   Rohacell->lock();
 
   /*
-  a = 12.957*GeoModelKernelUnits::g/GeoModelKernelUnits::mole;                                                       
+  a = 12.957*GeoModelKernelUnits::g/Gaudi::Units::mole;                                                       
   density = 0.112*g/cm3;                                              
   z = 6.18;
   G4Material* Rohacell = new G4Material(name="Rohacell",z, a, density);
@@ -213,35 +214,35 @@ GeoVFullPhysVol* LArGeo::ModulesConstructionH62004::GetEnvelope()
   if (!Alu) throw std::runtime_error("Error in ModulesConstruction, std::Aluminium is not found.");
 
   // DB numbers:
-  double bryr_y = 200.0*GeoModelKernelUnits::cm;
-  double bcry_rlar = 125.5*GeoModelKernelUnits::cm;
-  double bcry_phistart = 0.*GeoModelKernelUnits::degree;
-  double bcry_phiend = 360.*GeoModelKernelUnits::degree;
-  //double EMECdzende         =  63.2*GeoModelKernelUnits::cm;   // Can not get from parameters
+  double bryr_y = 200.0*Gaudi::Units::cm;
+  double bcry_rlar = 125.5*Gaudi::Units::cm;
+  double bcry_phistart = 0.*Gaudi::Units::degree;
+  double bcry_phiend = 360.*Gaudi::Units::degree;
+  //double EMECdzende         =  63.2*Gaudi::Units::cm;   // Can not get from parameters
   //double Zall = 62.6*cm; // Excluder dimension
 
-  double   bepo_tx = 180.0*GeoModelKernelUnits::degree;
-  double   bepo_tz = 90.0*GeoModelKernelUnits::degree;
-  double   bepo_tz_e = ( M_PI / 4 )*GeoModelKernelUnits::rad;
-  double   bepo_ty = 90.0*GeoModelKernelUnits::degree;
-  double   bepo_Beta = 4.668*GeoModelKernelUnits::degree;
-  double   bepo_z_e = -42.86*GeoModelKernelUnits::cm; // 43 GeoModelKernelUnits::cm * cos(4.668)
-  double   bepo_emec_shift = 2.5*GeoModelKernelUnits::cm;
-  double   bepo_excluder_shift = 34.4*GeoModelKernelUnits::cm;
-  //double   bepo_hec_shift = 63.6*GeoModelKernelUnits::cm; // relative position of HEC versus EMEC
+  double   bepo_tx = 180.0*Gaudi::Units::degree;
+  double   bepo_tz = 90.0*Gaudi::Units::degree;
+  double   bepo_tz_e = ( M_PI / 4 )*Gaudi::Units::rad;
+  double   bepo_ty = 90.0*Gaudi::Units::degree;
+  double   bepo_Beta = 4.668*Gaudi::Units::degree;
+  double   bepo_z_e = -42.86*Gaudi::Units::cm; // 43 Gaudi::Units::cm * cos(4.668)
+  double   bepo_emec_shift = 2.5*Gaudi::Units::cm;
+  double   bepo_excluder_shift = 34.4*Gaudi::Units::cm;
+  //double   bepo_hec_shift = 63.6*Gaudi::Units::cm; // relative position of HEC versus EMEC
   //double   bepo_y_a = bcry_rlar-bepo_emec_shift-bepo_hec_shift;
   double   bepo_y_ex = bcry_rlar-bepo_excluder_shift;
-  double   bepo_y_hecshift = 6.*GeoModelKernelUnits::mm;
-  double   bepo_y_emecshift = 11.*GeoModelKernelUnits::mm;
-  double   bepo_x = -2.75*GeoModelKernelUnits::mm;
-  double   bepo_x_e = -17.*GeoModelKernelUnits::mm;
-//  double   bepo_x = 13.25*GeoModelKernelUnits::mm;
-//  double   bepo_x_e = -3.*GeoModelKernelUnits::mm;
-//  double   bepo_x = 17.25*GeoModelKernelUnits::mm;
-//  double   bepo_x_e = -3.*GeoModelKernelUnits::mm;
-  //double   bepo_z = -48.24*GeoModelKernelUnits::cm; // 48.4 GeoModelKernelUnits::cm * cos(4.668)
+  double   bepo_y_hecshift = 6.*Gaudi::Units::mm;
+  double   bepo_y_emecshift = 11.*Gaudi::Units::mm;
+  double   bepo_x = -2.75*Gaudi::Units::mm;
+  double   bepo_x_e = -17.*Gaudi::Units::mm;
+//  double   bepo_x = 13.25*Gaudi::Units::mm;
+//  double   bepo_x_e = -3.*Gaudi::Units::mm;
+//  double   bepo_x = 17.25*Gaudi::Units::mm;
+//  double   bepo_x_e = -3.*Gaudi::Units::mm;
+  //double   bepo_z = -48.24*Gaudi::Units::cm; // 48.4 Gaudi::Units::cm * cos(4.668)
   double   bepo_y_e = bcry_rlar-bepo_emec_shift;
-  double   bepo_pz = 45.0*GeoModelKernelUnits::degree;
+  double   bepo_pz = 45.0*Gaudi::Units::degree;
 
   std::string baseName = "LArGeoTB::LeakageDet::";
 
@@ -249,9 +250,9 @@ GeoVFullPhysVol* LArGeo::ModulesConstructionH62004::GetEnvelope()
   if(m_Options && m_Options->isRun1()) {
      ylen = bryr_y;
   } else {
-     ylen = bryr_y - 200.*GeoModelKernelUnits::mm;
+     ylen = bryr_y - 200.*Gaudi::Units::mm;
   }
-  GeoTubs *shapeMother = new GeoTubs( 0.0*GeoModelKernelUnits::cm, bcry_rlar, ylen, bcry_phistart,bcry_phiend);
+  GeoTubs *shapeMother = new GeoTubs( 0.0*Gaudi::Units::cm, bcry_rlar, ylen, bcry_phistart,bcry_phiend);
   GeoLogVol *logMother = new GeoLogVol(baseName + "LAr", shapeMother, LAr);
 
   m_ModulesPhys = new GeoFullPhysVol(logMother);
@@ -294,7 +295,7 @@ GeoVFullPhysVol* LArGeo::ModulesConstructionH62004::GetEnvelope()
     /*if(excluderEnvelope != 0)*/{
       GeoTrf::Transform3D rot2 = GeoTrf::RotateX3D(bepo_Beta) * GeoTrf::RotateX3D(bepo_ty) * GeoTrf::RotateZ3D(bepo_tz);
       m_ModulesPhys->add(new GeoSerialIdentifier(0));
-      m_ModulesPhys->add(new GeoTransform(GeoTrf::Translation3D(0.,bepo_y_ex,bepo_z_e+42.*GeoModelKernelUnits::mm) * rot2));
+      m_ModulesPhys->add(new GeoTransform(GeoTrf::Translation3D(0.,bepo_y_ex,bepo_z_e+42.*Gaudi::Units::mm) * rot2));
       m_ModulesPhys->add(excluderEnvelope);
     }
   }
@@ -310,8 +311,8 @@ GeoVFullPhysVol* LArGeo::ModulesConstructionH62004::GetEnvelope()
     if(fcexcluderEnvelope != 0){
       GeoTrf::Transform3D rot2 = GeoTrf::RotateX3D(0.8*bepo_Beta) * GeoTrf::RotateX3D(-bepo_ty) * GeoTrf::RotateZ3D(bepo_tx);
       m_ModulesPhys->add(new GeoSerialIdentifier(0));
-//      m_ModulesPhys->add(new GeoTransform(GeoTrf::Transform3D(rot2,GeoTrf::Vector3D(0.,bepo_y_ex-138.*GeoModelKernelUnits::mm,-477.3*GeoModelKernelUnits::mm))));
-      m_ModulesPhys->add(new GeoTransform(GeoTrf::Translation3D(0.,bepo_y_ex-146.*GeoModelKernelUnits::mm,-412.0*GeoModelKernelUnits::mm) * rot2));
+//      m_ModulesPhys->add(new GeoTransform(GeoTrf::Transform3D(rot2,GeoTrf::Vector3D(0.,bepo_y_ex-138.*Gaudi::Units::mm,-477.3*Gaudi::Units::mm))));
+      m_ModulesPhys->add(new GeoTransform(GeoTrf::Translation3D(0.,bepo_y_ex-146.*Gaudi::Units::mm,-412.0*Gaudi::Units::mm) * rot2));
       m_ModulesPhys->add(fcexcluderEnvelope);
     }
   }
@@ -324,14 +325,14 @@ GeoVFullPhysVol* LArGeo::ModulesConstructionH62004::GetEnvelope()
   /*if(frontexcluder != 0)*/{
     GeoVFullPhysVol* frontexcluderEnvelope = frontexcluder.GetEnvelope();
     if(frontexcluderEnvelope != 0){
-      GeoTrf::RotateZ3D rot2((90.)*GeoModelKernelUnits::degree);
+      GeoTrf::RotateZ3D rot2((90.)*Gaudi::Units::degree);
       m_ModulesPhys->add(new GeoSerialIdentifier(0));
-      m_ModulesPhys->add(new GeoTransform(GeoTrf::Translation3D(0.,0.,20.*GeoModelKernelUnits::mm) * rot2));
+      m_ModulesPhys->add(new GeoTransform(GeoTrf::Translation3D(0.,0.,20.*Gaudi::Units::mm) * rot2));
       m_ModulesPhys->add(frontexcluderEnvelope);
       /*
       G4VPhysicalVolume* frontexcluderPhysical =
-//	    new G4PVPlacement(GeoTrf::Transform3D(rot2,GeoTrf::Vector3D(0.,0.,220.*GeoModelKernelUnits::mm)), // Translation 
-	    new G4PVPlacement(GeoTrf::Transform3D(rot2,GeoTrf::Vector3D(0.,0.,20.*GeoModelKernelUnits::mm)), // Translation 
+//	    new G4PVPlacement(GeoTrf::Transform3D(rot2,GeoTrf::Vector3D(0.,0.,220.*Gaudi::Units::mm)), // Translation 
+	    new G4PVPlacement(GeoTrf::Transform3D(rot2,GeoTrf::Vector3D(0.,0.,20.*Gaudi::Units::mm)), // Translation 
 			      frontexcluderEnvelope,                     // Logical volume
 			      frontexcluderEnvelope->GetName(),          // Name 
 			      logMother,                        // Mother volume 
@@ -349,13 +350,13 @@ GeoVFullPhysVol* LArGeo::ModulesConstructionH62004::GetEnvelope()
   /*if(backexcluder != 0)*/{
     GeoVFullPhysVol* backexcluderEnvelope = backexcluder.GetEnvelope();
     if(backexcluderEnvelope != 0){
-      GeoTrf::RotateZ3D rot2((-90.-29.)*GeoModelKernelUnits::degree);
+      GeoTrf::RotateZ3D rot2((-90.-29.)*Gaudi::Units::degree);
       m_ModulesPhys->add(new GeoSerialIdentifier(0));
-      m_ModulesPhys->add(new GeoTransform(GeoTrf::Translation3D(0.,0.,0.*GeoModelKernelUnits::mm) * rot2));
+      m_ModulesPhys->add(new GeoTransform(GeoTrf::Translation3D(0.,0.,0.*Gaudi::Units::mm) * rot2));
       m_ModulesPhys->add(backexcluderEnvelope);
       /*
       G4VPhysicalVolume* backexcluderPhysical =
-	    new G4PVPlacement(GeoTrf::Transform3D(rot2,GeoTrf::Vector3D(0.,0.,0.*GeoModelKernelUnits::mm)), // Translation 
+	    new G4PVPlacement(GeoTrf::Transform3D(rot2,GeoTrf::Vector3D(0.,0.,0.*Gaudi::Units::mm)), // Translation 
 			      backexcluderEnvelope,                     // Logical volume
 			      backexcluderEnvelope->GetName(),          // Name 
 			      logMother,                        // Mother volume 
@@ -373,27 +374,27 @@ GeoVFullPhysVol* LArGeo::ModulesConstructionH62004::GetEnvelope()
 
   // Transformation for assembly - should be putted to each piece now.
   GeoTrf::Transform3D rota = GeoTrf::RotateX3D(bepo_Beta) * GeoTrf::RotateX3D(bepo_ty) * GeoTrf::RotateZ3D(-bepo_pz);
-  GeoTrf::Transform3D trans = GeoTrf::Translation3D(0.,bepo_y_e,bepo_z_e+65.*GeoModelKernelUnits::mm) * rota;
+  GeoTrf::Transform3D trans = GeoTrf::Translation3D(0.,bepo_y_e,bepo_z_e+65.*Gaudi::Units::mm) * rota;
   
 //positions emec
 
   // Z-positions DB values !!!!
 
-  double HECzStart         =  427.7*GeoModelKernelUnits::cm;
-  double EMECzStart         = 364.1*GeoModelKernelUnits::cm;
-  double FCALzStart         =  466.85*GeoModelKernelUnits::cm;
-  double FCALzEnd           =  588.28*GeoModelKernelUnits::cm;
+  double HECzStart         =  427.7*Gaudi::Units::cm;
+  double EMECzStart         = 364.1*Gaudi::Units::cm;
+  double FCALzStart         =  466.85*Gaudi::Units::cm;
+  double FCALzEnd           =  588.28*Gaudi::Units::cm;
 
   if((!m_Options) || m_Options->isEmec()){
     GeoTrf::RotateZ3D MrotEmec(bepo_tz_e);
      // original value:
-//     GeoTrf::Vector3D pos3Emec(    0*GeoModelKernelUnits::mm,   9.0*GeoModelKernelUnits::mm ,   55.9*GeoModelKernelUnits::mm);
-//     GeoTrf::Vector3D pos3Emec(    3.636*GeoModelKernelUnits::mm,   9.0*GeoModelKernelUnits::mm ,   55.9*GeoModelKernelUnits::mm);
-//     GeoTrf::Vector3D pos3Emec(    bepo_x_e,   9.*GeoModelKernelUnits::mm ,   61.*GeoModelKernelUnits::mm);
+//     GeoTrf::Vector3D pos3Emec(    0*Gaudi::Units::mm,   9.0*Gaudi::Units::mm ,   55.9*Gaudi::Units::mm);
+//     GeoTrf::Vector3D pos3Emec(    3.636*Gaudi::Units::mm,   9.0*Gaudi::Units::mm ,   55.9*Gaudi::Units::mm);
+//     GeoTrf::Vector3D pos3Emec(    bepo_x_e,   9.*Gaudi::Units::mm ,   61.*Gaudi::Units::mm);
     GeoTrf::Translation3D pos3Emec((bepo_x_e - bepo_y_emecshift )/2./sin(bepo_tz_e)
 				   , (bepo_x_e + bepo_y_emecshift )/2./sin(bepo_tz_e)
-				   , 61.*GeoModelKernelUnits::mm);
-//     GeoTrf::Vector3D pos3Emec(    0.*GeoModelKernelUnits::mm, bepo_x_e,   61.*GeoModelKernelUnits::mm);
+				   , 61.*Gaudi::Units::mm);
+//     GeoTrf::Vector3D pos3Emec(    0.*Gaudi::Units::mm, bepo_x_e,   61.*Gaudi::Units::mm);
 
 //     std::cout<<"ModulesConstructionH62004 calling EMECModuleConstruction....."<<std::endl;
   //use this line for physical construction of the EMEC inner wheel only:
@@ -421,12 +422,12 @@ GeoVFullPhysVol* LArGeo::ModulesConstructionH62004::GetEnvelope()
 //        rot.rotateX(bepo_Beta);
   
 //        GeoTrf::Transform3D hpos = GeoTrf::Transform3D(rot,GeoTrf::Vector3D(bepo_x,bepo_y_a,bepo_z));
-//        GeoTrf::Vector3D hecshift(0.,6.*GeoModelKernelUnits::mm,HECzStart-EMECzStart);
+//        GeoTrf::Vector3D hecshift(0.,6.*Gaudi::Units::mm,HECzStart-EMECzStart);
 //          GeoTrf::Vector3D hecshift((bepo_x - bepo_y_hecshift)/2./sin(bepo_tz_e), (bepo_x + bepo_y_hecshift)/2./sin(bepo_tz_e), HECzStart-EMECzStart);
-//        GeoTrf::Vector3D hecshift(-21.*GeoModelKernelUnits::mm, bepo_x, HECzStart-EMECzStart);
-//        GeoTrf::Vector3D hecshift(-5.*GeoModelKernelUnits::mm, bepo_x, HECzStart-EMECzStart);
-//        GeoTrf::Vector3D hecshift(0.*GeoModelKernelUnits::mm, bepo_x, HECzStart-EMECzStart);
-//       GeoModelKernelUnits::HepRotation norot;
+//        GeoTrf::Vector3D hecshift(-21.*Gaudi::Units::mm, bepo_x, HECzStart-EMECzStart);
+//        GeoTrf::Vector3D hecshift(-5.*Gaudi::Units::mm, bepo_x, HECzStart-EMECzStart);
+//        GeoTrf::Vector3D hecshift(0.*Gaudi::Units::mm, bepo_x, HECzStart-EMECzStart);
+//       Gaudi::Units::HepRotation norot;
         m_ModulesPhys->add(new GeoTransform(trans));
         m_ModulesPhys->add( new GeoTransform(GeoTrf::Translate3D((bepo_x - bepo_y_hecshift)/2./sin(bepo_tz_e)
 								 , (bepo_x + bepo_y_hecshift)/2./sin(bepo_tz_e)
@@ -444,15 +445,15 @@ GeoVFullPhysVol* LArGeo::ModulesConstructionH62004::GetEnvelope()
       fcal.setFCALVisLimit(m_fcalVisLimit); 
       GeoVPhysVol* fcalEnvelope = fcal.GetEnvelope();
       if(fcalEnvelope != 0){
-//        GeoModelKernelUnits::HepRotation rotFCal;
-       // rotFCal.rotateY(0.*GeoModelKernelUnits::deg);
+//        Gaudi::Units::HepRotation rotFCal;
+       // rotFCal.rotateY(0.*Gaudi::Units::deg);
        //  rotFCal.rotateZ(-bepo_pz);
        //  rotFCal.rotateX(bepo_ty);
        //  rotFCal.rotateX(bepo_Beta);
-//        GeoTrf::Vector3D fcalshift(0.,-7.*GeoModelKernelUnits::mm,FCALzStart-EMECzStart+(FCALzEnd-FCALzStart)/2.);
+//        GeoTrf::Vector3D fcalshift(0.,-7.*Gaudi::Units::mm,FCALzStart-EMECzStart+(FCALzEnd-FCALzStart)/2.);
         m_ModulesPhys->add(new GeoTransform(trans));
-        m_ModulesPhys->add( new GeoTransform(GeoTrf::Translate3D(9.*GeoModelKernelUnits::mm
-								 ,0.*GeoModelKernelUnits::mm
+        m_ModulesPhys->add( new GeoTransform(GeoTrf::Translate3D(9.*Gaudi::Units::mm
+								 ,0.*Gaudi::Units::mm
 								 ,FCALzStart-EMECzStart+(FCALzEnd-FCALzStart)/2.)) );
         m_ModulesPhys->add(fcalEnvelope);
       }
@@ -463,48 +464,48 @@ GeoVFullPhysVol* LArGeo::ModulesConstructionH62004::GetEnvelope()
   // Position a cold nose
   //
   
-  double box_x = (650./2.)*GeoModelKernelUnits::mm;
-  double box_y = (356./2.)*GeoModelKernelUnits::mm;
-  double box_z = (50.8/2.)*GeoModelKernelUnits::mm;
-  double btot = 494.*GeoModelKernelUnits::mm;
-  double tub_r = 452.*GeoModelKernelUnits::mm;
-  double tub1_dr = 8.*GeoModelKernelUnits::mm;
-  double tub1_z = (1320./2.)*GeoModelKernelUnits::mm;
-  double cyl_dr = 10.*GeoModelKernelUnits::mm;
-  double cyl_r1 = 262.*GeoModelKernelUnits::mm;
-  double cyl_r2 = 336.5*GeoModelKernelUnits::mm;
-  double cyl_z = (912./2.)*GeoModelKernelUnits::mm;
-  double cyl_shift = (10. + 25.)*GeoModelKernelUnits::mm; 
-//  double NoseZshift = -360.*GeoModelKernelUnits::mm;
-  double NoseZshift = -63.1*GeoModelKernelUnits::mm;
-//  double NoseYshift = 94.4*GeoModelKernelUnits::mm;
-//  double NoseYshift = 96.4*GeoModelKernelUnits::mm;
-  double NoseYshift = 98.4*GeoModelKernelUnits::mm;
-//  double NoseXshift = -195.*GeoModelKernelUnits::mm;
-  double NoseXshift = -94.4*GeoModelKernelUnits::mm;
+  double box_x = (650./2.)*Gaudi::Units::mm;
+  double box_y = (356./2.)*Gaudi::Units::mm;
+  double box_z = (50.8/2.)*Gaudi::Units::mm;
+  double btot = 494.*Gaudi::Units::mm;
+  double tub_r = 452.*Gaudi::Units::mm;
+  double tub1_dr = 8.*Gaudi::Units::mm;
+  double tub1_z = (1320./2.)*Gaudi::Units::mm;
+  double cyl_dr = 10.*Gaudi::Units::mm;
+  double cyl_r1 = 262.*Gaudi::Units::mm;
+  double cyl_r2 = 336.5*Gaudi::Units::mm;
+  double cyl_z = (912./2.)*Gaudi::Units::mm;
+  double cyl_shift = (10. + 25.)*Gaudi::Units::mm; 
+//  double NoseZshift = -360.*Gaudi::Units::mm;
+  double NoseZshift = -63.1*Gaudi::Units::mm;
+//  double NoseYshift = 94.4*Gaudi::Units::mm;
+//  double NoseYshift = 96.4*Gaudi::Units::mm;
+  double NoseYshift = 98.4*Gaudi::Units::mm;
+//  double NoseXshift = -195.*Gaudi::Units::mm;
+  double NoseXshift = -94.4*Gaudi::Units::mm;
 
   GeoBox* Box1 = new GeoBox(box_x, box_y, box_z);
   double alpha = acos(box_x/tub_r);
   double ax = M_PI - 2*alpha;
   GeoTubs* Tub= new GeoTubs(0., tub_r, box_z, alpha, ax);
 
-//  tRot.rotateX(90*GeoModelKernelUnits::degree);
+//  tRot.rotateX(90*Gaudi::Units::degree);
   GeoTrf::Translate3D TubTrans(0.,btot-box_y-tub_r,0.);
   const GeoShapeUnion &uSolid = (*Box1).add((*Tub)<<TubTrans);
 
   GeoTubs* Tub1 = new GeoTubs(tub_r, tub_r+tub1_dr, tub1_z, alpha, ax);  
 //  GeoTrf::Vector3D TubShift2(0.,btot-box_y-tub_r,-tub1_z+box_z);
 //  GeoTrf::Vector3D TubShift2(0.,0.,0.);
-//  tRot.rotateX(90*GeoModelKernelUnits::degree);
-  GeoTrf::Translate3D UnTrans(0.,-135.5*GeoModelKernelUnits::mm,-tub1_z+box_z);
+//  tRot.rotateX(90*Gaudi::Units::degree);
+  GeoTrf::Translate3D UnTrans(0.,-135.5*Gaudi::Units::mm,-tub1_z+box_z);
   const GeoShapeUnion &uSolid2 = uSolid.add((*Tub1)<<UnTrans);
 
   GeoCons* Cone = new GeoCons(cyl_r2, cyl_r1, cyl_r2+cyl_dr, cyl_r1+cyl_dr, cyl_z, M_PI/4.,M_PI/2.);
-//  GeoTrf::Vector3D CylShift(0.,-box_y+cyl_shift,cyl_z+box_z-3.*GeoModelKernelUnits::mm);
-  GeoTrf::Translation3D CylShift(0.,-box_y+cyl_shift,cyl_z+box_z-5.*GeoModelKernelUnits::mm);
+//  GeoTrf::Vector3D CylShift(0.,-box_y+cyl_shift,cyl_z+box_z-3.*Gaudi::Units::mm);
+  GeoTrf::Translation3D CylShift(0.,-box_y+cyl_shift,cyl_z+box_z-5.*Gaudi::Units::mm);
 //  GeoTrf::Vector3D CylShift(0.,0.,cyl_z+box_z);
-  GeoTrf::RotateX3D tRot(1.*GeoModelKernelUnits::degree);
-//  tRot.rotateZ(-90*GeoModelKernelUnits::degree);
+  GeoTrf::RotateX3D tRot(1.*Gaudi::Units::degree);
+//  tRot.rotateZ(-90*Gaudi::Units::degree);
   GeoTrf::Transform3D CylTrans = CylShift * tRot;
   const GeoShapeUnion &uSolid3 =  uSolid2.add((*Cone)<<CylTrans);
 
@@ -529,7 +530,7 @@ GeoVFullPhysVol* LArGeo::ModulesConstructionH62004::GetEnvelope()
   // Do an imprint of assembly:
   
   /*
-  GeoModelKernelUnits::HepRotation rota;
+  Gaudi::Units::HepRotation rota;
   rota.rotateZ(-bepo_pz);
   rota.rotateX(bepo_ty);
   rota.rotateX(bepo_Beta);
@@ -647,14 +648,14 @@ LArGeo::ModulesConstructionH62004::construct(const StoredMaterialManager* materi
 //------------------ now construct shape and logical volume ---------------
   GeoLogVol *volume_log;
   if(myID == 6 || myID == 9 || myID == 17) {
-     GeoTubs *tub = new GeoTubs(s_dX[myID-1],s_dY[myID-1],s_dZ[myID-1],-43.*GeoModelKernelUnits::degree,86.*GeoModelKernelUnits::degree);
+     GeoTubs *tub = new GeoTubs(s_dX[myID-1],s_dY[myID-1],s_dZ[myID-1],-43.*Gaudi::Units::degree,86.*Gaudi::Units::degree);
      volume_log = new GeoLogVol(name,tub,Vacuum); 
   } else if(myID == 3) {
-     GeoTubs *tub = new GeoTubs(s_dX[myID-1],s_dY[myID-1],s_dZ[myID-1],-32.*GeoModelKernelUnits::degree,64.*GeoModelKernelUnits::degree);
+     GeoTubs *tub = new GeoTubs(s_dX[myID-1],s_dY[myID-1],s_dZ[myID-1],-32.*Gaudi::Units::degree,64.*Gaudi::Units::degree);
      volume_log = new GeoLogVol(name,tub,Vacuum); 
 #if 0 // impossible case...
   } else if(myID == 19) {
-    GeoTrd *trd = new GeoTrd(s_dX[myID-1]-16.*GeoModelKernelUnits::cm,s_dX[myID-1],s_dY[myID-1],s_dY[myID-1],s_dZ[myID-1]);
+    GeoTrd *trd = new GeoTrd(s_dX[myID-1]-16.*Gaudi::Units::cm,s_dX[myID-1],s_dY[myID-1],s_dY[myID-1],s_dZ[myID-1]);
     volume_log = new GeoLogVol(name,trd,Vacuum); 
 #endif
   } else {
diff --git a/LArCalorimeter/LArGeoModel/LArGeoH62004Algs/src/MovableTableConstructionH62004.cxx b/LArCalorimeter/LArGeoModel/LArGeoH62004Algs/src/MovableTableConstructionH62004.cxx
index 814b178f239e633b33a1d8815a04c7a81c1c0e3f..cb5d2f9a3d2459a7de0572565eef7eb5d6365e2a 100755
--- a/LArCalorimeter/LArGeoModel/LArGeoH62004Algs/src/MovableTableConstructionH62004.cxx
+++ b/LArCalorimeter/LArGeoModel/LArGeoH62004Algs/src/MovableTableConstructionH62004.cxx
@@ -25,7 +25,6 @@
 #include "GeoModelKernel/GeoIdentifierTag.h"  
 #include "GeoModelKernel/GeoSerialDenominator.h"
 #include "GeoModelKernel/GeoDefinitions.h"
-#include "GeoModelKernel/Units.h"
 #include "StoreGate/StoreGateSvc.h"
 #include "GeoModelInterfaces/AbsMaterialManager.h"
 #include "GeoModelInterfaces/StoredMaterialManager.h"
@@ -41,6 +40,7 @@
 
 #include "GaudiKernel/MsgStream.h"
 #include "GaudiKernel/Bootstrap.h"
+#include "GaudiKernel/SystemOfUnits.h"
 
 #include <string>
 #include <cmath>
@@ -122,25 +122,25 @@ GeoVPhysVol* LArGeo::MovableTableConstructionH62004::GetEnvelope()
   //
   // Define dimension of Movable part & position of Front part
   //
-  double bttb_x = 15.0*GeoModelKernelUnits::cm;
-  double bttb_y = 15.0*GeoModelKernelUnits::cm;
-  double bttb_z = 120.0*GeoModelKernelUnits::cm;
-  //double bttb_pos = 833.5*GeoModelKernelUnits::cm;
+  double bttb_x = 15.0*Gaudi::Units::cm;
+  double bttb_y = 15.0*Gaudi::Units::cm;
+  double bttb_z = 120.0*Gaudi::Units::cm;
+  //double bttb_pos = 833.5*Gaudi::Units::cm;
   //
   // Define S scintilator dimension and positions
   //
-  double btas_x = 7.5*GeoModelKernelUnits::cm;
-  double btas_y = 7.5*GeoModelKernelUnits::cm;
-  double btas_z = 1.0*GeoModelKernelUnits::cm;
-  double bb2_x = 3.0*GeoModelKernelUnits::cm;
-  double btas_pos[3] = {100.*GeoModelKernelUnits::cm, 219.5*GeoModelKernelUnits::cm, 232.0*GeoModelKernelUnits::cm};
-  double bh_x = 30.0*GeoModelKernelUnits::cm;
-  double bh_d = 6.0*GeoModelKernelUnits::cm;
-  double bh_shift = 12.0*GeoModelKernelUnits::cm;
-  double bb_shift = 2.5*GeoModelKernelUnits::cm;
-
-  double mwpc_pos[4] =  {44.5*GeoModelKernelUnits::cm, 12.5*GeoModelKernelUnits::cm, 87.0*GeoModelKernelUnits::cm, 185.3*GeoModelKernelUnits::cm};
-  double bpc_pos[2] =  {140.5*GeoModelKernelUnits::cm, 130.5*GeoModelKernelUnits::cm};
+  double btas_x = 7.5*Gaudi::Units::cm;
+  double btas_y = 7.5*Gaudi::Units::cm;
+  double btas_z = 1.0*Gaudi::Units::cm;
+  double bb2_x = 3.0*Gaudi::Units::cm;
+  double btas_pos[3] = {100.*Gaudi::Units::cm, 219.5*Gaudi::Units::cm, 232.0*Gaudi::Units::cm};
+  double bh_x = 30.0*Gaudi::Units::cm;
+  double bh_d = 6.0*Gaudi::Units::cm;
+  double bh_shift = 12.0*Gaudi::Units::cm;
+  double bb_shift = 2.5*Gaudi::Units::cm;
+
+  double mwpc_pos[4] =  {44.5*Gaudi::Units::cm, 12.5*Gaudi::Units::cm, 87.0*Gaudi::Units::cm, 185.3*Gaudi::Units::cm};
+  double bpc_pos[2] =  {140.5*Gaudi::Units::cm, 130.5*Gaudi::Units::cm};
 
   GeoBox* H62004MovableShape = new GeoBox( bttb_x, bttb_y, bttb_z );   
   const GeoLogVol* H62004FrontBeamLogical = new GeoLogVol( H62004MovableName, H62004MovableShape, Air );
@@ -152,8 +152,8 @@ GeoVPhysVol* LArGeo::MovableTableConstructionH62004::GetEnvelope()
   //   In the old stand-alone code, all three were round with a radius of 5cm 
   //   and 7.5mm thickness.
   //   Logbooks in the control-room say that their xyz sizes are:
-  //   B1   : 30 x 30 x 10 GeoModelKernelUnits::mm
-  //   W1,2 : 150 x 150 x 10 GeoModelKernelUnits::mm
+  //   B1   : 30 x 30 x 10 Gaudi::Units::mm
+  //   W1,2 : 150 x 150 x 10 Gaudi::Units::mm
   // They are certainly not round, so stick with the logbook values 
   // The beam sees the instrumentation in the following order:
   // W1, W2, B1, MWPC5
@@ -162,7 +162,7 @@ GeoVPhysVol* LArGeo::MovableTableConstructionH62004::GetEnvelope()
 
   // Create scintillator S1(num=4),S2,S3(num= 6,7)
   
-  GeoBox* ScintShapeS1 = new GeoBox((btas_x-1.*GeoModelKernelUnits::cm)/2., (btas_y-1.*GeoModelKernelUnits::cm)/2., btas_z/2.);  
+  GeoBox* ScintShapeS1 = new GeoBox((btas_x-1.*Gaudi::Units::cm)/2., (btas_y-1.*Gaudi::Units::cm)/2., btas_z/2.);  
   GeoBox* ScintShapeS23 = new GeoBox(btas_x/2., btas_y/2., btas_z/2.);  
   std::string ScintName = H62004MovableName + "::Scintillator";
   GeoLogVol* S1ScintLogical = new GeoLogVol( ScintName, ScintShapeS1, Scint );
@@ -171,11 +171,11 @@ GeoVPhysVol* LArGeo::MovableTableConstructionH62004::GetEnvelope()
   GeoPhysVol* S2ScintPhysical = new GeoPhysVol( S23ScintLogical );    
 
   m_H62004MovableTablePhysical->add( new GeoIdentifierTag(4) );
-  m_H62004MovableTablePhysical->add( new GeoTransform( GeoTrf::Translate3D( 0.*GeoModelKernelUnits::cm, 0.*GeoModelKernelUnits::cm, btas_pos[0]-bttb_z ) ) ) ;     
+  m_H62004MovableTablePhysical->add( new GeoTransform( GeoTrf::Translate3D( 0.*Gaudi::Units::cm, 0.*Gaudi::Units::cm, btas_pos[0]-bttb_z ) ) ) ;     
   m_H62004MovableTablePhysical->add(S1ScintPhysical);
   for ( unsigned int i = 1; i <3; ++i ) {
     m_H62004MovableTablePhysical->add( new GeoIdentifierTag(i+5) );
-    m_H62004MovableTablePhysical->add( new GeoTransform( GeoTrf::Translate3D( 0.*GeoModelKernelUnits::cm, 0.*GeoModelKernelUnits::cm, btas_pos[i]-bttb_z ) ) ) ; 
+    m_H62004MovableTablePhysical->add( new GeoTransform( GeoTrf::Translate3D( 0.*Gaudi::Units::cm, 0.*Gaudi::Units::cm, btas_pos[i]-bttb_z ) ) ) ; 
     m_H62004MovableTablePhysical->add( S2ScintPhysical ); 
   }
   // Create scintilators H (copy num 5) and B2 (copy num 8)
@@ -185,14 +185,14 @@ GeoVPhysVol* LArGeo::MovableTableConstructionH62004::GetEnvelope()
   GeoLogVol* logHSc = new GeoLogVol( ScintName, &shapeHSc, Scint);
   GeoPhysVol* physHSc = new GeoPhysVol(logHSc);
   m_H62004MovableTablePhysical->add( new GeoIdentifierTag(5) );
-  m_H62004MovableTablePhysical->add( new GeoTransform( GeoTrf::Translate3D( 0.*GeoModelKernelUnits::cm, 0.*GeoModelKernelUnits::cm, (btas_pos[0]-bttb_z) + bh_shift) )  ) ;     
+  m_H62004MovableTablePhysical->add( new GeoTransform( GeoTrf::Translate3D( 0.*Gaudi::Units::cm, 0.*Gaudi::Units::cm, (btas_pos[0]-bttb_z) + bh_shift) )  ) ;     
   m_H62004MovableTablePhysical->add(physHSc);
 
-  GeoBox* boxB = new GeoBox(bb2_x/2., bb2_x/2., (btas_z+2.5*GeoModelKernelUnits::cm)/2.);
+  GeoBox* boxB = new GeoBox(bb2_x/2., bb2_x/2., (btas_z+2.5*Gaudi::Units::cm)/2.);
   GeoLogVol* logBSc = new GeoLogVol( ScintName, boxB, Scint);
   GeoPhysVol* physBSc = new GeoPhysVol(logBSc);
   m_H62004MovableTablePhysical->add( new GeoIdentifierTag(8) );
-  m_H62004MovableTablePhysical->add( new GeoTransform( GeoTrf::Translate3D( 0.*GeoModelKernelUnits::cm, 0.*GeoModelKernelUnits::cm, (btas_pos[2]-bttb_z) + bb_shift )  ) ) ;     
+  m_H62004MovableTablePhysical->add( new GeoTransform( GeoTrf::Translate3D( 0.*Gaudi::Units::cm, 0.*Gaudi::Units::cm, (btas_pos[2]-bttb_z) + bb_shift )  ) ) ;     
   m_H62004MovableTablePhysical->add(physBSc);
   
   //----- Done with Scintillators
@@ -200,12 +200,12 @@ GeoVPhysVol* LArGeo::MovableTableConstructionH62004::GetEnvelope()
   //------ Now create MWPC N2 & N3 & N4 
   log << MSG::INFO << " Create MWPC's " << endmsg;
   
-  MWPCConstruction MWPC(1.*GeoModelKernelUnits::mm);
+  MWPCConstruction MWPC(1.*Gaudi::Units::mm);
   GeoVPhysVol* MwpcPhysical = MWPC.GetEnvelope();
 
   for(int i = 1; i < 4; ++i){
      m_H62004MovableTablePhysical->add( new GeoIdentifierTag(i+1) );
-     m_H62004MovableTablePhysical->add( new GeoTransform(GeoTrf::Translate3D( 0.*GeoModelKernelUnits::cm, 0.*GeoModelKernelUnits::cm, mwpc_pos[i]-bttb_z ) ) );
+     m_H62004MovableTablePhysical->add( new GeoTransform(GeoTrf::Translate3D( 0.*Gaudi::Units::cm, 0.*Gaudi::Units::cm, mwpc_pos[i]-bttb_z ) ) );
      m_H62004MovableTablePhysical->add( MwpcPhysical );
   }
   //----- Done with the MWPC
@@ -217,7 +217,7 @@ GeoVPhysVol* LArGeo::MovableTableConstructionH62004::GetEnvelope()
   GeoVPhysVol* BPCPhysical = BPC.GetEnvelope();
   for(int i=1; i<3; ++i) {
      m_H62004MovableTablePhysical->add( new GeoIdentifierTag(7-i) );
-     m_H62004MovableTablePhysical->add( new GeoTransform(GeoTrf::Translate3D( 0.*GeoModelKernelUnits::cm, 0.*GeoModelKernelUnits::cm, bpc_pos[i-1]-bttb_z) ) );
+     m_H62004MovableTablePhysical->add( new GeoTransform(GeoTrf::Translate3D( 0.*Gaudi::Units::cm, 0.*Gaudi::Units::cm, bpc_pos[i-1]-bttb_z) ) );
      m_H62004MovableTablePhysical->add(BPCPhysical);
   }
 
diff --git a/LArCalorimeter/LArGeoModel/LArGeoH62004Algs/src/WarmTCConstructionH62004.cxx b/LArCalorimeter/LArGeoModel/LArGeoH62004Algs/src/WarmTCConstructionH62004.cxx
index 272988e0d7ae52dea0e08a6130d062639e0dfabb..ed714e4157d0516f23762fd8e256c6eb93fd8819 100755
--- a/LArCalorimeter/LArGeoModel/LArGeoH62004Algs/src/WarmTCConstructionH62004.cxx
+++ b/LArCalorimeter/LArGeoModel/LArGeoH62004Algs/src/WarmTCConstructionH62004.cxx
@@ -41,6 +41,7 @@
 
 #include "GaudiKernel/MsgStream.h"
 #include "GaudiKernel/Bootstrap.h"
+#include "GaudiKernel/SystemOfUnits.h"
 #include "RDBAccessSvc/IRDBAccessSvc.h"
 #include "RDBAccessSvc/IRDBRecord.h"
 #include "RDBAccessSvc/IRDBRecordset.h"
@@ -80,30 +81,30 @@ GeoVFullPhysVol* LArGeo::WarmTCConstructionH62004::GetEnvelope()
 // SHOULD GO INTO DB !!!!
 
 // Muon scintilators are the first one:
-double Muon_x = 20.0*GeoModelKernelUnits::cm;
-double Muon_y = 120.0*GeoModelKernelUnits::cm;
-double Muon_z = 1.0*GeoModelKernelUnits::cm;
+double Muon_x = 20.0*Gaudi::Units::cm;
+double Muon_y = 120.0*Gaudi::Units::cm;
+double Muon_z = 1.0*Gaudi::Units::cm;
 // The extra space to accumulate muon sci. into mother:
-double Muon_dist = 120.0*GeoModelKernelUnits::mm;
+double Muon_dist = 120.0*Gaudi::Units::mm;
 //
 // WTC dimensions
-double WTC_len = 591.5*GeoModelKernelUnits::mm;
-double WTC_high = 1250.0*GeoModelKernelUnits::mm;
-double WTC_sci_z = 12.7*GeoModelKernelUnits::mm;
-double WTC_sci_x = 190.0*GeoModelKernelUnits::mm;
-double WTC_sci_y = 1160.0*GeoModelKernelUnits::mm;
+double WTC_len = 591.5*Gaudi::Units::mm;
+double WTC_high = 1250.0*Gaudi::Units::mm;
+double WTC_sci_z = 12.7*Gaudi::Units::mm;
+double WTC_sci_x = 190.0*Gaudi::Units::mm;
+double WTC_sci_y = 1160.0*Gaudi::Units::mm;
 
 //  Define dimension WTC mother
 //
 double x_m = WTC_high / 2;
 double y_m = WTC_high / 2;
-double z_m = (86.0*GeoModelKernelUnits::mm + WTC_len + WTC_sci_z + Muon_dist + Muon_z) / 2;
+double z_m = (86.0*Gaudi::Units::mm + WTC_len + WTC_sci_z + Muon_dist + Muon_z) / 2;
 //
 // Define dimension of Fe absorber
 //
 double Fe_x = WTC_high / 2;
 double Fe_y = WTC_high / 2;
-double Fe_z = (99.0 / 2)*GeoModelKernelUnits::mm;
+double Fe_z = (99.0 / 2)*Gaudi::Units::mm;
 //
 // Define dimension of X scintilator
 //
@@ -124,24 +125,24 @@ double z_s = WTC_sci_z / 2;
 //
 double z_x[3], z_y[3], z_Fe[4];
  z_x[0]  = -z_m + Muon_dist + Muon_z + z_s;                   // X scin. Layer 1
- z_y[0]  = z_x[0] + 54*GeoModelKernelUnits::mm;               // Y scin. Layer 2
- z_Fe[0] = z_x[0] + 86.0*GeoModelKernelUnits::mm + Fe_z;      // 1st Fe abs.
- z_y[1]  = z_Fe[0] + 125.5*GeoModelKernelUnits::mm - Fe_z;    // Y scin. Layer 3
- z_Fe[1] = z_Fe[0] + 2 * Fe_z + 53.0*GeoModelKernelUnits::mm; // 2nd Fe abs.
- z_x[1]  = z_Fe[0] - Fe_z + 278.5*GeoModelKernelUnits::mm;    // X scin. Layer 4
- z_Fe[2] = z_Fe[1] + 2 *Fe_z + 52.5*GeoModelKernelUnits::mm;  // 3rd Fe abs.
- z_y[2]  = z_Fe[0] - Fe_z + 433.0*GeoModelKernelUnits::mm;    // Y scin. Layer 5
- z_Fe[3] = z_Fe[2] + 2 *Fe_z + 61.5*GeoModelKernelUnits::mm;  // 4rd Fe abs.
+ z_y[0]  = z_x[0] + 54*Gaudi::Units::mm;               // Y scin. Layer 2
+ z_Fe[0] = z_x[0] + 86.0*Gaudi::Units::mm + Fe_z;      // 1st Fe abs.
+ z_y[1]  = z_Fe[0] + 125.5*Gaudi::Units::mm - Fe_z;    // Y scin. Layer 3
+ z_Fe[1] = z_Fe[0] + 2 * Fe_z + 53.0*Gaudi::Units::mm; // 2nd Fe abs.
+ z_x[1]  = z_Fe[0] - Fe_z + 278.5*Gaudi::Units::mm;    // X scin. Layer 4
+ z_Fe[2] = z_Fe[1] + 2 *Fe_z + 52.5*Gaudi::Units::mm;  // 3rd Fe abs.
+ z_y[2]  = z_Fe[0] - Fe_z + 433.0*Gaudi::Units::mm;    // Y scin. Layer 5
+ z_Fe[3] = z_Fe[2] + 2 *Fe_z + 61.5*Gaudi::Units::mm;  // 4rd Fe abs.
  z_x[2]  = z_Fe[0] - Fe_z + WTC_len;     // X scin. Layer 6
 //
 // Tilding of the TC
-//double WTC_tild = -1.1*GeoModelKernelUnits::deg;   // 24 GeoModelKernelUnits::mm tild on 1250 GeoModelKernelUnits::mm length
-//double WTC_tild = 0.*GeoModelKernelUnits::deg;   // 24 GeoModelKernelUnits::mm tild on 1250 GeoModelKernelUnits::mm length
+//double WTC_tild = -1.1*Gaudi::Units::deg;   // 24 Gaudi::Units::mm tild on 1250 Gaudi::Units::mm length
+//double WTC_tild = 0.*Gaudi::Units::deg;   // 24 Gaudi::Units::mm tild on 1250 Gaudi::Units::mm length
 // Define position in test beam line....
 //
-//double WTC_x = 0.0*GeoModelKernelUnits::mm;
-//double WTC_y = 0.0*GeoModelKernelUnits::mm;
-//double WTC_z = 460.0*GeoModelKernelUnits::mm - 120.*GeoModelKernelUnits::mm - 10.*GeoModelKernelUnits::mm;
+//double WTC_x = 0.0*Gaudi::Units::mm;
+//double WTC_y = 0.0*Gaudi::Units::mm;
+//double WTC_z = 460.0*Gaudi::Units::mm - 120.*Gaudi::Units::mm - 10.*Gaudi::Units::mm;
 
 // Some elements
  
@@ -152,7 +153,7 @@ double z_x[3], z_y[3], z_Fe[4];
     const GeoMaterial* Iron = materialManager->getMaterial("std::Iron");    
     const GeoMaterial *Air = materialManager->getMaterial("std::Air");
  // Scintillator
-    double density = 1.032*GeoModelKernelUnits::g/GeoModelKernelUnits::cm3;
+    double density = 1.032*GeoModelKernelUnits::g/Gaudi::Units::cm3;
     GeoMaterial* Scintillator=new GeoMaterial("Scintillator",density);
     Scintillator->add(elC,0.9147);
     Scintillator->add(elH,0.0853);
@@ -181,16 +182,16 @@ double z_x[3], z_y[3], z_Fe[4];
  GeoLogVol *mu_log = new GeoLogVol(muname, mu_box, Scintillator);
  GeoPhysVol *mu_phys = new GeoPhysVol(mu_log);
  for(int i=1; i<=3; ++i) {
-    a = -5.*i*GeoModelKernelUnits::mm + (2*i-1)*Muon_x/2;
+    a = -5.*i*Gaudi::Units::mm + (2*i-1)*Muon_x/2;
     n = pow(-1,i) * Muon_z/2 - z_m + Muon_z;
-    GeoTrf::Vector3D posShift(a,0.0*GeoModelKernelUnits::mm,n);
+    GeoTrf::Vector3D posShift(a,0.0*Gaudi::Units::mm,n);
     m_WarmTCPhys->add(new GeoSerialIdentifier(6-i));
-    m_WarmTCPhys->add(new GeoTransform(GeoTrf::Translate3D(a,0.0*GeoModelKernelUnits::mm,n)));
+    m_WarmTCPhys->add(new GeoTransform(GeoTrf::Translate3D(a,0.0*Gaudi::Units::mm,n)));
     m_WarmTCPhys->add(mu_phys); 
     
     n = pow(-1,i+1) * Muon_z/2 - z_m + Muon_z;
     m_WarmTCPhys->add(new GeoSerialIdentifier(5+i));
-    m_WarmTCPhys->add(new GeoTransform(GeoTrf::Translate3D(-a,0.0*GeoModelKernelUnits::mm,n)));
+    m_WarmTCPhys->add(new GeoTransform(GeoTrf::Translate3D(-a,0.0*Gaudi::Units::mm,n)));
     m_WarmTCPhys->add(mu_phys); 
     
  }
@@ -205,7 +206,7 @@ double z_x[3], z_y[3], z_Fe[4];
  
  for(int i=0; i<4; i++) {
    m_WarmTCPhys->add(new GeoSerialIdentifier(i+1)); 
-   m_WarmTCPhys->add(new GeoTransform(GeoTrf::Translate3D(0.0*GeoModelKernelUnits::mm,0.0*GeoModelKernelUnits::mm,z_Fe[i])));
+   m_WarmTCPhys->add(new GeoTransform(GeoTrf::Translate3D(0.0*Gaudi::Units::mm,0.0*Gaudi::Units::mm,z_Fe[i])));
    m_WarmTCPhys->add(Fe_phys);
  }
  
@@ -219,7 +220,7 @@ double z_x[3], z_y[3], z_Fe[4];
  
  for(int i=0; i<3; i++) {
     m_WarmTCPhys->add(new GeoSerialIdentifier(i+1));
-    m_WarmTCPhys->add(new GeoTransform(GeoTrf::Translate3D(0.0*GeoModelKernelUnits::mm,0.0*GeoModelKernelUnits::mm,z_x[i])));
+    m_WarmTCPhys->add(new GeoTransform(GeoTrf::Translate3D(0.0*Gaudi::Units::mm,0.0*Gaudi::Units::mm,z_x[i])));
     m_WarmTCPhys->add(X_phys);
  }
  
@@ -233,7 +234,7 @@ double z_x[3], z_y[3], z_Fe[4];
  
  for(int i=0; i<3; i++) {
     m_WarmTCPhys->add(new GeoSerialIdentifier(i+1));
-    m_WarmTCPhys->add(new GeoTransform(GeoTrf::Translate3D(0.0*GeoModelKernelUnits::mm,0.0*GeoModelKernelUnits::mm,z_y[i])));
+    m_WarmTCPhys->add(new GeoTransform(GeoTrf::Translate3D(0.0*Gaudi::Units::mm,0.0*Gaudi::Units::mm,z_y[i])));
     m_WarmTCPhys->add(Y_phys);
   }
 
diff --git a/LArCalorimeter/LArGeoModel/LArGeoH6Cryostats/LArGeoH6Cryostats/MWPCConstruction.h b/LArCalorimeter/LArGeoModel/LArGeoH6Cryostats/LArGeoH6Cryostats/MWPCConstruction.h
index 14f6658bd474a6ef03fe321c266b3702e984994e..0d1414271ff55f036a6683f1856b0965476c5bc3 100755
--- a/LArCalorimeter/LArGeoModel/LArGeoH6Cryostats/LArGeoH6Cryostats/MWPCConstruction.h
+++ b/LArCalorimeter/LArGeoModel/LArGeoH6Cryostats/LArGeoH6Cryostats/MWPCConstruction.h
@@ -11,7 +11,7 @@
 
 #include "GeoModelKernel/GeoPhysVol.h"
 #include "GeoModelKernel/GeoFullPhysVol.h"
-#include "GeoModelKernel/Units.h"
+#include "GaudiKernel/SystemOfUnits.h"
 #include <memory>
 
 class IRDBAccessSvc;
diff --git a/LArCalorimeter/LArGeoModel/LArGeoH6Cryostats/src/BPCConstruction.cxx b/LArCalorimeter/LArGeoModel/LArGeoH6Cryostats/src/BPCConstruction.cxx
index 043e1e5d2248c1912bb8a0a646e84738d10d8bb4..acc19f08b1940888d3847be3c3ece1c603de31b8 100755
--- a/LArCalorimeter/LArGeoModel/LArGeoH6Cryostats/src/BPCConstruction.cxx
+++ b/LArCalorimeter/LArGeoModel/LArGeoH6Cryostats/src/BPCConstruction.cxx
@@ -43,6 +43,7 @@
 #include "StoreGate/StoreGateSvc.h"
 #include "GaudiKernel/MsgStream.h"
 #include "GaudiKernel/Bootstrap.h"
+#include "GaudiKernel/SystemOfUnits.h"
 
 #include <string>
 #include <cmath>
@@ -104,7 +105,7 @@ GeoVPhysVol* LArGeo::BPCConstruction::GetEnvelope()
   std::string name;
   double density;
   const GeoElement* W=materialManager->getElement("Wolfram");
-  GeoMaterial* Tungsten = new GeoMaterial(name="Tungsten", density=19.3*GeoModelKernelUnits::g/GeoModelKernelUnits::cm3);
+  GeoMaterial* Tungsten = new GeoMaterial(name="Tungsten", density=19.3*GeoModelKernelUnits::g/Gaudi::Units::cm3);
   Tungsten->add(W,1.);
   Tungsten->lock();
   
@@ -114,21 +115,21 @@ GeoVPhysVol* LArGeo::BPCConstruction::GetEnvelope()
   const GeoElement*  O=materialManager->getElement("Oxygen");
   const GeoElement*  H=materialManager->getElement("Hydrogen");
   const GeoElement*  Al=materialManager->getElement("Aluminium");
-  GeoMaterial* CO2 =  new GeoMaterial(name="CO2", density=1.84E-03*GeoModelKernelUnits::g/GeoModelKernelUnits::cm3);
+  GeoMaterial* CO2 =  new GeoMaterial(name="CO2", density=1.84E-03*GeoModelKernelUnits::g/Gaudi::Units::cm3);
   CO2->add(C,0.273);
   CO2->add(O,0.727);
   CO2->lock();
-  GeoMaterial* ArCO2_1 = new GeoMaterial(name="ArCO2_1", density=(0.8*1.782e-03 + 0.2*1.84E-03)*GeoModelKernelUnits::g/GeoModelKernelUnits::cm3);
+  GeoMaterial* ArCO2_1 = new GeoMaterial(name="ArCO2_1", density=(0.8*1.782e-03 + 0.2*1.84E-03)*GeoModelKernelUnits::g/Gaudi::Units::cm3);
   ArCO2_1->add(Ar,0.8);
   ArCO2_1->add(CO2,0.2);
   ArCO2_1->lock();
-  GeoMaterial* ArCO2_2 = new GeoMaterial(name="ArCO2_2", density=(0.9*1.782e-03 + 0.1*1.84E-03)*GeoModelKernelUnits::g/GeoModelKernelUnits::cm3);
+  GeoMaterial* ArCO2_2 = new GeoMaterial(name="ArCO2_2", density=(0.9*1.782e-03 + 0.1*1.84E-03)*GeoModelKernelUnits::g/Gaudi::Units::cm3);
   ArCO2_2->add(Ar,0.9);
   ArCO2_2->add(CO2,0.1);
   ArCO2_2->lock();
   // AlMylar   AlC5H4O2 ??????    
-  density = 1.39*GeoModelKernelUnits::g/GeoModelKernelUnits::cm3;
-  GeoMaterial* AlMylar=new GeoMaterial(name="AlMylar",density=1.39*GeoModelKernelUnits::g/GeoModelKernelUnits::cm3);
+  density = 1.39*GeoModelKernelUnits::g/Gaudi::Units::cm3;
+  GeoMaterial* AlMylar=new GeoMaterial(name="AlMylar",density=1.39*GeoModelKernelUnits::g/Gaudi::Units::cm3);
   AlMylar->add(C,0.487980);
   AlMylar->add(O,0.260014);
   AlMylar->add(H,0.032761);
@@ -159,36 +160,36 @@ GeoVPhysVol* LArGeo::BPCConstruction::GetEnvelope()
   //////////////////////////////////////////////////////////////////
   // Define geometry
   //////////////////////////////////////////////////////////////////
-  double bpc_x = 15.0*GeoModelKernelUnits::cm;
-  double bpc_y = 15.0*GeoModelKernelUnits::cm;
-  double bpc_z = (8.684/2)*GeoModelKernelUnits::cm;
-  double bpc_send = (1.14/2)*GeoModelKernelUnits::cm;
-  double bpc_sen = (1.06)*GeoModelKernelUnits::cm;
-  double bpc_div = 5.06*GeoModelKernelUnits::mm;
-  //double bpc_space = 2.6*GeoModelKernelUnits::mm;
-  double bpc_ml = 0.0010*GeoModelKernelUnits::cm;
-  double bpc_alml = 0.0012*GeoModelKernelUnits::cm;
-  double bpc_frame = 12.1*GeoModelKernelUnits::mm;
-  double bpc_alframe = 8.*GeoModelKernelUnits::mm;
-  double bpc_step = 0.6*GeoModelKernelUnits::cm;
-  double bpc_cstep = 0.3*GeoModelKernelUnits::cm;
-  double bpc_wd = 0.0020*GeoModelKernelUnits::cm;
-  double bpc_cwd = 0.0100*GeoModelKernelUnits::cm;
+  double bpc_x = 15.0*Gaudi::Units::cm;
+  double bpc_y = 15.0*Gaudi::Units::cm;
+  double bpc_z = (8.684/2)*Gaudi::Units::cm;
+  double bpc_send = (1.14/2)*Gaudi::Units::cm;
+  double bpc_sen = (1.06)*Gaudi::Units::cm;
+  double bpc_div = 5.06*Gaudi::Units::mm;
+  //double bpc_space = 2.6*Gaudi::Units::mm;
+  double bpc_ml = 0.0010*Gaudi::Units::cm;
+  double bpc_alml = 0.0012*Gaudi::Units::cm;
+  double bpc_frame = 12.1*Gaudi::Units::mm;
+  double bpc_alframe = 8.*Gaudi::Units::mm;
+  double bpc_step = 0.6*Gaudi::Units::cm;
+  double bpc_cstep = 0.3*Gaudi::Units::cm;
+  double bpc_wd = 0.0020*Gaudi::Units::cm;
+  double bpc_cwd = 0.0100*Gaudi::Units::cm;
   
-  double bpc_old_x = 12.0*GeoModelKernelUnits::cm;
-  double bpc_old_y = 12.0*GeoModelKernelUnits::cm;
-  double bpc_old_z = (5.100/2)*GeoModelKernelUnits::cm;
-  double bpc_old_div = 7.6*GeoModelKernelUnits::mm;
-  double bpc_old_alml = 0.0020*GeoModelKernelUnits::cm;
-  double bpc_old_ml = 0.0050*GeoModelKernelUnits::cm;
-  double bpc_old_frame = 10.*GeoModelKernelUnits::mm;
-  double bpc_old_alframe = 2.*GeoModelKernelUnits::mm;
-  double bpc_old_alframe1 = 12.*GeoModelKernelUnits::mm;
-  double bpc_old_send = (1.7/2)*GeoModelKernelUnits::cm;
-  double bpc_old_sen = 0.5*GeoModelKernelUnits::cm;
-  double bpc_old_space = 1.*GeoModelKernelUnits::mm;
-  double bpc_old_step = 0.6*GeoModelKernelUnits::cm;
-  double bpc_old_cstep = 0.3*GeoModelKernelUnits::cm;
+  double bpc_old_x = 12.0*Gaudi::Units::cm;
+  double bpc_old_y = 12.0*Gaudi::Units::cm;
+  double bpc_old_z = (5.100/2)*Gaudi::Units::cm;
+  double bpc_old_div = 7.6*Gaudi::Units::mm;
+  double bpc_old_alml = 0.0020*Gaudi::Units::cm;
+  double bpc_old_ml = 0.0050*Gaudi::Units::cm;
+  double bpc_old_frame = 10.*Gaudi::Units::mm;
+  double bpc_old_alframe = 2.*Gaudi::Units::mm;
+  double bpc_old_alframe1 = 12.*Gaudi::Units::mm;
+  double bpc_old_send = (1.7/2)*Gaudi::Units::cm;
+  double bpc_old_sen = 0.5*Gaudi::Units::cm;
+  double bpc_old_space = 1.*Gaudi::Units::mm;
+  double bpc_old_step = 0.6*Gaudi::Units::cm;
+  double bpc_old_cstep = 0.3*Gaudi::Units::cm;
  
 
   //  Here we creat the envelope for the Moveable FrontBeam Instrumentation.  This code is repeated
@@ -307,18 +308,18 @@ GeoVPhysVol* LArGeo::BPCConstruction::GetEnvelope()
   
   // wires in each division
   GeoTubs* shape_bpc_wire;
-  if(m_oldType) shape_bpc_wire = new GeoTubs(0., bpc_wd, bpc_old_x, 0.*GeoModelKernelUnits::deg, 360.*GeoModelKernelUnits::deg);
-  else          shape_bpc_wire = new GeoTubs(0., bpc_wd, bpc_x, 0.*GeoModelKernelUnits::deg, 360.*GeoModelKernelUnits::deg);
+  if(m_oldType) shape_bpc_wire = new GeoTubs(0., bpc_wd, bpc_old_x, 0.*Gaudi::Units::deg, 360.*Gaudi::Units::deg);
+  else          shape_bpc_wire = new GeoTubs(0., bpc_wd, bpc_x, 0.*Gaudi::Units::deg, 360.*Gaudi::Units::deg);
   GeoLogVol* log_bpc_wire;
   if(m_oldType) log_bpc_wire = new GeoLogVol(BPCName + "::bpco_wire", shape_bpc_wire, Tungsten);
   else          log_bpc_wire = new GeoLogVol(BPCName + "::bpc_wire", shape_bpc_wire, Tungsten);
   GeoPhysVol* phys_bpc_wire = new GeoPhysVol(log_bpc_wire);
   phys_bpc_xdiv->add( new GeoIdentifierTag( 1 ) );
-  phys_bpc_xdiv->add( new GeoTransform( GeoTrf::RotateX3D( 90.*GeoModelKernelUnits::deg ) ) );
+  phys_bpc_xdiv->add( new GeoTransform( GeoTrf::RotateX3D( 90.*Gaudi::Units::deg ) ) );
   phys_bpc_xdiv->add(phys_bpc_wire);
   if(!m_oldType) {
      phys_bpc_ydiv->add( new GeoIdentifierTag( 1 ) );
-     phys_bpc_ydiv->add( new GeoTransform( GeoTrf::RotateY3D( 90.*GeoModelKernelUnits::deg ) ) );
+     phys_bpc_ydiv->add( new GeoTransform( GeoTrf::RotateY3D( 90.*Gaudi::Units::deg ) ) );
      phys_bpc_ydiv->add(phys_bpc_wire);
   }
 
@@ -326,20 +327,20 @@ GeoVPhysVol* LArGeo::BPCConstruction::GetEnvelope()
   if(m_oldType) Ndiv = int(2.0*bpc_old_x/bpc_cstep);
   else          Ndiv = int(2.0*bpc_x/bpc_cstep);
   GeoTubs* shape_bpc_cwire;
-  if(m_oldType) shape_bpc_cwire = new GeoTubs(0., bpc_cwd, bpc_old_x, 0.*GeoModelKernelUnits::deg, 360.*GeoModelKernelUnits::deg);
-  else          shape_bpc_cwire = new GeoTubs( 0., bpc_cwd, bpc_x, 0.*GeoModelKernelUnits::deg, 360.*GeoModelKernelUnits::deg);
+  if(m_oldType) shape_bpc_cwire = new GeoTubs(0., bpc_cwd, bpc_old_x, 0.*Gaudi::Units::deg, 360.*Gaudi::Units::deg);
+  else          shape_bpc_cwire = new GeoTubs( 0., bpc_cwd, bpc_x, 0.*Gaudi::Units::deg, 360.*Gaudi::Units::deg);
   GeoLogVol* log_bpc_cwire;
   if(m_oldType) log_bpc_cwire = new GeoLogVol(BPCName + "::bpco_cwire",shape_bpc_cwire, Tungsten);
   else          log_bpc_cwire = new GeoLogVol(BPCName + "::bpc_cwire",shape_bpc_cwire, Tungsten);
   GeoPhysVol* phys_bpc_cwire = new GeoPhysVol(log_bpc_cwire);
-//  GeoXF::TRANSFUNCTION TXXMO = GeoTrf::RotateX3D( 90.*GeoModelKernelUnits::deg ) * GeoXF::Pow(GeoTrf::TranslateX3D(1.0), -bpc_old_x+(2*Index+1)*bpc_old_cstep/2.) * GeoTrf::TranslateZ3D(-bpc_old_send-bpc_cwd+bpc_old_space);
-//  GeoXF::TRANSFUNCTION TXXPO = GeoTrf::RotateX3D( 90.*GeoModelKernelUnits::deg ) * GeoXF::Pow(GeoTrf::TranslateX3D(1.0), -bpc_old_x+(2*Index+1)*bpc_old_cstep/2.) * GeoTrf::TranslateZ3D(bpc_old_send-bpc_old_space+bpc_cwd);
-  GeoXF::TRANSFUNCTION TXXMO = GeoXF::Pow(GeoTrf::TranslateX3D(1.0), -bpc_old_x+(2*Index+1)*bpc_old_cstep/2.) * GeoTrf::TranslateZ3D(-bpc_old_send-2.*bpc_cwd+bpc_old_space) * GeoTrf::RotateX3D( 90.*GeoModelKernelUnits::deg );
-  GeoXF::TRANSFUNCTION TXXPO = GeoXF::Pow(GeoTrf::TranslateX3D(1.0), -bpc_old_x+(2*Index+1)*bpc_old_cstep/2.) * GeoTrf::TranslateZ3D(bpc_old_send-bpc_old_space+2.*bpc_cwd) * GeoTrf::RotateX3D( 90.*GeoModelKernelUnits::deg );
-//  GeoXF::TRANSFUNCTION TXXM = GeoTrf::RotateX3D( 90.*GeoModelKernelUnits::deg ) * GeoXF::Pow(GeoTrf::TranslateX3D(1.0), -bpc_x+(2*Index+1)*bpc_cstep/2.) * GeoTrf::TranslateZ3D(-bpc_div-bpc_cwd);
-//  GeoXF::TRANSFUNCTION TXXP = GeoTrf::RotateX3D( 90.*GeoModelKernelUnits::deg ) * GeoXF::Pow(GeoTrf::TranslateX3D(1.0), -bpc_x+(2*Index+1)*bpc_cstep/2.) * GeoTrf::TranslateZ3D(bpc_div+bpc_cwd);
-  GeoXF::TRANSFUNCTION TXXM = GeoXF::Pow(GeoTrf::TranslateX3D(1.0), -bpc_x+(2*Index+1)*bpc_cstep/2.) * GeoTrf::TranslateZ3D(-bpc_div-bpc_cwd) * GeoTrf::RotateX3D( 90.*GeoModelKernelUnits::deg );
-  GeoXF::TRANSFUNCTION TXXP = GeoXF::Pow(GeoTrf::TranslateX3D(1.0), -bpc_x+(2*Index+1)*bpc_cstep/2.) * GeoTrf::TranslateZ3D(bpc_div+bpc_cwd) * GeoTrf::RotateX3D( 90.*GeoModelKernelUnits::deg );
+//  GeoXF::TRANSFUNCTION TXXMO = GeoTrf::RotateX3D( 90.*Gaudi::Units::deg ) * GeoXF::Pow(GeoTrf::TranslateX3D(1.0), -bpc_old_x+(2*Index+1)*bpc_old_cstep/2.) * GeoTrf::TranslateZ3D(-bpc_old_send-bpc_cwd+bpc_old_space);
+//  GeoXF::TRANSFUNCTION TXXPO = GeoTrf::RotateX3D( 90.*Gaudi::Units::deg ) * GeoXF::Pow(GeoTrf::TranslateX3D(1.0), -bpc_old_x+(2*Index+1)*bpc_old_cstep/2.) * GeoTrf::TranslateZ3D(bpc_old_send-bpc_old_space+bpc_cwd);
+  GeoXF::TRANSFUNCTION TXXMO = GeoXF::Pow(GeoTrf::TranslateX3D(1.0), -bpc_old_x+(2*Index+1)*bpc_old_cstep/2.) * GeoTrf::TranslateZ3D(-bpc_old_send-2.*bpc_cwd+bpc_old_space) * GeoTrf::RotateX3D( 90.*Gaudi::Units::deg );
+  GeoXF::TRANSFUNCTION TXXPO = GeoXF::Pow(GeoTrf::TranslateX3D(1.0), -bpc_old_x+(2*Index+1)*bpc_old_cstep/2.) * GeoTrf::TranslateZ3D(bpc_old_send-bpc_old_space+2.*bpc_cwd) * GeoTrf::RotateX3D( 90.*Gaudi::Units::deg );
+//  GeoXF::TRANSFUNCTION TXXM = GeoTrf::RotateX3D( 90.*Gaudi::Units::deg ) * GeoXF::Pow(GeoTrf::TranslateX3D(1.0), -bpc_x+(2*Index+1)*bpc_cstep/2.) * GeoTrf::TranslateZ3D(-bpc_div-bpc_cwd);
+//  GeoXF::TRANSFUNCTION TXXP = GeoTrf::RotateX3D( 90.*Gaudi::Units::deg ) * GeoXF::Pow(GeoTrf::TranslateX3D(1.0), -bpc_x+(2*Index+1)*bpc_cstep/2.) * GeoTrf::TranslateZ3D(bpc_div+bpc_cwd);
+  GeoXF::TRANSFUNCTION TXXM = GeoXF::Pow(GeoTrf::TranslateX3D(1.0), -bpc_x+(2*Index+1)*bpc_cstep/2.) * GeoTrf::TranslateZ3D(-bpc_div-bpc_cwd) * GeoTrf::RotateX3D( 90.*Gaudi::Units::deg );
+  GeoXF::TRANSFUNCTION TXXP = GeoXF::Pow(GeoTrf::TranslateX3D(1.0), -bpc_x+(2*Index+1)*bpc_cstep/2.) * GeoTrf::TranslateZ3D(bpc_div+bpc_cwd) * GeoTrf::RotateX3D( 90.*Gaudi::Units::deg );
   phys_bpc_xplane->add( new GeoSerialIdentifier(0) );
   if(m_oldType) phys_bpc_xplane->add( new GeoSerialTransformer(phys_bpc_cwire, &TXXMO, Ndiv) );
   else          phys_bpc_xplane->add( new GeoSerialTransformer(phys_bpc_cwire, &TXXM, Ndiv) );
@@ -347,10 +348,10 @@ GeoVPhysVol* LArGeo::BPCConstruction::GetEnvelope()
   if(m_oldType) phys_bpc_xplane->add( new GeoSerialTransformer(phys_bpc_cwire, &TXXPO, Ndiv) );
   else          phys_bpc_xplane->add( new GeoSerialTransformer(phys_bpc_cwire, &TXXP, Ndiv) );
   if(!m_oldType) {
-//     GeoXF::TRANSFUNCTION TYYM = GeoTrf::RotateY3D( 90.*GeoModelKernelUnits::deg ) * GeoXF::Pow(GeoTrf::TranslateY3D(1.0), -bpc_y+(2*Index+1)*bpc_cstep/2.) * GeoTrf::TranslateZ3D(-bpc_div-bpc_cwd);
-//     GeoXF::TRANSFUNCTION TYYP = GeoTrf::RotateY3D( 90.*GeoModelKernelUnits::deg ) * GeoXF::Pow(GeoTrf::TranslateY3D(1.0), -bpc_y+(2*Index+1)*bpc_cstep/2.) * GeoTrf::TranslateZ3D(bpc_div+bpc_cwd);
-     GeoXF::TRANSFUNCTION TYYM = GeoXF::Pow(GeoTrf::TranslateY3D(1.0), -bpc_y+(2*Index+1)*bpc_cstep/2.) * GeoTrf::TranslateZ3D(-bpc_div-bpc_cwd) * GeoTrf::RotateY3D( 90.*GeoModelKernelUnits::deg );
-     GeoXF::TRANSFUNCTION TYYP = GeoXF::Pow(GeoTrf::TranslateY3D(1.0), -bpc_y+(2*Index+1)*bpc_cstep/2.) * GeoTrf::TranslateZ3D(bpc_div+bpc_cwd) * GeoTrf::RotateY3D( 90.*GeoModelKernelUnits::deg );
+//     GeoXF::TRANSFUNCTION TYYM = GeoTrf::RotateY3D( 90.*Gaudi::Units::deg ) * GeoXF::Pow(GeoTrf::TranslateY3D(1.0), -bpc_y+(2*Index+1)*bpc_cstep/2.) * GeoTrf::TranslateZ3D(-bpc_div-bpc_cwd);
+//     GeoXF::TRANSFUNCTION TYYP = GeoTrf::RotateY3D( 90.*Gaudi::Units::deg ) * GeoXF::Pow(GeoTrf::TranslateY3D(1.0), -bpc_y+(2*Index+1)*bpc_cstep/2.) * GeoTrf::TranslateZ3D(bpc_div+bpc_cwd);
+     GeoXF::TRANSFUNCTION TYYM = GeoXF::Pow(GeoTrf::TranslateY3D(1.0), -bpc_y+(2*Index+1)*bpc_cstep/2.) * GeoTrf::TranslateZ3D(-bpc_div-bpc_cwd) * GeoTrf::RotateY3D( 90.*Gaudi::Units::deg );
+     GeoXF::TRANSFUNCTION TYYP = GeoXF::Pow(GeoTrf::TranslateY3D(1.0), -bpc_y+(2*Index+1)*bpc_cstep/2.) * GeoTrf::TranslateZ3D(bpc_div+bpc_cwd) * GeoTrf::RotateY3D( 90.*Gaudi::Units::deg );
      phys_bpc_yplane->add( new GeoSerialIdentifier(0) );
      phys_bpc_yplane->add( new GeoSerialTransformer(phys_bpc_cwire, &TYYM, Ndiv) );
      phys_bpc_yplane->add( new GeoSerialIdentifier(Ndiv) );
diff --git a/LArCalorimeter/LArGeoModel/LArGeoH6Cryostats/src/H6CryostatConstruction.cxx b/LArCalorimeter/LArGeoModel/LArGeoH6Cryostats/src/H6CryostatConstruction.cxx
index a43ee7e780c310de00e1f81595babe8ceccf6285..c24e85b1d8e4636120385176297565bcab213e5d 100755
--- a/LArCalorimeter/LArGeoModel/LArGeoH6Cryostats/src/H6CryostatConstruction.cxx
+++ b/LArCalorimeter/LArGeoModel/LArGeoH6Cryostats/src/H6CryostatConstruction.cxx
@@ -23,7 +23,6 @@
 #include "GeoModelKernel/GeoAlignableTransform.h"  
 #include "GeoModelKernel/GeoIdentifierTag.h"  
 #include "GeoModelKernel/GeoDefinitions.h"
-#include "GeoModelKernel/Units.h"
 #include "StoreGate/StoreGateSvc.h"
 #include "GeoModelInterfaces/AbsMaterialManager.h"
 #include "GeoModelInterfaces/StoredMaterialManager.h"
@@ -41,6 +40,7 @@
 #include "StoreGate/StoreGateSvc.h"
 #include "GaudiKernel/MsgStream.h"
 #include "GaudiKernel/Bootstrap.h"
+#include "GaudiKernel/SystemOfUnits.h"
 
 #include <string>
 #include <cmath>
@@ -100,23 +100,23 @@ GeoVFullPhysVol* LArGeo::H6CryostatConstruction::GetEnvelope()
   // First attempt at creating the H6 cryostat: 
   // (values taken from  HECCommonDetectorParamDef)
   //
-  // A cylinder of half-height:   zcryo = 2000.0 *GeoModelKernelUnits::mm
-  // outer radius of warm-wall:   rwarm = 1295.5 *GeoModelKernelUnits::mm
-  // outer radius of vacuum:      rvac  = 1293.0 *GeoModelKernelUnits::mm
-  // outer radius of cold wall:   rcold = 1258.0 *GeoModelKernelUnits::mm
-  // outer radius of LAr:         rlar  = 1255.0 *GeoModelKernelUnits::mm
+  // A cylinder of half-height:   zcryo = 2000.0 *Gaudi::Units::mm
+  // outer radius of warm-wall:   rwarm = 1295.5 *Gaudi::Units::mm
+  // outer radius of vacuum:      rvac  = 1293.0 *Gaudi::Units::mm
+  // outer radius of cold wall:   rcold = 1258.0 *Gaudi::Units::mm
+  // outer radius of LAr:         rlar  = 1255.0 *Gaudi::Units::mm
 
   // needs to go into database: ---  4databa
-  double  zcryo = 2000.0 *GeoModelKernelUnits::mm;
-  double  rwarm = 1295.5 *GeoModelKernelUnits::mm;
-  double  rvac  = 1293.0 *GeoModelKernelUnits::mm;
-  double  rcold = 1258.0 *GeoModelKernelUnits::mm;
-  double  rlar  = 1255.0 *GeoModelKernelUnits::mm;
+  double  zcryo = 2000.0 *Gaudi::Units::mm;
+  double  rwarm = 1295.5 *Gaudi::Units::mm;
+  double  rvac  = 1293.0 *Gaudi::Units::mm;
+  double  rcold = 1258.0 *Gaudi::Units::mm;
+  double  rlar  = 1255.0 *Gaudi::Units::mm;
 
   std::string cryoMotherName = "LAr::H6::Cryostat::MotherVolume";
 
   // mother volume; cylinder of radius rwarm = outside of the cryostat warm wall 
-  GeoTube* cryoMotherShape = new GeoTube(0.0 , rwarm+10.0, zcryo+10.0*GeoModelKernelUnits::mm);  //  mother is a little bigger than warm wall   
+  GeoTube* cryoMotherShape = new GeoTube(0.0 , rwarm+10.0, zcryo+10.0*Gaudi::Units::mm);  //  mother is a little bigger than warm wall   
 
   const GeoLogVol* cryoMotherLogical = new GeoLogVol(cryoMotherName, cryoMotherShape, Air);
   m_cryoMotherPhysical = new GeoFullPhysVol(cryoMotherLogical);
@@ -142,13 +142,13 @@ GeoVFullPhysVol* LArGeo::H6CryostatConstruction::GetEnvelope()
   m_cryoMotherPhysical->add(cryoWarmWallPhys);
 
   // "Vacuum" gap (filled with air...)
-  GeoTube* cryoVacuumGapShape = new GeoTube(0. , rvac, zcryo-2.0*GeoModelKernelUnits::mm);   // an arbitrary 2mm shorter to avoid confilct  
+  GeoTube* cryoVacuumGapShape = new GeoTube(0. , rvac, zcryo-2.0*Gaudi::Units::mm);   // an arbitrary 2mm shorter to avoid confilct  
   const GeoLogVol* cryoVacuumGapLog = new GeoLogVol(cryoVacuumGapName, cryoVacuumGapShape, Air);
   GeoPhysVol*  cryoVacuumGapPhys = new GeoPhysVol(cryoVacuumGapLog);
   cryoWarmWallPhys->add(cryoVacuumGapPhys);
 
   // Cold Wall
-  GeoTube* cryoColdWallShape = new GeoTube(0. , rcold, zcryo-4.0*GeoModelKernelUnits::mm);  // an arbitrary 4mm shorter to avoid confilct   
+  GeoTube* cryoColdWallShape = new GeoTube(0. , rcold, zcryo-4.0*Gaudi::Units::mm);  // an arbitrary 4mm shorter to avoid confilct   
   const GeoLogVol* cryoColdWallLog = new GeoLogVol(cryoColdWallName, cryoColdWallShape, Iron);
   GeoPhysVol*  cryoColdWallPhys = new GeoPhysVol(cryoColdWallLog);
   cryoVacuumGapPhys->add(cryoColdWallPhys);
@@ -160,7 +160,7 @@ GeoVFullPhysVol* LArGeo::H6CryostatConstruction::GetEnvelope()
   // And the FCal the embedded in the LAr instead of the cryoMother!
 
   // Liquid Argon  
-  GeoTube* cryoLArShape = new GeoTube(0. , rlar, zcryo-6.0*GeoModelKernelUnits::mm);  // an arbitrary 2mm shorter to avoid confilct   
+  GeoTube* cryoLArShape = new GeoTube(0. , rlar, zcryo-6.0*Gaudi::Units::mm);  // an arbitrary 2mm shorter to avoid confilct   
   const GeoLogVol* cryoLArLog = new GeoLogVol(cryoLArName, cryoLArShape, LAr);
   m_cryoMotherPhysical->add(new GeoNameTag(std::string("Cryostat LAr Physical")));    
   // m_cryoLArPhys is a class member so that we can place Detectors inside. 
diff --git a/LArCalorimeter/LArGeoModel/LArGeoH6Cryostats/src/MWPCConstruction.cxx b/LArCalorimeter/LArGeoModel/LArGeoH6Cryostats/src/MWPCConstruction.cxx
index 2506edd5257888fb23dd27ff40e7609d5b3a8a39..e829fd0b8eecabfa98245a564fe65297b2b6b79e 100755
--- a/LArCalorimeter/LArGeoModel/LArGeoH6Cryostats/src/MWPCConstruction.cxx
+++ b/LArCalorimeter/LArGeoModel/LArGeoH6Cryostats/src/MWPCConstruction.cxx
@@ -46,6 +46,7 @@
 #include "CxxUtils/make_unique.h"
 #include "GaudiKernel/MsgStream.h"
 #include "GaudiKernel/Bootstrap.h"
+#include "GaudiKernel/SystemOfUnits.h"
 
 #include <string>
 #include <cmath>
@@ -106,7 +107,7 @@ GeoVPhysVol* LArGeo::MWPCConstruction::GetEnvelope()
   std::string name;
   double density;
   const GeoElement* W=materialManager->getElement("Wolfram");
-  GeoMaterial* Tungsten = new GeoMaterial(name="Tungsten", density=19.3*GeoModelKernelUnits::g/GeoModelKernelUnits::cm3);
+  GeoMaterial* Tungsten = new GeoMaterial(name="Tungsten", density=19.3*GeoModelKernelUnits::g/Gaudi::Units::cm3);
   Tungsten->add(W,1.);
   Tungsten->lock();
   
@@ -114,11 +115,11 @@ GeoVPhysVol* LArGeo::MWPCConstruction::GetEnvelope()
   const GeoElement* Ar=materialManager->getElement("Argon");
   const GeoElement*  C=materialManager->getElement("Carbon");
   const GeoElement*  H=materialManager->getElement("Hydrogen");
-  GeoMaterial* Isobutane = new GeoMaterial(name="Isobutane", density=2.67*GeoModelKernelUnits::g/GeoModelKernelUnits::cm3);
+  GeoMaterial* Isobutane = new GeoMaterial(name="Isobutane", density=2.67*GeoModelKernelUnits::g/Gaudi::Units::cm3);
   Isobutane->add(C,0.8266);
   Isobutane->add(H,0.1734);
   Isobutane->lock();
-  GeoMaterial* ArIso = new GeoMaterial(name="ArIso", density=0.0025*GeoModelKernelUnits::g/GeoModelKernelUnits::cm3);
+  GeoMaterial* ArIso = new GeoMaterial(name="ArIso", density=0.0025*GeoModelKernelUnits::g/Gaudi::Units::cm3);
   ArIso->add(Ar,0.61);
   ArIso->add(Isobutane,0.39);
   ArIso->lock();
@@ -169,8 +170,8 @@ GeoVPhysVol* LArGeo::MWPCConstruction::GetEnvelope()
   std::string MWPCName = baseName + "::MWPC";
   
   // This creates a square wire-chamber: 
-  const double MWPCDxy = 64.0*GeoModelKernelUnits::mm;
-  const double MWPCDz = 16.586*GeoModelKernelUnits::mm;  
+  const double MWPCDxy = 64.0*Gaudi::Units::mm;
+  const double MWPCDz = 16.586*Gaudi::Units::mm;  
 
 
   GeoBox* MWPCShape = new GeoBox(MWPCDxy, MWPCDxy, MWPCDz);  // A generic WWPC
@@ -180,7 +181,7 @@ GeoVPhysVol* LArGeo::MWPCConstruction::GetEnvelope()
   
 
   //..... Add Mylar to MWPC:
-  const double MylarDz = 0.015*GeoModelKernelUnits::mm; 
+  const double MylarDz = 0.015*Gaudi::Units::mm; 
 
   GeoBox* MylarShape = new GeoBox(MWPCDxy, MWPCDxy, MylarDz);  // Mylar fits across the MWPC in x,y
 
@@ -193,7 +194,7 @@ GeoVPhysVol* LArGeo::MWPCConstruction::GetEnvelope()
       GeoLogVol* MylarLogical = new GeoLogVol( MylarName, MylarShape, Mylar );   
       GeoPhysVol* MylarPhysical = new GeoPhysVol( MylarLogical );
       m_MWPCPhysical->add( new GeoIdentifierTag( side ) );
-      m_MWPCPhysical->add( new GeoTransform( GeoTrf::Translate3D( 0.*GeoModelKernelUnits::cm, 0.*GeoModelKernelUnits::cm, (MylarPos) ) ) );
+      m_MWPCPhysical->add( new GeoTransform( GeoTrf::Translate3D( 0.*Gaudi::Units::cm, 0.*Gaudi::Units::cm, (MylarPos) ) ) );
       m_MWPCPhysical->add( MylarPhysical );
     }
   // Done with the Mylar Foils 
@@ -201,10 +202,10 @@ GeoVPhysVol* LArGeo::MWPCConstruction::GetEnvelope()
 
 
   //..... Add Al walls to MWPC5:
-  const double Aluz = 0.014*GeoModelKernelUnits::mm; 
+  const double Aluz = 0.014*Gaudi::Units::mm; 
   const double AluDz = Aluz;
-  const double Alu_f = 7.*GeoModelKernelUnits::mm;   
-  const double Alu_s = 15.*GeoModelKernelUnits::mm;
+  const double Alu_f = 7.*Gaudi::Units::mm;   
+  const double Alu_s = 15.*Gaudi::Units::mm;
 
   GeoBox* AluShape = new GeoBox(MWPCDxy, MWPCDxy, AluDz);  // Al foil fits across the MWPC in x,y
   for ( int pos = 0; pos<4 ; pos++)
@@ -222,17 +223,17 @@ GeoVPhysVol* LArGeo::MWPCConstruction::GetEnvelope()
       GeoLogVol* AluLogical = new GeoLogVol( AluName, AluShape, Aluminium );  
       GeoPhysVol* AluPhysical = new GeoPhysVol( AluLogical );
       m_MWPCPhysical->add( new GeoIdentifierTag( pos ) );
-      m_MWPCPhysical->add( new GeoTransform( GeoTrf::Translate3D( 0.*GeoModelKernelUnits::cm, 0.*GeoModelKernelUnits::cm, (AluPos) ) ) );
+      m_MWPCPhysical->add( new GeoTransform( GeoTrf::Translate3D( 0.*Gaudi::Units::cm, 0.*Gaudi::Units::cm, (AluPos) ) ) );
       m_MWPCPhysical->add( AluPhysical );
     }
   
 
 
   //..... Add a sensitive X and Y plane to MWPC5:
-  const double Senz = 4.0*GeoModelKernelUnits::mm; 
+  const double Senz = 4.0*Gaudi::Units::mm; 
   const double SenDz = Senz;  // z-Thickness of sensitive volume
-  const double SenPos = 11.*GeoModelKernelUnits::mm;  // z-Position of sensitive volume  
-  //const double Step = 2.*GeoModelKernelUnits::mm;  // wire-step size for MWPC5
+  const double SenPos = 11.*Gaudi::Units::mm;  // z-Position of sensitive volume  
+  //const double Step = 2.*Gaudi::Units::mm;  // wire-step size for MWPC5
 
   GeoBox* SenPlaneShape = new GeoBox(MWPCDxy, MWPCDxy, SenDz);  // Sensitive Volume fits across the MWPC in x,y
 
@@ -243,10 +244,10 @@ GeoVPhysVol* LArGeo::MWPCConstruction::GetEnvelope()
   GeoPhysVol* XPlanePhysical = new GeoPhysVol( XPlaneLogical );
   GeoPhysVol* YPlanePhysical = new GeoPhysVol( YPlaneLogical );
   m_MWPCPhysical->add( new GeoIdentifierTag( 0 ) );
-  m_MWPCPhysical->add( new GeoTransform( GeoTrf::Translate3D( 0.*GeoModelKernelUnits::cm, 0.*GeoModelKernelUnits::cm, (-SenPos) ) ) );
+  m_MWPCPhysical->add( new GeoTransform( GeoTrf::Translate3D( 0.*Gaudi::Units::cm, 0.*Gaudi::Units::cm, (-SenPos) ) ) );
   m_MWPCPhysical->add( XPlanePhysical );  
   m_MWPCPhysical->add( new GeoIdentifierTag( 0 ) );
-  m_MWPCPhysical->add( new GeoTransform( GeoTrf::Translate3D( 0.*GeoModelKernelUnits::cm, 0.*GeoModelKernelUnits::cm, (SenPos) ) ) );
+  m_MWPCPhysical->add( new GeoTransform( GeoTrf::Translate3D( 0.*Gaudi::Units::cm, 0.*Gaudi::Units::cm, (SenPos) ) ) );
   m_MWPCPhysical->add( YPlanePhysical );
   
  
@@ -276,15 +277,15 @@ GeoVPhysVol* LArGeo::MWPCConstruction::GetEnvelope()
   YPlanePhysical->add(sTSY);
 
 //.... Put wires into the X/Y "divisions"
-  const double WireDiam = 0.006*GeoModelKernelUnits::mm;
+  const double WireDiam = 0.006*Gaudi::Units::mm;
   const double WireLen = MWPCDxy;
-  GeoTubs* WireShape = new GeoTubs(0.*GeoModelKernelUnits::cm, WireDiam/2., WireLen , 0.*GeoModelKernelUnits::deg,360.*GeoModelKernelUnits::deg); 
+  GeoTubs* WireShape = new GeoTubs(0.*Gaudi::Units::cm, WireDiam/2., WireLen , 0.*Gaudi::Units::deg,360.*Gaudi::Units::deg); 
   std::string WireName = MWPCName + "::Wire";
   GeoLogVol* WireLogical = new GeoLogVol(WireName, WireShape, Tungsten);  
   GeoPhysVol* WirePhysical = new GeoPhysVol( WireLogical );
-  XDivPhysical->add(new GeoTransform(GeoTrf::RotateX3D( 90.*GeoModelKernelUnits::deg )));
+  XDivPhysical->add(new GeoTransform(GeoTrf::RotateX3D( 90.*Gaudi::Units::deg )));
   XDivPhysical->add(WirePhysical);
-  YDivPhysical->add(new GeoTransform(GeoTrf::RotateY3D( 90.*GeoModelKernelUnits::deg )));
+  YDivPhysical->add(new GeoTransform(GeoTrf::RotateY3D( 90.*Gaudi::Units::deg )));
   YDivPhysical->add(WirePhysical);
 
 
diff --git a/LArCalorimeter/LArGeoModel/LArGeoH6Cryostats/src/WallsConstruction.cxx b/LArCalorimeter/LArGeoModel/LArGeoH6Cryostats/src/WallsConstruction.cxx
index a8f7cb567bef4eece8e7fb8d4c7d05994f1656cf..2a27e03f97aac71e04e22b3788987ae667283e43 100755
--- a/LArCalorimeter/LArGeoModel/LArGeoH6Cryostats/src/WallsConstruction.cxx
+++ b/LArCalorimeter/LArGeoModel/LArGeoH6Cryostats/src/WallsConstruction.cxx
@@ -23,7 +23,6 @@
 #include "GeoModelKernel/GeoIdentifierTag.h"  
 #include "GeoModelKernel/GeoSerialDenominator.h"
 #include "GeoModelKernel/GeoDefinitions.h"
-#include "GeoModelKernel/Units.h"
 #include "StoreGate/StoreGateSvc.h"
 #include "GeoModelInterfaces/AbsMaterialManager.h"
 #include "GeoModelInterfaces/StoredMaterialManager.h"
@@ -42,6 +41,7 @@
 #include "StoreGate/StoreGateSvc.h"
 #include "GaudiKernel/MsgStream.h"
 #include "GaudiKernel/Bootstrap.h"
+#include "GaudiKernel/SystemOfUnits.h"
 
 #include <string>
 #include <cmath>
@@ -117,7 +117,7 @@ GeoVPhysVol* LArGeo::WallsConstruction::GetEnvelope()
 
   // Is this ok for the Scintillator?
   // I don't really know for sure what kind of a scintillator we have.
-  // Lots of Scintillators are PMMA (Plexiglas), which has a composition of C5 H8 O2 and density 1.18 GeoModelKernelUnits::g/GeoModelKernelUnits::cm3
+  // Lots of Scintillators are PMMA (Plexiglas), which has a composition of C5 H8 O2 and density 1.18 g/cm3
   // The Tile uses a composition of C H (density 1.032)    
   // The old Walls testbeam code uses a composition of C9 H10 (density 1.032)
   // ... because it's easiest at the moment and not all that different from the fractional
@@ -157,9 +157,9 @@ GeoVPhysVol* LArGeo::WallsConstruction::GetEnvelope()
   std::string baseName = "LAr::TBH6";
   std::string WallsName = baseName + "::Walls";
 
-  const double WallsX   = 1500.*GeoModelKernelUnits::mm;
-  const double WallsY   = 2000.*GeoModelKernelUnits::mm;
-  const double WallsZ   = 560.5*GeoModelKernelUnits::mm;
+  const double WallsX   = 1500.*Gaudi::Units::mm;
+  const double WallsY   = 2000.*Gaudi::Units::mm;
+  const double WallsZ   = 560.5*Gaudi::Units::mm;
 
 
   GeoBox* WallsShape = new GeoBox( WallsX, WallsY, WallsZ );   
@@ -176,13 +176,13 @@ GeoVPhysVol* LArGeo::WallsConstruction::GetEnvelope()
 
   (*m_msg) << "Create Iron Wall " << endmsg;
   
-  const double IronX =  1499.*GeoModelKernelUnits::mm;
-  const double IronY =  1999.*GeoModelKernelUnits::mm;
-  const double IronZ =  200.0*GeoModelKernelUnits::mm;
-  const double IronHoleX =   51.5*GeoModelKernelUnits::mm;
-  const double IronHoleY =  1999.*GeoModelKernelUnits::mm;
-  const double IronHoleZ =   200.*GeoModelKernelUnits::mm;
-  const double IronPosZ  =   270.*GeoModelKernelUnits::mm;
+  const double IronX =  1499.*Gaudi::Units::mm;
+  const double IronY =  1999.*Gaudi::Units::mm;
+  const double IronZ =  200.0*Gaudi::Units::mm;
+  const double IronHoleX =   51.5*Gaudi::Units::mm;
+  const double IronHoleY =  1999.*Gaudi::Units::mm;
+  const double IronHoleZ =   200.*Gaudi::Units::mm;
+  const double IronPosZ  =   270.*Gaudi::Units::mm;
 
   // The wall itself:
   GeoBox* IronWallShape = new GeoBox(IronX, IronY, IronZ);  
@@ -198,7 +198,7 @@ GeoVPhysVol* LArGeo::WallsConstruction::GetEnvelope()
   IronWallPhysical->add(IronHolePhysical);
 
   // Add the iron wall to the Wall mother:
-  m_WallsPhysical->add( new GeoTransform( GeoTrf::Translate3D( 0.*GeoModelKernelUnits::mm, 0.*GeoModelKernelUnits::mm, (WallsZ-IronPosZ) ) ) ) ; 
+  m_WallsPhysical->add( new GeoTransform( GeoTrf::Translate3D( 0.*Gaudi::Units::mm, 0.*Gaudi::Units::mm, (WallsZ-IronPosZ) ) ) ) ; 
   m_WallsPhysical->add( new GeoNameTag(IronWallName) );
   m_WallsPhysical->add( IronWallPhysical );
   
@@ -210,13 +210,13 @@ GeoVPhysVol* LArGeo::WallsConstruction::GetEnvelope()
 
   (*m_msg) << "Create Lead Wall " << endmsg;
   
-  const double LeadX =  1499.*GeoModelKernelUnits::mm;
-  const double LeadY =  1999.*GeoModelKernelUnits::mm;
-  const double LeadZ =     6.*GeoModelKernelUnits::mm;
-  const double LeadHoleX =  23.5*GeoModelKernelUnits::mm;
-  const double LeadHoleY = 1999.*GeoModelKernelUnits::mm; 
-  const double LeadHoleZ =    6.*GeoModelKernelUnits::mm;
-  const double LeadPosZ  = 1045.*GeoModelKernelUnits::mm;
+  const double LeadX =  1499.*Gaudi::Units::mm;
+  const double LeadY =  1999.*Gaudi::Units::mm;
+  const double LeadZ =     6.*Gaudi::Units::mm;
+  const double LeadHoleX =  23.5*Gaudi::Units::mm;
+  const double LeadHoleY = 1999.*Gaudi::Units::mm; 
+  const double LeadHoleZ =    6.*Gaudi::Units::mm;
+  const double LeadPosZ  = 1045.*Gaudi::Units::mm;
 
   // The wall itself:
   GeoBox* LeadWallShape = new GeoBox(LeadX, LeadY, LeadZ);  
@@ -232,7 +232,7 @@ GeoVPhysVol* LArGeo::WallsConstruction::GetEnvelope()
   LeadWallPhysical->add(LeadHolePhysical);
 
   // Add the lead wall to the Wall mother:
-  m_WallsPhysical->add( new GeoTransform( GeoTrf::Translate3D( 0.*GeoModelKernelUnits::mm, 0.*GeoModelKernelUnits::mm, (WallsZ-LeadPosZ) ) ) ) ; 
+  m_WallsPhysical->add( new GeoTransform( GeoTrf::Translate3D( 0.*Gaudi::Units::mm, 0.*Gaudi::Units::mm, (WallsZ-LeadPosZ) ) ) ) ; 
   m_WallsPhysical->add( new GeoNameTag(LeadWallName) );
   m_WallsPhysical->add( LeadWallPhysical );
   
@@ -243,13 +243,13 @@ GeoVPhysVol* LArGeo::WallsConstruction::GetEnvelope()
 
   (*m_msg) << "Create Scint Wall " << endmsg;
   
-  const double ScintX =  1499.*GeoModelKernelUnits::mm;
-  const double ScintY =  1999.*GeoModelKernelUnits::mm;
-  const double ScintZ =    6.5*GeoModelKernelUnits::mm;
-  const double ScintHoleX =  92.5*GeoModelKernelUnits::mm;
-  const double ScintHoleY = 1999.*GeoModelKernelUnits::mm; 
-  const double ScintHoleZ =   6.5*GeoModelKernelUnits::mm;
-  const double ScintPosZ  =  625.*GeoModelKernelUnits::mm;
+  const double ScintX =  1499.*Gaudi::Units::mm;
+  const double ScintY =  1999.*Gaudi::Units::mm;
+  const double ScintZ =    6.5*Gaudi::Units::mm;
+  const double ScintHoleX =  92.5*Gaudi::Units::mm;
+  const double ScintHoleY = 1999.*Gaudi::Units::mm; 
+  const double ScintHoleZ =   6.5*Gaudi::Units::mm;
+  const double ScintPosZ  =  625.*Gaudi::Units::mm;
 
   // The wall itself:
   GeoBox* ScintWallShape = new GeoBox(ScintX, ScintY, ScintZ);  
@@ -265,7 +265,7 @@ GeoVPhysVol* LArGeo::WallsConstruction::GetEnvelope()
   ScintWallPhysical->add(ScintHolePhysical);
 
   // Add the scintillator wall to the Wall mother:
-  m_WallsPhysical->add( new GeoTransform( GeoTrf::Translate3D( 0.*GeoModelKernelUnits::mm, 0.*GeoModelKernelUnits::mm, (WallsZ-ScintPosZ) ) ) ) ; 
+  m_WallsPhysical->add( new GeoTransform( GeoTrf::Translate3D( 0.*Gaudi::Units::mm, 0.*Gaudi::Units::mm, (WallsZ-ScintPosZ) ) ) ) ; 
   m_WallsPhysical->add( new GeoNameTag(ScintWallName) );
   m_WallsPhysical->add( ScintWallPhysical );
   
@@ -277,10 +277,10 @@ GeoVPhysVol* LArGeo::WallsConstruction::GetEnvelope()
 
   //(*m_msg) << "Create Iron Plate " << endmsg;
   
-  const double IronPlateX =   50.*GeoModelKernelUnits::mm;
-  const double IronPlateY =  150.*GeoModelKernelUnits::mm;
-  const double IronPlateZ =    4.*GeoModelKernelUnits::mm;
-  const double IronPlatePosZ  =  493.*GeoModelKernelUnits::mm;
+  const double IronPlateX =   50.*Gaudi::Units::mm;
+  const double IronPlateY =  150.*Gaudi::Units::mm;
+  const double IronPlateZ =    4.*Gaudi::Units::mm;
+  const double IronPlatePosZ  =  493.*Gaudi::Units::mm;
   const int nPlate = 0 ;
   const int PlatePlace = 1 ; // There were two locations used for these plates - unclear which one when and exactly 
                              //            where they were....! For the moment, sort of copy the standalone code
@@ -309,7 +309,7 @@ GeoVPhysVol* LArGeo::WallsConstruction::GetEnvelope()
     // Add the iron plate to the Plate mother:
     for (int iz=0; iz<(nPlate); iz++) {
       m_WallsPhysical->add( new GeoIdentifierTag(iz) );
-      m_WallsPhysical->add( new GeoTransform( GeoTrf::Translate3D( 0.*GeoModelKernelUnits::mm, 0.*GeoModelKernelUnits::mm, double(PlatePlace)*(v_PlateZ[iz]) ) ) ) ; 
+      m_WallsPhysical->add( new GeoTransform( GeoTrf::Translate3D( 0.*Gaudi::Units::mm, 0.*Gaudi::Units::mm, double(PlatePlace)*(v_PlateZ[iz]) ) ) ) ; 
       m_WallsPhysical->add( new GeoNameTag(IronPlateName) );
       m_WallsPhysical->add( IronPlatePhysical );
     }
diff --git a/LArCalorimeter/LArGeoModel/LArGeoHec/src/HEC2WheelConstruction.cxx b/LArCalorimeter/LArGeoModel/LArGeoHec/src/HEC2WheelConstruction.cxx
index 1f205323582be5bf2c1f8bfa4dc864aebaf3c72d..6cd88171bc277213123f9652f3b731d1ea1481f9 100755
--- a/LArCalorimeter/LArGeoModel/LArGeoHec/src/HEC2WheelConstruction.cxx
+++ b/LArCalorimeter/LArGeoModel/LArGeoHec/src/HEC2WheelConstruction.cxx
@@ -44,7 +44,6 @@
 #include "GeoModelKernel/GeoSerialIdentifier.h"
 #include "GeoModelKernel/GeoXF.h"
 #include "GeoModelKernel/GeoDefinitions.h"
-#include "GeoModelKernel/Units.h"
 #include "GeoGenericFunctions/Variable.h"
 #include "StoreGate/StoreGateSvc.h"
 #include "GeoModelInterfaces/AbsMaterialManager.h"
@@ -53,6 +52,7 @@
 #include "GeoModelUtilities/StoredAlignX.h"
 #include "GaudiKernel/MsgStream.h"
 #include "GaudiKernel/Bootstrap.h"
+#include "GaudiKernel/SystemOfUnits.h"
 #include "AthenaKernel/getMessageSvc.h"
 
 #include "GeoModelUtilities/GeoDBUtils.h"
@@ -66,9 +66,9 @@
 #include <iostream>
 
 
-using GeoModelKernelUnits::cm;
-using GeoModelKernelUnits::mm;
-using GeoModelKernelUnits::deg;
+using Gaudi::Units::cm;
+using Gaudi::Units::mm;
+using Gaudi::Units::deg;
 using GeoTrf::Transform3D;
 using GeoTrf::Translate3D;
 
diff --git a/LArCalorimeter/LArGeoModel/LArGeoHec/src/HECClampConstruction.cxx b/LArCalorimeter/LArGeoModel/LArGeoHec/src/HECClampConstruction.cxx
index 200c46eb62db9b2c7d58e229bfb6ca624ac58b55..07c7e1c66cdbd3d7611f17cdcbd2a3bcb8d01435 100755
--- a/LArCalorimeter/LArGeoModel/LArGeoHec/src/HECClampConstruction.cxx
+++ b/LArCalorimeter/LArGeoModel/LArGeoHec/src/HECClampConstruction.cxx
@@ -32,13 +32,13 @@
 #include "GeoModelKernel/GeoSerialIdentifier.h"
 #include "GeoModelKernel/GeoXF.h"
 #include "GeoModelKernel/GeoDefinitions.h"
-#include "GeoModelKernel/Units.h"
 #include "GeoGenericFunctions/Variable.h"
 #include "StoreGate/StoreGateSvc.h"
 #include "GeoModelInterfaces/AbsMaterialManager.h"
 #include "GeoModelInterfaces/StoredMaterialManager.h"
 #include "GaudiKernel/MsgStream.h"
 #include "GaudiKernel/Bootstrap.h"
+#include "GaudiKernel/SystemOfUnits.h"
 #include "AthenaKernel/getMessageSvc.h"
 
 
@@ -51,9 +51,9 @@
 #include <cmath>
 #include <iostream>
 
-using GeoModelKernelUnits::cm;
-using GeoModelKernelUnits::mm;
-using GeoModelKernelUnits::deg;
+using Gaudi::Units::cm;
+using Gaudi::Units::mm;
+using Gaudi::Units::deg;
 using GeoTrf::RotateZ3D;
 using GeoTrf::Translate3D;
 using GeoTrf::TranslateZ3D;
diff --git a/LArCalorimeter/LArGeoModel/LArGeoHec/src/HECModuleConstruction.cxx b/LArCalorimeter/LArGeoModel/LArGeoHec/src/HECModuleConstruction.cxx
index 00319637749ccb245baf6bb68d70fc9d50c1661f..40491b326d1ea122667a8055f4d871c37f8abe69 100755
--- a/LArCalorimeter/LArGeoModel/LArGeoHec/src/HECModuleConstruction.cxx
+++ b/LArCalorimeter/LArGeoModel/LArGeoHec/src/HECModuleConstruction.cxx
@@ -23,13 +23,13 @@
 #include "GeoModelKernel/GeoSerialIdentifier.h"
 #include "GeoModelKernel/GeoXF.h"
 #include "GeoModelKernel/GeoDefinitions.h"
-#include "GeoModelKernel/Units.h"
 #include "GeoGenericFunctions/Variable.h"
 #include "StoreGate/StoreGateSvc.h"
 #include "GeoModelInterfaces/AbsMaterialManager.h"
 #include "GeoModelInterfaces/StoredMaterialManager.h"
 #include "GaudiKernel/MsgStream.h"
 #include "GaudiKernel/Bootstrap.h"
+#include "GaudiKernel/SystemOfUnits.h"
 #include "AthenaKernel/getMessageSvc.h"
 #include "RDBAccessSvc/IRDBAccessSvc.h"
 #include "RDBAccessSvc/IRDBRecord.h"
@@ -41,9 +41,9 @@
 #include <iostream>
 
 
-using GeoModelKernelUnits::cm;
-using GeoModelKernelUnits::mm;
-using GeoModelKernelUnits::deg;
+using Gaudi::Units::cm;
+using Gaudi::Units::mm;
+using Gaudi::Units::deg;
 using GeoTrf::Translate3D;
 using GeoTrf::TranslateY3D;
 using GeoTrf::TranslateZ3D;
diff --git a/LArCalorimeter/LArGeoModel/LArGeoHec/src/HECWheelConstruction.cxx b/LArCalorimeter/LArGeoModel/LArGeoHec/src/HECWheelConstruction.cxx
index ee64b7541b09f78d37fff68e3193709abe5c8159..24892c99b1e65b263538b0a61b1103218726ff71 100755
--- a/LArCalorimeter/LArGeoModel/LArGeoHec/src/HECWheelConstruction.cxx
+++ b/LArCalorimeter/LArGeoModel/LArGeoHec/src/HECWheelConstruction.cxx
@@ -33,13 +33,13 @@
 #include "GeoModelKernel/GeoSerialIdentifier.h"
 #include "GeoModelKernel/GeoXF.h"
 #include "GeoModelKernel/GeoDefinitions.h"
-#include "GeoModelKernel/Units.h"
 #include "GeoGenericFunctions/Variable.h"
 #include "StoreGate/StoreGateSvc.h"
 #include "GeoModelInterfaces/AbsMaterialManager.h"
 #include "GeoModelInterfaces/StoredMaterialManager.h"
 #include "GaudiKernel/MsgStream.h"
 #include "GaudiKernel/Bootstrap.h"
+#include "GaudiKernel/SystemOfUnits.h"
 #include "AthenaKernel/getMessageSvc.h"
 
 
@@ -53,9 +53,9 @@
 #include <iostream>
 
 
-using GeoModelKernelUnits::cm;
-using GeoModelKernelUnits::mm;
-using GeoModelKernelUnits::deg;
+using Gaudi::Units::cm;
+using Gaudi::Units::mm;
+using Gaudi::Units::deg;
 using GeoTrf::RotateZ3D;
 
 
diff --git a/LArCalorimeter/LArGeoModel/LArGeoMiniFcal/src/MiniFcalConstruction.cxx b/LArCalorimeter/LArGeoModel/LArGeoMiniFcal/src/MiniFcalConstruction.cxx
index ce0332a805de7e7b62697d707e967f671c562605..b2b25b3d3d331b018ca8e318cf56a19eaa1f64e1 100755
--- a/LArCalorimeter/LArGeoModel/LArGeoMiniFcal/src/MiniFcalConstruction.cxx
+++ b/LArCalorimeter/LArGeoModel/LArGeoMiniFcal/src/MiniFcalConstruction.cxx
@@ -19,7 +19,6 @@
 #include "GeoModelKernel/GeoSerialTransformer.h"
 #include "GeoModelKernel/GeoSerialIdentifier.h"
 #include "GeoModelKernel/GeoIdentifierTag.h"  
-#include "GeoModelKernel/Units.h"
 #include "GeoGenericFunctions/Variable.h"
 
 #include "GeoModelInterfaces/IGeoModelSvc.h"
@@ -32,6 +31,7 @@
 #include "StoreGate/StoreGateSvc.h"
 #include "GaudiKernel/MsgStream.h"
 #include "GaudiKernel/Bootstrap.h"
+#include "GaudiKernel/SystemOfUnits.h"
 
 #include <string>
 #include <cmath>
@@ -127,9 +127,9 @@ GeoFullPhysVol* LArGeo::MiniFcalConstruction::GetEnvelope()
   //_________ Define geometry __________________________
 
   //__Copper envelope
-  double halfLength = envParameters->getDouble("DZ")*GeoModelKernelUnits::mm; 
-  double Router     = envParameters->getDouble("RMAX")*GeoModelKernelUnits::mm; 
-  double Rinner     = envParameters->getDouble("RMIN")*GeoModelKernelUnits::mm;
+  double halfLength = envParameters->getDouble("DZ")*Gaudi::Units::mm; 
+  double Router     = envParameters->getDouble("RMAX")*Gaudi::Units::mm; 
+  double Rinner     = envParameters->getDouble("RMIN")*Gaudi::Units::mm;
 
   // Buld a Cu block and place layers into that...
   GeoTubs *solidMiniFcal = new GeoTubs(Rinner, Router, halfLength, 0., 2.*M_PI); // Big outer radius
@@ -165,15 +165,15 @@ GeoFullPhysVol* LArGeo::MiniFcalConstruction::GetEnvelope()
     for(unsigned i=0; i<recRings->size(); ++i)
       ringIndexes[(*recRings)[i]->getInt("RINGNUM")] = i;
 
-    double L1         =  (*recCommon)[0]->getDouble("ABSORBERTHICKNESS")*GeoModelKernelUnits::mm; // Cu plates of fixed thickness
-    double LayerThick =  (*recCommon)[0]->getDouble("LAYERTHICKNESS")*GeoModelKernelUnits::mm;    // Layers between the Cu plates 
-    double WaferThick =  (*recCommon)[0]->getDouble("WAFERTHICKNESS")*GeoModelKernelUnits::mm;   // Diamond wafers - thickness
-    double WaferSize  =  (*recCommon)[0]->getDouble("WAFERSIZEX")*GeoModelKernelUnits::mm;    // Square Daimond wafers
+    double L1         =  (*recCommon)[0]->getDouble("ABSORBERTHICKNESS")*Gaudi::Units::mm; // Cu plates of fixed thickness
+    double LayerThick =  (*recCommon)[0]->getDouble("LAYERTHICKNESS")*Gaudi::Units::mm;    // Layers between the Cu plates 
+    double WaferThick =  (*recCommon)[0]->getDouble("WAFERTHICKNESS")*Gaudi::Units::mm;   // Diamond wafers - thickness
+    double WaferSize  =  (*recCommon)[0]->getDouble("WAFERSIZEX")*Gaudi::Units::mm;    // Square Daimond wafers
     int    NLayers    =  (*recCommon)[0]->getInt("NLAYERS");      // Have 11 gaps and 12 Cu plates
 
-    log << MSG::DEBUG << "=====> Build a Mini FCal of length  " << 2.*halfLength << " GeoModelKernelUnits::mm and " 
-	<< NLayers << " layers of  " << LayerThick << " GeoModelKernelUnits::mm thickness each; place them every  "
-	<< L1 << " GeoModelKernelUnits::mm " << endmsg;
+    log << MSG::DEBUG << "=====> Build a Mini FCal of length  " << 2.*halfLength << " Gaudi::Units::mm and " 
+	<< NLayers << " layers of  " << LayerThick << " Gaudi::Units::mm thickness each; place them every  "
+	<< L1 << " Gaudi::Units::mm " << endmsg;
 
     // Make the Layers (all the same) - out of Feldspar (perhaps close to ceramics)
     std::string layerName = moduleName + "::Layer" ;
@@ -182,7 +182,7 @@ GeoFullPhysVol* LArGeo::MiniFcalConstruction::GetEnvelope()
     
     //-- Construct wafers and arrange them in rings inside the ceramic layers.
     std::string waferName = moduleName + "::Wafer" ;
-    GeoBox* solidWafer = new GeoBox( (WaferSize/2.)*GeoModelKernelUnits::mm, (WaferSize/2.)*GeoModelKernelUnits::mm, (WaferThick/2.)*GeoModelKernelUnits::mm);
+    GeoBox* solidWafer = new GeoBox( (WaferSize/2.)*Gaudi::Units::mm, (WaferSize/2.)*Gaudi::Units::mm, (WaferThick/2.)*Gaudi::Units::mm);
     GeoLogVol* logiWafer = new GeoLogVol(waferName,solidWafer,Diamond);
     GeoPhysVol* physiWafer = new GeoPhysVol(logiWafer);
 
@@ -210,7 +210,7 @@ GeoFullPhysVol* LArGeo::MiniFcalConstruction::GetEnvelope()
       int nwafers(0);
 
       double phishift = (*recLayers)[layerIndexes[j]]->getDouble("PHISHIFT");
-      double rshift = (*recLayers)[layerIndexes[j]]->getDouble("RSHIFT")*GeoModelKernelUnits::mm;
+      double rshift = (*recLayers)[layerIndexes[j]]->getDouble("RSHIFT")*Gaudi::Units::mm;
 
       for (unsigned int i=0; i<recRings->size(); i++){  // loop over the number of wafer rings
 	if(ringIndexes.find(i)==ringIndexes.end()) {
@@ -231,14 +231,14 @@ GeoFullPhysVol* LArGeo::MiniFcalConstruction::GetEnvelope()
 	// for the negative z-side have to add pi to get things right:
 	GeoGenfun::GENFUNCTION RotationAngle = activate*(M_PI) + phisense * (phishift + wAngle/2. + wAngle*Index) ;
 	GeoXF::TRANSFUNCTION t  = 
-	  GeoXF::Pow(GeoTrf::RotateZ3D(1.0),RotationAngle) * GeoTrf::TranslateX3D(rshift+rwafer+5.*GeoModelKernelUnits::mm) * GeoTrf::TranslateZ3D(-LayerThick/2.+ WaferThick/2.) ;
+	  GeoXF::Pow(GeoTrf::RotateZ3D(1.0),RotationAngle) * GeoTrf::TranslateX3D(rshift+rwafer+5.*Gaudi::Units::mm) * GeoTrf::TranslateZ3D(-LayerThick/2.+ WaferThick/2.) ;
 	GeoSerialTransformer *sTF = new GeoSerialTransformer (physiWafer,&t,nwafers);
 	physiLayer->add(sIF);
 	physiLayer->add(sTF);
       }
 
       log << MSG::DEBUG << "- Working on layer " << j << " now. Place it at " 
-	  << ( -halfLength + L1 + double(j)*( L1 + LayerThick) + LayerThick/2. ) << " GeoModelKernelUnits::mm " << endmsg;
+	  << ( -halfLength + L1 + double(j)*( L1 + LayerThick) + LayerThick/2. ) << " Gaudi::Units::mm " << endmsg;
       m_physiMiniFcal->add(new GeoIdentifierTag(j));        
       GeoTransform *xf = new GeoTransform(GeoTrf::TranslateZ3D( -halfLength + L1 + double(j)*( L1 + LayerThick) + LayerThick/2. ));
       m_physiMiniFcal->add(xf);
@@ -248,7 +248,7 @@ GeoFullPhysVol* LArGeo::MiniFcalConstruction::GetEnvelope()
 
 
   //________ Construct top transform object _____________
-  m_transform = GeoTrf::TranslateZ3D(envParameters->getDouble("ZPOS")*GeoModelKernelUnits::mm);
+  m_transform = GeoTrf::TranslateZ3D(envParameters->getDouble("ZPOS")*Gaudi::Units::mm);
   // Layers should be fully equipeed now. Put them into MiniFcal
  
   return m_physiMiniFcal;
diff --git a/LArCalorimeter/LArGeoModel/LArGeoTBBarrel/src/TBBarrelCryostatConstruction.cxx b/LArCalorimeter/LArGeoModel/LArGeoTBBarrel/src/TBBarrelCryostatConstruction.cxx
index 38752f5b5b5cd7948a0869736bdd8c7ee92f4365..3e9aa5ea9bf2db966fb5245e30da9e5d1f26e626 100755
--- a/LArCalorimeter/LArGeoModel/LArGeoTBBarrel/src/TBBarrelCryostatConstruction.cxx
+++ b/LArCalorimeter/LArGeoModel/LArGeoTBBarrel/src/TBBarrelCryostatConstruction.cxx
@@ -27,6 +27,7 @@
 #include "StoreGate/StoreGateSvc.h"
 #include "GaudiKernel/MsgStream.h"
 #include "GaudiKernel/Bootstrap.h"
+#include "GaudiKernel/PhysicalConstants.h"
 #include "GeoModelUtilities/StoredPhysVol.h"
 #include "GeoModelUtilities/StoredAlignX.h"
 
@@ -124,14 +125,14 @@ GeoFullPhysVol* LArGeo::TBBarrelCryostatConstruction::GetEnvelope()
     throw std::runtime_error("Error in TBBarrelCryostatConstruction, oxygen not found.");
   }
 
-  GeoMaterial *Vacuum = new GeoMaterial("Vacuum",GeoModelKernelUnits::universe_mean_density );
+  GeoMaterial *Vacuum = new GeoMaterial("Vacuum",Gaudi::Units::universe_mean_density );
   Vacuum->add(Hydrogen,1.);
   Vacuum->lock();
 
 // define material for FOAM (C5H8O2)
 // latest density value from P.Puzo (october 2003)
 //
-  double density = 0.058*GeoModelKernelUnits::g/GeoModelKernelUnits::cm3;
+  double density = 0.058*GeoModelKernelUnits::g/Gaudi::Units::cm3;
     GeoMaterial* Foam = new GeoMaterial("Foam", density);
     double fraction=8*1.01/(5*12.01+8*1.01+2.*16.0);
     Foam->add(Hydrogen,fraction);
@@ -164,7 +165,7 @@ GeoFullPhysVol* LArGeo::TBBarrelCryostatConstruction::GetEnvelope()
      std::cout << " Plane zp/ri/ro " << zp[i] << " " << ri[i] << " " << ro[i] << std::endl;
     }
 #endif
-    GeoPcon* Em_pcone = new GeoPcon(-25.*GeoModelKernelUnits::deg,50.*GeoModelKernelUnits::deg);
+    GeoPcon* Em_pcone = new GeoPcon(-25.*Gaudi::Units::deg,50.*Gaudi::Units::deg);
     for (int i=0; i < 3; i++) Em_pcone->addPlane(zp[i],ri[i],ro[i]);
 
     const GeoLogVol* cryoMotherLogical = 
@@ -175,20 +176,20 @@ GeoFullPhysVol* LArGeo::TBBarrelCryostatConstruction::GetEnvelope()
 
 // Cryostat geometry
 
-    double  Cryo_Distz = 483.5*GeoModelKernelUnits::cm;   // total size in z
-    double  Cryo_z0 = 103.0*GeoModelKernelUnits::cm;       // eta=0 position wrt cryosta edge at z<0
+    double  Cryo_Distz = 483.5*Gaudi::Units::cm;   // total size in z
+    double  Cryo_z0 = 103.0*Gaudi::Units::cm;       // eta=0 position wrt cryosta edge at z<0
 
-    double  DeltaR_cold = 4.1*GeoModelKernelUnits::cm;    // thickness cold vessel before calo
-    double  DeltaRout_cold = 5.0*GeoModelKernelUnits::cm;    // thickness cold vessel after calo
+    double  DeltaR_cold = 4.1*Gaudi::Units::cm;    // thickness cold vessel before calo
+    double  DeltaRout_cold = 5.0*Gaudi::Units::cm;    // thickness cold vessel after calo
 
-    double  DeltaR_warm= 3.86*GeoModelKernelUnits::cm;    // thickness warm vessel before calo
-    double  DeltaRout_warm = 4.0*GeoModelKernelUnits::cm;    // thickness warm vessel after calo
+    double  DeltaR_warm= 3.86*Gaudi::Units::cm;    // thickness warm vessel before calo
+    double  DeltaRout_warm = 4.0*Gaudi::Units::cm;    // thickness warm vessel after calo
 
-    double  DeltaRout_vac = 3.0*GeoModelKernelUnits::cm;  // vacuum space cryo after calo
+    double  DeltaRout_vac = 3.0*Gaudi::Units::cm;  // vacuum space cryo after calo
 
-    double Dz_end_warm = 7.0*GeoModelKernelUnits::cm;   // thickness of end plate at high z
-    double Dz_end_vac  = 8.0*GeoModelKernelUnits::cm;   
-    double Dz_end_cold = 7.0*GeoModelKernelUnits::cm;
+    double Dz_end_warm = 7.0*Gaudi::Units::cm;   // thickness of end plate at high z
+    double Dz_end_vac  = 8.0*Gaudi::Units::cm;   
+    double Dz_end_cold = 7.0*Gaudi::Units::cm;
 
     double Dz_end_tot = Dz_end_warm + Dz_end_vac + Dz_end_cold;
 
@@ -207,13 +208,13 @@ GeoFullPhysVol* LArGeo::TBBarrelCryostatConstruction::GetEnvelope()
     double  Rmin_mother = Cryo_Xcent-Cryo_Rmax_W;
     double  Rmax_mother = 2270.;
 
-    double Phi_Min = -5.0 * GeoModelKernelUnits::deg;
-    double Phi_Span = 32.5 * GeoModelKernelUnits::deg;
+    double Phi_Min = -5.0 * Gaudi::Units::deg;
+    double Phi_Span = 32.5 * Gaudi::Units::deg;
 // GU 10/09/2004
 // For cryostat mother volume, sligthly larger phi range
 //  to avoid clash with front cryostat
-    double Phi_Min_Moth=-9.0*GeoModelKernelUnits::deg;
-    double Phi_Span_Moth=38.5*GeoModelKernelUnits::deg;
+    double Phi_Min_Moth=-9.0*Gaudi::Units::deg;
+    double Phi_Span_Moth=38.5*Gaudi::Units::deg;
 
 // -----------------------------------------------------------------
 // Mother volume for Cryostat, filled with foam
@@ -225,8 +226,8 @@ GeoFullPhysVol* LArGeo::TBBarrelCryostatConstruction::GetEnvelope()
     std::cout << "   (matter = foam) " << std::endl;
     std::cout << " Rmin/Rmax " << Rmin_mother << " " << Rmax_mother << std::endl;
     std::cout << " Dz/2 " << Cryo_Distz/2. << std::endl;
-    std::cout << " PhiMin, Span " << Phi_Min_Moth*(1./GeoModelKernelUnits::deg) << " "
-              << Phi_Span_Moth*(1./GeoModelKernelUnits::deg) << std::endl;
+    std::cout << " PhiMin, Span " << Phi_Min_Moth*(1./Gaudi::Units::deg) << " "
+              << Phi_Span_Moth*(1./Gaudi::Units::deg) << std::endl;
 #endif
 
     GeoTubs* Cent_tube = new GeoTubs(Rmin_mother,
@@ -237,7 +238,7 @@ GeoFullPhysVol* LArGeo::TBBarrelCryostatConstruction::GetEnvelope()
     GeoLogVol* Cent_log = new GeoLogVol(baseName+"Mother",Cent_tube,Foam);
 //  position in Pcon mother envelope (which has Atlas reference frame)
      double zpos = Cryo_Distz/2.-Cryo_z0;
-     double phi  = -1.*360.*GeoModelKernelUnits::deg/16/2.;   // to have x axis in middle of volume
+     double phi  = -1.*360.*Gaudi::Units::deg/16/2.;   // to have x axis in middle of volume
 
     GeoPhysVol* Cent_phys  = new GeoPhysVol(Cent_log);
     cryoMotherPhysical->add(new GeoTransform(GeoTrf::RotateZ3D(phi)));
@@ -255,7 +256,7 @@ GeoFullPhysVol* LArGeo::TBBarrelCryostatConstruction::GetEnvelope()
     std::cout << " " << std::endl;
     std::cout << " ** Cryostat before LAr (shape=Tubs)" << std::endl;
     std::cout << " center in x = " << Cryo_Xcent  << std::endl;
-    std::cout << " angle 180-11 GeoModelKernelUnits::deg, span = 14 GeoModelKernelUnits::deg" << std::endl;
+    std::cout << " angle 180-11 deg, span = 14 deg" << std::endl;
     std::cout << " R warm vessel " << Cryo_Rmin_W << " "
                                    << Cryo_Rmax_W << std::endl;
     std::cout << " R vacuum      " << Cryo_Rmax_C << " "
@@ -270,8 +271,8 @@ GeoFullPhysVol* LArGeo::TBBarrelCryostatConstruction::GetEnvelope()
                                     Cryo_Rmin_W,
                                     Cryo_Rmax_W,
                                     (Cryo_Distz-Dz_end_tot)/2.,
-                                    (180.-11.)*GeoModelKernelUnits::deg,
-                                    14.*GeoModelKernelUnits::deg);
+                                    (180.-11.)*Gaudi::Units::deg,
+                                    14.*Gaudi::Units::deg);
 
     GeoLogVol* CryoW_log = new GeoLogVol(baseName+"WarmTube",
                                                      CryoW_tube,
@@ -287,8 +288,8 @@ GeoFullPhysVol* LArGeo::TBBarrelCryostatConstruction::GetEnvelope()
                                     Cryo_Rmax_C,
                                     Cryo_Rmin_W,
                                     (Cryo_Distz-Dz_end_tot)/2.,
-                                    (180.-11.)*GeoModelKernelUnits::deg,
-                                    14.*GeoModelKernelUnits::deg);
+                                    (180.-11.)*Gaudi::Units::deg,
+                                    14.*Gaudi::Units::deg);
 
     GeoLogVol *CryoV_log = new GeoLogVol(baseName+"VacTube",
                                                CryoV_tube,
@@ -304,8 +305,8 @@ GeoFullPhysVol* LArGeo::TBBarrelCryostatConstruction::GetEnvelope()
                                     Cryo_Rmin_C,
                                     Cryo_Rmax_C,
                                     (Cryo_Distz-Dz_end_tot)/2.,
-                                    (180.-11.)*GeoModelKernelUnits::deg,
-                                    14.*GeoModelKernelUnits::deg);
+                                    (180.-11.)*Gaudi::Units::deg,
+                                    14.*Gaudi::Units::deg);
 
     GeoLogVol *CryoC_log = new GeoLogVol(baseName+"ColdTube",
                                                CryoC_tube,
@@ -324,7 +325,7 @@ GeoFullPhysVol* LArGeo::TBBarrelCryostatConstruction::GetEnvelope()
 // cold vessel of the cryostat after calo
 //-----------------------------------------------------------------------
 
-    double LAr_inner_radius=141.00*GeoModelKernelUnits::cm;   // min radius of PS
+    double LAr_inner_radius=141.00*Gaudi::Units::cm;   // min radius of PS
     double LAr_outer_radius=Rmax_mother-DeltaRout_warm-DeltaRout_cold
                                          -DeltaRout_vac;
 
@@ -335,8 +336,8 @@ GeoFullPhysVol* LArGeo::TBBarrelCryostatConstruction::GetEnvelope()
     std::cout << " *** LAr volume (tubs put in foam)" << std::endl;
     std::cout << "Rmin/Rmax " << LAr_inner_radius << " "
                               << LAr_outer_radius << std::endl;
-    std::cout << "PhiMin,Span " << Phi_Min*(1./GeoModelKernelUnits::deg) << " "
-                                << Phi_Span*(1./GeoModelKernelUnits::deg) << std::endl;
+    std::cout << "PhiMin,Span " << Phi_Min*(1./Gaudi::Units::deg) << " "
+                                << Phi_Span*(1./Gaudi::Units::deg) << std::endl;
     std::cout << "DeltaZ/2 " << LAr_z_max/2. << std::endl;
     std::cout << "Position in z in mother " << (LAr_z_max-Cryo_Distz)/2. << std::endl;
 #endif
@@ -369,27 +370,27 @@ GeoFullPhysVol* LArGeo::TBBarrelCryostatConstruction::GetEnvelope()
 //    5.5mm at mid bottom and 0.5 mm at bottom
 
 // modified 17-Aug-05
-// the measured thickness are at 0, 22.5/4, 22.5/2, 3*22.5/4 and 22.5 GeoModelKernelUnits::deg
+// the measured thickness are at 0, 22.5/4, 22.5/2, 3*22.5/4 and 22.5 deg
 // so define the regions in phi to be better centered on the measurements
 // and to cover:
 //   -  0 to 22.5/8 deg  = bottom thickness => need 9.5 - 9mm = 0.5mm Ar
 //   - 22.5/8 to 3*22.5/8 deg = mid bottom => need 7.5-2mm    = 5.5mm Ar
-//   - 3*22.5/8 to 5*22.5/8 GeoModelKernelUnits::deg = mid => need 14.5-9 = 5.5 GeoModelKernelUnits::mm Ar
+//   - 3*22.5/8 to 5*22.5/8 deg = mid => need 14.5-9 = 5.5 mm Ar
 //   - 5*22.5/8 to 7*22.5/8 deg = mid top => need 12.5-2mm = 10.5mm Ar
-//   - 7*22.5/8 to 22.5/8 GeoModelKernelUnits::deg   = top     => need 18.5-9 = 9.5 GeoModelKernelUnits::mm Ar
+//   - 7*22.5/8 to 22.5/8 deg   = top     => need 18.5-9 = 9.5 mm Ar
 
 #ifdef BUILD_LARFOAM
 
-    double delta_LAr[5]={0.5*GeoModelKernelUnits::mm,5.5*GeoModelKernelUnits::mm,5.5*GeoModelKernelUnits::mm,10.5*GeoModelKernelUnits::mm,9.5*GeoModelKernelUnits::mm};
-    double Phi1[5]={0.*GeoModelKernelUnits::deg,22.5/8.*GeoModelKernelUnits::deg,3.*22.5/8*GeoModelKernelUnits::deg,5.*22.5/8*GeoModelKernelUnits::deg,7.*22.5/8*GeoModelKernelUnits::deg};
-    double Delta_phi[5]={22.5/8*GeoModelKernelUnits::deg, 2.*22.5/8.*GeoModelKernelUnits::deg,2.*22.5/8.*GeoModelKernelUnits::deg,2.*22.5/8.*GeoModelKernelUnits::deg,22.5/8.*GeoModelKernelUnits::deg};
+    double delta_LAr[5]={0.5*Gaudi::Units::mm,5.5*Gaudi::Units::mm,5.5*Gaudi::Units::mm,10.5*Gaudi::Units::mm,9.5*Gaudi::Units::mm};
+    double Phi1[5]={0.*Gaudi::Units::deg,22.5/8.*Gaudi::Units::deg,3.*22.5/8*Gaudi::Units::deg,5.*22.5/8*Gaudi::Units::deg,7.*22.5/8*Gaudi::Units::deg};
+    double Delta_phi[5]={22.5/8*Gaudi::Units::deg, 2.*22.5/8.*Gaudi::Units::deg,2.*22.5/8.*Gaudi::Units::deg,2.*22.5/8.*Gaudi::Units::deg,22.5/8.*Gaudi::Units::deg};
 
 // GU 08-dec-2005
 // additionnal LAr fudged before presampler to get better agreement
 //  waiting for Rhoacell measurement to know if this is reasonnable or not
 //  this should be now considered as a systematics
 //  25mm LAr ~ 0.18 X0
-//    double fudge_lar_gap = 25.*GeoModelKernelUnits::mm;
+//    double fudge_lar_gap = 25.*mm;
 // GU 28--feb-2006   removed this fudge 25mm, not supported by measurements of Rohacell
 
     for (int ilar=0;ilar<5;ilar++) {
@@ -398,7 +399,7 @@ GeoFullPhysVol* LArGeo::TBBarrelCryostatConstruction::GetEnvelope()
 
 #ifdef DEBUG_GEO
       std::cout << " Ar additionnal volume before PS " << r1 << " "
-                << r2 << " " << Phi1[ilar]*(1./GeoModelKernelUnits::deg) << " " << Delta_phi[ilar]*(1./GeoModelKernelUnits::deg) << std::endl;
+                << r2 << " " << Phi1[ilar]*(1./Gaudi::Units::deg) << " " << Delta_phi[ilar]*(1./Gaudi::Units::deg) << std::endl;
 #endif
 
       GeoTubs* lar_tube = new GeoTubs(r1,
@@ -419,7 +420,7 @@ GeoFullPhysVol* LArGeo::TBBarrelCryostatConstruction::GetEnvelope()
 // Outer support rings: 6 steel rings, starting just
 //   after Barrel volume (G10 bars) (r=2003.6)
 //   DZ=80mm for DR=12mm, then DZ=10mm for DR=757mm then DZ=80mm for DR=12mm
-//   at locations z=397,805,1255,1750,2316,2868 GeoModelKernelUnits::mm
+//   at locations z=397,805,1255,1750,2316,2868 mm
 #ifdef BUILD_SUPPORTRING
 
      double R_ring = 2003.6; 
@@ -653,10 +654,10 @@ GeoFullPhysVol* LArGeo::TBBarrelCryostatConstruction::GetEnvelope()
 
 //   Zcd = 1582.5-LAr_z_max/2.+Cryo_z0;
 // new value of PS mother lenght
-//       Zcd = 1550.0*GeoModelKernelUnits::mm-LAr_z_max/2.+Cryo_z0;
+//       Zcd = 1550.0*mm-LAr_z_max/2.+Cryo_z0;
 // also the PS is shifted by 3mm to start at z=3mm in Atlas equivalent frame
-       double PresamplerMother_length=1549.*GeoModelKernelUnits::mm;
-       double presamplerShift = 3.*GeoModelKernelUnits::mm;
+       double PresamplerMother_length=1549.*Gaudi::Units::mm;
+       double presamplerShift = 3.*Gaudi::Units::mm;
        Zcd = presamplerShift+PresamplerMother_length-LAr_z_max/2.+Cryo_z0;
 
 #ifdef DEBUG_GEO
diff --git a/LArCalorimeter/LArGeoModel/LArGeoTBEC/src/CryostatConstructionTBEC.cxx b/LArCalorimeter/LArGeoModel/LArGeoTBEC/src/CryostatConstructionTBEC.cxx
index 693d4358da90ae2d941a5ab72299fdb79f83e057..71b88f6326cd6eb0b0e7a3395bdf8a9448efe051 100755
--- a/LArCalorimeter/LArGeoModel/LArGeoTBEC/src/CryostatConstructionTBEC.cxx
+++ b/LArCalorimeter/LArGeoModel/LArGeoTBEC/src/CryostatConstructionTBEC.cxx
@@ -23,7 +23,6 @@
 #include "GeoModelKernel/GeoAlignableTransform.h"  
 #include "GeoModelKernel/GeoIdentifierTag.h"  
 #include "GeoModelKernel/GeoDefinitions.h"
-#include "GeoModelKernel/Units.h"
 #include "StoreGate/StoreGateSvc.h"
 #include "GeoModelInterfaces/AbsMaterialManager.h"
 #include "GeoModelInterfaces/StoredMaterialManager.h"
@@ -33,6 +32,7 @@
 #include "StoreGate/StoreGateSvc.h"
 #include "GaudiKernel/MsgStream.h"
 #include "GaudiKernel/Bootstrap.h"
+#include "GaudiKernel/SystemOfUnits.h"
 
 #include <string>
 #include <cmath>
@@ -115,7 +115,7 @@ GeoVFullPhysVol* LArGeo::CryostatConstructionTBEC::GetEnvelope()
   // accordingly.
 
   std::string cryoMotherName = baseName + "::MotherVolume";
-  GeoBox* cryoMotherShape = new GeoBox( 152.*GeoModelKernelUnits::cm, 195.*GeoModelKernelUnits::cm, 60.09*GeoModelKernelUnits::cm );
+  GeoBox* cryoMotherShape = new GeoBox( 152.*Gaudi::Units::cm, 195.*Gaudi::Units::cm, 60.09*Gaudi::Units::cm );
   const GeoLogVol* cryoMotherLogical = new GeoLogVol( cryoMotherName, cryoMotherShape, Air );
   //GeoFullPhysVol* m_cryoEnvelopePhysical = new GeoFullPhysVol( cryoMotherLogical );
   m_cryoEnvelopePhysical = new GeoFullPhysVol( cryoMotherLogical );
@@ -123,126 +123,126 @@ GeoVFullPhysVol* LArGeo::CryostatConstructionTBEC::GetEnvelope()
   // Cryostat walls
   
   std::string ExtWallName = baseName + "::ExternalWarmWall";
-  GeoBox* ExtWallShape = new GeoBox( 152.*GeoModelKernelUnits::cm, 195.*GeoModelKernelUnits::cm, 60.09*GeoModelKernelUnits::cm );
+  GeoBox* ExtWallShape = new GeoBox( 152.*Gaudi::Units::cm, 195.*Gaudi::Units::cm, 60.09*Gaudi::Units::cm );
   const GeoLogVol* ExtWallLogical = new GeoLogVol( ExtWallName, ExtWallShape, Al );
   GeoPhysVol* ExtWallPhysical = new GeoPhysVol( ExtWallLogical );
   
   std::string WallName = baseName + "::WarmWallInterval";
-  GeoBox* WallShape = new GeoBox( ( 152. - 0.8 )*GeoModelKernelUnits::cm, ( 195. - 0.8 )*GeoModelKernelUnits::cm, ( 60.09 - 0.8 )*GeoModelKernelUnits::cm );
+  GeoBox* WallShape = new GeoBox( ( 152. - 0.8 )*Gaudi::Units::cm, ( 195. - 0.8 )*Gaudi::Units::cm, ( 60.09 - 0.8 )*Gaudi::Units::cm );
   const GeoLogVol* WallLogical = new GeoLogVol( WallName, WallShape, Vacuum );
   GeoPhysVol* WallPhysical = new GeoPhysVol( WallLogical );
   
   std::string IntWallName = baseName + "::InternalWarmWall";
-  GeoBox* IntWallShape = new GeoBox( 148.4*GeoModelKernelUnits::cm, 191.6*GeoModelKernelUnits::cm, 46.8*GeoModelKernelUnits::cm );
+  GeoBox* IntWallShape = new GeoBox( 148.4*Gaudi::Units::cm, 191.6*Gaudi::Units::cm, 46.8*Gaudi::Units::cm );
   const GeoLogVol* IntWallLogical = new GeoLogVol( IntWallName, IntWallShape, Al );
   GeoPhysVol* IntWallPhysical = new GeoPhysVol( IntWallLogical );
   
   std::string VacuumName = baseName + "::Vacuum";
-  GeoBox* VacuumShape = new GeoBox( ( 148.4 - 0.8 )*GeoModelKernelUnits::cm, ( 191.6 - 0.8 )*GeoModelKernelUnits::cm, ( 46.8 - 0.8 )*GeoModelKernelUnits::cm );
+  GeoBox* VacuumShape = new GeoBox( ( 148.4 - 0.8 )*Gaudi::Units::cm, ( 191.6 - 0.8 )*Gaudi::Units::cm, ( 46.8 - 0.8 )*Gaudi::Units::cm );
   const GeoLogVol* VacuumLogical = new GeoLogVol( VacuumName, VacuumShape, Vacuum );
   GeoPhysVol* VacuumPhysical = new GeoPhysVol( VacuumLogical );
   
   std::string ColdWallName = baseName + "::ColdWall";
-  GeoBox* ColdWallShape = new GeoBox( 142.5*GeoModelKernelUnits::cm, 184.85*GeoModelKernelUnits::cm, 38.*GeoModelKernelUnits::cm );
+  GeoBox* ColdWallShape = new GeoBox( 142.5*Gaudi::Units::cm, 184.85*Gaudi::Units::cm, 38.*Gaudi::Units::cm );
   const GeoLogVol* ColdWallLogical = new GeoLogVol( ColdWallName, ColdWallShape, Iron );
   GeoPhysVol* ColdWallPhysical = new GeoPhysVol( ColdWallLogical );
   
   std::string LArName = baseName + "::LiquidArgon";
-  GeoBox* LArShape = new GeoBox( ( 142.5 - .5 )*GeoModelKernelUnits::cm, ( 184.85 - .5 )*GeoModelKernelUnits::cm, ( 38. - .5 )*GeoModelKernelUnits::cm );
+  GeoBox* LArShape = new GeoBox( ( 142.5 - .5 )*Gaudi::Units::cm, ( 184.85 - .5 )*Gaudi::Units::cm, ( 38. - .5 )*Gaudi::Units::cm );
   const GeoLogVol* LArLogical = new GeoLogVol( LArName, LArShape, LAr );
   // GeoPhysVol* m_LArPhysical = new GeoPhysVol( LArLogical );
   m_LArPhysical = new GeoPhysVol( LArLogical );
   
   ColdWallPhysical->add( new GeoIdentifierTag( 1 ) );
-  ColdWallPhysical->add( new GeoTransform( GeoTrf::Translate3D( 0.*GeoModelKernelUnits::cm, 0.*GeoModelKernelUnits::cm, 0.*GeoModelKernelUnits::cm ) ) );
+  ColdWallPhysical->add( new GeoTransform( GeoTrf::Translate3D( 0.*Gaudi::Units::cm, 0.*Gaudi::Units::cm, 0.*Gaudi::Units::cm ) ) );
   ColdWallPhysical->add( m_LArPhysical );
   
   VacuumPhysical->add( new GeoIdentifierTag( 1 ) );
-  VacuumPhysical->add( new GeoTransform( GeoTrf::Translate3D( 0.*GeoModelKernelUnits::cm, 0.*GeoModelKernelUnits::cm, 0.*GeoModelKernelUnits::cm ) ) );
+  VacuumPhysical->add( new GeoTransform( GeoTrf::Translate3D( 0.*Gaudi::Units::cm, 0.*Gaudi::Units::cm, 0.*Gaudi::Units::cm ) ) );
   VacuumPhysical->add( ColdWallPhysical );
   
   IntWallPhysical->add( new GeoIdentifierTag( 1 ) );
-  IntWallPhysical->add( new GeoTransform( GeoTrf::Translate3D( 0.*GeoModelKernelUnits::cm, 0.*GeoModelKernelUnits::cm, 0.*GeoModelKernelUnits::cm ) ) );
+  IntWallPhysical->add( new GeoTransform( GeoTrf::Translate3D( 0.*Gaudi::Units::cm, 0.*Gaudi::Units::cm, 0.*Gaudi::Units::cm ) ) );
   IntWallPhysical->add( VacuumPhysical );
   
   WallPhysical->add( new GeoIdentifierTag( 1 ) );
-  WallPhysical->add( new GeoTransform( GeoTrf::Translate3D( 0.*GeoModelKernelUnits::cm, 0.*GeoModelKernelUnits::cm, 0.*GeoModelKernelUnits::cm ) ) );
+  WallPhysical->add( new GeoTransform( GeoTrf::Translate3D( 0.*Gaudi::Units::cm, 0.*Gaudi::Units::cm, 0.*Gaudi::Units::cm ) ) );
   WallPhysical->add( IntWallPhysical );
   
   ExtWallPhysical->add( new GeoIdentifierTag( 1 ) );
-  ExtWallPhysical->add( new GeoTransform( GeoTrf::Translate3D( 0.*GeoModelKernelUnits::cm, 0.*GeoModelKernelUnits::cm, 0.*GeoModelKernelUnits::cm ) ) );
+  ExtWallPhysical->add( new GeoTransform( GeoTrf::Translate3D( 0.*Gaudi::Units::cm, 0.*Gaudi::Units::cm, 0.*Gaudi::Units::cm ) ) );
   ExtWallPhysical->add( WallPhysical );
   
   m_cryoEnvelopePhysical->add( new GeoIdentifierTag( 1 ) );
-  m_cryoEnvelopePhysical->add( new GeoTransform( GeoTrf::Translate3D( 0.*GeoModelKernelUnits::cm, 0.*GeoModelKernelUnits::cm, 0.*GeoModelKernelUnits::cm ) ) );					   
+  m_cryoEnvelopePhysical->add( new GeoTransform( GeoTrf::Translate3D( 0.*Gaudi::Units::cm, 0.*Gaudi::Units::cm, 0.*Gaudi::Units::cm ) ) );					   
   m_cryoEnvelopePhysical->add( ExtWallPhysical );
   
   // Pressure cone
   
   std::string PConeName = baseName + "::PressureCone::Mother";
-  GeoTubs* PConeShape = new GeoTubs( 0.*GeoModelKernelUnits::cm, 6.5*GeoModelKernelUnits::cm, 4.*GeoModelKernelUnits::cm, 0.*GeoModelKernelUnits::deg, 360.*GeoModelKernelUnits::deg );
+  GeoTubs* PConeShape = new GeoTubs( 0.*Gaudi::Units::cm, 6.5*Gaudi::Units::cm, 4.*Gaudi::Units::cm, 0.*Gaudi::Units::deg, 360.*Gaudi::Units::deg );
   const GeoLogVol* PConeLogical = new GeoLogVol( PConeName, PConeShape, Vacuum );
   GeoPhysVol* PConePhysical = new GeoPhysVol( PConeLogical );
   
   std::string IntFlangeName = baseName + "::PressureCone::InternalFlange";
-  GeoTubs* IntFlangeShape = new GeoTubs( 0.*GeoModelKernelUnits::cm, 4.9*GeoModelKernelUnits::cm, 0.4*GeoModelKernelUnits::cm, 0.*GeoModelKernelUnits::deg, 360.*GeoModelKernelUnits::deg );
+  GeoTubs* IntFlangeShape = new GeoTubs( 0.*Gaudi::Units::cm, 4.9*Gaudi::Units::cm, 0.4*Gaudi::Units::cm, 0.*Gaudi::Units::deg, 360.*Gaudi::Units::deg );
   const GeoLogVol* IntFlangeLogical = new GeoLogVol( IntFlangeName, IntFlangeShape, Gten );
   GeoPhysVol* IntFlangePhysical = new GeoPhysVol( IntFlangeLogical );
   
   std::string ExtFlangeName = baseName + "::PressureCone::ExternalFlange";
-  GeoTubs* ExtFlangeShape = new GeoTubs( 5.*GeoModelKernelUnits::cm, 6.5*GeoModelKernelUnits::cm, 0.4*GeoModelKernelUnits::cm, 0.*GeoModelKernelUnits::deg, 360.*GeoModelKernelUnits::deg );
+  GeoTubs* ExtFlangeShape = new GeoTubs( 5.*Gaudi::Units::cm, 6.5*Gaudi::Units::cm, 0.4*Gaudi::Units::cm, 0.*Gaudi::Units::deg, 360.*Gaudi::Units::deg );
   const GeoLogVol* ExtFlangeLogical = new GeoLogVol( ExtFlangeName, ExtFlangeShape, Gten );
   GeoPhysVol* ExtFlangePhysical = new GeoPhysVol( ExtFlangeLogical );
   
   std::string ConeName = baseName + "::PressureCone::Cone";
-  GeoCons* ConeShape = new GeoCons( 5.4*GeoModelKernelUnits::cm, 4.5*GeoModelKernelUnits::cm, 5.5*GeoModelKernelUnits::cm, 4.6*GeoModelKernelUnits::cm, 3.2*GeoModelKernelUnits::cm, 0.*GeoModelKernelUnits::deg, 360.*GeoModelKernelUnits::deg );
+  GeoCons* ConeShape = new GeoCons( 5.4*Gaudi::Units::cm, 4.5*Gaudi::Units::cm, 5.5*Gaudi::Units::cm, 4.6*Gaudi::Units::cm, 3.2*Gaudi::Units::cm, 0.*Gaudi::Units::deg, 360.*Gaudi::Units::deg );
   const GeoLogVol* ConeLogical = new GeoLogVol( ConeName, ConeShape, Gten );
   GeoPhysVol* ConePhysical = new GeoPhysVol( ConeLogical );
   
   PConePhysical->add( new GeoIdentifierTag( 1 ) );
-  PConePhysical->add( new GeoTransform( GeoTrf::Translate3D( 0.*GeoModelKernelUnits::cm, 0.*GeoModelKernelUnits::cm, 3.6*GeoModelKernelUnits::cm ) ) );
+  PConePhysical->add( new GeoTransform( GeoTrf::Translate3D( 0.*Gaudi::Units::cm, 0.*Gaudi::Units::cm, 3.6*Gaudi::Units::cm ) ) );
   PConePhysical->add( IntFlangePhysical );
   
   PConePhysical->add( new GeoIdentifierTag( 1 ) );
-  PConePhysical->add( new GeoTransform( GeoTrf::Translate3D( 0.*GeoModelKernelUnits::cm, 0.*GeoModelKernelUnits::cm, -3.6*GeoModelKernelUnits::cm ) ) );
+  PConePhysical->add( new GeoTransform( GeoTrf::Translate3D( 0.*Gaudi::Units::cm, 0.*Gaudi::Units::cm, -3.6*Gaudi::Units::cm ) ) );
   PConePhysical->add( ExtFlangePhysical );
   
   PConePhysical->add( new GeoIdentifierTag( 1 ) );
-  PConePhysical->add( new GeoTransform( GeoTrf::Translate3D( 0.*GeoModelKernelUnits::cm, 0.*GeoModelKernelUnits::cm, 0.*GeoModelKernelUnits::cm ) ) );
+  PConePhysical->add( new GeoTransform( GeoTrf::Translate3D( 0.*Gaudi::Units::cm, 0.*Gaudi::Units::cm, 0.*Gaudi::Units::cm ) ) );
   PConePhysical->add( ConePhysical );
   
   for ( int i  = 0; i < 3; i++ ) for ( int j = 0; j < 13; j++ ) {
-  	double x = 135.1*GeoModelKernelUnits::cm - 19.3*( j + 1 )*GeoModelKernelUnits::cm;
-	double y = 19.3*( i - 1 )*GeoModelKernelUnits::cm;
+  	double x = 135.1*Gaudi::Units::cm - 19.3*( j + 1 )*Gaudi::Units::cm;
+	double y = 19.3*( i - 1 )*Gaudi::Units::cm;
 	VacuumPhysical->add( new GeoIdentifierTag( 1 + i*13 + j ) );
-  	VacuumPhysical->add( new GeoTransform( GeoTrf::Translate3D( x, y, -42.*GeoModelKernelUnits::cm ) ) );
+  	VacuumPhysical->add( new GeoTransform( GeoTrf::Translate3D( x, y, -42.*Gaudi::Units::cm ) ) );
   	VacuumPhysical->add( PConePhysical );
   }
   
   // Zig-zag structure
   
   std::string ZigZagMotherName = baseName + "::ZigZag::Mother";
-  GeoBox* ZigZagMotherShape = new GeoBox( 130.*GeoModelKernelUnits::cm, 15.*GeoModelKernelUnits::cm, 6.45*GeoModelKernelUnits::cm );
+  GeoBox* ZigZagMotherShape = new GeoBox( 130.*Gaudi::Units::cm, 15.*Gaudi::Units::cm, 6.45*Gaudi::Units::cm );
   const GeoLogVol* ZigZagMotherLogical = new GeoLogVol( ZigZagMotherName, ZigZagMotherShape, Vacuum );
   GeoPhysVol* ZigZagMotherPhysical = new GeoPhysVol( ZigZagMotherLogical );
   
   std::string ZigZagStrAName = baseName + "::ZigZag::StrA";
-  GeoBox* ZigZagStrAShape = new GeoBox( 2.45*GeoModelKernelUnits::cm, 5.*GeoModelKernelUnits::cm, .4*GeoModelKernelUnits::cm );
+  GeoBox* ZigZagStrAShape = new GeoBox( 2.45*Gaudi::Units::cm, 5.*Gaudi::Units::cm, .4*Gaudi::Units::cm );
   const GeoLogVol* ZigZagStrALogical = new GeoLogVol( ZigZagStrAName, ZigZagStrAShape, Al );
   GeoPhysVol* ZigZagStrAPhysical = new GeoPhysVol( ZigZagStrALogical );
   
   std::string ZigZagStrBName = baseName + "::ZigZag::StrB";
-  GeoBox* ZigZagStrBShape = new GeoBox( 8.53*GeoModelKernelUnits::cm, 5.*GeoModelKernelUnits::cm, .4*GeoModelKernelUnits::cm );
+  GeoBox* ZigZagStrBShape = new GeoBox( 8.53*Gaudi::Units::cm, 5.*Gaudi::Units::cm, .4*Gaudi::Units::cm );
   const GeoLogVol* ZigZagStrBLogical = new GeoLogVol( ZigZagStrBName, ZigZagStrBShape, Al );
   GeoPhysVol* ZigZagStrBPhysical = new GeoPhysVol( ZigZagStrBLogical );
   
   std::string ZigZagStrCName = baseName + "::ZigZag::StrC";
-  GeoTrd* ZigZagStrCShape = new GeoTrd( 1.03*GeoModelKernelUnits::cm, .453*GeoModelKernelUnits::cm, 5.*GeoModelKernelUnits::cm, 5.*GeoModelKernelUnits::cm, .283*GeoModelKernelUnits::cm );
+  GeoTrd* ZigZagStrCShape = new GeoTrd( 1.03*Gaudi::Units::cm, .453*Gaudi::Units::cm, 5.*Gaudi::Units::cm, 5.*Gaudi::Units::cm, .283*Gaudi::Units::cm );
   const GeoLogVol* ZigZagStrCLogical = new GeoLogVol( ZigZagStrCName, ZigZagStrCShape, Al );
   GeoPhysVol* ZigZagStrCPhysical = new GeoPhysVol( ZigZagStrCLogical );
   
   std::string ZigZagStrDName = baseName + "::ZigZag::StrD";
-  GeoTrd* ZigZagStrDShape = new GeoTrd( .005*GeoModelKernelUnits::cm, .31*GeoModelKernelUnits::cm, 5.*GeoModelKernelUnits::cm, 5.*GeoModelKernelUnits::cm, .365*GeoModelKernelUnits::cm );
+  GeoTrd* ZigZagStrDShape = new GeoTrd( .005*Gaudi::Units::cm, .31*Gaudi::Units::cm, 5.*Gaudi::Units::cm, 5.*Gaudi::Units::cm, .365*Gaudi::Units::cm );
   const GeoLogVol* ZigZagStrDLogical = new GeoLogVol( ZigZagStrDName, ZigZagStrDShape, Al );
   GeoPhysVol* ZigZagStrDPhysical = new GeoPhysVol( ZigZagStrDLogical );
   
@@ -250,31 +250,31 @@ GeoVFullPhysVol* LArGeo::CryostatConstructionTBEC::GetEnvelope()
   
   for ( int i = 0; i < 9; i++ ) {
   	ZigZagMotherPhysical->add( new GeoIdentifierTag( StrAIdTag ) );
-  	ZigZagMotherPhysical->add( new GeoTransform( GeoTrf::Translate3D( ( 124.4 - 31.1*i )*GeoModelKernelUnits::cm, 0.*GeoModelKernelUnits::cm, 6.05*GeoModelKernelUnits::cm ) ) );
+  	ZigZagMotherPhysical->add( new GeoTransform( GeoTrf::Translate3D( ( 124.4 - 31.1*i )*Gaudi::Units::cm, 0.*Gaudi::Units::cm, 6.05*Gaudi::Units::cm ) ) );
   	ZigZagMotherPhysical->add( ZigZagStrAPhysical );
 	StrAIdTag++;
   }
   for ( int j = 0; j < 2; j++ ) for ( int i = 0; i < 8; i++ ) {
   	ZigZagMotherPhysical->add( new GeoIdentifierTag( StrAIdTag ) );
-  	ZigZagMotherPhysical->add( new GeoTransform( GeoTrf::Translate3D( ( 108.85 - 31.1*i )*GeoModelKernelUnits::cm, ( 2*j - 1 )*10.*GeoModelKernelUnits::cm, 6.05*GeoModelKernelUnits::cm ) ) );
+  	ZigZagMotherPhysical->add( new GeoTransform( GeoTrf::Translate3D( ( 108.85 - 31.1*i )*Gaudi::Units::cm, ( 2*j - 1 )*10.*Gaudi::Units::cm, 6.05*Gaudi::Units::cm ) ) );
   	ZigZagMotherPhysical->add( ZigZagStrAPhysical );
 	StrAIdTag++;
   }
   
   int StrBIdTag = 1;
-  const double xB1[ 2 ] = { ( -6.77 + 108.85 )*GeoModelKernelUnits::cm, ( 6.77 + 108.85 )*GeoModelKernelUnits::cm };
-  const double xB2[ 2 ] = { ( -6.77 + 124.4 )*GeoModelKernelUnits::cm, ( 6.77 + 93.3 )*GeoModelKernelUnits::cm  };
-  const double alpha[ 2 ] = { 45.*GeoModelKernelUnits::deg, -45.*GeoModelKernelUnits::deg };
+  const double xB1[ 2 ] = { ( -6.77 + 108.85 )*Gaudi::Units::cm, ( 6.77 + 108.85 )*Gaudi::Units::cm };
+  const double xB2[ 2 ] = { ( -6.77 + 124.4 )*Gaudi::Units::cm, ( 6.77 + 93.3 )*Gaudi::Units::cm  };
+  const double alpha[ 2 ] = { 45.*Gaudi::Units::deg, -45.*Gaudi::Units::deg };
   
   for ( int k = 0; k < 2; k++ )  for ( int i = 0; i < 8; i++ ) {
   	ZigZagMotherPhysical->add( new GeoIdentifierTag( StrBIdTag ) );
-  	ZigZagMotherPhysical->add( new GeoTransform( GeoTrf::Transform3D(GeoTrf::Translate3D( xB1[ k ] - 31.1*i*GeoModelKernelUnits::cm, 0.*GeoModelKernelUnits::cm, -.1*GeoModelKernelUnits::cm )*GeoTrf::RotateY3D( alpha[ k ] ) ) ) );
+  	ZigZagMotherPhysical->add( new GeoTransform( GeoTrf::Transform3D(GeoTrf::Translate3D( xB1[ k ] - 31.1*i*Gaudi::Units::cm, 0.*Gaudi::Units::cm, -.1*Gaudi::Units::cm )*GeoTrf::RotateY3D( alpha[ k ] ) ) ) );
   	ZigZagMotherPhysical->add( ZigZagStrBPhysical );
 	StrBIdTag++;
 	
 	for ( int j = 0; j < 2; j++ ) {
 		ZigZagMotherPhysical->add( new GeoIdentifierTag( StrBIdTag ) );
-  		ZigZagMotherPhysical->add( new GeoTransform( GeoTrf::Transform3D( GeoTrf::Translate3D( xB2[ k ] - 31.1*i*GeoModelKernelUnits::cm, ( -10. + 20.*j )*GeoModelKernelUnits::cm, -.1*GeoModelKernelUnits::cm ) *GeoTrf::RotateY3D( alpha[ k ] )) ) );
+  		ZigZagMotherPhysical->add( new GeoTransform( GeoTrf::Transform3D( GeoTrf::Translate3D( xB2[ k ] - 31.1*i*Gaudi::Units::cm, ( -10. + 20.*j )*Gaudi::Units::cm, -.1*Gaudi::Units::cm ) *GeoTrf::RotateY3D( alpha[ k ] )) ) );
   		ZigZagMotherPhysical->add( ZigZagStrBPhysical );
 		StrBIdTag++;	
 	}
@@ -285,39 +285,39 @@ GeoVFullPhysVol* LArGeo::CryostatConstructionTBEC::GetEnvelope()
   for ( int i = 0; i < 9; i++ ) {
   	if ( i < 8 ) {
   		ZigZagMotherPhysical->add( new GeoIdentifierTag( StrCIdTag ) );
-  		ZigZagMotherPhysical->add( new GeoTransform( GeoTrf::Translate3D( ( 108.85 - 31.1*i )*GeoModelKernelUnits::cm, 0.*GeoModelKernelUnits::cm, -6.15*GeoModelKernelUnits::cm ) ) );
+  		ZigZagMotherPhysical->add( new GeoTransform( GeoTrf::Translate3D( ( 108.85 - 31.1*i )*Gaudi::Units::cm, 0.*Gaudi::Units::cm, -6.15*Gaudi::Units::cm ) ) );
   		ZigZagMotherPhysical->add( ZigZagStrCPhysical );
 		StrCIdTag++;
 	}
 	for ( int j = 0; j < 2; j++ ) {
 		ZigZagMotherPhysical->add( new GeoIdentifierTag( StrCIdTag ) );
-  		ZigZagMotherPhysical->add( new GeoTransform( GeoTrf::Translate3D( ( 124.4 - 31.1*i )*GeoModelKernelUnits::cm, ( -10. + 20.*j )*GeoModelKernelUnits::cm, -6.15*GeoModelKernelUnits::cm ) ) );
+  		ZigZagMotherPhysical->add( new GeoTransform( GeoTrf::Translate3D( ( 124.4 - 31.1*i )*Gaudi::Units::cm, ( -10. + 20.*j )*Gaudi::Units::cm, -6.15*Gaudi::Units::cm ) ) );
   		ZigZagMotherPhysical->add( ZigZagStrCPhysical );
 		StrCIdTag++;
 	}
   }
   
   int StrDIdTag = 1;
-  const double xD1[ 2 ] = { ( -2.598 + 124.4 )*GeoModelKernelUnits::cm, ( 2.598 + 124.4 )*GeoModelKernelUnits::cm };
-  const double xD2[ 2 ] = { ( -2.598 + 108.85 )*GeoModelKernelUnits::cm, ( 2.598 + 108.85 )*GeoModelKernelUnits::cm };
-  const double beta[ 2 ] = { -22.5*GeoModelKernelUnits::deg, 22.5*GeoModelKernelUnits::deg };
+  const double xD1[ 2 ] = { ( -2.598 + 124.4 )*Gaudi::Units::cm, ( 2.598 + 124.4 )*Gaudi::Units::cm };
+  const double xD2[ 2 ] = { ( -2.598 + 108.85 )*Gaudi::Units::cm, ( 2.598 + 108.85 )*Gaudi::Units::cm };
+  const double beta[ 2 ] = { -22.5*Gaudi::Units::deg, 22.5*Gaudi::Units::deg };
   
   for ( int k = 0; k < 2; k++ )  for ( int i = 0; i < 9; i++ ) {
   	ZigZagMotherPhysical->add( new GeoIdentifierTag( StrDIdTag ) );
-  	ZigZagMotherPhysical->add( new GeoTransform( GeoTrf::Transform3D( GeoTrf::Translate3D( xD1[ k ] - 31.1*i*GeoModelKernelUnits::cm, 0.*GeoModelKernelUnits::cm, 5.995*GeoModelKernelUnits::cm ) *GeoTrf::RotateY3D( beta[ k ] )) ) );
+  	ZigZagMotherPhysical->add( new GeoTransform( GeoTrf::Transform3D( GeoTrf::Translate3D( xD1[ k ] - 31.1*i*Gaudi::Units::cm, 0.*Gaudi::Units::cm, 5.995*Gaudi::Units::cm ) *GeoTrf::RotateY3D( beta[ k ] )) ) );
   	ZigZagMotherPhysical->add( ZigZagStrDPhysical );
 	StrDIdTag++;
 	
 	if ( i < 8 ) for ( int j = 0; j < 2; j++ ) {
 		ZigZagMotherPhysical->add( new GeoIdentifierTag( StrDIdTag ) );
-  		ZigZagMotherPhysical->add( new GeoTransform( GeoTrf::Transform3D( GeoTrf::Translate3D( xD2[ k ] - 31.1*i*GeoModelKernelUnits::cm, ( -10. +20.*j )*GeoModelKernelUnits::cm, 5.995*GeoModelKernelUnits::cm ) *GeoTrf::RotateY3D( beta[ k ] )) ) );
+  		ZigZagMotherPhysical->add( new GeoTransform( GeoTrf::Transform3D( GeoTrf::Translate3D( xD2[ k ] - 31.1*i*Gaudi::Units::cm, ( -10. +20.*j )*Gaudi::Units::cm, 5.995*Gaudi::Units::cm ) *GeoTrf::RotateY3D( beta[ k ] )) ) );
   		ZigZagMotherPhysical->add( ZigZagStrDPhysical );
 		StrDIdTag++;	
 	}
   }
    
   WallPhysical->add( new GeoIdentifierTag( 1 ) );
-  WallPhysical->add( new GeoTransform( GeoTrf::Translate3D( 0.*GeoModelKernelUnits::cm, 0.*GeoModelKernelUnits::cm, -53.2*GeoModelKernelUnits::cm ) ) );
+  WallPhysical->add( new GeoTransform( GeoTrf::Translate3D( 0.*Gaudi::Units::cm, 0.*Gaudi::Units::cm, -53.2*Gaudi::Units::cm ) ) );
   WallPhysical->add( ZigZagMotherPhysical );
     
 return m_cryoEnvelopePhysical;
diff --git a/LArCalorimeter/LArGeoModel/LArGeoTBEC/src/EMECModuleConstruction.cxx b/LArCalorimeter/LArGeoModel/LArGeoTBEC/src/EMECModuleConstruction.cxx
index 8027190c6edfd65d6a84ebf72345c8b73b42bfe5..1dbfa6e3e745f175b8722732f25943ef18d7fbbc 100755
--- a/LArCalorimeter/LArGeoModel/LArGeoTBEC/src/EMECModuleConstruction.cxx
+++ b/LArCalorimeter/LArGeoModel/LArGeoTBEC/src/EMECModuleConstruction.cxx
@@ -49,6 +49,7 @@
 #include "GaudiKernel/Bootstrap.h"
 #include "GaudiKernel/IService.h"
 #include "GaudiKernel/ISvcLocator.h"
+#include "GaudiKernel/SystemOfUnits.h"
 
 #include <string>
 #include <cmath>
@@ -112,37 +113,37 @@ GeoVFullPhysVol* LArGeo::EMECModuleConstruction::GetEnvelope()
 
   //LAr
 
-  GeoMaterial* LAr = new GeoMaterial(name="LiquidArgon", density=1.396*GeoModelKernelUnits::g/GeoModelKernelUnits::cm3);
+  GeoMaterial* LAr = new GeoMaterial(name="LiquidArgon", density=1.396*GeoModelKernelUnits::g/Gaudi::Units::cm3);
   LAr->add(Ar,1.);
   LAr->lock();
  
   //Alu
 
-  GeoMaterial* Alu = new GeoMaterial(name="Alu", density=2.7*GeoModelKernelUnits::g/GeoModelKernelUnits::cm3);
+  GeoMaterial* Alu = new GeoMaterial(name="Alu", density=2.7*GeoModelKernelUnits::g/Gaudi::Units::cm3);
   Alu->add(Al,1.);
   Alu->lock();
 
   //Iron
 
-  GeoMaterial* Iron = new GeoMaterial(name="Iron", density=7.87*GeoModelKernelUnits::g/GeoModelKernelUnits::cm3);
+  GeoMaterial* Iron = new GeoMaterial(name="Iron", density=7.87*GeoModelKernelUnits::g/Gaudi::Units::cm3);
   Iron->add(Fe,1.);
   Iron->lock();
 
   //Copper
 
-  GeoMaterial* Copper = new GeoMaterial(name="Copper", density=8.96*GeoModelKernelUnits::g/GeoModelKernelUnits::cm3);
+  GeoMaterial* Copper = new GeoMaterial(name="Copper", density=8.96*GeoModelKernelUnits::g/Gaudi::Units::cm3);
   Copper->add(Cu,1.);
   Copper->lock();
 
   //Lead
 
-  GeoMaterial* Lead = new GeoMaterial(name="Lead", density=11.35*GeoModelKernelUnits::g/GeoModelKernelUnits::cm3);
+  GeoMaterial* Lead = new GeoMaterial(name="Lead", density=11.35*GeoModelKernelUnits::g/Gaudi::Units::cm3);
   Lead->add(Pb,1.);
   Lead->lock();
 
   // Air	,  at 20 deg C, 1 atm density=1.2931*mg/cm3
 
-  GeoMaterial* Air=new GeoMaterial(name="Air", density=1.290*GeoModelKernelUnits::mg/GeoModelKernelUnits::cm3);
+  GeoMaterial* Air=new GeoMaterial(name="Air", density=1.290*Gaudi::Units::mg/Gaudi::Units::cm3);
   Air->add(N, .8);
   Air->add(O, .2);
   Air->lock();
@@ -150,7 +151,7 @@ GeoVFullPhysVol* LArGeo::EMECModuleConstruction::GetEnvelope()
   //Prepreg glue for absorbers, composition to be checked!
   //ref:STR.CAL.01.CRB.6,(23-Jan-2003,J.T.)
 
-  GeoMaterial* Glue=new GeoMaterial(name="Glue", density=1.8*GeoModelKernelUnits::g/GeoModelKernelUnits::cm3);
+  GeoMaterial* Glue=new GeoMaterial(name="Glue", density=1.8*GeoModelKernelUnits::g/Gaudi::Units::cm3);
   aH=8.*H->getA();
   aO=2.*O->getA();
   aC=5.*C->getA();
@@ -169,7 +170,7 @@ GeoVFullPhysVol* LArGeo::EMECModuleConstruction::GetEnvelope()
   //PermaliE730 for Front middle ring, composition to be checked!
   //                     ref.: STR.CAL.01.CRB.6,(23-Jan-2003,J.T.)
 
-  GeoMaterial* PermaliE730=new GeoMaterial(name="PermaliE730",density=1.83*GeoModelKernelUnits::g/GeoModelKernelUnits::cm3);
+  GeoMaterial* PermaliE730=new GeoMaterial(name="PermaliE730",density=1.83*GeoModelKernelUnits::g/Gaudi::Units::cm3);
   aH=8.*H->getA();
   aO=2.*O->getA();
   aC=5.*C->getA();
@@ -187,7 +188,7 @@ GeoVFullPhysVol* LArGeo::EMECModuleConstruction::GetEnvelope()
 
   // Gten  ( C8 H14 O4 ), alias glass epoxy for long.&transv.bars
 
-  GeoMaterial* Gten = new GeoMaterial(name="Gten", density=1.8*GeoModelKernelUnits::g/GeoModelKernelUnits::cm3);
+  GeoMaterial* Gten = new GeoMaterial(name="Gten", density=1.8*GeoModelKernelUnits::g/Gaudi::Units::cm3);
   aH=14.*H->getA();
   aO= 4.*O->getA();
   aC= 8.*C->getA();
@@ -206,7 +207,7 @@ GeoVFullPhysVol* LArGeo::EMECModuleConstruction::GetEnvelope()
   // Kapton 11-Jan-2002 ML from accbgeo.age: the Kapton_E density is 1.46g/cm3
   //        one assumes it is the same as for the Kapton_H -> C22 H10 O5 N2
  
-  GeoMaterial* Kapton= new GeoMaterial(name="Kapton",density=1.46*GeoModelKernelUnits::g/GeoModelKernelUnits::cm3);
+  GeoMaterial* Kapton= new GeoMaterial(name="Kapton",density=1.46*GeoModelKernelUnits::g/Gaudi::Units::cm3);
   aH=10.*H->getA();
   aO= 5.*O->getA();
   aC=22.*C->getA();
@@ -227,9 +228,9 @@ GeoVFullPhysVol* LArGeo::EMECModuleConstruction::GetEnvelope()
 
   // THIN absorber: outer wheel
   //               11-Jan-2002 ML source: endegeo.age and Fig.7-3 of TDR
-  Tggl = 0.3*GeoModelKernelUnits::mm;
-  Tgfe = 0.4*GeoModelKernelUnits::mm;
-  Tgpb = 1.7*GeoModelKernelUnits::mm;
+  Tggl = 0.3*Gaudi::Units::mm;
+  Tgfe = 0.4*Gaudi::Units::mm;
+  Tgpb = 1.7*Gaudi::Units::mm;
   Totalthick=Tggl+Tgfe+Tgpb;
   m1=Tggl*Glue->getDensity();
   m2=Tgfe*Iron->getDensity();
@@ -250,9 +251,9 @@ GeoVFullPhysVol* LArGeo::EMECModuleConstruction::GetEnvelope()
 
   // THICK absorber: inner wheel
   //                 11-Jan-2002 ML source: endegeo.age and Fig.7-3 of TDR
-  Thgl = 0.3*GeoModelKernelUnits::mm;
-  Thfe = 0.4*GeoModelKernelUnits::mm;
-  Thpb = 2.2*GeoModelKernelUnits::mm;
+  Thgl = 0.3*Gaudi::Units::mm;
+  Thfe = 0.4*Gaudi::Units::mm;
+  Thpb = 2.2*Gaudi::Units::mm;
   Totalthick=Thgl+Thfe+Thpb;
   m1=Thgl*Glue->getDensity();
   m2=Thfe*Iron->getDensity();
@@ -273,8 +274,8 @@ GeoVFullPhysVol* LArGeo::EMECModuleConstruction::GetEnvelope()
 
   // Electrode,   as a mixture Kapton+Cu, 11-Jan-2002 ML
 
-  Thcu = 0.105*GeoModelKernelUnits::mm;
-  Thka = 0.170*GeoModelKernelUnits::mm;  //together with glue J.T.
+  Thcu = 0.105*Gaudi::Units::mm;
+  Thka = 0.170*Gaudi::Units::mm;  //together with glue J.T.
   Totalthicke = Thcu+Thka;
   m1=Thcu*Copper->getDensity();
   m2=Thka*Kapton->getDensity();
@@ -303,7 +304,7 @@ GeoVFullPhysVol* LArGeo::EMECModuleConstruction::GetEnvelope()
     FracC =aC*inv_Atot;
     FracAr=aAr*inv_Atot;
   }
-  GeoMaterial* Elect_LAr= new GeoMaterial(name="Elnics",density=1.28*GeoModelKernelUnits::g/GeoModelKernelUnits::cm3);
+  GeoMaterial* Elect_LAr= new GeoMaterial(name="Elnics",density=1.28*GeoModelKernelUnits::g/Gaudi::Units::cm3);
   Elect_LAr->add(H ,FracH);
   Elect_LAr->add(C ,FracC);
   Elect_LAr->add(Ar,FracAr);
@@ -316,9 +317,9 @@ GeoVFullPhysVol* LArGeo::EMECModuleConstruction::GetEnvelope()
 
   // G10FeInner for barrette in the inner wheel(J.T.08.01.2003)
 
-  Thfe  =0.4*GeoModelKernelUnits::mm;
-  Thgl  =0.3*GeoModelKernelUnits::mm;
-  Thpb  =2.2*GeoModelKernelUnits::mm;
+  Thfe  =0.4*Gaudi::Units::mm;
+  Thgl  =0.3*Gaudi::Units::mm;
+  Thpb  =2.2*Gaudi::Units::mm;
   ThGten=Thpb;
   Totalthick =Thfe+Thgl+ThGten;
   //Totalthicki=Totalthick;
@@ -343,9 +344,9 @@ GeoVFullPhysVol* LArGeo::EMECModuleConstruction::GetEnvelope()
 
  // G10FeOuter for barrette in the outer wheel(J.T.08.01.2003)
 
-  Thfe  =0.4*GeoModelKernelUnits::mm;
-  Thgl  =0.3*GeoModelKernelUnits::mm;
-  Thpb  =1.7*GeoModelKernelUnits::mm;
+  Thfe  =0.4*Gaudi::Units::mm;
+  Thgl  =0.3*Gaudi::Units::mm;
+  Thpb  =1.7*Gaudi::Units::mm;
   ThGten=Thpb;
   Totalthick =Thfe+Thgl+ThGten;
   //Totalthicko=Totalthick;
@@ -381,13 +382,13 @@ GeoVFullPhysVol* LArGeo::EMECModuleConstruction::GetEnvelope()
 // V.N: From LarWheelSolid, to get bounding polycone. Previoulsy G4 routine. No GeoModel equivalent so far ...
 //
   
-  double zWheelFrontFace 		= 3689.5*GeoModelKernelUnits::mm;
+  double zWheelFrontFace 		= 3689.5*Gaudi::Units::mm;
   
-  double dWRPtoFrontFace 		= 11.*GeoModelKernelUnits::mm;
+  double dWRPtoFrontFace 		= 11.*Gaudi::Units::mm;
 
-  double dMechFocaltoWRP                 = 3691. *GeoModelKernelUnits::mm;  //=endg_z1*GeoModelKernelUnits::cm
+  double dMechFocaltoWRP                 = 3691. *Gaudi::Units::mm;  //=endg_z1*Gaudi::Units::cm
                                                          //"LArEMECNomLarOrig" 
-  double rOuterCutoff                    = 2034. *GeoModelKernelUnits::mm;  //=endg_rlimit*GeoModelKernelUnits::cm
+  double rOuterCutoff                    = 2034. *Gaudi::Units::mm;  //=endg_rlimit*Gaudi::Units::cm
                                               //"LArEMECMaxRadiusActivePart
 
 //*****************      
@@ -399,32 +400,32 @@ GeoVFullPhysVol* LArGeo::EMECModuleConstruction::GetEnvelope()
   double Rin1, Rin2, Rout1, Rout2;
 
   if ( m_isInnerWheel ) {
-    Rin1 = 279.*GeoModelKernelUnits::mm;
-    Rin2 = 324.*GeoModelKernelUnits::mm;
+    Rin1 = 279.*Gaudi::Units::mm;
+    Rin2 = 324.*Gaudi::Units::mm;
   }
   else {
-    Rin1 = 590.*GeoModelKernelUnits::mm;
-    Rin2 = 678.*GeoModelKernelUnits::mm; 
+    Rin1 = 590.*Gaudi::Units::mm;
+    Rin2 = 678.*Gaudi::Units::mm; 
   }
   if ( m_isOuterWheel ) {
-    Rout1 = 2070.*GeoModelKernelUnits::mm;
-    Rout2 = 2070.*GeoModelKernelUnits::mm;
+    Rout1 = 2070.*Gaudi::Units::mm;
+    Rout2 = 2070.*Gaudi::Units::mm;
   }
   else {
-    Rout1 = 647.*GeoModelKernelUnits::mm;
-    Rout2 = 732.*GeoModelKernelUnits::mm;
+    Rout1 = 647.*Gaudi::Units::mm;
+    Rout2 = 732.*Gaudi::Units::mm;
   }
 
   // --> EndOfRadiiSelection <--
    
-  double emecMotherZplan[] = { 3639.5*GeoModelKernelUnits::mm, 3639.5*GeoModelKernelUnits::mm + 630.*GeoModelKernelUnits::mm };    //cold (J.T)                               
+  double emecMotherZplan[] = { 3639.5*Gaudi::Units::mm, 3639.5*Gaudi::Units::mm + 630.*Gaudi::Units::mm };    //cold (J.T)                               
   double emecMotherRin[]   = { Rin1, Rin2 };	
   double emecMotherRout[]  = { Rout1, Rout2 }; 
   int lastPlaneEmec = ( sizeof( emecMotherZplan )/sizeof( double ) );
 
   if ( m_isTB ) { 
      for ( int i = 0; i < lastPlaneEmec; i++ ) emecMotherZplan[ i ] -= zWheelFrontFace;
-     zWheelFrontFace = 0.*GeoModelKernelUnits::mm;
+     zWheelFrontFace = 0.*Gaudi::Units::mm;
   }
 
   double phiPosition = M_PI/2;
@@ -449,8 +450,8 @@ GeoVFullPhysVol* LArGeo::EMECModuleConstruction::GetEnvelope()
   double tanThetaMid   = 2. * exp(-eta_mid) / (1. - exp(2.*-eta_mid));
   double tanThetaOuter = 2. * exp(-eta_low) / (1. - exp(2.*-eta_low));
 
-  double zWheelThickness = 514.*GeoModelKernelUnits::mm;     // endg_etot-2.*(endg_sabl*GeoModelKernelUnits::cm-2.*GeoModelKernelUnits::mm)
-  double gapBetweenWheels= 1.5*GeoModelKernelUnits::mm*2.;  // "LArEMECHalfCrack"*2.
+  double zWheelThickness = 514.*Gaudi::Units::mm;     // endg_etot-2.*(endg_sabl*Gaudi::Units::cm-2.*Gaudi::Units::mm)
+  double gapBetweenWheels= 1.5*Gaudi::Units::mm*2.;  // "LArEMECHalfCrack"*2.
 
 //J.T************
 // zWheelFrontFace for mechanical design
@@ -654,14 +655,14 @@ GeoVFullPhysVol* LArGeo::EMECModuleConstruction::GetEnvelope()
 
   // V.N. --> Support selected
 
-  z0 = zWheelFrontFace - 61.*GeoModelKernelUnits::mm;
+  z0 = zWheelFrontFace - 61.*Gaudi::Units::mm;
   EMECSupportConstruction *fsc = new EMECSupportConstruction( FrontIndx, true, "LAr::EMEC::", M_PI/2 );
   GeoPhysVol* physicalFSM = fsc->GetEnvelope();
   emecMotherPhysical->add( new GeoIdentifierTag( 1 ) );
   emecMotherPhysical->add( new GeoTransform( GeoTrf::TranslateZ3D( z0 ) ) );
   emecMotherPhysical->add( physicalFSM );
 
-  z0 = zWheelFrontFace + 514.*GeoModelKernelUnits::mm + 55.*GeoModelKernelUnits::mm;
+  z0 = zWheelFrontFace + 514.*Gaudi::Units::mm + 55.*Gaudi::Units::mm;
   EMECSupportConstruction *bsc = new EMECSupportConstruction( BackIndx, true, "LAr::EMEC::", M_PI/2 );
   GeoPhysVol *physicalBSM = bsc->GetEnvelope();
   emecMotherPhysical->add( new GeoIdentifierTag( 1 ) );
@@ -670,7 +671,7 @@ GeoVFullPhysVol* LArGeo::EMECModuleConstruction::GetEnvelope()
   emecMotherPhysical->add( physicalBSM );
 
   if ( m_isOuterWheel ) {
-    z0 = zWheelFrontFace + 514.*GeoModelKernelUnits::mm/2;
+    z0 = zWheelFrontFace + 514.*Gaudi::Units::mm/2;
     EMECSupportConstruction *osc = new EMECSupportConstruction( 2, true, "LAr::EMEC::", M_PI/2 );
     GeoPhysVol *physicalOSM = osc->GetEnvelope();
     emecMotherPhysical->add( new GeoIdentifierTag( 1 ) );
@@ -679,7 +680,7 @@ GeoVFullPhysVol* LArGeo::EMECModuleConstruction::GetEnvelope()
   }
  
   if ( m_isInnerWheel ) {
-    z0 = zWheelFrontFace + 514.*GeoModelKernelUnits::mm/2;
+    z0 = zWheelFrontFace + 514.*Gaudi::Units::mm/2;
     EMECSupportConstruction *isc = new EMECSupportConstruction( 3, true, "LAr::EMEC::", M_PI/2 );
     GeoPhysVol *physicalISM = isc->GetEnvelope();
     emecMotherPhysical->add( new GeoIdentifierTag( 1 ) );
@@ -687,7 +688,7 @@ GeoVFullPhysVol* LArGeo::EMECModuleConstruction::GetEnvelope()
     emecMotherPhysical->add( physicalISM );
   }
  
-  z0 = zWheelFrontFace + 514.*GeoModelKernelUnits::mm/2;
+  z0 = zWheelFrontFace + 514.*Gaudi::Units::mm/2;
   EMECSupportConstruction *msc = new EMECSupportConstruction( 4, true, "LAr::EMEC::", M_PI/2 );
   GeoPhysVol *physicalMSM = msc->GetEnvelope();
   emecMotherPhysical->add( new GeoIdentifierTag( 1 ) );
diff --git a/LArCalorimeter/LArGeoModel/LArGeoTBEC/src/LArDetectorConstructionTBEC.cxx b/LArCalorimeter/LArGeoModel/LArGeoTBEC/src/LArDetectorConstructionTBEC.cxx
index f0b5264d749c38f26d96c7068ab90cb681de2629..820254ad36aa6fe76880d15cff8756454af1fad8 100755
--- a/LArCalorimeter/LArGeoModel/LArGeoTBEC/src/LArDetectorConstructionTBEC.cxx
+++ b/LArCalorimeter/LArGeoModel/LArGeoTBEC/src/LArDetectorConstructionTBEC.cxx
@@ -22,7 +22,6 @@
 #include "GeoModelKernel/GeoAlignableTransform.h"  
 #include "GeoModelKernel/GeoIdentifierTag.h"  
 #include "GeoModelKernel/GeoDefinitions.h"
-#include "GeoModelKernel/Units.h"
 #include "StoreGate/StoreGateSvc.h"
 #include "GeoModelInterfaces/AbsMaterialManager.h"
 #include "GeoModelInterfaces/StoredMaterialManager.h"
@@ -39,6 +38,7 @@
 #include "StoreGate/StoreGateSvc.h"
 #include "GaudiKernel/MsgStream.h"
 #include "GaudiKernel/Bootstrap.h"
+#include "GaudiKernel/SystemOfUnits.h"
 
 // For run options :
 #include "LArG4RunControl/LArGeoTBGeometricOptions.h"
@@ -110,21 +110,9 @@ StoreGate interface");
   else if ( m_eta_cell > 43.5 ) m_eta_pos = 0.1*( m_eta_cell - 43.5 ) + 2.5; // Inner Wheel
   else m_eta_pos = 0.025*( m_eta_cell - 0.5 ) + 1.425; // Outer Wheel
 
-  if ( m_eta_cell <= 43.5 ) m_phi_pos = -( ( m_phi_cell - 16. )*1.40625 + 0.46875 )*GeoModelKernelUnits::deg; // Outer Wheel
-  else m_phi_pos = -( 4*( m_phi_cell - 4. )*1.40625 + 0.46875 )*GeoModelKernelUnits::deg; // Inner Wheel
+  if ( m_eta_cell <= 43.5 ) m_phi_pos = -( ( m_phi_cell - 16. )*1.40625 + 0.46875 )*Gaudi::Units::deg; // Outer Wheel
+  else m_phi_pos = -( 4*( m_phi_cell - 4. )*1.40625 + 0.46875 )*Gaudi::Units::deg; // Inner Wheel
     
-
-/*
-  printf( "LArDetectorConstructionTBEC\teta_cell = %6.2lf ( eta = %6.2lf     )\n", m_eta_cell, 
-m_eta_pos );
-  printf( "LArDetectorConstructionTBEC\tphi_cell = %6.2lf ( phi = %6.2lf GeoModelKernelUnits::deg )\n", m_phi_cell, 
-m_phi_pos/GeoModelKernelUnits::deg );
-*/
-
-/*
-  printf( "LArDetectorConstructionTBEC\tModuleRotation = %6.2lf GeoModelKernelUnits::deg\n", m_ModuleRotation/GeoModelKernelUnits::deg );
-  printf( "LArDetectorConstructionTBEC\tYShift = %6.1lf GeoModelKernelUnits::mm\n", m_YShift/GeoModelKernelUnits::mm );
-*/
 }
 
 LArGeo::LArDetectorConstructionTBEC::~LArDetectorConstructionTBEC() {}
@@ -166,8 +154,8 @@ GeoVPhysVol* LArGeo::LArDetectorConstructionTBEC::GetEnvelope()
   // Default values....
   m_hasLeadCompensator = false;
   m_hasPresampler = false;
-  m_ModuleRotation = 0.*GeoModelKernelUnits::deg;
-  m_YShift = 0.*GeoModelKernelUnits::mm;
+  m_ModuleRotation = 0.*Gaudi::Units::deg;
+  m_YShift = 0.*Gaudi::Units::mm;
  
   IRDBRecordset_ptr tbecGeometry   = m_pAccessSvc->getRecordsetPtr("TBECGeometry",detectorKey, detectorNode); 
   if ((*tbecGeometry).size()!=0) {
@@ -192,7 +180,7 @@ GeoVPhysVol* LArGeo::LArDetectorConstructionTBEC::GetEnvelope()
 
   std::string baseName = "LAr::TBEC::MotherVolume";
 
-  GeoBox* tbecMotherShape = new GeoBox( 5.*GeoModelKernelUnits::m, 5.*GeoModelKernelUnits::m, 15.*GeoModelKernelUnits::m );
+  GeoBox* tbecMotherShape = new GeoBox( 5.*Gaudi::Units::m, 5.*Gaudi::Units::m, 15.*Gaudi::Units::m );
 
   const GeoLogVol* tbecMotherLogical =
     new GeoLogVol(baseName, tbecMotherShape, Air);
@@ -259,25 +247,25 @@ GeoFullPhysVol* LArGeo::LArDetectorConstructionTBEC::createEnvelope()
   // accordingly.
 
   std::string tbecMotherName = baseName + "::MotherVolume";
-  GeoBox* tbecMotherShape = new GeoBox( 5.*GeoModelKernelUnits::m, 5.*GeoModelKernelUnits::m, 15.*GeoModelKernelUnits::m  );
+  GeoBox* tbecMotherShape = new GeoBox( 5.*Gaudi::Units::m, 5.*Gaudi::Units::m, 15.*Gaudi::Units::m  );
   const GeoLogVol* tbecMotherLogical = new GeoLogVol( tbecMotherName, tbecMotherShape, Air );
   GeoFullPhysVol* tbecMotherPhysical = new GeoFullPhysVol( tbecMotherLogical );
   
-  double xcent = -120.*GeoModelKernelUnits::cm, zcent = 395.7*GeoModelKernelUnits::cm;
-  double zfface = zcent - 60.09*GeoModelKernelUnits::cm;
+  double xcent = -120.*Gaudi::Units::cm, zcent = 395.7*Gaudi::Units::cm;
+  double zfface = zcent - 60.09*Gaudi::Units::cm;
   log << MSG::DEBUG << "eta = " << m_eta_pos;
   if ( m_eta_pos > 5. ) m_eta_pos = 0.;
   else m_eta_pos = 2*atan( exp( -m_eta_pos ) );
-  log << ", positioning cryostat with angle " << m_eta_pos*(1./GeoModelKernelUnits::deg) << " GeoModelKernelUnits::deg";
+  log << ", positioning cryostat with angle " << m_eta_pos*(1./Gaudi::Units::deg) << " Gaudi::Units::deg";
   log << endmsg;
   
   // Tubular axis, dummy
   
   if ( AXIS_ON ) {
   
-     double axisZHalfLength = 5*GeoModelKernelUnits::m;
+     double axisZHalfLength = 5*Gaudi::Units::m;
   
-     GeoTube* axisShape = new GeoTube( 0.*GeoModelKernelUnits::cm, 1.*GeoModelKernelUnits::cm, axisZHalfLength );
+     GeoTube* axisShape = new GeoTube( 0.*Gaudi::Units::cm, 1.*Gaudi::Units::cm, axisZHalfLength );
   
      // x-axis
      std::string XAxisName = baseName + "::XAxis";
@@ -285,7 +273,7 @@ GeoFullPhysVol* LArGeo::LArDetectorConstructionTBEC::createEnvelope()
      GeoPhysVol* XAxisPhysVol = new GeoPhysVol( XAxisLogical );
   
      tbecMotherPhysical->add( new GeoIdentifierTag( 1 ) );
-     tbecMotherPhysical->add( new GeoTransform( GeoTrf::Transform3D( GeoTrf::Translation3D( axisZHalfLength, 0.*GeoModelKernelUnits::m, 0.*GeoModelKernelUnits::m ) *GeoTrf::RotateY3D( 90.*GeoModelKernelUnits::deg )) ) );
+     tbecMotherPhysical->add( new GeoTransform( GeoTrf::Transform3D( GeoTrf::Translation3D( axisZHalfLength, 0.*Gaudi::Units::m, 0.*Gaudi::Units::m ) *GeoTrf::RotateY3D( 90.*Gaudi::Units::deg )) ) );
      tbecMotherPhysical->add( XAxisPhysVol );
   
      // y-axis
@@ -294,7 +282,7 @@ GeoFullPhysVol* LArGeo::LArDetectorConstructionTBEC::createEnvelope()
      GeoPhysVol* YAxisPhysVol = new GeoPhysVol( YAxisLogical );
   
      tbecMotherPhysical->add( new GeoIdentifierTag( 1 ) );
-     tbecMotherPhysical->add( new GeoTransform( GeoTrf::Transform3D( GeoTrf::Translation3D( 0.*GeoModelKernelUnits::m, axisZHalfLength, 0.*GeoModelKernelUnits::m )*GeoTrf::RotateX3D( -90.*GeoModelKernelUnits::deg ) ) ) );
+     tbecMotherPhysical->add( new GeoTransform( GeoTrf::Transform3D( GeoTrf::Translation3D( 0.*Gaudi::Units::m, axisZHalfLength, 0.*Gaudi::Units::m )*GeoTrf::RotateX3D( -90.*Gaudi::Units::deg ) ) ) );
      tbecMotherPhysical->add( YAxisPhysVol );
   
      //z-axis
@@ -311,13 +299,13 @@ GeoFullPhysVol* LArGeo::LArDetectorConstructionTBEC::createEnvelope()
   
   if ( m_hasLeadCompensator ) {
      std::string CompensatorName = baseName + "::LeadCompensator";
-     GeoBox* CompensatorShape = new GeoBox( 152.*GeoModelKernelUnits::cm, 195.*GeoModelKernelUnits::cm, 0.56*GeoModelKernelUnits::cm );
+     GeoBox* CompensatorShape = new GeoBox( 152.*Gaudi::Units::cm, 195.*Gaudi::Units::cm, 0.56*Gaudi::Units::cm );
      const GeoLogVol* CompensatorLogical = new GeoLogVol( CompensatorName, CompensatorShape, Lead );
      GeoPhysVol* CompensatorPhysical = new GeoPhysVol( CompensatorLogical );
 	
      tbecMotherPhysical->add( new GeoIdentifierTag( 1 ) );
 
-     GeoTrf::Vector3D tmpvec1(xcent, 0., 300.*GeoModelKernelUnits::cm);
+     GeoTrf::Vector3D tmpvec1(xcent, 0., 300.*Gaudi::Units::cm);
      GeoTrf::Vector3D tmpvec1Rotated = GeoTrf::RotateY3D(m_eta_pos)*tmpvec1;
      GeoTrf::Translate3D tmpxf1(tmpvec1Rotated.x(),tmpvec1Rotated.y(),tmpvec1Rotated.z());
      tbecMotherPhysical->add(new GeoTransform( tmpxf1 * GeoTrf::RotateY3D(m_eta_pos)));
@@ -341,8 +329,8 @@ GeoFullPhysVol* LArGeo::LArDetectorConstructionTBEC::createEnvelope()
   
   log << MSG::VERBOSE << "Creating beam chambers ..." << std::endl;
   
-  const double beamCZ[ 4 ] = { 17.9*GeoModelKernelUnits::m, 7.673*GeoModelKernelUnits::m, 1.352*GeoModelKernelUnits::m, .256*GeoModelKernelUnits::m };
-  const double beamCSize = 11.*GeoModelKernelUnits::cm, beamCTh = 28*GeoModelKernelUnits::mm; // divided by 2, for half-length
+  const double beamCZ[ 4 ] = { 17.9*Gaudi::Units::m, 7.673*Gaudi::Units::m, 1.352*Gaudi::Units::m, .256*Gaudi::Units::m };
+  const double beamCSize = 11.*Gaudi::Units::cm, beamCTh = 28*Gaudi::Units::mm; // divided by 2, for half-length
   
   GeoBox* BeamCShape = new GeoBox( beamCSize, beamCSize, beamCTh );
   for ( int i = 0; i < 4; i++ ) {
@@ -352,15 +340,15 @@ GeoFullPhysVol* LArGeo::LArDetectorConstructionTBEC::createEnvelope()
   	GeoPhysVol* BeamCPhysical = new GeoPhysVol( BeamCLogical );
 	
 	tbecMotherPhysical->add( new GeoIdentifierTag( 1 ) );
-  	tbecMotherPhysical->add( new GeoTransform( GeoTrf::Translate3D( 0.*GeoModelKernelUnits::cm, 0.*GeoModelKernelUnits::cm, zfface - beamCZ[ i ] ) ) );
+  	tbecMotherPhysical->add( new GeoTransform( GeoTrf::Translate3D( 0.*Gaudi::Units::cm, 0.*Gaudi::Units::cm, zfface - beamCZ[ i ] ) ) );
   	tbecMotherPhysical->add( BeamCPhysical );
   } 
   
   // End cap module
 	log << MSG::DEBUG << std::endl
-	    << "Module deviation: " << m_ModuleRotation * (1./GeoModelKernelUnits::deg) << " GeoModelKernelUnits::deg" << std::endl
-            << "Phi position: " << m_phi_pos * (1./GeoModelKernelUnits::deg) << " GeoModelKernelUnits::deg" << std::endl
-            << "Y shift: " << m_YShift * (1./GeoModelKernelUnits::mm) << " GeoModelKernelUnits::mm"
+	    << "Module deviation: " << m_ModuleRotation * (1./Gaudi::Units::deg) << " Gaudi::Units::deg" << std::endl
+            << "Phi position: " << m_phi_pos * (1./Gaudi::Units::deg) << " Gaudi::Units::deg" << std::endl
+            << "Y shift: " << m_YShift * (1./Gaudi::Units::mm) << " Gaudi::Units::mm"
             << endmsg;
   
   // z = 0 in emecMother is at active region's front face
@@ -371,8 +359,8 @@ GeoFullPhysVol* LArGeo::LArDetectorConstructionTBEC::createEnvelope()
   StatusCode status=detStore->record(sPhysVol,"EMEC_POS");
   if(!status.isSuccess()) throw std::runtime_error ("Cannot store EMEC_POS");  
 
-  GeoTrf::Transform3D Mrot(GeoTrf::RotateZ3D( m_phi_pos + 90*GeoModelKernelUnits::deg)*GeoTrf::RotateY3D(m_ModuleRotation));
-  GeoTrf::Vector3D pos( -xcent, m_YShift, -51.4/2*GeoModelKernelUnits::cm );
+  GeoTrf::Transform3D Mrot(GeoTrf::RotateZ3D( m_phi_pos + 90*Gaudi::Units::deg)*GeoTrf::RotateY3D(m_ModuleRotation));
+  GeoTrf::Vector3D pos( -xcent, m_YShift, -51.4/2*Gaudi::Units::cm );
   
   if ( LArPhysical != 0 ) {
   
@@ -381,7 +369,7 @@ GeoFullPhysVol* LArGeo::LArDetectorConstructionTBEC::createEnvelope()
      LArPhysical->add( emecEnvelope );			  		
   }
   
-  pos-= GeoTrf::Vector3D( 0.*GeoModelKernelUnits::mm, 0.*GeoModelKernelUnits::mm, 61.*GeoModelKernelUnits::mm +2.*GeoModelKernelUnits::mm +13.5*GeoModelKernelUnits::mm );
+  pos-= GeoTrf::Vector3D( 0.*Gaudi::Units::mm, 0.*Gaudi::Units::mm, 61.*Gaudi::Units::mm +2.*Gaudi::Units::mm +13.5*Gaudi::Units::mm );
   
   if ( m_hasPresampler ) {
 
diff --git a/LArCalorimeter/LArGeoModel/LArReadoutGeometry/LArReadoutGeometry/EMECDetectorRegion.h b/LArCalorimeter/LArGeoModel/LArReadoutGeometry/LArReadoutGeometry/EMECDetectorRegion.h
index 36764678130615e583a77aada6631e3e55783245..23bcc382d038bb12374814d695ced7d204e73c36 100755
--- a/LArCalorimeter/LArGeoModel/LArReadoutGeometry/LArReadoutGeometry/EMECDetectorRegion.h
+++ b/LArCalorimeter/LArGeoModel/LArReadoutGeometry/LArReadoutGeometry/EMECDetectorRegion.h
@@ -8,7 +8,7 @@
 #include "LArReadoutGeometry/EMECDetDescr.h"
 #include "GeoModelKernel/GeoVDetectorElement.h"
 #include "GeoModelKernel/GeoDefinitions.h"
-#include "GeoModelKernel/Units.h"
+#include "GaudiKernel/SystemOfUnits.h"
 #include "GeoPrimitives/GeoPrimitives.h"
 #include "CLHEP/Geometry/Point3D.h"
 
@@ -39,7 +39,7 @@ class EMECDetectorRegion : public GeoVDetectorElement
   EMECDetectorRegion(const GeoVFullPhysVol *physVol
 		     , const EMECDetDescr *emecDescriptor
 		     , DetectorSide endcap
-		     , double projectivityDisplacement = 4*GeoModelKernelUnits::cm);
+		     , double projectivityDisplacement = 4*Gaudi::Units::cm);
 
   /**
    * @brief    Destructor    
diff --git a/LArCalorimeter/LArGeoModel/LArReadoutGeometry/LArReadoutGeometry/FCALModule.h b/LArCalorimeter/LArGeoModel/LArReadoutGeometry/LArReadoutGeometry/FCALModule.h
index b86a754eadb337ab792e9e0c4dddd1325bc10de0..010f745fc0c4d31dd21b23b82d25c7d4e06ad926 100755
--- a/LArCalorimeter/LArGeoModel/LArReadoutGeometry/LArReadoutGeometry/FCALModule.h
+++ b/LArCalorimeter/LArGeoModel/LArReadoutGeometry/LArReadoutGeometry/FCALModule.h
@@ -9,7 +9,7 @@
 #include "LArReadoutGeometry/FCALTile.h"
 #include "GeoModelKernel/GeoVDetectorElement.h"
 #include "GeoModelKernel/GeoDefinitions.h"
-#include "GeoModelKernel/Units.h"
+#include "GaudiKernel/SystemOfUnits.h"
 #include "GeoPrimitives/GeoPrimitives.h"
 
 class FCALDetectorManager;
@@ -45,7 +45,7 @@ class FCALModule : public GeoVDetectorElement
   FCALModule (const GeoVFullPhysVol *physVol
 	      , Module module
 	      , Endcap endcap
-	      , double projectivityDisplacement = 4*GeoModelKernelUnits::cm);
+	      , double projectivityDisplacement = 4*Gaudi::Units::cm);
     
   /**
    * @brief Desctructor
diff --git a/LArCalorimeter/LArGeoModel/LArReadoutGeometry/LArReadoutGeometry/HECDetectorRegion.h b/LArCalorimeter/LArGeoModel/LArReadoutGeometry/LArReadoutGeometry/HECDetectorRegion.h
index 8be83da82bdb142ebf958e9ffab2a2e2d18ae1af..776adb869626e9719a2d493336a2cd5d5a76c320 100755
--- a/LArCalorimeter/LArGeoModel/LArReadoutGeometry/LArReadoutGeometry/HECDetectorRegion.h
+++ b/LArCalorimeter/LArGeoModel/LArReadoutGeometry/LArReadoutGeometry/HECDetectorRegion.h
@@ -8,7 +8,7 @@
 #include "LArReadoutGeometry/HECCellConstLink.h"
 #include "GeoModelKernel/GeoVDetectorElement.h"
 #include "GeoModelKernel/GeoDefinitions.h"
-#include "GeoModelKernel/Units.h"
+#include "GaudiKernel/SystemOfUnits.h"
 #include "GeoPrimitives/GeoPrimitives.h"
 #include "CLHEP/Geometry/Point3D.h"
 
@@ -42,7 +42,7 @@ class HECDetectorRegion : public GeoVDetectorElement
   HECDetectorRegion (const GeoVFullPhysVol *physVol
 		     , const HECDetDescr *hecDescriptor
 		     , DetectorSide endcap
-		     , double projectivityDisplacement = 4*GeoModelKernelUnits::cm);
+		     , double projectivityDisplacement = 4*Gaudi::Units::cm);
 
   /**
    * @brief Destructor
diff --git a/LArCalorimeter/LArGeoModel/LArReadoutGeometry/src/EMBAccordionDetails.cxx b/LArCalorimeter/LArGeoModel/LArReadoutGeometry/src/EMBAccordionDetails.cxx
index fe74f2b8f292ae72b4c13ae74c52aa05eac6c9af..1a34066cddd63cf37d7b3a856581be50992ba92e 100644
--- a/LArCalorimeter/LArGeoModel/LArReadoutGeometry/src/EMBAccordionDetails.cxx
+++ b/LArCalorimeter/LArGeoModel/LArReadoutGeometry/src/EMBAccordionDetails.cxx
@@ -10,8 +10,8 @@
 #include "GeoModelInterfaces/IGeoModelSvc.h"
 #include "GaudiKernel/ISvcLocator.h"
 #include "GaudiKernel/Bootstrap.h"
+#include "GaudiKernel/PhysicalConstants.h"
 #include "StoreGate/StoreGateSvc.h"
-#include "GeoModelKernel/Units.h"
 #include <cmath>
 class EMBAccordionDetails::Clockwork {
 
@@ -187,7 +187,7 @@ void EMBAccordionDetails::Clockwork::getRPhi()
 // accordion geometry
 int EMBAccordionDetails::Clockwork::phiGap(double radius, double xhit, const double yhit)
 {
-  const double m2pi = 2.0*GeoModelKernelUnits::pi;
+  const double m2pi = 2.0*Gaudi::Units::pi;
   double phi_0=phi0(radius)+gam0;   // from -M_PI to M_PI
   double phi_hit=atan2(yhit,xhit);  // from -M_PI to M_PI
   double dphi=phi_hit-phi_0;
@@ -244,23 +244,23 @@ EMBAccordionDetails::EMBAccordionDetails():m_c(new Clockwork()) {
   // phi of first absorber
   m_c->gam0 = (*barrelGeometry)[0]->getDouble("PHIFIRST");
   // radius of curvature of neutral fiber in the folds
-  m_c->rint_eleFib = (*barrelGeometry)[0]->getDouble("RINT")*GeoModelKernelUnits::cm;
+  m_c->rint_eleFib = (*barrelGeometry)[0]->getDouble("RINT")*Gaudi::Units::cm;
   
   // r,phi positions of the centre of the folds (nominal geometry)
   for (int idat = 0; idat < m_c->Nbrt1 ; idat++) 
     {
-      m_c->rc[idat]   = (*barrelGeometry)[0]->getDouble("RHOCEN",idat)*GeoModelKernelUnits::cm; 
-      m_c->phic[idat] = (*barrelGeometry)[0]->getDouble("PHICEN",idat)*GeoModelKernelUnits::deg; 
-      m_c->delta[idat] = (*barrelGeometry)[0]->getDouble("DELTA",idat)*GeoModelKernelUnits::deg; 
+      m_c->rc[idat]   = (*barrelGeometry)[0]->getDouble("RHOCEN",idat)*Gaudi::Units::cm; 
+      m_c->phic[idat] = (*barrelGeometry)[0]->getDouble("PHICEN",idat)*Gaudi::Units::deg; 
+      m_c->delta[idat] = (*barrelGeometry)[0]->getDouble("DELTA",idat)*Gaudi::Units::deg; 
       m_c->xc[idat] = m_c->rc[idat]*cos(m_c->phic[idat]);
       m_c->yc[idat] = m_c->rc[idat]*sin(m_c->phic[idat]);
     }
   //
-  m_c->rMinAccordion  =   (*barrelGeometry)[0]->getDouble("RIN_AC")*GeoModelKernelUnits::cm;  
-  m_c->rMaxAccordion  =   (*barrelGeometry)[0]->getDouble("ROUT_AC")*GeoModelKernelUnits::cm;  
+  m_c->rMinAccordion  =   (*barrelGeometry)[0]->getDouble("RIN_AC")*Gaudi::Units::cm;  
+  m_c->rMaxAccordion  =   (*barrelGeometry)[0]->getDouble("ROUT_AC")*Gaudi::Units::cm;  
   m_c->etaMaxBarrel   =   (*barrelGeometry)[0]->getDouble("ETACUT");      
-  m_c->zMinBarrel     =   (*barrelLongDiv)[0]->getDouble("ZMAXACT")*GeoModelKernelUnits::cm;    
-  m_c->zMaxBarrel     =   (*barrelLongDiv)[0]->getDouble("ZMINACT")*GeoModelKernelUnits::cm;    
+  m_c->zMinBarrel     =   (*barrelLongDiv)[0]->getDouble("ZMAXACT")*Gaudi::Units::cm;    
+  m_c->zMaxBarrel     =   (*barrelLongDiv)[0]->getDouble("ZMINACT")*Gaudi::Units::cm;    
   // === GU 11/06/2003   total number of cells in phi
   // to distinguish 1 module (testbeam case) from full Atlas
   m_c->NCellTot =         (*barrelGeometry)[0]->getInt("NCELMX"); 
diff --git a/LArCalorimeter/LArGeoModel/LArReadoutGeometry/src/EMBBasicReadoutNumbers.cxx b/LArCalorimeter/LArGeoModel/LArReadoutGeometry/src/EMBBasicReadoutNumbers.cxx
index 74c7e745950fecbbad121ae003ffc54cfeb20133..d0aece53d0bf1425e40df79b4f5f0fab509437a6 100755
--- a/LArCalorimeter/LArGeoModel/LArReadoutGeometry/src/EMBBasicReadoutNumbers.cxx
+++ b/LArCalorimeter/LArGeoModel/LArReadoutGeometry/src/EMBBasicReadoutNumbers.cxx
@@ -5,6 +5,7 @@
 #include "GaudiKernel/MsgStream.h"
 #include "GaudiKernel/Bootstrap.h"
 #include "GaudiKernel/ISvcLocator.h"
+#include "GaudiKernel/SystemOfUnits.h"
 
 #include "RDBAccessSvc/IRDBRecord.h"
 #include "RDBAccessSvc/IRDBRecordset.h"
@@ -13,7 +14,6 @@
 
 #include "GeoModelInterfaces/IGeoModelSvc.h"
 #include "GeoModelUtilities/DecodeVersionKey.h" 
-#include "GeoModelKernel/Units.h"
 #include "LArReadoutGeometry/EMBBasicReadoutNumbers.h"
 
 EMBBasicReadoutNumbers::EMBBasicReadoutNumbers()
@@ -56,12 +56,12 @@ EMBBasicReadoutNumbers::EMBBasicReadoutNumbers()
 
 
 
-  m_presamplerRadius = (*presamplerGeometry)[0]->getDouble("RACTIVE")*GeoModelKernelUnits::cm;
-  m_rInAc            = (*barrelGeometry)[0]->getDouble("RIN_AC")*GeoModelKernelUnits::cm;
-  m_rOutAc           = (*barrelGeometry)[0]->getDouble("ROUT_AC")*GeoModelKernelUnits::cm;
+  m_presamplerRadius = (*presamplerGeometry)[0]->getDouble("RACTIVE")*Gaudi::Units::cm;
+  m_rInAc            = (*barrelGeometry)[0]->getDouble("RIN_AC")*Gaudi::Units::cm;
+  m_rOutAc           = (*barrelGeometry)[0]->getDouble("ROUT_AC")*Gaudi::Units::cm;
   for (int i=0;i<8;i++) m_EE.push_back((*barrelLongDiv)[0]->getDouble("EE",i));
-  for (int i=0;i<8;i++) m_RMX12.push_back((*barrelLongDiv)[0]->getDouble("RMX12",i)*GeoModelKernelUnits::cm);
-  for (int i=0;i<53;i++) m_RMX23.push_back((*barrelLongDiv)[0]->getDouble("RMX23",i)*GeoModelKernelUnits::cm);
+  for (int i=0;i<8;i++) m_RMX12.push_back((*barrelLongDiv)[0]->getDouble("RMX12",i)*Gaudi::Units::cm);
+  for (int i=0;i<53;i++) m_RMX23.push_back((*barrelLongDiv)[0]->getDouble("RMX23",i)*Gaudi::Units::cm);
   for (int i=0;i<448;i++) m_EMBSamplingSepInnerRMax.push_back((*embSamplingSepInner)[0]->getDouble("RMAX",i)); // 
 
 }
diff --git a/LArCalorimeter/LArGeoModel/LArReadoutGeometry/src/EMECDetectorManager.cxx b/LArCalorimeter/LArGeoModel/LArReadoutGeometry/src/EMECDetectorManager.cxx
index a1e3a425bbf4e5ef0afc2d22bc55bc0123e49ec5..20add8ffd31a3ead5248c1e23e4636d265a30aee 100755
--- a/LArCalorimeter/LArGeoModel/LArReadoutGeometry/src/EMECDetectorManager.cxx
+++ b/LArCalorimeter/LArGeoModel/LArReadoutGeometry/src/EMECDetectorManager.cxx
@@ -4,16 +4,14 @@
 
 #include "GaudiKernel/MsgStream.h"
 #include "GaudiKernel/Bootstrap.h"
+#include "GaudiKernel/SystemOfUnits.h"
 
 #include "RDBAccessSvc/IRDBRecord.h"
 #include "RDBAccessSvc/IRDBRecordset.h"
 #include "RDBAccessSvc/IRDBAccessSvc.h"
 
-
 #include "GeoModelInterfaces/IGeoModelSvc.h"
 #include "GeoModelUtilities/DecodeVersionKey.h"
-#include "GeoModelKernel/Units.h"
-
 #include "LArReadoutGeometry/EMECDetectorManager.h"
 #include "LArReadoutGeometry/EMECDetectorRegion.h"
 #include "LArReadoutGeometry/EMECDetDescr.h"
@@ -56,20 +54,20 @@ EMECDetectorManager::EMECDetectorManager()
   if (emecSamplingSep->size()==0)   throw std::runtime_error("Error getting EmecSamplingSep table");
 
   const IRDBRecord *ess = (*emecSamplingSep)[0];
-  for (int j=0;j<7;j++)  m_ziw.push_back(ess->getDouble("ZIW",j)*GeoModelKernelUnits::cm);
-  for (int j=0;j<44;j++) m_zsep12.push_back(ess->getDouble("ZSEP12",j)*GeoModelKernelUnits::cm);
-  for (int j=0;j<22;j++) m_zsep23.push_back(ess->getDouble("ZSEP23",j)*GeoModelKernelUnits::cm);
+  for (int j=0;j<7;j++)  m_ziw.push_back(ess->getDouble("ZIW",j)*Gaudi::Units::cm);
+  for (int j=0;j<44;j++) m_zsep12.push_back(ess->getDouble("ZSEP12",j)*Gaudi::Units::cm);
+  for (int j=0;j<22;j++) m_zsep23.push_back(ess->getDouble("ZSEP23",j)*Gaudi::Units::cm);
 
   IRDBRecordset_ptr emecMagicNumbers       = rdbAccess->getRecordsetPtr("EmecMagicNumbers", larVersionKey.tag(),larVersionKey.node());
   if (emecMagicNumbers->size()==0) {
     emecMagicNumbers       = rdbAccess->getRecordsetPtr("EmecMagicNumbers", "EmecMagicNumbers-00");
     if (emecMagicNumbers->size()==0) throw std::runtime_error("Error getting EmecMagicNumbers table");
   }
-  m_MagicNumbers->focalToRef        =(*emecMagicNumbers)[0]->getDouble("FOCALTOREF")*GeoModelKernelUnits::mm;
-  m_MagicNumbers->refToActive       =(*emecMagicNumbers)[0]->getDouble("REFTOACTIVE")*GeoModelKernelUnits::mm;
-  m_MagicNumbers->activeLength      =(*emecMagicNumbers)[0]->getDouble("ACTIVELENGTH")*GeoModelKernelUnits::mm;
-  m_MagicNumbers->refToPresampler   =(*emecMagicNumbers)[0]->getDouble("REFTOPRESAMPLER")*GeoModelKernelUnits::mm;
-  m_MagicNumbers->presamplerLength  =(*emecMagicNumbers)[0]->getDouble("PRESAMPLERLENGTH")*GeoModelKernelUnits::mm;
+  m_MagicNumbers->focalToRef        =(*emecMagicNumbers)[0]->getDouble("FOCALTOREF")*Gaudi::Units::mm;
+  m_MagicNumbers->refToActive       =(*emecMagicNumbers)[0]->getDouble("REFTOACTIVE")*Gaudi::Units::mm;
+  m_MagicNumbers->activeLength      =(*emecMagicNumbers)[0]->getDouble("ACTIVELENGTH")*Gaudi::Units::mm;
+  m_MagicNumbers->refToPresampler   =(*emecMagicNumbers)[0]->getDouble("REFTOPRESAMPLER")*Gaudi::Units::mm;
+  m_MagicNumbers->presamplerLength  =(*emecMagicNumbers)[0]->getDouble("PRESAMPLERLENGTH")*Gaudi::Units::mm;
   
 }
 
diff --git a/LArCalorimeter/LArGeoModel/LArReadoutGeometry/src/FCAL_ChannelMap.cxx b/LArCalorimeter/LArGeoModel/LArReadoutGeometry/src/FCAL_ChannelMap.cxx
index 5cb3662d79dd502fedb2856954f6d3bb3cbfb4f6..4bb9cbd7d353071c022cff0eb9baf7a5d5200479 100755
--- a/LArCalorimeter/LArGeoModel/LArReadoutGeometry/src/FCAL_ChannelMap.cxx
+++ b/LArCalorimeter/LArGeoModel/LArReadoutGeometry/src/FCAL_ChannelMap.cxx
@@ -13,7 +13,7 @@
 //****************************************************************************
 
 #include "LArReadoutGeometry/FCAL_ChannelMap.h"
-#include "GeoModelKernel/Units.h"
+#include "GaudiKernel/SystemOfUnits.h"
 #include "boost/io/ios_state.hpp"
 #include <sstream>
 #include <iostream>
@@ -21,7 +21,7 @@
 #include <stdio.h>
 
 /* === Geometrical parameters === */
-const double FCAL_ChannelMap::m_tubeSpacing[] = {0.75*GeoModelKernelUnits::cm, 0.8179*GeoModelKernelUnits::cm, 0.90*GeoModelKernelUnits::cm};
+const double FCAL_ChannelMap::m_tubeSpacing[] = {0.75*Gaudi::Units::cm, 0.8179*Gaudi::Units::cm, 0.90*Gaudi::Units::cm};
 
 FCAL_ChannelMap::FCAL_ChannelMap( int flag)          
 {
@@ -78,7 +78,7 @@ void FCAL_ChannelMap::add_tube(const std::string & tileName, int mod, int /*id*/
 
   tileName_t tilename = (a3 << 16) + a2;
 
-  TubePosition tb(tilename, x*GeoModelKernelUnits::cm, y*GeoModelKernelUnits::cm,"");
+  TubePosition tb(tilename, x*Gaudi::Units::cm, y*Gaudi::Units::cm,"");
   // Add offsets, becaues iy and ix can be negative HMA
   
   i = i+200;
@@ -104,7 +104,7 @@ void FCAL_ChannelMap::add_tube(const std::string & tileName, int mod, int /*id*/
 
   tileName_t tilename = (a3 << 16) + a2;
 
-  TubePosition tb(tilename, x*GeoModelKernelUnits::cm, y*GeoModelKernelUnits::cm, hvFT);
+  TubePosition tb(tilename, x*Gaudi::Units::cm, y*Gaudi::Units::cm, hvFT);
   // Add offsets, becaues iy and ix can be negative HMA
   
   i = i+200;
diff --git a/LArCalorimeter/LArGeoModel/LArReadoutGeometry/src/HECDetDescr.cxx b/LArCalorimeter/LArGeoModel/LArReadoutGeometry/src/HECDetDescr.cxx
index e44269da848d34410c3f0cc7f131f49a12f10d83..426a5e9a232786e2f983a568426d92c58afdb786 100755
--- a/LArCalorimeter/LArGeoModel/LArReadoutGeometry/src/HECDetDescr.cxx
+++ b/LArCalorimeter/LArGeoModel/LArReadoutGeometry/src/HECDetDescr.cxx
@@ -5,6 +5,7 @@
 #include "LArReadoutGeometry/HECDetDescr.h"
 #include "GaudiKernel/MsgStream.h"
 #include "GaudiKernel/Bootstrap.h"
+#include "GaudiKernel/SystemOfUnits.h"
 #include "StoreGate/StoreGateSvc.h"
 #include "RDBAccessSvc/IRDBRecord.h"
 #include "RDBAccessSvc/IRDBRecordset.h"
@@ -68,7 +69,7 @@ HECDetDescr::HECDetDescr (const HECDetectorManager *detManager
 	m_zMax.push_back(back);
       }
       pos += m_manager->getBlock(b)->getDepth();
-      if(isTestBeam && b==2) pos += (*hadronicEndcap)[0]->getDouble("GAPWHL")*GeoModelKernelUnits::cm;
+      if(isTestBeam && b==2) pos += (*hadronicEndcap)[0]->getDouble("GAPWHL")*Gaudi::Units::cm;
     }
   }
 }
diff --git a/LArCalorimeter/LArGeoModel/LArReadoutGeometry/src/HECDetectorManager.cxx b/LArCalorimeter/LArGeoModel/LArReadoutGeometry/src/HECDetectorManager.cxx
index d270dcd4fd3ae88c6bd0444a4fee6442ab124e7d..313f1ea19c0fc6ddafd0cf0e4a6fbabe88843dcc 100755
--- a/LArCalorimeter/LArGeoModel/LArReadoutGeometry/src/HECDetectorManager.cxx
+++ b/LArCalorimeter/LArGeoModel/LArReadoutGeometry/src/HECDetectorManager.cxx
@@ -6,13 +6,13 @@
 #include "LArReadoutGeometry/HECDetectorRegion.h"
 #include "GaudiKernel/MsgStream.h"
 #include "GaudiKernel/Bootstrap.h"
+#include "GaudiKernel/SystemOfUnits.h"
 #include "StoreGate/StoreGateSvc.h"
 #include "RDBAccessSvc/IRDBRecord.h"
 #include "RDBAccessSvc/IRDBRecordset.h"
 #include "RDBAccessSvc/IRDBAccessSvc.h"
 #include "GeoModelInterfaces/IGeoModelSvc.h"
 #include "GeoModelUtilities/DecodeVersionKey.h"
-#include "GeoModelKernel/Units.h"
 #include "LArReadoutGeometry/HECDetectorManager.h"
 #include "LArHV/LArHVManager.h"
 #include "StoreGate/StoreGate.h"
@@ -60,21 +60,21 @@ HECDetectorManager::HECDetectorManager(bool isTestBeam)
   if (hecPad->size()!=hecLongBlock->size()) throw std::runtime_error("Error.  Hec[LongitudinalBlock,Pad] size discrepancy");
 
   // Get the focal length:
-  m_focalToRef1 = (*hadronicEndcap)[0]->getDouble("ZORIG")*GeoModelKernelUnits::cm;
+  m_focalToRef1 = (*hadronicEndcap)[0]->getDouble("ZORIG")*Gaudi::Units::cm;
   m_focalToRef2 = m_focalToRef1;
-  double betweenWheel=(*hadronicEndcap)[0]->getDouble("GAPWHL")*GeoModelKernelUnits::cm;
+  double betweenWheel=(*hadronicEndcap)[0]->getDouble("GAPWHL")*Gaudi::Units::cm;
   if(!m_isTestBeam) m_focalToRef2 += betweenWheel;
 
   for (unsigned int b=0;b<hecLongBlock->size();b++) {
     double etaBoundary[15];
     const IRDBRecord *block = (*hecLongBlock)[b];
     unsigned int blockNumber= (unsigned int) (block->getDouble("IBLC")+0.01); // will truncate down.
-    double innerRadius= block->getDouble("BLRMN")*GeoModelKernelUnits::cm;
-    double outerRadius= block->getDouble("BLRMX")*GeoModelKernelUnits::cm;
-    double depth= block->getDouble("BLDPTH")*GeoModelKernelUnits::cm;
+    double innerRadius= block->getDouble("BLRMN")*Gaudi::Units::cm;
+    double outerRadius= block->getDouble("BLRMX")*Gaudi::Units::cm;
+    double depth= block->getDouble("BLDPTH")*Gaudi::Units::cm;
     unsigned int numLArGaps= (unsigned int) (block->getDouble("BLMOD") + 0.01); // will truncate down.
-    double frontPlateThickness= block->getDouble("PLATE0")*GeoModelKernelUnits::cm;
-    double backPlateThickness= block->getDouble("PLATEE")*GeoModelKernelUnits::cm;
+    double frontPlateThickness= block->getDouble("PLATE0")*Gaudi::Units::cm;
+    double backPlateThickness= block->getDouble("PLATEE")*Gaudi::Units::cm;
     
     const IRDBRecord *pad = (*hecPad)[b];
     for (int j=0;j<15;j++) etaBoundary[j]=pad->getDouble("ETA",j);
diff --git a/LArCalorimeter/LArTrackingGeometry/src/LArVolumeBuilder.cxx b/LArCalorimeter/LArTrackingGeometry/src/LArVolumeBuilder.cxx
index 89cb49713f733b69cc48d84ad112224a896b98f4..4dec62b4abea44acb078d554d0ef2c27790b0166 100755
--- a/LArCalorimeter/LArTrackingGeometry/src/LArVolumeBuilder.cxx
+++ b/LArCalorimeter/LArTrackingGeometry/src/LArVolumeBuilder.cxx
@@ -22,7 +22,6 @@
 #include "GeoModelKernel/GeoTrd.h"
 #include "GeoModelKernel/GeoMaterial.h"
 #include "GeoModelKernel/GeoPVConstLink.h"
-#include "GeoModelKernel/Units.h"
 #include "GeoModelUtilities/StoredPhysVol.h"
 // Trk
 #include "TrkDetDescrInterfaces/ITrackingVolumeHelper.h"
@@ -49,8 +48,9 @@
 #include "TrkGeometrySurfaces/SlidingDiscSurface.h"
 // StoreGate
 #include "StoreGate/StoreGateSvc.h"
+#include "GaudiKernel/SystemOfUnits.h"
 
-using GeoModelKernelUnits::mm;
+using Gaudi::Units::mm;
 
 // constructor
 LAr::LArVolumeBuilder::LArVolumeBuilder(const std::string& t, const std::string& n, const IInterface* p) :
diff --git a/MuonSpectrometer/MuonCnv/MuonByteStream/src/MuonCacheCreator.cxx b/MuonSpectrometer/MuonCnv/MuonByteStream/src/MuonCacheCreator.cxx
index b55dc1ff486748e11997163b8ea21ea643266cc4..243546226d03f190eed54a24173abcee8bedfa9c 100644
--- a/MuonSpectrometer/MuonCnv/MuonByteStream/src/MuonCacheCreator.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonByteStream/src/MuonCacheCreator.cxx
@@ -5,14 +5,23 @@
 #include "MuonCacheCreator.h"
 
 #include "MuonIdHelpers/MdtIdHelper.h"
+#include "MuonIdHelpers/CscIdHelper.h"
+#include "MuonIdHelpers/RpcIdHelper.h"
+#include "MuonIdHelpers/TgcIdHelper.h"
 #include "AthViews/View.h"
 
 /// Constructor
 MuonCacheCreator::MuonCacheCreator(const std::string &name,ISvcLocator *pSvcLocator):
   AthReentrantAlgorithm(name,pSvcLocator),
-  m_MdtCsmCacheKey("")
+  m_MdtCsmCacheKey(""),
+  m_CscCacheKey(""),
+  m_RpcCacheKey(""),
+  m_TgcCacheKey("")
 {
   declareProperty("MdtCsmCacheKey", m_MdtCsmCacheKey);
+  declareProperty("CscCacheKey",    m_CscCacheKey);
+  declareProperty("RpcCacheKey",    m_RpcCacheKey);
+  declareProperty("TgcCacheKey",    m_TgcCacheKey);
   declareProperty("DisableViewWarning", m_disableWarning);
 }
 
@@ -22,9 +31,13 @@ MuonCacheCreator::~MuonCacheCreator() {
 
 StatusCode MuonCacheCreator::initialize() {
   ATH_CHECK( m_MdtCsmCacheKey.initialize(!m_MdtCsmCacheKey.key().empty()) );
-  
+  ATH_CHECK( m_CscCacheKey.initialize(!m_CscCacheKey.key().empty()) );
+  ATH_CHECK( m_RpcCacheKey.initialize(!m_RpcCacheKey.key().empty()) );
+  ATH_CHECK( m_TgcCacheKey.initialize(!m_TgcCacheKey.key().empty()) );
   ATH_CHECK( detStore()->retrieve(m_mdtIdHelper,"MDTIDHELPER") );
-  
+  ATH_CHECK( detStore()->retrieve(m_cscIdHelper,"CSCIDHELPER") );
+  ATH_CHECK( detStore()->retrieve(m_rpcIdHelper,"RPCIDHELPER") );
+  ATH_CHECK( detStore()->retrieve(m_tgcIdHelper,"TGCIDHELPER") );
   return StatusCode::SUCCESS;
 }
 
@@ -45,11 +58,20 @@ StatusCode MuonCacheCreator::execute (const EventContext& ctx) const {
      m_disableWarning = true; //only check once
   }
   // Create the MDT cache container
-  auto maxHashMDTs = m_mdtIdHelper->stationNameIndex("BME") != -1 ?
-             m_mdtIdHelper->detectorElement_hash_max() : m_mdtIdHelper->module_hash_max();
+  auto maxHashMDTs = m_mdtIdHelper->stationNameIndex("BME") != -1 ? m_mdtIdHelper->detectorElement_hash_max() : m_mdtIdHelper->module_hash_max();
   ATH_CHECK(createContainer(m_MdtCsmCacheKey, maxHashMDTs, ctx));
+  // Create the CSC cache container
+  ATH_CHECK(createContainer(m_CscCacheKey,    m_cscIdHelper->module_hash_max(), ctx));
+  // Create the RPC cache container
+  ATH_CHECK(createContainer(m_RpcCacheKey,    m_rpcIdHelper->module_hash_max(), ctx));
+  // Create the TGC cache container
+  ATH_CHECK(createContainer(m_TgcCacheKey,    m_tgcIdHelper->module_hash_max(), ctx));
 
   ATH_MSG_INFO("Created cache container " << m_MdtCsmCacheKey);
+  ATH_MSG_INFO("Created cache container " << m_CscCacheKey);
+  ATH_MSG_INFO("Created cache container " << m_RpcCacheKey);
+  ATH_MSG_INFO("Created cache container " << m_TgcCacheKey);
+
 
   return StatusCode::SUCCESS;
 }
diff --git a/MuonSpectrometer/MuonCnv/MuonByteStream/src/MuonCacheCreator.h b/MuonSpectrometer/MuonCnv/MuonByteStream/src/MuonCacheCreator.h
index 9a78b8520d0eb134dca194fae98136c1ed60f420..c19c9a388e59e2918adb3d87731bc9eabe89d26b 100644
--- a/MuonSpectrometer/MuonCnv/MuonByteStream/src/MuonCacheCreator.h
+++ b/MuonSpectrometer/MuonCnv/MuonByteStream/src/MuonCacheCreator.h
@@ -7,8 +7,16 @@
 #include "AthenaBaseComps/AthReentrantAlgorithm.h"
 
 #include "MuonRDO/MdtCsm_Cache.h"
+#include "MuonRDO/CscRawDataCollection_Cache.h"
+#include "MuonRDO/RpcPad_Cache.h"
+#include "MuonRDO/TgcRdo_Cache.h"
+
 
 class MdtIdHelper;
+class CscIdHelper;
+class RpcIdHelper;
+class TgcIdHelper;
+
 
 class MuonCacheCreator : public AthReentrantAlgorithm {
  public:
@@ -31,11 +39,17 @@ protected:
   
   /// Write handle key for the MDT CSM cache container
   SG::WriteHandleKey<MdtCsm_Cache> m_MdtCsmCacheKey;
-
+  SG::WriteHandleKey<CscRawDataCollection_Cache> m_CscCacheKey;
+  SG::WriteHandleKey<RpcPad_Cache> m_RpcCacheKey;
+  SG::WriteHandleKey<TgcRdo_Cache> m_TgcCacheKey;
   /// ID helpers
   const MdtIdHelper* m_mdtIdHelper = 0;
+  const CscIdHelper* m_cscIdHelper = 0;
+  const RpcIdHelper* m_rpcIdHelper = 0;
+  const TgcIdHelper* m_tgcIdHelper = 0;  
   mutable bool m_disableWarning = false;
   bool isInsideView(const EventContext&) const;
+
 };//class MuonCacheCreator
 
 // copied from http://acode-browser1.usatlas.bnl.gov/lxr/source/athena/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/src/CacheCreator.h#0062
diff --git a/MuonSpectrometer/MuonCnv/MuonByteStreamCnvTest/src/MM_DigitToRDO.cxx b/MuonSpectrometer/MuonCnv/MuonByteStreamCnvTest/src/MM_DigitToRDO.cxx
index 9f3560d6fb994b8c12ca7f4661154ee177717d4d..a86e114f2eb737daa1ca4a6633ebc425a306de1b 100644
--- a/MuonSpectrometer/MuonCnv/MuonByteStreamCnvTest/src/MM_DigitToRDO.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonByteStreamCnvTest/src/MM_DigitToRDO.cxx
@@ -70,7 +70,29 @@ StatusCode MM_DigitToRDO::execute()
 
 	for ( unsigned int i=0 ; i<nstrips ; ++i ) {
 
-	  MM_RawData* rdo = new MM_RawData(id,
+	  ///
+	  /// set the rdo id to a value consistent with the channel number
+	  /// 
+	  bool isValid;
+	  int stationName = m_idHelper->stationName(id);
+	  int stationEta  = m_idHelper->stationEta(id);
+	  int stationPhi  = m_idHelper->stationPhi(id);
+	  int multilayer  = m_idHelper->multilayer(id);
+	  int gasGap      = m_idHelper->gasGap(id);
+	  ///
+	  int channel     = digit->stripResponsePosition().at(i);
+
+	  Identifier newId = m_idHelper->channelID(stationName,stationEta,
+						   stationPhi,multilayer,gasGap,channel,true,&isValid);
+
+	  if (!isValid) {
+	    ATH_MSG_WARNING("Invalid MM identifier. StationName="<<stationName <<
+			    " stationEta=" << stationEta << " stationPhi=" << stationPhi << 
+			    " multi=" << multilayer << " gasGap=" << gasGap << " channel=" << channel);
+	    continue;
+	  } 
+
+	  MM_RawData* rdo = new MM_RawData(newId,
 					   digit->stripResponsePosition().at(i),
 					   digit->stripResponseTime().at(i),
 					   digit->stripResponseCharge().at(i));
diff --git a/MuonSpectrometer/MuonCnv/MuonCSC_CnvTools/src/CSC_RawDataProviderTool.cxx b/MuonSpectrometer/MuonCnv/MuonCSC_CnvTools/src/CSC_RawDataProviderTool.cxx
index 64b1f084c79f8edc45c7e71e75b8de2da693314d..5370323573e1c7bb496188acccac20389cc865ed 100644
--- a/MuonSpectrometer/MuonCnv/MuonCSC_CnvTools/src/CSC_RawDataProviderTool.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonCSC_CnvTools/src/CSC_RawDataProviderTool.cxx
@@ -39,6 +39,8 @@ Muon::CSC_RawDataProviderTool::CSC_RawDataProviderTool(const std::string& t,
 {
   declareInterface<IMuonRawDataProviderTool>(this);
   declareProperty("Decoder",     m_decoder);
+  declareProperty ("CscContainerCacheKey", m_rdoContainerCacheKey, "Optional external cache for the CSC container");
+
 }
 
 //================ Destructor =================================================
@@ -151,6 +153,8 @@ StatusCode Muon::CSC_RawDataProviderTool::initialize()
   m_activeStore->setStore( &*evtStore() );
   m_createContainerEachEvent = has_bytestream || m_containerKey.key() != "CSCRDO";
 
+  // Initialise the container cache if available  
+  ATH_CHECK( m_rdoContainerCacheKey.initialize( !m_rdoContainerCacheKey.key().empty() ) );
 
   // Retrieve decoder
   if (m_decoder.retrieve().isFailure()) {
@@ -228,14 +232,25 @@ StatusCode Muon::CSC_RawDataProviderTool::convert(const ROBFragmentList& vecRobs
     return StatusCode::SUCCESS;
   }
 
-  SG::WriteHandle<CscRawDataContainer> handle(m_containerKey);
-  if (handle.isPresent())
+  SG::WriteHandle<CscRawDataContainer> rdoContainerHandle(m_containerKey);
+  if (rdoContainerHandle.isPresent())
     return StatusCode::SUCCESS;
-  ATH_CHECK( handle.record(std::unique_ptr<CscRawDataContainer>( 
-           new CscRawDataContainer(m_muonMgr->cscIdHelper()->module_hash_max())) ));
-  
-  CscRawDataContainer* container = handle.ptr();
 
+  // Split the methods to have one where we use the cache and one where we just setup the container
+  const bool externalCacheRDO = !m_rdoContainerCacheKey.key().empty();
+  if(!externalCacheRDO){
+    //ATH_CHECK( handle.record(std::unique_ptr<CscRawDataContainer>( new CscRawDataContainer(m_muonMgr->cscIdHelper()->module_hash_max())) ));
+    ATH_CHECK( rdoContainerHandle.record(std::make_unique<CscRawDataContainer>( m_muonMgr->cscIdHelper()->module_hash_max() )));
+    ATH_MSG_DEBUG( "Created CSCRawDataContainer" );
+  }
+  else{
+    SG::UpdateHandle<CscRawDataCollection_Cache> update(m_rdoContainerCacheKey);
+    ATH_CHECK(update.isValid());
+    ATH_CHECK(rdoContainerHandle.record (std::make_unique<CscRawDataContainer>( update.ptr() )));
+    ATH_MSG_DEBUG("Created container using cache for " << m_rdoContainerCacheKey.key());
+  }
+  
+  CscRawDataContainer* container = rdoContainerHandle.ptr();
 
   m_activeStore->setStore( &*evtStore() );   
   const EventInfo* thisEventInfo;
diff --git a/MuonSpectrometer/MuonCnv/MuonCSC_CnvTools/src/CSC_RawDataProviderTool.h b/MuonSpectrometer/MuonCnv/MuonCSC_CnvTools/src/CSC_RawDataProviderTool.h
index 1b40f0210506da6941e5c880ca967ca5ba7f199a..adcfd0a18c19e6e09ba0262f34adf45bc56a6944 100644
--- a/MuonSpectrometer/MuonCnv/MuonCSC_CnvTools/src/CSC_RawDataProviderTool.h
+++ b/MuonSpectrometer/MuonCnv/MuonCSC_CnvTools/src/CSC_RawDataProviderTool.h
@@ -14,6 +14,7 @@
 #include "MuonCnvToolInterfaces/IMuonRawDataProviderTool.h"
 #include "MuonCSC_CnvTools/ICSC_ROD_Decoder.h"
 #include "MuonRDO/CscRawDataContainer.h"
+#include "MuonRDO/CscRawDataCollection_Cache.h"
 #include "CSCcabling/CSCcablingSvc.h"
 #include "CSC_Hid2RESrcID.h"
 
@@ -68,6 +69,9 @@ private:
 
   ActiveStoreSvc*                     m_activeStore;
   bool				      m_createContainerEachEvent;
+
+  /// CSC container cache key
+  SG::UpdateHandleKey<CscRawDataCollection_Cache> m_rdoContainerCacheKey ;
 };
 } // end of namespace
 
diff --git a/MuonSpectrometer/MuonCnv/MuonCSC_CnvTools/src/CscROD_Decoder.cxx b/MuonSpectrometer/MuonCnv/MuonCSC_CnvTools/src/CscROD_Decoder.cxx
index 87e11baad9077a6027af687519f8b17b4c8e1937..bb76d1695d24e95c4480907be040c3f3b95fcba6 100644
--- a/MuonSpectrometer/MuonCnv/MuonCSC_CnvTools/src/CscROD_Decoder.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonCSC_CnvTools/src/CscROD_Decoder.cxx
@@ -210,20 +210,15 @@ void Muon::CscROD_Decoder::rodVersion2(const ROBFragment& robFrag,  CscRawDataCo
 
   //assert (subDetectorId == 0x6A || subDetectorId == 0x69); // 50 or 51
 
-  CscRawDataCollection * rawCollection = 0;
-  CscRawDataContainer::const_iterator it_coll = rdoIDC.indexFind(idColl);
-  if (rdoIDC.end() !=  it_coll) {
+  // Create the Csc container and use the cache to get it
+  std::unique_ptr<CscRawDataCollection> rawCollection(nullptr);
+  CscRawDataContainer::IDC_WriteHandle lock = rdoIDC.getWriteHandle( idColl );
+  if( lock.alreadyPresent() ) {
     ATH_MSG_DEBUG ( "CSC RDO collection already exist with collection hash = " << idColl << " converting is skipped!");
-    return; 
-    //rawCollection = it_coll->cptr();
-  } else {
+  }
+  else{
     ATH_MSG_DEBUG ( "CSC RDO collection does not exist - creating a new one with hash = " << idColl );
-    rawCollection = new CscRawDataCollection(idColl);
-    if ( (rdoIDC.addCollection(rawCollection, idColl)).isFailure() ) {
-       ATH_MSG_ERROR ( "Failed to add RDO collection to container" );
-       delete rawCollection;
-       return;
-    }
+    rawCollection = std::make_unique<CscRawDataCollection>(idColl);
   }
 
   /** set the ROD id and the subDector id */
@@ -518,6 +513,15 @@ void Muon::CscROD_Decoder::rodVersion2(const ROBFragment& robFrag,  CscRawDataCo
     //    delete rawCollection;
     //    return;
   }
+
+  if(rawCollection) {
+    StatusCode status_lock = lock.addOrDelete(std::move( rawCollection ) );
+    if (status_lock.isFailure()) {
+      ATH_MSG_ERROR ( "Could not insert CscRawDataCollection into CscRawDataContainer..." );
+      return;
+    }
+  }
+
   ATH_MSG_DEBUG ( "end of CscROD_Decode::fillCollection()" );
   return;
 }
@@ -541,20 +545,15 @@ void Muon::CscROD_Decoder::rodVersion1(const ROBFragment& robFrag,  CscRawDataCo
 
   //assert (subDetectorId <= 1);
   
-  CscRawDataCollection * rawCollection = 0;
-  CscRawDataContainer::const_iterator it_coll = rdoIDC.indexFind(idColl);
-  if (rdoIDC.end() !=  it_coll) {
+  // Create the Csc container and use the cache to get it
+  std::unique_ptr<CscRawDataCollection> rawCollection(nullptr);
+  CscRawDataContainer::IDC_WriteHandle lock = rdoIDC.getWriteHandle( idColl );
+  if( lock.alreadyPresent() ) {
     ATH_MSG_DEBUG ( "CSC RDO collection already exist with collection hash = " << idColl << " converting is skipped!");
-    return; 
-    //rawCollection = it_coll->cptr();
-  } else {
+  }
+  else{
     ATH_MSG_DEBUG ( "CSC RDO collection does not exist - creating a new one with hash = " << idColl );
-    rawCollection = new CscRawDataCollection(idColl);
-    if ( (rdoIDC.addCollection(rawCollection, idColl)).isFailure() ) {
-       ATH_MSG_ERROR ( "Failed to add RDO collection to container" );
-       delete rawCollection;
-       return;
-    }
+    rawCollection = std::make_unique<CscRawDataCollection>(idColl);
   }
 
   // set the ROD id and the subDector id
@@ -596,7 +595,6 @@ void Muon::CscROD_Decoder::rodVersion1(const ROBFragment& robFrag,  CscRawDataCo
   bool dpuFragment = rodReadOut.isDPU(p[rodHeader]);
   if (!dpuFragment) {
     ATH_MSG_ERROR ( "expecting a DPU fragment, Aborting..." );
-    delete rawCollection;
     return;
   }
 
@@ -655,6 +653,17 @@ void Muon::CscROD_Decoder::rodVersion1(const ROBFragment& robFrag,  CscRawDataCo
     if (i < (size-rodFooter)) dpuFragment = rodReadOut.isDPU(p[i]);
     numberOfDPU++;
   }
+
+  if(rawCollection) {
+    StatusCode status_lock = lock.addOrDelete(std::move( rawCollection ) );
+    if (status_lock.isFailure()) {
+      ATH_MSG_ERROR ( "Could not insert CscRawDataCollection into CscRawDataContainer..." );
+      return;
+    }
+  }
+
+  return;
+
 }
 
 void Muon::CscROD_Decoder::rodVersion0(const ROBFragment& robFrag,  CscRawDataContainer& rdoIDC, MsgStream& /*log*/) {  
@@ -683,20 +692,15 @@ void Muon::CscROD_Decoder::rodVersion0(const ROBFragment& robFrag,  CscRawDataCo
   
   uint16_t idColl        = m_cabling->collectionId(subId, rodId);
 
-  CscRawDataCollection * rawCollection = 0;
-  CscRawDataContainer::const_iterator it_coll = rdoIDC.indexFind(idColl);
-  if (rdoIDC.end() !=  it_coll) {
+  // Create the Csc container and use the cache to get it
+  std::unique_ptr<CscRawDataCollection> rawCollection(nullptr);
+  CscRawDataContainer::IDC_WriteHandle lock = rdoIDC.getWriteHandle( idColl );
+  if( lock.alreadyPresent() ) {
     ATH_MSG_DEBUG ( "CSC RDO collection already exist with collection hash = " << idColl << " converting is skipped!");
-    return; 
-    //rawCollection = it_coll->cptr();
-  } else {
+  }
+  else{
     ATH_MSG_DEBUG ( "CSC RDO collection does not exist - creating a new one with hash = " << idColl );
-    rawCollection = new CscRawDataCollection(idColl);
-    if ( (rdoIDC.addCollection(rawCollection, idColl)).isFailure() ) {
-       ATH_MSG_ERROR ( "Failed to add RDO collection to container" );
-       delete rawCollection;
-       return;
-    }
+    rawCollection = std::make_unique<CscRawDataCollection>(idColl);
   }
 
   // set the ROD id and the subDector id
@@ -711,7 +715,6 @@ void Muon::CscROD_Decoder::rodVersion0(const ROBFragment& robFrag,  CscRawDataCo
   bool bodyFragment = rodReadOut.isBody(p[rodHeader]);
   if (!bodyFragment) {
     ATH_MSG_ERROR ( "expecting a body fragment, Aborting..." );
-    delete rawCollection;
     return;
   }
   uint32_t i = rodHeader; 
@@ -758,6 +761,16 @@ void Muon::CscROD_Decoder::rodVersion0(const ROBFragment& robFrag,  CscRawDataCo
     bodyFragment = rodReadOut.isBody(p[i]);
   }
 
+  if(rawCollection) {
+    StatusCode status_lock = lock.addOrDelete(std::move( rawCollection ) );
+    if (status_lock.isFailure()) {
+      ATH_MSG_ERROR ( "Could not insert CscRawDataCollection into CscRawDataContainer..." );
+      return;
+    }
+  }
+
+  return;
+
 }
 
 
diff --git a/MuonSpectrometer/MuonConfig/CMakeLists.txt b/MuonSpectrometer/MuonConfig/CMakeLists.txt
index e2a4b1573d890e039b4d33861d72fb4bf98b0b34..360059848aa5fae174b45893bb869842cd989216 100644
--- a/MuonSpectrometer/MuonConfig/CMakeLists.txt
+++ b/MuonSpectrometer/MuonConfig/CMakeLists.txt
@@ -17,6 +17,12 @@ atlas_add_test( MuonDataDecodeTest
                 EXTRA_PATTERNS "GeoModelSvc.MuonDetectorTool.*SZ=|Cache alignment|Range of input|recorded new|map from|DEBUG Reconciled configuration"
                 SCRIPT test/testMuonDataDecode.sh )
 
+# Adding an identical test for the ByteStream identifiable caches (and future RDO caches)
+atlas_add_test( MuonDataDecodeTest_Cache
+                PROPERTIES TIMEOUT 1000
+                EXTRA_PATTERNS "GeoModelSvc.MuonDetectorTool.*SZ=|Cache alignment|Range of input|recorded new|map from"
+                SCRIPT test/testMuonDataDecode_Cache.sh )
+
 atlas_add_test( MuonCablingConfigTest
    SCRIPT python -m MuonConfig.MuonCablingConfig
    POST_EXEC_SCRIPT nopost.sh )
diff --git a/MuonSpectrometer/MuonConfig/python/MuonBytestreamDecodeConfig.py b/MuonSpectrometer/MuonConfig/python/MuonBytestreamDecodeConfig.py
index 74e5f1d607a457ca143b16496d48195769ea9cdf..06fc84cb37bc1c2c9309afcce4e87af9c83a9cbf 100644
--- a/MuonSpectrometer/MuonConfig/python/MuonBytestreamDecodeConfig.py
+++ b/MuonSpectrometer/MuonConfig/python/MuonBytestreamDecodeConfig.py
@@ -4,6 +4,22 @@
 from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
 from AthenaCommon.Constants import VERBOSE, DEBUG, INFO
 
+## This configuration function creates the IdentifiableCaches for RDO
+#
+# The function returns a ComponentAccumulator which should be loaded first
+# If a configuration wants to use the cache, they need to use the same names as defined here
+def MuonCacheCfg():
+    acc = ComponentAccumulator()
+
+    from MuonByteStream.MuonByteStreamConf import MuonCacheCreator
+    cacheCreator = MuonCacheCreator(MdtCsmCacheKey = "MdtCsmCache",
+                                    CscCacheKey    = "CscCache",
+                                    RpcCacheKey    = "RpcCache",
+                                    TgcCacheKey    = "TgcCache")
+    acc.addEventAlgo( cacheCreator )
+    return acc, cacheCreator
+
+
 ## This configuration function sets up everything for decoding RPC bytestream data into RDOs
 #
 # The forTrigger paramater is used to put the algorithm in RoI mode
@@ -82,12 +98,6 @@ def TgcBytestreamDecodeCfg(flags, forTrigger=False):
 def MdtBytestreamDecodeCfg(flags, forTrigger=False):
     acc = ComponentAccumulator()
 
-    # Configure the IdentifiableCaches when running for trigger
-    if forTrigger:
-        from MuonByteStream.MuonByteStreamConf import MuonCacheCreator
-        cacheCreator = MuonCacheCreator(MdtCsmCacheKey= "MdtCsmCache")
-        acc.addEventAlgo( cacheCreator )
-
     # We need the MDT cabling to be setup
     from MuonConfig.MuonCablingConfig import MDTCablingConfigCfg
     acc.merge( MDTCablingConfigCfg(flags)[0] )
@@ -111,8 +121,7 @@ def MdtBytestreamDecodeCfg(flags, forTrigger=False):
     # Setup the RAW data provider tool
     from MuonMDT_CnvTools.MuonMDT_CnvToolsConf import Muon__MDT_RawDataProviderTool
     MuonMdtRawDataProviderTool = Muon__MDT_RawDataProviderTool(name    = "MDT_RawDataProviderTool",
-                                                               Decoder = MDTRodDecoder,
-                                                               OutputLevel = VERBOSE)
+                                                               Decoder = MDTRodDecoder)
     if forTrigger:
         MuonMdtRawDataProviderTool.CsmContainerCacheKey = "MdtCsmCache"
 
@@ -148,7 +157,10 @@ def CscBytestreamDecodeCfg(flags, forTrigger=False):
     # Setup the RAW data provider tool
     from MuonCSC_CnvTools.MuonCSC_CnvToolsConf import Muon__CSC_RawDataProviderTool
     MuonCscRawDataProviderTool = Muon__CSC_RawDataProviderTool(name    = "CSC_RawDataProviderTool",
-                                                               Decoder = CSCRodDecoder )
+                                                               Decoder = CSCRodDecoder)
+    if forTrigger:
+        MuonCscRawDataProviderTool.CscContainerCacheKey = "CscCache"
+
     acc.addPublicTool( MuonCscRawDataProviderTool ) # This should be removed, but now defined as PublicTool at MuFastSteering 
     
     # Setup the RAW data provider algorithm
@@ -160,14 +172,15 @@ def CscBytestreamDecodeCfg(flags, forTrigger=False):
 
 if __name__=="__main__":
     # To run this, do e.g. 
-    # python ../athena/MuonSpectrometer/MuonConfig/python/MuonBytestreamDecodeCfg.py
+    # python ../athena/MuonSpectrometer/MuonConfig/python/MuonBytestreamDecode.py
 
     from AthenaCommon.Configurable import Configurable
     Configurable.configurableRun3Behavior=1
 
     from AthenaConfiguration.AllConfigFlags import ConfigFlags
-    from AthenaConfiguration.TestDefaults import defaultTestFiles
-    ConfigFlags.Input.Files = defaultTestFiles.RAW
+    ConfigFlags.Input.Files = ["/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data17_13TeV.00327265.physics_EnhancedBias.merge.RAW._lb0100._SFO-1._0001.1"]
+    #from AthenaConfiguration.TestDefaults import defaultTestFiles
+    #ConfigFlags.Input.Files = defaultTestFiles.RAW
     # Set global tag by hand for now
     ConfigFlags.IOVDb.GlobalTag = "CONDBR2-BLKPA-2018-13"#"CONDBR2-BLKPA-2015-17"
     ConfigFlags.GeoModel.AtlasVersion = "ATLAS-R2-2016-01-00-01"#"ATLAS-R2-2015-03-01-00"
@@ -186,6 +199,11 @@ if __name__=="__main__":
     from ByteStreamCnvSvc.ByteStreamConfig import TrigBSReadCfg
     cfg.merge(TrigBSReadCfg(ConfigFlags ))
 
+    # Setup IdentifiableCaches before anything else
+    muoncacheacc, muoncachealg = MuonCacheCfg()
+    cfg.merge( muoncacheacc )
+    cfg.addEventAlgo( muoncachealg )
+
     # Schedule Rpc data decoding - once mergeAll is working can simplify these lines
     rpcdecodingAcc, rpcdecodingAlg = RpcBytestreamDecodeCfg( ConfigFlags ) 
     cfg.merge( rpcdecodingAcc )
@@ -197,12 +215,12 @@ if __name__=="__main__":
     cfg.addEventAlgo( tgcdecodingAlg )
 
     # Schedule Mdt data decoding - once mergeAll is working can simplify these lines
-    mdtdecodingAcc, mdtdecodingAlg = MdtBytestreamDecodeCfg( ConfigFlags ) 
+    mdtdecodingAcc, mdtdecodingAlg = MdtBytestreamDecodeCfg( ConfigFlags , True)
     cfg.merge( mdtdecodingAcc )
     cfg.addEventAlgo( mdtdecodingAlg )
 
     # Schedule Csc data decoding - once mergeAll is working can simplify these lines
-    cscdecodingAcc, cscdecodingAlg = CscBytestreamDecodeCfg( ConfigFlags ) 
+    cscdecodingAcc, cscdecodingAlg = CscBytestreamDecodeCfg( ConfigFlags , True) 
     cfg.merge( cscdecodingAcc )
     cfg.addEventAlgo( cscdecodingAlg )
 
diff --git a/MuonSpectrometer/MuonConfig/python/MuonCablingConfig.py b/MuonSpectrometer/MuonConfig/python/MuonCablingConfig.py
index 0b3862aacf0de7d400911c0f0b534f28a4139244..16e117c6de58ec7ae374d5c71295efdc6b8e4870 100644
--- a/MuonSpectrometer/MuonConfig/python/MuonCablingConfig.py
+++ b/MuonSpectrometer/MuonConfig/python/MuonCablingConfig.py
@@ -156,4 +156,5 @@ if __name__ == '__main__':
     acc.store(f)
     f.close()
 
+    
 
diff --git a/MuonSpectrometer/MuonConfig/python/MuonRdoDecodeConfig.py b/MuonSpectrometer/MuonConfig/python/MuonRdoDecodeConfig.py
index ab4baa7f57b1bfde7a7829ab380e29f59a8309a7..4d9f08a0c897a65a302de0144cbeee78f701cb1b 100644
--- a/MuonSpectrometer/MuonConfig/python/MuonRdoDecodeConfig.py
+++ b/MuonSpectrometer/MuonConfig/python/MuonRdoDecodeConfig.py
@@ -1,8 +1,8 @@
 #
-#  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+#  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 #
 from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
-from AthenaCommon.Constants import DEBUG, INFO
+from AthenaCommon.Constants import VERBOSE, DEBUG, INFO
 
 ## This configuration function sets up everything for decoding RPC RDO to PRD conversion
 #
@@ -148,7 +148,8 @@ def CscClusterBuildCfg(flags, forTrigger=False):
 
 
 # This function runs the decoding on a data file
-def muonRdoDecodeTestData():
+def muonRdoDecodeTestData( forTrigger = False ):
+    # Add a flag, forTrigger, which will initially put the ByteStreamDecodeCfg code into "Cached Container" mode
     from AthenaCommon.Configurable import Configurable
     Configurable.configurableRun3Behavior=1
 
@@ -174,24 +175,37 @@ def muonRdoDecodeTestData():
     from ByteStreamCnvSvc.ByteStreamConfig import TrigBSReadCfg
     cfg.merge(TrigBSReadCfg(ConfigFlags ))
 
+    # Setup IdentifiableCaches before anything else
+    from MuonConfig.MuonBytestreamDecodeConfig import MuonCacheCfg
+    muoncacheacc, muoncachealg = MuonCacheCfg()
+    cfg.merge( muoncacheacc )
+    cfg.addEventAlgo( muoncachealg )
+
     # Schedule Rpc bytestream data decoding - once mergeAll is working can simplify these lines
     from MuonConfig.MuonBytestreamDecodeConfig import RpcBytestreamDecodeCfg
     rpcdecodingAcc, rpcdecodingAlg = RpcBytestreamDecodeCfg( ConfigFlags ) 
     cfg.merge( rpcdecodingAcc )
     cfg.addEventAlgo( rpcdecodingAlg )
 
+    # Schedule Mdt data decoding - once mergeAll is working can simplify these lines
     from MuonConfig.MuonBytestreamDecodeConfig import TgcBytestreamDecodeCfg
     tgcdecodingAcc, tgcdecodingAlg = TgcBytestreamDecodeCfg( ConfigFlags ) 
     cfg.merge( tgcdecodingAcc )
     cfg.addEventAlgo( tgcdecodingAlg )
 
     from MuonConfig.MuonBytestreamDecodeConfig import MdtBytestreamDecodeCfg
-    mdtdecodingAcc, mdtdecodingAlg = MdtBytestreamDecodeCfg( ConfigFlags ) 
+    mdtdecodingAcc, mdtdecodingAlg = MdtBytestreamDecodeCfg( ConfigFlags, forTrigger )
+    # Put into a verbose logging mode to check the caching
+    if forTrigger:
+        mdtdecodingAlg.ProviderTool.OutputLevel = VERBOSE    
     cfg.merge( mdtdecodingAcc )
     cfg.addEventAlgo( mdtdecodingAlg )
 
     from MuonConfig.MuonBytestreamDecodeConfig import CscBytestreamDecodeCfg
-    cscdecodingAcc, cscdecodingAlg = CscBytestreamDecodeCfg( ConfigFlags ) 
+    cscdecodingAcc, cscdecodingAlg = CscBytestreamDecodeCfg( ConfigFlags, forTrigger ) 
+    # Put into a verbose logging mode to check the caching
+    if forTrigger:
+        cscdecodingAlg.ProviderTool.OutputLevel = VERBOSE 
     cfg.merge( cscdecodingAcc )
     cfg.addEventAlgo( cscdecodingAlg )
 
@@ -225,9 +239,14 @@ def muonRdoDecodeTestData():
     log.info('Print Config')
     cfg.printConfig(withDetails=True)
 
+    if forTrigger:
+        pklName = 'MuonRdoDecode_Cache.pkl'
+    else:
+        pklName = 'MuonRdoDecode.pkl'
+
     # Store config as pickle
     log.info('Save Config')
-    with open('MuonRdoDecode.pkl','w') as f:
+    with open(pklName,'w') as f:
         cfg.store(f)
         f.close()
 
diff --git a/MuonSpectrometer/MuonConfig/python/MuonReconstructionConfig.py b/MuonSpectrometer/MuonConfig/python/MuonReconstructionConfig.py
index f6cba997e36746e03f1dc4d14bb5659dfc4cd950..37879ac4db2be2d69a0a29597b522b2f679267cd 100644
--- a/MuonSpectrometer/MuonConfig/python/MuonReconstructionConfig.py
+++ b/MuonSpectrometer/MuonConfig/python/MuonReconstructionConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 
 # Core configuration
 from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
@@ -28,7 +28,7 @@ if __name__=="__main__":
     from AthenaCommon.Logging import log
     log.debug('About to set up Segment Finding.')
     
-    ConfigFlags.Input.Files = ["/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/q221/21.3/myESD.pool.root"]
+    ConfigFlags.Input.Files = ["/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/q221/21.3/v1/myESD.pool.root"]
     ConfigFlags.Muon.doCSCs = False 
     ConfigFlags.lock()
 
diff --git a/MuonSpectrometer/MuonConfig/python/MuonSegmentFindingConfig.py b/MuonSpectrometer/MuonConfig/python/MuonSegmentFindingConfig.py
index 78a1091d1dd0b88129623df3554258d76f134183..1638457f065987dde501a94503b5a8fdc4b72f7d 100644
--- a/MuonSpectrometer/MuonConfig/python/MuonSegmentFindingConfig.py
+++ b/MuonSpectrometer/MuonConfig/python/MuonSegmentFindingConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 
 # This file configures the Muon segment finding. It is based on a few files in the old configuration system:
 # Tools, which are configured here: 
@@ -813,7 +813,7 @@ if __name__=="__main__":
     from AthenaCommon.Logging import log
     log.debug('About to set up Segment Finding.')
     
-    ConfigFlags.Input.Files = ["/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/q221/21.3/myESD.pool.root"]
+    ConfigFlags.Input.Files = ["/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/q221/21.3/v1/myESD.pool.root"]
     ConfigFlags.Input.isMC = True
     ConfigFlags.Muon.doCSCs = False 
     ConfigFlags.lock()
diff --git a/MuonSpectrometer/MuonConfig/share/MuonDataDecodeTest.ref b/MuonSpectrometer/MuonConfig/share/MuonDataDecodeTest.ref
index d83162b1d46d2d39286f05b94f1317e9379a5c23..4b52decb7485ff79cbe050e0b9355dcbb542e44e 100644
--- a/MuonSpectrometer/MuonConfig/share/MuonDataDecodeTest.ref
+++ b/MuonSpectrometer/MuonConfig/share/MuonDataDecodeTest.ref
@@ -1,4 +1,142 @@
+Py:Athena            INFO using release [WorkDir-22.0.1] [x86_64-slc6-gcc8-opt] [atlas-work3/5f61275c16] -- built on [2019-01-25T1856]
 Flag Name                                : Value
+Beam.BunchSpacing                        : 25
+Beam.Energy                              : [function]
+Beam.NumberOfCollisions                  : 0
+Beam.Type                                : 'collisions'
+Beam.estimatedLuminosity                 : [function]
+Calo.Noise.fixedLumiForNoise             : -1
+Calo.Noise.useCaloNoiseLumi              : True
+Calo.TopoCluster.doTreatEnergyCutAsAbsol : False
+Calo.TopoCluster.doTwoGaussianNoise      : True
+Common.isOnline                          : False
+Concurrency.NumConcurrentEvents          : 0
+Concurrency.NumProcs                     : 0
+Concurrency.NumThreads                   : 0
+DQ.DataType                              : [function]
+DQ.Environment                           : [function]
+DQ.FileKey                               : 'CombinedMonitoring'
+DQ.disableAtlasReadyFilter               : False
+DQ.doGlobalMon                           : True
+DQ.doMonitoring                          : True
+DQ.doStreamAwareMon                      : True
+GeoModel.AtlasVersion                    : 'ATLAS-R2-2016-01-00-01'
+GeoModel.Layout                          : 'atlas'
+IOVDb.DatabaseInstance                   : [function]
+IOVDb.GlobalTag                          : 'CONDBR2-BLKPA-2018-13'
+Input.Files                              : ['/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data17_13TeV.00327265.physics_EnhancedBias.merge.RAW._lb0100._SFO-1._0001.1']
+Input.ProjectName                        : [function]
+Input.RunNumber                          : [function]
+Input.isMC                               : [function]
+LAr.RawChannelSource                     : [function]
+LAr.doAlign                              : [function]
+LAr.doCellEmMisCalib                     : [function]
+LAr.doCellNoiseMasking                   : True
+LAr.doCellSporadicNoiseMasking           : True
+LAr.doHVCorr                             : [function]
+Muon.Align.UseALines                     : False
+Muon.Align.UseAsBuilt                    : False
+Muon.Align.UseBLines                     : 'none'
+Muon.Align.UseILines                     : False
+Muon.Calib.CscF001FromLocalFile          : False
+Muon.Calib.CscNoiseFromLocalFile         : False
+Muon.Calib.CscPSlopeFromLocalFile        : False
+Muon.Calib.CscPedFromLocalFile           : False
+Muon.Calib.CscRmsFromLocalFile           : False
+Muon.Calib.CscStatusFromLocalFile        : False
+Muon.Calib.CscT0BaseFromLocalFile        : False
+Muon.Calib.CscT0PhaseFromLocalFile       : False
+Muon.Calib.EventTag                      : 'MoMu'
+Muon.Calib.applyRtScaling                : True
+Muon.Calib.correctMdtRtForBField         : False
+Muon.Calib.correctMdtRtForTimeSlewing    : False
+Muon.Calib.correctMdtRtWireSag           : False
+Muon.Calib.mdtCalibrationSource          : 'MDT'
+Muon.Calib.mdtMode                       : 'ntuple'
+Muon.Calib.mdtPropagationSpeedBeta       : 0.85
+Muon.Calib.readMDTCalibFromBlob          : True
+Muon.Calib.useMLRt                       : True
+Muon.Chi2NDofCut                         : 20.0
+Muon.createTrackParticles                : True
+Muon.doCSCs                              : True
+Muon.doDigitization                      : True
+Muon.doFastDigitization                  : False
+Muon.doMDTs                              : True
+Muon.doMSVertex                          : False
+Muon.doMicromegas                        : False
+Muon.doPseudoTracking                    : False
+Muon.doRPCClusterSegmentFinding          : False
+Muon.doRPCs                              : True
+Muon.doSegmentT0Fit                      : False
+Muon.doTGCClusterSegmentFinding          : False
+Muon.doTGCs                              : True
+Muon.dosTGCs                             : False
+Muon.enableCurvedSegmentFinding          : False
+Muon.enableErrorTuning                   : False
+Muon.optimiseMomentumResolutionUsingChi2 : False
+Muon.patternsOnly                        : False
+Muon.prdToxAOD                           : False
+Muon.printSummary                        : False
+Muon.refinementTool                      : 'Moore'
+Muon.rpcRawToxAOD                        : False
+Muon.segmentOrigin                       : 'Muon'
+Muon.straightLineFitMomentum             : 2000.0
+Muon.strategy                            : []
+Muon.trackBuilder                        : 'Moore'
+Muon.updateSegmentSecondCoordinate       : [function]
+Muon.useAlignmentCorrections             : False
+Muon.useLooseErrorTuning                 : False
+Muon.useSegmentMatching                  : [function]
+Muon.useTGCPriorNextBC                   : False
+Muon.useTrackSegmentMatching             : True
+Muon.useWireSagCorrections               : False
+Output.AODFileName                       : 'myAOD.pool.root'
+Output.ESDFileName                       : 'myESD.pool.root'
+Output.HISTFileName                      : 'myHIST.root'
+Output.HITFileName                       : 'myHIT.pool.root'
+Output.RDOFileName                       : 'myROD.pool.root'
+Output.doESD                             : False
+Scheduler.CheckDependencies              : True
+Scheduler.ShowControlFlow                : False
+Scheduler.ShowDataDeps                   : False
+Scheduler.ShowDataFlow                   : False
+Trigger.AODEDMSet                        : []
+Trigger.EDMDecodingVersion               : 2
+Trigger.ESDEDMSet                        : []
+Trigger.L1.CTPVersion                    : 4
+Trigger.L1.doBcm                         : True
+Trigger.L1.doMuons                       : True
+Trigger.L1Decoder.forceEnableAllChains   : False
+Trigger.LVL1ConfigFile                   : [function]
+Trigger.LVL1TopoConfigFile               : [function]
+Trigger.OnlineCondTag                    : 'CONDBR2-HLTP-2016-01'
+Trigger.OnlineGeoTag                     : 'ATLAS-R2-2015-04-00-00'
+Trigger.calo.doOffsetCorrection          : True
+Trigger.dataTakingConditions             : 'FullTrigger'
+Trigger.doHLT                            : True
+Trigger.doL1Topo                         : True
+Trigger.doLVL1                           : [function]
+Trigger.doTriggerConfigOnly              : False
+Trigger.doTruth                          : False
+Trigger.egamma.calibMVAVersiona          : [function]
+Trigger.egamma.clusterCorrectionVersion  : [function]
+Trigger.egamma.pidVersion                : [function]
+Trigger.generateLVL1Config               : False
+Trigger.generateLVL1TopoConfig           : False
+Trigger.menu.combined                    : []
+Trigger.menu.electron                    : []
+Trigger.menu.muon                        : []
+Trigger.menu.photon                      : []
+Trigger.menuVersion                      : [function]
+Trigger.muon.doEFRoIDrivenAccess         : False
+Trigger.run2Config                       : '2018'
+Trigger.triggerConfig                    : 'MCRECO:DEFAULT'
+Trigger.triggerMenuSetup                 : 'MC_pp_v7_tight_mc_prescale'
+Trigger.triggerUseFrontier               : False
+Trigger.useL1CaloCalibration             : False
+Trigger.useRun1CaloEnergyScale           : False
+Trigger.writeBS                          : False
+Trigger.writeL1TopoValData               : True
 Py:Athena            INFO About to setup Rpc Raw data decoding
 Py:ComponentAccumulator   DEBUG Adding component EventSelectorByteStream/EventSelector to the job
 Py:ComponentAccumulator   DEBUG Adding component ByteStreamEventStorageInputSvc/ByteStreamInputSvc to the job
@@ -27,6 +165,7 @@ Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderS
 Py:ComponentAccumulator   DEBUG Adding component ByteStreamAttListMetadataSvc/ByteStreamAttListMetadataSvc to the job
 Py:ComponentAccumulator   DEBUG Adding component IOVDbMetaDataTool/IOVDbMetaDataTool to the job
 Py:ComponentAccumulator   DEBUG Adding component ByteStreamMetadataTool/ByteStreamMetadataTool to the job
+Py:ComponentAccumulator   DEBUG   Merging algorithm MuonCacheCreator to a sequence AthAlgSeq
 Py:ComponentAccumulator   DEBUG Adding component GeoModelSvc/GeoModelSvc to the job
 Py:ComponentAccumulator   DEBUG Adding component DetDescrCnvSvc/DetDescrCnvSvc to the job
 Py:ComponentAccumulator   DEBUG Adding component EvtPersistencySvc/EventPersistencySvc to the job
@@ -96,7 +235,6 @@ Py:ComponentAccumulator   DEBUG Adding component TagInfoMgr/TagInfoMgr to the jo
 Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
 Py:ComponentAccumulator   DEBUG Reconciled configuration of component GeoModelSvc
 Py:ComponentAccumulator   DEBUG Adding component Muon::MuonIdHelperTool/Muon::MuonIdHelperTool to the job
-Py:ComponentAccumulator   DEBUG Reconciled configuration of component GeoModelSvc.MuonDetectorTool
 Py:ComponentAccumulator   DEBUG Reconciled configuration of component GeoModelSvc
 Py:ComponentAccumulator   DEBUG Reconciled configuration of component DetDescrCnvSvc
 Py:ComponentAccumulator   DEBUG Reconciled configuration of component EventPersistencySvc
@@ -188,7 +326,6 @@ Py:ComponentAccumulator   DEBUG Adding component TagInfoMgr/TagInfoMgr to the jo
 Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
 Py:ComponentAccumulator   DEBUG Reconciled configuration of component GeoModelSvc
 Py:ComponentAccumulator   DEBUG Adding component Muon::MuonIdHelperTool/Muon::MuonIdHelperTool to the job
-Py:ComponentAccumulator   DEBUG Reconciled configuration of component GeoModelSvc.MuonDetectorTool
 Py:ComponentAccumulator   DEBUG Reconciled configuration of component GeoModelSvc
 Py:ComponentAccumulator   DEBUG Reconciled configuration of component DetDescrCnvSvc
 Py:ComponentAccumulator   DEBUG Reconciled configuration of component EventPersistencySvc
@@ -198,7 +335,6 @@ Py:ComponentAccumulator   DEBUG Reconciled configuration of component ToolSvc.Mu
 Py:ComponentAccumulator   DEBUG Adding component ROBDataProviderSvc/ROBDataProviderSvc to the job
 Py:ComponentAccumulator   DEBUG Adding component Muon::TGC_RawDataProviderTool/TGC_RawDataProviderTool to the job
 Py:ComponentAccumulator   DEBUG Reconciled configuration of component CondInputLoader
-Py:ComponentAccumulator   DEBUG Reconciled configuration of component GeoModelSvc.MuonDetectorTool
 Py:ComponentAccumulator   DEBUG Reconciled configuration of component GeoModelSvc
 Py:ComponentAccumulator   DEBUG Reconciled configuration of component DetDescrCnvSvc
 Py:ComponentAccumulator   DEBUG Reconciled configuration of component EventPersistencySvc
@@ -329,12 +465,101 @@ Py:ComponentAccumulator   DEBUG Adding component CondSvc/CondSvc to the job
 Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
 Py:ComponentAccumulator   DEBUG Adding component DBReplicaSvc/DBReplicaSvc to the job
 Py:IOVDbSvc.CondDB   DEBUG Loading basic services for CondDBSetup...
+Py:ConfigurableDb   DEBUG loading confDb files...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libGaudiHive.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libStoreGate.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libGaudiCommonSvc.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libprofhelp.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libCaloTools.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libAthExHelloWorld.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libAthExHive.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libIOVDbSvc.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libPixelConditionsServices.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libLArMonTools.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libMdtRawDataMonitoring.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libEventUtils.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libxAODBTaggingEfficiency.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libRecBackgroundAlgs.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libCaloClusterMatching.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libCaloRingerTools.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libParticlesInConeTools.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libTrackToCalo.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libTrackToVertex.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libISF_Geant4Tools.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libTrkExStraightLineIntersector.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libTrigTauMonitoring.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libCaloCellCorrection.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libCaloCondPhysAlgs.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libCaloUtils.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libAthViewsAlgs.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libZdcAnalysis.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libAthViewsDFlow.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libInDetPhysValMonitoring.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libLArRecUtils.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libLArCafJobs.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libMuonPhysValMonitoring.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libDerivationFrameworkExamples.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libDerivationFrameworkTools.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libElectronPhotonTagTools.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libJetMissingEtTagTools.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libMissingEtDQA.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libMuonMomentumCorrections.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libMuonResonanceTools.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libMuonSelectorTools.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libMuonTagTools.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libRingerSelectorTools.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libTauAnalysisTools.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libLongLivedParticleDPDMaker.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libTauTagTools.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libDiTauRec.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libMETUtilities.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libMuonCombinedBaseTools.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libegammaPerformance.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libFastCaloSim.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libTileCalibAlgs.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libTileMonitoring.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libTileRec.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libTileRecAlgs.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libTileRecUtils.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libTrigEgammaEmulationTool.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libTrigConfigSvc.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libFTK_RecTools.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libTrigMissingETHypo.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libTileSimAlgs.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libTBRec.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libCaloRec.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libZdcRec.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libDataQualityTools.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libLArCellRec.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libMuonTrackMonitoring.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libDerivationFrameworkJetEtMiss.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libEventTagAlgs.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libIsolationTool.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/WorkDir.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libTrigEgammaAnalysisTools.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libJetSubStructureMomentTools.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libJetTagTools.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-24T2342/GAUDI/22.0.1/InstallArea/x86_64-slc6-gcc8-opt/lib/Gaudi.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-24T2342/Athena/22.0.1/InstallArea/x86_64-slc6-gcc8-opt/lib/Athena.confdb]...
+Py:ConfigurableDb   DEBUG loading confDb files... [DONE]
+Py:ConfigurableDb   DEBUG loaded 1101 confDb packages
+Py:ConfigurableDb    INFO Read module info for 5454 configurables from 75 genConfDb files
+Py:ConfigurableDb    INFO No duplicates have been found: that's good !
+Py:ConfigurableDb   DEBUG : Found configurable <class 'GaudiCoreSvc.GaudiCoreSvcConf.MessageSvc'> in module GaudiCoreSvc.GaudiCoreSvcConf
 Py:loadBasicAthenaPool   DEBUG Loading basic services for AthenaPool...
+Py:ConfigurableDb   DEBUG : Found configurable <class 'PoolSvc.PoolSvcConf.PoolSvc'> in module PoolSvc.PoolSvcConf
+Py:ConfigurableDb   DEBUG : Found configurable <class 'AthenaPoolCnvSvc.AthenaPoolCnvSvcConf.AthenaPoolCnvSvc'> in module AthenaPoolCnvSvc.AthenaPoolCnvSvcConf
+Py:ConfigurableDb   DEBUG : Found configurable <class 'SGComps.SGCompsConf.ProxyProviderSvc'> in module SGComps.SGCompsConf
+Py:ConfigurableDb   DEBUG : Found configurable <class 'AthenaServices.AthenaServicesConf.MetaDataSvc'> in module AthenaServices.AthenaServicesConf
+Py:ConfigurableDb   DEBUG : Found configurable <class 'StoreGate.StoreGateConf.StoreGateSvc'> in module StoreGate.StoreGateConf
 Py:loadBasicAthenaPool   DEBUG Loading basic services for AthenaPool... [DONE]
 Py:loadBasicIOVDb   DEBUG Loading basic services for IOVDbSvc...
+Py:ConfigurableDb   DEBUG : Found configurable <class 'SGComps.SGCompsConf.ProxyProviderSvc'> in module SGComps.SGCompsConf
 Py:Configurable     ERROR attempt to add a duplicate (ServiceManager.ProxyProviderSvc) ... dupe ignored
 Py:loadBasicEventInfoMgt   DEBUG Loading basic services for EventInfoMgt...
+EventInfoMgtInit: Got release version  Athena-22.0.1
 Py:Configurable     ERROR attempt to add a duplicate (ServiceManager.EventPersistencySvc) ... dupe ignored
+Py:ConfigurableDb   DEBUG : Found configurable <class 'SGComps.SGCompsConf.ProxyProviderSvc'> in module SGComps.SGCompsConf
 Py:Configurable     ERROR attempt to add a duplicate (ServiceManager.ProxyProviderSvc) ... dupe ignored
 Py:loadBasicEventInfoMgt   DEBUG Loading basic services for EventInfoMgt... [DONE]
 Py:loadBasicIOVDb   DEBUG Loading basic services for IOVDb... [DONE]
@@ -388,7 +613,6 @@ Py:ComponentAccumulator   DEBUG Adding component TagInfoMgr/TagInfoMgr to the jo
 Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
 Py:ComponentAccumulator   DEBUG Reconciled configuration of component GeoModelSvc
 Py:ComponentAccumulator   DEBUG Adding component Muon::MuonIdHelperTool/Muon::MuonIdHelperTool to the job
-Py:ComponentAccumulator   DEBUG Reconciled configuration of component GeoModelSvc.MuonDetectorTool
 Py:ComponentAccumulator   DEBUG Reconciled configuration of component GeoModelSvc
 Py:ComponentAccumulator   DEBUG Reconciled configuration of component DetDescrCnvSvc
 Py:ComponentAccumulator   DEBUG Reconciled configuration of component EventPersistencySvc
@@ -399,7 +623,6 @@ Py:ComponentAccumulator   DEBUG Adding component ROBDataProviderSvc/ROBDataProvi
 Py:ComponentAccumulator   DEBUG Adding component Muon::MDT_RawDataProviderTool/MDT_RawDataProviderTool to the job
 Py:ComponentAccumulator   DEBUG Reconciled configuration of component CondInputLoader
 Py:ComponentAccumulator   DEBUG Adding component MuonMDT_CablingAlg/MuonMDT_CablingAlg to the job
-Py:ComponentAccumulator   DEBUG Reconciled configuration of component GeoModelSvc.MuonDetectorTool
 Py:ComponentAccumulator   DEBUG Reconciled configuration of component GeoModelSvc
 Py:ComponentAccumulator   DEBUG Reconciled configuration of component DetDescrCnvSvc
 Py:ComponentAccumulator   DEBUG Reconciled configuration of component EventPersistencySvc
@@ -467,7 +690,6 @@ Py:ComponentAccumulator   DEBUG Adding component TagInfoMgr/TagInfoMgr to the jo
 Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
 Py:ComponentAccumulator   DEBUG Reconciled configuration of component GeoModelSvc
 Py:ComponentAccumulator   DEBUG Adding component Muon::MuonIdHelperTool/Muon::MuonIdHelperTool to the job
-Py:ComponentAccumulator   DEBUG Reconciled configuration of component GeoModelSvc.MuonDetectorTool
 Py:ComponentAccumulator   DEBUG Reconciled configuration of component GeoModelSvc
 Py:ComponentAccumulator   DEBUG Reconciled configuration of component DetDescrCnvSvc
 Py:ComponentAccumulator   DEBUG Reconciled configuration of component EventPersistencySvc
@@ -476,7 +698,6 @@ Py:ComponentAccumulator   DEBUG Reconciled configuration of component ProxyProvi
 Py:ComponentAccumulator   DEBUG Reconciled configuration of component ToolSvc.Muon::MuonIdHelperTool
 Py:ComponentAccumulator   DEBUG Adding component ROBDataProviderSvc/ROBDataProviderSvc to the job
 Py:ComponentAccumulator   DEBUG Adding component Muon::CSC_RawDataProviderTool/CSC_RawDataProviderTool to the job
-Py:ComponentAccumulator   DEBUG Reconciled configuration of component GeoModelSvc.MuonDetectorTool
 Py:ComponentAccumulator   DEBUG Reconciled configuration of component GeoModelSvc
 Py:ComponentAccumulator   DEBUG Reconciled configuration of component DetDescrCnvSvc
 Py:ComponentAccumulator   DEBUG Reconciled configuration of component EventPersistencySvc
@@ -555,16 +776,15 @@ Py:ComponentAccumulator   DEBUG Adding component TagInfoMgr/TagInfoMgr to the jo
 Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
 Py:ComponentAccumulator   DEBUG Reconciled configuration of component GeoModelSvc
 Py:ComponentAccumulator   DEBUG Adding component Muon::MuonIdHelperTool/Muon::MuonIdHelperTool to the job
-Py:ComponentAccumulator   DEBUG Reconciled configuration of component GeoModelSvc.MuonDetectorTool
 Py:ComponentAccumulator   DEBUG Reconciled configuration of component GeoModelSvc
 Py:ComponentAccumulator   DEBUG Reconciled configuration of component DetDescrCnvSvc
 Py:ComponentAccumulator   DEBUG Reconciled configuration of component EventPersistencySvc
 Py:ComponentAccumulator   DEBUG Reconciled configuration of component TagInfoMgr
 Py:ComponentAccumulator   DEBUG Reconciled configuration of component ProxyProviderSvc
 Py:ComponentAccumulator   DEBUG Reconciled configuration of component ToolSvc.Muon::MuonIdHelperTool
+Py:ConfigurableDb   DEBUG : Found configurable <class 'MuonRPC_CnvTools.MuonRPC_CnvToolsConf.Muon__RpcRDO_Decoder'> in module MuonRPC_CnvTools.MuonRPC_CnvToolsConf
 Py:ComponentAccumulator   DEBUG Adding component Muon::RpcRdoToPrepDataTool/RpcRdoToRpcPrepDataTool to the job
 Py:ComponentAccumulator   DEBUG Reconciled configuration of component CondInputLoader
-Py:ComponentAccumulator   DEBUG Reconciled configuration of component GeoModelSvc.MuonDetectorTool
 Py:ComponentAccumulator   DEBUG Reconciled configuration of component GeoModelSvc
 Py:ComponentAccumulator   DEBUG Reconciled configuration of component DetDescrCnvSvc
 Py:ComponentAccumulator   DEBUG Reconciled configuration of component EventPersistencySvc
@@ -646,7 +866,6 @@ Py:ComponentAccumulator   DEBUG Adding component TagInfoMgr/TagInfoMgr to the jo
 Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
 Py:ComponentAccumulator   DEBUG Reconciled configuration of component GeoModelSvc
 Py:ComponentAccumulator   DEBUG Adding component Muon::MuonIdHelperTool/Muon::MuonIdHelperTool to the job
-Py:ComponentAccumulator   DEBUG Reconciled configuration of component GeoModelSvc.MuonDetectorTool
 Py:ComponentAccumulator   DEBUG Reconciled configuration of component GeoModelSvc
 Py:ComponentAccumulator   DEBUG Reconciled configuration of component DetDescrCnvSvc
 Py:ComponentAccumulator   DEBUG Reconciled configuration of component EventPersistencySvc
@@ -655,7 +874,6 @@ Py:ComponentAccumulator   DEBUG Reconciled configuration of component ProxyProvi
 Py:ComponentAccumulator   DEBUG Reconciled configuration of component ToolSvc.Muon::MuonIdHelperTool
 Py:ComponentAccumulator   DEBUG Adding component Muon::TgcRdoToPrepDataTool/TgcRdoToTgcPrepDataTool to the job
 Py:ComponentAccumulator   DEBUG Reconciled configuration of component CondInputLoader
-Py:ComponentAccumulator   DEBUG Reconciled configuration of component GeoModelSvc.MuonDetectorTool
 Py:ComponentAccumulator   DEBUG Reconciled configuration of component GeoModelSvc
 Py:ComponentAccumulator   DEBUG Reconciled configuration of component DetDescrCnvSvc
 Py:ComponentAccumulator   DEBUG Reconciled configuration of component EventPersistencySvc
@@ -829,7 +1047,6 @@ Py:ComponentAccumulator   DEBUG Adding component TagInfoMgr/TagInfoMgr to the jo
 Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
 Py:ComponentAccumulator   DEBUG Reconciled configuration of component GeoModelSvc
 Py:ComponentAccumulator   DEBUG Adding component Muon::MuonIdHelperTool/Muon::MuonIdHelperTool to the job
-Py:ComponentAccumulator   DEBUG Reconciled configuration of component GeoModelSvc.MuonDetectorTool
 Py:ComponentAccumulator   DEBUG Reconciled configuration of component GeoModelSvc
 Py:ComponentAccumulator   DEBUG Reconciled configuration of component DetDescrCnvSvc
 Py:ComponentAccumulator   DEBUG Reconciled configuration of component EventPersistencySvc
@@ -839,7 +1056,6 @@ Py:ComponentAccumulator   DEBUG Reconciled configuration of component ToolSvc.Mu
 Py:ComponentAccumulator   DEBUG Adding component Muon::MdtRdoToPrepDataTool/MdtRdoToMdtPrepDataTool to the job
 Py:ComponentAccumulator   DEBUG Reconciled configuration of component CondInputLoader
 Py:ComponentAccumulator   DEBUG Reconciled configuration of component MuonMDT_CablingAlg
-Py:ComponentAccumulator   DEBUG Reconciled configuration of component GeoModelSvc.MuonDetectorTool
 Py:ComponentAccumulator   DEBUG Reconciled configuration of component GeoModelSvc
 Py:ComponentAccumulator   DEBUG Reconciled configuration of component DetDescrCnvSvc
 Py:ComponentAccumulator   DEBUG Reconciled configuration of component EventPersistencySvc
@@ -1058,16 +1274,18 @@ Py:ComponentAccumulator   DEBUG Adding component TagInfoMgr/TagInfoMgr to the jo
 Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
 Py:ComponentAccumulator   DEBUG Reconciled configuration of component GeoModelSvc
 Py:ComponentAccumulator   DEBUG Adding component Muon::MuonIdHelperTool/Muon::MuonIdHelperTool to the job
-Py:ComponentAccumulator   DEBUG Reconciled configuration of component GeoModelSvc.MuonDetectorTool
 Py:ComponentAccumulator   DEBUG Reconciled configuration of component GeoModelSvc
 Py:ComponentAccumulator   DEBUG Reconciled configuration of component DetDescrCnvSvc
 Py:ComponentAccumulator   DEBUG Reconciled configuration of component EventPersistencySvc
 Py:ComponentAccumulator   DEBUG Reconciled configuration of component TagInfoMgr
 Py:ComponentAccumulator   DEBUG Reconciled configuration of component ProxyProviderSvc
 Py:ComponentAccumulator   DEBUG Reconciled configuration of component ToolSvc.Muon::MuonIdHelperTool
+Py:ConfigurableDb   DEBUG : Found configurable <class 'MuonCSC_CnvTools.MuonCSC_CnvToolsConf.Muon__CscRDO_Decoder'> in module MuonCSC_CnvTools.MuonCSC_CnvToolsConf
+Py:ConfigurableDb   DEBUG : Found configurable <class 'CscCalibTools.CscCalibToolsConf.CscCalibTool'> in module CscCalibTools.CscCalibToolsConf
+Py:ConfigurableDb   DEBUG : Found configurable <class 'MuonCSC_CnvTools.MuonCSC_CnvToolsConf.Muon__CSC_RawDataProviderTool'> in module MuonCSC_CnvTools.MuonCSC_CnvToolsConf
+Py:ConfigurableDb   DEBUG : Found configurable <class 'MuonCSC_CnvTools.MuonCSC_CnvToolsConf.Muon__CscROD_Decoder'> in module MuonCSC_CnvTools.MuonCSC_CnvToolsConf
 Py:ComponentAccumulator   DEBUG Adding component Muon::CscRdoToCscPrepDataTool/CscRdoToCscPrepDataTool to the job
 Py:ComponentAccumulator   DEBUG Reconciled configuration of component CondInputLoader
-Py:ComponentAccumulator   DEBUG Reconciled configuration of component GeoModelSvc.MuonDetectorTool
 Py:ComponentAccumulator   DEBUG Reconciled configuration of component GeoModelSvc
 Py:ComponentAccumulator   DEBUG Reconciled configuration of component DetDescrCnvSvc
 Py:ComponentAccumulator   DEBUG Reconciled configuration of component EventPersistencySvc
@@ -1083,8 +1301,13 @@ Py:ComponentAccumulator   DEBUG Reconciled configuration of component ToolSvc.Mu
 Py:ComponentAccumulator   DEBUG Adding component Muon::CscRdoToCscPrepDataTool/CscRdoToCscPrepDataTool to the job
 Py:ComponentAccumulator   DEBUG Adding component CscThresholdClusterBuilderTool/CscThesholdClusterBuilderTool to the job
 Py:ComponentAccumulator   DEBUG Adding component CscThresholdClusterBuilderTool/CscThesholdClusterBuilderTool to the job
+Py:ConfigurableDb   DEBUG : Found configurable <class 'AthenaPoolCnvSvc.AthenaPoolCnvSvcConf.AthenaPoolCnvSvc'> in module AthenaPoolCnvSvc.AthenaPoolCnvSvcConf
 Py:ComponentAccumulator   DEBUG Reconciled configuration of component AthenaPoolCnvSvc
 Py:Athena            INFO Print Config
+Py:ComponentAccumulator    INFO Event Inputs
+Py:ComponentAccumulator    INFO set([])
+Py:ComponentAccumulator    INFO Event Algorithm Sequences
+Py:ComponentAccumulator    INFO /***** Algorithm AthSequencer/AthAlgSeq ************************************************************
 |-Atomic                                  = False
 |-AuditAlgorithms                         = False
 |-AuditBeginRun                           = False
@@ -1096,21 +1319,61 @@ Py:Athena            INFO Print Config
 |-AuditRestart                            = False
 |-AuditStart                              = False
 |-AuditStop                               = False
+|-Cardinality                             = 0
 |-ContinueEventloopOnFPE                  = False
+|-DetStore                   @0x7f4eee4eb9d0 = ServiceHandle('StoreGateSvc/DetectorStore')
 |-Enable                                  = True
 |-ErrorCounter                            = 0
 |-ErrorMax                                = 1
+|-EvtStore                   @0x7f4eee4eb950 = ServiceHandle('StoreGateSvc')
+|-ExtraInputs                @0x7f4eecb072d8 = []  (default: [])
+|-ExtraOutputs               @0x7f4eecb07488 = []  (default: [])
 |-FilterCircularDependencies              = True
 |-IgnoreFilterPassed                      = False
 |-IsIOBound                               = False
+|-Members                    @0x7f4eecb070e0 = ['MuonCacheCreator/MuonCacheCreator', 'Muon::RpcRawDataProvider/RpcRawDataProvider', 'Muon::TgcRawDataProvider/TgcRawDataProvider', 'Muon::MdtRawDataProvider/MdtRawDataProvider', 'Muon::CscRawDataProvider/CscRawDataProvider', 'RpcRdoToRpcPrepData/RpcRdoToRpcPrepData', 'TgcRdoToTgcPrepData/TgcRdoToTgcPrepData', 'MdtRdoToMdtPrepData/MdtRdoToMdtPrepData', 'CscRdoToCscPrepData/CscRdoToCscPrepData', 'CscThresholdClusterBuilder/CscThesholdClusterBuilder']
 |                                            (default: [])
 |-ModeOR                                  = False
 |-MonitorService                          = 'MonitorSvc'
+|-NeededResources            @0x7f4eecb07560 = []  (default: [])
 |-OutputLevel                             = 0
 |-RegisterForContextService               = False
 |-Sequential                              = False
 |-StopOverride                            = False
 |-TimeOut                                 = 0.0
+|-Timeline                                = True
+|=/***** Algorithm MuonCacheCreator/MuonCacheCreator *************************************************
+| |-AuditAlgorithms                         = False
+| |-AuditBeginRun                           = False
+| |-AuditEndRun                             = False
+| |-AuditExecute                            = False
+| |-AuditFinalize                           = False
+| |-AuditInitialize                         = False
+| |-AuditReinitialize                       = False
+| |-AuditRestart                            = False
+| |-AuditStart                              = False
+| |-AuditStop                               = False
+| |-Cardinality                             = 0
+| |-CscCacheKey                @0x7f4eed1213f0 = 'CscCache'  (default: 'StoreGateSvc+')
+| |-DetStore                   @0x7f4eed1e9950 = ServiceHandle('StoreGateSvc/DetectorStore')
+| |-DisableViewWarning                      = False
+| |-Enable                                  = True
+| |-ErrorCounter                            = 0
+| |-ErrorMax                                = 1
+| |-EvtStore                   @0x7f4eed1e98d0 = ServiceHandle('StoreGateSvc')
+| |-ExtraInputs                @0x7f4eed2bd0e0 = []  (default: [])
+| |-ExtraOutputs               @0x7f4eed1f3fc8 = []  (default: [])
+| |-FilterCircularDependencies              = True
+| |-IsIOBound                               = False
+| |-MdtCsmCacheKey             @0x7f4eed1213c0 = 'MdtCsmCache'  (default: 'StoreGateSvc+')
+| |-MonitorService                          = 'MonitorSvc'
+| |-NeededResources            @0x7f4eed2bd050 = []  (default: [])
+| |-OutputLevel                             = 0
+| |-RegisterForContextService               = False
+| |-RpcCacheKey                @0x7f4eed1217b0 = 'RpcCache'  (default: 'StoreGateSvc+')
+| |-TgcCacheKey                @0x7f4eed121810 = 'TgcCache'  (default: 'StoreGateSvc+')
+| |-Timeline                                = True
+| \----- (End of Algorithm MuonCacheCreator/MuonCacheCreator) ----------------------------------------
 |=/***** Algorithm Muon::RpcRawDataProvider/RpcRawDataProvider ***************************************
 | |-AuditAlgorithms                         = False
 | |-AuditBeginRun                           = False
@@ -1122,17 +1385,26 @@ Py:Athena            INFO Print Config
 | |-AuditRestart                            = False
 | |-AuditStart                              = False
 | |-AuditStop                               = False
+| |-Cardinality                             = 1
+| |-DetStore                   @0x7f4eed2cab90 = ServiceHandle('StoreGateSvc/DetectorStore')
 | |-DoSeededDecoding                        = False
 | |-Enable                                  = True
 | |-ErrorCounter                            = 0
 | |-ErrorMax                                = 1
+| |-EvtStore                   @0x7f4eed2cab10 = ServiceHandle('StoreGateSvc')
+| |-ExtraInputs                @0x7f4eecb07758 = []  (default: [])
+| |-ExtraOutputs               @0x7f4eecb075a8 = []  (default: [])
 | |-FilterCircularDependencies              = True
 | |-IsIOBound                               = False
 | |-MonitorService                          = 'MonitorSvc'
+| |-NeededResources            @0x7f4eecb075f0 = []  (default: [])
 | |-OutputLevel                             = 0
+| |-ProviderTool               @0x7f4eed5b0528 = PrivateToolHandle('Muon::RPC_RawDataProviderTool/RPC_RawDataProviderTool')
 | |                                            (default: 'Muon::RPC_RawDataProviderTool/RpcRawDataProviderTool')
+| |-RegionSelectionSvc         @0x7f4eed2cac10 = ServiceHandle('RegSelSvc')
 | |-RegisterForContextService               = False
 | |-RoIs                                    = 'StoreGateSvc+OutputRoIs'
+| |-Timeline                                = True
 | |=/***** Private AlgTool Muon::RPC_RawDataProviderTool/RpcRawDataProvider.RPC_RawDataProviderTool *****
 | | |-AuditFinalize                  = False
 | | |-AuditInitialize                = False
@@ -1141,6 +1413,11 @@ Py:Athena            INFO Print Config
 | | |-AuditStart                     = False
 | | |-AuditStop                      = False
 | | |-AuditTools                     = False
+| | |-Decoder           @0x7f4eed5b0620 = PrivateToolHandle('Muon::RpcROD_Decoder/RpcROD_Decoder')
+| | |-DetStore          @0x7f4eed0bc410 = ServiceHandle('StoreGateSvc/DetectorStore')
+| | |-EvtStore          @0x7f4eed0bc450 = ServiceHandle('StoreGateSvc')
+| | |-ExtraInputs       @0x7f4eed0bf170 = []  (default: [])
+| | |-ExtraOutputs      @0x7f4eed0bf098 = []  (default: [])
 | | |-MonitorService                 = 'MonitorSvc'
 | | |-OutputLevel                    = 0
 | | |-RPCSec                         = 'StoreGateSvc+RPC_SECTORLOGIC'
@@ -1154,6 +1431,10 @@ Py:Athena            INFO Print Config
 | | | |-AuditStop                        = False
 | | | |-AuditTools                       = False
 | | | |-DataErrorPrintLimit              = 1000
+| | | |-DetStore            @0x7f4eed0bc510 = ServiceHandle('StoreGateSvc/DetectorStore')
+| | | |-EvtStore            @0x7f4eed0bc550 = ServiceHandle('StoreGateSvc')
+| | | |-ExtraInputs         @0x7f4eed0bf050 = []  (default: [])
+| | | |-ExtraOutputs        @0x7f4eed0b5f80 = []  (default: [])
 | | | |-MonitorService                   = 'MonitorSvc'
 | | | |-OutputLevel                      = 0
 | | | |-Sector13Data                     = False
@@ -1172,15 +1453,23 @@ Py:Athena            INFO Print Config
 | |-AuditRestart                            = False
 | |-AuditStart                              = False
 | |-AuditStop                               = False
+| |-Cardinality                             = 1
+| |-DetStore                   @0x7f4eed1d9b50 = ServiceHandle('StoreGateSvc/DetectorStore')
 | |-Enable                                  = True
 | |-ErrorCounter                            = 0
 | |-ErrorMax                                = 1
+| |-EvtStore                   @0x7f4eed1d9ad0 = ServiceHandle('StoreGateSvc')
+| |-ExtraInputs                @0x7f4eecb07950 = []  (default: [])
+| |-ExtraOutputs               @0x7f4eecb07a28 = []  (default: [])
 | |-FilterCircularDependencies              = True
 | |-IsIOBound                               = False
 | |-MonitorService                          = 'MonitorSvc'
+| |-NeededResources            @0x7f4eecb07998 = []  (default: [])
 | |-OutputLevel                             = 0
+| |-ProviderTool               @0x7f4eee28e9b0 = PrivateToolHandle('Muon::TGC_RawDataProviderTool/TGC_RawDataProviderTool')
 | |                                            (default: 'Muon::TGC_RawDataProviderTool/TgcRawDataProviderTool')
 | |-RegisterForContextService               = False
+| |-Timeline                                = True
 | |=/***** Private AlgTool Muon::TGC_RawDataProviderTool/TgcRawDataProvider.TGC_RawDataProviderTool *****
 | | |-AuditFinalize                  = False
 | | |-AuditInitialize                = False
@@ -1189,7 +1478,12 @@ Py:Athena            INFO Print Config
 | | |-AuditStart                     = False
 | | |-AuditStop                      = False
 | | |-AuditTools                     = False
+| | |-Decoder           @0x7f4eee28eaa0 = PrivateToolHandle('Muon::TGC_RodDecoderReadout/TgcROD_Decoder')
 | | |                                   (default: 'Muon::TGC_RodDecoderReadout/TGC_RodDecoderReadout')
+| | |-DetStore          @0x7f4eed062a50 = ServiceHandle('StoreGateSvc/DetectorStore')
+| | |-EvtStore          @0x7f4eed062a90 = ServiceHandle('StoreGateSvc')
+| | |-ExtraInputs       @0x7f4eecfe6128 = []  (default: [])
+| | |-ExtraOutputs      @0x7f4eecfe60e0 = []  (default: [])
 | | |-MonitorService                 = 'MonitorSvc'
 | | |-OutputLevel                    = 0
 | | |-RdoLocation                    = 'StoreGateSvc+TGCRDO'
@@ -1201,6 +1495,10 @@ Py:Athena            INFO Print Config
 | | | |-AuditStart                     = False
 | | | |-AuditStop                      = False
 | | | |-AuditTools                     = False
+| | | |-DetStore          @0x7f4eed062b50 = ServiceHandle('StoreGateSvc/DetectorStore')
+| | | |-EvtStore          @0x7f4eed062b90 = ServiceHandle('StoreGateSvc')
+| | | |-ExtraInputs       @0x7f4eed05fd88 = []  (default: [])
+| | | |-ExtraOutputs      @0x7f4eed05fef0 = []  (default: [])
 | | | |-MonitorService                 = 'MonitorSvc'
 | | | |-OutputLevel                    = 0
 | | | |-ShowStatusWords                = False
@@ -1219,15 +1517,23 @@ Py:Athena            INFO Print Config
 | |-AuditRestart                            = False
 | |-AuditStart                              = False
 | |-AuditStop                               = False
+| |-Cardinality                             = 1
+| |-DetStore                   @0x7f4eed1d2d90 = ServiceHandle('StoreGateSvc/DetectorStore')
 | |-Enable                                  = True
 | |-ErrorCounter                            = 0
 | |-ErrorMax                                = 1
+| |-EvtStore                   @0x7f4eed1d2d10 = ServiceHandle('StoreGateSvc')
+| |-ExtraInputs                @0x7f4eecb07a70 = []  (default: [])
+| |-ExtraOutputs               @0x7f4eecb07b00 = []  (default: [])
 | |-FilterCircularDependencies              = True
 | |-IsIOBound                               = False
 | |-MonitorService                          = 'MonitorSvc'
+| |-NeededResources            @0x7f4eecb079e0 = []  (default: [])
 | |-OutputLevel                             = 0
+| |-ProviderTool               @0x7f4eed14cc50 = PrivateToolHandle('Muon::MDT_RawDataProviderTool/MDT_RawDataProviderTool')
 | |                                            (default: 'Muon::MDT_RawDataProviderTool/MdtRawDataProviderTool')
 | |-RegisterForContextService               = False
+| |-Timeline                                = True
 | |=/***** Private AlgTool Muon::MDT_RawDataProviderTool/MdtRawDataProvider.MDT_RawDataProviderTool *****
 | | |-AuditFinalize                     = False
 | | |-AuditInitialize                   = False
@@ -1237,7 +1543,13 @@ Py:Athena            INFO Print Config
 | | |-AuditStop                         = False
 | | |-AuditTools                        = False
 | | |-CsmContainerCacheKey              = 'StoreGateSvc+'
+| | |-Decoder              @0x7f4eee28ed70 = PrivateToolHandle('MdtROD_Decoder/MdtROD_Decoder')
+| | |-DetStore             @0x7f4eecb93650 = ServiceHandle('StoreGateSvc/DetectorStore')
+| | |-EvtStore             @0x7f4eecb93690 = ServiceHandle('StoreGateSvc')
+| | |-ExtraInputs          @0x7f4eecb947e8 = []  (default: [])
+| | |-ExtraOutputs         @0x7f4eecb94878 = []  (default: [])
 | | |-MonitorService                    = 'MonitorSvc'
+| | |-OutputLevel                       = 0
 | | |-RdoLocation                       = 'StoreGateSvc+MDTCSM'
 | | |-ReadKey                           = 'ConditionStore+MuonMDT_CablingMap'
 | | |=/***** Private AlgTool MdtROD_Decoder/MdtRawDataProvider.MDT_RawDataProviderTool.MdtROD_Decoder *****
@@ -1248,6 +1560,10 @@ Py:Athena            INFO Print Config
 | | | |-AuditStart                     = False
 | | | |-AuditStop                      = False
 | | | |-AuditTools                     = False
+| | | |-DetStore          @0x7f4eecb93750 = ServiceHandle('StoreGateSvc/DetectorStore')
+| | | |-EvtStore          @0x7f4eecb93790 = ServiceHandle('StoreGateSvc')
+| | | |-ExtraInputs       @0x7f4eecb94758 = []  (default: [])
+| | | |-ExtraOutputs      @0x7f4eecb94710 = []  (default: [])
 | | | |-MonitorService                 = 'MonitorSvc'
 | | | |-OutputLevel                    = 0
 | | | |-ReadKey                        = 'ConditionStore+MuonMDT_CablingMap'
@@ -1266,26 +1582,40 @@ Py:Athena            INFO Print Config
 | |-AuditRestart                            = False
 | |-AuditStart                              = False
 | |-AuditStop                               = False
+| |-Cardinality                             = 1
+| |-DetStore                   @0x7f4eed2b7cd0 = ServiceHandle('StoreGateSvc/DetectorStore')
 | |-Enable                                  = True
 | |-ErrorCounter                            = 0
 | |-ErrorMax                                = 1
+| |-EvtStore                   @0x7f4eed2b7c50 = ServiceHandle('StoreGateSvc')
+| |-ExtraInputs                @0x7f4eecb07b48 = []  (default: [])
+| |-ExtraOutputs               @0x7f4eecb07b90 = []  (default: [])
 | |-FilterCircularDependencies              = True
 | |-IsIOBound                               = False
 | |-MonitorService                          = 'MonitorSvc'
+| |-NeededResources            @0x7f4eecb07680 = []  (default: [])
 | |-OutputLevel                             = 0
+| |-ProviderTool               @0x7f4eed5b0810 = PrivateToolHandle('Muon::CSC_RawDataProviderTool/CSC_RawDataProviderTool')
 | |                                            (default: 'Muon::CSC_RawDataProviderTool/CscRawDataProviderTool')
 | |-RegisterForContextService               = False
+| |-Timeline                                = True
 | |=/***** Private AlgTool Muon::CSC_RawDataProviderTool/CscRawDataProvider.CSC_RawDataProviderTool *****
-| | |-AuditFinalize                  = False
-| | |-AuditInitialize                = False
-| | |-AuditReinitialize              = False
-| | |-AuditRestart                   = False
-| | |-AuditStart                     = False
-| | |-AuditStop                      = False
-| | |-AuditTools                     = False
-| | |-MonitorService                 = 'MonitorSvc'
-| | |-OutputLevel                    = 0
-| | |-RdoLocation                    = 'StoreGateSvc+CSCRDO'
+| | |-AuditFinalize                     = False
+| | |-AuditInitialize                   = False
+| | |-AuditReinitialize                 = False
+| | |-AuditRestart                      = False
+| | |-AuditStart                        = False
+| | |-AuditStop                         = False
+| | |-AuditTools                        = False
+| | |-CscContainerCacheKey              = 'StoreGateSvc+'
+| | |-Decoder              @0x7f4eed02e050 = PrivateToolHandle('Muon::CscROD_Decoder/CscROD_Decoder')
+| | |-DetStore             @0x7f4eecb50590 = ServiceHandle('StoreGateSvc/DetectorStore')
+| | |-EvtStore             @0x7f4eecb505d0 = ServiceHandle('StoreGateSvc')
+| | |-ExtraInputs          @0x7f4eecb74ef0 = []  (default: [])
+| | |-ExtraOutputs         @0x7f4eecb74e60 = []  (default: [])
+| | |-MonitorService                    = 'MonitorSvc'
+| | |-OutputLevel                       = 0
+| | |-RdoLocation                       = 'StoreGateSvc+CSCRDO'
 | | |=/***** Private AlgTool Muon::CscROD_Decoder/CscRawDataProvider.CSC_RawDataProviderTool.CscROD_Decoder *****
 | | | |-AuditFinalize                  = False
 | | | |-AuditInitialize                = False
@@ -1294,6 +1624,10 @@ Py:Athena            INFO Print Config
 | | | |-AuditStart                     = False
 | | | |-AuditStop                      = False
 | | | |-AuditTools                     = False
+| | | |-DetStore          @0x7f4eecb50690 = ServiceHandle('StoreGateSvc/DetectorStore')
+| | | |-EvtStore          @0x7f4eecb506d0 = ServiceHandle('StoreGateSvc')
+| | | |-ExtraInputs       @0x7f4eecb74d40 = []  (default: [])
+| | | |-ExtraOutputs      @0x7f4eecb74cf8 = []  (default: [])
 | | | |-IsCosmics                      = False
 | | | |-IsOldCosmics                   = False
 | | | |-MonitorService                 = 'MonitorSvc'
@@ -1312,19 +1646,29 @@ Py:Athena            INFO Print Config
 | |-AuditRestart                            = False
 | |-AuditStart                              = False
 | |-AuditStop                               = False
+| |-Cardinality                             = 1
+| |-DecodingTool               @0x7f4eed4c9d20 = PrivateToolHandle('Muon::RpcRdoToPrepDataTool/RpcRdoToRpcPrepDataTool')
 | |                                            (default: 'Muon::RpcRdoToPrepDataTool/RpcRdoToPrepDataTool')
+| |-DetStore                   @0x7f4eecae4050 = ServiceHandle('StoreGateSvc/DetectorStore')
 | |-DoSeededDecoding                        = False
 | |-Enable                                  = True
 | |-ErrorCounter                            = 0
 | |-ErrorMax                                = 1
+| |-EvtStore                   @0x7f4eecb81f90 = ServiceHandle('StoreGateSvc')
+| |-ExtraInputs                @0x7f4eecb07ab8 = []  (default: [])
+| |-ExtraOutputs               @0x7f4eecb07c68 = []  (default: [])
 | |-FilterCircularDependencies              = True
 | |-IsIOBound                               = False
 | |-MonitorService                          = 'MonitorSvc'
+| |-NeededResources            @0x7f4eecb07cb0 = []  (default: [])
 | |-OutputCollection                        = 'StoreGateSvc+RPC_Measurements'
 | |-OutputLevel                             = 0
 | |-PrintInputRdo                           = False
+| |-PrintPrepData              @0x7f4ef05f4b20 = False  (default: False)
+| |-RegionSelectionSvc         @0x7f4eecae40d0 = ServiceHandle('RegSelSvc')
 | |-RegisterForContextService               = False
 | |-RoIs                                    = 'StoreGateSvc+OutputRoIs'
+| |-Timeline                                = True
 | |=/***** Private AlgTool Muon::RpcRdoToPrepDataTool/RpcRdoToRpcPrepData.RpcRdoToRpcPrepDataTool ******
 | | |-AuditFinalize                                   = False
 | | |-AuditInitialize                                 = False
@@ -1334,11 +1678,16 @@ Py:Athena            INFO Print Config
 | | |-AuditStop                                       = False
 | | |-AuditTools                                      = False
 | | |-DecodeData                                      = True
+| | |-DetStore                           @0x7f4eecafc210 = ServiceHandle('StoreGateSvc/DetectorStore')
+| | |-EvtStore                           @0x7f4eecafc290 = ServiceHandle('StoreGateSvc')
+| | |-ExtraInputs                        @0x7f4eecb5d680 = []  (default: [])
+| | |-ExtraOutputs                       @0x7f4eecb5d830 = []  (default: [])
 | | |-InputCollection                                 = 'StoreGateSvc+RPC_triggerHits'
 | | |-MonitorService                                  = 'MonitorSvc'
 | | |-OutputCollection                                = 'StoreGateSvc+RPCPAD'
 | | |-OutputLevel                                     = 0
 | | |-RPCInfoFromDb                                   = False
+| | |-RdoDecoderTool                     @0x7f4eecbe83d0 = PrivateToolHandle('Muon::RpcRDO_Decoder/Muon::RpcRDO_Decoder')
 | | |                                                    (default: 'Muon::RpcRDO_Decoder')
 | | |-TriggerOutputCollection                         = 'StoreGateSvc+RPC_Measurements'
 | | |-etaphi_coincidenceTime                          = 20.0
@@ -1356,6 +1705,10 @@ Py:Athena            INFO Print Config
 | | | |-AuditStart                     = False
 | | | |-AuditStop                      = False
 | | | |-AuditTools                     = False
+| | | |-DetStore          @0x7f4eecafc310 = ServiceHandle('StoreGateSvc/DetectorStore')
+| | | |-EvtStore          @0x7f4eecafc350 = ServiceHandle('StoreGateSvc')
+| | | |-ExtraInputs       @0x7f4eecb5d950 = []  (default: [])
+| | | |-ExtraOutputs      @0x7f4eecb5d908 = []  (default: [])
 | | | |-MonitorService                 = 'MonitorSvc'
 | | | |-OutputLevel                    = 0
 | | | \----- (End of Private AlgTool Muon::RpcRDO_Decoder/RpcRdoToRpcPrepData.RpcRdoToRpcPrepDataTool.Muon::RpcRDO_Decoder) -----
@@ -1372,20 +1725,30 @@ Py:Athena            INFO Print Config
 | |-AuditRestart                            = False
 | |-AuditStart                              = False
 | |-AuditStop                               = False
+| |-Cardinality                             = 1
+| |-DecodingTool               @0x7f4eecb04050 = PrivateToolHandle('Muon::TgcRdoToPrepDataTool/TgcRdoToTgcPrepDataTool')
 | |                                            (default: 'Muon::TgcRdoToPrepDataTool/TgcPrepDataProviderTool')
+| |-DetStore                   @0x7f4eecad9f10 = ServiceHandle('StoreGateSvc/DetectorStore')
 | |-DoSeededDecoding                        = False
 | |-Enable                                  = True
 | |-ErrorCounter                            = 0
 | |-ErrorMax                                = 1
+| |-EvtStore                   @0x7f4eecad9e90 = ServiceHandle('StoreGateSvc')
+| |-ExtraInputs                @0x7f4eecb07bd8 = []  (default: [])
+| |-ExtraOutputs               @0x7f4eecb07cf8 = []  (default: [])
 | |-FilterCircularDependencies              = True
 | |-IsIOBound                               = False
 | |-MonitorService                          = 'MonitorSvc'
+| |-NeededResources            @0x7f4eecb07d40 = []  (default: [])
 | |-OutputCollection                        = 'StoreGateSvc+TGC_Measurements'
 | |-OutputLevel                             = 0
 | |-PrintInputRdo                           = False
+| |-PrintPrepData              @0x7f4ef05f4b20 = False  (default: False)
+| |-RegionSelectorSvc          @0x7f4eecad9f90 = ServiceHandle('RegSelSvc')
 | |-RegisterForContextService               = False
 | |-RoIs                                    = 'StoreGateSvc+OutputRoIs'
 | |-Setting                                 = 0
+| |-Timeline                                = True
 | |=/***** Private AlgTool Muon::TgcRdoToPrepDataTool/TgcRdoToTgcPrepData.TgcRdoToTgcPrepDataTool ******
 | | |-AuditFinalize                                        = False
 | | |-AuditInitialize                                      = False
@@ -1395,6 +1758,10 @@ Py:Athena            INFO Print Config
 | | |-AuditStop                                            = False
 | | |-AuditTools                                           = False
 | | |-DecodeData                                           = True
+| | |-DetStore                                @0x7f4eecafc490 = ServiceHandle('StoreGateSvc/DetectorStore')
+| | |-EvtStore                                @0x7f4eecafc550 = ServiceHandle('StoreGateSvc')
+| | |-ExtraInputs                             @0x7f4eecb03488 = []  (default: [])
+| | |-ExtraOutputs                            @0x7f4eecb03200 = []  (default: [])
 | | |-FillCoinData                                         = True
 | | |-MonitorService                                       = 'MonitorSvc'
 | | |-OutputCoinCollection                                 = 'TrigT1CoinDataCollection'
@@ -1403,7 +1770,9 @@ Py:Athena            INFO Print Config
 | | |-RDOContainer                                         = 'StoreGateSvc+TGCRDO'
 | | |-TGCHashIdOffset                                      = 26000
 | | |-dropPrdsWithZeroWidth                                = True
+| | |-outputCoinKey                           @0x7f4eecb03440 = ['StoreGateSvc+dummy', 'StoreGateSvc+dummy', 'StoreGateSvc+dummy']
 | | |                                                         (default: ['StoreGateSvc+dummy', 'StoreGateSvc+dummy', 'StoreGateSvc+dummy'])
+| | |-prepDataKeys                            @0x7f4eecb03518 = ['StoreGateSvc+dummy', 'StoreGateSvc+dummy', 'StoreGateSvc+dummy', 'StoreGateSvc+dummy']
 | | |                                                         (default: ['StoreGateSvc+dummy', 'StoreGateSvc+dummy', 'StoreGateSvc+dummy', 'StoreGateSvc+dummy'])
 | | |-show_warning_level_invalid_A09_SSW6_hit              = False
 | | \----- (End of Private AlgTool Muon::TgcRdoToPrepDataTool/TgcRdoToTgcPrepData.TgcRdoToTgcPrepDataTool) -----
@@ -1419,19 +1788,29 @@ Py:Athena            INFO Print Config
 | |-AuditRestart                            = False
 | |-AuditStart                              = False
 | |-AuditStop                               = False
+| |-Cardinality                             = 1
+| |-DecodingTool               @0x7f4ef06f69f0 = PrivateToolHandle('Muon::MdtRdoToPrepDataTool/MdtRdoToMdtPrepDataTool')
 | |                                            (default: 'Muon::MdtRdoToPrepDataTool/MdtPrepDataProviderTool')
+| |-DetStore                   @0x7f4eecb6ded0 = ServiceHandle('StoreGateSvc/DetectorStore')
 | |-DoSeededDecoding                        = False
 | |-Enable                                  = True
 | |-ErrorCounter                            = 0
 | |-ErrorMax                                = 1
+| |-EvtStore                   @0x7f4eecb6de50 = ServiceHandle('StoreGateSvc')
+| |-ExtraInputs                @0x7f4eecb07dd0 = []  (default: [])
+| |-ExtraOutputs               @0x7f4eecb07e60 = []  (default: [])
 | |-FilterCircularDependencies              = True
 | |-IsIOBound                               = False
 | |-MonitorService                          = 'MonitorSvc'
+| |-NeededResources            @0x7f4eecb07e18 = []  (default: [])
 | |-OutputCollection                        = 'StoreGateSvc+MDT_DriftCircles'
 | |-OutputLevel                             = 0
 | |-PrintInputRdo                           = False
+| |-PrintPrepData              @0x7f4ef05f4b20 = False  (default: False)
+| |-RegionSelectionSvc         @0x7f4eecb6df50 = ServiceHandle('RegSelSvc')
 | |-RegisterForContextService               = False
 | |-RoIs                                    = 'StoreGateSvc+OutputRoIs'
+| |-Timeline                                = True
 | |=/***** Private AlgTool Muon::MdtRdoToPrepDataTool/MdtRdoToMdtPrepData.MdtRdoToMdtPrepDataTool ******
 | | |-AuditFinalize                        = False
 | | |-AuditInitialize                      = False
@@ -1442,9 +1821,13 @@ Py:Athena            INFO Print Config
 | | |-AuditTools                           = False
 | | |-CalibratePrepData                    = True
 | | |-DecodeData                           = True
+| | |-DetStore                @0x7f4eecafc690 = ServiceHandle('StoreGateSvc/DetectorStore')
 | | |-DiscardSecondaryHitTwin              = False
 | | |-DoPropagationCorrection              = False
 | | |-DoTofCorrection                      = True
+| | |-EvtStore                @0x7f4eecafc610 = ServiceHandle('StoreGateSvc')
+| | |-ExtraInputs             @0x7f4eecb0bef0 = []  (default: [])
+| | |-ExtraOutputs            @0x7f4eecb0bd88 = []  (default: [])
 | | |-MonitorService                       = 'MonitorSvc'
 | | |-OutputCollection                     = 'StoreGateSvc+MDT_DriftCircles'
 | | |-OutputLevel                          = 0
@@ -1471,19 +1854,29 @@ Py:Athena            INFO Print Config
 | |-AuditRestart                            = False
 | |-AuditStart                              = False
 | |-AuditStop                               = False
+| |-Cardinality                             = 1
+| |-CscRdoToCscPrepDataTool    @0x7f4eecfba950 = PrivateToolHandle('Muon::CscRdoToCscPrepDataTool/CscRdoToCscPrepDataTool')
 | |                                            (default: 'Muon::CscRdoToCscPrepDataTool/CscRdoToPrepDataTool')
+| |-DetStore                   @0x7f4eecb50cd0 = ServiceHandle('StoreGateSvc/DetectorStore')
 | |-DoSeededDecoding                        = False
 | |-Enable                                  = True
 | |-ErrorCounter                            = 0
 | |-ErrorMax                                = 1
+| |-EvtStore                   @0x7f4eecb50c50 = ServiceHandle('StoreGateSvc')
+| |-ExtraInputs                @0x7f4eecb07f38 = []  (default: [])
+| |-ExtraOutputs               @0x7f4eecb07638 = []  (default: [])
 | |-FilterCircularDependencies              = True
 | |-IsIOBound                               = False
 | |-MonitorService                          = 'MonitorSvc'
+| |-NeededResources            @0x7f4eecb07ea8 = []  (default: [])
 | |-OutputCollection                        = 'StoreGateSvc+CSC_Measurements'
 | |-OutputLevel                             = 0
 | |-PrintInputRdo                           = False
+| |-PrintPrepData              @0x7f4ef05f4b20 = False  (default: False)
+| |-RegionSelectionSvc         @0x7f4eecb50d50 = ServiceHandle('RegSelSvc')
 | |-RegisterForContextService               = False
 | |-RoIs                                    = 'StoreGateSvc+OutputRoIs'
+| |-Timeline                                = True
 | |=/***** Private AlgTool Muon::CscRdoToCscPrepDataTool/CscRdoToCscPrepData.CscRdoToCscPrepDataTool *****
 | | |-AuditFinalize                    = False
 | | |-AuditInitialize                  = False
@@ -1493,22 +1886,36 @@ Py:Athena            INFO Print Config
 | | |-AuditStop                        = False
 | | |-AuditTools                       = False
 | | |-CSCHashIdOffset                  = 22000
+| | |-CscCalibTool        @0x7f4ef06b7860 = PrivateToolHandle('CscCalibTool/CscCalibTool')
+| | |-CscRdoDecoderTool   @0x7f4eecb00878 = PrivateToolHandle('Muon::CscRDO_Decoder/CscRDO_Decoder')
 | | |-DecodeData                       = True
+| | |-DetStore            @0x7f4eecafc9d0 = ServiceHandle('StoreGateSvc/DetectorStore')
+| | |-EvtStore            @0x7f4eecafcad0 = ServiceHandle('StoreGateSvc')
+| | |-ExtraInputs         @0x7f4eecb0e950 = []  (default: [])
+| | |-ExtraOutputs        @0x7f4eecb12050 = []  (default: [])
 | | |-MonitorService                   = 'MonitorSvc'
 | | |-OutputCollection                 = 'StoreGateSvc+CSC_Measurements'
 | | |-OutputLevel                      = 0
 | | |-RDOContainer                     = 'StoreGateSvc+CSCRDO'
+| | |-RawDataProviderTool @0x7f4eed5b0af8 = PrivateToolHandle('Muon::CSC_RawDataProviderTool/CSC_RawDataProviderTool')
+| | |-useBStoRdoTool      @0x7f4ef05f4b00 = True  (default: False)
 | | |=/***** Private AlgTool Muon::CSC_RawDataProviderTool/CscRdoToCscPrepData.CscRdoToCscPrepDataTool.CSC_RawDataProviderTool *****
-| | | |-AuditFinalize                  = False
-| | | |-AuditInitialize                = False
-| | | |-AuditReinitialize              = False
-| | | |-AuditRestart                   = False
-| | | |-AuditStart                     = False
-| | | |-AuditStop                      = False
-| | | |-AuditTools                     = False
-| | | |-MonitorService                 = 'MonitorSvc'
-| | | |-OutputLevel                    = 0
-| | | |-RdoLocation                    = 'StoreGateSvc+CSCRDO'
+| | | |-AuditFinalize                     = False
+| | | |-AuditInitialize                   = False
+| | | |-AuditReinitialize                 = False
+| | | |-AuditRestart                      = False
+| | | |-AuditStart                        = False
+| | | |-AuditStop                         = False
+| | | |-AuditTools                        = False
+| | | |-CscContainerCacheKey              = 'StoreGateSvc+'
+| | | |-Decoder              @0x7f4eed02e230 = PrivateToolHandle('Muon::CscROD_Decoder/CscROD_Decoder')
+| | | |-DetStore             @0x7f4eecafcbd0 = ServiceHandle('StoreGateSvc/DetectorStore')
+| | | |-EvtStore             @0x7f4eecafcc10 = ServiceHandle('StoreGateSvc')
+| | | |-ExtraInputs          @0x7f4eed06cbd8 = []  (default: [])
+| | | |-ExtraOutputs         @0x7f4eecbefb90 = []  (default: [])
+| | | |-MonitorService                    = 'MonitorSvc'
+| | | |-OutputLevel                       = 0
+| | | |-RdoLocation                       = 'StoreGateSvc+CSCRDO'
 | | | |=/***** Private AlgTool Muon::CscROD_Decoder/CscRdoToCscPrepData.CscRdoToCscPrepDataTool.CSC_RawDataProviderTool.CscROD_Decoder *****
 | | | | |-AuditFinalize                  = False
 | | | | |-AuditInitialize                = False
@@ -1517,6 +1924,10 @@ Py:Athena            INFO Print Config
 | | | | |-AuditStart                     = False
 | | | | |-AuditStop                      = False
 | | | | |-AuditTools                     = False
+| | | | |-DetStore          @0x7f4eecafcc50 = ServiceHandle('StoreGateSvc/DetectorStore')
+| | | | |-EvtStore          @0x7f4eecafccd0 = ServiceHandle('StoreGateSvc')
+| | | | |-ExtraInputs       @0x7f4eed06c878 = []  (default: [])
+| | | | |-ExtraOutputs      @0x7f4eed06c7a0 = []  (default: [])
 | | | | |-IsCosmics                      = False
 | | | | |-IsOldCosmics                   = False
 | | | | |-MonitorService                 = 'MonitorSvc'
@@ -1531,6 +1942,10 @@ Py:Athena            INFO Print Config
 | | | |-AuditStart                      = False
 | | | |-AuditStop                       = False
 | | | |-AuditTools                      = False
+| | | |-DetStore           @0x7f4eecafcb10 = ServiceHandle('StoreGateSvc/DetectorStore')
+| | | |-EvtStore           @0x7f4eecafcb50 = ServiceHandle('StoreGateSvc')
+| | | |-ExtraInputs        @0x7f4eecb0e878 = []  (default: [])
+| | | |-ExtraOutputs       @0x7f4eecb0e098 = []  (default: [])
 | | | |-IsOnline                        = True
 | | | |-Latency                         = 100.0
 | | | |-MonitorService                  = 'MonitorSvc'
@@ -1557,6 +1972,11 @@ Py:Athena            INFO Print Config
 | | | |-AuditStart                     = False
 | | | |-AuditStop                      = False
 | | | |-AuditTools                     = False
+| | | |-CscCalibTool      @0x7f4eecafca50 = PublicToolHandle('CscCalibTool')
+| | | |-DetStore          @0x7f4eecafca10 = ServiceHandle('StoreGateSvc/DetectorStore')
+| | | |-EvtStore          @0x7f4eecafca90 = ServiceHandle('StoreGateSvc')
+| | | |-ExtraInputs       @0x7f4eecb0efc8 = []  (default: [])
+| | | |-ExtraOutputs      @0x7f4eecb0ef80 = []  (default: [])
 | | | |-MonitorService                 = 'MonitorSvc'
 | | | |-OutputLevel                    = 0
 | | | \----- (End of Private AlgTool Muon::CscRDO_Decoder/CscRdoToCscPrepData.CscRdoToCscPrepDataTool.CscRDO_Decoder) -----
@@ -1573,30 +1993,83 @@ Py:Athena            INFO Print Config
 | |-AuditRestart                            = False
 | |-AuditStart                              = False
 | |-AuditStop                               = False
+| |-Cardinality                             = 1
+| |-DetStore                   @0x7f4eecb39fd0 = ServiceHandle('StoreGateSvc/DetectorStore')
 | |-Enable                                  = True
 | |-ErrorCounter                            = 0
 | |-ErrorMax                                = 1
+| |-EvtStore                   @0x7f4eecb39f50 = ServiceHandle('StoreGateSvc')
+| |-ExtraInputs                @0x7f4eeca87050 = []  (default: [])
+| |-ExtraOutputs               @0x7f4eeca870e0 = []  (default: [])
 | |-FilterCircularDependencies              = True
 | |-IsIOBound                               = False
 | |-MonitorService                          = 'MonitorSvc'
+| |-NeededResources            @0x7f4eeca87128 = []  (default: [])
 | |-OutputLevel                             = 0
 | |-RegisterForContextService               = False
+| |-Timeline                                = True
+| |-cluster_builder            @0x7f4eeca7f950 = PublicToolHandle('CscThresholdClusterBuilderTool/CscThesholdClusterBuilderTool')
 | |                                            (default: 'CscThresholdClusterBuilderTool/CscThresholdClusterBuilderTool')
 | \----- (End of Algorithm CscThresholdClusterBuilder/CscThesholdClusterBuilder) ---------------------
 \----- (End of Algorithm AthSequencer/AthAlgSeq) ---------------------------------------------------
+Py:ComponentAccumulator    INFO Condition Algorithms
+Py:ComponentAccumulator    INFO ['CondInputLoader', 'MuonMDT_CablingAlg']
+Py:ComponentAccumulator    INFO Services
+Py:ComponentAccumulator    INFO ['EventSelector', 'ByteStreamInputSvc', 'EventPersistencySvc', 'ByteStreamCnvSvc', 'ROBDataProviderSvc', 'ByteStreamAddressProviderSvc', 'MetaDataStore', 'InputMetaDataStore', 'MetaDataSvc', 'ProxyProviderSvc', 'ByteStreamAttListMetadataSvc', 'GeoModelSvc', 'DetDescrCnvSvc', 'TagInfoMgr', 'RPCcablingServerSvc', 'IOVDbSvc', 'PoolSvc', 'CondSvc', 'DBReplicaSvc', 'MuonRPC_CablingSvc', 'LVL1TGC::TGCRecRoiSvc', 'TGCcablingServerSvc', 'AthenaPoolCnvSvc', 'MuonMDT_CablingSvc', 'AtlasFieldSvc', 'MdtCalibrationDbSvc', 'MdtCalibrationSvc', 'CSCcablingSvc', 'MuonCalib::CscCoolStrSvc']
+Py:ComponentAccumulator    INFO Outputs
+Py:ComponentAccumulator    INFO {}
+Py:ComponentAccumulator    INFO Public Tools
+Py:ComponentAccumulator    INFO [
+Py:ComponentAccumulator    INFO   IOVDbMetaDataTool/IOVDbMetaDataTool,
+Py:ComponentAccumulator    INFO   ByteStreamMetadataTool/ByteStreamMetadataTool,
+Py:ComponentAccumulator    INFO   Muon::MuonIdHelperTool/Muon::MuonIdHelperTool,
+Py:ComponentAccumulator    INFO   RPCCablingDbTool/RPCCablingDbTool,
+Py:ComponentAccumulator    INFO   Muon::RPC_RawDataProviderTool/RPC_RawDataProviderTool,
+Py:ComponentAccumulator    INFO   Muon::TGC_RawDataProviderTool/TGC_RawDataProviderTool,
+Py:ComponentAccumulator    INFO   MDTCablingDbTool/MDTCablingDbTool,
+Py:ComponentAccumulator    INFO   MuonCalib::MdtCalibDbCoolStrTool/MuonCalib::MdtCalibDbCoolStrTool,
+Py:ComponentAccumulator    INFO   Muon::MDT_RawDataProviderTool/MDT_RawDataProviderTool,
+Py:ComponentAccumulator    INFO   Muon::CSC_RawDataProviderTool/CSC_RawDataProviderTool,
+Py:ComponentAccumulator    INFO   Muon::RpcRdoToPrepDataTool/RpcRdoToRpcPrepDataTool,
+Py:ComponentAccumulator    INFO   Muon::TgcRdoToPrepDataTool/TgcRdoToTgcPrepDataTool,
+Py:ComponentAccumulator    INFO   Muon::MdtRdoToPrepDataTool/MdtRdoToMdtPrepDataTool,
+Py:ComponentAccumulator    INFO   Muon::CscRdoToCscPrepDataTool/CscRdoToCscPrepDataTool,
+Py:ComponentAccumulator    INFO   CscThresholdClusterBuilderTool/CscThesholdClusterBuilderTool,
+Py:ComponentAccumulator    INFO ]
 Py:Athena            INFO Save Config
 
 JOs reading stage finished, launching Athena from pickle file
 
+Fri Jan 25 22:58:00 CET 2019
+Preloading tcmalloc_minimal.so
+Py:Athena            INFO using release [WorkDir-22.0.1] [x86_64-slc6-gcc8-opt] [atlas-work3/5f61275c16] -- built on [2019-01-25T1856]
+Py:Athena            INFO including file "AthenaCommon/Preparation.py"
+Py:Athena            INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
 Py:Athena            INFO executing ROOT6Setup
 Py:Athena            INFO configuring AthenaHive with [1] concurrent threads and [1] concurrent events
 Py:AlgScheduler      INFO setting up AvalancheSchedulerSvc/AvalancheSchedulerSvc with 1 threads
+Py:Athena            INFO including file "AthenaCommon/Execution.py"
 Py:Athena            INFO now loading MuonRdoDecode.pkl  ... 
+Py:ConfigurableDb    INFO Read module info for 5454 configurables from 75 genConfDb files
+Py:ConfigurableDb    INFO No duplicates have been found: that's good !
+[?1034hApplicationMgr       INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
+ApplicationMgr    SUCCESS 
+====================================================================================================================================
+                                                   Welcome to ApplicationMgr (GaudiCoreSvc v30r5)
+                                          running on lxplus063.cern.ch on Fri Jan 25 22:58:26 2019
+====================================================================================================================================
+ApplicationMgr       INFO Successfully loaded modules : AthenaServices
 ApplicationMgr       INFO Application Manager Configured successfully
+ApplicationMgr                                     INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
+Py:Athena            INFO including file "AthenaCommon/runbatch.py"
+StatusCodeSvc        INFO initialize
 AthDictLoaderSvc     INFO in initialize...
 AthDictLoaderSvc     INFO acquired Dso-registry
+ClassIDSvc           INFO  getRegistryEntries: read 3320 CLIDRegistry entries for module ALL
 CoreDumpSvc          INFO install f-a-t-a-l handler... (flag = -1)
 CoreDumpSvc          INFO Handling signals: 11(Segmentation fault) 7(Bus error) 4(Illegal instruction) 8(Floating point exception) 
+ByteStreamAddre...   INFO Initializing ByteStreamAddressProviderSvc - package version ByteStreamCnvSvcBase-00-00-00
+ROBDataProviderSvc   INFO Initializing ROBDataProviderSvc - package version ByteStreamCnvSvcBase-00-00-00
 ROBDataProviderSvc   INFO  ---> Filter out empty ROB fragments                               =  'filterEmptyROB':False
 ROBDataProviderSvc   INFO  ---> Filter out specific ROBs by Status Code: # ROBs = 0
 ROBDataProviderSvc   INFO  ---> Filter out Sub Detector ROBs by Status Code: # Sub Detectors = 0
@@ -1611,6 +2084,10 @@ ByteStreamAddre...   INFO -- Will fill Store with id =  0
 PoolSvc              INFO io_register[PoolSvc](xmlcatalog_file:PoolFileCatalog.xml) [ok]
 PoolSvc              INFO Set connectionsvc retry/timeout/IDLE timeout to  'ConnectionRetrialPeriod':300/ 'ConnectionRetrialTimeOut':3600/ 'ConnectionTimeOut':5 seconds with connection cleanup disabled
 PoolSvc              INFO Frontier compression level set to 5
+DBReplicaSvc         INFO Frontier server at (serverurl=http://atlasfrontier-local.cern.ch:8000/atlr)(serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://lcgft-atlas.gridpp.rl.ac.uk:3128/frontierATLAS)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://ca-proxy.cern.ch:3128)(proxyurl=http://ca-proxy-meyrin.cern.ch:3128)(proxyurl=http://ca-proxy-wigner.cern.ch:3128)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
+DBReplicaSvc         INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-24T2342/Athena/22.0.1/InstallArea/x86_64-slc6-gcc8-opt/share/dbreplica.config
+DBReplicaSvc         INFO Total of 10 servers found for host lxplus063.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
+DBReplicaSvc         INFO COOL SQLite replicas will be excluded if matching pattern /DBRelease/
 PoolSvc              INFO Successfully setup replica sorting algorithm
 PoolSvc              INFO Setting up APR FileCatalog and Streams
 PoolSvc              INFO Resolved path (via ATLAS_POOLCOND_PATH) is /cvmfs/atlas-condb.cern.ch/repo/conditions/poolcond/PoolFileCatalog.xml
@@ -1619,14 +2096,26 @@ PoolSvc           WARNING Unable to locate catalog for apcfile:poolcond/PoolCat_
 PoolSvc           WARNING Unable to locate catalog for prfile:poolcond/PoolCat_comcond.xml check your ATLAS_POOLCOND_PATH and DATAPATH variables
 PoolSvc           WARNING Unable to locate catalog for apcfile:poolcond/PoolCat_comcond.xml check your ATLAS_POOLCOND_PATH and DATAPATH variables
 PoolSvc              INFO POOL WriteCatalog is xmlcatalog_file:PoolFileCatalog.xml
+DbSession            INFO     Open     DbSession    
+Domain[ROOT_All]     INFO >   Access   DbDomain     READ      [ROOT_All] 
 IOVDbSvc             INFO Opened read transaction for POOL PersistencySvc
 IOVDbSvc             INFO Only 5 POOL conditions files will be open at once
 IOVDbSvc             INFO Cache alignment will be done in 3 slices
 IOVDbSvc             INFO Global tag: CONDBR2-BLKPA-2018-13 set from joboptions
 IOVDbFolder          INFO Inputfile tag override disabled for /GLOBAL/BField/Maps
+IOVDbSvc             INFO Folder /GLOBAL/BField/Maps will be written to file metadata
 IOVDbSvc             INFO Initialised with 8 connections and 19 folders
 IOVDbSvc             INFO Service IOVDbSvc initialised successfully
+MetaDataSvc          INFO Initializing MetaDataSvc - package version AthenaServices-00-00-00
+AthenaPoolCnvSvc     INFO Initializing AthenaPoolCnvSvc - package version AthenaPoolCnvSvc-00-00-00
+ToolSvc.ByteStr...   INFO Initializing ToolSvc.ByteStreamMetadataTool - package version ByteStreamCnvSvc-00-00-00
+MetaDataSvc          INFO Found MetaDataTools = PublicToolHandleArray(['IOVDbMetaDataTool/IOVDbMetaDataTool','ByteStreamMetadataTool/ByteStreamMetadataTool'])
 IOVDbSvc             INFO Opening COOL connection for COOLONL_MDT/CONDBR2
+ClassIDSvc           INFO  getRegistryEntries: read 3288 CLIDRegistry entries for module ALL
+ClassIDSvc           INFO  getRegistryEntries: read 163 CLIDRegistry entries for module ALL
+ClassIDSvc           INFO  getRegistryEntries: read 4096 CLIDRegistry entries for module ALL
+ClassIDSvc           INFO  getRegistryEntries: read 129 CLIDRegistry entries for module ALL
+ClassIDSvc           INFO  getRegistryEntries: read 3031 CLIDRegistry entries for module ALL
 IOVSvc               INFO No IOVSvcTool associated with store "StoreGateSvc"
 IOVSvcTool           INFO IOVRanges will be checked at every Event
 IOVDbSvc             INFO Opening COOL connection for COOLONL_RPC/CONDBR2
@@ -1707,6 +2196,10 @@ GeoModelSvc::RD...WARNING  Getting PixTBMatComponents with default tag
 GeoModelSvc::RD...WARNING  Getting PixTBMaterials with default tag
 GeoModelSvc::RD...WARNING  Getting InDetMatComponents with default tag
 GeoModelSvc::RD...WARNING  Getting InDetMaterials with default tag
+GeoModelSvc.Muo...   INFO create MuonDetectorTool - package version = MuonGeoModel-00-00-00
+GeoModelSvc.Muo...   INFO (from GeoModelSvc)    AtlasVersion = <ATLAS-R2-2016-01-00-01>  MuonVersion = <>
+GeoModelSvc.Muo...   INFO Keys for Muon Switches are  (key) ATLAS-R2-2016-01-00-01 (node) ATLAS
+GeoModelSvc.Muo...   INFO (from GeoModelSvc) in AtlasVersion = <ATLAS-R2-2016-01-00-01>  default MuonVersion is <MuonSpectrometer-R.08.01>
 GeoModelSvc.Muo...   INFO Properties have been set as follows: 
 GeoModelSvc.Muo...   INFO     LayoutName                     R
 GeoModelSvc.Muo...   INFO     IncludeCutouts                 0
@@ -1821,6 +2314,7 @@ AtlasDetectorID::initLevelsFromDict - there are no MM entries in the dictionary!
 MuGM:MuonFactory     INFO MMIDHELPER retrieved from DetStore
 MuGM:MuonFactory     INFO  **************** MuonDetectorFactory001 ************************
 MuGM:MuonFactory     INFO  *** Start building the Muon Geometry Tree **********************
+MuGM:RDBReadAtlas    INFO Start retriving dbObjects with tag = <ATLAS-R2-2016-01-00-01> node <ATLAS>
 RDBAccessSvc      WARNING Could not get the tag for XtomoData node. Returning 0 pointer to IRDBQuery
 MuGM:RDBReadAtlas    INFO After getQuery XtomoData
 In DblQ00Xtomo(data)
@@ -1850,6 +2344,7 @@ MuGM:ProcCutouts     INFO  Processing Cutouts DONE
 MuGM:RDBReadAtlas    INFO  ProcessTGCreadout - version 7 wirespacing 1.8
 MuGM:RDBReadAtlas    INFO Intermediate Objects built from primary numbers
 MuGM:MuonFactory     INFO  theMaterialManager retrieven successfully from the DetStore
+MuGM:MuonFactory     INFO MuonSystem description from OracleTag=<ATLAS-R2-2016-01-00-01> and node=<ATLAS>
 MuGM:MuonFactory     INFO  TreeTop added to the Manager
 MuGM:MuonFactory     INFO  Muon Layout R.08.01
 MuGM:MuonFactory     INFO Fine Clash Fixing disabled: (should be ON/OFF for Simulation/Reconstruction)
@@ -1873,9 +2368,13 @@ MuGM:MuonFactory     INFO  *****************************************************
 
 MGM::MuonDetect...   INFO Init A/B Line Containers - done - size is respectively 1758/0
 MGM::MuonDetect...   INFO No Aline for CSC wire layers loaded 
+GeoModelSvc          INFO GeoModelSvc.MuonDetectorTool	 SZ= 44884Kb 	 Time = 0.78S
 GeoModelSvc.Muo...   INFO CondAttrListCollection not found in the DetectorStore
 GeoModelSvc.Muo...   INFO Unable to register callback on CondAttrListCollection for any folder in the list 
 GeoModelSvc.Muo...   INFO This is OK unless you expect to read alignment and deformations from COOL 
+ClassIDSvc           INFO  getRegistryEntries: read 1455 CLIDRegistry entries for module ALL
+AthenaEventLoopMgr   INFO Initializing AthenaEventLoopMgr - package version AthenaServices-00-00-00
+ClassIDSvc           INFO  getRegistryEntries: read 1794 CLIDRegistry entries for module ALL
 CondInputLoader      INFO Initializing CondInputLoader...
 CondInputLoader      INFO Adding base classes:
   +  ( 'CondAttrListCollection' , 'ConditionStore+/EXT/DCS/MAGNETS/SENSORDATA' )   ->
@@ -1885,12 +2384,17 @@ CondInputLoader      INFO Will create WriteCondHandle dependencies for the follo
     +  ( 'CondAttrListCollection' , 'ConditionStore+/EXT/DCS/MAGNETS/SENSORDATA' ) 
     +  ( 'CondAttrListCollection' , 'ConditionStore+/MDT/CABLING/MAP_SCHEMA' ) 
     +  ( 'CondAttrListCollection' , 'ConditionStore+/MDT/CABLING/MEZZANINE_SCHEMA' ) 
+ClassIDSvc           INFO  getRegistryEntries: read 1370 CLIDRegistry entries for module ALL
+ClassIDSvc           INFO  getRegistryEntries: read 743 CLIDRegistry entries for module ALL
 RpcRawDataProvider   INFO RpcRawDataProvider::initialize
 RpcRawDataProvider   INFO  'DoSeededDecoding':False
+ClassIDSvc           INFO  getRegistryEntries: read 1699 CLIDRegistry entries for module ALL
+MuonRPC_CablingSvc   INFO Initializing MuonRPC_CablingSvc - package version MuonRPC_Cabling-00-00-00
 ToolSvc.RPCCabl...   INFO Initializing - folders names are: conf /RPC/CABLING/MAP_SCHEMA / corr /RPC/CABLING/MAP_SCHEMA_CORR
 MuonRPC_CablingSvc   INFO RPCCablingDbTool retrieved with statusCode = SUCCESS with handle TheRpcCablingDbTool = PublicToolHandle('RPCCablingDbTool/RPCCablingDbTool')
 MuonRPC_CablingSvc   INFO Register call-back  against 2 folders listed below 
 MuonRPC_CablingSvc   INFO  Folder n. 1 </RPC/CABLING/MAP_SCHEMA>     found in the DetStore
+ClassIDSvc           INFO  getRegistryEntries: read 501 CLIDRegistry entries for module ALL
 MuonRPC_CablingSvc   INFO initMappingModel registered for call-back against folder </RPC/CABLING/MAP_SCHEMA>
 MuonRPC_CablingSvc   INFO  Folder n. 2 </RPC/CABLING/MAP_SCHEMA_CORR>     found in the DetStore
 MuonRPC_CablingSvc   INFO initMappingModel registered for call-back against folder </RPC/CABLING/MAP_SCHEMA_CORR>
@@ -1905,31 +2409,32 @@ RpcRawDataProvi...   INFO Retrieved service ServiceHandle('ROBDataProviderSvc')
 RpcRawDataProvi...   INFO  Tool = RpcRawDataProvider.RPC_RawDataProviderTool is connected to JobOptionsSvc Service = JobOptionsSvc
 RpcRawDataProvi...   INFO initialize() successful in RpcRawDataProvider.RPC_RawDataProviderTool
 TgcRawDataProvider   INFO TgcRawDataProvider::initialize
+ClassIDSvc           INFO  getRegistryEntries: read 878 CLIDRegistry entries for module ALL
 TgcRawDataProvi...   INFO initialize() successful in TgcRawDataProvider.TGC_RawDataProviderTool.TgcROD_Decoder
 TgcRawDataProvi...   INFO Retrieved tool Decoder = PrivateToolHandle('Muon::TGC_RodDecoderReadout/TgcROD_Decoder')
 TgcRawDataProvi...   INFO Retrieved service ServiceHandle('ROBDataProviderSvc')
 TgcRawDataProvi...   INFO  Tool = TgcRawDataProvider.TGC_RawDataProviderTool is connected to JobOptionsSvc Service = JobOptionsSvc
 MuonTGC_CablingSvc   INFO for 1/12 sector initialize
 ToolSvc.TGCCabl...   INFO initialize
+ClassIDSvc           INFO  getRegistryEntries: read 273 CLIDRegistry entries for module ALL
+IOVSvcTool           INFO Still in initialize phase, not tiggering callback for MuonTGC_CablingSvc[0x25900c00]+219 bound to CondAttrListCollection[/TGC/CABLING/MAP_SCHEMA]
 TgcRawDataProvi...   INFO initialize() successful in TgcRawDataProvider.TGC_RawDataProviderTool
 MdtRawDataProvider   INFO MdtRawDataProvider::initialize
-MdtRawDataProvi...VERBOSE Starting init
-MdtRawDataProvi...VERBOSE Getting m_robDataProvider
+ClassIDSvc           INFO  getRegistryEntries: read 922 CLIDRegistry entries for module ALL
 MdtRawDataProvi...   INFO Retrieved service ServiceHandle('ROBDataProviderSvc')
-MdtRawDataProvi...VERBOSE Getting MuonDetectorManager
-MdtRawDataProvi...VERBOSE Getting m_decoder
 MdtRawDataProvi...   INFO Processing configuration for layouts with BME chambers.
 MdtRawDataProvi...   INFO Processing configuration for layouts with BMG chambers.
 MdtRawDataProvi...   INFO Retrieved tool Decoder = PrivateToolHandle('MdtROD_Decoder/MdtROD_Decoder')
 MdtRawDataProvi...   INFO  Tool = MdtRawDataProvider.MDT_RawDataProviderTool is connected to JobOptionsSvc Service = JobOptionsSvc
-MdtRawDataProvi...  DEBUG Could not find TrigConf::HLTJobOptionsSvc
 MdtRawDataProvi...   INFO initialize() successful in MdtRawDataProvider.MDT_RawDataProviderTool
-MdtRawDataProvi...  DEBUG Adding private ToolHandle tool MdtRawDataProvider.MDT_RawDataProviderTool.MdtROD_Decoder (MdtROD_Decoder)
+ClassIDSvc           INFO  getRegistryEntries: read 660 CLIDRegistry entries for module ALL
 CscRawDataProvi...   INFO Retrieved service ServiceHandle('ROBDataProviderSvc')
 CscRawDataProvi...   INFO  Tool = CscRawDataProvider.CSC_RawDataProviderTool is connected to JobOptionsSvc Service = JobOptionsSvc
 CscRawDataProvi...   INFO Retrieved tool Decoder = PrivateToolHandle('Muon::CscROD_Decoder/CscROD_Decoder')
 CscRawDataProvi...   INFO The Muon Geometry version is R.08.01
 CscRawDataProvi...   INFO initialize() successful in CscRawDataProvider.CSC_RawDataProviderTool
+ClassIDSvc           INFO  getRegistryEntries: read 53 CLIDRegistry entries for module ALL
+RpcRdoToRpcPrep...   INFO package version = MuonRPC_CnvTools-00-00-00
 RpcRdoToRpcPrep...   INFO properties are 
 RpcRdoToRpcPrep...   INFO processingData                     0
 RpcRdoToRpcPrep...   INFO produceRpcCoinDatafromTriggerWords 1
@@ -1944,14 +2449,17 @@ RpcRdoToRpcPrep...   INFO Retrieved DecodingTool = PrivateToolHandle('Muon::RpcR
 TgcRdoToTgcPrep...   INFO initialize() successful in TgcRdoToTgcPrepData.TgcRdoToTgcPrepDataTool
 TgcRdoToTgcPrep...   INFO Retrieved DecodingTool = PrivateToolHandle('Muon::TgcRdoToPrepDataTool/TgcRdoToTgcPrepDataTool')
 MdtCalibrationSvc    INFO Processing configuration for layouts with BMG chambers.
+ClassIDSvc           INFO  getRegistryEntries: read 194 CLIDRegistry entries for module ALL
 AtlasFieldSvc        INFO initialize() ...
 AtlasFieldSvc        INFO maps will be chosen reading COOL folder /GLOBAL/BField/Maps
+ClassIDSvc           INFO  getRegistryEntries: read 163 CLIDRegistry entries for module ALL
 AtlasFieldSvc        INFO magnet currents will be read from COOL folder /EXT/DCS/MAGNETS/SENSORDATA
 AtlasFieldSvc        INFO Booked callback for /EXT/DCS/MAGNETS/SENSORDATA
 AtlasFieldSvc        INFO initialize() successful
 MdtRdoToMdtPrep...   INFO Processing configuration for layouts with BME chambers.
 MdtRdoToMdtPrep...   INFO Processing configuration for layouts with BMG chambers.
 MdtRdoToMdtPrep...   INFO Retrieved DecodingTool = PrivateToolHandle('Muon::MdtRdoToPrepDataTool/MdtRdoToMdtPrepDataTool')
+ClassIDSvc           INFO  getRegistryEntries: read 60 CLIDRegistry entries for module ALL
 CscRdoToCscPrep...   INFO The Geometry version is MuonSpectrometer-R.08.01
 CscRdoToCscPrep...   INFO Retrieved service ServiceHandle('ROBDataProviderSvc')
 CscRdoToCscPrep...   INFO  Tool = CscRdoToCscPrepData.CscRdoToCscPrepDataTool.CSC_RawDataProviderTool is connected to JobOptionsSvc Service = JobOptionsSvc
@@ -1959,9 +2467,19 @@ CscRdoToCscPrep...   INFO Retrieved tool Decoder = PrivateToolHandle('Muon::CscR
 CscRdoToCscPrep...   INFO The Muon Geometry version is R.08.01
 CscRdoToCscPrep...   INFO initialize() successful in CscRdoToCscPrepData.CscRdoToCscPrepDataTool.CSC_RawDataProviderTool
 MuonCalib::CscC...   INFO Initializing CscCoolStrSvc
+ClassIDSvc           INFO  getRegistryEntries: read 181 CLIDRegistry entries for module ALL
+IOVSvcTool           INFO Still in initialize phase, not tiggering callback for MuonCalib::CscCoolStrSvc[0x2a791a00]+259 bound to CondAttrListCollection[CSC_PED]
+IOVSvcTool           INFO Still in initialize phase, not tiggering callback for MuonCalib::CscCoolStrSvc[0x2a791a00]+259 bound to CondAttrListCollection[CSC_NOISE]
+IOVSvcTool           INFO Still in initialize phase, not tiggering callback for MuonCalib::CscCoolStrSvc[0x2a791a00]+259 bound to CondAttrListCollection[CSC_PSLOPE]
+IOVSvcTool           INFO Still in initialize phase, not tiggering callback for MuonCalib::CscCoolStrSvc[0x2a791a00]+259 bound to CondAttrListCollection[CSC_STAT]
+IOVSvcTool           INFO Still in initialize phase, not tiggering callback for MuonCalib::CscCoolStrSvc[0x2a791a00]+259 bound to CondAttrListCollection[CSC_RMS]
+IOVSvcTool           INFO Still in initialize phase, not tiggering callback for MuonCalib::CscCoolStrSvc[0x2a791a00]+259 bound to CondAttrListCollection[CSC_FTHOLD]
+IOVSvcTool           INFO Still in initialize phase, not tiggering callback for MuonCalib::CscCoolStrSvc[0x2a791a00]+259 bound to CondAttrListCollection[CSC_T0BASE]
+IOVSvcTool           INFO Still in initialize phase, not tiggering callback for MuonCalib::CscCoolStrSvc[0x2a791a00]+259 bound to CondAttrListCollection[CSC_T0PHASE]
 CscRdoToCscPrep...   INFO Retrieved CscRdoToCscPrepDataTool = PrivateToolHandle('Muon::CscRdoToCscPrepDataTool/CscRdoToCscPrepDataTool')
 CscRdoToCscPrep...WARNING Implicit circular data dependency detected for id  ( 'CscRawDataContainer' , 'StoreGateSvc+CSCRDO' ) 
 HistogramPersis...WARNING Histograms saving not required.
+EventSelector        INFO Initializing EventSelector - package version ByteStreamCnvSvc-00-00-00
 EventSelector     WARNING InputCollections not properly set, checking EventStorageInputSvc properties
 EventSelector        INFO Retrieved StoreGateSvc name of  '':StoreGateSvc
 EventSelector        INFO reinitialization...
@@ -1973,10 +2491,12 @@ ToolSvc.Luminos...   INFO BunchLumisTool.empty() is TRUE, skipping...
 ToolSvc.Luminos...   INFO BunchGroupTool.empty() is TRUE, skipping...
 ToolSvc.Luminos...   INFO LBLBFolderName is empty, skipping...
 EventSelector        INFO Retrieved InputCollections from InputSvc
+ByteStreamInputSvc   INFO Initializing ByteStreamInputSvc - package version ByteStreamCnvSvc-00-00-00
 EventSelector        INFO reinitialization...
 AthenaEventLoopMgr   INFO Setup EventSelector service EventSelector
 ApplicationMgr       INFO Application Manager Initialized successfully
 ByteStreamInputSvc   INFO Picked valid file: /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data17_13TeV.00327265.physics_EnhancedBias.merge.RAW._lb0100._SFO-1._0001.1
+ClassIDSvc           INFO  getRegistryEntries: read 1156 CLIDRegistry entries for module ALL
 CondInputLoader      INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/EXT/DCS/MAGNETS/SENSORDATA'
 CondInputLoader      INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/MDT/CABLING/MAP_SCHEMA'
 CondInputLoader      INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/MDT/CABLING/MEZZANINE_SCHEMA'
@@ -2094,6 +2614,7 @@ AtlasFieldSvc        INFO Currents read from DCS: solenoid 7729.99 toroid 20399.
 AtlasFieldSvc        INFO Initializing the field map (solenoidCurrent=7729.99 toroidCurrent=20399.9)
 AtlasFieldSvc        INFO reading the map from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/atlas/offline/ReleaseData/v20/MagneticFieldMaps/bfieldmap_7730_20400_14m.root
 AtlasFieldSvc        INFO Initialized the field map from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/atlas/offline/ReleaseData/v20/MagneticFieldMaps/bfieldmap_7730_20400_14m.root
+ClassIDSvc           INFO  getRegistryEntries: read 672 CLIDRegistry entries for module ALL
 AthenaEventLoopMgr   INFO   ===>>>  start processing event #186525031, run #327265 0 events processed so far  <<<===
 IOVDbSvc             INFO Opening COOL connection for COOLONL_MDT/CONDBR2
 IOVDbFolder          INFO HVS tag CONDBR2-BLKPA-2018-13 resolved to MDTCablingMapSchema_BMG_01 for folder /MDT/CABLING/MAP_SCHEMA
@@ -2104,593 +2625,161 @@ MuonMDT_CablingAlg   INFO Range of input is {[0,l:0] - [INVALID]}
 MuonMDT_CablingAlg   INFO Size of CondAttrListCollection  ( 'CondAttrListCollection' , 'ConditionStore+/MDT/CABLING/MAP_SCHEMA' )  readCdoMap->size()= 2312
 MuonMDT_CablingAlg   INFO Range of input is {[327264,l:4294640031] - [327265,l:4294640030]}
 MuonMDT_CablingAlg   INFO recorded new MuonMDT_CablingMap with range {[327264,l:4294640031] - [327265,l:4294640030]} into Conditions Store
-MdtRawDataProvi...VERBOSE convert(): 264 ROBFragments.
-MdtRawDataProvi...  DEBUG Created container
-MdtRawDataProvi...  DEBUG fillCollection: starting
-MdtRawDataProvi...  DEBUG **********Decoder dumping the words******** 
-MdtRawDataProvi...  DEBUG The size of this ROD-read is 
-MdtRawDataProvi...  DEBUG word 0 = 8003e994
-MdtRawDataProvi...  DEBUG word 1 = 81040007
-MdtRawDataProvi...  DEBUG word 2 = 18030370
-MdtRawDataProvi...  DEBUG word 3 = 890003ff
-MdtRawDataProvi...  DEBUG word 4 = a3994153
-MdtRawDataProvi...  DEBUG word 5 = 30a403c0
-MdtRawDataProvi...  DEBUG word 6 = 30a004ce
-MdtRawDataProvi...  DEBUG word 7 = 8a994005
-MdtRawDataProvi...  DEBUG word 8 = 8104000d
-MdtRawDataProvi...  DEBUG word 9 = 18030371
-MdtRawDataProvi...  DEBUG word 10 = 89000fff
-MdtRawDataProvi...  DEBUG word 11 = a2994153
-MdtRawDataProvi...  DEBUG word 12 = 306c0472
-MdtRawDataProvi...  DEBUG word 13 = 306804d5
-MdtRawDataProvi...  DEBUG word 14 = a3994153
-MdtRawDataProvi...  DEBUG word 15 = 20080000
-MdtRawDataProvi...  DEBUG word 16 = a4994153
-MdtRawDataProvi...  DEBUG word 17 = 301c0504
-MdtRawDataProvi...  DEBUG word 18 = 30180562
-MdtRawDataProvi...  DEBUG word 19 = 20000010
-MdtRawDataProvi...  DEBUG word 20 = 8a99400b
-MdtRawDataProvi...  DEBUG word 21 = 81040006
-MdtRawDataProvi...  DEBUG word 22 = 18030372
-MdtRawDataProvi...  DEBUG word 23 = 89003fff
-MdtRawDataProvi...  DEBUG word 24 = a6994153
-MdtRawDataProvi...  DEBUG word 25 = 20008000
-MdtRawDataProvi...  DEBUG word 26 = 8a994004
-MdtRawDataProvi...  DEBUG word 27 = 8104000f
-MdtRawDataProvi...  DEBUG word 28 = 18030373
-MdtRawDataProvi...  DEBUG word 29 = 89003fff
-MdtRawDataProvi...  DEBUG word 30 = a0994153
-MdtRawDataProvi...  DEBUG word 31 = 3034054a
-MdtRawDataProvi...  DEBUG word 32 = 303005c2
-MdtRawDataProvi...  DEBUG word 33 = a7994153
-MdtRawDataProvi...  DEBUG word 34 = 3084023a
-MdtRawDataProvi...  DEBUG word 35 = 3080029e
-MdtRawDataProvi...  DEBUG word 36 = a8994153
-MdtRawDataProvi...  DEBUG word 37 = 307c03f6
-MdtRawDataProvi...  DEBUG word 38 = 30ac03f8
-MdtRawDataProvi...  DEBUG word 39 = 307804c4
-MdtRawDataProvi...  DEBUG word 40 = 30a804cb
-MdtRawDataProvi...  DEBUG word 41 = 8a99400d
-MdtRawDataProvi...  DEBUG word 42 = 81040008
-MdtRawDataProvi...  DEBUG word 43 = 18030374
-MdtRawDataProvi...  DEBUG word 44 = 8903ffff
-MdtRawDataProvi...  DEBUG word 45 = af994153
-MdtRawDataProvi...  DEBUG word 46 = 302c05c7
-MdtRawDataProvi...  DEBUG word 47 = 30280664
-MdtRawDataProvi...  DEBUG word 48 = 305c0673
-MdtRawDataProvi...  DEBUG word 49 = 8a994006
-MdtRawDataProvi...  DEBUG word 50 = 81040031
-MdtRawDataProvi...  DEBUG word 51 = 18030375
-MdtRawDataProvi...  DEBUG word 52 = 8903ffff
-MdtRawDataProvi...  DEBUG word 53 = a0994153
-MdtRawDataProvi...  DEBUG word 54 = 3054055c
-MdtRawDataProvi...  DEBUG word 55 = 305005fb
-MdtRawDataProvi...  DEBUG word 56 = a2994153
-MdtRawDataProvi...  DEBUG word 57 = 20010000
-MdtRawDataProvi...  DEBUG word 58 = a8994153
-MdtRawDataProvi...  DEBUG word 59 = 306c034f
-MdtRawDataProvi...  DEBUG word 60 = 309c0349
-MdtRawDataProvi...  DEBUG word 61 = 308c0394
-MdtRawDataProvi...  DEBUG word 62 = 309803d9
-MdtRawDataProvi...  DEBUG word 63 = 304c03f8
-MdtRawDataProvi...  DEBUG word 64 = 30680422
-MdtRawDataProvi...  DEBUG word 65 = 30880439
-MdtRawDataProvi...  DEBUG word 66 = 30bc03f3
-MdtRawDataProvi...  DEBUG word 67 = 3048049a
-MdtRawDataProvi...  DEBUG word 68 = 30b80479
-MdtRawDataProvi...  DEBUG word 69 = 305c05e9
-MdtRawDataProvi...  DEBUG word 70 = 30580652
-MdtRawDataProvi...  DEBUG word 71 = af994153
-MdtRawDataProvi...  DEBUG word 72 = 30940521
-MdtRawDataProvi...  DEBUG word 73 = 30840583
-MdtRawDataProvi...  DEBUG word 74 = 308c0583
-MdtRawDataProvi...  DEBUG word 75 = 309c0585
-MdtRawDataProvi...  DEBUG word 76 = 308005e7
-MdtRawDataProvi...  DEBUG word 77 = 308805f5
-MdtRawDataProvi...  DEBUG word 78 = 3090061d
-MdtRawDataProvi...  DEBUG word 79 = 309805f1
-MdtRawDataProvi...  DEBUG word 80 = 30a40587
-MdtRawDataProvi...  DEBUG word 81 = 30ac0588
-MdtRawDataProvi...  DEBUG word 82 = 30b40589
-MdtRawDataProvi...  DEBUG word 83 = 30bc058d
-MdtRawDataProvi...  DEBUG word 84 = 30a005fc
-MdtRawDataProvi...  DEBUG word 85 = 30a805f2
-MdtRawDataProvi...  DEBUG word 86 = 30b005e7
-MdtRawDataProvi...  DEBUG word 87 = 30b805d8
-MdtRawDataProvi...  DEBUG word 88 = b0994153
-MdtRawDataProvi...  DEBUG word 89 = 306c0082
-MdtRawDataProvi...  DEBUG word 90 = 3068012b
-MdtRawDataProvi...  DEBUG word 91 = 303c01ed
-MdtRawDataProvi...  DEBUG word 92 = 30380250
-MdtRawDataProvi...  DEBUG word 93 = 306c0556
-MdtRawDataProvi...  DEBUG word 94 = 306805a3
-MdtRawDataProvi...  DEBUG word 95 = 20004000
-MdtRawDataProvi...  DEBUG word 96 = b1994153
-MdtRawDataProvi...  DEBUG word 97 = 20010000
-MdtRawDataProvi...  DEBUG word 98 = 8a99402f
-MdtRawDataProvi...  DEBUG word 99 = f0000064
-MdtRawDataProvi...  DEBUG Found the beginning of buffer 
-MdtRawDataProvi...  DEBUG Level 1 Id : 256404
-MdtRawDataProvi...  DEBUG Found the Beginnning of Link 
-MdtRawDataProvi...  DEBUG subdetId : 97 mrodId : 0 csmId : 0
-MdtRawDataProvi...  DEBUG getOfflineIdfromOnlineID result: 
-MdtRawDataProvi...  DEBUG Name : 0
-MdtRawDataProvi...  DEBUG Eta  : 1
-MdtRawDataProvi...  DEBUG Phi  : 1
-MdtRawDataProvi...  DEBUG  Decoding data from TDC number : 3
-MdtRawDataProvi...  DEBUG Found the Beginnning of Link 
-MdtRawDataProvi...  DEBUG subdetId : 97 mrodId : 0 csmId : 1
-MdtRawDataProvi...  DEBUG getOfflineIdfromOnlineID result: 
-MdtRawDataProvi...  DEBUG Name : 0
-MdtRawDataProvi...  DEBUG Eta  : 2
-MdtRawDataProvi...  DEBUG Phi  : 1
-MdtRawDataProvi...  DEBUG  Decoding data from TDC number : 2
-MdtRawDataProvi...  DEBUG  Decoding data from TDC number : 3
-MdtRawDataProvi...  DEBUG  Decoding data from TDC number : 4
-MdtRawDataProvi...  DEBUG Found the Beginnning of Link 
-MdtRawDataProvi...  DEBUG subdetId : 97 mrodId : 0 csmId : 2
-MdtRawDataProvi...  DEBUG getOfflineIdfromOnlineID result: 
-MdtRawDataProvi...  DEBUG Name : 2
-MdtRawDataProvi...  DEBUG Eta  : 1
-MdtRawDataProvi...  DEBUG Phi  : 1
-MdtRawDataProvi...  DEBUG  Decoding data from TDC number : 6
-MdtRawDataProvi...  DEBUG Found the Beginnning of Link 
-MdtRawDataProvi...  DEBUG subdetId : 97 mrodId : 0 csmId : 3
-MdtRawDataProvi...  DEBUG getOfflineIdfromOnlineID result: 
-MdtRawDataProvi...  DEBUG Name : 2
-MdtRawDataProvi...  DEBUG Eta  : 2
-MdtRawDataProvi...  DEBUG Phi  : 1
-MdtRawDataProvi...  DEBUG  Decoding data from TDC number : 0
-MdtRawDataProvi...  DEBUG  Decoding data from TDC number : 7
-MdtRawDataProvi...  DEBUG  Decoding data from TDC number : 8
-MdtRawDataProvi...  DEBUG Found the Beginnning of Link 
-MdtRawDataProvi...  DEBUG subdetId : 97 mrodId : 0 csmId : 4
-MdtRawDataProvi...  DEBUG getOfflineIdfromOnlineID result: 
-MdtRawDataProvi...  DEBUG Name : 4
-MdtRawDataProvi...  DEBUG Eta  : 1
-MdtRawDataProvi...  DEBUG Phi  : 1
-MdtRawDataProvi...  DEBUG  Decoding data from TDC number : 15
-MdtRawDataProvi...  DEBUG Found the Beginnning of Link 
-MdtRawDataProvi...  DEBUG subdetId : 97 mrodId : 0 csmId : 5
-MdtRawDataProvi...  DEBUG getOfflineIdfromOnlineID result: 
-MdtRawDataProvi...  DEBUG Name : 4
-MdtRawDataProvi...  DEBUG Eta  : 2
-MdtRawDataProvi...  DEBUG Phi  : 1
-MdtRawDataProvi...  DEBUG  Decoding data from TDC number : 0
-MdtRawDataProvi...  DEBUG  Decoding data from TDC number : 2
-MdtRawDataProvi...  DEBUG  Decoding data from TDC number : 8
-MdtRawDataProvi...  DEBUG  Decoding data from TDC number : 15
-MdtRawDataProvi...  DEBUG  Decoding data from TDC number : 16
-MdtRawDataProvi...  DEBUG  Decoding data from TDC number : 17
-MdtRawDataProvi...  DEBUG fillCollection: starting
-MdtRawDataProvi...  DEBUG **********Decoder dumping the words******** 
-MdtRawDataProvi...  DEBUG The size of this ROD-read is 
-MdtRawDataProvi...  DEBUG word 0 = 8003e994
-MdtRawDataProvi...  DEBUG word 1 = 81040004
-MdtRawDataProvi...  DEBUG word 2 = 18030210
-MdtRawDataProvi...  DEBUG word 3 = 890003ff
-MdtRawDataProvi...  DEBUG word 4 = 8a994002
-MdtRawDataProvi...  DEBUG word 5 = 81040014
-MdtRawDataProvi...  DEBUG word 6 = 18030211
-MdtRawDataProvi...  DEBUG word 7 = 89000fff
-MdtRawDataProvi...  DEBUG word 8 = a1994153
-MdtRawDataProvi...  DEBUG word 9 = 20000500
-MdtRawDataProvi...  DEBUG word 10 = a3994153
-MdtRawDataProvi...  DEBUG word 11 = 20000028
-MdtRawDataProvi...  DEBUG word 12 = aa994153
-MdtRawDataProvi...  DEBUG word 13 = 303c0116
-MdtRawDataProvi...  DEBUG word 14 = 3038016f
-MdtRawDataProvi...  DEBUG word 15 = 308c0202
-MdtRawDataProvi...  DEBUG word 16 = 3088026b
-MdtRawDataProvi...  DEBUG word 17 = 20100000
-MdtRawDataProvi...  DEBUG word 18 = ab994153
-MdtRawDataProvi...  DEBUG word 19 = 3074012d
-MdtRawDataProvi...  DEBUG word 20 = 30700187
-MdtRawDataProvi...  DEBUG word 21 = 3084015b
-MdtRawDataProvi...  DEBUG word 22 = 308001ca
-MdtRawDataProvi...  DEBUG word 23 = 20140150
-MdtRawDataProvi...  DEBUG word 24 = 8a994012
-MdtRawDataProvi...  DEBUG word 25 = 81040007
-MdtRawDataProvi...  DEBUG word 26 = 18030212
-MdtRawDataProvi...  DEBUG word 27 = 89003fff
-MdtRawDataProvi...  DEBUG word 28 = a3994153
-MdtRawDataProvi...  DEBUG word 29 = 307c0071
-MdtRawDataProvi...  DEBUG word 30 = 30780094
-MdtRawDataProvi...  DEBUG word 31 = 8a994005
-MdtRawDataProvi...  DEBUG word 32 = 81040014
-MdtRawDataProvi...  DEBUG word 33 = 18030213
-MdtRawDataProvi...  DEBUG word 34 = 89003fff
-MdtRawDataProvi...  DEBUG word 35 = a3994153
-MdtRawDataProvi...  DEBUG word 36 = 30b401cb
-MdtRawDataProvi...  DEBUG word 37 = 30bc0213
-MdtRawDataProvi...  DEBUG word 38 = 30b00256
-MdtRawDataProvi...  DEBUG word 39 = 30b802c7
-MdtRawDataProvi...  DEBUG word 40 = 307c032d
-MdtRawDataProvi...  DEBUG word 41 = 30840397
-MdtRawDataProvi...  DEBUG word 42 = 307803e7
-MdtRawDataProvi...  DEBUG word 43 = 308003f1
-MdtRawDataProvi...  DEBUG word 44 = a6994153
-MdtRawDataProvi...  DEBUG word 45 = 30b40533
-MdtRawDataProvi...  DEBUG word 46 = 30740552
-MdtRawDataProvi...  DEBUG word 47 = 30a40588
-MdtRawDataProvi...  DEBUG word 48 = 307005cb
-MdtRawDataProvi...  DEBUG word 49 = 30a00611
-MdtRawDataProvi...  DEBUG word 50 = 30b0063b
-MdtRawDataProvi...  DEBUG word 51 = 8a994012
-MdtRawDataProvi...  DEBUG word 52 = 8104001c
-MdtRawDataProvi...  DEBUG word 53 = 18030214
-MdtRawDataProvi...  DEBUG word 54 = 8903ffff
-MdtRawDataProvi...  DEBUG word 55 = a2994153
-MdtRawDataProvi...  DEBUG word 56 = 30b0002f
-MdtRawDataProvi...  DEBUG word 57 = 3084019b
-MdtRawDataProvi...  DEBUG word 58 = 30800237
-MdtRawDataProvi...  DEBUG word 59 = 20540100
-MdtRawDataProvi...  DEBUG word 60 = a4994153
-MdtRawDataProvi...  DEBUG word 61 = 306c019f
-MdtRawDataProvi...  DEBUG word 62 = 30680214
-MdtRawDataProvi...  DEBUG word 63 = 30140429
-MdtRawDataProvi...  DEBUG word 64 = 30100474
-MdtRawDataProvi...  DEBUG word 65 = 20000ad4
-MdtRawDataProvi...  DEBUG word 66 = a5994153
-MdtRawDataProvi...  DEBUG word 67 = 30bc0362
-MdtRawDataProvi...  DEBUG word 68 = 30b80481
-MdtRawDataProvi...  DEBUG word 69 = a6994153
-MdtRawDataProvi...  DEBUG word 70 = 20004000
-MdtRawDataProvi...  DEBUG word 71 = a8994153
-MdtRawDataProvi...  DEBUG word 72 = 20000820
-MdtRawDataProvi...  DEBUG word 73 = aa994153
-MdtRawDataProvi...  DEBUG word 74 = 20000002
-MdtRawDataProvi...  DEBUG word 75 = ae994153
-MdtRawDataProvi...  DEBUG word 76 = 20000080
-MdtRawDataProvi...  DEBUG word 77 = b0994153
-MdtRawDataProvi...  DEBUG word 78 = 20000200
-MdtRawDataProvi...  DEBUG word 79 = 8a99401a
-MdtRawDataProvi...  DEBUG word 80 = 81040025
-MdtRawDataProvi...  DEBUG word 81 = 18030215
-MdtRawDataProvi...  DEBUG word 82 = 8903ffff
-MdtRawDataProvi...  DEBUG word 83 = a5994153
-MdtRawDataProvi...  DEBUG word 84 = 304c054e
-MdtRawDataProvi...  DEBUG word 85 = 304805fd
-MdtRawDataProvi...  DEBUG word 86 = a6994153
-MdtRawDataProvi...  DEBUG word 87 = 20000040
-MdtRawDataProvi...  DEBUG word 88 = a8994153
-MdtRawDataProvi...  DEBUG word 89 = 306c0098
-MdtRawDataProvi...  DEBUG word 90 = 30bc0093
-MdtRawDataProvi...  DEBUG word 91 = 308400fd
-MdtRawDataProvi...  DEBUG word 92 = 308c00fe
-MdtRawDataProvi...  DEBUG word 93 = 309400fb
-MdtRawDataProvi...  DEBUG word 94 = 309c00fd
-MdtRawDataProvi...  DEBUG word 95 = 30a400f9
-MdtRawDataProvi...  DEBUG word 96 = 30ac00fc
-MdtRawDataProvi...  DEBUG word 97 = 30b400f9
-MdtRawDataProvi...  DEBUG word 98 = 302c0185
-MdtRawDataProvi...  DEBUG word 99 = 306801a0
-MdtRawDataProvi...  DEBUG word 100 = 30800148
-MdtRawDataProvi...  DEBUG word 101 = 30880147
-MdtRawDataProvi...  DEBUG word 102 = 30900149
-MdtRawDataProvi...  DEBUG word 103 = 30980168
-MdtRawDataProvi...  DEBUG word 104 = 30a00169
-MdtRawDataProvi...  DEBUG word 105 = 30a80163
-MdtRawDataProvi...  DEBUG word 106 = 30b00161
-MdtRawDataProvi...  DEBUG word 107 = 30b801a3
-MdtRawDataProvi...  DEBUG word 108 = 30280271
-MdtRawDataProvi...  DEBUG word 109 = a9994153
-MdtRawDataProvi...  DEBUG word 110 = 301c00b6
-MdtRawDataProvi...  DEBUG word 111 = 309c00d1
-MdtRawDataProvi...  DEBUG word 112 = 301801bc
-MdtRawDataProvi...  DEBUG word 113 = 309801b9
-MdtRawDataProvi...  DEBUG word 114 = 305c01f8
-MdtRawDataProvi...  DEBUG word 115 = 305802ec
-MdtRawDataProvi...  DEBUG word 116 = 8a994023
-MdtRawDataProvi...  DEBUG word 117 = f0000076
-MdtRawDataProvi...  DEBUG Found the beginning of buffer 
-MdtRawDataProvi...  DEBUG Level 1 Id : 256404
-MdtRawDataProvi...  DEBUG Found the Beginnning of Link 
-MdtRawDataProvi...  DEBUG subdetId : 97 mrodId : 1 csmId : 0
-MdtRawDataProvi...  DEBUG getOfflineIdfromOnlineID result: 
-MdtRawDataProvi...  DEBUG Name : 0
-MdtRawDataProvi...  DEBUG Eta  : 1
-MdtRawDataProvi...  DEBUG Phi  : 2
-MdtRawDataProvi...  DEBUG Found the Beginnning of Link 
-MdtRawDataProvi...  DEBUG subdetId : 97 mrodId : 1 csmId : 1
-MdtRawDataProvi...  DEBUG getOfflineIdfromOnlineID result: 
-MdtRawDataProvi...  DEBUG Name : 0
-MdtRawDataProvi...  DEBUG Eta  : 2
-MdtRawDataProvi...  DEBUG Phi  : 2
-MdtRawDataProvi...  DEBUG  Decoding data from TDC number : 1
-MdtRawDataProvi...  DEBUG  Decoding data from TDC number : 3
-MdtRawDataProvi...  DEBUG  Decoding data from TDC number : 10
-MdtRawDataProvi...  DEBUG  Decoding data from TDC number : 11
-MdtRawDataProvi...  DEBUG Found the Beginnning of Link 
-MdtRawDataProvi...  DEBUG subdetId : 97 mrodId : 1 csmId : 2
-MdtRawDataProvi...  DEBUG getOfflineIdfromOnlineID result: 
-MdtRawDataProvi...  DEBUG Name : 2
-MdtRawDataProvi...  DEBUG Eta  : 1
-MdtRawDataProvi...  DEBUG Phi  : 2
-MdtRawDataProvi...  DEBUG  Decoding data from TDC number : 3
-MdtRawDataProvi...  DEBUG Found the Beginnning of Link 
-MdtRawDataProvi...  DEBUG subdetId : 97 mrodId : 1 csmId : 3
-MdtRawDataProvi...  DEBUG getOfflineIdfromOnlineID result: 
-MdtRawDataProvi...  DEBUG Name : 2
-MdtRawDataProvi...  DEBUG Eta  : 2
-MdtRawDataProvi...  DEBUG Phi  : 2
-MdtRawDataProvi...  DEBUG  Decoding data from TDC number : 3
-MdtRawDataProvi...  DEBUG  Decoding data from TDC number : 6
-MdtRawDataProvi...  DEBUG Found the Beginnning of Link 
-MdtRawDataProvi...  DEBUG subdetId : 97 mrodId : 1 csmId : 4
-MdtRawDataProvi...  DEBUG getOfflineIdfromOnlineID result: 
-MdtRawDataProvi...  DEBUG Name : 4
-MdtRawDataProvi...  DEBUG Eta  : 1
-MdtRawDataProvi...  DEBUG Phi  : 2
-MdtRawDataProvi...  DEBUG  Decoding data from TDC number : 2
-MdtRawDataProvi...  DEBUG Error: corresponding leading edge not found for the trailing edge tdc: 2 chan: 22
-MdtRawDataProvi...  DEBUG  Decoding data from TDC number : 4
-MdtRawDataProvi...  DEBUG  Decoding data from TDC number : 5
-MdtRawDataProvi...  DEBUG  Decoding data from TDC number : 6
-MdtRawDataProvi...  DEBUG  Decoding data from TDC number : 8
-MdtRawDataProvi...  DEBUG  Decoding data from TDC number : 10
-MdtRawDataProvi...  DEBUG  Decoding data from TDC number : 14
-MdtRawDataProvi...  DEBUG  Decoding data from TDC number : 16
-MdtRawDataProvi...  DEBUG Found the Beginnning of Link 
-MdtRawDataProvi...  DEBUG subdetId : 97 mrodId : 1 csmId : 5
-MdtRawDataProvi...  DEBUG getOfflineIdfromOnlineID result: 
-MdtRawDataProvi...  DEBUG Name : 4
-MdtRawDataProvi...  DEBUG Eta  : 2
-MdtRawDataProvi...  DEBUG Phi  : 2
-MdtRawDataProvi...  DEBUG  Decoding data from TDC number : 5
-MdtRawDataProvi...  DEBUG  Decoding data from TDC number : 6
-MdtRawDataProvi...  DEBUG  Decoding data from TDC number : 8
-MdtRawDataProvi...  DEBUG  Decoding data from TDC number : 9
-MdtRawDataProvi...  DEBUG fillCollection: starting
-MdtRawDataProvi...  DEBUG **********Decoder dumping the words******** 
-MdtRawDataProvi...  DEBUG The size of this ROD-read is 
-MdtRawDataProvi...  DEBUG word 0 = 8003e994
-MdtRawDataProvi...  DEBUG word 1 = 81040004
-MdtRawDataProvi...  DEBUG word 2 = 180300d0
-MdtRawDataProvi...  DEBUG word 3 = 890003ff
-MdtRawDataProvi...  DEBUG word 4 = 8a994002
-MdtRawDataProvi...  DEBUG word 5 = 81040004
-MdtRawDataProvi...  DEBUG word 6 = 180300d1
-MdtRawDataProvi...  DEBUG word 7 = 89000fff
-MdtRawDataProvi...  DEBUG word 8 = 8a994002
-MdtRawDataProvi...  DEBUG word 9 = 8104000e
-MdtRawDataProvi...  DEBUG word 10 = 180300d2
-MdtRawDataProvi...  DEBUG word 11 = 89000fff
-MdtRawDataProvi...  DEBUG word 12 = a0994153
-MdtRawDataProvi...  DEBUG word 13 = 30a00056
-MdtRawDataProvi...  DEBUG word 14 = 20105050
-MdtRawDataProvi...  DEBUG word 15 = a1994153
-MdtRawDataProvi...  DEBUG word 16 = 30b40578
-MdtRawDataProvi...  DEBUG word 17 = 30b0060a
-MdtRawDataProvi...  DEBUG word 18 = a8994153
-MdtRawDataProvi...  DEBUG word 19 = 20000400
-MdtRawDataProvi...  DEBUG word 20 = a9994153
-MdtRawDataProvi...  DEBUG word 21 = 307c067b
-MdtRawDataProvi...  DEBUG word 22 = 8a99400c
-MdtRawDataProvi...  DEBUG word 23 = 81040011
-MdtRawDataProvi...  DEBUG word 24 = 180300d3
-MdtRawDataProvi...  DEBUG word 25 = 89003fff
-MdtRawDataProvi...  DEBUG word 26 = a5994153
-MdtRawDataProvi...  DEBUG word 27 = 308c0359
-MdtRawDataProvi...  DEBUG word 28 = 30880397
-MdtRawDataProvi...  DEBUG word 29 = 20020000
-MdtRawDataProvi...  DEBUG word 30 = a7994153
-MdtRawDataProvi...  DEBUG word 31 = 30600040
-MdtRawDataProvi...  DEBUG word 32 = 20001000
-MdtRawDataProvi...  DEBUG word 33 = a8994153
-MdtRawDataProvi...  DEBUG word 34 = 302403a8
-MdtRawDataProvi...  DEBUG word 35 = 3020040f
-MdtRawDataProvi...  DEBUG word 36 = a9994153
-MdtRawDataProvi...  DEBUG word 37 = 309c0635
-MdtRawDataProvi...  DEBUG word 38 = 308c0671
-MdtRawDataProvi...  DEBUG word 39 = 8a99400f
-MdtRawDataProvi...  DEBUG word 40 = 81040017
-MdtRawDataProvi...  DEBUG word 41 = 180300d4
-MdtRawDataProvi...  DEBUG word 42 = 8900ffff
-MdtRawDataProvi...  DEBUG word 43 = a1994153
-MdtRawDataProvi...  DEBUG word 44 = 304c0488
-MdtRawDataProvi...  DEBUG word 45 = 308c0498
-MdtRawDataProvi...  DEBUG word 46 = 302c0500
-MdtRawDataProvi...  DEBUG word 47 = 30280581
-MdtRawDataProvi...  DEBUG word 48 = 3048052d
-MdtRawDataProvi...  DEBUG word 49 = 3088056a
-MdtRawDataProvi...  DEBUG word 50 = 301c05a2
-MdtRawDataProvi...  DEBUG word 51 = 30180610
-MdtRawDataProvi...  DEBUG word 52 = 309c0646
-MdtRawDataProvi...  DEBUG word 53 = a4994153
-MdtRawDataProvi...  DEBUG word 54 = 30640517
-MdtRawDataProvi...  DEBUG word 55 = 306005a2
-MdtRawDataProvi...  DEBUG word 56 = 302405e1
-MdtRawDataProvi...  DEBUG word 57 = 30200624
-MdtRawDataProvi...  DEBUG word 58 = a9994153
-MdtRawDataProvi...  DEBUG word 59 = 200000a0
-MdtRawDataProvi...  DEBUG word 60 = ab994153
-MdtRawDataProvi...  DEBUG word 61 = 20041100
-MdtRawDataProvi...  DEBUG word 62 = 8a994015
-MdtRawDataProvi...  DEBUG word 63 = 8104001c
-MdtRawDataProvi...  DEBUG word 64 = 180300d5
-MdtRawDataProvi...  DEBUG word 65 = 8903ffff
-MdtRawDataProvi...  DEBUG word 66 = a0994153
-MdtRawDataProvi...  DEBUG word 67 = 3014000e
-MdtRawDataProvi...  DEBUG word 68 = 30100032
-MdtRawDataProvi...  DEBUG word 69 = 30940069
-MdtRawDataProvi...  DEBUG word 70 = 3090008d
-MdtRawDataProvi...  DEBUG word 71 = 20000400
-MdtRawDataProvi...  DEBUG word 72 = a1994153
-MdtRawDataProvi...  DEBUG word 73 = 3070001a
-MdtRawDataProvi...  DEBUG word 74 = 30040377
-MdtRawDataProvi...  DEBUG word 75 = 30000398
-MdtRawDataProvi...  DEBUG word 76 = 20014001
-MdtRawDataProvi...  DEBUG word 77 = a2994153
-MdtRawDataProvi...  DEBUG word 78 = 20000020
-MdtRawDataProvi...  DEBUG word 79 = a3994153
-MdtRawDataProvi...  DEBUG word 80 = 20000040
-MdtRawDataProvi...  DEBUG word 81 = a9994153
-MdtRawDataProvi...  DEBUG word 82 = 30a40400
-MdtRawDataProvi...  DEBUG word 83 = 30a00424
-MdtRawDataProvi...  DEBUG word 84 = aa994153
-MdtRawDataProvi...  DEBUG word 85 = 20008000
-MdtRawDataProvi...  DEBUG word 86 = ab994153
-MdtRawDataProvi...  DEBUG word 87 = 20080000
-MdtRawDataProvi...  DEBUG word 88 = b0994153
-MdtRawDataProvi...  DEBUG word 89 = 20080000
-MdtRawDataProvi...  DEBUG word 90 = 8a99401a
-MdtRawDataProvi...  DEBUG word 91 = f000005c
-MdtRawDataProvi...  DEBUG Found the beginning of buffer 
-MdtRawDataProvi...  DEBUG Level 1 Id : 256404
-MdtRawDataProvi...  DEBUG Found the Beginnning of Link 
-MdtRawDataProvi...  DEBUG subdetId : 97 mrodId : 2 csmId : 0
-MdtRawDataProvi...  DEBUG getOfflineIdfromOnlineID result: 
-MdtRawDataProvi...  DEBUG Name : 0
-MdtRawDataProvi...  DEBUG Eta  : 1
-MdtRawDataProvi...  DEBUG Phi  : 3
-MdtRawDataProvi...  DEBUG Found the Beginnning of Link 
-MdtRawDataProvi...  DEBUG subdetId : 97 mrodId : 2 csmId : 1
-MdtRawDataProvi...  DEBUG getOfflineIdfromOnlineID result: 
-MdtRawDataProvi...  DEBUG Name : 0
-MdtRawDataProvi...  DEBUG Eta  : 2
-MdtRawDataProvi...  DEBUG Phi  : 3
-MdtRawDataProvi...  DEBUG Found the Beginnning of Link 
-MdtRawDataProvi...  DEBUG subdetId : 97 mrodId : 2 csmId : 2
-MdtRawDataProvi...  DEBUG getOfflineIdfromOnlineID result: 
-MdtRawDataProvi...  DEBUG Name : 2
-MdtRawDataProvi...  DEBUG Eta  : 1
-MdtRawDataProvi...  DEBUG Phi  : 3
-MdtRawDataProvi...  DEBUG  Decoding data from TDC number : 0
-MdtRawDataProvi...  DEBUG Error: corresponding leading edge not found for the trailing edge tdc: 0 chan: 20
-MdtRawDataProvi...  DEBUG  Decoding data from TDC number : 1
-MdtRawDataProvi...  DEBUG  Decoding data from TDC number : 8
-MdtRawDataProvi...  DEBUG  Decoding data from TDC number : 9
-MdtRawDataProvi...  DEBUG Found the Beginnning of Link 
-MdtRawDataProvi...  DEBUG subdetId : 97 mrodId : 2 csmId : 3
-MdtRawDataProvi...  DEBUG getOfflineIdfromOnlineID result: 
-MdtRawDataProvi...  DEBUG Name : 2
-MdtRawDataProvi...  DEBUG Eta  : 2
-MdtRawDataProvi...  DEBUG Phi  : 3
-MdtRawDataProvi...  DEBUG  Decoding data from TDC number : 5
-MdtRawDataProvi...  DEBUG  Decoding data from TDC number : 7
-MdtRawDataProvi...  DEBUG Error: corresponding leading edge not found for the trailing edge tdc: 7 chan: 12
-MdtRawDataProvi...  DEBUG  Decoding data from TDC number : 8
-MdtRawDataProvi...  DEBUG  Decoding data from TDC number : 9
-MdtRawDataProvi...  DEBUG Found the Beginnning of Link 
-MdtRawDataProvi...  DEBUG subdetId : 97 mrodId : 2 csmId : 4
-MdtRawDataProvi...  DEBUG getOfflineIdfromOnlineID result: 
-MdtRawDataProvi...  DEBUG Name : 4
-MdtRawDataProvi...  DEBUG Eta  : 1
-MdtRawDataProvi...  DEBUG Phi  : 3
-MdtRawDataProvi...  DEBUG  Decoding data from TDC number : 1
-MdtRawDataProvi...  DEBUG  Decoding data from TDC number : 4
-MdtRawDataProvi...  DEBUG  Decoding data from TDC number : 9
-MdtRawDataProvi...  DEBUG  Decoding data from TDC number : 11
-MdtRawDataProvi...  DEBUG Found the Beginnning of Link 
-MdtRawDataProvi...  DEBUG subdetId : 97 mrodId : 2 csmId : 5
-MdtRawDataProvi...  DEBUG getOfflineIdfromOnlineID result: 
-MdtRawDataProvi...  DEBUG Name : 4
-MdtRawDataProvi...  DEBUG Eta  : 2
-MdtRawDataProvi...WARNING DEBUG message limit (500) reached for MdtRawDataProvider.MDT_RawDataProviderTool.MdtROD_Decoder. Suppressing further output.
-MdtRawDataProvi...  DEBUG After processing numColls=1136
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+MdtCsmCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+CscCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+RpcCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+TgcCache'
 AthenaEventLoopMgr   INFO   ===>>>  done processing event #186525031, run #327265 1 events processed so far  <<<===
 AthenaEventLoopMgr   INFO   ===>>>  start processing event #186524665, run #327265 1 events processed so far  <<<===
-MdtRawDataProvi...VERBOSE convert(): 264 ROBFragments.
-MdtRawDataProvi...  DEBUG Created container
-MdtRawDataProvi...  DEBUG After processing numColls=1136
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+MdtCsmCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+CscCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+RpcCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+TgcCache'
 AthenaEventLoopMgr   INFO   ===>>>  done processing event #186524665, run #327265 2 events processed so far  <<<===
 AthenaEventLoopMgr   INFO   ===>>>  start processing event #186542447, run #327265 2 events processed so far  <<<===
-MdtRawDataProvi...VERBOSE convert(): 264 ROBFragments.
-MdtRawDataProvi...  DEBUG Created container
-MdtRawDataProvi...  DEBUG After processing numColls=1136
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+MdtCsmCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+CscCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+RpcCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+TgcCache'
 AthenaEventLoopMgr   INFO   ===>>>  done processing event #186542447, run #327265 3 events processed so far  <<<===
 AthenaEventLoopMgr   INFO   ===>>>  start processing event #186543405, run #327265 3 events processed so far  <<<===
-MdtRawDataProvi...VERBOSE convert(): 264 ROBFragments.
-MdtRawDataProvi...  DEBUG Created container
-MdtRawDataProvi...  DEBUG After processing numColls=1136
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+MdtCsmCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+CscCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+RpcCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+TgcCache'
 AthenaEventLoopMgr   INFO   ===>>>  done processing event #186543405, run #327265 4 events processed so far  <<<===
 AthenaEventLoopMgr   INFO   ===>>>  start processing event #186548387, run #327265 4 events processed so far  <<<===
-MdtRawDataProvi...VERBOSE convert(): 264 ROBFragments.
-MdtRawDataProvi...  DEBUG Created container
-MdtRawDataProvi...  DEBUG After processing numColls=1136
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+MdtCsmCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+CscCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+RpcCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+TgcCache'
 AthenaEventLoopMgr   INFO   ===>>>  done processing event #186548387, run #327265 5 events processed so far  <<<===
 AthenaEventLoopMgr   INFO   ===>>>  start processing event #186515186, run #327265 5 events processed so far  <<<===
-MdtRawDataProvi...VERBOSE convert(): 264 ROBFragments.
-MdtRawDataProvi...  DEBUG Created container
-MdtRawDataProvi...  DEBUG After processing numColls=1136
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+MdtCsmCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+CscCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+RpcCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+TgcCache'
 AthenaEventLoopMgr   INFO   ===>>>  done processing event #186515186, run #327265 6 events processed so far  <<<===
 AthenaEventLoopMgr   INFO   ===>>>  start processing event #186556019, run #327265 6 events processed so far  <<<===
-MdtRawDataProvi...VERBOSE convert(): 264 ROBFragments.
-MdtRawDataProvi...  DEBUG Created container
-MdtRawDataProvi...  DEBUG After processing numColls=1136
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+MdtCsmCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+CscCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+RpcCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+TgcCache'
 AthenaEventLoopMgr   INFO   ===>>>  done processing event #186556019, run #327265 7 events processed so far  <<<===
 AthenaEventLoopMgr   INFO   ===>>>  start processing event #186542866, run #327265 7 events processed so far  <<<===
-MdtRawDataProvi...VERBOSE convert(): 264 ROBFragments.
-MdtRawDataProvi...  DEBUG Created container
-MdtRawDataProvi...  DEBUG After processing numColls=1136
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+MdtCsmCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+CscCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+RpcCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+TgcCache'
 AthenaEventLoopMgr   INFO   ===>>>  done processing event #186542866, run #327265 8 events processed so far  <<<===
 AthenaEventLoopMgr   INFO   ===>>>  start processing event #186537901, run #327265 8 events processed so far  <<<===
-MdtRawDataProvi...VERBOSE convert(): 264 ROBFragments.
-MdtRawDataProvi...  DEBUG Created container
-MdtRawDataProvi...  DEBUG After processing numColls=1136
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+MdtCsmCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+CscCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+RpcCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+TgcCache'
 AthenaEventLoopMgr   INFO   ===>>>  done processing event #186537901, run #327265 9 events processed so far  <<<===
 AthenaEventLoopMgr   INFO   ===>>>  start processing event #186517811, run #327265 9 events processed so far  <<<===
-MdtRawDataProvi...VERBOSE convert(): 264 ROBFragments.
-MdtRawDataProvi...  DEBUG Created container
-MdtRawDataProvi...  DEBUG After processing numColls=1136
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+MdtCsmCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+CscCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+RpcCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+TgcCache'
 AthenaEventLoopMgr   INFO   ===>>>  done processing event #186517811, run #327265 10 events processed so far  <<<===
 AthenaEventLoopMgr   INFO   ===>>>  start processing event #186534221, run #327265 10 events processed so far  <<<===
-MdtRawDataProvi...VERBOSE convert(): 264 ROBFragments.
-MdtRawDataProvi...  DEBUG Created container
-MdtRawDataProvi...  DEBUG After processing numColls=1136
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+MdtCsmCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+CscCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+RpcCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+TgcCache'
 AthenaEventLoopMgr   INFO   ===>>>  done processing event #186534221, run #327265 11 events processed so far  <<<===
 AthenaEventLoopMgr   INFO   ===>>>  start processing event #186540986, run #327265 11 events processed so far  <<<===
-MdtRawDataProvi...VERBOSE convert(): 264 ROBFragments.
-MdtRawDataProvi...  DEBUG Created container
-MdtRawDataProvi...  DEBUG After processing numColls=1136
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+MdtCsmCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+CscCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+RpcCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+TgcCache'
 AthenaEventLoopMgr   INFO   ===>>>  done processing event #186540986, run #327265 12 events processed so far  <<<===
 AthenaEventLoopMgr   INFO   ===>>>  start processing event #186535104, run #327265 12 events processed so far  <<<===
-MdtRawDataProvi...VERBOSE convert(): 264 ROBFragments.
-MdtRawDataProvi...  DEBUG Created container
-MdtRawDataProvi...  DEBUG After processing numColls=1136
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+MdtCsmCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+CscCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+RpcCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+TgcCache'
 AthenaEventLoopMgr   INFO   ===>>>  done processing event #186535104, run #327265 13 events processed so far  <<<===
 AthenaEventLoopMgr   INFO   ===>>>  start processing event #186539903, run #327265 13 events processed so far  <<<===
-MdtRawDataProvi...VERBOSE convert(): 264 ROBFragments.
-MdtRawDataProvi...  DEBUG Created container
-MdtRawDataProvi...  DEBUG After processing numColls=1136
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+MdtCsmCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+CscCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+RpcCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+TgcCache'
 AthenaEventLoopMgr   INFO   ===>>>  done processing event #186539903, run #327265 14 events processed so far  <<<===
 AthenaEventLoopMgr   INFO   ===>>>  start processing event #186552713, run #327265 14 events processed so far  <<<===
-MdtRawDataProvi...VERBOSE convert(): 264 ROBFragments.
-MdtRawDataProvi...  DEBUG Created container
-MdtRawDataProvi...  DEBUG After processing numColls=1136
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+MdtCsmCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+CscCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+RpcCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+TgcCache'
 AthenaEventLoopMgr   INFO   ===>>>  done processing event #186552713, run #327265 15 events processed so far  <<<===
 AthenaEventLoopMgr   INFO   ===>>>  start processing event #186524730, run #327265 15 events processed so far  <<<===
-MdtRawDataProvi...VERBOSE convert(): 264 ROBFragments.
-MdtRawDataProvi...  DEBUG Created container
-MdtRawDataProvi...  DEBUG After processing numColls=1136
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+MdtCsmCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+CscCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+RpcCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+TgcCache'
 AthenaEventLoopMgr   INFO   ===>>>  done processing event #186524730, run #327265 16 events processed so far  <<<===
 AthenaEventLoopMgr   INFO   ===>>>  start processing event #186547632, run #327265 16 events processed so far  <<<===
-MdtRawDataProvi...VERBOSE convert(): 264 ROBFragments.
-MdtRawDataProvi...  DEBUG Created container
-MdtRawDataProvi...  DEBUG After processing numColls=1136
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+MdtCsmCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+CscCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+RpcCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+TgcCache'
 AthenaEventLoopMgr   INFO   ===>>>  done processing event #186547632, run #327265 17 events processed so far  <<<===
 AthenaEventLoopMgr   INFO   ===>>>  start processing event #186555621, run #327265 17 events processed so far  <<<===
-MdtRawDataProvi...VERBOSE convert(): 264 ROBFragments.
-MdtRawDataProvi...  DEBUG Created container
-MdtRawDataProvi...  DEBUG After processing numColls=1136
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+MdtCsmCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+CscCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+RpcCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+TgcCache'
 AthenaEventLoopMgr   INFO   ===>>>  done processing event #186555621, run #327265 18 events processed so far  <<<===
 AthenaEventLoopMgr   INFO   ===>>>  start processing event #186568452, run #327265 18 events processed so far  <<<===
-MdtRawDataProvi...VERBOSE convert(): 264 ROBFragments.
-MdtRawDataProvi...  DEBUG Created container
-MdtRawDataProvi...  DEBUG After processing numColls=1136
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+MdtCsmCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+CscCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+RpcCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+TgcCache'
 AthenaEventLoopMgr   INFO   ===>>>  done processing event #186568452, run #327265 19 events processed so far  <<<===
 AthenaEventLoopMgr   INFO   ===>>>  start processing event #186580451, run #327265 19 events processed so far  <<<===
-MdtRawDataProvi...VERBOSE convert(): 264 ROBFragments.
-MdtRawDataProvi...  DEBUG Created container
-MdtRawDataProvi...  DEBUG After processing numColls=1136
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+MdtCsmCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+CscCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+RpcCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+TgcCache'
 AthenaEventLoopMgr   INFO   ===>>>  done processing event #186580451, run #327265 20 events processed so far  <<<===
 Domain[ROOT_All]     INFO >   Deaccess DbDomain     READ      [ROOT_All] 
 ApplicationMgr       INFO Application Manager Stopped successfully
+IncidentProcAlg1     INFO Finalize
 CondInputLoader      INFO Finalizing CondInputLoader...
+IncidentProcAlg2     INFO Finalize
 AtlasFieldSvc        INFO finalize() successful
 EventInfoByteSt...   INFO finalize 
 IdDictDetDescrCnv    INFO in finalize
+IOVDbFolder          INFO Folder /EXT/DCS/MAGNETS/SENSORDATA (AttrListColl) db-read 1/2 objs/chan/bytes 4/4/25 ((     0.19 ))s
+IOVDbFolder          INFO Folder /GLOBAL/BField/Maps (AttrListColl) db-read 1/1 objs/chan/bytes 3/3/271 ((     0.63 ))s
+IOVDbFolder          INFO Folder /MDT/CABLING/MAP_SCHEMA (AttrListColl) db-read 1/1 objs/chan/bytes 2312/2437/216598 ((     0.81 ))s
+IOVDbFolder          INFO Folder /MDT/CABLING/MEZZANINE_SCHEMA (AttrListColl) db-read 1/1 objs/chan/bytes 24/24/300 ((     1.42 ))s
+IOVDbFolder          INFO Folder /MDT/RTBLOB (AttrListColl) db-read 0/0 objs/chan/bytes 0/1186/0 ((     0.00 ))s
+IOVDbFolder          INFO Folder /MDT/T0BLOB (AttrListColl) db-read 0/0 objs/chan/bytes 0/1186/0 ((     0.00 ))s
+IOVDbFolder          INFO Folder /RPC/CABLING/MAP_SCHEMA (AttrListColl) db-read 1/1 objs/chan/bytes 1/1/444470 ((     0.90 ))s
+IOVDbFolder          INFO Folder /RPC/CABLING/MAP_SCHEMA_CORR (AttrListColl) db-read 1/1 objs/chan/bytes 1/1/58804 ((     0.48 ))s
+IOVDbFolder          INFO Folder /RPC/TRIGGER/CM_THR_ETA (AttrListColl) db-read 1/1 objs/chan/bytes 1613/1613/7562972 ((     2.88 ))s
+IOVDbFolder          INFO Folder /RPC/TRIGGER/CM_THR_PHI (AttrListColl) db-read 1/1 objs/chan/bytes 1612/1612/8101322 ((     0.21 ))s
+IOVDbFolder          INFO Folder /TGC/CABLING/MAP_SCHEMA (AttrListColl) db-read 1/1 objs/chan/bytes 1/1/7408 ((     0.82 ))s
+IOVDbFolder          INFO Folder /CSC/FTHOLD (AttrListColl) db-read 1/1 objs/chan/bytes 32/32/331329 ((     0.69 ))s
+IOVDbFolder          INFO Folder /CSC/NOISE (AttrListColl) db-read 1/1 objs/chan/bytes 32/32/359591 ((     0.13 ))s
+IOVDbFolder          INFO Folder /CSC/PED (AttrListColl) db-read 1/1 objs/chan/bytes 32/32/422629 ((     0.85 ))s
+IOVDbFolder          INFO Folder /CSC/PSLOPE (AttrListColl) db-read 1/1 objs/chan/bytes 32/32/363009 ((     1.96 ))s
+IOVDbFolder          INFO Folder /CSC/RMS (AttrListColl) db-read 1/1 objs/chan/bytes 32/32/422831 ((     0.79 ))s
+IOVDbFolder          INFO Folder /CSC/STAT (AttrListColl) db-read 1/1 objs/chan/bytes 32/32/236289 ((     0.64 ))s
+IOVDbFolder          INFO Folder /CSC/T0BASE (AttrListColl) db-read 1/1 objs/chan/bytes 32/32/322855 ((     0.13 ))s
+IOVDbFolder          INFO Folder /CSC/T0PHASE (AttrListColl) db-read 1/1 objs/chan/bytes 32/32/3234 ((     0.80 ))s
+IOVDbSvc             INFO  bytes in ((     14.33 ))s
+IOVDbSvc             INFO Connection sqlite://;schema=mycool.db;dbname=CONDBR2 : nConnect: 0 nFolders: 0 ReadTime: ((     0.00 ))s
+IOVDbSvc             INFO Connection COOLONL_MDT/CONDBR2 : nConnect: 2 nFolders: 2 ReadTime: ((     2.22 ))s
+IOVDbSvc             INFO Connection COOLONL_RPC/CONDBR2 : nConnect: 2 nFolders: 4 ReadTime: ((     4.47 ))s
+IOVDbSvc             INFO Connection COOLOFL_MDT/CONDBR2 : nConnect: 1 nFolders: 2 ReadTime: ((     0.00 ))s
+IOVDbSvc             INFO Connection COOLOFL_CSC/CONDBR2 : nConnect: 2 nFolders: 8 ReadTime: ((     5.99 ))s
+IOVDbSvc             INFO Connection COOLONL_GLOBAL/CONDBR2 : nConnect: 2 nFolders: 1 ReadTime: ((     0.63 ))s
+IOVDbSvc             INFO Connection COOLONL_TGC/CONDBR2 : nConnect: 2 nFolders: 1 ReadTime: ((     0.82 ))s
+IOVDbSvc             INFO Connection COOLOFL_DCS/CONDBR2 : nConnect: 2 nFolders: 1 ReadTime: ((     0.19 ))s
 AthDictLoaderSvc     INFO in finalize...
 ToolSvc              INFO Removing all tools created by ToolSvc
 ToolSvc.ByteStr...   INFO in finalize()
@@ -2714,11 +2803,10 @@ ToolSvc.TGCCabl...   INFO finalize
 *****Chrono*****     INFO ****************************************************************************************************
 *****Chrono*****     INFO  The Final CPU consumption ( Chrono ) Table (ordered)
 *****Chrono*****     INFO ****************************************************************************************************
+cObj_ALL             INFO Time User   : Tot=    0 [us] Ave/Min/Max=    0(+-    0)/    0/    0 [us] #= 18
+ChronoStatSvc        INFO Time User   : Tot= 10.8  [s]                                             #=  1
 *****Chrono*****     INFO ****************************************************************************************************
 ChronoStatSvc.f...   INFO  Service finalized successfully 
 ApplicationMgr       INFO Application Manager Finalized successfully
 ApplicationMgr       INFO Application Manager Terminated successfully
-Listing sources of suppressed message: 
- Message Source              |   Level |    Count
- MdtRawDataProvider.MDT_RawDataProviderTool.MdtROD_Decoder|   DEBUG |   854603
 Py:Athena            INFO leaving with code 0: "successful run"
diff --git a/MuonSpectrometer/MuonConfig/share/MuonDataDecodeTest_Cache.ref b/MuonSpectrometer/MuonConfig/share/MuonDataDecodeTest_Cache.ref
new file mode 100644
index 0000000000000000000000000000000000000000..a89f1a706c65bbaa88edac63959adf9f6585205c
--- /dev/null
+++ b/MuonSpectrometer/MuonConfig/share/MuonDataDecodeTest_Cache.ref
@@ -0,0 +1,4011 @@
+Py:Athena            INFO using release [WorkDir-22.0.1] [x86_64-slc6-gcc8-opt] [atlas-work3/5f61275c16] -- built on [2019-01-25T1856]
+Flag Name                                : Value
+Beam.BunchSpacing                        : 25
+Beam.Energy                              : [function]
+Beam.NumberOfCollisions                  : 0
+Beam.Type                                : 'collisions'
+Beam.estimatedLuminosity                 : [function]
+Calo.Noise.fixedLumiForNoise             : -1
+Calo.Noise.useCaloNoiseLumi              : True
+Calo.TopoCluster.doTreatEnergyCutAsAbsol : False
+Calo.TopoCluster.doTwoGaussianNoise      : True
+Common.isOnline                          : False
+Concurrency.NumConcurrentEvents          : 0
+Concurrency.NumProcs                     : 0
+Concurrency.NumThreads                   : 0
+DQ.DataType                              : [function]
+DQ.Environment                           : [function]
+DQ.FileKey                               : 'CombinedMonitoring'
+DQ.disableAtlasReadyFilter               : False
+DQ.doGlobalMon                           : True
+DQ.doMonitoring                          : True
+DQ.doStreamAwareMon                      : True
+GeoModel.AtlasVersion                    : 'ATLAS-R2-2016-01-00-01'
+GeoModel.Layout                          : 'atlas'
+IOVDb.DatabaseInstance                   : [function]
+IOVDb.GlobalTag                          : 'CONDBR2-BLKPA-2018-13'
+Input.Files                              : ['/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data17_13TeV.00327265.physics_EnhancedBias.merge.RAW._lb0100._SFO-1._0001.1']
+Input.ProjectName                        : [function]
+Input.RunNumber                          : [function]
+Input.isMC                               : [function]
+LAr.RawChannelSource                     : [function]
+LAr.doAlign                              : [function]
+LAr.doCellEmMisCalib                     : [function]
+LAr.doCellNoiseMasking                   : True
+LAr.doCellSporadicNoiseMasking           : True
+LAr.doHVCorr                             : [function]
+Muon.Align.UseALines                     : False
+Muon.Align.UseAsBuilt                    : False
+Muon.Align.UseBLines                     : 'none'
+Muon.Align.UseILines                     : False
+Muon.Calib.CscF001FromLocalFile          : False
+Muon.Calib.CscNoiseFromLocalFile         : False
+Muon.Calib.CscPSlopeFromLocalFile        : False
+Muon.Calib.CscPedFromLocalFile           : False
+Muon.Calib.CscRmsFromLocalFile           : False
+Muon.Calib.CscStatusFromLocalFile        : False
+Muon.Calib.CscT0BaseFromLocalFile        : False
+Muon.Calib.CscT0PhaseFromLocalFile       : False
+Muon.Calib.EventTag                      : 'MoMu'
+Muon.Calib.applyRtScaling                : True
+Muon.Calib.correctMdtRtForBField         : False
+Muon.Calib.correctMdtRtForTimeSlewing    : False
+Muon.Calib.correctMdtRtWireSag           : False
+Muon.Calib.mdtCalibrationSource          : 'MDT'
+Muon.Calib.mdtMode                       : 'ntuple'
+Muon.Calib.mdtPropagationSpeedBeta       : 0.85
+Muon.Calib.readMDTCalibFromBlob          : True
+Muon.Calib.useMLRt                       : True
+Muon.Chi2NDofCut                         : 20.0
+Muon.createTrackParticles                : True
+Muon.doCSCs                              : True
+Muon.doDigitization                      : True
+Muon.doFastDigitization                  : False
+Muon.doMDTs                              : True
+Muon.doMSVertex                          : False
+Muon.doMicromegas                        : False
+Muon.doPseudoTracking                    : False
+Muon.doRPCClusterSegmentFinding          : False
+Muon.doRPCs                              : True
+Muon.doSegmentT0Fit                      : False
+Muon.doTGCClusterSegmentFinding          : False
+Muon.doTGCs                              : True
+Muon.dosTGCs                             : False
+Muon.enableCurvedSegmentFinding          : False
+Muon.enableErrorTuning                   : False
+Muon.optimiseMomentumResolutionUsingChi2 : False
+Muon.patternsOnly                        : False
+Muon.prdToxAOD                           : False
+Muon.printSummary                        : False
+Muon.refinementTool                      : 'Moore'
+Muon.rpcRawToxAOD                        : False
+Muon.segmentOrigin                       : 'Muon'
+Muon.straightLineFitMomentum             : 2000.0
+Muon.strategy                            : []
+Muon.trackBuilder                        : 'Moore'
+Muon.updateSegmentSecondCoordinate       : [function]
+Muon.useAlignmentCorrections             : False
+Muon.useLooseErrorTuning                 : False
+Muon.useSegmentMatching                  : [function]
+Muon.useTGCPriorNextBC                   : False
+Muon.useTrackSegmentMatching             : True
+Muon.useWireSagCorrections               : False
+Output.AODFileName                       : 'myAOD.pool.root'
+Output.ESDFileName                       : 'myESD.pool.root'
+Output.HISTFileName                      : 'myHIST.root'
+Output.HITFileName                       : 'myHIT.pool.root'
+Output.RDOFileName                       : 'myROD.pool.root'
+Output.doESD                             : False
+Scheduler.CheckDependencies              : True
+Scheduler.ShowControlFlow                : False
+Scheduler.ShowDataDeps                   : False
+Scheduler.ShowDataFlow                   : False
+Trigger.AODEDMSet                        : []
+Trigger.EDMDecodingVersion               : 2
+Trigger.ESDEDMSet                        : []
+Trigger.L1.CTPVersion                    : 4
+Trigger.L1.doBcm                         : True
+Trigger.L1.doMuons                       : True
+Trigger.L1Decoder.forceEnableAllChains   : False
+Trigger.LVL1ConfigFile                   : [function]
+Trigger.LVL1TopoConfigFile               : [function]
+Trigger.OnlineCondTag                    : 'CONDBR2-HLTP-2016-01'
+Trigger.OnlineGeoTag                     : 'ATLAS-R2-2015-04-00-00'
+Trigger.calo.doOffsetCorrection          : True
+Trigger.dataTakingConditions             : 'FullTrigger'
+Trigger.doHLT                            : True
+Trigger.doL1Topo                         : True
+Trigger.doLVL1                           : [function]
+Trigger.doTriggerConfigOnly              : False
+Trigger.doTruth                          : False
+Trigger.egamma.calibMVAVersiona          : [function]
+Trigger.egamma.clusterCorrectionVersion  : [function]
+Trigger.egamma.pidVersion                : [function]
+Trigger.generateLVL1Config               : False
+Trigger.generateLVL1TopoConfig           : False
+Trigger.menu.combined                    : []
+Trigger.menu.electron                    : []
+Trigger.menu.muon                        : []
+Trigger.menu.photon                      : []
+Trigger.menuVersion                      : [function]
+Trigger.muon.doEFRoIDrivenAccess         : False
+Trigger.run2Config                       : '2018'
+Trigger.triggerConfig                    : 'MCRECO:DEFAULT'
+Trigger.triggerMenuSetup                 : 'MC_pp_v7_tight_mc_prescale'
+Trigger.triggerUseFrontier               : False
+Trigger.useL1CaloCalibration             : False
+Trigger.useRun1CaloEnergyScale           : False
+Trigger.writeBS                          : False
+Trigger.writeL1TopoValData               : True
+Py:Athena            INFO About to setup Rpc Raw data decoding
+Py:ComponentAccumulator   DEBUG Adding component EventSelectorByteStream/EventSelector to the job
+Py:ComponentAccumulator   DEBUG Adding component ByteStreamEventStorageInputSvc/ByteStreamInputSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component EvtPersistencySvc/EventPersistencySvc to the job
+Py:ComponentAccumulator   DEBUG Adding component ByteStreamCnvSvc/ByteStreamCnvSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component ROBDataProviderSvc/ROBDataProviderSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component ByteStreamAddressProviderSvc/ByteStreamAddressProviderSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component IOVDbMetaDataTool/IOVDbMetaDataTool to the job
+Py:ComponentAccumulator   DEBUG Adding component ByteStreamMetadataTool/ByteStreamMetadataTool to the job
+Py:ComponentAccumulator   DEBUG Adding component StoreGateSvc/MetaDataStore to the job
+Py:ComponentAccumulator   DEBUG Adding component StoreGateSvc/InputMetaDataStore to the job
+Py:ComponentAccumulator   DEBUG Adding component MetaDataSvc/MetaDataSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component ByteStreamAttListMetadataSvc/ByteStreamAttListMetadataSvc to the job
+Py:Athena            INFO Obtaining metadata of auto-configuration by peeking into /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data17_13TeV.00327265.physics_EnhancedBias.merge.RAW._lb0100._SFO-1._0001.1
+Py:ComponentAccumulator   DEBUG Adding component EventSelectorByteStream/EventSelector to the job
+Py:ComponentAccumulator   DEBUG Adding component ByteStreamEventStorageInputSvc/ByteStreamInputSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component EvtPersistencySvc/EventPersistencySvc to the job
+Py:ComponentAccumulator   DEBUG Adding component ByteStreamCnvSvc/ByteStreamCnvSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component ROBDataProviderSvc/ROBDataProviderSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component ByteStreamAddressProviderSvc/ByteStreamAddressProviderSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component StoreGateSvc/MetaDataStore to the job
+Py:ComponentAccumulator   DEBUG Adding component StoreGateSvc/InputMetaDataStore to the job
+Py:ComponentAccumulator   DEBUG Adding component MetaDataSvc/MetaDataSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component ByteStreamAttListMetadataSvc/ByteStreamAttListMetadataSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component IOVDbMetaDataTool/IOVDbMetaDataTool to the job
+Py:ComponentAccumulator   DEBUG Adding component ByteStreamMetadataTool/ByteStreamMetadataTool to the job
+Py:ComponentAccumulator   DEBUG   Merging algorithm MuonCacheCreator to a sequence AthAlgSeq
+Py:ComponentAccumulator   DEBUG Adding component GeoModelSvc/GeoModelSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component DetDescrCnvSvc/DetDescrCnvSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component EvtPersistencySvc/EventPersistencySvc to the job
+Py:ComponentAccumulator   DEBUG Adding component TagInfoMgr/TagInfoMgr to the job
+Py:ComponentAccumulator   DEBUG Adding component EvtPersistencySvc/EventPersistencySvc to the job
+Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component TagInfoMgr/TagInfoMgr to the job
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component TagInfoMgr
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component EventPersistencySvc
+Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component GeoModelSvc/GeoModelSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component DetDescrCnvSvc/DetDescrCnvSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component EvtPersistencySvc/EventPersistencySvc to the job
+Py:ComponentAccumulator   DEBUG Adding component TagInfoMgr/TagInfoMgr to the job
+Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component GeoModelSvc
+Py:ComponentAccumulator   DEBUG Adding component Muon::MuonIdHelperTool/Muon::MuonIdHelperTool to the job
+Py:ComponentAccumulator   DEBUG Adding component GeoModelSvc/GeoModelSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component DetDescrCnvSvc/DetDescrCnvSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component EvtPersistencySvc/EventPersistencySvc to the job
+Py:ComponentAccumulator   DEBUG Adding component TagInfoMgr/TagInfoMgr to the job
+Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component Muon::MuonIdHelperTool/Muon::MuonIdHelperTool to the job
+Py:ComponentAccumulator   DEBUG Adding component RPCcablingServerSvc/RPCcablingServerSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component CondInputLoader/CondInputLoader to the job
+Py:ComponentAccumulator   DEBUG Adding component IOVDbSvc/IOVDbSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component PoolSvc/PoolSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component CondSvc/CondSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component DBReplicaSvc/DBReplicaSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component CondInputLoader/CondInputLoader to the job
+Py:ComponentAccumulator   DEBUG Adding component IOVDbSvc/IOVDbSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component PoolSvc/PoolSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component CondSvc/CondSvc to the job
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component ProxyProviderSvc
+Py:ComponentAccumulator   DEBUG Adding component DBReplicaSvc/DBReplicaSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component RPCCablingDbTool/RPCCablingDbTool to the job
+Py:ComponentAccumulator   DEBUG Adding component MuonRPC_CablingSvc/MuonRPC_CablingSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component CondInputLoader/CondInputLoader to the job
+Py:ComponentAccumulator   DEBUG Adding component GeoModelSvc/GeoModelSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component DetDescrCnvSvc/DetDescrCnvSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component EvtPersistencySvc/EventPersistencySvc to the job
+Py:ComponentAccumulator   DEBUG Adding component TagInfoMgr/TagInfoMgr to the job
+Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component RPCcablingServerSvc/RPCcablingServerSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component IOVDbSvc/IOVDbSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component PoolSvc/PoolSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component CondSvc/CondSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component DBReplicaSvc/DBReplicaSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component MuonRPC_CablingSvc/MuonRPC_CablingSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component Muon::MuonIdHelperTool/Muon::MuonIdHelperTool to the job
+Py:ComponentAccumulator   DEBUG Adding component RPCCablingDbTool/RPCCablingDbTool to the job
+Py:ComponentAccumulator   DEBUG Adding component GeoModelSvc/GeoModelSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component DetDescrCnvSvc/DetDescrCnvSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component EvtPersistencySvc/EventPersistencySvc to the job
+Py:ComponentAccumulator   DEBUG Adding component TagInfoMgr/TagInfoMgr to the job
+Py:ComponentAccumulator   DEBUG Adding component EvtPersistencySvc/EventPersistencySvc to the job
+Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component TagInfoMgr/TagInfoMgr to the job
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component TagInfoMgr
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component EventPersistencySvc
+Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component GeoModelSvc/GeoModelSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component DetDescrCnvSvc/DetDescrCnvSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component EvtPersistencySvc/EventPersistencySvc to the job
+Py:ComponentAccumulator   DEBUG Adding component TagInfoMgr/TagInfoMgr to the job
+Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component GeoModelSvc
+Py:ComponentAccumulator   DEBUG Adding component Muon::MuonIdHelperTool/Muon::MuonIdHelperTool to the job
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component GeoModelSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component DetDescrCnvSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component EventPersistencySvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component TagInfoMgr
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component ProxyProviderSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component ToolSvc.Muon::MuonIdHelperTool
+Py:ComponentAccumulator   DEBUG Adding component ROBDataProviderSvc/ROBDataProviderSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component Muon::RPC_RawDataProviderTool/RPC_RawDataProviderTool to the job
+Py:ComponentAccumulator   DEBUG Adding component CondInputLoader/CondInputLoader to the job
+Py:ComponentAccumulator   DEBUG Adding component GeoModelSvc/GeoModelSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component DetDescrCnvSvc/DetDescrCnvSvc to the job
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component EventPersistencySvc
+Py:ComponentAccumulator   DEBUG Adding component TagInfoMgr/TagInfoMgr to the job
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component ProxyProviderSvc
+Py:ComponentAccumulator   DEBUG Adding component RPCcablingServerSvc/RPCcablingServerSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component IOVDbSvc/IOVDbSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component PoolSvc/PoolSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component CondSvc/CondSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component DBReplicaSvc/DBReplicaSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component MuonRPC_CablingSvc/MuonRPC_CablingSvc to the job
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component ROBDataProviderSvc
+Py:ComponentAccumulator   DEBUG Adding component Muon::MuonIdHelperTool/Muon::MuonIdHelperTool to the job
+Py:ComponentAccumulator   DEBUG Adding component RPCCablingDbTool/RPCCablingDbTool to the job
+Py:ComponentAccumulator   DEBUG Adding component Muon::RPC_RawDataProviderTool/RPC_RawDataProviderTool to the job
+Py:ComponentAccumulator   DEBUG Adding component GeoModelSvc/GeoModelSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component DetDescrCnvSvc/DetDescrCnvSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component EvtPersistencySvc/EventPersistencySvc to the job
+Py:ComponentAccumulator   DEBUG Adding component TagInfoMgr/TagInfoMgr to the job
+Py:ComponentAccumulator   DEBUG Adding component EvtPersistencySvc/EventPersistencySvc to the job
+Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component TagInfoMgr/TagInfoMgr to the job
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component TagInfoMgr
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component EventPersistencySvc
+Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component GeoModelSvc/GeoModelSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component DetDescrCnvSvc/DetDescrCnvSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component EvtPersistencySvc/EventPersistencySvc to the job
+Py:ComponentAccumulator   DEBUG Adding component TagInfoMgr/TagInfoMgr to the job
+Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component GeoModelSvc
+Py:ComponentAccumulator   DEBUG Adding component Muon::MuonIdHelperTool/Muon::MuonIdHelperTool to the job
+Py:ComponentAccumulator   DEBUG Adding component GeoModelSvc/GeoModelSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component DetDescrCnvSvc/DetDescrCnvSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component EvtPersistencySvc/EventPersistencySvc to the job
+Py:ComponentAccumulator   DEBUG Adding component TagInfoMgr/TagInfoMgr to the job
+Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component Muon::MuonIdHelperTool/Muon::MuonIdHelperTool to the job
+Py:ComponentAccumulator   DEBUG Adding component LVL1TGC::TGCRecRoiSvc/LVL1TGC::TGCRecRoiSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component TGCcablingServerSvc/TGCcablingServerSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component CondInputLoader/CondInputLoader to the job
+Py:ComponentAccumulator   DEBUG Adding component IOVDbSvc/IOVDbSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component PoolSvc/PoolSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component CondSvc/CondSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component DBReplicaSvc/DBReplicaSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component CondInputLoader/CondInputLoader to the job
+Py:ComponentAccumulator   DEBUG Adding component IOVDbSvc/IOVDbSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component PoolSvc/PoolSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component CondSvc/CondSvc to the job
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component ProxyProviderSvc
+Py:ComponentAccumulator   DEBUG Adding component DBReplicaSvc/DBReplicaSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component CondInputLoader/CondInputLoader to the job
+Py:ComponentAccumulator   DEBUG Adding component GeoModelSvc/GeoModelSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component DetDescrCnvSvc/DetDescrCnvSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component EvtPersistencySvc/EventPersistencySvc to the job
+Py:ComponentAccumulator   DEBUG Adding component TagInfoMgr/TagInfoMgr to the job
+Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component LVL1TGC::TGCRecRoiSvc/LVL1TGC::TGCRecRoiSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component TGCcablingServerSvc/TGCcablingServerSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component IOVDbSvc/IOVDbSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component PoolSvc/PoolSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component CondSvc/CondSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component DBReplicaSvc/DBReplicaSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component Muon::MuonIdHelperTool/Muon::MuonIdHelperTool to the job
+Py:ComponentAccumulator   DEBUG Adding component GeoModelSvc/GeoModelSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component DetDescrCnvSvc/DetDescrCnvSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component EvtPersistencySvc/EventPersistencySvc to the job
+Py:ComponentAccumulator   DEBUG Adding component TagInfoMgr/TagInfoMgr to the job
+Py:ComponentAccumulator   DEBUG Adding component EvtPersistencySvc/EventPersistencySvc to the job
+Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component TagInfoMgr/TagInfoMgr to the job
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component TagInfoMgr
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component EventPersistencySvc
+Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component GeoModelSvc/GeoModelSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component DetDescrCnvSvc/DetDescrCnvSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component EvtPersistencySvc/EventPersistencySvc to the job
+Py:ComponentAccumulator   DEBUG Adding component TagInfoMgr/TagInfoMgr to the job
+Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component GeoModelSvc
+Py:ComponentAccumulator   DEBUG Adding component Muon::MuonIdHelperTool/Muon::MuonIdHelperTool to the job
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component GeoModelSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component DetDescrCnvSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component EventPersistencySvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component TagInfoMgr
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component ProxyProviderSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component ToolSvc.Muon::MuonIdHelperTool
+Py:ComponentAccumulator   DEBUG Adding component ROBDataProviderSvc/ROBDataProviderSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component Muon::TGC_RawDataProviderTool/TGC_RawDataProviderTool to the job
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component CondInputLoader
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component GeoModelSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component DetDescrCnvSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component EventPersistencySvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component TagInfoMgr
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component ProxyProviderSvc
+Py:ComponentAccumulator   DEBUG Adding component LVL1TGC::TGCRecRoiSvc/LVL1TGC::TGCRecRoiSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component TGCcablingServerSvc/TGCcablingServerSvc to the job
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component IOVDbSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component PoolSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component CondSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component DBReplicaSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component ROBDataProviderSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component ToolSvc.Muon::MuonIdHelperTool
+Py:ComponentAccumulator   DEBUG Adding component Muon::TGC_RawDataProviderTool/TGC_RawDataProviderTool to the job
+Py:ComponentAccumulator   DEBUG Adding component GeoModelSvc/GeoModelSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component DetDescrCnvSvc/DetDescrCnvSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component EvtPersistencySvc/EventPersistencySvc to the job
+Py:ComponentAccumulator   DEBUG Adding component TagInfoMgr/TagInfoMgr to the job
+Py:ComponentAccumulator   DEBUG Adding component EvtPersistencySvc/EventPersistencySvc to the job
+Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component TagInfoMgr/TagInfoMgr to the job
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component TagInfoMgr
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component EventPersistencySvc
+Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component GeoModelSvc/GeoModelSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component DetDescrCnvSvc/DetDescrCnvSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component EvtPersistencySvc/EventPersistencySvc to the job
+Py:ComponentAccumulator   DEBUG Adding component TagInfoMgr/TagInfoMgr to the job
+Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component GeoModelSvc
+Py:ComponentAccumulator   DEBUG Adding component Muon::MuonIdHelperTool/Muon::MuonIdHelperTool to the job
+Py:ComponentAccumulator   DEBUG Adding component GeoModelSvc/GeoModelSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component DetDescrCnvSvc/DetDescrCnvSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component EvtPersistencySvc/EventPersistencySvc to the job
+Py:ComponentAccumulator   DEBUG Adding component TagInfoMgr/TagInfoMgr to the job
+Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component Muon::MuonIdHelperTool/Muon::MuonIdHelperTool to the job
+Py:ComponentAccumulator   DEBUG Adding component CondInputLoader/CondInputLoader to the job
+Py:ComponentAccumulator   DEBUG Adding component IOVDbSvc/IOVDbSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component PoolSvc/PoolSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component CondSvc/CondSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component DBReplicaSvc/DBReplicaSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component AthenaPoolCnvSvc/AthenaPoolCnvSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component EvtPersistencySvc/EventPersistencySvc to the job
+Py:ComponentAccumulator   DEBUG Adding component CondInputLoader/CondInputLoader to the job
+Py:ComponentAccumulator   DEBUG Adding component IOVDbSvc/IOVDbSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component PoolSvc/PoolSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component CondSvc/CondSvc to the job
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component ProxyProviderSvc
+Py:ComponentAccumulator   DEBUG Adding component DBReplicaSvc/DBReplicaSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component AthenaPoolCnvSvc/AthenaPoolCnvSvc to the job
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component EventPersistencySvc
+Py:ComponentAccumulator   DEBUG Adding component MuonMDT_CablingAlg/MuonMDT_CablingAlg to the job
+Py:ComponentAccumulator   DEBUG Adding component MDTCablingDbTool/MDTCablingDbTool to the job
+Py:ComponentAccumulator   DEBUG Adding component MuonMDT_CablingSvc/MuonMDT_CablingSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component CondInputLoader/CondInputLoader to the job
+Py:ComponentAccumulator   DEBUG Adding component MuonMDT_CablingAlg/MuonMDT_CablingAlg to the job
+Py:ComponentAccumulator   DEBUG Adding component GeoModelSvc/GeoModelSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component DetDescrCnvSvc/DetDescrCnvSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component EvtPersistencySvc/EventPersistencySvc to the job
+Py:ComponentAccumulator   DEBUG Adding component TagInfoMgr/TagInfoMgr to the job
+Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component IOVDbSvc/IOVDbSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component PoolSvc/PoolSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component CondSvc/CondSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component DBReplicaSvc/DBReplicaSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component AthenaPoolCnvSvc/AthenaPoolCnvSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component MuonMDT_CablingSvc/MuonMDT_CablingSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component Muon::MuonIdHelperTool/Muon::MuonIdHelperTool to the job
+Py:ComponentAccumulator   DEBUG Adding component MDTCablingDbTool/MDTCablingDbTool to the job
+Py:Athena            INFO Importing MuonCnvExample.MuonCnvUtils
+Py:Athena            INFO Importing MagFieldServices.MagFieldServicesConfig
+Py:ComponentAccumulator   DEBUG Adding component CondInputLoader/CondInputLoader to the job
+Py:ComponentAccumulator   DEBUG Adding component IOVDbSvc/IOVDbSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component PoolSvc/PoolSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component CondSvc/CondSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component DBReplicaSvc/DBReplicaSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component CondInputLoader/CondInputLoader to the job
+Py:ComponentAccumulator   DEBUG Adding component IOVDbSvc/IOVDbSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component PoolSvc/PoolSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component CondSvc/CondSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component DBReplicaSvc/DBReplicaSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component CondInputLoader/CondInputLoader to the job
+Py:ComponentAccumulator   DEBUG Adding component IOVDbSvc/IOVDbSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component PoolSvc/PoolSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component CondSvc/CondSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component DBReplicaSvc/DBReplicaSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component AthenaPoolCnvSvc/AthenaPoolCnvSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component EvtPersistencySvc/EventPersistencySvc to the job
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component CondInputLoader
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component IOVDbSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component PoolSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component CondSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component ProxyProviderSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component DBReplicaSvc
+Py:ComponentAccumulator   DEBUG Adding component AthenaPoolCnvSvc/AthenaPoolCnvSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component EvtPersistencySvc/EventPersistencySvc to the job
+Py:ComponentAccumulator   DEBUG Adding component MagField::AtlasFieldSvc/AtlasFieldSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component CondInputLoader/CondInputLoader to the job
+Py:ComponentAccumulator   DEBUG Adding component IOVDbSvc/IOVDbSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component PoolSvc/PoolSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component CondSvc/CondSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component DBReplicaSvc/DBReplicaSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component AthenaPoolCnvSvc/AthenaPoolCnvSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component EvtPersistencySvc/EventPersistencySvc to the job
+Py:ComponentAccumulator   DEBUG Adding component MagField::AtlasFieldSvc/AtlasFieldSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component CondInputLoader/CondInputLoader to the job
+Py:ComponentAccumulator   DEBUG Adding component IOVDbSvc/IOVDbSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component PoolSvc/PoolSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component CondSvc/CondSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component DBReplicaSvc/DBReplicaSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component CondInputLoader/CondInputLoader to the job
+Py:ComponentAccumulator   DEBUG Adding component IOVDbSvc/IOVDbSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component PoolSvc/PoolSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component CondSvc/CondSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component DBReplicaSvc/DBReplicaSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component CondInputLoader/CondInputLoader to the job
+Py:ComponentAccumulator   DEBUG Adding component IOVDbSvc/IOVDbSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component PoolSvc/PoolSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component CondSvc/CondSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component DBReplicaSvc/DBReplicaSvc to the job
+Py:IOVDbSvc.CondDB   DEBUG Loading basic services for CondDBSetup...
+Py:ConfigurableDb   DEBUG loading confDb files...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libGaudiHive.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libStoreGate.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libGaudiCommonSvc.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libprofhelp.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libCaloTools.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libAthExHelloWorld.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libAthExHive.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libIOVDbSvc.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libPixelConditionsServices.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libLArMonTools.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libMdtRawDataMonitoring.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libEventUtils.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libxAODBTaggingEfficiency.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libRecBackgroundAlgs.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libCaloClusterMatching.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libCaloRingerTools.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libParticlesInConeTools.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libTrackToCalo.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libTrackToVertex.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libISF_Geant4Tools.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libTrkExStraightLineIntersector.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libTrigTauMonitoring.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libCaloCellCorrection.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libCaloCondPhysAlgs.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libCaloUtils.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libAthViewsAlgs.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libZdcAnalysis.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libAthViewsDFlow.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libInDetPhysValMonitoring.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libLArRecUtils.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libLArCafJobs.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libMuonPhysValMonitoring.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libDerivationFrameworkExamples.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libDerivationFrameworkTools.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libElectronPhotonTagTools.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libJetMissingEtTagTools.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libMissingEtDQA.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libMuonMomentumCorrections.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libMuonResonanceTools.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libMuonSelectorTools.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libMuonTagTools.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libRingerSelectorTools.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libTauAnalysisTools.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libLongLivedParticleDPDMaker.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libTauTagTools.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libDiTauRec.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libMETUtilities.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libMuonCombinedBaseTools.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libegammaPerformance.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libFastCaloSim.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libTileCalibAlgs.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libTileMonitoring.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libTileRec.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libTileRecAlgs.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libTileRecUtils.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libTrigEgammaEmulationTool.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libTrigConfigSvc.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libFTK_RecTools.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libTrigMissingETHypo.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libTileSimAlgs.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libTBRec.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libCaloRec.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libZdcRec.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libDataQualityTools.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libLArCellRec.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libMuonTrackMonitoring.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libDerivationFrameworkJetEtMiss.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libEventTagAlgs.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libIsolationTool.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/WorkDir.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libTrigEgammaAnalysisTools.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libJetSubStructureMomentTools.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc8-opt/x86_64-slc6-gcc8-opt/lib/libJetTagTools.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-24T2342/GAUDI/22.0.1/InstallArea/x86_64-slc6-gcc8-opt/lib/Gaudi.confdb]...
+Py:ConfigurableDb   DEBUG 	-loading [/cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-24T2342/Athena/22.0.1/InstallArea/x86_64-slc6-gcc8-opt/lib/Athena.confdb]...
+Py:ConfigurableDb   DEBUG loading confDb files... [DONE]
+Py:ConfigurableDb   DEBUG loaded 1101 confDb packages
+Py:ConfigurableDb    INFO Read module info for 5454 configurables from 75 genConfDb files
+Py:ConfigurableDb    INFO No duplicates have been found: that's good !
+Py:ConfigurableDb   DEBUG : Found configurable <class 'GaudiCoreSvc.GaudiCoreSvcConf.MessageSvc'> in module GaudiCoreSvc.GaudiCoreSvcConf
+Py:loadBasicAthenaPool   DEBUG Loading basic services for AthenaPool...
+Py:ConfigurableDb   DEBUG : Found configurable <class 'PoolSvc.PoolSvcConf.PoolSvc'> in module PoolSvc.PoolSvcConf
+Py:ConfigurableDb   DEBUG : Found configurable <class 'AthenaPoolCnvSvc.AthenaPoolCnvSvcConf.AthenaPoolCnvSvc'> in module AthenaPoolCnvSvc.AthenaPoolCnvSvcConf
+Py:ConfigurableDb   DEBUG : Found configurable <class 'SGComps.SGCompsConf.ProxyProviderSvc'> in module SGComps.SGCompsConf
+Py:ConfigurableDb   DEBUG : Found configurable <class 'AthenaServices.AthenaServicesConf.MetaDataSvc'> in module AthenaServices.AthenaServicesConf
+Py:ConfigurableDb   DEBUG : Found configurable <class 'StoreGate.StoreGateConf.StoreGateSvc'> in module StoreGate.StoreGateConf
+Py:loadBasicAthenaPool   DEBUG Loading basic services for AthenaPool... [DONE]
+Py:loadBasicIOVDb   DEBUG Loading basic services for IOVDbSvc...
+Py:ConfigurableDb   DEBUG : Found configurable <class 'SGComps.SGCompsConf.ProxyProviderSvc'> in module SGComps.SGCompsConf
+Py:Configurable     ERROR attempt to add a duplicate (ServiceManager.ProxyProviderSvc) ... dupe ignored
+Py:loadBasicEventInfoMgt   DEBUG Loading basic services for EventInfoMgt...
+EventInfoMgtInit: Got release version  Athena-22.0.1
+Py:Configurable     ERROR attempt to add a duplicate (ServiceManager.EventPersistencySvc) ... dupe ignored
+Py:ConfigurableDb   DEBUG : Found configurable <class 'SGComps.SGCompsConf.ProxyProviderSvc'> in module SGComps.SGCompsConf
+Py:Configurable     ERROR attempt to add a duplicate (ServiceManager.ProxyProviderSvc) ... dupe ignored
+Py:loadBasicEventInfoMgt   DEBUG Loading basic services for EventInfoMgt... [DONE]
+Py:loadBasicIOVDb   DEBUG Loading basic services for IOVDb... [DONE]
+Py:IOVDbSvc.CondDB    INFO Setting up conditions DB access to instance OFLP200
+Py:Configurable     ERROR attempt to add a duplicate (ServiceManager.PoolSvc) ... dupe ignored
+Py:IOVDbSvc.CondDB   DEBUG Loading basic services for CondDBSetup... [DONE]
+Py:ComponentAccumulator   DEBUG Adding component MuonCalib::MdtCalibDbCoolStrTool/MuonCalib::MdtCalibDbCoolStrTool to the job
+Py:ComponentAccumulator   DEBUG Adding component CondInputLoader/CondInputLoader to the job
+Py:ComponentAccumulator   DEBUG Adding component IOVDbSvc/IOVDbSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component PoolSvc/PoolSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component CondSvc/CondSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component DBReplicaSvc/DBReplicaSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component MuonCalib::MdtCalibDbCoolStrTool/MuonCalib::MdtCalibDbCoolStrTool to the job
+Py:ComponentAccumulator   DEBUG Adding component MdtCalibrationDbSvc/MdtCalibrationDbSvc to the job
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component CondInputLoader
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component IOVDbSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component PoolSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component CondSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component ProxyProviderSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component DBReplicaSvc
+Py:ComponentAccumulator   DEBUG Adding component MdtCalibrationDbSvc/MdtCalibrationDbSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component MuonCalib::MdtCalibDbCoolStrTool/MuonCalib::MdtCalibDbCoolStrTool to the job
+Py:ComponentAccumulator   DEBUG Adding component MdtCalibrationSvc/MdtCalibrationSvc to the job
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component CondInputLoader
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component IOVDbSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component PoolSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component CondSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component ProxyProviderSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component DBReplicaSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component AthenaPoolCnvSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component EventPersistencySvc
+Py:ComponentAccumulator   DEBUG Adding component MagField::AtlasFieldSvc/AtlasFieldSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component MdtCalibrationDbSvc/MdtCalibrationDbSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component MdtCalibrationSvc/MdtCalibrationSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component MuonCalib::MdtCalibDbCoolStrTool/MuonCalib::MdtCalibDbCoolStrTool to the job
+Py:ComponentAccumulator   DEBUG Adding component GeoModelSvc/GeoModelSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component DetDescrCnvSvc/DetDescrCnvSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component EvtPersistencySvc/EventPersistencySvc to the job
+Py:ComponentAccumulator   DEBUG Adding component TagInfoMgr/TagInfoMgr to the job
+Py:ComponentAccumulator   DEBUG Adding component EvtPersistencySvc/EventPersistencySvc to the job
+Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component TagInfoMgr/TagInfoMgr to the job
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component TagInfoMgr
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component EventPersistencySvc
+Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component GeoModelSvc/GeoModelSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component DetDescrCnvSvc/DetDescrCnvSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component EvtPersistencySvc/EventPersistencySvc to the job
+Py:ComponentAccumulator   DEBUG Adding component TagInfoMgr/TagInfoMgr to the job
+Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component GeoModelSvc
+Py:ComponentAccumulator   DEBUG Adding component Muon::MuonIdHelperTool/Muon::MuonIdHelperTool to the job
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component GeoModelSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component DetDescrCnvSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component EventPersistencySvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component TagInfoMgr
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component ProxyProviderSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component ToolSvc.Muon::MuonIdHelperTool
+Py:ComponentAccumulator   DEBUG Adding component ROBDataProviderSvc/ROBDataProviderSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component Muon::MDT_RawDataProviderTool/MDT_RawDataProviderTool to the job
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component CondInputLoader
+Py:ComponentAccumulator   DEBUG Adding component MuonMDT_CablingAlg/MuonMDT_CablingAlg to the job
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component GeoModelSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component DetDescrCnvSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component EventPersistencySvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component TagInfoMgr
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component ProxyProviderSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component IOVDbSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component PoolSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component CondSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component DBReplicaSvc
+Py:ComponentAccumulator   DEBUG Adding component AthenaPoolCnvSvc/AthenaPoolCnvSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component MuonMDT_CablingSvc/MuonMDT_CablingSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component MagField::AtlasFieldSvc/AtlasFieldSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component MdtCalibrationDbSvc/MdtCalibrationDbSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component MdtCalibrationSvc/MdtCalibrationSvc to the job
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component ROBDataProviderSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component ToolSvc.Muon::MuonIdHelperTool
+Py:ComponentAccumulator   DEBUG Adding component MDTCablingDbTool/MDTCablingDbTool to the job
+Py:ComponentAccumulator   DEBUG Adding component MuonCalib::MdtCalibDbCoolStrTool/MuonCalib::MdtCalibDbCoolStrTool to the job
+Py:ComponentAccumulator   DEBUG Adding component Muon::MDT_RawDataProviderTool/MDT_RawDataProviderTool to the job
+Py:ComponentAccumulator   DEBUG Adding component GeoModelSvc/GeoModelSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component DetDescrCnvSvc/DetDescrCnvSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component EvtPersistencySvc/EventPersistencySvc to the job
+Py:ComponentAccumulator   DEBUG Adding component TagInfoMgr/TagInfoMgr to the job
+Py:ComponentAccumulator   DEBUG Adding component EvtPersistencySvc/EventPersistencySvc to the job
+Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component TagInfoMgr/TagInfoMgr to the job
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component TagInfoMgr
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component EventPersistencySvc
+Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component GeoModelSvc/GeoModelSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component DetDescrCnvSvc/DetDescrCnvSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component EvtPersistencySvc/EventPersistencySvc to the job
+Py:ComponentAccumulator   DEBUG Adding component TagInfoMgr/TagInfoMgr to the job
+Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component GeoModelSvc
+Py:ComponentAccumulator   DEBUG Adding component Muon::MuonIdHelperTool/Muon::MuonIdHelperTool to the job
+Py:ComponentAccumulator   DEBUG Adding component GeoModelSvc/GeoModelSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component DetDescrCnvSvc/DetDescrCnvSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component EvtPersistencySvc/EventPersistencySvc to the job
+Py:ComponentAccumulator   DEBUG Adding component TagInfoMgr/TagInfoMgr to the job
+Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component Muon::MuonIdHelperTool/Muon::MuonIdHelperTool to the job
+Py:ComponentAccumulator   DEBUG Adding component CSCcablingSvc/CSCcablingSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component GeoModelSvc/GeoModelSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component DetDescrCnvSvc/DetDescrCnvSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component EvtPersistencySvc/EventPersistencySvc to the job
+Py:ComponentAccumulator   DEBUG Adding component TagInfoMgr/TagInfoMgr to the job
+Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component CSCcablingSvc/CSCcablingSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component Muon::MuonIdHelperTool/Muon::MuonIdHelperTool to the job
+Py:ComponentAccumulator   DEBUG Adding component GeoModelSvc/GeoModelSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component DetDescrCnvSvc/DetDescrCnvSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component EvtPersistencySvc/EventPersistencySvc to the job
+Py:ComponentAccumulator   DEBUG Adding component TagInfoMgr/TagInfoMgr to the job
+Py:ComponentAccumulator   DEBUG Adding component EvtPersistencySvc/EventPersistencySvc to the job
+Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component TagInfoMgr/TagInfoMgr to the job
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component TagInfoMgr
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component EventPersistencySvc
+Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component GeoModelSvc/GeoModelSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component DetDescrCnvSvc/DetDescrCnvSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component EvtPersistencySvc/EventPersistencySvc to the job
+Py:ComponentAccumulator   DEBUG Adding component TagInfoMgr/TagInfoMgr to the job
+Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component GeoModelSvc
+Py:ComponentAccumulator   DEBUG Adding component Muon::MuonIdHelperTool/Muon::MuonIdHelperTool to the job
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component GeoModelSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component DetDescrCnvSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component EventPersistencySvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component TagInfoMgr
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component ProxyProviderSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component ToolSvc.Muon::MuonIdHelperTool
+Py:ComponentAccumulator   DEBUG Adding component ROBDataProviderSvc/ROBDataProviderSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component Muon::CSC_RawDataProviderTool/CSC_RawDataProviderTool to the job
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component GeoModelSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component DetDescrCnvSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component EventPersistencySvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component TagInfoMgr
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component ProxyProviderSvc
+Py:ComponentAccumulator   DEBUG Adding component CSCcablingSvc/CSCcablingSvc to the job
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component ROBDataProviderSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component ToolSvc.Muon::MuonIdHelperTool
+Py:ComponentAccumulator   DEBUG Adding component Muon::CSC_RawDataProviderTool/CSC_RawDataProviderTool to the job
+Py:ComponentAccumulator   DEBUG Adding component GeoModelSvc/GeoModelSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component DetDescrCnvSvc/DetDescrCnvSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component EvtPersistencySvc/EventPersistencySvc to the job
+Py:ComponentAccumulator   DEBUG Adding component TagInfoMgr/TagInfoMgr to the job
+Py:ComponentAccumulator   DEBUG Adding component EvtPersistencySvc/EventPersistencySvc to the job
+Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component TagInfoMgr/TagInfoMgr to the job
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component TagInfoMgr
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component EventPersistencySvc
+Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component GeoModelSvc/GeoModelSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component DetDescrCnvSvc/DetDescrCnvSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component EvtPersistencySvc/EventPersistencySvc to the job
+Py:ComponentAccumulator   DEBUG Adding component TagInfoMgr/TagInfoMgr to the job
+Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component GeoModelSvc
+Py:ComponentAccumulator   DEBUG Adding component Muon::MuonIdHelperTool/Muon::MuonIdHelperTool to the job
+Py:ComponentAccumulator   DEBUG Adding component GeoModelSvc/GeoModelSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component DetDescrCnvSvc/DetDescrCnvSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component EvtPersistencySvc/EventPersistencySvc to the job
+Py:ComponentAccumulator   DEBUG Adding component TagInfoMgr/TagInfoMgr to the job
+Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component Muon::MuonIdHelperTool/Muon::MuonIdHelperTool to the job
+Py:ComponentAccumulator   DEBUG Adding component RPCcablingServerSvc/RPCcablingServerSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component CondInputLoader/CondInputLoader to the job
+Py:ComponentAccumulator   DEBUG Adding component IOVDbSvc/IOVDbSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component PoolSvc/PoolSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component CondSvc/CondSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component DBReplicaSvc/DBReplicaSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component CondInputLoader/CondInputLoader to the job
+Py:ComponentAccumulator   DEBUG Adding component IOVDbSvc/IOVDbSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component PoolSvc/PoolSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component CondSvc/CondSvc to the job
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component ProxyProviderSvc
+Py:ComponentAccumulator   DEBUG Adding component DBReplicaSvc/DBReplicaSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component RPCCablingDbTool/RPCCablingDbTool to the job
+Py:ComponentAccumulator   DEBUG Adding component MuonRPC_CablingSvc/MuonRPC_CablingSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component CondInputLoader/CondInputLoader to the job
+Py:ComponentAccumulator   DEBUG Adding component GeoModelSvc/GeoModelSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component DetDescrCnvSvc/DetDescrCnvSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component EvtPersistencySvc/EventPersistencySvc to the job
+Py:ComponentAccumulator   DEBUG Adding component TagInfoMgr/TagInfoMgr to the job
+Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component RPCcablingServerSvc/RPCcablingServerSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component IOVDbSvc/IOVDbSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component PoolSvc/PoolSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component CondSvc/CondSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component DBReplicaSvc/DBReplicaSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component MuonRPC_CablingSvc/MuonRPC_CablingSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component Muon::MuonIdHelperTool/Muon::MuonIdHelperTool to the job
+Py:ComponentAccumulator   DEBUG Adding component RPCCablingDbTool/RPCCablingDbTool to the job
+Py:ComponentAccumulator   DEBUG Adding component GeoModelSvc/GeoModelSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component DetDescrCnvSvc/DetDescrCnvSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component EvtPersistencySvc/EventPersistencySvc to the job
+Py:ComponentAccumulator   DEBUG Adding component TagInfoMgr/TagInfoMgr to the job
+Py:ComponentAccumulator   DEBUG Adding component EvtPersistencySvc/EventPersistencySvc to the job
+Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component TagInfoMgr/TagInfoMgr to the job
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component TagInfoMgr
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component EventPersistencySvc
+Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component GeoModelSvc/GeoModelSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component DetDescrCnvSvc/DetDescrCnvSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component EvtPersistencySvc/EventPersistencySvc to the job
+Py:ComponentAccumulator   DEBUG Adding component TagInfoMgr/TagInfoMgr to the job
+Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component GeoModelSvc
+Py:ComponentAccumulator   DEBUG Adding component Muon::MuonIdHelperTool/Muon::MuonIdHelperTool to the job
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component GeoModelSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component DetDescrCnvSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component EventPersistencySvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component TagInfoMgr
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component ProxyProviderSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component ToolSvc.Muon::MuonIdHelperTool
+Py:ConfigurableDb   DEBUG : Found configurable <class 'MuonRPC_CnvTools.MuonRPC_CnvToolsConf.Muon__RpcRDO_Decoder'> in module MuonRPC_CnvTools.MuonRPC_CnvToolsConf
+Py:ComponentAccumulator   DEBUG Adding component Muon::RpcRdoToPrepDataTool/RpcRdoToRpcPrepDataTool to the job
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component CondInputLoader
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component GeoModelSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component DetDescrCnvSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component EventPersistencySvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component TagInfoMgr
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component ProxyProviderSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component RPCcablingServerSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component IOVDbSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component PoolSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component CondSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component DBReplicaSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component MuonRPC_CablingSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component ToolSvc.Muon::MuonIdHelperTool
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component ToolSvc.RPCCablingDbTool
+Py:ComponentAccumulator   DEBUG Adding component Muon::RpcRdoToPrepDataTool/RpcRdoToRpcPrepDataTool to the job
+Py:ComponentAccumulator   DEBUG Adding component GeoModelSvc/GeoModelSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component DetDescrCnvSvc/DetDescrCnvSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component EvtPersistencySvc/EventPersistencySvc to the job
+Py:ComponentAccumulator   DEBUG Adding component TagInfoMgr/TagInfoMgr to the job
+Py:ComponentAccumulator   DEBUG Adding component EvtPersistencySvc/EventPersistencySvc to the job
+Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component TagInfoMgr/TagInfoMgr to the job
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component TagInfoMgr
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component EventPersistencySvc
+Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component GeoModelSvc/GeoModelSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component DetDescrCnvSvc/DetDescrCnvSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component EvtPersistencySvc/EventPersistencySvc to the job
+Py:ComponentAccumulator   DEBUG Adding component TagInfoMgr/TagInfoMgr to the job
+Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component GeoModelSvc
+Py:ComponentAccumulator   DEBUG Adding component Muon::MuonIdHelperTool/Muon::MuonIdHelperTool to the job
+Py:ComponentAccumulator   DEBUG Adding component GeoModelSvc/GeoModelSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component DetDescrCnvSvc/DetDescrCnvSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component EvtPersistencySvc/EventPersistencySvc to the job
+Py:ComponentAccumulator   DEBUG Adding component TagInfoMgr/TagInfoMgr to the job
+Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component Muon::MuonIdHelperTool/Muon::MuonIdHelperTool to the job
+Py:ComponentAccumulator   DEBUG Adding component LVL1TGC::TGCRecRoiSvc/LVL1TGC::TGCRecRoiSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component TGCcablingServerSvc/TGCcablingServerSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component CondInputLoader/CondInputLoader to the job
+Py:ComponentAccumulator   DEBUG Adding component IOVDbSvc/IOVDbSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component PoolSvc/PoolSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component CondSvc/CondSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component DBReplicaSvc/DBReplicaSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component CondInputLoader/CondInputLoader to the job
+Py:ComponentAccumulator   DEBUG Adding component IOVDbSvc/IOVDbSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component PoolSvc/PoolSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component CondSvc/CondSvc to the job
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component ProxyProviderSvc
+Py:ComponentAccumulator   DEBUG Adding component DBReplicaSvc/DBReplicaSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component CondInputLoader/CondInputLoader to the job
+Py:ComponentAccumulator   DEBUG Adding component GeoModelSvc/GeoModelSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component DetDescrCnvSvc/DetDescrCnvSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component EvtPersistencySvc/EventPersistencySvc to the job
+Py:ComponentAccumulator   DEBUG Adding component TagInfoMgr/TagInfoMgr to the job
+Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component LVL1TGC::TGCRecRoiSvc/LVL1TGC::TGCRecRoiSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component TGCcablingServerSvc/TGCcablingServerSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component IOVDbSvc/IOVDbSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component PoolSvc/PoolSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component CondSvc/CondSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component DBReplicaSvc/DBReplicaSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component Muon::MuonIdHelperTool/Muon::MuonIdHelperTool to the job
+Py:ComponentAccumulator   DEBUG Adding component GeoModelSvc/GeoModelSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component DetDescrCnvSvc/DetDescrCnvSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component EvtPersistencySvc/EventPersistencySvc to the job
+Py:ComponentAccumulator   DEBUG Adding component TagInfoMgr/TagInfoMgr to the job
+Py:ComponentAccumulator   DEBUG Adding component EvtPersistencySvc/EventPersistencySvc to the job
+Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component TagInfoMgr/TagInfoMgr to the job
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component TagInfoMgr
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component EventPersistencySvc
+Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component GeoModelSvc/GeoModelSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component DetDescrCnvSvc/DetDescrCnvSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component EvtPersistencySvc/EventPersistencySvc to the job
+Py:ComponentAccumulator   DEBUG Adding component TagInfoMgr/TagInfoMgr to the job
+Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component GeoModelSvc
+Py:ComponentAccumulator   DEBUG Adding component Muon::MuonIdHelperTool/Muon::MuonIdHelperTool to the job
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component GeoModelSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component DetDescrCnvSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component EventPersistencySvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component TagInfoMgr
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component ProxyProviderSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component ToolSvc.Muon::MuonIdHelperTool
+Py:ComponentAccumulator   DEBUG Adding component Muon::TgcRdoToPrepDataTool/TgcRdoToTgcPrepDataTool to the job
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component CondInputLoader
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component GeoModelSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component DetDescrCnvSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component EventPersistencySvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component TagInfoMgr
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component ProxyProviderSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component LVL1TGC::TGCRecRoiSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component TGCcablingServerSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component IOVDbSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component PoolSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component CondSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component DBReplicaSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component ToolSvc.Muon::MuonIdHelperTool
+Py:ComponentAccumulator   DEBUG Adding component Muon::TgcRdoToPrepDataTool/TgcRdoToTgcPrepDataTool to the job
+Py:ComponentAccumulator   DEBUG Adding component GeoModelSvc/GeoModelSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component DetDescrCnvSvc/DetDescrCnvSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component EvtPersistencySvc/EventPersistencySvc to the job
+Py:ComponentAccumulator   DEBUG Adding component TagInfoMgr/TagInfoMgr to the job
+Py:ComponentAccumulator   DEBUG Adding component EvtPersistencySvc/EventPersistencySvc to the job
+Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component TagInfoMgr/TagInfoMgr to the job
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component TagInfoMgr
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component EventPersistencySvc
+Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component GeoModelSvc/GeoModelSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component DetDescrCnvSvc/DetDescrCnvSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component EvtPersistencySvc/EventPersistencySvc to the job
+Py:ComponentAccumulator   DEBUG Adding component TagInfoMgr/TagInfoMgr to the job
+Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component GeoModelSvc
+Py:ComponentAccumulator   DEBUG Adding component Muon::MuonIdHelperTool/Muon::MuonIdHelperTool to the job
+Py:ComponentAccumulator   DEBUG Adding component GeoModelSvc/GeoModelSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component DetDescrCnvSvc/DetDescrCnvSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component EvtPersistencySvc/EventPersistencySvc to the job
+Py:ComponentAccumulator   DEBUG Adding component TagInfoMgr/TagInfoMgr to the job
+Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component Muon::MuonIdHelperTool/Muon::MuonIdHelperTool to the job
+Py:ComponentAccumulator   DEBUG Adding component CondInputLoader/CondInputLoader to the job
+Py:ComponentAccumulator   DEBUG Adding component IOVDbSvc/IOVDbSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component PoolSvc/PoolSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component CondSvc/CondSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component DBReplicaSvc/DBReplicaSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component AthenaPoolCnvSvc/AthenaPoolCnvSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component EvtPersistencySvc/EventPersistencySvc to the job
+Py:ComponentAccumulator   DEBUG Adding component CondInputLoader/CondInputLoader to the job
+Py:ComponentAccumulator   DEBUG Adding component IOVDbSvc/IOVDbSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component PoolSvc/PoolSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component CondSvc/CondSvc to the job
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component ProxyProviderSvc
+Py:ComponentAccumulator   DEBUG Adding component DBReplicaSvc/DBReplicaSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component AthenaPoolCnvSvc/AthenaPoolCnvSvc to the job
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component EventPersistencySvc
+Py:ComponentAccumulator   DEBUG Adding component MuonMDT_CablingAlg/MuonMDT_CablingAlg to the job
+Py:ComponentAccumulator   DEBUG Adding component MDTCablingDbTool/MDTCablingDbTool to the job
+Py:ComponentAccumulator   DEBUG Adding component MuonMDT_CablingSvc/MuonMDT_CablingSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component CondInputLoader/CondInputLoader to the job
+Py:ComponentAccumulator   DEBUG Adding component MuonMDT_CablingAlg/MuonMDT_CablingAlg to the job
+Py:ComponentAccumulator   DEBUG Adding component GeoModelSvc/GeoModelSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component DetDescrCnvSvc/DetDescrCnvSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component EvtPersistencySvc/EventPersistencySvc to the job
+Py:ComponentAccumulator   DEBUG Adding component TagInfoMgr/TagInfoMgr to the job
+Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component IOVDbSvc/IOVDbSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component PoolSvc/PoolSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component CondSvc/CondSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component DBReplicaSvc/DBReplicaSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component AthenaPoolCnvSvc/AthenaPoolCnvSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component MuonMDT_CablingSvc/MuonMDT_CablingSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component Muon::MuonIdHelperTool/Muon::MuonIdHelperTool to the job
+Py:ComponentAccumulator   DEBUG Adding component MDTCablingDbTool/MDTCablingDbTool to the job
+Py:ComponentAccumulator   DEBUG Adding component CondInputLoader/CondInputLoader to the job
+Py:ComponentAccumulator   DEBUG Adding component IOVDbSvc/IOVDbSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component PoolSvc/PoolSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component CondSvc/CondSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component DBReplicaSvc/DBReplicaSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component CondInputLoader/CondInputLoader to the job
+Py:ComponentAccumulator   DEBUG Adding component IOVDbSvc/IOVDbSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component PoolSvc/PoolSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component CondSvc/CondSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component DBReplicaSvc/DBReplicaSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component CondInputLoader/CondInputLoader to the job
+Py:ComponentAccumulator   DEBUG Adding component IOVDbSvc/IOVDbSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component PoolSvc/PoolSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component CondSvc/CondSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component DBReplicaSvc/DBReplicaSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component AthenaPoolCnvSvc/AthenaPoolCnvSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component EvtPersistencySvc/EventPersistencySvc to the job
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component CondInputLoader
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component IOVDbSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component PoolSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component CondSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component ProxyProviderSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component DBReplicaSvc
+Py:ComponentAccumulator   DEBUG Adding component AthenaPoolCnvSvc/AthenaPoolCnvSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component EvtPersistencySvc/EventPersistencySvc to the job
+Py:ComponentAccumulator   DEBUG Adding component MagField::AtlasFieldSvc/AtlasFieldSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component CondInputLoader/CondInputLoader to the job
+Py:ComponentAccumulator   DEBUG Adding component IOVDbSvc/IOVDbSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component PoolSvc/PoolSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component CondSvc/CondSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component DBReplicaSvc/DBReplicaSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component AthenaPoolCnvSvc/AthenaPoolCnvSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component EvtPersistencySvc/EventPersistencySvc to the job
+Py:ComponentAccumulator   DEBUG Adding component MagField::AtlasFieldSvc/AtlasFieldSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component CondInputLoader/CondInputLoader to the job
+Py:ComponentAccumulator   DEBUG Adding component IOVDbSvc/IOVDbSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component PoolSvc/PoolSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component CondSvc/CondSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component DBReplicaSvc/DBReplicaSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component CondInputLoader/CondInputLoader to the job
+Py:ComponentAccumulator   DEBUG Adding component IOVDbSvc/IOVDbSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component PoolSvc/PoolSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component CondSvc/CondSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component DBReplicaSvc/DBReplicaSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component CondInputLoader/CondInputLoader to the job
+Py:ComponentAccumulator   DEBUG Adding component IOVDbSvc/IOVDbSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component PoolSvc/PoolSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component CondSvc/CondSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component DBReplicaSvc/DBReplicaSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component MuonCalib::MdtCalibDbCoolStrTool/MuonCalib::MdtCalibDbCoolStrTool to the job
+Py:ComponentAccumulator   DEBUG Adding component CondInputLoader/CondInputLoader to the job
+Py:ComponentAccumulator   DEBUG Adding component IOVDbSvc/IOVDbSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component PoolSvc/PoolSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component CondSvc/CondSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component DBReplicaSvc/DBReplicaSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component MuonCalib::MdtCalibDbCoolStrTool/MuonCalib::MdtCalibDbCoolStrTool to the job
+Py:ComponentAccumulator   DEBUG Adding component MdtCalibrationDbSvc/MdtCalibrationDbSvc to the job
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component CondInputLoader
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component IOVDbSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component PoolSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component CondSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component ProxyProviderSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component DBReplicaSvc
+Py:ComponentAccumulator   DEBUG Adding component MdtCalibrationDbSvc/MdtCalibrationDbSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component MuonCalib::MdtCalibDbCoolStrTool/MuonCalib::MdtCalibDbCoolStrTool to the job
+Py:ComponentAccumulator   DEBUG Adding component MdtCalibrationSvc/MdtCalibrationSvc to the job
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component CondInputLoader
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component IOVDbSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component PoolSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component CondSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component ProxyProviderSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component DBReplicaSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component AthenaPoolCnvSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component EventPersistencySvc
+Py:ComponentAccumulator   DEBUG Adding component MagField::AtlasFieldSvc/AtlasFieldSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component MdtCalibrationDbSvc/MdtCalibrationDbSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component MdtCalibrationSvc/MdtCalibrationSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component MuonCalib::MdtCalibDbCoolStrTool/MuonCalib::MdtCalibDbCoolStrTool to the job
+Py:ComponentAccumulator   DEBUG Adding component GeoModelSvc/GeoModelSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component DetDescrCnvSvc/DetDescrCnvSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component EvtPersistencySvc/EventPersistencySvc to the job
+Py:ComponentAccumulator   DEBUG Adding component TagInfoMgr/TagInfoMgr to the job
+Py:ComponentAccumulator   DEBUG Adding component EvtPersistencySvc/EventPersistencySvc to the job
+Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component TagInfoMgr/TagInfoMgr to the job
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component TagInfoMgr
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component EventPersistencySvc
+Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component GeoModelSvc/GeoModelSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component DetDescrCnvSvc/DetDescrCnvSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component EvtPersistencySvc/EventPersistencySvc to the job
+Py:ComponentAccumulator   DEBUG Adding component TagInfoMgr/TagInfoMgr to the job
+Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component GeoModelSvc
+Py:ComponentAccumulator   DEBUG Adding component Muon::MuonIdHelperTool/Muon::MuonIdHelperTool to the job
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component GeoModelSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component DetDescrCnvSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component EventPersistencySvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component TagInfoMgr
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component ProxyProviderSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component ToolSvc.Muon::MuonIdHelperTool
+Py:ComponentAccumulator   DEBUG Adding component Muon::MdtRdoToPrepDataTool/MdtRdoToMdtPrepDataTool to the job
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component CondInputLoader
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component MuonMDT_CablingAlg
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component GeoModelSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component DetDescrCnvSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component EventPersistencySvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component TagInfoMgr
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component ProxyProviderSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component IOVDbSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component PoolSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component CondSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component DBReplicaSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component AthenaPoolCnvSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component MuonMDT_CablingSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component AtlasFieldSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component MdtCalibrationDbSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component MdtCalibrationSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component ToolSvc.Muon::MuonIdHelperTool
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component ToolSvc.MDTCablingDbTool
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component ToolSvc.MuonCalib::MdtCalibDbCoolStrTool
+Py:ComponentAccumulator   DEBUG Adding component Muon::MdtRdoToPrepDataTool/MdtRdoToMdtPrepDataTool to the job
+Py:ComponentAccumulator   DEBUG Adding component GeoModelSvc/GeoModelSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component DetDescrCnvSvc/DetDescrCnvSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component EvtPersistencySvc/EventPersistencySvc to the job
+Py:ComponentAccumulator   DEBUG Adding component TagInfoMgr/TagInfoMgr to the job
+Py:ComponentAccumulator   DEBUG Adding component EvtPersistencySvc/EventPersistencySvc to the job
+Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component TagInfoMgr/TagInfoMgr to the job
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component TagInfoMgr
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component EventPersistencySvc
+Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component GeoModelSvc/GeoModelSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component DetDescrCnvSvc/DetDescrCnvSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component EvtPersistencySvc/EventPersistencySvc to the job
+Py:ComponentAccumulator   DEBUG Adding component TagInfoMgr/TagInfoMgr to the job
+Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component GeoModelSvc
+Py:ComponentAccumulator   DEBUG Adding component Muon::MuonIdHelperTool/Muon::MuonIdHelperTool to the job
+Py:ComponentAccumulator   DEBUG Adding component GeoModelSvc/GeoModelSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component DetDescrCnvSvc/DetDescrCnvSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component EvtPersistencySvc/EventPersistencySvc to the job
+Py:ComponentAccumulator   DEBUG Adding component TagInfoMgr/TagInfoMgr to the job
+Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component Muon::MuonIdHelperTool/Muon::MuonIdHelperTool to the job
+Py:ComponentAccumulator   DEBUG Adding component CSCcablingSvc/CSCcablingSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component GeoModelSvc/GeoModelSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component DetDescrCnvSvc/DetDescrCnvSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component EvtPersistencySvc/EventPersistencySvc to the job
+Py:ComponentAccumulator   DEBUG Adding component TagInfoMgr/TagInfoMgr to the job
+Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component CSCcablingSvc/CSCcablingSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component Muon::MuonIdHelperTool/Muon::MuonIdHelperTool to the job
+Py:ComponentAccumulator   DEBUG Adding component MuonCalib::CscCoolStrSvc/MuonCalib::CscCoolStrSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component CondInputLoader/CondInputLoader to the job
+Py:ComponentAccumulator   DEBUG Adding component IOVDbSvc/IOVDbSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component PoolSvc/PoolSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component CondSvc/CondSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component DBReplicaSvc/DBReplicaSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component CondInputLoader/CondInputLoader to the job
+Py:ComponentAccumulator   DEBUG Adding component IOVDbSvc/IOVDbSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component PoolSvc/PoolSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component CondSvc/CondSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component DBReplicaSvc/DBReplicaSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component CondInputLoader/CondInputLoader to the job
+Py:ComponentAccumulator   DEBUG Adding component IOVDbSvc/IOVDbSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component PoolSvc/PoolSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component CondSvc/CondSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component DBReplicaSvc/DBReplicaSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component CondInputLoader/CondInputLoader to the job
+Py:ComponentAccumulator   DEBUG Adding component IOVDbSvc/IOVDbSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component PoolSvc/PoolSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component CondSvc/CondSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component DBReplicaSvc/DBReplicaSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component CondInputLoader/CondInputLoader to the job
+Py:ComponentAccumulator   DEBUG Adding component IOVDbSvc/IOVDbSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component PoolSvc/PoolSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component CondSvc/CondSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component DBReplicaSvc/DBReplicaSvc to the job
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component CondInputLoader
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component IOVDbSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component PoolSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component CondSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component ProxyProviderSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component DBReplicaSvc
+Py:ComponentAccumulator   DEBUG Adding component CondInputLoader/CondInputLoader to the job
+Py:ComponentAccumulator   DEBUG Adding component IOVDbSvc/IOVDbSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component PoolSvc/PoolSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component CondSvc/CondSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component DBReplicaSvc/DBReplicaSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component CondInputLoader/CondInputLoader to the job
+Py:ComponentAccumulator   DEBUG Adding component IOVDbSvc/IOVDbSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component PoolSvc/PoolSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component CondSvc/CondSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component DBReplicaSvc/DBReplicaSvc to the job
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component CondInputLoader
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component IOVDbSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component PoolSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component CondSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component ProxyProviderSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component DBReplicaSvc
+Py:ComponentAccumulator   DEBUG Adding component CondInputLoader/CondInputLoader to the job
+Py:ComponentAccumulator   DEBUG Adding component IOVDbSvc/IOVDbSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component PoolSvc/PoolSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component CondSvc/CondSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component DBReplicaSvc/DBReplicaSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component CondInputLoader/CondInputLoader to the job
+Py:ComponentAccumulator   DEBUG Adding component IOVDbSvc/IOVDbSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component PoolSvc/PoolSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component CondSvc/CondSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component DBReplicaSvc/DBReplicaSvc to the job
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component CondInputLoader
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component IOVDbSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component PoolSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component CondSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component ProxyProviderSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component DBReplicaSvc
+Py:ComponentAccumulator   DEBUG Adding component CondInputLoader/CondInputLoader to the job
+Py:ComponentAccumulator   DEBUG Adding component IOVDbSvc/IOVDbSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component PoolSvc/PoolSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component CondSvc/CondSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component DBReplicaSvc/DBReplicaSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component CondInputLoader/CondInputLoader to the job
+Py:ComponentAccumulator   DEBUG Adding component IOVDbSvc/IOVDbSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component PoolSvc/PoolSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component CondSvc/CondSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component DBReplicaSvc/DBReplicaSvc to the job
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component CondInputLoader
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component IOVDbSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component PoolSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component CondSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component ProxyProviderSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component DBReplicaSvc
+Py:ComponentAccumulator   DEBUG Adding component CondInputLoader/CondInputLoader to the job
+Py:ComponentAccumulator   DEBUG Adding component IOVDbSvc/IOVDbSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component PoolSvc/PoolSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component CondSvc/CondSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component DBReplicaSvc/DBReplicaSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component CondInputLoader/CondInputLoader to the job
+Py:ComponentAccumulator   DEBUG Adding component IOVDbSvc/IOVDbSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component PoolSvc/PoolSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component CondSvc/CondSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component DBReplicaSvc/DBReplicaSvc to the job
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component CondInputLoader
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component IOVDbSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component PoolSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component CondSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component ProxyProviderSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component DBReplicaSvc
+Py:ComponentAccumulator   DEBUG Adding component CondInputLoader/CondInputLoader to the job
+Py:ComponentAccumulator   DEBUG Adding component IOVDbSvc/IOVDbSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component PoolSvc/PoolSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component CondSvc/CondSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component DBReplicaSvc/DBReplicaSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component CondInputLoader/CondInputLoader to the job
+Py:ComponentAccumulator   DEBUG Adding component IOVDbSvc/IOVDbSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component PoolSvc/PoolSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component CondSvc/CondSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component DBReplicaSvc/DBReplicaSvc to the job
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component CondInputLoader
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component IOVDbSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component PoolSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component CondSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component ProxyProviderSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component DBReplicaSvc
+Py:ComponentAccumulator   DEBUG Adding component CondInputLoader/CondInputLoader to the job
+Py:ComponentAccumulator   DEBUG Adding component IOVDbSvc/IOVDbSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component PoolSvc/PoolSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component CondSvc/CondSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component DBReplicaSvc/DBReplicaSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component CondInputLoader/CondInputLoader to the job
+Py:ComponentAccumulator   DEBUG Adding component IOVDbSvc/IOVDbSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component PoolSvc/PoolSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component CondSvc/CondSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component DBReplicaSvc/DBReplicaSvc to the job
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component CondInputLoader
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component IOVDbSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component PoolSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component CondSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component ProxyProviderSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component DBReplicaSvc
+Py:ComponentAccumulator   DEBUG Adding component CondInputLoader/CondInputLoader to the job
+Py:ComponentAccumulator   DEBUG Adding component MuonCalib::CscCoolStrSvc/MuonCalib::CscCoolStrSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component IOVDbSvc/IOVDbSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component PoolSvc/PoolSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component CondSvc/CondSvc to the job
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component ProxyProviderSvc
+Py:ComponentAccumulator   DEBUG Adding component DBReplicaSvc/DBReplicaSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component GeoModelSvc/GeoModelSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component DetDescrCnvSvc/DetDescrCnvSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component EvtPersistencySvc/EventPersistencySvc to the job
+Py:ComponentAccumulator   DEBUG Adding component TagInfoMgr/TagInfoMgr to the job
+Py:ComponentAccumulator   DEBUG Adding component EvtPersistencySvc/EventPersistencySvc to the job
+Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component TagInfoMgr/TagInfoMgr to the job
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component TagInfoMgr
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component EventPersistencySvc
+Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component GeoModelSvc/GeoModelSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component DetDescrCnvSvc/DetDescrCnvSvc to the job
+Py:ComponentAccumulator   DEBUG Adding component EvtPersistencySvc/EventPersistencySvc to the job
+Py:ComponentAccumulator   DEBUG Adding component TagInfoMgr/TagInfoMgr to the job
+Py:ComponentAccumulator   DEBUG Adding component ProxyProviderSvc/ProxyProviderSvc to the job
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component GeoModelSvc
+Py:ComponentAccumulator   DEBUG Adding component Muon::MuonIdHelperTool/Muon::MuonIdHelperTool to the job
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component GeoModelSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component DetDescrCnvSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component EventPersistencySvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component TagInfoMgr
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component ProxyProviderSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component ToolSvc.Muon::MuonIdHelperTool
+Py:ConfigurableDb   DEBUG : Found configurable <class 'MuonCSC_CnvTools.MuonCSC_CnvToolsConf.Muon__CscRDO_Decoder'> in module MuonCSC_CnvTools.MuonCSC_CnvToolsConf
+Py:ConfigurableDb   DEBUG : Found configurable <class 'CscCalibTools.CscCalibToolsConf.CscCalibTool'> in module CscCalibTools.CscCalibToolsConf
+Py:ConfigurableDb   DEBUG : Found configurable <class 'MuonCSC_CnvTools.MuonCSC_CnvToolsConf.Muon__CSC_RawDataProviderTool'> in module MuonCSC_CnvTools.MuonCSC_CnvToolsConf
+Py:ConfigurableDb   DEBUG : Found configurable <class 'MuonCSC_CnvTools.MuonCSC_CnvToolsConf.Muon__CscROD_Decoder'> in module MuonCSC_CnvTools.MuonCSC_CnvToolsConf
+Py:ComponentAccumulator   DEBUG Adding component Muon::CscRdoToCscPrepDataTool/CscRdoToCscPrepDataTool to the job
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component CondInputLoader
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component GeoModelSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component DetDescrCnvSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component EventPersistencySvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component TagInfoMgr
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component ProxyProviderSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component CSCcablingSvc
+Py:ComponentAccumulator   DEBUG Adding component MuonCalib::CscCoolStrSvc/MuonCalib::CscCoolStrSvc to the job
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component IOVDbSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component PoolSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component CondSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component DBReplicaSvc
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component ToolSvc.Muon::MuonIdHelperTool
+Py:ComponentAccumulator   DEBUG Adding component Muon::CscRdoToCscPrepDataTool/CscRdoToCscPrepDataTool to the job
+Py:ComponentAccumulator   DEBUG Adding component CscThresholdClusterBuilderTool/CscThesholdClusterBuilderTool to the job
+Py:ComponentAccumulator   DEBUG Adding component CscThresholdClusterBuilderTool/CscThesholdClusterBuilderTool to the job
+Py:ConfigurableDb   DEBUG : Found configurable <class 'AthenaPoolCnvSvc.AthenaPoolCnvSvcConf.AthenaPoolCnvSvc'> in module AthenaPoolCnvSvc.AthenaPoolCnvSvcConf
+Py:ComponentAccumulator   DEBUG Reconciled configuration of component AthenaPoolCnvSvc
+Py:Athena            INFO Print Config
+Py:ComponentAccumulator    INFO Event Inputs
+Py:ComponentAccumulator    INFO set([])
+Py:ComponentAccumulator    INFO Event Algorithm Sequences
+Py:ComponentAccumulator    INFO /***** Algorithm AthSequencer/AthAlgSeq ************************************************************
+|-Atomic                                  = False
+|-AuditAlgorithms                         = False
+|-AuditBeginRun                           = False
+|-AuditEndRun                             = False
+|-AuditExecute                            = False
+|-AuditFinalize                           = False
+|-AuditInitialize                         = False
+|-AuditReinitialize                       = False
+|-AuditRestart                            = False
+|-AuditStart                              = False
+|-AuditStop                               = False
+|-Cardinality                             = 0
+|-ContinueEventloopOnFPE                  = False
+|-DetStore                   @0x7f0b3f4b1990 = ServiceHandle('StoreGateSvc/DetectorStore')
+|-Enable                                  = True
+|-ErrorCounter                            = 0
+|-ErrorMax                                = 1
+|-EvtStore                   @0x7f0b3f4b1910 = ServiceHandle('StoreGateSvc')
+|-ExtraInputs                @0x7f0b3da4b488 = []  (default: [])
+|-ExtraOutputs               @0x7f0b3da4b638 = []  (default: [])
+|-FilterCircularDependencies              = True
+|-IgnoreFilterPassed                      = False
+|-IsIOBound                               = False
+|-Members                    @0x7f0b3da4b290 = ['MuonCacheCreator/MuonCacheCreator', 'Muon::RpcRawDataProvider/RpcRawDataProvider', 'Muon::TgcRawDataProvider/TgcRawDataProvider', 'Muon::MdtRawDataProvider/MdtRawDataProvider', 'Muon::CscRawDataProvider/CscRawDataProvider', 'RpcRdoToRpcPrepData/RpcRdoToRpcPrepData', 'TgcRdoToTgcPrepData/TgcRdoToTgcPrepData', 'MdtRdoToMdtPrepData/MdtRdoToMdtPrepData', 'CscRdoToCscPrepData/CscRdoToCscPrepData', 'CscThresholdClusterBuilder/CscThesholdClusterBuilder']
+|                                            (default: [])
+|-ModeOR                                  = False
+|-MonitorService                          = 'MonitorSvc'
+|-NeededResources            @0x7f0b3da4b710 = []  (default: [])
+|-OutputLevel                             = 0
+|-RegisterForContextService               = False
+|-Sequential                              = False
+|-StopOverride                            = False
+|-TimeOut                                 = 0.0
+|-Timeline                                = True
+|=/***** Algorithm MuonCacheCreator/MuonCacheCreator *************************************************
+| |-AuditAlgorithms                         = False
+| |-AuditBeginRun                           = False
+| |-AuditEndRun                             = False
+| |-AuditExecute                            = False
+| |-AuditFinalize                           = False
+| |-AuditInitialize                         = False
+| |-AuditReinitialize                       = False
+| |-AuditRestart                            = False
+| |-AuditStart                              = False
+| |-AuditStop                               = False
+| |-Cardinality                             = 0
+| |-CscCacheKey                @0x7f0b3e0e63f0 = 'CscCache'  (default: 'StoreGateSvc+')
+| |-DetStore                   @0x7f0b3e1ae910 = ServiceHandle('StoreGateSvc/DetectorStore')
+| |-DisableViewWarning                      = False
+| |-Enable                                  = True
+| |-ErrorCounter                            = 0
+| |-ErrorMax                                = 1
+| |-EvtStore                   @0x7f0b3e1ae890 = ServiceHandle('StoreGateSvc')
+| |-ExtraInputs                @0x7f0b3e2820e0 = []  (default: [])
+| |-ExtraOutputs               @0x7f0b3e1b8fc8 = []  (default: [])
+| |-FilterCircularDependencies              = True
+| |-IsIOBound                               = False
+| |-MdtCsmCacheKey             @0x7f0b3e0e63c0 = 'MdtCsmCache'  (default: 'StoreGateSvc+')
+| |-MonitorService                          = 'MonitorSvc'
+| |-NeededResources            @0x7f0b3e282050 = []  (default: [])
+| |-OutputLevel                             = 0
+| |-RegisterForContextService               = False
+| |-RpcCacheKey                @0x7f0b3e0e67b0 = 'RpcCache'  (default: 'StoreGateSvc+')
+| |-TgcCacheKey                @0x7f0b3e0e6810 = 'TgcCache'  (default: 'StoreGateSvc+')
+| |-Timeline                                = True
+| \----- (End of Algorithm MuonCacheCreator/MuonCacheCreator) ----------------------------------------
+|=/***** Algorithm Muon::RpcRawDataProvider/RpcRawDataProvider ***************************************
+| |-AuditAlgorithms                         = False
+| |-AuditBeginRun                           = False
+| |-AuditEndRun                             = False
+| |-AuditExecute                            = False
+| |-AuditFinalize                           = False
+| |-AuditInitialize                         = False
+| |-AuditReinitialize                       = False
+| |-AuditRestart                            = False
+| |-AuditStart                              = False
+| |-AuditStop                               = False
+| |-Cardinality                             = 1
+| |-DetStore                   @0x7f0b3e28fb50 = ServiceHandle('StoreGateSvc/DetectorStore')
+| |-DoSeededDecoding                        = False
+| |-Enable                                  = True
+| |-ErrorCounter                            = 0
+| |-ErrorMax                                = 1
+| |-EvtStore                   @0x7f0b3e28fad0 = ServiceHandle('StoreGateSvc')
+| |-ExtraInputs                @0x7f0b3da4b908 = []  (default: [])
+| |-ExtraOutputs               @0x7f0b3da4b758 = []  (default: [])
+| |-FilterCircularDependencies              = True
+| |-IsIOBound                               = False
+| |-MonitorService                          = 'MonitorSvc'
+| |-NeededResources            @0x7f0b3da4b7a0 = []  (default: [])
+| |-OutputLevel                             = 0
+| |-ProviderTool               @0x7f0b3e575528 = PrivateToolHandle('Muon::RPC_RawDataProviderTool/RPC_RawDataProviderTool')
+| |                                            (default: 'Muon::RPC_RawDataProviderTool/RpcRawDataProviderTool')
+| |-RegionSelectionSvc         @0x7f0b3e28fbd0 = ServiceHandle('RegSelSvc')
+| |-RegisterForContextService               = False
+| |-RoIs                                    = 'StoreGateSvc+OutputRoIs'
+| |-Timeline                                = True
+| |=/***** Private AlgTool Muon::RPC_RawDataProviderTool/RpcRawDataProvider.RPC_RawDataProviderTool *****
+| | |-AuditFinalize                  = False
+| | |-AuditInitialize                = False
+| | |-AuditReinitialize              = False
+| | |-AuditRestart                   = False
+| | |-AuditStart                     = False
+| | |-AuditStop                      = False
+| | |-AuditTools                     = False
+| | |-Decoder           @0x7f0b3e575620 = PrivateToolHandle('Muon::RpcROD_Decoder/RpcROD_Decoder')
+| | |-DetStore          @0x7f0b3e0813d0 = ServiceHandle('StoreGateSvc/DetectorStore')
+| | |-EvtStore          @0x7f0b3e081410 = ServiceHandle('StoreGateSvc')
+| | |-ExtraInputs       @0x7f0b3e084170 = []  (default: [])
+| | |-ExtraOutputs      @0x7f0b3e084098 = []  (default: [])
+| | |-MonitorService                 = 'MonitorSvc'
+| | |-OutputLevel                    = 0
+| | |-RPCSec                         = 'StoreGateSvc+RPC_SECTORLOGIC'
+| | |-RdoLocation                    = 'StoreGateSvc+RPCPAD'
+| | |=/***** Private AlgTool Muon::RpcROD_Decoder/RpcRawDataProvider.RPC_RawDataProviderTool.RpcROD_Decoder *****
+| | | |-AuditFinalize                    = False
+| | | |-AuditInitialize                  = False
+| | | |-AuditReinitialize                = False
+| | | |-AuditRestart                     = False
+| | | |-AuditStart                       = False
+| | | |-AuditStop                        = False
+| | | |-AuditTools                       = False
+| | | |-DataErrorPrintLimit              = 1000
+| | | |-DetStore            @0x7f0b3e0814d0 = ServiceHandle('StoreGateSvc/DetectorStore')
+| | | |-EvtStore            @0x7f0b3e081510 = ServiceHandle('StoreGateSvc')
+| | | |-ExtraInputs         @0x7f0b3e084050 = []  (default: [])
+| | | |-ExtraOutputs        @0x7f0b3e07af80 = []  (default: [])
+| | | |-MonitorService                   = 'MonitorSvc'
+| | | |-OutputLevel                      = 0
+| | | |-Sector13Data                     = False
+| | | |-SpecialROBNumber                 = -1
+| | | \----- (End of Private AlgTool Muon::RpcROD_Decoder/RpcRawDataProvider.RPC_RawDataProviderTool.RpcROD_Decoder) -----
+| | \----- (End of Private AlgTool Muon::RPC_RawDataProviderTool/RpcRawDataProvider.RPC_RawDataProviderTool) -----
+| \----- (End of Algorithm Muon::RpcRawDataProvider/RpcRawDataProvider) ------------------------------
+|=/***** Algorithm Muon::TgcRawDataProvider/TgcRawDataProvider ***************************************
+| |-AuditAlgorithms                         = False
+| |-AuditBeginRun                           = False
+| |-AuditEndRun                             = False
+| |-AuditExecute                            = False
+| |-AuditFinalize                           = False
+| |-AuditInitialize                         = False
+| |-AuditReinitialize                       = False
+| |-AuditRestart                            = False
+| |-AuditStart                              = False
+| |-AuditStop                               = False
+| |-Cardinality                             = 1
+| |-DetStore                   @0x7f0b3e19eb10 = ServiceHandle('StoreGateSvc/DetectorStore')
+| |-Enable                                  = True
+| |-ErrorCounter                            = 0
+| |-ErrorMax                                = 1
+| |-EvtStore                   @0x7f0b3e19ea90 = ServiceHandle('StoreGateSvc')
+| |-ExtraInputs                @0x7f0b3da4bb00 = []  (default: [])
+| |-ExtraOutputs               @0x7f0b3da4bbd8 = []  (default: [])
+| |-FilterCircularDependencies              = True
+| |-IsIOBound                               = False
+| |-MonitorService                          = 'MonitorSvc'
+| |-NeededResources            @0x7f0b3da4bb48 = []  (default: [])
+| |-OutputLevel                             = 0
+| |-ProviderTool               @0x7f0b3f2539b0 = PrivateToolHandle('Muon::TGC_RawDataProviderTool/TGC_RawDataProviderTool')
+| |                                            (default: 'Muon::TGC_RawDataProviderTool/TgcRawDataProviderTool')
+| |-RegisterForContextService               = False
+| |-Timeline                                = True
+| |=/***** Private AlgTool Muon::TGC_RawDataProviderTool/TgcRawDataProvider.TGC_RawDataProviderTool *****
+| | |-AuditFinalize                  = False
+| | |-AuditInitialize                = False
+| | |-AuditReinitialize              = False
+| | |-AuditRestart                   = False
+| | |-AuditStart                     = False
+| | |-AuditStop                      = False
+| | |-AuditTools                     = False
+| | |-Decoder           @0x7f0b3f253aa0 = PrivateToolHandle('Muon::TGC_RodDecoderReadout/TgcROD_Decoder')
+| | |                                   (default: 'Muon::TGC_RodDecoderReadout/TGC_RodDecoderReadout')
+| | |-DetStore          @0x7f0b3e027a10 = ServiceHandle('StoreGateSvc/DetectorStore')
+| | |-EvtStore          @0x7f0b3e027a50 = ServiceHandle('StoreGateSvc')
+| | |-ExtraInputs       @0x7f0b3dfab128 = []  (default: [])
+| | |-ExtraOutputs      @0x7f0b3dfab0e0 = []  (default: [])
+| | |-MonitorService                 = 'MonitorSvc'
+| | |-OutputLevel                    = 0
+| | |-RdoLocation                    = 'StoreGateSvc+TGCRDO'
+| | |=/***** Private AlgTool Muon::TGC_RodDecoderReadout/TgcRawDataProvider.TGC_RawDataProviderTool.TgcROD_Decoder *****
+| | | |-AuditFinalize                  = False
+| | | |-AuditInitialize                = False
+| | | |-AuditReinitialize              = False
+| | | |-AuditRestart                   = False
+| | | |-AuditStart                     = False
+| | | |-AuditStop                      = False
+| | | |-AuditTools                     = False
+| | | |-DetStore          @0x7f0b3e027b10 = ServiceHandle('StoreGateSvc/DetectorStore')
+| | | |-EvtStore          @0x7f0b3e027b50 = ServiceHandle('StoreGateSvc')
+| | | |-ExtraInputs       @0x7f0b3e024d88 = []  (default: [])
+| | | |-ExtraOutputs      @0x7f0b3e024ef0 = []  (default: [])
+| | | |-MonitorService                 = 'MonitorSvc'
+| | | |-OutputLevel                    = 0
+| | | |-ShowStatusWords                = False
+| | | |-SkipCoincidence                = False
+| | | \----- (End of Private AlgTool Muon::TGC_RodDecoderReadout/TgcRawDataProvider.TGC_RawDataProviderTool.TgcROD_Decoder) -----
+| | \----- (End of Private AlgTool Muon::TGC_RawDataProviderTool/TgcRawDataProvider.TGC_RawDataProviderTool) -----
+| \----- (End of Algorithm Muon::TgcRawDataProvider/TgcRawDataProvider) ------------------------------
+|=/***** Algorithm Muon::MdtRawDataProvider/MdtRawDataProvider ***************************************
+| |-AuditAlgorithms                         = False
+| |-AuditBeginRun                           = False
+| |-AuditEndRun                             = False
+| |-AuditExecute                            = False
+| |-AuditFinalize                           = False
+| |-AuditInitialize                         = False
+| |-AuditReinitialize                       = False
+| |-AuditRestart                            = False
+| |-AuditStart                              = False
+| |-AuditStop                               = False
+| |-Cardinality                             = 1
+| |-DetStore                   @0x7f0b3e198d50 = ServiceHandle('StoreGateSvc/DetectorStore')
+| |-Enable                                  = True
+| |-ErrorCounter                            = 0
+| |-ErrorMax                                = 1
+| |-EvtStore                   @0x7f0b3e198cd0 = ServiceHandle('StoreGateSvc')
+| |-ExtraInputs                @0x7f0b3da4bc20 = []  (default: [])
+| |-ExtraOutputs               @0x7f0b3da4bcb0 = []  (default: [])
+| |-FilterCircularDependencies              = True
+| |-IsIOBound                               = False
+| |-MonitorService                          = 'MonitorSvc'
+| |-NeededResources            @0x7f0b3da4bb90 = []  (default: [])
+| |-OutputLevel                             = 0
+| |-ProviderTool               @0x7f0b3e111c50 = PrivateToolHandle('Muon::MDT_RawDataProviderTool/MDT_RawDataProviderTool')
+| |                                            (default: 'Muon::MDT_RawDataProviderTool/MdtRawDataProviderTool')
+| |-RegisterForContextService               = False
+| |-Timeline                                = True
+| |=/***** Private AlgTool Muon::MDT_RawDataProviderTool/MdtRawDataProvider.MDT_RawDataProviderTool *****
+| | |-AuditFinalize                     = False
+| | |-AuditInitialize                   = False
+| | |-AuditReinitialize                 = False
+| | |-AuditRestart                      = False
+| | |-AuditStart                        = False
+| | |-AuditStop                         = False
+| | |-AuditTools                        = False
+| | |-CsmContainerCacheKey @0x7f0b3e0e63c0 = 'MdtCsmCache'  (default: 'StoreGateSvc+')
+| | |-Decoder              @0x7f0b3f253d70 = PrivateToolHandle('MdtROD_Decoder/MdtROD_Decoder')
+| | |-DetStore             @0x7f0b3db58610 = ServiceHandle('StoreGateSvc/DetectorStore')
+| | |-EvtStore             @0x7f0b3db58650 = ServiceHandle('StoreGateSvc')
+| | |-ExtraInputs          @0x7f0b3db59878 = []  (default: [])
+| | |-ExtraOutputs         @0x7f0b3db59950 = []  (default: [])
+| | |-MonitorService                    = 'MonitorSvc'
+| | |-OutputLevel          @  0x16031d8 = 1  (default: 0)
+| | |-RdoLocation                       = 'StoreGateSvc+MDTCSM'
+| | |-ReadKey                           = 'ConditionStore+MuonMDT_CablingMap'
+| | |=/***** Private AlgTool MdtROD_Decoder/MdtRawDataProvider.MDT_RawDataProviderTool.MdtROD_Decoder *****
+| | | |-AuditFinalize                  = False
+| | | |-AuditInitialize                = False
+| | | |-AuditReinitialize              = False
+| | | |-AuditRestart                   = False
+| | | |-AuditStart                     = False
+| | | |-AuditStop                      = False
+| | | |-AuditTools                     = False
+| | | |-DetStore          @0x7f0b3db58710 = ServiceHandle('StoreGateSvc/DetectorStore')
+| | | |-EvtStore          @0x7f0b3db58750 = ServiceHandle('StoreGateSvc')
+| | | |-ExtraInputs       @0x7f0b3db59758 = []  (default: [])
+| | | |-ExtraOutputs      @0x7f0b3db59710 = []  (default: [])
+| | | |-MonitorService                 = 'MonitorSvc'
+| | | |-OutputLevel                    = 0
+| | | |-ReadKey                        = 'ConditionStore+MuonMDT_CablingMap'
+| | | |-SpecialROBNumber               = -1
+| | | \----- (End of Private AlgTool MdtROD_Decoder/MdtRawDataProvider.MDT_RawDataProviderTool.MdtROD_Decoder) -----
+| | \----- (End of Private AlgTool Muon::MDT_RawDataProviderTool/MdtRawDataProvider.MDT_RawDataProviderTool) -----
+| \----- (End of Algorithm Muon::MdtRawDataProvider/MdtRawDataProvider) ------------------------------
+|=/***** Algorithm Muon::CscRawDataProvider/CscRawDataProvider ***************************************
+| |-AuditAlgorithms                         = False
+| |-AuditBeginRun                           = False
+| |-AuditEndRun                             = False
+| |-AuditExecute                            = False
+| |-AuditFinalize                           = False
+| |-AuditInitialize                         = False
+| |-AuditReinitialize                       = False
+| |-AuditRestart                            = False
+| |-AuditStart                              = False
+| |-AuditStop                               = False
+| |-Cardinality                             = 1
+| |-DetStore                   @0x7f0b3e27cc90 = ServiceHandle('StoreGateSvc/DetectorStore')
+| |-Enable                                  = True
+| |-ErrorCounter                            = 0
+| |-ErrorMax                                = 1
+| |-EvtStore                   @0x7f0b3e27cc10 = ServiceHandle('StoreGateSvc')
+| |-ExtraInputs                @0x7f0b3da4bd40 = []  (default: [])
+| |-ExtraOutputs               @0x7f0b3da4bc68 = []  (default: [])
+| |-FilterCircularDependencies              = True
+| |-IsIOBound                               = False
+| |-MonitorService                          = 'MonitorSvc'
+| |-NeededResources            @0x7f0b3da4b7e8 = []  (default: [])
+| |-OutputLevel                             = 0
+| |-ProviderTool               @0x7f0b3e575810 = PrivateToolHandle('Muon::CSC_RawDataProviderTool/CSC_RawDataProviderTool')
+| |                                            (default: 'Muon::CSC_RawDataProviderTool/CscRawDataProviderTool')
+| |-RegisterForContextService               = False
+| |-Timeline                                = True
+| |=/***** Private AlgTool Muon::CSC_RawDataProviderTool/CscRawDataProvider.CSC_RawDataProviderTool *****
+| | |-AuditFinalize                     = False
+| | |-AuditInitialize                   = False
+| | |-AuditReinitialize                 = False
+| | |-AuditRestart                      = False
+| | |-AuditStart                        = False
+| | |-AuditStop                         = False
+| | |-AuditTools                        = False
+| | |-CscContainerCacheKey @0x7f0b3e0e63f0 = 'CscCache'  (default: 'StoreGateSvc+')
+| | |-Decoder              @0x7f0b3dff3050 = PrivateToolHandle('Muon::CscROD_Decoder/CscROD_Decoder')
+| | |-DetStore             @0x7f0b3db16550 = ServiceHandle('StoreGateSvc/DetectorStore')
+| | |-EvtStore             @0x7f0b3db16590 = ServiceHandle('StoreGateSvc')
+| | |-ExtraInputs          @0x7f0b3db1a098 = []  (default: [])
+| | |-ExtraOutputs         @0x7f0b3db1a050 = []  (default: [])
+| | |-MonitorService                    = 'MonitorSvc'
+| | |-OutputLevel          @  0x16031d8 = 1  (default: 0)
+| | |-RdoLocation                       = 'StoreGateSvc+CSCRDO'
+| | |=/***** Private AlgTool Muon::CscROD_Decoder/CscRawDataProvider.CSC_RawDataProviderTool.CscROD_Decoder *****
+| | | |-AuditFinalize                  = False
+| | | |-AuditInitialize                = False
+| | | |-AuditReinitialize              = False
+| | | |-AuditRestart                   = False
+| | | |-AuditStart                     = False
+| | | |-AuditStop                      = False
+| | | |-AuditTools                     = False
+| | | |-DetStore          @0x7f0b3db16650 = ServiceHandle('StoreGateSvc/DetectorStore')
+| | | |-EvtStore          @0x7f0b3db16690 = ServiceHandle('StoreGateSvc')
+| | | |-ExtraInputs       @0x7f0b3db3be18 = []  (default: [])
+| | | |-ExtraOutputs      @0x7f0b3db3bdd0 = []  (default: [])
+| | | |-IsCosmics                      = False
+| | | |-IsOldCosmics                   = False
+| | | |-MonitorService                 = 'MonitorSvc'
+| | | |-OutputLevel                    = 0
+| | | \----- (End of Private AlgTool Muon::CscROD_Decoder/CscRawDataProvider.CSC_RawDataProviderTool.CscROD_Decoder) -----
+| | \----- (End of Private AlgTool Muon::CSC_RawDataProviderTool/CscRawDataProvider.CSC_RawDataProviderTool) -----
+| \----- (End of Algorithm Muon::CscRawDataProvider/CscRawDataProvider) ------------------------------
+|=/***** Algorithm RpcRdoToRpcPrepData/RpcRdoToRpcPrepData *******************************************
+| |-AuditAlgorithms                         = False
+| |-AuditBeginRun                           = False
+| |-AuditEndRun                             = False
+| |-AuditExecute                            = False
+| |-AuditFinalize                           = False
+| |-AuditInitialize                         = False
+| |-AuditReinitialize                       = False
+| |-AuditRestart                            = False
+| |-AuditStart                              = False
+| |-AuditStop                               = False
+| |-Cardinality                             = 1
+| |-DecodingTool               @0x7f0b3e48ed20 = PrivateToolHandle('Muon::RpcRdoToPrepDataTool/RpcRdoToRpcPrepDataTool')
+| |                                            (default: 'Muon::RpcRdoToPrepDataTool/RpcRdoToPrepDataTool')
+| |-DetStore                   @0x7f0b3db45fd0 = ServiceHandle('StoreGateSvc/DetectorStore')
+| |-DoSeededDecoding                        = False
+| |-Enable                                  = True
+| |-ErrorCounter                            = 0
+| |-ErrorMax                                = 1
+| |-EvtStore                   @0x7f0b3db45f50 = ServiceHandle('StoreGateSvc')
+| |-ExtraInputs                @0x7f0b3da4bcf8 = []  (default: [])
+| |-ExtraOutputs               @0x7f0b3da4be60 = []  (default: [])
+| |-FilterCircularDependencies              = True
+| |-IsIOBound                               = False
+| |-MonitorService                          = 'MonitorSvc'
+| |-NeededResources            @0x7f0b3da4bd88 = []  (default: [])
+| |-OutputCollection                        = 'StoreGateSvc+RPC_Measurements'
+| |-OutputLevel                             = 0
+| |-PrintInputRdo                           = False
+| |-PrintPrepData              @0x7f0b415b9b20 = False  (default: False)
+| |-RegionSelectionSvc         @0x7f0b3daaa090 = ServiceHandle('RegSelSvc')
+| |-RegisterForContextService               = False
+| |-RoIs                                    = 'StoreGateSvc+OutputRoIs'
+| |-Timeline                                = True
+| |=/***** Private AlgTool Muon::RpcRdoToPrepDataTool/RpcRdoToRpcPrepData.RpcRdoToRpcPrepDataTool ******
+| | |-AuditFinalize                                   = False
+| | |-AuditInitialize                                 = False
+| | |-AuditReinitialize                               = False
+| | |-AuditRestart                                    = False
+| | |-AuditStart                                      = False
+| | |-AuditStop                                       = False
+| | |-AuditTools                                      = False
+| | |-DecodeData                                      = True
+| | |-DetStore                           @0x7f0b3dac11d0 = ServiceHandle('StoreGateSvc/DetectorStore')
+| | |-EvtStore                           @0x7f0b3dac1250 = ServiceHandle('StoreGateSvc')
+| | |-ExtraInputs                        @0x7f0b3db23830 = []  (default: [])
+| | |-ExtraOutputs                       @0x7f0b3db239e0 = []  (default: [])
+| | |-InputCollection                                 = 'StoreGateSvc+RPC_triggerHits'
+| | |-MonitorService                                  = 'MonitorSvc'
+| | |-OutputCollection                                = 'StoreGateSvc+RPCPAD'
+| | |-OutputLevel                                     = 0
+| | |-RPCInfoFromDb                                   = False
+| | |-RdoDecoderTool                     @0x7f0b3dbad3d0 = PrivateToolHandle('Muon::RpcRDO_Decoder/Muon::RpcRDO_Decoder')
+| | |                                                    (default: 'Muon::RpcRDO_Decoder')
+| | |-TriggerOutputCollection                         = 'StoreGateSvc+RPC_Measurements'
+| | |-etaphi_coincidenceTime                          = 20.0
+| | |-overlap_timeTolerance                           = 10.0
+| | |-processingData                                  = False
+| | |-produceRpcCoinDatafromTriggerWords              = True
+| | |-reduceCablingOverlap                            = True
+| | |-solvePhiAmbiguities                             = True
+| | |-timeShift                                       = -12.5
+| | |=/***** Private AlgTool Muon::RpcRDO_Decoder/RpcRdoToRpcPrepData.RpcRdoToRpcPrepDataTool.Muon::RpcRDO_Decoder *****
+| | | |-AuditFinalize                  = False
+| | | |-AuditInitialize                = False
+| | | |-AuditReinitialize              = False
+| | | |-AuditRestart                   = False
+| | | |-AuditStart                     = False
+| | | |-AuditStop                      = False
+| | | |-AuditTools                     = False
+| | | |-DetStore          @0x7f0b3dac12d0 = ServiceHandle('StoreGateSvc/DetectorStore')
+| | | |-EvtStore          @0x7f0b3dac1310 = ServiceHandle('StoreGateSvc')
+| | | |-ExtraInputs       @0x7f0b3db23b00 = []  (default: [])
+| | | |-ExtraOutputs      @0x7f0b3db23ab8 = []  (default: [])
+| | | |-MonitorService                 = 'MonitorSvc'
+| | | |-OutputLevel                    = 0
+| | | \----- (End of Private AlgTool Muon::RpcRDO_Decoder/RpcRdoToRpcPrepData.RpcRdoToRpcPrepDataTool.Muon::RpcRDO_Decoder) -----
+| | \----- (End of Private AlgTool Muon::RpcRdoToPrepDataTool/RpcRdoToRpcPrepData.RpcRdoToRpcPrepDataTool) -----
+| \----- (End of Algorithm RpcRdoToRpcPrepData/RpcRdoToRpcPrepData) ----------------------------------
+|=/***** Algorithm TgcRdoToTgcPrepData/TgcRdoToTgcPrepData *******************************************
+| |-AuditAlgorithms                         = False
+| |-AuditBeginRun                           = False
+| |-AuditEndRun                             = False
+| |-AuditExecute                            = False
+| |-AuditFinalize                           = False
+| |-AuditInitialize                         = False
+| |-AuditReinitialize                       = False
+| |-AuditRestart                            = False
+| |-AuditStart                              = False
+| |-AuditStop                               = False
+| |-Cardinality                             = 1
+| |-DecodingTool               @0x7f0b3dac9050 = PrivateToolHandle('Muon::TgcRdoToPrepDataTool/TgcRdoToTgcPrepDataTool')
+| |                                            (default: 'Muon::TgcRdoToPrepDataTool/TgcPrepDataProviderTool')
+| |-DetStore                   @0x7f0b3da9eed0 = ServiceHandle('StoreGateSvc/DetectorStore')
+| |-DoSeededDecoding                        = False
+| |-Enable                                  = True
+| |-ErrorCounter                            = 0
+| |-ErrorMax                                = 1
+| |-EvtStore                   @0x7f0b3da9ee50 = ServiceHandle('StoreGateSvc')
+| |-ExtraInputs                @0x7f0b3da4bdd0 = []  (default: [])
+| |-ExtraOutputs               @0x7f0b3da4bea8 = []  (default: [])
+| |-FilterCircularDependencies              = True
+| |-IsIOBound                               = False
+| |-MonitorService                          = 'MonitorSvc'
+| |-NeededResources            @0x7f0b3da4bef0 = []  (default: [])
+| |-OutputCollection                        = 'StoreGateSvc+TGC_Measurements'
+| |-OutputLevel                             = 0
+| |-PrintInputRdo                           = False
+| |-PrintPrepData              @0x7f0b415b9b20 = False  (default: False)
+| |-RegionSelectorSvc          @0x7f0b3da9ef50 = ServiceHandle('RegSelSvc')
+| |-RegisterForContextService               = False
+| |-RoIs                                    = 'StoreGateSvc+OutputRoIs'
+| |-Setting                                 = 0
+| |-Timeline                                = True
+| |=/***** Private AlgTool Muon::TgcRdoToPrepDataTool/TgcRdoToTgcPrepData.TgcRdoToTgcPrepDataTool ******
+| | |-AuditFinalize                                        = False
+| | |-AuditInitialize                                      = False
+| | |-AuditReinitialize                                    = False
+| | |-AuditRestart                                         = False
+| | |-AuditStart                                           = False
+| | |-AuditStop                                            = False
+| | |-AuditTools                                           = False
+| | |-DecodeData                                           = True
+| | |-DetStore                                @0x7f0b3dac1450 = ServiceHandle('StoreGateSvc/DetectorStore')
+| | |-EvtStore                                @0x7f0b3dac1510 = ServiceHandle('StoreGateSvc')
+| | |-ExtraInputs                             @0x7f0b3dac8638 = []  (default: [])
+| | |-ExtraOutputs                            @0x7f0b3dac85f0 = []  (default: [])
+| | |-FillCoinData                                         = True
+| | |-MonitorService                                       = 'MonitorSvc'
+| | |-OutputCoinCollection                                 = 'TrigT1CoinDataCollection'
+| | |-OutputCollection                                     = 'TGC_Measurements'
+| | |-OutputLevel                                          = 0
+| | |-RDOContainer                                         = 'StoreGateSvc+TGCRDO'
+| | |-TGCHashIdOffset                                      = 26000
+| | |-dropPrdsWithZeroWidth                                = True
+| | |-outputCoinKey                           @0x7f0b3dac8050 = ['StoreGateSvc+dummy', 'StoreGateSvc+dummy', 'StoreGateSvc+dummy']
+| | |                                                         (default: ['StoreGateSvc+dummy', 'StoreGateSvc+dummy', 'StoreGateSvc+dummy'])
+| | |-prepDataKeys                            @0x7f0b3dac86c8 = ['StoreGateSvc+dummy', 'StoreGateSvc+dummy', 'StoreGateSvc+dummy', 'StoreGateSvc+dummy']
+| | |                                                         (default: ['StoreGateSvc+dummy', 'StoreGateSvc+dummy', 'StoreGateSvc+dummy', 'StoreGateSvc+dummy'])
+| | |-show_warning_level_invalid_A09_SSW6_hit              = False
+| | \----- (End of Private AlgTool Muon::TgcRdoToPrepDataTool/TgcRdoToTgcPrepData.TgcRdoToTgcPrepDataTool) -----
+| \----- (End of Algorithm TgcRdoToTgcPrepData/TgcRdoToTgcPrepData) ----------------------------------
+|=/***** Algorithm MdtRdoToMdtPrepData/MdtRdoToMdtPrepData *******************************************
+| |-AuditAlgorithms                         = False
+| |-AuditBeginRun                           = False
+| |-AuditEndRun                             = False
+| |-AuditExecute                            = False
+| |-AuditFinalize                           = False
+| |-AuditInitialize                         = False
+| |-AuditReinitialize                       = False
+| |-AuditRestart                            = False
+| |-AuditStart                              = False
+| |-AuditStop                               = False
+| |-Cardinality                             = 1
+| |-DecodingTool               @0x7f0b416bb9f0 = PrivateToolHandle('Muon::MdtRdoToPrepDataTool/MdtRdoToMdtPrepDataTool')
+| |                                            (default: 'Muon::MdtRdoToPrepDataTool/MdtPrepDataProviderTool')
+| |-DetStore                   @0x7f0b3db32e90 = ServiceHandle('StoreGateSvc/DetectorStore')
+| |-DoSeededDecoding                        = False
+| |-Enable                                  = True
+| |-ErrorCounter                            = 0
+| |-ErrorMax                                = 1
+| |-EvtStore                   @0x7f0b3db32e10 = ServiceHandle('StoreGateSvc')
+| |-ExtraInputs                @0x7f0b3dae60e0 = []  (default: [])
+| |-ExtraOutputs               @0x7f0b3da4bfc8 = []  (default: [])
+| |-FilterCircularDependencies              = True
+| |-IsIOBound                               = False
+| |-MonitorService                          = 'MonitorSvc'
+| |-NeededResources            @0x7f0b3da4be18 = []  (default: [])
+| |-OutputCollection                        = 'StoreGateSvc+MDT_DriftCircles'
+| |-OutputLevel                             = 0
+| |-PrintInputRdo                           = False
+| |-PrintPrepData              @0x7f0b415b9b20 = False  (default: False)
+| |-RegionSelectionSvc         @0x7f0b3db32f10 = ServiceHandle('RegSelSvc')
+| |-RegisterForContextService               = False
+| |-RoIs                                    = 'StoreGateSvc+OutputRoIs'
+| |-Timeline                                = True
+| |=/***** Private AlgTool Muon::MdtRdoToPrepDataTool/MdtRdoToMdtPrepData.MdtRdoToMdtPrepDataTool ******
+| | |-AuditFinalize                        = False
+| | |-AuditInitialize                      = False
+| | |-AuditReinitialize                    = False
+| | |-AuditRestart                         = False
+| | |-AuditStart                           = False
+| | |-AuditStop                            = False
+| | |-AuditTools                           = False
+| | |-CalibratePrepData                    = True
+| | |-DecodeData                           = True
+| | |-DetStore                @0x7f0b3dac1650 = ServiceHandle('StoreGateSvc/DetectorStore')
+| | |-DiscardSecondaryHitTwin              = False
+| | |-DoPropagationCorrection              = False
+| | |-DoTofCorrection                      = True
+| | |-EvtStore                @0x7f0b3dac1610 = ServiceHandle('StoreGateSvc')
+| | |-ExtraInputs             @0x7f0b3dad20e0 = []  (default: [])
+| | |-ExtraOutputs            @0x7f0b3dad0f38 = []  (default: [])
+| | |-MonitorService                       = 'MonitorSvc'
+| | |-OutputCollection                     = 'StoreGateSvc+MDT_DriftCircles'
+| | |-OutputLevel                          = 0
+| | |-RDOContainer                         = 'StoreGateSvc+MDTCSM'
+| | |-ReadKey                              = 'ConditionStore+MuonMDT_CablingMap'
+| | |-SortPrepData                         = False
+| | |-TimeWindowLowerBound                 = -1000000.0
+| | |-TimeWindowSetting                    = 2
+| | |-TimeWindowUpperBound                 = -1000000.0
+| | |-TwinCorrectSlewing                   = False
+| | |-Use1DPrepDataTwin                    = False
+| | |-UseAllBOLTwin                        = False
+| | |-UseTwin                              = True
+| | \----- (End of Private AlgTool Muon::MdtRdoToPrepDataTool/MdtRdoToMdtPrepData.MdtRdoToMdtPrepDataTool) -----
+| \----- (End of Algorithm MdtRdoToMdtPrepData/MdtRdoToMdtPrepData) ----------------------------------
+|=/***** Algorithm CscRdoToCscPrepData/CscRdoToCscPrepData *******************************************
+| |-AuditAlgorithms                         = False
+| |-AuditBeginRun                           = False
+| |-AuditEndRun                             = False
+| |-AuditExecute                            = False
+| |-AuditFinalize                           = False
+| |-AuditInitialize                         = False
+| |-AuditReinitialize                       = False
+| |-AuditRestart                            = False
+| |-AuditStart                              = False
+| |-AuditStop                               = False
+| |-Cardinality                             = 1
+| |-CscRdoToCscPrepDataTool    @0x7f0b3df7f950 = PrivateToolHandle('Muon::CscRdoToCscPrepDataTool/CscRdoToCscPrepDataTool')
+| |                                            (default: 'Muon::CscRdoToCscPrepDataTool/CscRdoToPrepDataTool')
+| |-DetStore                   @0x7f0b3db16c90 = ServiceHandle('StoreGateSvc/DetectorStore')
+| |-DoSeededDecoding                        = False
+| |-Enable                                  = True
+| |-ErrorCounter                            = 0
+| |-ErrorMax                                = 1
+| |-EvtStore                   @0x7f0b3db16c10 = ServiceHandle('StoreGateSvc')
+| |-ExtraInputs                @0x7f0b3dae61b8 = []  (default: [])
+| |-ExtraOutputs               @0x7f0b3da4bf38 = []  (default: [])
+| |-FilterCircularDependencies              = True
+| |-IsIOBound                               = False
+| |-MonitorService                          = 'MonitorSvc'
+| |-NeededResources            @0x7f0b3dae6128 = []  (default: [])
+| |-OutputCollection                        = 'StoreGateSvc+CSC_Measurements'
+| |-OutputLevel                             = 0
+| |-PrintInputRdo                           = False
+| |-PrintPrepData              @0x7f0b415b9b20 = False  (default: False)
+| |-RegionSelectionSvc         @0x7f0b3db16d10 = ServiceHandle('RegSelSvc')
+| |-RegisterForContextService               = False
+| |-RoIs                                    = 'StoreGateSvc+OutputRoIs'
+| |-Timeline                                = True
+| |=/***** Private AlgTool Muon::CscRdoToCscPrepDataTool/CscRdoToCscPrepData.CscRdoToCscPrepDataTool *****
+| | |-AuditFinalize                    = False
+| | |-AuditInitialize                  = False
+| | |-AuditReinitialize                = False
+| | |-AuditRestart                     = False
+| | |-AuditStart                       = False
+| | |-AuditStop                        = False
+| | |-AuditTools                       = False
+| | |-CSCHashIdOffset                  = 22000
+| | |-CscCalibTool        @0x7f0b4167c860 = PrivateToolHandle('CscCalibTool/CscCalibTool')
+| | |-CscRdoDecoderTool   @0x7f0b3dac6878 = PrivateToolHandle('Muon::CscRDO_Decoder/CscRDO_Decoder')
+| | |-DecodeData                       = True
+| | |-DetStore            @0x7f0b3dac1990 = ServiceHandle('StoreGateSvc/DetectorStore')
+| | |-EvtStore            @0x7f0b3dac1a90 = ServiceHandle('StoreGateSvc')
+| | |-ExtraInputs         @0x7f0b3dad7290 = []  (default: [])
+| | |-ExtraOutputs        @0x7f0b3dad7128 = []  (default: [])
+| | |-MonitorService                   = 'MonitorSvc'
+| | |-OutputCollection                 = 'StoreGateSvc+CSC_Measurements'
+| | |-OutputLevel                      = 0
+| | |-RDOContainer                     = 'StoreGateSvc+CSCRDO'
+| | |-RawDataProviderTool @0x7f0b3e575af8 = PrivateToolHandle('Muon::CSC_RawDataProviderTool/CSC_RawDataProviderTool')
+| | |-useBStoRdoTool      @0x7f0b415b9b00 = True  (default: False)
+| | |=/***** Private AlgTool Muon::CSC_RawDataProviderTool/CscRdoToCscPrepData.CscRdoToCscPrepDataTool.CSC_RawDataProviderTool *****
+| | | |-AuditFinalize                     = False
+| | | |-AuditInitialize                   = False
+| | | |-AuditReinitialize                 = False
+| | | |-AuditRestart                      = False
+| | | |-AuditStart                        = False
+| | | |-AuditStop                         = False
+| | | |-AuditTools                        = False
+| | | |-CscContainerCacheKey              = 'StoreGateSvc+'
+| | | |-Decoder              @0x7f0b3dff3230 = PrivateToolHandle('Muon::CscROD_Decoder/CscROD_Decoder')
+| | | |-DetStore             @0x7f0b3dac1b90 = ServiceHandle('StoreGateSvc/DetectorStore')
+| | | |-EvtStore             @0x7f0b3dac1bd0 = ServiceHandle('StoreGateSvc')
+| | | |-ExtraInputs          @0x7f0b3e031bd8 = []  (default: [])
+| | | |-ExtraOutputs         @0x7f0b3dbb4bd8 = []  (default: [])
+| | | |-MonitorService                    = 'MonitorSvc'
+| | | |-OutputLevel                       = 0
+| | | |-RdoLocation                       = 'StoreGateSvc+CSCRDO'
+| | | |=/***** Private AlgTool Muon::CscROD_Decoder/CscRdoToCscPrepData.CscRdoToCscPrepDataTool.CSC_RawDataProviderTool.CscROD_Decoder *****
+| | | | |-AuditFinalize                  = False
+| | | | |-AuditInitialize                = False
+| | | | |-AuditReinitialize              = False
+| | | | |-AuditRestart                   = False
+| | | | |-AuditStart                     = False
+| | | | |-AuditStop                      = False
+| | | | |-AuditTools                     = False
+| | | | |-DetStore          @0x7f0b3dac1c10 = ServiceHandle('StoreGateSvc/DetectorStore')
+| | | | |-EvtStore          @0x7f0b3dac1c90 = ServiceHandle('StoreGateSvc')
+| | | | |-ExtraInputs       @0x7f0b3e0317a0 = []  (default: [])
+| | | | |-ExtraOutputs      @0x7f0b3e0315a8 = []  (default: [])
+| | | | |-IsCosmics                      = False
+| | | | |-IsOldCosmics                   = False
+| | | | |-MonitorService                 = 'MonitorSvc'
+| | | | |-OutputLevel                    = 0
+| | | | \----- (End of Private AlgTool Muon::CscROD_Decoder/CscRdoToCscPrepData.CscRdoToCscPrepDataTool.CSC_RawDataProviderTool.CscROD_Decoder) -----
+| | | \----- (End of Private AlgTool Muon::CSC_RawDataProviderTool/CscRdoToCscPrepData.CscRdoToCscPrepDataTool.CSC_RawDataProviderTool) -----
+| | |=/***** Private AlgTool CscCalibTool/CscRdoToCscPrepData.CscRdoToCscPrepDataTool.CscCalibTool *******
+| | | |-AuditFinalize                   = False
+| | | |-AuditInitialize                 = False
+| | | |-AuditReinitialize               = False
+| | | |-AuditRestart                    = False
+| | | |-AuditStart                      = False
+| | | |-AuditStop                       = False
+| | | |-AuditTools                      = False
+| | | |-DetStore           @0x7f0b3dac1ad0 = ServiceHandle('StoreGateSvc/DetectorStore')
+| | | |-EvtStore           @0x7f0b3dac1b10 = ServiceHandle('StoreGateSvc')
+| | | |-ExtraInputs        @0x7f0b3dad21b8 = []  (default: [])
+| | | |-ExtraOutputs       @0x7f0b3dad2170 = []  (default: [])
+| | | |-IsOnline                        = True
+| | | |-Latency                         = 100.0
+| | | |-MonitorService                  = 'MonitorSvc'
+| | | |-NSamples                        = 4
+| | | |-Noise                           = 3.5
+| | | |-OutputLevel                     = 0
+| | | |-Pedestal                        = 2048.0
+| | | |-ReadFromDatabase                = True
+| | | |-Slope                           = 0.19
+| | | |-SlopeFromDatabase               = False
+| | | |-TimeOffsetRange                 = 1.0
+| | | |-Use2Samples                     = False
+| | | |-integrationNumber               = 12.0
+| | | |-integrationNumber2              = 11.66
+| | | |-samplingTime                    = 50.0
+| | | |-signalWidth                     = 14.4092
+| | | |-timeOffset                      = 46.825
+| | | \----- (End of Private AlgTool CscCalibTool/CscRdoToCscPrepData.CscRdoToCscPrepDataTool.CscCalibTool) -----
+| | |=/***** Private AlgTool Muon::CscRDO_Decoder/CscRdoToCscPrepData.CscRdoToCscPrepDataTool.CscRDO_Decoder *****
+| | | |-AuditFinalize                  = False
+| | | |-AuditInitialize                = False
+| | | |-AuditReinitialize              = False
+| | | |-AuditRestart                   = False
+| | | |-AuditStart                     = False
+| | | |-AuditStop                      = False
+| | | |-AuditTools                     = False
+| | | |-CscCalibTool      @0x7f0b3dac1a10 = PublicToolHandle('CscCalibTool')
+| | | |-DetStore          @0x7f0b3dac19d0 = ServiceHandle('StoreGateSvc/DetectorStore')
+| | | |-EvtStore          @0x7f0b3dac1a50 = ServiceHandle('StoreGateSvc')
+| | | |-ExtraInputs       @0x7f0b3dad24d0 = []  (default: [])
+| | | |-ExtraOutputs      @0x7f0b3dad2b00 = []  (default: [])
+| | | |-MonitorService                 = 'MonitorSvc'
+| | | |-OutputLevel                    = 0
+| | | \----- (End of Private AlgTool Muon::CscRDO_Decoder/CscRdoToCscPrepData.CscRdoToCscPrepDataTool.CscRDO_Decoder) -----
+| | \----- (End of Private AlgTool Muon::CscRdoToCscPrepDataTool/CscRdoToCscPrepData.CscRdoToCscPrepDataTool) -----
+| \----- (End of Algorithm CscRdoToCscPrepData/CscRdoToCscPrepData) ----------------------------------
+|=/***** Algorithm CscThresholdClusterBuilder/CscThesholdClusterBuilder ******************************
+| |-AuditAlgorithms                         = False
+| |-AuditBeginRun                           = False
+| |-AuditEndRun                             = False
+| |-AuditExecute                            = False
+| |-AuditFinalize                           = False
+| |-AuditInitialize                         = False
+| |-AuditReinitialize                       = False
+| |-AuditRestart                            = False
+| |-AuditStart                              = False
+| |-AuditStop                               = False
+| |-Cardinality                             = 1
+| |-DetStore                   @0x7f0b3dafef90 = ServiceHandle('StoreGateSvc/DetectorStore')
+| |-Enable                                  = True
+| |-ErrorCounter                            = 0
+| |-ErrorMax                                = 1
+| |-EvtStore                   @0x7f0b3dafef10 = ServiceHandle('StoreGateSvc')
+| |-ExtraInputs                @0x7f0b3dae6170 = []  (default: [])
+| |-ExtraOutputs               @0x7f0b3dae6320 = []  (default: [])
+| |-FilterCircularDependencies              = True
+| |-IsIOBound                               = False
+| |-MonitorService                          = 'MonitorSvc'
+| |-NeededResources            @0x7f0b3dae62d8 = []  (default: [])
+| |-OutputLevel                             = 0
+| |-RegisterForContextService               = False
+| |-Timeline                                = True
+| |-cluster_builder            @0x7f0b3da46910 = PublicToolHandle('CscThresholdClusterBuilderTool/CscThesholdClusterBuilderTool')
+| |                                            (default: 'CscThresholdClusterBuilderTool/CscThresholdClusterBuilderTool')
+| \----- (End of Algorithm CscThresholdClusterBuilder/CscThesholdClusterBuilder) ---------------------
+\----- (End of Algorithm AthSequencer/AthAlgSeq) ---------------------------------------------------
+Py:ComponentAccumulator    INFO Condition Algorithms
+Py:ComponentAccumulator    INFO ['CondInputLoader', 'MuonMDT_CablingAlg']
+Py:ComponentAccumulator    INFO Services
+Py:ComponentAccumulator    INFO ['EventSelector', 'ByteStreamInputSvc', 'EventPersistencySvc', 'ByteStreamCnvSvc', 'ROBDataProviderSvc', 'ByteStreamAddressProviderSvc', 'MetaDataStore', 'InputMetaDataStore', 'MetaDataSvc', 'ProxyProviderSvc', 'ByteStreamAttListMetadataSvc', 'GeoModelSvc', 'DetDescrCnvSvc', 'TagInfoMgr', 'RPCcablingServerSvc', 'IOVDbSvc', 'PoolSvc', 'CondSvc', 'DBReplicaSvc', 'MuonRPC_CablingSvc', 'LVL1TGC::TGCRecRoiSvc', 'TGCcablingServerSvc', 'AthenaPoolCnvSvc', 'MuonMDT_CablingSvc', 'AtlasFieldSvc', 'MdtCalibrationDbSvc', 'MdtCalibrationSvc', 'CSCcablingSvc', 'MuonCalib::CscCoolStrSvc']
+Py:ComponentAccumulator    INFO Outputs
+Py:ComponentAccumulator    INFO {}
+Py:ComponentAccumulator    INFO Public Tools
+Py:ComponentAccumulator    INFO [
+Py:ComponentAccumulator    INFO   IOVDbMetaDataTool/IOVDbMetaDataTool,
+Py:ComponentAccumulator    INFO   ByteStreamMetadataTool/ByteStreamMetadataTool,
+Py:ComponentAccumulator    INFO   Muon::MuonIdHelperTool/Muon::MuonIdHelperTool,
+Py:ComponentAccumulator    INFO   RPCCablingDbTool/RPCCablingDbTool,
+Py:ComponentAccumulator    INFO   Muon::RPC_RawDataProviderTool/RPC_RawDataProviderTool,
+Py:ComponentAccumulator    INFO   Muon::TGC_RawDataProviderTool/TGC_RawDataProviderTool,
+Py:ComponentAccumulator    INFO   MDTCablingDbTool/MDTCablingDbTool,
+Py:ComponentAccumulator    INFO   MuonCalib::MdtCalibDbCoolStrTool/MuonCalib::MdtCalibDbCoolStrTool,
+Py:ComponentAccumulator    INFO   Muon::MDT_RawDataProviderTool/MDT_RawDataProviderTool,
+Py:ComponentAccumulator    INFO   Muon::CSC_RawDataProviderTool/CSC_RawDataProviderTool,
+Py:ComponentAccumulator    INFO   Muon::RpcRdoToPrepDataTool/RpcRdoToRpcPrepDataTool,
+Py:ComponentAccumulator    INFO   Muon::TgcRdoToPrepDataTool/TgcRdoToTgcPrepDataTool,
+Py:ComponentAccumulator    INFO   Muon::MdtRdoToPrepDataTool/MdtRdoToMdtPrepDataTool,
+Py:ComponentAccumulator    INFO   Muon::CscRdoToCscPrepDataTool/CscRdoToCscPrepDataTool,
+Py:ComponentAccumulator    INFO   CscThresholdClusterBuilderTool/CscThesholdClusterBuilderTool,
+Py:ComponentAccumulator    INFO ]
+Py:Athena            INFO Save Config
+
+JOs reading stage finished, launching Athena from pickle file
+
+Fri Jan 25 22:53:54 CET 2019
+Preloading tcmalloc_minimal.so
+Py:Athena            INFO using release [WorkDir-22.0.1] [x86_64-slc6-gcc8-opt] [atlas-work3/5f61275c16] -- built on [2019-01-25T1856]
+Py:Athena            INFO including file "AthenaCommon/Preparation.py"
+Py:Athena            INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
+Py:Athena            INFO executing ROOT6Setup
+Py:Athena            INFO configuring AthenaHive with [1] concurrent threads and [1] concurrent events
+Py:AlgScheduler      INFO setting up AvalancheSchedulerSvc/AvalancheSchedulerSvc with 1 threads
+Py:Athena            INFO including file "AthenaCommon/Execution.py"
+Py:Athena            INFO now loading MuonRdoDecode_Cache.pkl  ... 
+Py:ConfigurableDb    INFO Read module info for 5454 configurables from 75 genConfDb files
+Py:ConfigurableDb    INFO No duplicates have been found: that's good !
+[?1034hApplicationMgr       INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
+ApplicationMgr    SUCCESS 
+====================================================================================================================================
+                                                   Welcome to ApplicationMgr (GaudiCoreSvc v30r5)
+                                          running on lxplus063.cern.ch on Fri Jan 25 22:54:21 2019
+====================================================================================================================================
+ApplicationMgr       INFO Successfully loaded modules : AthenaServices
+ApplicationMgr       INFO Application Manager Configured successfully
+ApplicationMgr                                     INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
+Py:Athena            INFO including file "AthenaCommon/runbatch.py"
+StatusCodeSvc        INFO initialize
+AthDictLoaderSvc     INFO in initialize...
+AthDictLoaderSvc     INFO acquired Dso-registry
+ClassIDSvc           INFO  getRegistryEntries: read 3320 CLIDRegistry entries for module ALL
+CoreDumpSvc          INFO install f-a-t-a-l handler... (flag = -1)
+CoreDumpSvc          INFO Handling signals: 11(Segmentation fault) 7(Bus error) 4(Illegal instruction) 8(Floating point exception) 
+ByteStreamAddre...   INFO Initializing ByteStreamAddressProviderSvc - package version ByteStreamCnvSvcBase-00-00-00
+ROBDataProviderSvc   INFO Initializing ROBDataProviderSvc - package version ByteStreamCnvSvcBase-00-00-00
+ROBDataProviderSvc   INFO  ---> Filter out empty ROB fragments                               =  'filterEmptyROB':False
+ROBDataProviderSvc   INFO  ---> Filter out specific ROBs by Status Code: # ROBs = 0
+ROBDataProviderSvc   INFO  ---> Filter out Sub Detector ROBs by Status Code: # Sub Detectors = 0
+ByteStreamAddre...   INFO initialized 
+ByteStreamAddre...   INFO -- Module IDs for: 
+ByteStreamAddre...   INFO    CTP                                  = 0x1
+ByteStreamAddre...   INFO    muCTPi                               = 0x1
+ByteStreamAddre...   INFO    Calorimeter Cluster Processor RoI    = 0xa8, 0xa9, 0xaa, 0xab
+ByteStreamAddre...   INFO    Calorimeter Jet/Energy Processor RoI = 0xac, 0xad
+ByteStreamAddre...   INFO    Topo Processor RoI = 0x81, 0x91
+ByteStreamAddre...   INFO -- Will fill Store with id =  0
+PoolSvc              INFO io_register[PoolSvc](xmlcatalog_file:PoolFileCatalog.xml) [ok]
+PoolSvc              INFO Set connectionsvc retry/timeout/IDLE timeout to  'ConnectionRetrialPeriod':300/ 'ConnectionRetrialTimeOut':3600/ 'ConnectionTimeOut':5 seconds with connection cleanup disabled
+PoolSvc              INFO Frontier compression level set to 5
+DBReplicaSvc         INFO Frontier server at (serverurl=http://atlasfrontier-local.cern.ch:8000/atlr)(serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://lcgft-atlas.gridpp.rl.ac.uk:3128/frontierATLAS)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://ca-proxy.cern.ch:3128)(proxyurl=http://ca-proxy-meyrin.cern.ch:3128)(proxyurl=http://ca-proxy-wigner.cern.ch:3128)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
+DBReplicaSvc         INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-24T2342/Athena/22.0.1/InstallArea/x86_64-slc6-gcc8-opt/share/dbreplica.config
+DBReplicaSvc         INFO Total of 10 servers found for host lxplus063.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
+DBReplicaSvc         INFO COOL SQLite replicas will be excluded if matching pattern /DBRelease/
+PoolSvc              INFO Successfully setup replica sorting algorithm
+PoolSvc              INFO Setting up APR FileCatalog and Streams
+PoolSvc              INFO Resolved path (via ATLAS_POOLCOND_PATH) is /cvmfs/atlas-condb.cern.ch/repo/conditions/poolcond/PoolFileCatalog.xml
+PoolSvc           WARNING Unable to locate catalog for prfile:poolcond/PoolCat_oflcond.xml check your ATLAS_POOLCOND_PATH and DATAPATH variables
+PoolSvc           WARNING Unable to locate catalog for apcfile:poolcond/PoolCat_oflcond.xml check your ATLAS_POOLCOND_PATH and DATAPATH variables
+PoolSvc           WARNING Unable to locate catalog for prfile:poolcond/PoolCat_comcond.xml check your ATLAS_POOLCOND_PATH and DATAPATH variables
+PoolSvc           WARNING Unable to locate catalog for apcfile:poolcond/PoolCat_comcond.xml check your ATLAS_POOLCOND_PATH and DATAPATH variables
+PoolSvc              INFO POOL WriteCatalog is xmlcatalog_file:PoolFileCatalog.xml
+DbSession            INFO     Open     DbSession    
+Domain[ROOT_All]     INFO >   Access   DbDomain     READ      [ROOT_All] 
+IOVDbSvc             INFO Opened read transaction for POOL PersistencySvc
+IOVDbSvc             INFO Only 5 POOL conditions files will be open at once
+IOVDbSvc             INFO Cache alignment will be done in 3 slices
+IOVDbSvc             INFO Global tag: CONDBR2-BLKPA-2018-13 set from joboptions
+IOVDbFolder          INFO Inputfile tag override disabled for /GLOBAL/BField/Maps
+IOVDbSvc             INFO Folder /GLOBAL/BField/Maps will be written to file metadata
+IOVDbSvc             INFO Initialised with 8 connections and 19 folders
+IOVDbSvc             INFO Service IOVDbSvc initialised successfully
+MetaDataSvc          INFO Initializing MetaDataSvc - package version AthenaServices-00-00-00
+AthenaPoolCnvSvc     INFO Initializing AthenaPoolCnvSvc - package version AthenaPoolCnvSvc-00-00-00
+ToolSvc.ByteStr...   INFO Initializing ToolSvc.ByteStreamMetadataTool - package version ByteStreamCnvSvc-00-00-00
+MetaDataSvc          INFO Found MetaDataTools = PublicToolHandleArray(['IOVDbMetaDataTool/IOVDbMetaDataTool','ByteStreamMetadataTool/ByteStreamMetadataTool'])
+IOVDbSvc             INFO Opening COOL connection for COOLONL_MDT/CONDBR2
+ClassIDSvc           INFO  getRegistryEntries: read 3288 CLIDRegistry entries for module ALL
+ClassIDSvc           INFO  getRegistryEntries: read 163 CLIDRegistry entries for module ALL
+ClassIDSvc           INFO  getRegistryEntries: read 4096 CLIDRegistry entries for module ALL
+ClassIDSvc           INFO  getRegistryEntries: read 129 CLIDRegistry entries for module ALL
+ClassIDSvc           INFO  getRegistryEntries: read 3031 CLIDRegistry entries for module ALL
+IOVSvc               INFO No IOVSvcTool associated with store "StoreGateSvc"
+IOVSvcTool           INFO IOVRanges will be checked at every Event
+IOVDbSvc             INFO Opening COOL connection for COOLONL_RPC/CONDBR2
+IOVDbSvc             INFO Disconnecting from COOLONL_MDT/CONDBR2
+IOVDbSvc             INFO Opening COOL connection for COOLOFL_MDT/CONDBR2
+IOVDbSvc             INFO Disconnecting from COOLONL_RPC/CONDBR2
+IOVDbSvc             INFO Opening COOL connection for COOLOFL_CSC/CONDBR2
+IOVDbSvc             INFO Disconnecting from COOLOFL_MDT/CONDBR2
+IOVDbSvc             INFO Opening COOL connection for COOLONL_GLOBAL/CONDBR2
+IOVDbSvc             INFO Disconnecting from COOLOFL_CSC/CONDBR2
+IOVDbSvc             INFO Opening COOL connection for COOLONL_TGC/CONDBR2
+IOVDbSvc             INFO Disconnecting from COOLONL_GLOBAL/CONDBR2
+IOVDbSvc             INFO Opening COOL connection for COOLOFL_DCS/CONDBR2
+IOVDbSvc             INFO Disconnecting from COOLONL_TGC/CONDBR2
+IOVDbSvc             INFO Disconnecting from COOLOFL_DCS/CONDBR2
+IOVDbSvc             INFO Added taginfo remove for /EXT/DCS/MAGNETS/SENSORDATA
+IOVDbSvc             INFO Added taginfo remove for /GLOBAL/BField/Maps
+IOVDbSvc             INFO Added taginfo remove for /MDT/CABLING/MAP_SCHEMA
+IOVDbSvc             INFO Added taginfo remove for /MDT/CABLING/MEZZANINE_SCHEMA
+IOVDbSvc             INFO Added taginfo remove for /MDT/RTBLOB
+IOVDbSvc             INFO Added taginfo remove for /MDT/T0BLOB
+IOVDbSvc             INFO Added taginfo remove for /RPC/CABLING/MAP_SCHEMA
+IOVDbSvc             INFO Added taginfo remove for /RPC/CABLING/MAP_SCHEMA_CORR
+IOVDbSvc             INFO Added taginfo remove for /RPC/TRIGGER/CM_THR_ETA
+IOVDbSvc             INFO Added taginfo remove for /RPC/TRIGGER/CM_THR_PHI
+IOVDbSvc             INFO Added taginfo remove for /TGC/CABLING/MAP_SCHEMA
+IOVDbSvc             INFO Added taginfo remove for /CSC/FTHOLD
+IOVDbSvc             INFO Added taginfo remove for /CSC/NOISE
+IOVDbSvc             INFO Added taginfo remove for /CSC/PED
+IOVDbSvc             INFO Added taginfo remove for /CSC/PSLOPE
+IOVDbSvc             INFO Added taginfo remove for /CSC/RMS
+IOVDbSvc             INFO Added taginfo remove for /CSC/STAT
+IOVDbSvc             INFO Added taginfo remove for /CSC/T0BASE
+IOVDbSvc             INFO Added taginfo remove for /CSC/T0PHASE
+DetDescrCnvSvc       INFO  initializing 
+DetDescrCnvSvc       INFO Found DetectorStore service
+DetDescrCnvSvc       INFO  filling proxies for detector managers 
+DetDescrCnvSvc       INFO  filling address for CaloTTMgr with CLID 117659265 and storage type 68 to detector store 
+DetDescrCnvSvc       INFO  filling address for CaloMgr with CLID 4548337 and storage type 68 to detector store 
+DetDescrCnvSvc       INFO  filling address for CaloSuperCellMgr with CLID 241807251 and storage type 68 to detector store 
+DetDescrCnvSvc       INFO  filling address for CaloIdManager with CLID 125856940 and storage type 68 to detector store 
+DetDescrCnvSvc       INFO  filling address for LArIdManager with CLID 79554919 and storage type 68 to detector store 
+DetDescrCnvSvc       INFO  filling address for IdDict with CLID 2411 and storage type 68 to detector store 
+DetDescrCnvSvc       INFO  filling address for AtlasID with CLID 164875623 and storage type 68 to detector store 
+DetDescrCnvSvc       INFO  filling address for PixelID with CLID 2516 and storage type 68 to detector store 
+DetDescrCnvSvc       INFO  filling address for SCT_ID with CLID 2517 and storage type 68 to detector store 
+DetDescrCnvSvc       INFO  filling address for TRT_ID with CLID 2518 and storage type 68 to detector store 
+DetDescrCnvSvc       INFO  filling address for SiliconID with CLID 129452393 and storage type 68 to detector store 
+DetDescrCnvSvc       INFO  filling address for LArEM_ID with CLID 163583365 and storage type 68 to detector store 
+DetDescrCnvSvc       INFO  filling address for LArEM_SuperCell_ID with CLID 99488227 and storage type 68 to detector store 
+DetDescrCnvSvc       INFO  filling address for LArHEC_ID with CLID 3870484 and storage type 68 to detector store 
+DetDescrCnvSvc       INFO  filling address for LArHEC_SuperCell_ID with CLID 254277678 and storage type 68 to detector store 
+DetDescrCnvSvc       INFO  filling address for LArFCAL_ID with CLID 45738051 and storage type 68 to detector store 
+DetDescrCnvSvc       INFO  filling address for LArFCAL_SuperCell_ID with CLID 12829437 and storage type 68 to detector store 
+DetDescrCnvSvc       INFO  filling address for LArMiniFCAL_ID with CLID 79264204 and storage type 68 to detector store 
+DetDescrCnvSvc       INFO  filling address for LArOnlineID with CLID 158698068 and storage type 68 to detector store 
+DetDescrCnvSvc       INFO  filling address for TTOnlineID with CLID 38321944 and storage type 68 to detector store 
+DetDescrCnvSvc       INFO  filling address for LArOnline_SuperCellID with CLID 115600394 and storage type 68 to detector store 
+DetDescrCnvSvc       INFO  filling address for LArHVLineID with CLID 27863673 and storage type 68 to detector store 
+DetDescrCnvSvc       INFO  filling address for LArElectrodeID with CLID 80757351 and storage type 68 to detector store 
+DetDescrCnvSvc       INFO  filling address for TileID with CLID 2901 and storage type 68 to detector store 
+DetDescrCnvSvc       INFO  filling address for Tile_SuperCell_ID with CLID 49557789 and storage type 68 to detector store 
+DetDescrCnvSvc       INFO  filling address for TileHWID with CLID 2902 and storage type 68 to detector store 
+DetDescrCnvSvc       INFO  filling address for TileTBID with CLID 2903 and storage type 68 to detector store 
+DetDescrCnvSvc       INFO  filling address for MDTIDHELPER with CLID 4170 and storage type 68 to detector store 
+DetDescrCnvSvc       INFO  filling address for CSCIDHELPER with CLID 4171 and storage type 68 to detector store 
+DetDescrCnvSvc       INFO  filling address for RPCIDHELPER with CLID 4172 and storage type 68 to detector store 
+DetDescrCnvSvc       INFO  filling address for TGCIDHELPER with CLID 4173 and storage type 68 to detector store 
+DetDescrCnvSvc       INFO  filling address for STGCIDHELPER with CLID 4174 and storage type 68 to detector store 
+DetDescrCnvSvc       INFO  filling address for MMIDHELPER with CLID 4175 and storage type 68 to detector store 
+DetDescrCnvSvc       INFO  filling address for CaloLVL1_ID with CLID 108133391 and storage type 68 to detector store 
+DetDescrCnvSvc       INFO  filling address for CaloCell_ID with CLID 123500438 and storage type 68 to detector store 
+DetDescrCnvSvc       INFO  filling address for CaloCell_SuperCell_ID with CLID 128365736 and storage type 68 to detector store 
+DetDescrCnvSvc       INFO  filling address for CaloDM_ID with CLID 167756483 and storage type 68 to detector store 
+DetDescrCnvSvc       INFO  filling address for ZdcID with CLID 190591643 and storage type 68 to detector store 
+GeoModelSvc.Muo...   INFO Initializing ...
+GeoModelSvc::RD...WARNING  Getting PixTBMatComponents with default tag
+GeoModelSvc::RD...WARNING  Getting PixTBMaterials with default tag
+GeoModelSvc::RD...WARNING  Getting InDetMatComponents with default tag
+GeoModelSvc::RD...WARNING  Getting InDetMaterials with default tag
+GeoModelSvc.Muo...   INFO create MuonDetectorTool - package version = MuonGeoModel-00-00-00
+GeoModelSvc.Muo...   INFO (from GeoModelSvc)    AtlasVersion = <ATLAS-R2-2016-01-00-01>  MuonVersion = <>
+GeoModelSvc.Muo...   INFO Keys for Muon Switches are  (key) ATLAS-R2-2016-01-00-01 (node) ATLAS
+GeoModelSvc.Muo...   INFO (from GeoModelSvc) in AtlasVersion = <ATLAS-R2-2016-01-00-01>  default MuonVersion is <MuonSpectrometer-R.08.01>
+GeoModelSvc.Muo...   INFO Properties have been set as follows: 
+GeoModelSvc.Muo...   INFO     LayoutName                     R
+GeoModelSvc.Muo...   INFO     IncludeCutouts                 0
+GeoModelSvc.Muo...   INFO     IncludeCutoutsBog              0
+GeoModelSvc.Muo...   INFO     IncludeCtbBis                  0
+GeoModelSvc.Muo...   INFO     ControlAlines                  111111
+GeoModelSvc.Muo...   INFO     MinimalGeoFlag                 0
+GeoModelSvc.Muo...   INFO     EnableCscIntAlignment          0
+GeoModelSvc.Muo...   INFO     EnableCscIntAlignmentFromGM    1
+GeoModelSvc.Muo...   INFO     ControlCscIntAlines   reset to 0
+GeoModelSvc.Muo...   INFO     EnableMdtDeformations          0
+GeoModelSvc.Muo...   INFO     EnableMdtAsBuiltParameters     0
+MuonGeoModel         INFO MuonDetectorFactory - constructor  MuonSystem OuterRadius 13000 Length 22030
+MuGM:MuonFactory     INFO MuonLayout set to <R.08.01> = Development version for DC3 - infrastructures 
+MuGM:MuonFactory     INFO                    BOG cutouts are activated 1 , all other cutouts are disabled 1
+MuGM:MuonFactory     INFO Manager created for geometry version R.08.01 from DB MuonVersion <MuonSpectrometer-R.08.01>
+MuonGeoModel_MYSQL   INFO GeometryVersion set to <R.08.01>
+MuGM:MuonFactory     INFO Mysql helper class created here for geometry version R.08.01 from DB MuonVersion <MuonSpectrometer-R.08.01>
+EventPersistenc...   INFO Added successfully Conversion service:ByteStreamCnvSvc
+EventPersistenc...   INFO Added successfully Conversion service:AthenaPoolCnvSvc
+EventPersistenc...   INFO Added successfully Conversion service:DetDescrCnvSvc
+MDT_IDDetDescrCnv    INFO in createObj: creating a MdtIdHelper object in the detector store
+IdDictDetDescrCnv    INFO in initialize
+IdDictDetDescrCnv    INFO in createObj: creating a IdDictManager object in the detector store
+IdDictDetDescrCnv    INFO IdDictName:  IdDictParser/ATLAS_IDS.xml
+IdDictDetDescrCnv    INFO Reading InnerDetector    IdDict file InDetIdDictFiles/IdDictInnerDetector_IBL3D25-03.xml
+IdDictDetDescrCnv    INFO Reading LArCalorimeter   IdDict file IdDictParser/IdDictLArCalorimeter_DC3-05-Comm-01.xml
+IdDictDetDescrCnv    INFO Reading TileCalorimeter  IdDict file IdDictParser/IdDictTileCalorimeter.xml
+IdDictDetDescrCnv    INFO Reading Calorimeter      IdDict file IdDictParser/IdDictCalorimeter_L1Onl.xml
+IdDictDetDescrCnv    INFO Reading MuonSpectrometer IdDict file IdDictParser/IdDictMuonSpectrometer_R.03.xml
+IdDictDetDescrCnv    INFO Reading ForwardDetectors IdDict file IdDictParser/IdDictForwardDetectors_2010.xml
+IdDictDetDescrCnv    INFO Found id dicts:
+IdDictDetDescrCnv    INFO Using dictionary tag: null
+IdDictDetDescrCnv    INFO Dictionary ATLAS                version default              DetDescr tag (using default) file 
+IdDictDetDescrCnv    INFO Dictionary Calorimeter          version default              DetDescr tag CaloIdentifier-LVL1-02 file IdDictParser/IdDictCalorimeter_L1Onl.xml
+IdDictDetDescrCnv    INFO Dictionary ForwardDetectors     version default              DetDescr tag ForDetIdentifier-01       file IdDictParser/IdDictForwardDetectors_2010.xml
+IdDictDetDescrCnv    INFO Dictionary InnerDetector        version IBL-DBM              DetDescr tag InDetIdentifier-IBL3D25-02 file InDetIdDictFiles/IdDictInnerDetector_IBL3D25-03.xml
+IdDictDetDescrCnv    INFO Dictionary LArCalorimeter       version fullAtlas            DetDescr tag LArIdentifier-DC3-05-Comm file IdDictParser/IdDictLArCalorimeter_DC3-05-Comm-01.xml
+IdDictDetDescrCnv    INFO Dictionary LArElectrode         version fullAtlas            DetDescr tag (using default) file 
+IdDictDetDescrCnv    INFO Dictionary LArHighVoltage       version fullAtlas            DetDescr tag (using default) file 
+IdDictDetDescrCnv    INFO Dictionary MuonSpectrometer     version R.03                 DetDescr tag MuonIdentifier-08         file IdDictParser/IdDictMuonSpectrometer_R.03.xml
+IdDictDetDescrCnv    INFO Dictionary TileCalorimeter      version fullAtlasAndTestBeam DetDescr tag TileIdentifier-00         file IdDictParser/IdDictTileCalorimeter.xml
+AtlasDetectorIDHelper::initialize_from_dictionary - Warning: unable to find mm region index: group, region size 0 0
+AtlasDetectorIDHelper::initialize_from_dictionary - Warning: unable to find stgc region index: group, region size 0 0
+AtlasDetectorID::initLevelsFromDict - there are no sTGC entries in the dictionary! 
+AtlasDetectorID::initLevelsFromDict - there are no MM entries in the dictionary! 
+ AtlasDetectorID::initialize_from_dictionary - OK 
+MdtIdHelper          INFO MultiRange built successfully to Technology: MultiRange size is 210
+MdtIdHelper          INFO MultiRange built successfully to detector element: Multilayer MultiRange size is 241
+MdtIdHelper          INFO MultiRange built successfully to tube: MultiRange size is 241
+MdtIdHelper          INFO Initializing MDT hash indices ... 
+MdtIdHelper          INFO The element hash max is 1188
+MdtIdHelper          INFO The detector element hash max is 2328
+MdtIdHelper          INFO Initializing MDT hash indices for finding neighbors ... 
+MuGM:MuonFactory     INFO MDTIDHELPER retrieved from DetStore
+RPC_IDDetDescrCnv    INFO in createObj: creating a RpcIdHelper object in the detector store
+AtlasDetectorIDHelper::initialize_from_dictionary - Warning: unable to find mm region index: group, region size 0 0
+AtlasDetectorIDHelper::initialize_from_dictionary - Warning: unable to find stgc region index: group, region size 0 0
+AtlasDetectorID::initLevelsFromDict - there are no sTGC entries in the dictionary! 
+AtlasDetectorID::initLevelsFromDict - there are no MM entries in the dictionary! 
+ AtlasDetectorID::initialize_from_dictionary - OK 
+RpcIdHelper          INFO MultiRange built successfully to doubletR: MultiRange size is 241
+RpcIdHelper          INFO MultiRange built successfully to detectorElement: DetectorElement MultiRange size is 241
+RpcIdHelper          INFO MultiRange built successfully to rpcStrip: MultiRange size is 241
+RpcIdHelper          INFO Initializing RPC hash indices ... 
+RpcIdHelper          INFO The element hash max is 600
+RpcIdHelper          INFO The detector element hash max is 1122
+RpcIdHelper          INFO Initializing RPC hash indices for finding neighbors ... 
+MuGM:MuonFactory     INFO RPCIDHELPER retrieved from DetStore
+TGC_IDDetDescrCnv    INFO in createObj: creating a TgcIdHelper object in the detector store
+AtlasDetectorIDHelper::initialize_from_dictionary - Warning: unable to find mm region index: group, region size 0 0
+AtlasDetectorIDHelper::initialize_from_dictionary - Warning: unable to find stgc region index: group, region size 0 0
+AtlasDetectorID::initLevelsFromDict - there are no sTGC entries in the dictionary! 
+AtlasDetectorID::initLevelsFromDict - there are no MM entries in the dictionary! 
+ AtlasDetectorID::initialize_from_dictionary - OK 
+TgcIdHelper          INFO MultiRange built successfully to Technology: MultiRange size is 210
+TgcIdHelper          INFO MultiRange built successfully to detector element: Multilayer MultiRange size is 210
+TgcIdHelper          INFO MultiRange built successfully to channel: MultiRange size is 241
+TgcIdHelper          INFO Initializing TGC hash indices ... 
+TgcIdHelper          INFO The element hash max is 1578
+TgcIdHelper          INFO The detector element hash max is 1578
+TgcIdHelper          INFO Initializing TGC hash indices for finding neighbors ... 
+MuGM:MuonFactory     INFO TGCIDHELPER retrieved from DetStore
+CSC_IDDetDescrCnv    INFO in createObj: creating a CcscIdHelper object in the detector store
+AtlasDetectorIDHelper::initialize_from_dictionary - Warning: unable to find mm region index: group, region size 0 0
+AtlasDetectorIDHelper::initialize_from_dictionary - Warning: unable to find stgc region index: group, region size 0 0
+AtlasDetectorID::initLevelsFromDict - there are no sTGC entries in the dictionary! 
+AtlasDetectorID::initLevelsFromDict - there are no MM entries in the dictionary! 
+ AtlasDetectorID::initialize_from_dictionary - OK 
+CscIdHelper          INFO MultiRange built successfully to Technology: MultiRange size is 210
+CscIdHelper          INFO MultiRange built successfully to detector element: Multilayer MultiRange size is 237
+CscIdHelper          INFO MultiRange built successfully to cscStrip: MultiRange size is 241
+CscIdHelper          INFO Initializing CSC hash indices ... 
+CscIdHelper          INFO The element hash max is 32
+CscIdHelper          INFO The detector element hash max is 64
+CscIdHelper          INFO The channel hash max is 61440
+CscIdHelper          INFO Initializing CSC hash indices for finding neighbors ... 
+MuGM:MuonFactory     INFO CSCIDHELPER retrieved from DetStore
+sTGC_IDDetDescrCnv   INFO in createObj: creating a sTgcIdHelper object in the detector store
+AtlasDetectorIDHelper::initialize_from_dictionary - Warning: unable to find mm region index: group, region size 0 0
+AtlasDetectorIDHelper::initialize_from_dictionary - Warning: unable to find stgc region index: group, region size 0 0
+AtlasDetectorID::initLevelsFromDict - there are no sTGC entries in the dictionary! 
+AtlasDetectorID::initLevelsFromDict - there are no MM entries in the dictionary! 
+ AtlasDetectorID::initialize_from_dictionary - OK 
+MuGM:MuonFactory     INFO STGCIDHELPER retrieved from DetStore
+MM_IDDetDescrCnv     INFO in createObj: creating a MmIdHelper object in the detector store
+AtlasDetectorIDHelper::initialize_from_dictionary - Warning: unable to find mm region index: group, region size 0 0
+AtlasDetectorIDHelper::initialize_from_dictionary - Warning: unable to find stgc region index: group, region size 0 0
+AtlasDetectorID::initLevelsFromDict - there are no sTGC entries in the dictionary! 
+AtlasDetectorID::initLevelsFromDict - there are no MM entries in the dictionary! 
+ AtlasDetectorID::initialize_from_dictionary - OK 
+MuGM:MuonFactory     INFO MMIDHELPER retrieved from DetStore
+MuGM:MuonFactory     INFO  **************** MuonDetectorFactory001 ************************
+MuGM:MuonFactory     INFO  *** Start building the Muon Geometry Tree **********************
+MuGM:RDBReadAtlas    INFO Start retriving dbObjects with tag = <ATLAS-R2-2016-01-00-01> node <ATLAS>
+RDBAccessSvc      WARNING Could not get the tag for XtomoData node. Returning 0 pointer to IRDBQuery
+MuGM:RDBReadAtlas    INFO After getQuery XtomoData
+In DblQ00Xtomo(data)
+No XtomoData table in the MuonDD Database
+MuGM:RDBReadAtlas    INFO After new DblQ00Xtomo
+MuGM:RDBReadAtlas    INFO After m_dhxtomo.data()
+MuGM:RDBReadAtlas    INFO No Ascii aszt input found: looking for A-lines in ORACLE
+MuGM:RDBReadAtlas    INFO ASZT table found in Oracle
+MuGM:RDBReadAtlas    INFO ASZT size is 32
+MuGM:RDBReadAtlas    INFO No Ascii iacsc input found: looking for A-lines in ORACLE
+RDBAccessSvc      WARNING Could not get the tag for ISZT node. Returning 0 pointer to IRDBQuery
+MuGM:RDBReadAtlas    INFO No ISZT table in Oracle
+MuGM:RDBReadAtlas    INFO Access granted for all dbObjects needed by muon detectors
+MuonGeoModel_MYSQL   INFO LayoutName (from DBAM) set to <R.08>  -- relevant for CTB2004
+MuGM:ProcStations    INFO  Processing Stations and Components
+MuGM:ProcStations    INFO  Processing Stations and Components DONE
+MuGM:ProcTechnol.s   INFO nMDT 13 nCSC 2 nTGC 22 nRPC 25
+MuGM:ProcTechnol.s   INFO nDED 2 nSUP 4 nSPA 2
+MuGM:ProcTechnol.s   INFO nCHV 7 nCRO 7 nCMI 6 nLBI 6
+MuGM:ProcPosition    INFO  *** N. of stations positioned in the setup 234
+MuGM:ProcPosition    INFO  *** N. of stations described in mysql      234
+MuGM:ProcPosition    INFO  *** N. of types  32 size of jtypvec 32
+MuGM:ProcPosition    INFO  *** : 234 kinds of stations (type*sub_type) 
+MuGM:ProcPosition    INFO  *** : 1758 physical stations in space - according to the MuonDD DataBase
+MuGM:ProcCutouts     INFO  Processing Cutouts for geometry layout R.08
+MuGM:ProcCutouts     INFO  Processing Cutouts DONE
+MuGM:RDBReadAtlas    INFO  ProcessTGCreadout - version 7 wirespacing 1.8
+MuGM:RDBReadAtlas    INFO Intermediate Objects built from primary numbers
+MuGM:MuonFactory     INFO  theMaterialManager retrieven successfully from the DetStore
+MuGM:MuonFactory     INFO MuonSystem description from OracleTag=<ATLAS-R2-2016-01-00-01> and node=<ATLAS>
+MuGM:MuonFactory     INFO  TreeTop added to the Manager
+MuGM:MuonFactory     INFO  Muon Layout R.08.01
+MuGM:MuonFactory     INFO Fine Clash Fixing disabled: (should be ON/OFF for Simulation/Reconstruction)
+MuGM:MuonFactory     INFO  **************** MuonDetectorFactory001 ****************************
+MuGM:MuonFactory     INFO  *** The Muon Chamber Geometry Tree is built with 
+MuGM:MuonFactory     INFO  *** 1758 child volumes 
+MuGM:MuonFactory     INFO  *** 1839 independent elements and 
+MuGM:MuonFactory     INFO  *** 11473 elements cloned or shared 
+MuGM:MuonFactory     INFO  *** 234 kinds of stations
+MuGM:MuonFactory     INFO  *** 1758 stations with alignable transforms
+MuGM:MuonFactory     INFO  *** 148 stations are described as Assemblies
+MuGM:MuonFactory     INFO  *** 1758 MuonStations 
+MuGM:MuonFactory     INFO  *** 	 2324 MDT Readout Elements 	 1186 MDT Detector Elements 
+MuGM:MuonFactory     INFO  *** 	 32 CSC Readout Elements 	 32 CSC Detector Elements 
+MuGM:MuonFactory     INFO  *** 	 1122 RPC Readout Elements 	 600 RPC Detector Elements 
+MuGM:MuonFactory     INFO  *** 	 1578 TGC Readout Elements 	 1578 TGC Detector Elements 
+MuGM:MuonFactory     INFO  ********************************************************************
+MuGM:MuonFactory     INFO  *** Inert Material built according to DB switches and config. ****** 
+MuGM:MuonFactory     INFO  *** The Muon Geometry Tree has 1758 child vol.s in total ********
+MuGM:MuonFactory     INFO  ********************************************************************
+
+MGM::MuonDetect...   INFO Init A/B Line Containers - done - size is respectively 1758/0
+MGM::MuonDetect...   INFO No Aline for CSC wire layers loaded 
+GeoModelSvc          INFO GeoModelSvc.MuonDetectorTool	 SZ= 44884Kb 	 Time = 0.83S
+GeoModelSvc.Muo...   INFO CondAttrListCollection not found in the DetectorStore
+GeoModelSvc.Muo...   INFO Unable to register callback on CondAttrListCollection for any folder in the list 
+GeoModelSvc.Muo...   INFO This is OK unless you expect to read alignment and deformations from COOL 
+ClassIDSvc           INFO  getRegistryEntries: read 1455 CLIDRegistry entries for module ALL
+AthenaEventLoopMgr   INFO Initializing AthenaEventLoopMgr - package version AthenaServices-00-00-00
+ClassIDSvc           INFO  getRegistryEntries: read 1794 CLIDRegistry entries for module ALL
+CondInputLoader      INFO Initializing CondInputLoader...
+CondInputLoader      INFO Adding base classes:
+  +  ( 'CondAttrListCollection' , 'ConditionStore+/EXT/DCS/MAGNETS/SENSORDATA' )   ->
+  +  ( 'CondAttrListCollection' , 'ConditionStore+/MDT/CABLING/MAP_SCHEMA' )   ->
+  +  ( 'CondAttrListCollection' , 'ConditionStore+/MDT/CABLING/MEZZANINE_SCHEMA' )   ->
+CondInputLoader      INFO Will create WriteCondHandle dependencies for the following DataObjects:
+    +  ( 'CondAttrListCollection' , 'ConditionStore+/EXT/DCS/MAGNETS/SENSORDATA' ) 
+    +  ( 'CondAttrListCollection' , 'ConditionStore+/MDT/CABLING/MAP_SCHEMA' ) 
+    +  ( 'CondAttrListCollection' , 'ConditionStore+/MDT/CABLING/MEZZANINE_SCHEMA' ) 
+ClassIDSvc           INFO  getRegistryEntries: read 1370 CLIDRegistry entries for module ALL
+ClassIDSvc           INFO  getRegistryEntries: read 743 CLIDRegistry entries for module ALL
+RpcRawDataProvider   INFO RpcRawDataProvider::initialize
+RpcRawDataProvider   INFO  'DoSeededDecoding':False
+ClassIDSvc           INFO  getRegistryEntries: read 1699 CLIDRegistry entries for module ALL
+MuonRPC_CablingSvc   INFO Initializing MuonRPC_CablingSvc - package version MuonRPC_Cabling-00-00-00
+ToolSvc.RPCCabl...   INFO Initializing - folders names are: conf /RPC/CABLING/MAP_SCHEMA / corr /RPC/CABLING/MAP_SCHEMA_CORR
+MuonRPC_CablingSvc   INFO RPCCablingDbTool retrieved with statusCode = SUCCESS with handle TheRpcCablingDbTool = PublicToolHandle('RPCCablingDbTool/RPCCablingDbTool')
+MuonRPC_CablingSvc   INFO Register call-back  against 2 folders listed below 
+MuonRPC_CablingSvc   INFO  Folder n. 1 </RPC/CABLING/MAP_SCHEMA>     found in the DetStore
+ClassIDSvc           INFO  getRegistryEntries: read 501 CLIDRegistry entries for module ALL
+MuonRPC_CablingSvc   INFO initMappingModel registered for call-back against folder </RPC/CABLING/MAP_SCHEMA>
+MuonRPC_CablingSvc   INFO  Folder n. 2 </RPC/CABLING/MAP_SCHEMA_CORR>     found in the DetStore
+MuonRPC_CablingSvc   INFO initMappingModel registered for call-back against folder </RPC/CABLING/MAP_SCHEMA_CORR>
+MuonRPC_CablingSvc   INFO RPCTriggerDbTool retrieved with statusCode = SUCCESS pointer = TheRpcTriggerDbTool = PublicToolHandle('RPCTriggerDbTool')
+MuonRPC_CablingSvc   INFO Register call-back  against 2 folders listed below 
+MuonRPC_CablingSvc   INFO  Folder n. 1 </RPC/TRIGGER/CM_THR_ETA>     found in the DetStore
+MuonRPC_CablingSvc   INFO initTrigRoadsModel registered for call-back against folder </RPC/TRIGGER/CM_THR_ETA>
+MuonRPC_CablingSvc   INFO  Folder n. 2 </RPC/TRIGGER/CM_THR_PHI>     found in the DetStore
+MuonRPC_CablingSvc   INFO initTrigRoadsModel registered for call-back against folder </RPC/TRIGGER/CM_THR_PHI>
+RpcRawDataProvi...   INFO Retrieved tool Decoder = PrivateToolHandle('Muon::RpcROD_Decoder/RpcROD_Decoder')
+RpcRawDataProvi...   INFO Retrieved service ServiceHandle('ROBDataProviderSvc')
+RpcRawDataProvi...   INFO  Tool = RpcRawDataProvider.RPC_RawDataProviderTool is connected to JobOptionsSvc Service = JobOptionsSvc
+RpcRawDataProvi...   INFO initialize() successful in RpcRawDataProvider.RPC_RawDataProviderTool
+TgcRawDataProvider   INFO TgcRawDataProvider::initialize
+ClassIDSvc           INFO  getRegistryEntries: read 878 CLIDRegistry entries for module ALL
+TgcRawDataProvi...   INFO initialize() successful in TgcRawDataProvider.TGC_RawDataProviderTool.TgcROD_Decoder
+TgcRawDataProvi...   INFO Retrieved tool Decoder = PrivateToolHandle('Muon::TGC_RodDecoderReadout/TgcROD_Decoder')
+TgcRawDataProvi...   INFO Retrieved service ServiceHandle('ROBDataProviderSvc')
+TgcRawDataProvi...   INFO  Tool = TgcRawDataProvider.TGC_RawDataProviderTool is connected to JobOptionsSvc Service = JobOptionsSvc
+MuonTGC_CablingSvc   INFO for 1/12 sector initialize
+ToolSvc.TGCCabl...   INFO initialize
+ClassIDSvc           INFO  getRegistryEntries: read 273 CLIDRegistry entries for module ALL
+IOVSvcTool           INFO Still in initialize phase, not tiggering callback for MuonTGC_CablingSvc[0x260c0100]+219 bound to CondAttrListCollection[/TGC/CABLING/MAP_SCHEMA]
+TgcRawDataProvi...   INFO initialize() successful in TgcRawDataProvider.TGC_RawDataProviderTool
+MdtRawDataProvider   INFO MdtRawDataProvider::initialize
+ClassIDSvc           INFO  getRegistryEntries: read 922 CLIDRegistry entries for module ALL
+MdtRawDataProvi...  DEBUG Property update for OutputLevel : new value = 1
+MdtRawDataProvi...VERBOSE Starting init
+MdtRawDataProvi...VERBOSE Getting m_robDataProvider
+MdtRawDataProvi...   INFO Retrieved service ServiceHandle('ROBDataProviderSvc')
+MdtRawDataProvi...VERBOSE Getting MuonDetectorManager
+MdtRawDataProvi...VERBOSE Getting m_decoder
+MdtRawDataProvi...  DEBUG Property update for OutputLevel : new value = 1
+MdtRawDataProvi...   INFO Processing configuration for layouts with BME chambers.
+MdtRawDataProvi...   INFO Processing configuration for layouts with BMG chambers.
+MdtRawDataProvi...   INFO Retrieved tool Decoder = PrivateToolHandle('MdtROD_Decoder/MdtROD_Decoder')
+MdtRawDataProvi...   INFO  Tool = MdtRawDataProvider.MDT_RawDataProviderTool is connected to JobOptionsSvc Service = JobOptionsSvc
+MdtRawDataProvi...  DEBUG Could not find TrigConf::HLTJobOptionsSvc
+MdtRawDataProvi...   INFO initialize() successful in MdtRawDataProvider.MDT_RawDataProviderTool
+MdtRawDataProvi...  DEBUG Adding private ToolHandle tool MdtRawDataProvider.MDT_RawDataProviderTool.MdtROD_Decoder (MdtROD_Decoder)
+ClassIDSvc           INFO  getRegistryEntries: read 660 CLIDRegistry entries for module ALL
+CscRawDataProvi...  DEBUG Property update for OutputLevel : new value = 1
+CscRawDataProvi...VERBOSE ServiceLocatorHelper::service: found service ActiveStoreSvc
+CscRawDataProvi...   INFO Retrieved service ServiceHandle('ROBDataProviderSvc')
+CscRawDataProvi...VERBOSE ServiceLocatorHelper::service: found service JobOptionsSvc
+CscRawDataProvi...   INFO  Tool = CscRawDataProvider.CSC_RawDataProviderTool is connected to JobOptionsSvc Service = JobOptionsSvc
+CscRawDataProvi...  DEBUG Could not find TrigConf::HLTJobOptionsSvc
+CscRawDataProvi...  DEBUG Property update for OutputLevel : new value = 1
+CscRawDataProvi...  DEBUG  Found the CscIdHelper. 
+CscRawDataProvi...   INFO Retrieved tool Decoder = PrivateToolHandle('Muon::CscROD_Decoder/CscROD_Decoder')
+CscRawDataProvi...   INFO The Muon Geometry version is R.08.01
+CscRawDataProvi...   INFO initialize() successful in CscRawDataProvider.CSC_RawDataProviderTool
+CscRawDataProvi...  DEBUG Adding private ToolHandle tool CscRawDataProvider.CSC_RawDataProviderTool.CscROD_Decoder (Muon::CscROD_Decoder)
+ClassIDSvc           INFO  getRegistryEntries: read 53 CLIDRegistry entries for module ALL
+RpcRdoToRpcPrep...   INFO package version = MuonRPC_CnvTools-00-00-00
+RpcRdoToRpcPrep...   INFO properties are 
+RpcRdoToRpcPrep...   INFO processingData                     0
+RpcRdoToRpcPrep...   INFO produceRpcCoinDatafromTriggerWords 1
+RpcRdoToRpcPrep...   INFO reduceCablingOverlap               1
+RpcRdoToRpcPrep...   INFO solvePhiAmbiguities                1
+RpcRdoToRpcPrep...   INFO timeShift                          -12.5
+RpcRdoToRpcPrep...   INFO etaphi_coincidenceTime             20
+RpcRdoToRpcPrep...   INFO overlap_timeTolerance              10
+RpcRdoToRpcPrep...   INFO Correct prd time from cool db      0
+RpcRdoToRpcPrep...   INFO Rpc Cabling Svc name is dataLike
+RpcRdoToRpcPrep...   INFO Retrieved DecodingTool = PrivateToolHandle('Muon::RpcRdoToPrepDataTool/RpcRdoToRpcPrepDataTool')
+TgcRdoToTgcPrep...   INFO initialize() successful in TgcRdoToTgcPrepData.TgcRdoToTgcPrepDataTool
+TgcRdoToTgcPrep...   INFO Retrieved DecodingTool = PrivateToolHandle('Muon::TgcRdoToPrepDataTool/TgcRdoToTgcPrepDataTool')
+MdtCalibrationSvc    INFO Processing configuration for layouts with BMG chambers.
+ClassIDSvc           INFO  getRegistryEntries: read 194 CLIDRegistry entries for module ALL
+AtlasFieldSvc        INFO initialize() ...
+AtlasFieldSvc        INFO maps will be chosen reading COOL folder /GLOBAL/BField/Maps
+ClassIDSvc           INFO  getRegistryEntries: read 163 CLIDRegistry entries for module ALL
+AtlasFieldSvc        INFO magnet currents will be read from COOL folder /EXT/DCS/MAGNETS/SENSORDATA
+AtlasFieldSvc        INFO Booked callback for /EXT/DCS/MAGNETS/SENSORDATA
+AtlasFieldSvc        INFO initialize() successful
+MdtRdoToMdtPrep...   INFO Processing configuration for layouts with BME chambers.
+MdtRdoToMdtPrep...   INFO Processing configuration for layouts with BMG chambers.
+MdtRdoToMdtPrep...   INFO Retrieved DecodingTool = PrivateToolHandle('Muon::MdtRdoToPrepDataTool/MdtRdoToMdtPrepDataTool')
+ClassIDSvc           INFO  getRegistryEntries: read 60 CLIDRegistry entries for module ALL
+CscRdoToCscPrep...   INFO The Geometry version is MuonSpectrometer-R.08.01
+CscRdoToCscPrep...   INFO Retrieved service ServiceHandle('ROBDataProviderSvc')
+CscRdoToCscPrep...   INFO  Tool = CscRdoToCscPrepData.CscRdoToCscPrepDataTool.CSC_RawDataProviderTool is connected to JobOptionsSvc Service = JobOptionsSvc
+CscRdoToCscPrep...   INFO Retrieved tool Decoder = PrivateToolHandle('Muon::CscROD_Decoder/CscROD_Decoder')
+CscRdoToCscPrep...   INFO The Muon Geometry version is R.08.01
+CscRdoToCscPrep...   INFO initialize() successful in CscRdoToCscPrepData.CscRdoToCscPrepDataTool.CSC_RawDataProviderTool
+MuonCalib::CscC...   INFO Initializing CscCoolStrSvc
+ClassIDSvc           INFO  getRegistryEntries: read 181 CLIDRegistry entries for module ALL
+IOVSvcTool           INFO Still in initialize phase, not tiggering callback for MuonCalib::CscCoolStrSvc[0x33875a00]+259 bound to CondAttrListCollection[CSC_PED]
+IOVSvcTool           INFO Still in initialize phase, not tiggering callback for MuonCalib::CscCoolStrSvc[0x33875a00]+259 bound to CondAttrListCollection[CSC_NOISE]
+IOVSvcTool           INFO Still in initialize phase, not tiggering callback for MuonCalib::CscCoolStrSvc[0x33875a00]+259 bound to CondAttrListCollection[CSC_PSLOPE]
+IOVSvcTool           INFO Still in initialize phase, not tiggering callback for MuonCalib::CscCoolStrSvc[0x33875a00]+259 bound to CondAttrListCollection[CSC_STAT]
+IOVSvcTool           INFO Still in initialize phase, not tiggering callback for MuonCalib::CscCoolStrSvc[0x33875a00]+259 bound to CondAttrListCollection[CSC_RMS]
+IOVSvcTool           INFO Still in initialize phase, not tiggering callback for MuonCalib::CscCoolStrSvc[0x33875a00]+259 bound to CondAttrListCollection[CSC_FTHOLD]
+IOVSvcTool           INFO Still in initialize phase, not tiggering callback for MuonCalib::CscCoolStrSvc[0x33875a00]+259 bound to CondAttrListCollection[CSC_T0BASE]
+IOVSvcTool           INFO Still in initialize phase, not tiggering callback for MuonCalib::CscCoolStrSvc[0x33875a00]+259 bound to CondAttrListCollection[CSC_T0PHASE]
+CscRdoToCscPrep...   INFO Retrieved CscRdoToCscPrepDataTool = PrivateToolHandle('Muon::CscRdoToCscPrepDataTool/CscRdoToCscPrepDataTool')
+CscRdoToCscPrep...WARNING Implicit circular data dependency detected for id  ( 'CscRawDataContainer' , 'StoreGateSvc+CSCRDO' ) 
+HistogramPersis...WARNING Histograms saving not required.
+EventSelector        INFO Initializing EventSelector - package version ByteStreamCnvSvc-00-00-00
+EventSelector     WARNING InputCollections not properly set, checking EventStorageInputSvc properties
+EventSelector        INFO Retrieved StoreGateSvc name of  '':StoreGateSvc
+EventSelector        INFO reinitialization...
+ToolSvc.Luminos...   INFO LuminosityTool::initialize() registering 
+ToolSvc.Luminos...   INFO LumiFolderName is empty, skipping
+ToolSvc.Luminos...   INFO OnlineLumiCalibrationTool.empty() is TRUE, skipping...
+ToolSvc.Luminos...   INFO FillParamsTool.empty() is TRUE, skipping...
+ToolSvc.Luminos...   INFO BunchLumisTool.empty() is TRUE, skipping...
+ToolSvc.Luminos...   INFO BunchGroupTool.empty() is TRUE, skipping...
+ToolSvc.Luminos...   INFO LBLBFolderName is empty, skipping...
+EventSelector        INFO Retrieved InputCollections from InputSvc
+ByteStreamInputSvc   INFO Initializing ByteStreamInputSvc - package version ByteStreamCnvSvc-00-00-00
+EventSelector        INFO reinitialization...
+AthenaEventLoopMgr   INFO Setup EventSelector service EventSelector
+ApplicationMgr       INFO Application Manager Initialized successfully
+ByteStreamInputSvc   INFO Picked valid file: /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data17_13TeV.00327265.physics_EnhancedBias.merge.RAW._lb0100._SFO-1._0001.1
+ClassIDSvc           INFO  getRegistryEntries: read 1156 CLIDRegistry entries for module ALL
+CondInputLoader      INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/EXT/DCS/MAGNETS/SENSORDATA'
+CondInputLoader      INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/MDT/CABLING/MAP_SCHEMA'
+CondInputLoader      INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/MDT/CABLING/MEZZANINE_SCHEMA'
+ApplicationMgr       INFO Application Manager Started successfully
+EventInfoByteSt...   INFO UserType : RawEvent
+EventInfoByteSt...   INFO IsSimulation : 0
+EventInfoByteSt...   INFO IsTestbeam : 0
+EventInfoByteSt...   INFO IsCalibration : 0
+EventInfoByteSt...   INFO  EventContext not valid 
+AthenaEventLoopMgr   INFO   ===>>>  start of run 327265    <<<===
+EventPersistenc...   INFO Added successfully Conversion service:TagInfoMgr
+IOVDbSvc             INFO Opening COOL connection for COOLOFL_DCS/CONDBR2
+IOVDbSvc             INFO Disconnecting from COOLOFL_DCS/CONDBR2
+IOVDbSvc             INFO Opening COOL connection for COOLONL_GLOBAL/CONDBR2
+IOVDbFolder          INFO HVS tag CONDBR2-BLKPA-2018-13 resolved to BFieldMap-Run1-14m-v01 for folder /GLOBAL/BField/Maps
+IOVDbSvc             INFO Disconnecting from COOLONL_GLOBAL/CONDBR2
+IOVDbSvc             INFO Opening COOL connection for COOLONL_RPC/CONDBR2
+IOVDbFolder          INFO HVS tag CONDBR2-BLKPA-2018-13 resolved to RPCCablingMapSchema_2016_2017_01 for folder /RPC/CABLING/MAP_SCHEMA
+IOVDbFolder          INFO HVS tag CONDBR2-BLKPA-2018-13 resolved to RPCCablingMapSchemaCorr_2016_2017_01 for folder /RPC/CABLING/MAP_SCHEMA_CORR
+IOVDbFolder          INFO HVS tag CONDBR2-BLKPA-2018-13 resolved to RPCTriggerCMThrEta_RUN1-RUN2-HI-02 for folder /RPC/TRIGGER/CM_THR_ETA
+IOVDbFolder          INFO HVS tag CONDBR2-BLKPA-2018-13 resolved to RPCTriggerCMThrPhi_RUN1-RUN2-HI-02 for folder /RPC/TRIGGER/CM_THR_PHI
+IOVDbSvc             INFO Disconnecting from COOLONL_RPC/CONDBR2
+IOVDbSvc             INFO Opening COOL connection for COOLONL_TGC/CONDBR2
+IOVDbFolder          INFO HVS tag CONDBR2-BLKPA-2018-13 resolved to TgcCablingMapschema-RUN2-20100908-ASD2PPONL for folder /TGC/CABLING/MAP_SCHEMA
+IOVDbSvc             INFO Disconnecting from COOLONL_TGC/CONDBR2
+IOVDbSvc             INFO Opening COOL connection for COOLOFL_CSC/CONDBR2
+IOVDbFolder          INFO HVS tag CONDBR2-BLKPA-2018-13 resolved to CscFthold-RUN2-BLK-UPD1-007-00 for folder /CSC/FTHOLD
+IOVDbFolder          INFO HVS tag CONDBR2-BLKPA-2018-13 resolved to CscNoise-RUN2-BLK-UPD1-007-00 for folder /CSC/NOISE
+IOVDbFolder          INFO HVS tag CONDBR2-BLKPA-2018-13 resolved to CscPed-RUN2-BLK-UPD1-007-00 for folder /CSC/PED
+IOVDbFolder          INFO HVS tag CONDBR2-BLKPA-2018-13 resolved to CscPslope-RUN2-BLK-UPD1-000-00 for folder /CSC/PSLOPE
+IOVDbFolder          INFO HVS tag CONDBR2-BLKPA-2018-13 resolved to CscRms-RUN2-BLK-UPD1-003-00 for folder /CSC/RMS
+IOVDbFolder          INFO HVS tag CONDBR2-BLKPA-2018-13 resolved to CscStat-RUN2-BLK-UPD1-008-00 for folder /CSC/STAT
+IOVDbFolder          INFO HVS tag CONDBR2-BLKPA-2018-13 resolved to CscT0base-RUN2-BLK-UPD1-001-00 for folder /CSC/T0BASE
+IOVDbFolder          INFO HVS tag CONDBR2-BLKPA-2018-13 resolved to CscT0phase-RUN2-BLK-UPD2-001-00 for folder /CSC/T0PHASE
+IOVDbSvc             INFO Disconnecting from COOLOFL_CSC/CONDBR2
+MuonRPC_CablingSvc   INFO initMappingModel has been called
+MuonRPC_CablingSvc   INFO ToolHandle in initMappingModel - <TheRpcCablingDbTool = PublicToolHandle('RPCCablingDbTool/RPCCablingDbTool')>
+MuonRPC_CablingSvc   INFO Retrieving cabling singleton; to create an empty one or to get the existing one
+RPCcabling           INFO CablingRPC---singleton constructor ---- this must be executed just once
+RPCcabling           INFO CablingRPC---The singleton will fill the maps from the COOL streams
+RPCcabling           INFO CablingRPC---InitMaps from COOL cannot be executed NOW: empty string
+RPCcabling           INFO CablingRPC---The singleton is created here
+RPCcabling           INFO CablingRPC--- cacheCleared: s_status = 0
+MuonRPC_CablingSvc   INFO Cabling singleton cache has been cleared
+MuonRPC_CablingSvc   INFO  Trigger roads will be loaded from COOL
+ToolSvc.RPCCabl...   INFO LoadParameters /RPC/CABLING/MAP_SCHEMA I=2 
+ToolSvc.RPCCabl...   INFO loadRPCMap --- Load Map from DB
+ToolSvc.RPCCabl...   INFO Try to read from folder </RPC/CABLING/MAP_SCHEMA>
+ToolSvc.RPCCabl...   INFO  CondAttrListCollection from DB folder have been obtained with size 1
+ToolSvc.RPCCabl...   INFO Loop over CondAttrListCollection ic = 1
+ToolSvc.RPCCabl...   INFO After Reading folder, Configuration string size is 222202
+ToolSvc.RPCCabl...   INFO LoadParameters /RPC/CABLING/MAP_SCHEMA_CORR I=2 
+ToolSvc.RPCCabl...   INFO loadRPCCorr --- Load Corrections from DB
+ToolSvc.RPCCabl...   INFO Try to read from folder </RPC/CABLING/MAP_SCHEMA_CORR>
+ToolSvc.RPCCabl...   INFO  CondAttrListCollection from DB folder have been obtained with size 1
+ToolSvc.RPCCabl...   INFO After Reading folder, Correction string size is 29369
+MuonRPC_CablingSvc   INFO  InitMappingModel: Trigger roads not yet loaded from COOL - postpone cabling initialization 
+MuonRPC_CablingSvc   INFO initTrigRoadsModel has been called
+MuonRPC_CablingSvc   INFO  Trigger roads will be loaded from COOL
+MuonRPC_CablingSvc   INFO Retrieve the pointer to the cabling singleton 
+RPCcabling           INFO CablingRPC--- cacheCleared: s_status = 0
+MuonRPC_CablingSvc   INFO Cabling singleton cache has been cleared
+ToolSvc.RPCTrig...   INFO LoadParameters /RPC/TRIGGER/CM_THR_ETA I=2 
+ToolSvc.RPCTrig...   INFO LoadParameters /RPC/TRIGGER/CM_THR_PHI I=2 
+MuonRPC_CablingSvc   INFO ======== RPC Trigger Roads from COOL - Header infos ========
+MuonRPC_CablingSvc   INFO 
+RPC LVL1 Configuration 10.6 with roads from Feb 2012
+L1 THRESHOLDS:   MU4 MU6 MU10 MU11 MU15 MU20
+Road version: "road_files_120209"
+CMA            th0    th1   th2
+eta low-pt     mu4    mu6   mu10
+phi low-pt     mu4    mu6   mu10
+eta high-pt    mu11  mu15   mu20
+phi high-pt    mu11  mu15   mu15
+
+
+RPCcabling           INFO CablingRPC---InitMaps from COOL: going to read configuration
+RPCcabling           INFO CablingRPC--->> RPC cabling map from COOL <<
+RPCcabling           INFO CablingRPC--- ReadConf: map has size 222202
+RPCcabling           INFO CablingRPC--- ReadConf: map n. of lines read is 924
+RPCcabling           INFO CablingRPC--- ReadConf: version is 5.0 Atlas R_07_03_RUN2ver104
+RPCcabling           INFO CablingRPC--- buildRDOmap
+RPCcabling           INFO CablingRPC---InitMaps from COOL: going to read corrections to configuration
+RPCcabling           INFO CablingRPC--->> RPC cabling corrections from COOL <<
+RPCcabling           INFO CablingRPC--- ReadCorr: CorrMap has size 29369
+RPCcabling           INFO CablingRPC--- ReadConf: CorrMap n. of lines read is 743
+RPCcabling           INFO CablingRPC---InitMaps from COOL - maps have been parsed
+MuonRPC_CablingSvc   INFO InitTrigRoadsModel: RPC cabling model is loaded!
+Level-1 configuration database version 5.0 Atlas R_07_03_RUN2ver104 read.
+Contains 26 Trigger Sector Types:
+negative sectors  0 - 15 ==> 18  2 24  3 19  2 24  4 20  2 24  1 18  5 25  6 
+negative sectors 16 - 31 ==> 21 13 26  6 21  7 16  8 14  7 16  6 21 13 26  1 
+positive sectors 32 - 47 ==>  9 24  2 22  9 24  2 23 10 24  2 18  1 25  5 18 
+positive sectors 48 - 63 ==>  1 26 13 21  6 17 12 15 11 17 12 21  6 26 13 22 
+
+MuonRPC_CablingSvc   INFO buildOfflineOnlineMap
+MuonRPC_CablingSvc   INFO Applying FeetPadThresholds : 0,2,5
+MuonRPC_CablingSvc   INFO MuonRPC_CablingSvc initialized succesfully
+MuonTGC_CablingSvc   INFO updateCableASDToPP called
+ToolSvc.TGCCabl...   INFO loadTGCMap from DB
+ToolSvc.TGCCabl...   INFO CondAttrListCollection from DB folder have been obtained with size 1
+ToolSvc.TGCCabl...   INFO giveASD2PP_DIFF_12 (m_ASD2PP_DIFF_12 is not NULL)
+MdtCalibrationD...   INFO RtKey I=2 TubeKey I=2 
+AtlasFieldSvc        INFO reading magnetic field map filenames from COOL
+AtlasFieldSvc        INFO found map of type GlobalMap with soleCur=7730 toroCur=20400 (path file:MagneticFieldMaps/bfieldmap_7730_20400_14m.root)
+AtlasFieldSvc        INFO found map of type SolenoidMap with soleCur=7730 toroCur=0 (path file:MagneticFieldMaps/bfieldmap_7730_0_14m.root)
+AtlasFieldSvc        INFO found map of type ToroidMap with soleCur=0 toroCur=20400 (path file:MagneticFieldMaps/bfieldmap_0_20400_14m.root)
+AtlasFieldSvc        INFO no need to update map set
+AtlasFieldSvc        INFO Attempt 1 at reading currents from DCS (using channel name)
+AtlasFieldSvc        INFO Trying to read from DCS: [channel name, index, value] CentralSol_Current , 1 , 7729.99
+AtlasFieldSvc        INFO Trying to read from DCS: [channel name, index, value] CentralSol_SCurrent , 2 , 7730
+AtlasFieldSvc        INFO Trying to read from DCS: [channel name, index, value] Toroids_Current , 3 , 20399.9
+AtlasFieldSvc        INFO Trying to read from DCS: [channel name, index, value] Toroids_SCurrent , 4 , 20397.7
+AtlasFieldSvc        INFO Currents read from DCS: solenoid 7729.99 toroid 20399.9
+AtlasFieldSvc        INFO Initializing the field map (solenoidCurrent=7729.99 toroidCurrent=20399.9)
+AtlasFieldSvc        INFO reading the map from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/atlas/offline/ReleaseData/v20/MagneticFieldMaps/bfieldmap_7730_20400_14m.root
+AtlasFieldSvc        INFO Initialized the field map from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/atlas/offline/ReleaseData/v20/MagneticFieldMaps/bfieldmap_7730_20400_14m.root
+ClassIDSvc           INFO  getRegistryEntries: read 672 CLIDRegistry entries for module ALL
+AthenaEventLoopMgr   INFO   ===>>>  start processing event #186525031, run #327265 0 events processed so far  <<<===
+IOVDbSvc             INFO Opening COOL connection for COOLONL_MDT/CONDBR2
+IOVDbFolder          INFO HVS tag CONDBR2-BLKPA-2018-13 resolved to MDTCablingMapSchema_BMG_01 for folder /MDT/CABLING/MAP_SCHEMA
+IOVDbFolder          INFO HVS tag CONDBR2-BLKPA-2018-13 resolved to MDTCablingMezzanineSchema_M5-RUN2 for folder /MDT/CABLING/MEZZANINE_SCHEMA
+IOVDbSvc             INFO Disconnecting from COOLONL_MDT/CONDBR2
+MuonMDT_CablingAlg   INFO Size of CondAttrListCollection  ( 'CondAttrListCollection' , 'ConditionStore+/MDT/CABLING/MEZZANINE_SCHEMA' )  readCdoMez->size()= 24
+MuonMDT_CablingAlg   INFO Range of input is {[0,l:0] - [INVALID]}
+MuonMDT_CablingAlg   INFO Size of CondAttrListCollection  ( 'CondAttrListCollection' , 'ConditionStore+/MDT/CABLING/MAP_SCHEMA' )  readCdoMap->size()= 2312
+MuonMDT_CablingAlg   INFO Range of input is {[327264,l:4294640031] - [327265,l:4294640030]}
+MuonMDT_CablingAlg   INFO recorded new MuonMDT_CablingMap with range {[327264,l:4294640031] - [327265,l:4294640030]} into Conditions Store
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+MdtCsmCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+CscCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+RpcCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+TgcCache'
+MdtRawDataProvi...VERBOSE convert(): 264 ROBFragments.
+MdtRawDataProvi...  DEBUG Created container using cache for MdtCsmCache
+MdtRawDataProvi...  DEBUG fillCollection: starting
+MdtRawDataProvi...  DEBUG **********Decoder dumping the words******** 
+MdtRawDataProvi...  DEBUG The size of this ROD-read is 
+MdtRawDataProvi...  DEBUG word 0 = 8003e994
+MdtRawDataProvi...  DEBUG word 1 = 81040007
+MdtRawDataProvi...  DEBUG word 2 = 18030370
+MdtRawDataProvi...  DEBUG word 3 = 890003ff
+MdtRawDataProvi...  DEBUG word 4 = a3994153
+MdtRawDataProvi...  DEBUG word 5 = 30a403c0
+MdtRawDataProvi...  DEBUG word 6 = 30a004ce
+MdtRawDataProvi...  DEBUG word 7 = 8a994005
+MdtRawDataProvi...  DEBUG word 8 = 8104000d
+MdtRawDataProvi...  DEBUG word 9 = 18030371
+MdtRawDataProvi...  DEBUG word 10 = 89000fff
+MdtRawDataProvi...  DEBUG word 11 = a2994153
+MdtRawDataProvi...  DEBUG word 12 = 306c0472
+MdtRawDataProvi...  DEBUG word 13 = 306804d5
+MdtRawDataProvi...  DEBUG word 14 = a3994153
+MdtRawDataProvi...  DEBUG word 15 = 20080000
+MdtRawDataProvi...  DEBUG word 16 = a4994153
+MdtRawDataProvi...  DEBUG word 17 = 301c0504
+MdtRawDataProvi...  DEBUG word 18 = 30180562
+MdtRawDataProvi...  DEBUG word 19 = 20000010
+MdtRawDataProvi...  DEBUG word 20 = 8a99400b
+MdtRawDataProvi...  DEBUG word 21 = 81040006
+MdtRawDataProvi...  DEBUG word 22 = 18030372
+MdtRawDataProvi...  DEBUG word 23 = 89003fff
+MdtRawDataProvi...  DEBUG word 24 = a6994153
+MdtRawDataProvi...  DEBUG word 25 = 20008000
+MdtRawDataProvi...  DEBUG word 26 = 8a994004
+MdtRawDataProvi...  DEBUG word 27 = 8104000f
+MdtRawDataProvi...  DEBUG word 28 = 18030373
+MdtRawDataProvi...  DEBUG word 29 = 89003fff
+MdtRawDataProvi...  DEBUG word 30 = a0994153
+MdtRawDataProvi...  DEBUG word 31 = 3034054a
+MdtRawDataProvi...  DEBUG word 32 = 303005c2
+MdtRawDataProvi...  DEBUG word 33 = a7994153
+MdtRawDataProvi...  DEBUG word 34 = 3084023a
+MdtRawDataProvi...  DEBUG word 35 = 3080029e
+MdtRawDataProvi...  DEBUG word 36 = a8994153
+MdtRawDataProvi...  DEBUG word 37 = 307c03f6
+MdtRawDataProvi...  DEBUG word 38 = 30ac03f8
+MdtRawDataProvi...  DEBUG word 39 = 307804c4
+MdtRawDataProvi...  DEBUG word 40 = 30a804cb
+MdtRawDataProvi...  DEBUG word 41 = 8a99400d
+MdtRawDataProvi...  DEBUG word 42 = 81040008
+MdtRawDataProvi...  DEBUG word 43 = 18030374
+MdtRawDataProvi...  DEBUG word 44 = 8903ffff
+MdtRawDataProvi...  DEBUG word 45 = af994153
+MdtRawDataProvi...  DEBUG word 46 = 302c05c7
+MdtRawDataProvi...  DEBUG word 47 = 30280664
+MdtRawDataProvi...  DEBUG word 48 = 305c0673
+MdtRawDataProvi...  DEBUG word 49 = 8a994006
+MdtRawDataProvi...  DEBUG word 50 = 81040031
+MdtRawDataProvi...  DEBUG word 51 = 18030375
+MdtRawDataProvi...  DEBUG word 52 = 8903ffff
+MdtRawDataProvi...  DEBUG word 53 = a0994153
+MdtRawDataProvi...  DEBUG word 54 = 3054055c
+MdtRawDataProvi...  DEBUG word 55 = 305005fb
+MdtRawDataProvi...  DEBUG word 56 = a2994153
+MdtRawDataProvi...  DEBUG word 57 = 20010000
+MdtRawDataProvi...  DEBUG word 58 = a8994153
+MdtRawDataProvi...  DEBUG word 59 = 306c034f
+MdtRawDataProvi...  DEBUG word 60 = 309c0349
+MdtRawDataProvi...  DEBUG word 61 = 308c0394
+MdtRawDataProvi...  DEBUG word 62 = 309803d9
+MdtRawDataProvi...  DEBUG word 63 = 304c03f8
+MdtRawDataProvi...  DEBUG word 64 = 30680422
+MdtRawDataProvi...  DEBUG word 65 = 30880439
+MdtRawDataProvi...  DEBUG word 66 = 30bc03f3
+MdtRawDataProvi...  DEBUG word 67 = 3048049a
+MdtRawDataProvi...  DEBUG word 68 = 30b80479
+MdtRawDataProvi...  DEBUG word 69 = 305c05e9
+MdtRawDataProvi...  DEBUG word 70 = 30580652
+MdtRawDataProvi...  DEBUG word 71 = af994153
+MdtRawDataProvi...  DEBUG word 72 = 30940521
+MdtRawDataProvi...  DEBUG word 73 = 30840583
+MdtRawDataProvi...  DEBUG word 74 = 308c0583
+MdtRawDataProvi...  DEBUG word 75 = 309c0585
+MdtRawDataProvi...  DEBUG word 76 = 308005e7
+MdtRawDataProvi...  DEBUG word 77 = 308805f5
+MdtRawDataProvi...  DEBUG word 78 = 3090061d
+MdtRawDataProvi...  DEBUG word 79 = 309805f1
+MdtRawDataProvi...  DEBUG word 80 = 30a40587
+MdtRawDataProvi...  DEBUG word 81 = 30ac0588
+MdtRawDataProvi...  DEBUG word 82 = 30b40589
+MdtRawDataProvi...  DEBUG word 83 = 30bc058d
+MdtRawDataProvi...  DEBUG word 84 = 30a005fc
+MdtRawDataProvi...  DEBUG word 85 = 30a805f2
+MdtRawDataProvi...  DEBUG word 86 = 30b005e7
+MdtRawDataProvi...  DEBUG word 87 = 30b805d8
+MdtRawDataProvi...  DEBUG word 88 = b0994153
+MdtRawDataProvi...  DEBUG word 89 = 306c0082
+MdtRawDataProvi...  DEBUG word 90 = 3068012b
+MdtRawDataProvi...  DEBUG word 91 = 303c01ed
+MdtRawDataProvi...  DEBUG word 92 = 30380250
+MdtRawDataProvi...  DEBUG word 93 = 306c0556
+MdtRawDataProvi...  DEBUG word 94 = 306805a3
+MdtRawDataProvi...  DEBUG word 95 = 20004000
+MdtRawDataProvi...  DEBUG word 96 = b1994153
+MdtRawDataProvi...  DEBUG word 97 = 20010000
+MdtRawDataProvi...  DEBUG word 98 = 8a99402f
+MdtRawDataProvi...  DEBUG word 99 = f0000064
+MdtRawDataProvi...  DEBUG Found the beginning of buffer 
+MdtRawDataProvi...  DEBUG Level 1 Id : 256404
+MdtRawDataProvi...  DEBUG Found the Beginnning of Link 
+MdtRawDataProvi...  DEBUG subdetId : 97 mrodId : 0 csmId : 0
+MdtRawDataProvi...  DEBUG getOfflineIdfromOnlineID result: 
+MdtRawDataProvi...  DEBUG Name : 0
+MdtRawDataProvi...  DEBUG Eta  : 1
+MdtRawDataProvi...  DEBUG Phi  : 1
+MdtRawDataProvi...  DEBUG  Collection ID = 0x6048000000000000 does not exist, create it 
+MdtRawDataProvi...  DEBUG  Decoding data from TDC number : 3
+MdtRawDataProvi...  DEBUG Found the Beginnning of Link 
+MdtRawDataProvi...  DEBUG subdetId : 97 mrodId : 0 csmId : 1
+MdtRawDataProvi...  DEBUG getOfflineIdfromOnlineID result: 
+MdtRawDataProvi...  DEBUG Name : 0
+MdtRawDataProvi...  DEBUG Eta  : 2
+MdtRawDataProvi...  DEBUG Phi  : 1
+MdtRawDataProvi...  DEBUG  Collection ID = 0x6050000000000000 does not exist, create it 
+MdtRawDataProvi...  DEBUG  Decoding data from TDC number : 2
+MdtRawDataProvi...  DEBUG  Decoding data from TDC number : 3
+MdtRawDataProvi...  DEBUG  Decoding data from TDC number : 4
+MdtRawDataProvi...  DEBUG Found the Beginnning of Link 
+MdtRawDataProvi...  DEBUG subdetId : 97 mrodId : 0 csmId : 2
+MdtRawDataProvi...  DEBUG getOfflineIdfromOnlineID result: 
+MdtRawDataProvi...  DEBUG Name : 2
+MdtRawDataProvi...  DEBUG Eta  : 1
+MdtRawDataProvi...  DEBUG Phi  : 1
+MdtRawDataProvi...  DEBUG  Collection ID = 0x6248000000000000 does not exist, create it 
+MdtRawDataProvi...  DEBUG  Decoding data from TDC number : 6
+MdtRawDataProvi...  DEBUG Found the Beginnning of Link 
+MdtRawDataProvi...  DEBUG subdetId : 97 mrodId : 0 csmId : 3
+MdtRawDataProvi...  DEBUG getOfflineIdfromOnlineID result: 
+MdtRawDataProvi...  DEBUG Name : 2
+MdtRawDataProvi...  DEBUG Eta  : 2
+MdtRawDataProvi...  DEBUG Phi  : 1
+MdtRawDataProvi...  DEBUG  Collection ID = 0x6250000000000000 does not exist, create it 
+MdtRawDataProvi...  DEBUG  Decoding data from TDC number : 0
+MdtRawDataProvi...  DEBUG  Decoding data from TDC number : 7
+MdtRawDataProvi...  DEBUG  Decoding data from TDC number : 8
+MdtRawDataProvi...  DEBUG Found the Beginnning of Link 
+MdtRawDataProvi...  DEBUG subdetId : 97 mrodId : 0 csmId : 4
+MdtRawDataProvi...  DEBUG getOfflineIdfromOnlineID result: 
+MdtRawDataProvi...  DEBUG Name : 4
+MdtRawDataProvi...  DEBUG Eta  : 1
+MdtRawDataProvi...  DEBUG Phi  : 1
+MdtRawDataProvi...  DEBUG  Collection ID = 0x6448000000000000 does not exist, create it 
+MdtRawDataProvi...  DEBUG  Decoding data from TDC number : 15
+MdtRawDataProvi...  DEBUG Found the Beginnning of Link 
+MdtRawDataProvi...  DEBUG subdetId : 97 mrodId : 0 csmId : 5
+MdtRawDataProvi...  DEBUG getOfflineIdfromOnlineID result: 
+MdtRawDataProvi...  DEBUG Name : 4
+MdtRawDataProvi...  DEBUG Eta  : 2
+MdtRawDataProvi...  DEBUG Phi  : 1
+MdtRawDataProvi...  DEBUG  Collection ID = 0x6450000000000000 does not exist, create it 
+MdtRawDataProvi...  DEBUG  Decoding data from TDC number : 0
+MdtRawDataProvi...  DEBUG  Decoding data from TDC number : 2
+MdtRawDataProvi...  DEBUG  Decoding data from TDC number : 8
+MdtRawDataProvi...  DEBUG  Decoding data from TDC number : 15
+MdtRawDataProvi...  DEBUG  Decoding data from TDC number : 16
+MdtRawDataProvi...  DEBUG  Decoding data from TDC number : 17
+MdtRawDataProvi...  DEBUG fillCollection: starting
+MdtRawDataProvi...  DEBUG **********Decoder dumping the words******** 
+MdtRawDataProvi...  DEBUG The size of this ROD-read is 
+MdtRawDataProvi...  DEBUG word 0 = 8003e994
+MdtRawDataProvi...  DEBUG word 1 = 81040004
+MdtRawDataProvi...  DEBUG word 2 = 18030210
+MdtRawDataProvi...  DEBUG word 3 = 890003ff
+MdtRawDataProvi...  DEBUG word 4 = 8a994002
+MdtRawDataProvi...  DEBUG word 5 = 81040014
+MdtRawDataProvi...  DEBUG word 6 = 18030211
+MdtRawDataProvi...  DEBUG word 7 = 89000fff
+MdtRawDataProvi...  DEBUG word 8 = a1994153
+MdtRawDataProvi...  DEBUG word 9 = 20000500
+MdtRawDataProvi...  DEBUG word 10 = a3994153
+MdtRawDataProvi...  DEBUG word 11 = 20000028
+MdtRawDataProvi...  DEBUG word 12 = aa994153
+MdtRawDataProvi...  DEBUG word 13 = 303c0116
+MdtRawDataProvi...  DEBUG word 14 = 3038016f
+MdtRawDataProvi...  DEBUG word 15 = 308c0202
+MdtRawDataProvi...  DEBUG word 16 = 3088026b
+MdtRawDataProvi...  DEBUG word 17 = 20100000
+MdtRawDataProvi...  DEBUG word 18 = ab994153
+MdtRawDataProvi...  DEBUG word 19 = 3074012d
+MdtRawDataProvi...  DEBUG word 20 = 30700187
+MdtRawDataProvi...  DEBUG word 21 = 3084015b
+MdtRawDataProvi...  DEBUG word 22 = 308001ca
+MdtRawDataProvi...  DEBUG word 23 = 20140150
+MdtRawDataProvi...  DEBUG word 24 = 8a994012
+MdtRawDataProvi...  DEBUG word 25 = 81040007
+MdtRawDataProvi...  DEBUG word 26 = 18030212
+MdtRawDataProvi...  DEBUG word 27 = 89003fff
+MdtRawDataProvi...  DEBUG word 28 = a3994153
+MdtRawDataProvi...  DEBUG word 29 = 307c0071
+MdtRawDataProvi...  DEBUG word 30 = 30780094
+MdtRawDataProvi...  DEBUG word 31 = 8a994005
+MdtRawDataProvi...  DEBUG word 32 = 81040014
+MdtRawDataProvi...  DEBUG word 33 = 18030213
+MdtRawDataProvi...  DEBUG word 34 = 89003fff
+MdtRawDataProvi...  DEBUG word 35 = a3994153
+MdtRawDataProvi...  DEBUG word 36 = 30b401cb
+MdtRawDataProvi...  DEBUG word 37 = 30bc0213
+MdtRawDataProvi...  DEBUG word 38 = 30b00256
+MdtRawDataProvi...  DEBUG word 39 = 30b802c7
+MdtRawDataProvi...  DEBUG word 40 = 307c032d
+MdtRawDataProvi...  DEBUG word 41 = 30840397
+MdtRawDataProvi...  DEBUG word 42 = 307803e7
+MdtRawDataProvi...  DEBUG word 43 = 308003f1
+MdtRawDataProvi...  DEBUG word 44 = a6994153
+MdtRawDataProvi...  DEBUG word 45 = 30b40533
+MdtRawDataProvi...  DEBUG word 46 = 30740552
+MdtRawDataProvi...  DEBUG word 47 = 30a40588
+MdtRawDataProvi...  DEBUG word 48 = 307005cb
+MdtRawDataProvi...  DEBUG word 49 = 30a00611
+MdtRawDataProvi...  DEBUG word 50 = 30b0063b
+MdtRawDataProvi...  DEBUG word 51 = 8a994012
+MdtRawDataProvi...  DEBUG word 52 = 8104001c
+MdtRawDataProvi...  DEBUG word 53 = 18030214
+MdtRawDataProvi...  DEBUG word 54 = 8903ffff
+MdtRawDataProvi...  DEBUG word 55 = a2994153
+MdtRawDataProvi...  DEBUG word 56 = 30b0002f
+MdtRawDataProvi...  DEBUG word 57 = 3084019b
+MdtRawDataProvi...  DEBUG word 58 = 30800237
+MdtRawDataProvi...  DEBUG word 59 = 20540100
+MdtRawDataProvi...  DEBUG word 60 = a4994153
+MdtRawDataProvi...  DEBUG word 61 = 306c019f
+MdtRawDataProvi...  DEBUG word 62 = 30680214
+MdtRawDataProvi...  DEBUG word 63 = 30140429
+MdtRawDataProvi...  DEBUG word 64 = 30100474
+MdtRawDataProvi...  DEBUG word 65 = 20000ad4
+MdtRawDataProvi...  DEBUG word 66 = a5994153
+MdtRawDataProvi...  DEBUG word 67 = 30bc0362
+MdtRawDataProvi...  DEBUG word 68 = 30b80481
+MdtRawDataProvi...  DEBUG word 69 = a6994153
+MdtRawDataProvi...  DEBUG word 70 = 20004000
+MdtRawDataProvi...  DEBUG word 71 = a8994153
+MdtRawDataProvi...  DEBUG word 72 = 20000820
+MdtRawDataProvi...  DEBUG word 73 = aa994153
+MdtRawDataProvi...  DEBUG word 74 = 20000002
+MdtRawDataProvi...  DEBUG word 75 = ae994153
+MdtRawDataProvi...  DEBUG word 76 = 20000080
+MdtRawDataProvi...  DEBUG word 77 = b0994153
+MdtRawDataProvi...  DEBUG word 78 = 20000200
+MdtRawDataProvi...  DEBUG word 79 = 8a99401a
+MdtRawDataProvi...  DEBUG word 80 = 81040025
+MdtRawDataProvi...  DEBUG word 81 = 18030215
+MdtRawDataProvi...  DEBUG word 82 = 8903ffff
+MdtRawDataProvi...  DEBUG word 83 = a5994153
+MdtRawDataProvi...  DEBUG word 84 = 304c054e
+MdtRawDataProvi...  DEBUG word 85 = 304805fd
+MdtRawDataProvi...  DEBUG word 86 = a6994153
+MdtRawDataProvi...  DEBUG word 87 = 20000040
+MdtRawDataProvi...  DEBUG word 88 = a8994153
+MdtRawDataProvi...  DEBUG word 89 = 306c0098
+MdtRawDataProvi...  DEBUG word 90 = 30bc0093
+MdtRawDataProvi...  DEBUG word 91 = 308400fd
+MdtRawDataProvi...  DEBUG word 92 = 308c00fe
+MdtRawDataProvi...  DEBUG word 93 = 309400fb
+MdtRawDataProvi...  DEBUG word 94 = 309c00fd
+MdtRawDataProvi...  DEBUG word 95 = 30a400f9
+MdtRawDataProvi...  DEBUG word 96 = 30ac00fc
+MdtRawDataProvi...  DEBUG word 97 = 30b400f9
+MdtRawDataProvi...  DEBUG word 98 = 302c0185
+MdtRawDataProvi...  DEBUG word 99 = 306801a0
+MdtRawDataProvi...  DEBUG word 100 = 30800148
+MdtRawDataProvi...  DEBUG word 101 = 30880147
+MdtRawDataProvi...  DEBUG word 102 = 30900149
+MdtRawDataProvi...  DEBUG word 103 = 30980168
+MdtRawDataProvi...  DEBUG word 104 = 30a00169
+MdtRawDataProvi...  DEBUG word 105 = 30a80163
+MdtRawDataProvi...  DEBUG word 106 = 30b00161
+MdtRawDataProvi...  DEBUG word 107 = 30b801a3
+MdtRawDataProvi...  DEBUG word 108 = 30280271
+MdtRawDataProvi...  DEBUG word 109 = a9994153
+MdtRawDataProvi...  DEBUG word 110 = 301c00b6
+MdtRawDataProvi...  DEBUG word 111 = 309c00d1
+MdtRawDataProvi...  DEBUG word 112 = 301801bc
+MdtRawDataProvi...  DEBUG word 113 = 309801b9
+MdtRawDataProvi...  DEBUG word 114 = 305c01f8
+MdtRawDataProvi...  DEBUG word 115 = 305802ec
+MdtRawDataProvi...  DEBUG word 116 = 8a994023
+MdtRawDataProvi...  DEBUG word 117 = f0000076
+MdtRawDataProvi...  DEBUG Found the beginning of buffer 
+MdtRawDataProvi...  DEBUG Level 1 Id : 256404
+MdtRawDataProvi...  DEBUG Found the Beginnning of Link 
+MdtRawDataProvi...  DEBUG subdetId : 97 mrodId : 1 csmId : 0
+MdtRawDataProvi...  DEBUG getOfflineIdfromOnlineID result: 
+MdtRawDataProvi...  DEBUG Name : 0
+MdtRawDataProvi...  DEBUG Eta  : 1
+MdtRawDataProvi...  DEBUG Phi  : 2
+MdtRawDataProvi...  DEBUG  Collection ID = 0x6049000000000000 does not exist, create it 
+MdtRawDataProvi...  DEBUG Found the Beginnning of Link 
+MdtRawDataProvi...  DEBUG subdetId : 97 mrodId : 1 csmId : 1
+MdtRawDataProvi...  DEBUG getOfflineIdfromOnlineID result: 
+MdtRawDataProvi...  DEBUG Name : 0
+MdtRawDataProvi...  DEBUG Eta  : 2
+MdtRawDataProvi...  DEBUG Phi  : 2
+MdtRawDataProvi...  DEBUG  Collection ID = 0x6051000000000000 does not exist, create it 
+MdtRawDataProvi...  DEBUG  Decoding data from TDC number : 1
+MdtRawDataProvi...  DEBUG  Decoding data from TDC number : 3
+MdtRawDataProvi...  DEBUG  Decoding data from TDC number : 10
+MdtRawDataProvi...  DEBUG  Decoding data from TDC number : 11
+MdtRawDataProvi...  DEBUG Found the Beginnning of Link 
+MdtRawDataProvi...  DEBUG subdetId : 97 mrodId : 1 csmId : 2
+MdtRawDataProvi...  DEBUG getOfflineIdfromOnlineID result: 
+MdtRawDataProvi...  DEBUG Name : 2
+MdtRawDataProvi...  DEBUG Eta  : 1
+MdtRawDataProvi...  DEBUG Phi  : 2
+MdtRawDataProvi...  DEBUG  Collection ID = 0x6249000000000000 does not exist, create it 
+MdtRawDataProvi...  DEBUG  Decoding data from TDC number : 3
+MdtRawDataProvi...  DEBUG Found the Beginnning of Link 
+MdtRawDataProvi...  DEBUG subdetId : 97 mrodId : 1 csmId : 3
+MdtRawDataProvi...  DEBUG getOfflineIdfromOnlineID result: 
+MdtRawDataProvi...  DEBUG Name : 2
+MdtRawDataProvi...  DEBUG Eta  : 2
+MdtRawDataProvi...  DEBUG Phi  : 2
+MdtRawDataProvi...  DEBUG  Collection ID = 0x6251000000000000 does not exist, create it 
+MdtRawDataProvi...  DEBUG  Decoding data from TDC number : 3
+MdtRawDataProvi...  DEBUG  Decoding data from TDC number : 6
+MdtRawDataProvi...  DEBUG Found the Beginnning of Link 
+MdtRawDataProvi...  DEBUG subdetId : 97 mrodId : 1 csmId : 4
+MdtRawDataProvi...  DEBUG getOfflineIdfromOnlineID result: 
+MdtRawDataProvi...  DEBUG Name : 4
+MdtRawDataProvi...  DEBUG Eta  : 1
+MdtRawDataProvi...  DEBUG Phi  : 2
+MdtRawDataProvi...  DEBUG  Collection ID = 0x6449000000000000 does not exist, create it 
+MdtRawDataProvi...  DEBUG  Decoding data from TDC number : 2
+MdtRawDataProvi...  DEBUG Error: corresponding leading edge not found for the trailing edge tdc: 2 chan: 22
+MdtRawDataProvi...  DEBUG  Decoding data from TDC number : 4
+MdtRawDataProvi...  DEBUG  Decoding data from TDC number : 5
+MdtRawDataProvi...  DEBUG  Decoding data from TDC number : 6
+MdtRawDataProvi...  DEBUG  Decoding data from TDC number : 8
+MdtRawDataProvi...  DEBUG  Decoding data from TDC number : 10
+MdtRawDataProvi...  DEBUG  Decoding data from TDC number : 14
+MdtRawDataProvi...  DEBUG  Decoding data from TDC number : 16
+MdtRawDataProvi...  DEBUG Found the Beginnning of Link 
+MdtRawDataProvi...  DEBUG subdetId : 97 mrodId : 1 csmId : 5
+MdtRawDataProvi...  DEBUG getOfflineIdfromOnlineID result: 
+MdtRawDataProvi...  DEBUG Name : 4
+MdtRawDataProvi...  DEBUG Eta  : 2
+MdtRawDataProvi...  DEBUG Phi  : 2
+MdtRawDataProvi...  DEBUG  Collection ID = 0x6451000000000000 does not exist, create it 
+MdtRawDataProvi...  DEBUG  Decoding data from TDC number : 5
+MdtRawDataProvi...  DEBUG  Decoding data from TDC number : 6
+MdtRawDataProvi...  DEBUG  Decoding data from TDC number : 8
+MdtRawDataProvi...  DEBUG  Decoding data from TDC number : 9
+MdtRawDataProvi...  DEBUG fillCollection: starting
+MdtRawDataProvi...  DEBUG **********Decoder dumping the words******** 
+MdtRawDataProvi...  DEBUG The size of this ROD-read is 
+MdtRawDataProvi...  DEBUG word 0 = 8003e994
+MdtRawDataProvi...  DEBUG word 1 = 81040004
+MdtRawDataProvi...  DEBUG word 2 = 180300d0
+MdtRawDataProvi...  DEBUG word 3 = 890003ff
+MdtRawDataProvi...  DEBUG word 4 = 8a994002
+MdtRawDataProvi...  DEBUG word 5 = 81040004
+MdtRawDataProvi...  DEBUG word 6 = 180300d1
+MdtRawDataProvi...  DEBUG word 7 = 89000fff
+MdtRawDataProvi...  DEBUG word 8 = 8a994002
+MdtRawDataProvi...  DEBUG word 9 = 8104000e
+MdtRawDataProvi...  DEBUG word 10 = 180300d2
+MdtRawDataProvi...  DEBUG word 11 = 89000fff
+MdtRawDataProvi...  DEBUG word 12 = a0994153
+MdtRawDataProvi...  DEBUG word 13 = 30a00056
+MdtRawDataProvi...  DEBUG word 14 = 20105050
+MdtRawDataProvi...  DEBUG word 15 = a1994153
+MdtRawDataProvi...  DEBUG word 16 = 30b40578
+MdtRawDataProvi...  DEBUG word 17 = 30b0060a
+MdtRawDataProvi...  DEBUG word 18 = a8994153
+MdtRawDataProvi...  DEBUG word 19 = 20000400
+MdtRawDataProvi...  DEBUG word 20 = a9994153
+MdtRawDataProvi...  DEBUG word 21 = 307c067b
+MdtRawDataProvi...  DEBUG word 22 = 8a99400c
+MdtRawDataProvi...  DEBUG word 23 = 81040011
+MdtRawDataProvi...  DEBUG word 24 = 180300d3
+MdtRawDataProvi...  DEBUG word 25 = 89003fff
+MdtRawDataProvi...  DEBUG word 26 = a5994153
+MdtRawDataProvi...  DEBUG word 27 = 308c0359
+MdtRawDataProvi...  DEBUG word 28 = 30880397
+MdtRawDataProvi...  DEBUG word 29 = 20020000
+MdtRawDataProvi...  DEBUG word 30 = a7994153
+MdtRawDataProvi...  DEBUG word 31 = 30600040
+MdtRawDataProvi...  DEBUG word 32 = 20001000
+MdtRawDataProvi...  DEBUG word 33 = a8994153
+MdtRawDataProvi...  DEBUG word 34 = 302403a8
+MdtRawDataProvi...  DEBUG word 35 = 3020040f
+MdtRawDataProvi...  DEBUG word 36 = a9994153
+MdtRawDataProvi...  DEBUG word 37 = 309c0635
+MdtRawDataProvi...  DEBUG word 38 = 308c0671
+MdtRawDataProvi...  DEBUG word 39 = 8a99400f
+MdtRawDataProvi...  DEBUG word 40 = 81040017
+MdtRawDataProvi...  DEBUG word 41 = 180300d4
+MdtRawDataProvi...  DEBUG word 42 = 8900ffff
+MdtRawDataProvi...  DEBUG word 43 = a1994153
+MdtRawDataProvi...  DEBUG word 44 = 304c0488
+MdtRawDataProvi...  DEBUG word 45 = 308c0498
+MdtRawDataProvi...  DEBUG word 46 = 302c0500
+MdtRawDataProvi...  DEBUG word 47 = 30280581
+MdtRawDataProvi...  DEBUG word 48 = 3048052d
+MdtRawDataProvi...  DEBUG word 49 = 3088056a
+MdtRawDataProvi...  DEBUG word 50 = 301c05a2
+MdtRawDataProvi...  DEBUG word 51 = 30180610
+MdtRawDataProvi...  DEBUG word 52 = 309c0646
+MdtRawDataProvi...  DEBUG word 53 = a4994153
+MdtRawDataProvi...  DEBUG word 54 = 30640517
+MdtRawDataProvi...  DEBUG word 55 = 306005a2
+MdtRawDataProvi...  DEBUG word 56 = 302405e1
+MdtRawDataProvi...  DEBUG word 57 = 30200624
+MdtRawDataProvi...  DEBUG word 58 = a9994153
+MdtRawDataProvi...  DEBUG word 59 = 200000a0
+MdtRawDataProvi...  DEBUG word 60 = ab994153
+MdtRawDataProvi...  DEBUG word 61 = 20041100
+MdtRawDataProvi...  DEBUG word 62 = 8a994015
+MdtRawDataProvi...  DEBUG word 63 = 8104001c
+MdtRawDataProvi...  DEBUG word 64 = 180300d5
+MdtRawDataProvi...  DEBUG word 65 = 8903ffff
+MdtRawDataProvi...  DEBUG word 66 = a0994153
+MdtRawDataProvi...  DEBUG word 67 = 3014000e
+MdtRawDataProvi...  DEBUG word 68 = 30100032
+MdtRawDataProvi...  DEBUG word 69 = 30940069
+MdtRawDataProvi...  DEBUG word 70 = 3090008d
+MdtRawDataProvi...  DEBUG word 71 = 20000400
+MdtRawDataProvi...  DEBUG word 72 = a1994153
+MdtRawDataProvi...  DEBUG word 73 = 3070001a
+MdtRawDataProvi...  DEBUG word 74 = 30040377
+MdtRawDataProvi...  DEBUG word 75 = 30000398
+MdtRawDataProvi...  DEBUG word 76 = 20014001
+MdtRawDataProvi...  DEBUG word 77 = a2994153
+MdtRawDataProvi...  DEBUG word 78 = 20000020
+MdtRawDataProvi...  DEBUG word 79 = a3994153
+MdtRawDataProvi...  DEBUG word 80 = 20000040
+MdtRawDataProvi...  DEBUG word 81 = a9994153
+MdtRawDataProvi...  DEBUG word 82 = 30a40400
+MdtRawDataProvi...  DEBUG word 83 = 30a00424
+MdtRawDataProvi...  DEBUG word 84 = aa994153
+MdtRawDataProvi...  DEBUG word 85 = 20008000
+MdtRawDataProvi...  DEBUG word 86 = ab994153
+MdtRawDataProvi...  DEBUG word 87 = 20080000
+MdtRawDataProvi...  DEBUG word 88 = b0994153
+MdtRawDataProvi...  DEBUG word 89 = 20080000
+MdtRawDataProvi...  DEBUG word 90 = 8a99401a
+MdtRawDataProvi...  DEBUG word 91 = f000005c
+MdtRawDataProvi...  DEBUG Found the beginning of buffer 
+MdtRawDataProvi...  DEBUG Level 1 Id : 256404
+MdtRawDataProvi...  DEBUG Found the Beginnning of Link 
+MdtRawDataProvi...  DEBUG subdetId : 97 mrodId : 2 csmId : 0
+MdtRawDataProvi...  DEBUG getOfflineIdfromOnlineID result: 
+MdtRawDataProvi...  DEBUG Name : 0
+MdtRawDataProvi...  DEBUG Eta  : 1
+MdtRawDataProvi...  DEBUG Phi  : 3
+MdtRawDataProvi...  DEBUG  Collection ID = 0x604a000000000000 does not exist, create it 
+MdtRawDataProvi...  DEBUG Found the Beginnning of Link 
+MdtRawDataProvi...  DEBUG subdetId : 97 mrodId : 2 csmId : 1
+MdtRawDataProvi...  DEBUG getOfflineIdfromOnlineID result: 
+MdtRawDataProvi...  DEBUG Name : 0
+MdtRawDataProvi...  DEBUG Eta  : 2
+MdtRawDataProvi...  DEBUG Phi  : 3
+MdtRawDataProvi...  DEBUG  Collection ID = 0x6052000000000000 does not exist, create it 
+MdtRawDataProvi...  DEBUG Found the Beginnning of Link 
+MdtRawDataProvi...  DEBUG subdetId : 97 mrodId : 2 csmId : 2
+MdtRawDataProvi...  DEBUG getOfflineIdfromOnlineID result: 
+MdtRawDataProvi...  DEBUG Name : 2
+MdtRawDataProvi...  DEBUG Eta  : 1
+MdtRawDataProvi...  DEBUG Phi  : 3
+MdtRawDataProvi...  DEBUG  Collection ID = 0x624a000000000000 does not exist, create it 
+MdtRawDataProvi...  DEBUG  Decoding data from TDC number : 0
+MdtRawDataProvi...  DEBUG Error: corresponding leading edge not found for the trailing edge tdc: 0 chan: 20
+MdtRawDataProvi...  DEBUG  Decoding data from TDC number : 1
+MdtRawDataProvi...  DEBUG  Decoding data from TDC number : 8
+MdtRawDataProvi...  DEBUG  Decoding data from TDC number : 9
+MdtRawDataProvi...  DEBUG Found the Beginnning of Link 
+MdtRawDataProvi...  DEBUG subdetId : 97 mrodId : 2 csmId : 3
+MdtRawDataProvi...  DEBUG getOfflineIdfromOnlineID result: 
+MdtRawDataProvi...  DEBUG Name : 2
+MdtRawDataProvi...  DEBUG Eta  : 2
+MdtRawDataProvi...  DEBUG Phi  : 3
+MdtRawDataProvi...  DEBUG  Collection ID = 0x6252000000000000 does not exist, create it 
+MdtRawDataProvi...  DEBUG  Decoding data from TDC number : 5
+MdtRawDataProvi...  DEBUG  Decoding data from TDC number : 7
+MdtRawDataProvi...  DEBUG Error: corresponding leading edge not found for the trailing edge tdc: 7 chan: 12
+MdtRawDataProvi...  DEBUG  Decoding data from TDC number : 8
+MdtRawDataProvi...  DEBUG  Decoding data from TDC number : 9
+MdtRawDataProvi...  DEBUG Found the Beginnning of Link 
+MdtRawDataProvi...  DEBUG subdetId : 97 mrodId : 2 csmId : 4
+MdtRawDataProvi...  DEBUG getOfflineIdfromOnlineID result: 
+MdtRawDataProvi...  DEBUG Name : 4
+MdtRawDataProvi...  DEBUG Eta  : 1
+MdtRawDataProvi...  DEBUG Phi  : 3
+MdtRawDataProvi...  DEBUG  Collection ID = 0x644a000000000000 does not exist, create it 
+MdtRawDataProvi...  DEBUG  Decoding data from TDC number : 1
+MdtRawDataProvi...  DEBUG  Decoding data from TDC number : 4
+MdtRawDataProvi...  DEBUG  Decoding data from TDC number : 9
+MdtRawDataProvi...  DEBUG  Decoding data from TDC number : 11
+MdtRawDataProvi...  DEBUG Found the Beginnning of Link 
+MdtRawDataProvi...  DEBUG subdetId : 97 mrodId : 2 csmId : 5
+MdtRawDataProvi...  DEBUG getOfflineIdfromOnlineID result: 
+MdtRawDataProvi...  DEBUG Name : 4
+MdtRawDataProvi...  DEBUG Eta  : 2
+MdtRawDataProvi...WARNING DEBUG message limit (500) reached for MdtRawDataProvider.MDT_RawDataProviderTool.MdtROD_Decoder. Suppressing further output.
+MdtRawDataProvi...  DEBUG After processing numColls=1136
+CscRawDataProvi...VERBOSE Number of ROB ids 32
+CscRawDataProvi...VERBOSE Number of ROB fragments 32
+CscRawDataProvi...  DEBUG Created container using cache for CscCache
+CscRawDataProvi...  DEBUG Before processing numColls=0
+CscRawDataProvi...  DEBUG vector of ROB ID to decode: size = 32
+CscRawDataProvi...  DEBUG in CscROD_Decode::fillCollection()
+CscRawDataProvi...  DEBUG in CscROD_Decoder::fillCollection :ROD version 401
+CscRawDataProvi...  DEBUG  
+CscRawDataProvi...  DEBUG ===================================================
+CscRawDataProvi...  DEBUG in CscROD_Decode::fillCollection() - ROD version 2
+CscRawDataProvi...  DEBUG DetDescr tag = ATLAS-R2-2016-01-00-01
+CscRawDataProvi...  DEBUG Online ROD id is 0x80
+CscRawDataProvi...  DEBUG Online ROD / ROD / collection / subDetector IDs are 0x80 24 8 106
+CscRawDataProvi...  DEBUG CSC RDO collection does not exist - creating a new one with hash = 8
+CscRawDataProvi...  DEBUG Event Type: 5407e04
+CscRawDataProvi...  DEBUG Sampling Time: 50  Number of Samples: 4
+CscRawDataProvi...  DEBUG Is Calibration Enabled?: 0  Calibration Amplitude: 5
+CscRawDataProvi...  DEBUG Calibration Layer: 0  Latency: 126
+CscRawDataProvi...  DEBUG Is neutron rejection ON?: 0  Is sparsified data?: 1
+CscRawDataProvi...  DEBUG CscROD_Decoder Total words received = 112
+CscRawDataProvi...  DEBUG RPU Header word 0x5000070
+CscRawDataProvi...  DEBUG RPU ID original = 5
+CscRawDataProvi...  DEBUG RPU ID Updated = 5
+CscRawDataProvi...  DEBUG RPU size = 112
+CscRawDataProvi...  DEBUG SCA Address = 724315438
+CscRawDataProvi...  DEBUG Number of Precision Cluster word 0x20202
+CscRawDataProvi...  DEBUG Number of precision Cluster Counts - Layer Index = 0 Cluster Counts = 0
+CscRawDataProvi...  DEBUG Number of precision Cluster Counts - Layer Index = 1 Cluster Counts = 2
+CscRawDataProvi...  DEBUG Number of precision Cluster Counts - Layer Index = 2 Cluster Counts = 2
+CscRawDataProvi...  DEBUG Number of precision Cluster Counts - Layer Index = 3 Cluster Counts = 2
+CscRawDataProvi...  DEBUG Second cluster word 0x600006c
+CscRawDataProvi...  DEBUG Summed Number of Clusters for non-precision layers 6
+CscRawDataProvi...  DEBUG Cluster Data Words = 108
+CscRawDataProvi...  DEBUG Total summed Cluster Count for precision and non-precision layers = 12
+CscRawDataProvi...  DEBUG cluster location word 0x10a2d
+CscRawDataProvi...  DEBUG  cluster time size word : stripId (CscIdHelper) 0x10000004 46
+CscRawDataProvi...  DEBUG     idColl clusHashid spuID stationId :: 8 31725  6  51 :: measphi0 L2 strId 46 nStr 4 T0 nSampWords 8 [7.51.-1.1.1.2.2.0.46]
+CscRawDataProvi...  DEBUG cluster location word 0x10a35
+CscRawDataProvi...  DEBUG  cluster time size word : stripId (CscIdHelper) 0x10000003 54
+CscRawDataProvi...  DEBUG     idColl clusHashid spuID stationId :: 8 31733  6  51 :: measphi0 L2 strId 54 nStr 3 T0 nSampWords 6 [7.51.-1.1.1.2.2.0.54]
+CscRawDataProvi...  DEBUG cluster location word 0x10c2c
+CscRawDataProvi...  DEBUG  cluster time size word : stripId (CscIdHelper) 0x10000005 45
+CscRawDataProvi...  DEBUG     idColl clusHashid spuID stationId :: 8 31916  7  51 :: measphi0 L3 strId 45 nStr 5 T0 nSampWords 10 [7.51.-1.1.1.2.3.0.45]
+CscRawDataProvi...  DEBUG cluster location word 0x10c37
+CscRawDataProvi...  DEBUG  cluster time size word : stripId (CscIdHelper) 0x10000004 56
+CscRawDataProvi...  DEBUG     idColl clusHashid spuID stationId :: 8 31927  7  51 :: measphi0 L3 strId 56 nStr 4 T0 nSampWords 8 [7.51.-1.1.1.2.3.0.56]
+CscRawDataProvi...  DEBUG cluster location word 0x10e2d
+CscRawDataProvi...  DEBUG  cluster time size word : stripId (CscIdHelper) 0x10000003 46
+CscRawDataProvi...  DEBUG     idColl clusHashid spuID stationId :: 8 32109  8  51 :: measphi0 L4 strId 46 nStr 3 T0 nSampWords 6 [7.51.-1.1.1.2.4.0.46]
+CscRawDataProvi...  DEBUG cluster location word 0x10e39
+CscRawDataProvi...  DEBUG  cluster time size word : stripId (CscIdHelper) 0x10000003 58
+CscRawDataProvi...  DEBUG     idColl clusHashid spuID stationId :: 8 32121  8  51 :: measphi0 L4 strId 58 nStr 3 T0 nSampWords 6 [7.51.-1.1.1.2.4.0.58]
+CscRawDataProvi...  DEBUG cluster location word 0x10903
+CscRawDataProvi...  DEBUG  cluster time size word : stripId (CscIdHelper) 0x10000003 4
+CscRawDataProvi...  DEBUG     idColl clusHashid spuID stationId :: 8 55491  9  51 :: measphi1 L1 strId 4 nStr 3 T0 nSampWords 6 [7.51.-1.1.1.2.1.1.4]
+CscRawDataProvi...  DEBUG cluster location word 0x10b08
+CscRawDataProvi...  DEBUG  cluster time size word : stripId (CscIdHelper) 0x10000003 9
+CscRawDataProvi...  DEBUG     idColl clusHashid spuID stationId :: 8 55544  9  51 :: measphi1 L2 strId 9 nStr 3 T0 nSampWords 6 [7.51.-1.1.1.2.2.1.9]
+CscRawDataProvi...  DEBUG cluster location word 0x10b1e
+CscRawDataProvi...  DEBUG  cluster time size word : stripId (CscIdHelper) 0x10000003 31
+CscRawDataProvi...  DEBUG     idColl clusHashid spuID stationId :: 8 55566  9  51 :: measphi1 L2 strId 31 nStr 3 T0 nSampWords 6 [7.51.-1.1.1.2.2.1.31]
+CscRawDataProvi...  DEBUG cluster location word 0x10d07
+CscRawDataProvi...  DEBUG  cluster time size word : stripId (CscIdHelper) 0x10000005 8
+CscRawDataProvi...  DEBUG     idColl clusHashid spuID stationId :: 8 55591  9  51 :: measphi1 L3 strId 8 nStr 5 T0 nSampWords 10 [7.51.-1.1.1.2.3.1.8]
+CscRawDataProvi...  DEBUG cluster location word 0x10d1e
+CscRawDataProvi...  DEBUG  cluster time size word : stripId (CscIdHelper) 0x10000003 31
+CscRawDataProvi...  DEBUG     idColl clusHashid spuID stationId :: 8 55614  9  51 :: measphi1 L3 strId 31 nStr 3 T0 nSampWords 6 [7.51.-1.1.1.2.3.1.31]
+CscRawDataProvi...  DEBUG cluster location word 0x10f08
+CscRawDataProvi...  DEBUG  cluster time size word : stripId (CscIdHelper) 0x10000003 9
+CscRawDataProvi...  DEBUG     idColl clusHashid spuID stationId :: 8 55640  9  51 :: measphi1 L4 strId 9 nStr 3 T0 nSampWords 6 [7.51.-1.1.1.2.4.1.9]
+CscRawDataProvi...  DEBUG ****Total Cluster count = 12 for RPU ID 5
+CscRawDataProvi...  DEBUG end of CscROD_Decode::fillCollection()
+CscRawDataProvi...  DEBUG in CscROD_Decode::fillCollection()
+CscRawDataProvi...  DEBUG in CscROD_Decoder::fillCollection :ROD version 401
+CscRawDataProvi...  DEBUG  
+CscRawDataProvi...  DEBUG ===================================================
+CscRawDataProvi...  DEBUG in CscROD_Decode::fillCollection() - ROD version 2
+CscRawDataProvi...  DEBUG DetDescr tag = ATLAS-R2-2016-01-00-01
+CscRawDataProvi...  DEBUG Online ROD id is 0x81
+CscRawDataProvi...  DEBUG Online ROD / ROD / collection / subDetector IDs are 0x81 16 0 106
+CscRawDataProvi...  DEBUG CSC RDO collection does not exist - creating a new one with hash = 0
+CscRawDataProvi...  DEBUG Event Type: 5407e04
+CscRawDataProvi...  DEBUG Sampling Time: 50  Number of Samples: 4
+CscRawDataProvi...  DEBUG Is Calibration Enabled?: 0  Calibration Amplitude: 5
+CscRawDataProvi...  DEBUG Calibration Layer: 0  Latency: 126
+CscRawDataProvi...  DEBUG Is neutron rejection ON?: 0  Is sparsified data?: 1
+CscRawDataProvi...  DEBUG CscROD_Decoder Total words received = 122
+CscRawDataProvi...  DEBUG RPU Header word 0xd00007a
+CscRawDataProvi...  DEBUG RPU ID original = 13
+CscRawDataProvi...  DEBUG RPU ID Updated = 11
+CscRawDataProvi...  DEBUG RPU size = 122
+CscRawDataProvi...  DEBUG SCA Address = 2358087311
+CscRawDataProvi...  DEBUG Number of Precision Cluster word 0x2000002
+CscRawDataProvi...  DEBUG Number of precision Cluster Counts - Layer Index = 0 Cluster Counts = 2
+CscRawDataProvi...  DEBUG Number of precision Cluster Counts - Layer Index = 1 Cluster Counts = 0
+CscRawDataProvi...  DEBUG Number of precision Cluster Counts - Layer Index = 2 Cluster Counts = 0
+CscRawDataProvi...  DEBUG Number of precision Cluster Counts - Layer Index = 3 Cluster Counts = 2
+CscRawDataProvi...  DEBUG Second cluster word 0x7000076
+CscRawDataProvi...  DEBUG Summed Number of Clusters for non-precision layers 7
+CscRawDataProvi...  DEBUG Cluster Data Words = 118
+CscRawDataProvi...  DEBUG Total summed Cluster Count for precision and non-precision layers = 11
+CscRawDataProvi...  DEBUG cluster location word 0x810
+CscRawDataProvi...  DEBUG  cluster time size word : stripId (CscIdHelper) 0x10000004 17
+CscRawDataProvi...  DEBUG     idColl clusHashid spuID stationId :: 0 784  0  50 :: measphi0 L1 strId 17 nStr 4 T0 nSampWords 8 [7.50.-1.1.1.2.1.0.17]
+CscRawDataProvi...  DEBUG cluster location word 0x868
+CscRawDataProvi...  DEBUG  cluster time size word : stripId (CscIdHelper) 0x10000007 105
+CscRawDataProvi...  DEBUG     idColl clusHashid spuID stationId :: 0 872  0  50 :: measphi0 L1 strId 105 nStr 7 T0 nSampWords 14 [7.50.-1.1.1.2.1.0.105]
+CscRawDataProvi...  DEBUG cluster location word 0xe11
+CscRawDataProvi...  DEBUG  cluster time size word : stripId (CscIdHelper) 0x1000000a 18
+CscRawDataProvi...  DEBUG     idColl clusHashid spuID stationId :: 0 1361  3  50 :: measphi0 L4 strId 18 nStr 10 T0 nSampWords 20 [7.50.-1.1.1.2.4.0.18]
+CscRawDataProvi...  DEBUG cluster location word 0xe41
+CscRawDataProvi...  DEBUG  cluster time size word : stripId (CscIdHelper) 0x10000004 66
+CscRawDataProvi...  DEBUG     idColl clusHashid spuID stationId :: 0 1409  3  50 :: measphi0 L4 strId 66 nStr 4 T0 nSampWords 8 [7.50.-1.1.1.2.4.0.66]
+CscRawDataProvi...  DEBUG cluster location word 0x916
+CscRawDataProvi...  DEBUG  cluster time size word : stripId (CscIdHelper) 0x10000005 23
+CscRawDataProvi...  DEBUG     idColl clusHashid spuID stationId :: 0 24790  4  50 :: measphi1 L1 strId 23 nStr 5 T0 nSampWords 10 [7.50.-1.1.1.2.1.1.23]
+CscRawDataProvi...  DEBUG cluster location word 0xb16
+CscRawDataProvi...  DEBUG  cluster time size word : stripId (CscIdHelper) 0x10000003 23
+CscRawDataProvi...  DEBUG     idColl clusHashid spuID stationId :: 0 24838  4  50 :: measphi1 L2 strId 23 nStr 3 T0 nSampWords 6 [7.50.-1.1.1.2.2.1.23]
+CscRawDataProvi...  DEBUG cluster location word 0xd03
+CscRawDataProvi...  DEBUG  cluster time size word : stripId (CscIdHelper) 0x10000003 4
+CscRawDataProvi...  DEBUG     idColl clusHashid spuID stationId :: 0 24867  4  50 :: measphi1 L3 strId 4 nStr 3 T0 nSampWords 6 [7.50.-1.1.1.2.3.1.4]
+CscRawDataProvi...  DEBUG cluster location word 0xd15
+CscRawDataProvi...  DEBUG  cluster time size word : stripId (CscIdHelper) 0x10000003 22
+CscRawDataProvi...  DEBUG     idColl clusHashid spuID stationId :: 0 24885  4  50 :: measphi1 L3 strId 22 nStr 3 T0 nSampWords 6 [7.50.-1.1.1.2.3.1.22]
+CscRawDataProvi...  DEBUG cluster location word 0xd2d
+CscRawDataProvi...  DEBUG  cluster time size word : stripId (CscIdHelper) 0x10000003 46
+CscRawDataProvi...  DEBUG     idColl clusHashid spuID stationId :: 0 24909  4  50 :: measphi1 L3 strId 46 nStr 3 T0 nSampWords 6 [7.50.-1.1.1.2.3.1.46]
+CscRawDataProvi...  DEBUG cluster location word 0xf15
+CscRawDataProvi...  DEBUG  cluster time size word : stripId (CscIdHelper) 0x10000003 22
+CscRawDataProvi...  DEBUG     idColl clusHashid spuID stationId :: 0 24933  4  50 :: measphi1 L4 strId 22 nStr 3 T0 nSampWords 6 [7.50.-1.1.1.2.4.1.22]
+CscRawDataProvi...  DEBUG cluster location word 0xf1e
+CscRawDataProvi...  DEBUG  cluster time size word : stripId (CscIdHelper) 0x10000003 31
+CscRawDataProvi...  DEBUG     idColl clusHashid spuID stationId :: 0 24942  4  50 :: measphi1 L4 strId 31 nStr 3 T0 nSampWords 6 [7.50.-1.1.1.2.4.1.31]
+CscRawDataProvi...  DEBUG ****Total Cluster count = 11 for RPU ID 11
+CscRawDataProvi...  DEBUG end of CscROD_Decode::fillCollection()
+CscRawDataProvi...  DEBUG in CscROD_Decode::fillCollection()
+CscRawDataProvi...  DEBUG in CscROD_Decoder::fillCollection :ROD version 401
+CscRawDataProvi...  DEBUG  
+CscRawDataProvi...  DEBUG ===================================================
+CscRawDataProvi...  DEBUG in CscROD_Decode::fillCollection() - ROD version 2
+CscRawDataProvi...  DEBUG DetDescr tag = ATLAS-R2-2016-01-00-01
+CscRawDataProvi...  DEBUG Online ROD id is 0x82
+CscRawDataProvi...  DEBUG Online ROD / ROD / collection / subDetector IDs are 0x82 25 9 106
+CscRawDataProvi...  DEBUG CSC RDO collection does not exist - creating a new one with hash = 9
+CscRawDataProvi...  DEBUG Event Type: 5407e04
+CscRawDataProvi...  DEBUG Sampling Time: 50  Number of Samples: 4
+CscRawDataProvi...  DEBUG Is Calibration Enabled?: 0  Calibration Amplitude: 5
+CscRawDataProvi...  DEBUG Calibration Layer: 0  Latency: 126
+CscRawDataProvi...  DEBUG Is neutron rejection ON?: 0  Is sparsified data?: 1
+CscRawDataProvi...  DEBUG CscROD_Decoder Total words received = 50
+CscRawDataProvi...  DEBUG RPU Header word 0x5000032
+CscRawDataProvi...  DEBUG RPU ID original = 5
+CscRawDataProvi...  DEBUG RPU ID Updated = 5
+CscRawDataProvi...  DEBUG RPU size = 50
+CscRawDataProvi...  DEBUG SCA Address = 269554195
+CscRawDataProvi...  DEBUG Number of Precision Cluster word 0x102
+CscRawDataProvi...  DEBUG Number of precision Cluster Counts - Layer Index = 0 Cluster Counts = 0
+CscRawDataProvi...  DEBUG Number of precision Cluster Counts - Layer Index = 1 Cluster Counts = 0
+CscRawDataProvi...  DEBUG Number of precision Cluster Counts - Layer Index = 2 Cluster Counts = 1
+CscRawDataProvi...  DEBUG Number of precision Cluster Counts - Layer Index = 3 Cluster Counts = 2
+CscRawDataProvi...  DEBUG Second cluster word 0x200002e
+CscRawDataProvi...  DEBUG Summed Number of Clusters for non-precision layers 2
+CscRawDataProvi...  DEBUG Cluster Data Words = 46
+CscRawDataProvi...  DEBUG Total summed Cluster Count for precision and non-precision layers = 5
+CscRawDataProvi...  DEBUG cluster location word 0x12c17
+CscRawDataProvi...  DEBUG  cluster time size word : stripId (CscIdHelper) 0x10000005 24
+CscRawDataProvi...  DEBUG     idColl clusHashid spuID stationId :: 9 33431  7  51 :: measphi0 L3 strId 24 nStr 5 T0 nSampWords 10 [7.51.-1.2.1.2.3.0.24]
+CscRawDataProvi...  DEBUG cluster location word 0x12e16
+CscRawDataProvi...  DEBUG  cluster time size word : stripId (CscIdHelper) 0x10000003 23
+CscRawDataProvi...  DEBUG     idColl clusHashid spuID stationId :: 9 33622  8  51 :: measphi0 L4 strId 23 nStr 3 T0 nSampWords 6 [7.51.-1.2.1.2.4.0.23]
+CscRawDataProvi...  DEBUG cluster location word 0x12e1a
+CscRawDataProvi...  DEBUG  cluster time size word : stripId (CscIdHelper) 0x10000003 27
+CscRawDataProvi...  DEBUG     idColl clusHashid spuID stationId :: 9 33626  8  51 :: measphi0 L4 strId 27 nStr 3 T0 nSampWords 6 [7.51.-1.2.1.2.4.0.27]
+CscRawDataProvi...  DEBUG cluster location word 0x12d24
+CscRawDataProvi...  DEBUG  cluster time size word : stripId (CscIdHelper) 0x10000004 37
+CscRawDataProvi...  DEBUG     idColl clusHashid spuID stationId :: 9 56004  9  51 :: measphi1 L3 strId 37 nStr 4 T0 nSampWords 8 [7.51.-1.2.1.2.3.1.37]
+CscRawDataProvi...  DEBUG cluster location word 0x12f24
+CscRawDataProvi...  DEBUG  cluster time size word : stripId (CscIdHelper) 0x10000003 37
+CscRawDataProvi...  DEBUG     idColl clusHashid spuID stationId :: 9 56052  9  51 :: measphi1 L4 strId 37 nStr 3 T0 nSampWords 6 [7.51.-1.2.1.2.4.1.37]
+CscRawDataProvi...  DEBUG ****Total Cluster count = 5 for RPU ID 5
+CscRawDataProvi...  DEBUG end of CscROD_Decode::fillCollection()
+CscRawDataProvi...  DEBUG in CscROD_Decode::fillCollection()
+CscRawDataProvi...  DEBUG in CscROD_Decoder::fillCollection :ROD version 401
+CscRawDataProvi...  DEBUG  
+CscRawDataProvi...  DEBUG ===================================================
+CscRawDataProvi...  DEBUG in CscROD_Decode::fillCollection() - ROD version 2
+CscRawDataProvi...  DEBUG DetDescr tag = ATLAS-R2-2016-01-00-01
+CscRawDataProvi...  DEBUG Online ROD id is 0x83
+CscRawDataProvi...  DEBUG Online ROD / ROD / collection / subDetector IDs are 0x83 17 1 106
+CscRawDataProvi...  DEBUG CSC RDO collection does not exist - creating a new one with hash = 1
+CscRawDataProvi...  DEBUG Event Type: 5407e04
+CscRawDataProvi...  DEBUG Sampling Time: 50  Number of Samples: 4
+CscRawDataProvi...  DEBUG Is Calibration Enabled?: 0  Calibration Amplitude: 5
+CscRawDataProvi...  DEBUG Calibration Layer: 0  Latency: 126
+CscRawDataProvi...  DEBUG Is neutron rejection ON?: 0  Is sparsified data?: 1
+CscRawDataProvi...  DEBUG CscROD_Decoder Total words received = 116
+CscRawDataProvi...  DEBUG RPU Header word 0xd000074
+CscRawDataProvi...  DEBUG RPU ID original = 13
+CscRawDataProvi...  DEBUG RPU ID Updated = 11
+CscRawDataProvi...  DEBUG RPU size = 116
+CscRawDataProvi...  DEBUG SCA Address = 1920169077
+CscRawDataProvi...  DEBUG Number of Precision Cluster word 0x1010102
+CscRawDataProvi...  DEBUG Number of precision Cluster Counts - Layer Index = 0 Cluster Counts = 1
+CscRawDataProvi...  DEBUG Number of precision Cluster Counts - Layer Index = 1 Cluster Counts = 1
+CscRawDataProvi...  DEBUG Number of precision Cluster Counts - Layer Index = 2 Cluster Counts = 1
+CscRawDataProvi...  DEBUG Number of precision Cluster Counts - Layer Index = 3 Cluster Counts = 2
+CscRawDataProvi...  DEBUG Second cluster word 0x6000070
+CscRawDataProvi...  DEBUG Summed Number of Clusters for non-precision layers 6
+CscRawDataProvi...  DEBUG Cluster Data Words = 112
+CscRawDataProvi...  DEBUG Total summed Cluster Count for precision and non-precision layers = 11
+CscRawDataProvi...  DEBUG cluster location word 0x2818
+CscRawDataProvi...  DEBUG  cluster time size word : stripId (CscIdHelper) 0x10000004 25
+CscRawDataProvi...  DEBUG     idColl clusHashid spuID stationId :: 1 2328  0  50 :: measphi0 L1 strId 25 nStr 4 T0 nSampWords 8 [7.50.-1.2.1.2.1.0.25]
+CscRawDataProvi...  DEBUG cluster location word 0x2a17
+CscRawDataProvi...  DEBUG  cluster time size word : stripId (CscIdHelper) 0x10000006 24
+CscRawDataProvi...  DEBUG     idColl clusHashid spuID stationId :: 1 2519  1  50 :: measphi0 L2 strId 24 nStr 6 T0 nSampWords 12 [7.50.-1.2.1.2.2.0.24]
+CscRawDataProvi...  DEBUG cluster location word 0x2c17
+CscRawDataProvi...  DEBUG  cluster time size word : stripId (CscIdHelper) 0x10000005 24
+CscRawDataProvi...  DEBUG     idColl clusHashid spuID stationId :: 1 2711  2  50 :: measphi0 L3 strId 24 nStr 5 T0 nSampWords 10 [7.50.-1.2.1.2.3.0.24]
+CscRawDataProvi...  DEBUG cluster location word 0x2e18
+CscRawDataProvi...  DEBUG  cluster time size word : stripId (CscIdHelper) 0x10000004 25
+CscRawDataProvi...  DEBUG     idColl clusHashid spuID stationId :: 1 2904  3  50 :: measphi0 L4 strId 25 nStr 4 T0 nSampWords 8 [7.50.-1.2.1.2.4.0.25]
+CscRawDataProvi...  DEBUG cluster location word 0x2ebc
+CscRawDataProvi...  DEBUG  cluster time size word : stripId (CscIdHelper) 0x10000003 189
+CscRawDataProvi...  DEBUG     idColl clusHashid spuID stationId :: 1 3068  3  50 :: measphi0 L4 strId 189 nStr 3 T0 nSampWords 6 [7.50.-1.2.1.2.4.0.189]
+CscRawDataProvi...  DEBUG cluster location word 0x2909
+CscRawDataProvi...  DEBUG  cluster time size word : stripId (CscIdHelper) 0x10000004 10
+CscRawDataProvi...  DEBUG     idColl clusHashid spuID stationId :: 1 25161  4  50 :: measphi1 L1 strId 10 nStr 4 T0 nSampWords 8 [7.50.-1.2.1.2.1.1.10]
+CscRawDataProvi...  DEBUG cluster location word 0x2b09
+CscRawDataProvi...  DEBUG  cluster time size word : stripId (CscIdHelper) 0x10000005 10
+CscRawDataProvi...  DEBUG     idColl clusHashid spuID stationId :: 1 25209  4  50 :: measphi1 L2 strId 10 nStr 5 T0 nSampWords 10 [7.50.-1.2.1.2.2.1.10]
+CscRawDataProvi...  DEBUG cluster location word 0x2d09
+CscRawDataProvi...  DEBUG  cluster time size word : stripId (CscIdHelper) 0x10000004 10
+CscRawDataProvi...  DEBUG     idColl clusHashid spuID stationId :: 1 25257  4  50 :: measphi1 L3 strId 10 nStr 4 T0 nSampWords 8 [7.50.-1.2.1.2.3.1.10]
+CscRawDataProvi...  DEBUG cluster location word 0x2d16
+CscRawDataProvi...  DEBUG  cluster time size word : stripId (CscIdHelper) 0x10000003 23
+CscRawDataProvi...  DEBUG     idColl clusHashid spuID stationId :: 1 25270  4  50 :: measphi1 L3 strId 23 nStr 3 T0 nSampWords 6 [7.50.-1.2.1.2.3.1.23]
+CscRawDataProvi...  DEBUG cluster location word 0x2f09
+CscRawDataProvi...  DEBUG  cluster time size word : stripId (CscIdHelper) 0x10000004 10
+CscRawDataProvi...  DEBUG     idColl clusHashid spuID stationId :: 1 25305  4  50 :: measphi1 L4 strId 10 nStr 4 T0 nSampWords 8 [7.50.-1.2.1.2.4.1.10]
+CscRawDataProvi...  DEBUG cluster location word 0x2f28
+CscRawDataProvi...  DEBUG  cluster time size word : stripId (CscIdHelper) 0x10000003 41
+CscRawDataProvi...  DEBUG     idColl clusHashid spuID stationId :: 1 25336  4  50 :: measphi1 L4 strId 41 nStr 3 T0 nSampWords 6 [7.50.-1.2.1.2.4.1.41]
+CscRawDataProvi...  DEBUG ****Total Cluster count = 11 for RPU ID 11
+CscRawDataProvi...  DEBUG end of CscROD_Decode::fillCollection()
+CscRawDataProvi...  DEBUG in CscROD_Decode::fillCollection()
+CscRawDataProvi...  DEBUG in CscROD_Decoder::fillCollection :ROD version 401
+CscRawDataProvi...  DEBUG  
+CscRawDataProvi...  DEBUG ===================================================
+CscRawDataProvi...  DEBUG in CscROD_Decode::fillCollection() - ROD version 2
+CscRawDataProvi...  DEBUG DetDescr tag = ATLAS-R2-2016-01-00-01
+CscRawDataProvi...  DEBUG Online ROD id is 0x84
+CscRawDataProvi...  DEBUG Online ROD / ROD / collection / subDetector IDs are 0x84 26 10 106
+CscRawDataProvi...  DEBUG CSC RDO collection does not exist - creating a new one with hash = 10
+CscRawDataProvi...  DEBUG Event Type: 5407e04
+CscRawDataProvi...  DEBUG Sampling Time: 50  Number of Samples: 4
+CscRawDataProvi...  DEBUG Is Calibration Enabled?: 0  Calibration Amplitude: 5
+CscRawDataProvi...  DEBUG Calibration Layer: 0  Latency: 126
+CscRawDataProvi...  DEBUG Is neutron rejection ON?: 0  Is sparsified data?: 1
+CscRawDataProvi...  DEBUG CscROD_Decoder Total words received = 114
+CscRawDataProvi...  DEBUG RPU Header word 0x5000072
+CscRawDataProvi...  DEBUG RPU ID original = 5
+CscRawDataProvi...  DEBUG RPU ID Updated = 5
+CscRawDataProvi...  DEBUG RPU size = 114
+CscRawDataProvi...  DEBUG SCA Address = 1414878807
+CscRawDataProvi...  DEBUG Number of Precision Cluster word 0x200
+CscRawDataProvi...  DEBUG Number of precision Cluster Counts - Layer Index = 0 Cluster Counts = 0
+CscRawDataProvi...  DEBUG Number of precision Cluster Counts - Layer Index = 1 Cluster Counts = 0
+CscRawDataProvi...  DEBUG Number of precision Cluster Counts - Layer Index = 2 Cluster Counts = 2
+CscRawDataProvi...  DEBUG Number of precision Cluster Counts - Layer Index = 3 Cluster Counts = 0
+CscRawDataProvi...  DEBUG Second cluster word 0x400006e
+CscRawDataProvi...  DEBUG Summed Number of Clusters for non-precision layers 4
+CscRawDataProvi...  DEBUG Cluster Data Words = 110
+CscRawDataProvi...  DEBUG Total summed Cluster Count for precision and non-precision layers = 6
+CscRawDataProvi...  DEBUG cluster location word 0x14c03
+CscRawDataProvi...  DEBUG  cluster time size word : stripId (CscIdHelper) 0x10000005 4
+CscRawDataProvi...  DEBUG     idColl clusHashid spuID stationId :: 10 34947  7  51 :: measphi0 L3 strId 4 nStr 5 T0 nSampWords 10 [7.51.-1.3.1.2.3.0.4]
+CscRawDataProvi...  DEBUG cluster location word 0x14c66
+CscRawDataProvi...  DEBUG  cluster time size word : stripId (CscIdHelper) 0x10000013 103
+CscRawDataProvi...  DEBUG     idColl clusHashid spuID stationId :: 10 35046  7  51 :: measphi0 L3 strId 103 nStr 19 T0 nSampWords 38 [7.51.-1.3.1.2.3.0.103]
+CscRawDataProvi...  DEBUG cluster location word 0x1491b
+CscRawDataProvi...  DEBUG  cluster time size word : stripId (CscIdHelper) 0x10000003 28
+CscRawDataProvi...  DEBUG     idColl clusHashid spuID stationId :: 10 56283  9  51 :: measphi1 L1 strId 28 nStr 3 T0 nSampWords 6 [7.51.-1.3.1.2.1.1.28]
+CscRawDataProvi...  DEBUG cluster location word 0x14d09
+CscRawDataProvi...  DEBUG  cluster time size word : stripId (CscIdHelper) 0x10000006 10
+CscRawDataProvi...  DEBUG     idColl clusHashid spuID stationId :: 10 56361  9  51 :: measphi1 L3 strId 10 nStr 6 T0 nSampWords 12 [7.51.-1.3.1.2.3.1.10]
+CscRawDataProvi...  DEBUG cluster location word 0x14d1f
+CscRawDataProvi...  DEBUG  cluster time size word : stripId (CscIdHelper) 0x10000003 32
+CscRawDataProvi...  DEBUG     idColl clusHashid spuID stationId :: 10 56383  9  51 :: measphi1 L3 strId 32 nStr 3 T0 nSampWords 6 [7.51.-1.3.1.2.3.1.32]
+CscRawDataProvi...  DEBUG cluster location word 0x14d23
+CscRawDataProvi...  DEBUG  cluster time size word : stripId (CscIdHelper) 0x1000000d 36
+CscRawDataProvi...  DEBUG     idColl clusHashid spuID stationId :: 10 56387  9  51 :: measphi1 L3 strId 36 nStr 13 T0 nSampWords 26 [7.51.-1.3.1.2.3.1.36]
+CscRawDataProvi...  DEBUG ****Total Cluster count = 6 for RPU ID 5
+CscRawDataProvi...  DEBUG end of CscROD_Decode::fillCollection()
+CscRawDataProvi...  DEBUG in CscROD_Decode::fillCollection()
+CscRawDataProvi...  DEBUG in CscROD_Decoder::fillCollection :ROD version 401
+CscRawDataProvi...  DEBUG  
+CscRawDataProvi...  DEBUG ===================================================
+CscRawDataProvi...  DEBUG in CscROD_Decode::fillCollection() - ROD version 2
+CscRawDataProvi...  DEBUG DetDescr tag = ATLAS-R2-2016-01-00-01
+CscRawDataProvi...  DEBUG Online ROD id is 0x85
+CscRawDataProvi...  DEBUG Online ROD / ROD / collection / subDetector IDs are 0x85 18 2 106
+CscRawDataProvi...  DEBUG CSC RDO collection does not exist - creating a new one with hash = 2
+CscRawDataProvi...  DEBUG Event Type: 5407e04
+CscRawDataProvi...  DEBUG Sampling Time: 50  Number of Samples: 4
+CscRawDataProvi...  DEBUG Is Calibration Enabled?: 0  Calibration Amplitude: 5
+CscRawDataProvi...  DEBUG Calibration Layer: 0  Latency: 126
+CscRawDataProvi...  DEBUG Is neutron rejection ON?: 0  Is sparsified data?: 1
+CscRawDataProvi...  DEBUG CscROD_Decoder Total words received = 90
+CscRawDataProvi...  DEBUG RPU Header word 0xd00005a
+CscRawDataProvi...  DEBUG RPU ID original = 13
+CscRawDataProvi...  DEBUG RPU ID Updated = 11
+CscRawDataProvi...  DEBUG RPU size = 90
+CscRawDataProvi...  DEBUG SCA Address = 1482250843
+CscRawDataProvi...  DEBUG Number of Precision Cluster word 0x20100
+CscRawDataProvi...  DEBUG Number of precision Cluster Counts - Layer Index = 0 Cluster Counts = 0
+CscRawDataProvi...  DEBUG Number of precision Cluster Counts - Layer Index = 1 Cluster Counts = 2
+CscRawDataProvi...  DEBUG Number of precision Cluster Counts - Layer Index = 2 Cluster Counts = 1
+CscRawDataProvi...  DEBUG Number of precision Cluster Counts - Layer Index = 3 Cluster Counts = 0
+CscRawDataProvi...  DEBUG Second cluster word 0x4000056
+CscRawDataProvi...  DEBUG Summed Number of Clusters for non-precision layers 4
+CscRawDataProvi...  DEBUG Cluster Data Words = 86
+CscRawDataProvi...  DEBUG Total summed Cluster Count for precision and non-precision layers = 7
+CscRawDataProvi...  DEBUG cluster location word 0x4a18
+CscRawDataProvi...  DEBUG  cluster time size word : stripId (CscIdHelper) 0x10000008 25
+CscRawDataProvi...  DEBUG     idColl clusHashid spuID stationId :: 2 4056  1  50 :: measphi0 L2 strId 25 nStr 8 T0 nSampWords 16 [7.50.-1.3.1.2.2.0.25]
+CscRawDataProvi...  DEBUG cluster location word 0x4a3a
+CscRawDataProvi...  DEBUG  cluster time size word : stripId (CscIdHelper) 0x10000004 59
+CscRawDataProvi...  DEBUG     idColl clusHashid spuID stationId :: 2 4090  1  50 :: measphi0 L2 strId 59 nStr 4 T0 nSampWords 8 [7.50.-1.3.1.2.2.0.59]
+CscRawDataProvi...  DEBUG cluster location word 0x4c1a
+CscRawDataProvi...  DEBUG  cluster time size word : stripId (CscIdHelper) 0x10000006 27
+CscRawDataProvi...  DEBUG     idColl clusHashid spuID stationId :: 2 4250  2  50 :: measphi0 L3 strId 27 nStr 6 T0 nSampWords 12 [7.50.-1.3.1.2.3.0.27]
+CscRawDataProvi...  DEBUG cluster location word 0x4b11
+CscRawDataProvi...  DEBUG  cluster time size word : stripId (CscIdHelper) 0x10000003 18
+CscRawDataProvi...  DEBUG     idColl clusHashid spuID stationId :: 2 25601  4  50 :: measphi1 L2 strId 18 nStr 3 T0 nSampWords 6 [7.50.-1.3.1.2.2.1.18]
+CscRawDataProvi...  DEBUG cluster location word 0x4b18
+CscRawDataProvi...  DEBUG  cluster time size word : stripId (CscIdHelper) 0x10000005 25
+CscRawDataProvi...  DEBUG     idColl clusHashid spuID stationId :: 2 25608  4  50 :: measphi1 L2 strId 25 nStr 5 T0 nSampWords 10 [7.50.-1.3.1.2.2.1.25]
+CscRawDataProvi...  DEBUG cluster location word 0x4b1e
+CscRawDataProvi...  DEBUG  cluster time size word : stripId (CscIdHelper) 0x10000005 31
+CscRawDataProvi...  DEBUG     idColl clusHashid spuID stationId :: 2 25614  4  50 :: measphi1 L2 strId 31 nStr 5 T0 nSampWords 10 [7.50.-1.3.1.2.2.1.31]
+CscRawDataProvi...  DEBUG cluster location word 0x4d14
+CscRawDataProvi...  DEBUG  cluster time size word : stripId (CscIdHelper) 0x10000005 21
+CscRawDataProvi...  DEBUG     idColl clusHashid spuID stationId :: 2 25652  4  50 :: measphi1 L3 strId 21 nStr 5 T0 nSampWords 10 [7.50.-1.3.1.2.3.1.21]
+CscRawDataProvi...  DEBUG ****Total Cluster count = 7 for RPU ID 11
+CscRawDataProvi...  DEBUG end of CscROD_Decode::fillCollection()
+CscRawDataProvi...  DEBUG in CscROD_Decode::fillCollection()
+CscRawDataProvi...  DEBUG in CscROD_Decoder::fillCollection :ROD version 401
+CscRawDataProvi...  DEBUG  
+CscRawDataProvi...  DEBUG ===================================================
+CscRawDataProvi...  DEBUG in CscROD_Decode::fillCollection() - ROD version 2
+CscRawDataProvi...  DEBUG DetDescr tag = ATLAS-R2-2016-01-00-01
+CscRawDataProvi...  DEBUG Online ROD id is 0x86
+CscRawDataProvi...  DEBUG Online ROD / ROD / collection / subDetector IDs are 0x86 27 11 106
+CscRawDataProvi...  DEBUG CSC RDO collection does not exist - creating a new one with hash = 11
+CscRawDataProvi...  DEBUG Event Type: 5407e04
+CscRawDataProvi...  DEBUG Sampling Time: 50  Number of Samples: 4
+CscRawDataProvi...  DEBUG Is Calibration Enabled?: 0  Calibration Amplitude: 5
+CscRawDataProvi...  DEBUG Calibration Layer: 0  Latency: 126
+CscRawDataProvi...  DEBUG Is neutron rejection ON?: 0  Is sparsified data?: 1
+CscRawDataProvi...  DEBUG CscROD_Decoder Total words received = 58
+CscRawDataProvi...  DEBUG RPU Header word 0x500003a
+CscRawDataProvi...  DEBUG RPU ID original = 5
+CscRawDataProvi...  DEBUG RPU ID Updated = 5
+CscRawDataProvi...  DEBUG RPU size = 58
+CscRawDataProvi...  DEBUG SCA Address = 151653132
+CscRawDataProvi...  DEBUG Number of Precision Cluster word 0x201
+CscRawDataProvi...  DEBUG Number of precision Cluster Counts - Layer Index = 0 Cluster Counts = 0
+CscRawDataProvi...  DEBUG Number of precision Cluster Counts - Layer Index = 1 Cluster Counts = 0
+CscRawDataProvi...  DEBUG Number of precision Cluster Counts - Layer Index = 2 Cluster Counts = 2
+CscRawDataProvi...  DEBUG Number of precision Cluster Counts - Layer Index = 3 Cluster Counts = 1
+CscRawDataProvi...  DEBUG Second cluster word 0x1000036
+CscRawDataProvi...  DEBUG Summed Number of Clusters for non-precision layers 1
+CscRawDataProvi...  DEBUG Cluster Data Words = 54
+CscRawDataProvi...  DEBUG Total summed Cluster Count for precision and non-precision layers = 4
+CscRawDataProvi...  DEBUG cluster location word 0x16c2f
+CscRawDataProvi...  DEBUG  cluster time size word : stripId (CscIdHelper) 0x10000003 48
+CscRawDataProvi...  DEBUG     idColl clusHashid spuID stationId :: 11 36527  7  51 :: measphi0 L3 strId 48 nStr 3 T0 nSampWords 6 [7.51.-1.4.1.2.3.0.48]
+CscRawDataProvi...  DEBUG cluster location word 0x16c56
+CscRawDataProvi...  DEBUG  cluster time size word : stripId (CscIdHelper) 0x10000008 87
+CscRawDataProvi...  DEBUG     idColl clusHashid spuID stationId :: 11 36566  7  51 :: measphi0 L3 strId 87 nStr 8 T0 nSampWords 16 [7.51.-1.4.1.2.3.0.87]
+CscRawDataProvi...  DEBUG cluster location word 0x16e57
+CscRawDataProvi...  DEBUG  cluster time size word : stripId (CscIdHelper) 0x10000007 88
+CscRawDataProvi...  DEBUG     idColl clusHashid spuID stationId :: 11 36759  8  51 :: measphi0 L4 strId 88 nStr 7 T0 nSampWords 14 [7.51.-1.4.1.2.4.0.88]
+CscRawDataProvi...  DEBUG cluster location word 0x16f04
+CscRawDataProvi...  DEBUG  cluster time size word : stripId (CscIdHelper) 0x10000005 5
+CscRawDataProvi...  DEBUG     idColl clusHashid spuID stationId :: 11 56788  9  51 :: measphi1 L4 strId 5 nStr 5 T0 nSampWords 10 [7.51.-1.4.1.2.4.1.5]
+CscRawDataProvi...  DEBUG ****Total Cluster count = 4 for RPU ID 5
+CscRawDataProvi...  DEBUG end of CscROD_Decode::fillCollection()
+CscRawDataProvi...  DEBUG in CscROD_Decode::fillCollection()
+CscRawDataProvi...  DEBUG in CscROD_Decoder::fillCollection :ROD version 401
+CscRawDataProvi...  DEBUG  
+CscRawDataProvi...  DEBUG ===================================================
+CscRawDataProvi...  DEBUG in CscROD_Decode::fillCollection() - ROD version 2
+CscRawDataProvi...  DEBUG DetDescr tag = ATLAS-R2-2016-01-00-01
+CscRawDataProvi...  DEBUG Online ROD id is 0x87
+CscRawDataProvi...  DEBUG Online ROD / ROD / collection / subDetector IDs are 0x87 19 3 106
+CscRawDataProvi...  DEBUG CSC RDO collection does not exist - creating a new one with hash = 3
+CscRawDataProvi...  DEBUG Event Type: 5407e04
+CscRawDataProvi...  DEBUG Sampling Time: 50  Number of Samples: 4
+CscRawDataProvi...  DEBUG Is Calibration Enabled?: 0  Calibration Amplitude: 5
+CscRawDataProvi...  DEBUG Calibration Layer: 0  Latency: 126
+CscRawDataProvi...  DEBUG Is neutron rejection ON?: 0  Is sparsified data?: 1
+CscRawDataProvi...  DEBUG CscROD_Decoder Total words received = 92
+CscRawDataProvi...  DEBUG RPU Header word 0xd00005c
+CscRawDataProvi...  DEBUG RPU ID original = 13
+CscRawDataProvi...  DEBUG RPU ID Updated = 11
+CscRawDataProvi...  DEBUG RPU size = 92
+CscRawDataProvi...  DEBUG SCA Address = 404298267
+CscRawDataProvi...  DEBUG Number of Precision Cluster word 0x1010101
+CscRawDataProvi...  DEBUG Number of precision Cluster Counts - Layer Index = 0 Cluster Counts = 1
+CscRawDataProvi...  DEBUG Number of precision Cluster Counts - Layer Index = 1 Cluster Counts = 1
+CscRawDataProvi...  DEBUG Number of precision Cluster Counts - Layer Index = 2 Cluster Counts = 1
+CscRawDataProvi...  DEBUG Number of precision Cluster Counts - Layer Index = 3 Cluster Counts = 1
+CscRawDataProvi...  DEBUG Second cluster word 0x6000058
+CscRawDataProvi...  DEBUG Summed Number of Clusters for non-precision layers 6
+CscRawDataProvi...  DEBUG Cluster Data Words = 88
+CscRawDataProvi...  DEBUG Total summed Cluster Count for precision and non-precision layers = 10
+CscRawDataProvi...  DEBUG cluster location word 0x6855
+CscRawDataProvi...  DEBUG  cluster time size word : stripId (CscIdHelper) 0x10000004 86
+CscRawDataProvi...  DEBUG     idColl clusHashid spuID stationId :: 3 5461  0  50 :: measphi0 L1 strId 86 nStr 4 T0 nSampWords 8 [7.50.-1.4.1.2.1.0.86]
+CscRawDataProvi...  DEBUG cluster location word 0x6a7c
+CscRawDataProvi...  DEBUG  cluster time size word : stripId (CscIdHelper) 0x10000003 125
+CscRawDataProvi...  DEBUG     idColl clusHashid spuID stationId :: 3 5692  1  50 :: measphi0 L2 strId 125 nStr 3 T0 nSampWords 6 [7.50.-1.4.1.2.2.0.125]
+CscRawDataProvi...  DEBUG cluster location word 0x6c77
+CscRawDataProvi...  DEBUG  cluster time size word : stripId (CscIdHelper) 0x10000005 120
+CscRawDataProvi...  DEBUG     idColl clusHashid spuID stationId :: 3 5879  2  50 :: measphi0 L3 strId 120 nStr 5 T0 nSampWords 10 [7.50.-1.4.1.2.3.0.120]
+CscRawDataProvi...  DEBUG cluster location word 0x6e71
+CscRawDataProvi...  DEBUG  cluster time size word : stripId (CscIdHelper) 0x10000003 114
+CscRawDataProvi...  DEBUG     idColl clusHashid spuID stationId :: 3 6065  3  50 :: measphi0 L4 strId 114 nStr 3 T0 nSampWords 6 [7.50.-1.4.1.2.4.0.114]
+CscRawDataProvi...  DEBUG cluster location word 0x691b
+CscRawDataProvi...  DEBUG  cluster time size word : stripId (CscIdHelper) 0x10000003 28
+CscRawDataProvi...  DEBUG     idColl clusHashid spuID stationId :: 3 25947  4  50 :: measphi1 L1 strId 28 nStr 3 T0 nSampWords 6 [7.50.-1.4.1.2.1.1.28]
+CscRawDataProvi...  DEBUG cluster location word 0x691f
+CscRawDataProvi...  DEBUG  cluster time size word : stripId (CscIdHelper) 0x10000003 32
+CscRawDataProvi...  DEBUG     idColl clusHashid spuID stationId :: 3 25951  4  50 :: measphi1 L1 strId 32 nStr 3 T0 nSampWords 6 [7.50.-1.4.1.2.1.1.32]
+CscRawDataProvi...  DEBUG cluster location word 0x6924
+CscRawDataProvi...  DEBUG  cluster time size word : stripId (CscIdHelper) 0x10000003 37
+CscRawDataProvi...  DEBUG     idColl clusHashid spuID stationId :: 3 25956  4  50 :: measphi1 L1 strId 37 nStr 3 T0 nSampWords 6 [7.50.-1.4.1.2.1.1.37]
+CscRawDataProvi...  DEBUG cluster location word 0x6b17
+CscRawDataProvi...  DEBUG  cluster time size word : stripId (CscIdHelper) 0x10000003 24
+CscRawDataProvi...  DEBUG     idColl clusHashid spuID stationId :: 3 25991  4  50 :: measphi1 L2 strId 24 nStr 3 T0 nSampWords 6 [7.50.-1.4.1.2.2.1.24]
+CscRawDataProvi...  DEBUG cluster location word 0x6d17
+CscRawDataProvi...  DEBUG  cluster time size word : stripId (CscIdHelper) 0x10000004 24
+CscRawDataProvi...  DEBUG     idColl clusHashid spuID stationId :: 3 26039  4  50 :: measphi1 L3 strId 24 nStr 4 T0 nSampWords 8 [7.50.-1.4.1.2.3.1.24]
+CscRawDataProvi...  DEBUG cluster location word 0x6f2a
+CscRawDataProvi...  DEBUG  cluster time size word : stripId (CscIdHelper) 0x10000003 43
+CscRawDataProvi...  DEBUG     idColl clusHashid spuID stationId :: 3 26106  4  50 :: measphi1 L4 strId 43 nStr 3 T0 nSampWords 6 [7.50.-1.4.1.2.4.1.43]
+CscRawDataProvi...  DEBUG ****Total Cluster count = 10 for RPU ID 11
+CscRawDataProvi...  DEBUG end of CscROD_Decode::fillCollection()
+CscRawDataProvi...  DEBUG in CscROD_Decode::fillCollection()
+CscRawDataProvi...  DEBUG in CscROD_Decoder::fillCollection :ROD version 401
+CscRawDataProvi...  DEBUG  
+CscRawDataProvi...  DEBUG ===================================================
+CscRawDataProvi...  DEBUG in CscROD_Decode::fillCollection() - ROD version 2
+CscRawDataProvi...  DEBUG DetDescr tag = ATLAS-R2-2016-01-00-01
+CscRawDataProvi...  DEBUG Online ROD id is 0x88
+CscRawDataProvi...  DEBUG Online ROD / ROD / collection / subDetector IDs are 0x88 28 12 106
+CscRawDataProvi...  DEBUG CSC RDO collection does not exist - creating a new one with hash = 12
+CscRawDataProvi...  DEBUG Event Type: 5407e04
+CscRawDataProvi...  DEBUG Sampling Time: 50  Number of Samples: 4
+CscRawDataProvi...  DEBUG Is Calibration Enabled?: 0  Calibration Amplitude: 5
+CscRawDataProvi...  DEBUG Calibration Layer: 0  Latency: 126
+CscRawDataProvi...  DEBUG Is neutron rejection ON?: 0  Is sparsified data?: 1
+CscRawDataProvi...  DEBUG CscROD_Decoder Total words received = 74
+CscRawDataProvi...  DEBUG RPU Header word 0x500004a
+CscRawDataProvi...  DEBUG RPU ID original = 5
+CscRawDataProvi...  DEBUG RPU ID Updated = 5
+CscRawDataProvi...  DEBUG RPU size = 74
+CscRawDataProvi...  DEBUG SCA Address = 1499093852
+CscRawDataProvi...  DEBUG Number of Precision Cluster word 0x2000001
+CscRawDataProvi...  DEBUG Number of precision Cluster Counts - Layer Index = 0 Cluster Counts = 2
+CscRawDataProvi...  DEBUG Number of precision Cluster Counts - Layer Index = 1 Cluster Counts = 0
+CscRawDataProvi...  DEBUG Number of precision Cluster Counts - Layer Index = 2 Cluster Counts = 0
+CscRawDataProvi...  DEBUG Number of precision Cluster Counts - Layer Index = 3 Cluster Counts = 1
+CscRawDataProvi...  DEBUG Second cluster word 0x5000046
+CscRawDataProvi...  DEBUG Summed Number of Clusters for non-precision layers 5
+CscRawDataProvi...  DEBUG Cluster Data Words = 70
+CscRawDataProvi...  DEBUG Total summed Cluster Count for precision and non-precision layers = 8
+CscRawDataProvi...  DEBUG cluster location word 0x18831
+CscRawDataProvi...  DEBUG  cluster time size word : stripId (CscIdHelper) 0x10000003 50
+CscRawDataProvi...  DEBUG     idColl clusHashid spuID stationId :: 12 37681  5  51 :: measphi0 L1 strId 50 nStr 3 T0 nSampWords 6 [7.51.-1.5.1.2.1.0.50]
+CscRawDataProvi...  DEBUG cluster location word 0x188ab
+CscRawDataProvi...  DEBUG  cluster time size word : stripId (CscIdHelper) 0x10000003 172
+CscRawDataProvi...  DEBUG     idColl clusHashid spuID stationId :: 12 37803  5  51 :: measphi0 L1 strId 172 nStr 3 T0 nSampWords 6 [7.51.-1.5.1.2.1.0.172]
+CscRawDataProvi...  DEBUG cluster location word 0x18e03
+CscRawDataProvi...  DEBUG  cluster time size word : stripId (CscIdHelper) 0x10000005 4
+CscRawDataProvi...  DEBUG     idColl clusHashid spuID stationId :: 12 38211  8  51 :: measphi0 L4 strId 4 nStr 5 T0 nSampWords 10 [7.51.-1.5.1.2.4.0.4]
+CscRawDataProvi...  DEBUG cluster location word 0x18908
+CscRawDataProvi...  DEBUG  cluster time size word : stripId (CscIdHelper) 0x10000003 9
+CscRawDataProvi...  DEBUG     idColl clusHashid spuID stationId :: 12 57032  9  51 :: measphi1 L1 strId 9 nStr 3 T0 nSampWords 6 [7.51.-1.5.1.2.1.1.9]
+CscRawDataProvi...  DEBUG cluster location word 0x1892e
+CscRawDataProvi...  DEBUG  cluster time size word : stripId (CscIdHelper) 0x10000002 47
+CscRawDataProvi...  DEBUG     idColl clusHashid spuID stationId :: 12 57070  9  51 :: measphi1 L1 strId 47 nStr 2 T0 nSampWords 4 [7.51.-1.5.1.2.1.1.47]
+CscRawDataProvi...  DEBUG cluster location word 0x18b00
+CscRawDataProvi...  DEBUG  cluster time size word : stripId (CscIdHelper) 0x10000002 1
+CscRawDataProvi...  DEBUG     idColl clusHashid spuID stationId :: 12 57072  9  51 :: measphi1 L2 strId 1 nStr 2 T0 nSampWords 4 [7.51.-1.5.1.2.2.1.1]
+CscRawDataProvi...  DEBUG cluster location word 0x18d0d
+CscRawDataProvi...  DEBUG  cluster time size word : stripId (CscIdHelper) 0x10000003 14
+CscRawDataProvi...  DEBUG     idColl clusHashid spuID stationId :: 12 57133  9  51 :: measphi1 L3 strId 14 nStr 3 T0 nSampWords 6 [7.51.-1.5.1.2.3.1.14]
+CscRawDataProvi...  DEBUG cluster location word 0x18f1c
+CscRawDataProvi...WARNING DEBUG message limit (500) reached for CscRawDataProvider.CSC_RawDataProviderTool.CscROD_Decoder. Suppressing further output.
+CscRawDataProvi...  DEBUG After processing numColls=32
+AthenaEventLoopMgr   INFO   ===>>>  done processing event #186525031, run #327265 1 events processed so far  <<<===
+AthenaEventLoopMgr   INFO   ===>>>  start processing event #186524665, run #327265 1 events processed so far  <<<===
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+MdtCsmCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+CscCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+RpcCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+TgcCache'
+MdtRawDataProvi...VERBOSE convert(): 264 ROBFragments.
+MdtRawDataProvi...  DEBUG Created container using cache for MdtCsmCache
+MdtRawDataProvi...  DEBUG After processing numColls=1136
+CscRawDataProvi...VERBOSE Number of ROB ids 32
+CscRawDataProvi...VERBOSE Number of ROB fragments 32
+CscRawDataProvi...  DEBUG Created container using cache for CscCache
+CscRawDataProvi...  DEBUG Before processing numColls=0
+CscRawDataProvi...  DEBUG vector of ROB ID to decode: size = 32
+CscRawDataProvi...  DEBUG After processing numColls=32
+AthenaEventLoopMgr   INFO   ===>>>  done processing event #186524665, run #327265 2 events processed so far  <<<===
+AthenaEventLoopMgr   INFO   ===>>>  start processing event #186542447, run #327265 2 events processed so far  <<<===
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+MdtCsmCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+CscCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+RpcCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+TgcCache'
+MdtRawDataProvi...VERBOSE convert(): 264 ROBFragments.
+MdtRawDataProvi...  DEBUG Created container using cache for MdtCsmCache
+MdtRawDataProvi...  DEBUG After processing numColls=1136
+CscRawDataProvi...VERBOSE Number of ROB ids 32
+CscRawDataProvi...VERBOSE Number of ROB fragments 32
+CscRawDataProvi...  DEBUG Created container using cache for CscCache
+CscRawDataProvi...  DEBUG Before processing numColls=0
+CscRawDataProvi...  DEBUG vector of ROB ID to decode: size = 32
+CscRawDataProvi...  DEBUG After processing numColls=32
+AthenaEventLoopMgr   INFO   ===>>>  done processing event #186542447, run #327265 3 events processed so far  <<<===
+AthenaEventLoopMgr   INFO   ===>>>  start processing event #186543405, run #327265 3 events processed so far  <<<===
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+MdtCsmCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+CscCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+RpcCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+TgcCache'
+MdtRawDataProvi...VERBOSE convert(): 264 ROBFragments.
+MdtRawDataProvi...  DEBUG Created container using cache for MdtCsmCache
+MdtRawDataProvi...  DEBUG After processing numColls=1136
+CscRawDataProvi...VERBOSE Number of ROB ids 32
+CscRawDataProvi...VERBOSE Number of ROB fragments 32
+CscRawDataProvi...  DEBUG Created container using cache for CscCache
+CscRawDataProvi...  DEBUG Before processing numColls=0
+CscRawDataProvi...  DEBUG vector of ROB ID to decode: size = 32
+CscRawDataProvi...  DEBUG After processing numColls=32
+AthenaEventLoopMgr   INFO   ===>>>  done processing event #186543405, run #327265 4 events processed so far  <<<===
+AthenaEventLoopMgr   INFO   ===>>>  start processing event #186548387, run #327265 4 events processed so far  <<<===
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+MdtCsmCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+CscCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+RpcCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+TgcCache'
+MdtRawDataProvi...VERBOSE convert(): 264 ROBFragments.
+MdtRawDataProvi...  DEBUG Created container using cache for MdtCsmCache
+MdtRawDataProvi...  DEBUG After processing numColls=1136
+CscRawDataProvi...VERBOSE Number of ROB ids 32
+CscRawDataProvi...VERBOSE Number of ROB fragments 32
+CscRawDataProvi...  DEBUG Created container using cache for CscCache
+CscRawDataProvi...  DEBUG Before processing numColls=0
+CscRawDataProvi...  DEBUG vector of ROB ID to decode: size = 32
+CscRawDataProvi...  DEBUG After processing numColls=32
+AthenaEventLoopMgr   INFO   ===>>>  done processing event #186548387, run #327265 5 events processed so far  <<<===
+AthenaEventLoopMgr   INFO   ===>>>  start processing event #186515186, run #327265 5 events processed so far  <<<===
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+MdtCsmCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+CscCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+RpcCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+TgcCache'
+MdtRawDataProvi...VERBOSE convert(): 264 ROBFragments.
+MdtRawDataProvi...  DEBUG Created container using cache for MdtCsmCache
+MdtRawDataProvi...  DEBUG After processing numColls=1136
+CscRawDataProvi...VERBOSE Number of ROB ids 32
+CscRawDataProvi...VERBOSE Number of ROB fragments 32
+CscRawDataProvi...  DEBUG Created container using cache for CscCache
+CscRawDataProvi...  DEBUG Before processing numColls=0
+CscRawDataProvi...  DEBUG vector of ROB ID to decode: size = 32
+CscRawDataProvi...  DEBUG After processing numColls=32
+AthenaEventLoopMgr   INFO   ===>>>  done processing event #186515186, run #327265 6 events processed so far  <<<===
+AthenaEventLoopMgr   INFO   ===>>>  start processing event #186556019, run #327265 6 events processed so far  <<<===
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+MdtCsmCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+CscCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+RpcCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+TgcCache'
+MdtRawDataProvi...VERBOSE convert(): 264 ROBFragments.
+MdtRawDataProvi...  DEBUG Created container using cache for MdtCsmCache
+MdtRawDataProvi...  DEBUG After processing numColls=1136
+CscRawDataProvi...VERBOSE Number of ROB ids 32
+CscRawDataProvi...VERBOSE Number of ROB fragments 32
+CscRawDataProvi...  DEBUG Created container using cache for CscCache
+CscRawDataProvi...  DEBUG Before processing numColls=0
+CscRawDataProvi...  DEBUG vector of ROB ID to decode: size = 32
+CscRawDataProvi...  DEBUG After processing numColls=32
+AthenaEventLoopMgr   INFO   ===>>>  done processing event #186556019, run #327265 7 events processed so far  <<<===
+AthenaEventLoopMgr   INFO   ===>>>  start processing event #186542866, run #327265 7 events processed so far  <<<===
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+MdtCsmCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+CscCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+RpcCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+TgcCache'
+MdtRawDataProvi...VERBOSE convert(): 264 ROBFragments.
+MdtRawDataProvi...  DEBUG Created container using cache for MdtCsmCache
+MdtRawDataProvi...  DEBUG After processing numColls=1136
+CscRawDataProvi...VERBOSE Number of ROB ids 32
+CscRawDataProvi...VERBOSE Number of ROB fragments 32
+CscRawDataProvi...  DEBUG Created container using cache for CscCache
+CscRawDataProvi...  DEBUG Before processing numColls=0
+CscRawDataProvi...  DEBUG vector of ROB ID to decode: size = 32
+CscRawDataProvi...  DEBUG After processing numColls=32
+AthenaEventLoopMgr   INFO   ===>>>  done processing event #186542866, run #327265 8 events processed so far  <<<===
+AthenaEventLoopMgr   INFO   ===>>>  start processing event #186537901, run #327265 8 events processed so far  <<<===
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+MdtCsmCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+CscCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+RpcCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+TgcCache'
+MdtRawDataProvi...VERBOSE convert(): 264 ROBFragments.
+MdtRawDataProvi...  DEBUG Created container using cache for MdtCsmCache
+MdtRawDataProvi...  DEBUG After processing numColls=1136
+CscRawDataProvi...VERBOSE Number of ROB ids 32
+CscRawDataProvi...VERBOSE Number of ROB fragments 32
+CscRawDataProvi...  DEBUG Created container using cache for CscCache
+CscRawDataProvi...  DEBUG Before processing numColls=0
+CscRawDataProvi...  DEBUG vector of ROB ID to decode: size = 32
+CscRawDataProvi...  DEBUG After processing numColls=32
+AthenaEventLoopMgr   INFO   ===>>>  done processing event #186537901, run #327265 9 events processed so far  <<<===
+AthenaEventLoopMgr   INFO   ===>>>  start processing event #186517811, run #327265 9 events processed so far  <<<===
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+MdtCsmCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+CscCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+RpcCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+TgcCache'
+MdtRawDataProvi...VERBOSE convert(): 264 ROBFragments.
+MdtRawDataProvi...  DEBUG Created container using cache for MdtCsmCache
+MdtRawDataProvi...  DEBUG After processing numColls=1136
+CscRawDataProvi...VERBOSE Number of ROB ids 32
+CscRawDataProvi...VERBOSE Number of ROB fragments 32
+CscRawDataProvi...  DEBUG Created container using cache for CscCache
+CscRawDataProvi...  DEBUG Before processing numColls=0
+CscRawDataProvi...  DEBUG vector of ROB ID to decode: size = 32
+CscRawDataProvi...  DEBUG After processing numColls=32
+AthenaEventLoopMgr   INFO   ===>>>  done processing event #186517811, run #327265 10 events processed so far  <<<===
+AthenaEventLoopMgr   INFO   ===>>>  start processing event #186534221, run #327265 10 events processed so far  <<<===
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+MdtCsmCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+CscCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+RpcCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+TgcCache'
+MdtRawDataProvi...VERBOSE convert(): 264 ROBFragments.
+MdtRawDataProvi...  DEBUG Created container using cache for MdtCsmCache
+MdtRawDataProvi...  DEBUG After processing numColls=1136
+CscRawDataProvi...VERBOSE Number of ROB ids 32
+CscRawDataProvi...VERBOSE Number of ROB fragments 32
+CscRawDataProvi...  DEBUG Created container using cache for CscCache
+CscRawDataProvi...  DEBUG Before processing numColls=0
+CscRawDataProvi...  DEBUG vector of ROB ID to decode: size = 32
+CscRawDataProvi...  DEBUG After processing numColls=32
+AthenaEventLoopMgr   INFO   ===>>>  done processing event #186534221, run #327265 11 events processed so far  <<<===
+AthenaEventLoopMgr   INFO   ===>>>  start processing event #186540986, run #327265 11 events processed so far  <<<===
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+MdtCsmCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+CscCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+RpcCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+TgcCache'
+MdtRawDataProvi...VERBOSE convert(): 264 ROBFragments.
+MdtRawDataProvi...  DEBUG Created container using cache for MdtCsmCache
+MdtRawDataProvi...  DEBUG After processing numColls=1136
+CscRawDataProvi...VERBOSE Number of ROB ids 32
+CscRawDataProvi...VERBOSE Number of ROB fragments 32
+CscRawDataProvi...  DEBUG Created container using cache for CscCache
+CscRawDataProvi...  DEBUG Before processing numColls=0
+CscRawDataProvi...  DEBUG vector of ROB ID to decode: size = 32
+CscRawDataProvi...  DEBUG After processing numColls=32
+AthenaEventLoopMgr   INFO   ===>>>  done processing event #186540986, run #327265 12 events processed so far  <<<===
+AthenaEventLoopMgr   INFO   ===>>>  start processing event #186535104, run #327265 12 events processed so far  <<<===
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+MdtCsmCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+CscCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+RpcCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+TgcCache'
+MdtRawDataProvi...VERBOSE convert(): 264 ROBFragments.
+MdtRawDataProvi...  DEBUG Created container using cache for MdtCsmCache
+MdtRawDataProvi...  DEBUG After processing numColls=1136
+CscRawDataProvi...VERBOSE Number of ROB ids 32
+CscRawDataProvi...VERBOSE Number of ROB fragments 32
+CscRawDataProvi...  DEBUG Created container using cache for CscCache
+CscRawDataProvi...  DEBUG Before processing numColls=0
+CscRawDataProvi...  DEBUG vector of ROB ID to decode: size = 32
+CscRawDataProvi...  DEBUG After processing numColls=32
+AthenaEventLoopMgr   INFO   ===>>>  done processing event #186535104, run #327265 13 events processed so far  <<<===
+AthenaEventLoopMgr   INFO   ===>>>  start processing event #186539903, run #327265 13 events processed so far  <<<===
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+MdtCsmCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+CscCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+RpcCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+TgcCache'
+MdtRawDataProvi...VERBOSE convert(): 264 ROBFragments.
+MdtRawDataProvi...  DEBUG Created container using cache for MdtCsmCache
+MdtRawDataProvi...  DEBUG After processing numColls=1136
+CscRawDataProvi...VERBOSE Number of ROB ids 32
+CscRawDataProvi...VERBOSE Number of ROB fragments 32
+CscRawDataProvi...  DEBUG Created container using cache for CscCache
+CscRawDataProvi...  DEBUG Before processing numColls=0
+CscRawDataProvi...  DEBUG vector of ROB ID to decode: size = 32
+CscRawDataProvi...  DEBUG After processing numColls=32
+AthenaEventLoopMgr   INFO   ===>>>  done processing event #186539903, run #327265 14 events processed so far  <<<===
+AthenaEventLoopMgr   INFO   ===>>>  start processing event #186552713, run #327265 14 events processed so far  <<<===
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+MdtCsmCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+CscCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+RpcCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+TgcCache'
+MdtRawDataProvi...VERBOSE convert(): 264 ROBFragments.
+MdtRawDataProvi...  DEBUG Created container using cache for MdtCsmCache
+MdtRawDataProvi...  DEBUG After processing numColls=1136
+CscRawDataProvi...VERBOSE Number of ROB ids 32
+CscRawDataProvi...VERBOSE Number of ROB fragments 32
+CscRawDataProvi...  DEBUG Created container using cache for CscCache
+CscRawDataProvi...  DEBUG Before processing numColls=0
+CscRawDataProvi...  DEBUG vector of ROB ID to decode: size = 32
+CscRawDataProvi...  DEBUG After processing numColls=32
+AthenaEventLoopMgr   INFO   ===>>>  done processing event #186552713, run #327265 15 events processed so far  <<<===
+AthenaEventLoopMgr   INFO   ===>>>  start processing event #186524730, run #327265 15 events processed so far  <<<===
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+MdtCsmCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+CscCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+RpcCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+TgcCache'
+MdtRawDataProvi...VERBOSE convert(): 264 ROBFragments.
+MdtRawDataProvi...  DEBUG Created container using cache for MdtCsmCache
+MdtRawDataProvi...  DEBUG After processing numColls=1136
+CscRawDataProvi...VERBOSE Number of ROB ids 32
+CscRawDataProvi...VERBOSE Number of ROB fragments 32
+CscRawDataProvi...  DEBUG Created container using cache for CscCache
+CscRawDataProvi...  DEBUG Before processing numColls=0
+CscRawDataProvi...  DEBUG vector of ROB ID to decode: size = 32
+CscRawDataProvi...  DEBUG After processing numColls=32
+AthenaEventLoopMgr   INFO   ===>>>  done processing event #186524730, run #327265 16 events processed so far  <<<===
+AthenaEventLoopMgr   INFO   ===>>>  start processing event #186547632, run #327265 16 events processed so far  <<<===
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+MdtCsmCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+CscCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+RpcCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+TgcCache'
+MdtRawDataProvi...VERBOSE convert(): 264 ROBFragments.
+MdtRawDataProvi...  DEBUG Created container using cache for MdtCsmCache
+MdtRawDataProvi...  DEBUG After processing numColls=1136
+CscRawDataProvi...VERBOSE Number of ROB ids 32
+CscRawDataProvi...VERBOSE Number of ROB fragments 32
+CscRawDataProvi...  DEBUG Created container using cache for CscCache
+CscRawDataProvi...  DEBUG Before processing numColls=0
+CscRawDataProvi...  DEBUG vector of ROB ID to decode: size = 32
+CscRawDataProvi...  DEBUG After processing numColls=32
+AthenaEventLoopMgr   INFO   ===>>>  done processing event #186547632, run #327265 17 events processed so far  <<<===
+AthenaEventLoopMgr   INFO   ===>>>  start processing event #186555621, run #327265 17 events processed so far  <<<===
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+MdtCsmCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+CscCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+RpcCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+TgcCache'
+MdtRawDataProvi...VERBOSE convert(): 264 ROBFragments.
+MdtRawDataProvi...  DEBUG Created container using cache for MdtCsmCache
+MdtRawDataProvi...  DEBUG After processing numColls=1136
+CscRawDataProvi...VERBOSE Number of ROB ids 32
+CscRawDataProvi...VERBOSE Number of ROB fragments 32
+CscRawDataProvi...  DEBUG Created container using cache for CscCache
+CscRawDataProvi...  DEBUG Before processing numColls=0
+CscRawDataProvi...  DEBUG vector of ROB ID to decode: size = 32
+CscRawDataProvi...  DEBUG After processing numColls=32
+AthenaEventLoopMgr   INFO   ===>>>  done processing event #186555621, run #327265 18 events processed so far  <<<===
+AthenaEventLoopMgr   INFO   ===>>>  start processing event #186568452, run #327265 18 events processed so far  <<<===
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+MdtCsmCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+CscCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+RpcCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+TgcCache'
+MdtRawDataProvi...VERBOSE convert(): 264 ROBFragments.
+MdtRawDataProvi...  DEBUG Created container using cache for MdtCsmCache
+MdtRawDataProvi...  DEBUG After processing numColls=1136
+CscRawDataProvi...VERBOSE Number of ROB ids 32
+CscRawDataProvi...VERBOSE Number of ROB fragments 32
+CscRawDataProvi...  DEBUG Created container using cache for CscCache
+CscRawDataProvi...  DEBUG Before processing numColls=0
+CscRawDataProvi...  DEBUG vector of ROB ID to decode: size = 32
+CscRawDataProvi...  DEBUG After processing numColls=32
+AthenaEventLoopMgr   INFO   ===>>>  done processing event #186568452, run #327265 19 events processed so far  <<<===
+AthenaEventLoopMgr   INFO   ===>>>  start processing event #186580451, run #327265 19 events processed so far  <<<===
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+MdtCsmCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+CscCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+RpcCache'
+MuonCacheCreator     INFO Created cache container 'StoreGateSvc+TgcCache'
+MdtRawDataProvi...VERBOSE convert(): 264 ROBFragments.
+MdtRawDataProvi...  DEBUG Created container using cache for MdtCsmCache
+MdtRawDataProvi...  DEBUG After processing numColls=1136
+CscRawDataProvi...VERBOSE Number of ROB ids 32
+CscRawDataProvi...VERBOSE Number of ROB fragments 32
+CscRawDataProvi...  DEBUG Created container using cache for CscCache
+CscRawDataProvi...  DEBUG Before processing numColls=0
+CscRawDataProvi...  DEBUG vector of ROB ID to decode: size = 32
+CscRawDataProvi...  DEBUG After processing numColls=32
+AthenaEventLoopMgr   INFO   ===>>>  done processing event #186580451, run #327265 20 events processed so far  <<<===
+Domain[ROOT_All]     INFO >   Deaccess DbDomain     READ      [ROOT_All] 
+ApplicationMgr       INFO Application Manager Stopped successfully
+IncidentProcAlg1     INFO Finalize
+CondInputLoader      INFO Finalizing CondInputLoader...
+IncidentProcAlg2     INFO Finalize
+AtlasFieldSvc        INFO finalize() successful
+EventInfoByteSt...   INFO finalize 
+IdDictDetDescrCnv    INFO in finalize
+IOVDbFolder          INFO Folder /EXT/DCS/MAGNETS/SENSORDATA (AttrListColl) db-read 1/2 objs/chan/bytes 4/4/25 ((     1.39 ))s
+IOVDbFolder          INFO Folder /GLOBAL/BField/Maps (AttrListColl) db-read 1/1 objs/chan/bytes 3/3/271 ((     6.55 ))s
+IOVDbFolder          INFO Folder /MDT/CABLING/MAP_SCHEMA (AttrListColl) db-read 1/1 objs/chan/bytes 2312/2437/216598 ((     1.41 ))s
+IOVDbFolder          INFO Folder /MDT/CABLING/MEZZANINE_SCHEMA (AttrListColl) db-read 1/1 objs/chan/bytes 24/24/300 ((     0.82 ))s
+IOVDbFolder          INFO Folder /MDT/RTBLOB (AttrListColl) db-read 0/0 objs/chan/bytes 0/1186/0 ((     0.00 ))s
+IOVDbFolder          INFO Folder /MDT/T0BLOB (AttrListColl) db-read 0/0 objs/chan/bytes 0/1186/0 ((     0.00 ))s
+IOVDbFolder          INFO Folder /RPC/CABLING/MAP_SCHEMA (AttrListColl) db-read 1/1 objs/chan/bytes 1/1/444470 ((     1.18 ))s
+IOVDbFolder          INFO Folder /RPC/CABLING/MAP_SCHEMA_CORR (AttrListColl) db-read 1/1 objs/chan/bytes 1/1/58804 ((     0.58 ))s
+IOVDbFolder          INFO Folder /RPC/TRIGGER/CM_THR_ETA (AttrListColl) db-read 1/1 objs/chan/bytes 1613/1613/7562972 ((     2.72 ))s
+IOVDbFolder          INFO Folder /RPC/TRIGGER/CM_THR_PHI (AttrListColl) db-read 1/1 objs/chan/bytes 1612/1612/8101322 ((     0.60 ))s
+IOVDbFolder          INFO Folder /TGC/CABLING/MAP_SCHEMA (AttrListColl) db-read 1/1 objs/chan/bytes 1/1/7408 ((     0.95 ))s
+IOVDbFolder          INFO Folder /CSC/FTHOLD (AttrListColl) db-read 1/1 objs/chan/bytes 32/32/331329 ((     1.47 ))s
+IOVDbFolder          INFO Folder /CSC/NOISE (AttrListColl) db-read 1/1 objs/chan/bytes 32/32/359591 ((     0.40 ))s
+IOVDbFolder          INFO Folder /CSC/PED (AttrListColl) db-read 1/1 objs/chan/bytes 32/32/422629 ((     1.35 ))s
+IOVDbFolder          INFO Folder /CSC/PSLOPE (AttrListColl) db-read 1/1 objs/chan/bytes 32/32/363009 ((     2.15 ))s
+IOVDbFolder          INFO Folder /CSC/RMS (AttrListColl) db-read 1/1 objs/chan/bytes 32/32/422831 ((     0.21 ))s
+IOVDbFolder          INFO Folder /CSC/STAT (AttrListColl) db-read 1/1 objs/chan/bytes 32/32/236289 ((     0.76 ))s
+IOVDbFolder          INFO Folder /CSC/T0BASE (AttrListColl) db-read 1/1 objs/chan/bytes 32/32/322855 ((     0.26 ))s
+IOVDbFolder          INFO Folder /CSC/T0PHASE (AttrListColl) db-read 1/1 objs/chan/bytes 32/32/3234 ((     1.53 ))s
+IOVDbSvc             INFO  bytes in ((     24.31 ))s
+IOVDbSvc             INFO Connection sqlite://;schema=mycool.db;dbname=CONDBR2 : nConnect: 0 nFolders: 0 ReadTime: ((     0.00 ))s
+IOVDbSvc             INFO Connection COOLONL_MDT/CONDBR2 : nConnect: 2 nFolders: 2 ReadTime: ((     2.22 ))s
+IOVDbSvc             INFO Connection COOLONL_RPC/CONDBR2 : nConnect: 2 nFolders: 4 ReadTime: ((     5.09 ))s
+IOVDbSvc             INFO Connection COOLOFL_MDT/CONDBR2 : nConnect: 1 nFolders: 2 ReadTime: ((     0.00 ))s
+IOVDbSvc             INFO Connection COOLOFL_CSC/CONDBR2 : nConnect: 2 nFolders: 8 ReadTime: ((     8.12 ))s
+IOVDbSvc             INFO Connection COOLONL_GLOBAL/CONDBR2 : nConnect: 2 nFolders: 1 ReadTime: ((     6.55 ))s
+IOVDbSvc             INFO Connection COOLONL_TGC/CONDBR2 : nConnect: 2 nFolders: 1 ReadTime: ((     0.95 ))s
+IOVDbSvc             INFO Connection COOLOFL_DCS/CONDBR2 : nConnect: 2 nFolders: 1 ReadTime: ((     1.39 ))s
+AthDictLoaderSvc     INFO in finalize...
+ToolSvc              INFO Removing all tools created by ToolSvc
+ToolSvc.ByteStr...   INFO in finalize()
+TgcRdoToTgcPrep...   INFO finalize(): input RDOs->output PRDs [Hit: 6807->6807, Tracklet: 28->28, TrackletEIFI: 692->692, HiPt: 4031->4031, SL: 3->3]
+RpcROD_Decoder:...   INFO  ============ FINAL RPC DATA FORMAT STAT. =========== 
+RpcROD_Decoder:...   INFO  RX Header Errors.............0
+RpcROD_Decoder:...   INFO  RX SubHeader Errors..........0
+RpcROD_Decoder:...   INFO  PAD Header Errors............0
+RpcROD_Decoder:...   INFO  PAD/SL SubHeader Errors......0
+RpcROD_Decoder:...   INFO  CM Header Errors.............0
+RpcROD_Decoder:...   INFO  CM SubHeader Errors..........0
+RpcROD_Decoder:...   INFO  CM Footer Errors.............0
+RpcROD_Decoder:...   INFO  PAD PreFooter Errors.........0
+RpcROD_Decoder:...   INFO  PAD Footer Errors............0
+RpcROD_Decoder:...   INFO  SL Header Errors.............0
+RpcROD_Decoder:...   INFO  SL Footer Errors.............0
+RpcROD_Decoder:...   INFO  RX Footer Errors.............0
+RpcROD_Decoder:...   INFO  CRC8 check Failures..........0
+RpcROD_Decoder:...   INFO  ==================================================== 
+ToolSvc.TGCCabl...   INFO finalize
+*****Chrono*****     INFO ****************************************************************************************************
+*****Chrono*****     INFO  The Final CPU consumption ( Chrono ) Table (ordered)
+*****Chrono*****     INFO ****************************************************************************************************
+cObj_ALL             INFO Time User   : Tot=    0 [us] Ave/Min/Max=    0(+-    0)/    0/    0 [us] #= 18
+ChronoStatSvc        INFO Time User   : Tot= 11.7  [s]                                             #=  1
+*****Chrono*****     INFO ****************************************************************************************************
+ChronoStatSvc.f...   INFO  Service finalized successfully 
+ApplicationMgr       INFO Application Manager Finalized successfully
+ApplicationMgr       INFO Application Manager Terminated successfully
+Listing sources of suppressed message: 
+=====================================================
+ Message Source              |   Level |    Count
+-----------------------------+---------+-------------
+ CscRawDataProvider.CSC_RawDataProviderTool.CscROD_Decoder|   DEBUG |    35169
+ MdtRawDataProvider.MDT_RawDataProviderTool.MdtROD_Decoder|   DEBUG |   854603
+=====================================================
+Py:Athena            INFO leaving with code 0: "successful run"
diff --git a/MuonSpectrometer/MuonConfig/test/testMuonDataDecode_Cache.sh b/MuonSpectrometer/MuonConfig/test/testMuonDataDecode_Cache.sh
new file mode 100755
index 0000000000000000000000000000000000000000..e8b5190f0871b41813bd89fea7f3e278447e03f4
--- /dev/null
+++ b/MuonSpectrometer/MuonConfig/test/testMuonDataDecode_Cache.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+python -c 'from MuonConfig.MuonRdoDecodeConfig import muonRdoDecodeTestData; muonRdoDecodeTestData( True )'# generate pickle
+status=$?
+if [ ${status} -ne 0 ] 
+then
+    echo "ERROR in configuration generation stage, stopping"
+    exit -1
+else
+    echo
+    echo "JOs reading stage finished, launching Athena from pickle file"
+    echo 
+    athena --threads=1 --evtMax=20 MuonRdoDecode_Cache.pkl
+fi
diff --git a/MuonSpectrometer/MuonDetDescr/MuonTrackingGeometry/src/MuonTrackingGeometryBuilder.cxx b/MuonSpectrometer/MuonDetDescr/MuonTrackingGeometry/src/MuonTrackingGeometryBuilder.cxx
index 3ca351d08f0b26dd77f5234bdb4d2030878b7b70..c324beb236a639a1efbc92ee77799ea2f5ebf2a5 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonTrackingGeometry/src/MuonTrackingGeometryBuilder.cxx
+++ b/MuonSpectrometer/MuonDetDescr/MuonTrackingGeometry/src/MuonTrackingGeometryBuilder.cxx
@@ -14,7 +14,7 @@
 // Amg
 #include "GeoPrimitives/GeoPrimitives.h"
 // Units
-#include "GeoModelKernel/Units.h"
+#include "GaudiKernel/SystemOfUnits.h"
 // Trk
 #include "TrkDetDescrInterfaces/ITrackingVolumeArrayCreator.h"
 #include "TrkDetDescrInterfaces/ITrackingVolumeHelper.h"
@@ -222,7 +222,7 @@ const Trk::TrackingGeometry* Muon::MuonTrackingGeometryBuilder::trackingGeometry
   }
   
   // find object's span with tolerance for the alignment 
-  if (!m_stationSpan) m_stationSpan = findVolumesSpan(m_stations, 100.*m_alignTolerance, m_alignTolerance*GeoModelKernelUnits::deg);
+  if (!m_stationSpan) m_stationSpan = findVolumesSpan(m_stations, 100.*m_alignTolerance, m_alignTolerance*Gaudi::Units::deg);
   if (!m_inertSpan)   m_inertSpan = findVolumesSpan(m_inertObjs,0.,0.);
  
   // 0) Preparation //////////////////////////////////////////////////////////////////////////////////////
diff --git a/MuonSpectrometer/MuonDigitization/sTGC_Digitization/sTGC_Digitization/sTgcDigitInfo.h b/MuonSpectrometer/MuonDigitization/sTGC_Digitization/sTGC_Digitization/sTgcDigitInfo.h
deleted file mode 100644
index 7984c80d8d59c99b6797f92461a7f3430d61cff9..0000000000000000000000000000000000000000
--- a/MuonSpectrometer/MuonDigitization/sTGC_Digitization/sTGC_Digitization/sTgcDigitInfo.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef sTgcDigitInfoUH
-#define sTgcDigitInfoUH
-
-#include <iosfwd>
-#include <inttypes.h>
-#include "MuonDigitContainer/MuonDigit.h"
-#include "MuonIdHelpers/sTgcIdHelper.h"
-
-class sTgcDigitInfo : public MuonDigit {
-
- public:  // functions
-
-  enum {BC_UNDEFINED=0, BC_PREVIOUS, BC_CURRENT, BC_NEXT};
-	sTgcDigitInfo() :  m_bcTag (BC_UNDEFINED), m_charge(-1), m_time(0), m_isDead (0), m_isPileup(0) { }
-
-	//**********************************************************************
-	sTgcDigitInfo(const Identifier& id, uint16_t bctag, float time, float charge, bool isDead, bool isPileup)
-	  : MuonDigit(id),
-			m_bcTag(bctag),
-			m_charge(charge),
-			m_time(time),
-	    m_isDead(isDead),
-	    m_isPileup(isPileup) { }
-	// //**********************************************************************
-
-	uint16_t bcTag() const {
-	  return m_bcTag;
-	}
-
-	// get the charge
-	float charge() const {
-	  return m_charge;
-	}
-
-	// get the charge
-	float time() const {
-	  return m_time;
-	}
-
-	//return the dead channel status
-	bool isDead() const {
-		return m_isDead;
-	}
-
-	// return whether the digit is due to pileup
-	bool isPileup() const {
-		return m_isPileup;
-	}
-
-	void set_bcTag(uint16_t newbcTag) {
-	  m_bcTag = newbcTag;
-	}
-
-	void set_charge(float newCharge) {
-	  m_charge = newCharge;
-	}
-
-	void set_isDead(bool newIsDead) {
-		m_isDead = newIsDead;
-	}
-
-	void set_isPileup(bool newIsPileup) {
-		m_isPileup = newIsPileup;
-	}
-
- private:  // data
-  uint16_t  m_bcTag;
-  float m_charge;
-  float m_time;
-  bool m_isDead;
-  bool m_isPileup;
-};
-
-#endif
diff --git a/MuonSpectrometer/MuonDigitization/sTGC_Digitization/sTGC_Digitization/sTgcDigitInfoCollection.h b/MuonSpectrometer/MuonDigitization/sTGC_Digitization/sTGC_Digitization/sTgcDigitInfoCollection.h
deleted file mode 100644
index 4d146985ab35524a732ecf59627c79e2806bc965..0000000000000000000000000000000000000000
--- a/MuonSpectrometer/MuonDigitization/sTGC_Digitization/sTGC_Digitization/sTgcDigitInfoCollection.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef MUONSPECTROMETER_STGCDIGITINFOCOLLECTION_H
-#define MUONSPECTROMETER_STGCDIGITINFOCOLLECTION_H
-
-#include "sTGC_Digitization/sTgcDigitInfo.h"
-#include "Identifier/Identifier.h"
-#include "Identifier/IdentifierHash.h"
-
-#include "AthContainers/DataVector.h"
-#include "AthenaKernel/CLASS_DEF.h"
-
-class sTgcDigitInfoCollection : public DataVector<sTgcDigitInfo>
-{
-
- public:  // functions
-
-  typedef Identifier ID;
-  typedef sTgcDigitInfo DIGITINFO;
-  // Default constructor.
-  sTgcDigitInfoCollection()
-    : DataVector<sTgcDigitInfo>(),m_id(0),m_idHash(0)
-    { };
-
-    // Creates an empty container ready for writing.
-    sTgcDigitInfoCollection(Identifier id,IdentifierHash idHash)
-      : DataVector<sTgcDigitInfo>(),m_id(id),m_idHash(idHash)
-      { };
-
-      Identifier identify() const
-      {
-	return m_id;
-      }
-
-      IdentifierHash identifierHash() const
-      {
-	return m_idHash;
-      }
-
- private:
-      Identifier     m_id;
-      IdentifierHash m_idHash;
-
-};
-
-CLASS_DEF(sTgcDigitInfoCollection, 1084451812, 1)
-
-// Class needed only for persistency
-typedef DataVector<sTgcDigitInfoCollection> sTgcDigitInfoCollection_vector;
-CLASS_DEF( sTgcDigitInfoCollection_vector , 1257207333 , 1 )
-
-#endif
-
diff --git a/MuonSpectrometer/MuonDigitization/sTGC_Digitization/sTGC_Digitization/sTgcDigitizationTool.h b/MuonSpectrometer/MuonDigitization/sTGC_Digitization/sTGC_Digitization/sTgcDigitizationTool.h
index 5a0a89192da37188495d4cf2bea8e1cdae8be170..b23c097ca1b1367ca7f08b01a6ef6e999d863e83 100644
--- a/MuonSpectrometer/MuonDigitization/sTGC_Digitization/sTGC_Digitization/sTgcDigitizationTool.h
+++ b/MuonSpectrometer/MuonDigitization/sTGC_Digitization/sTGC_Digitization/sTgcDigitizationTool.h
@@ -25,8 +25,6 @@
 #include "xAODEventInfo/EventInfo.h"
 #include "xAODEventInfo/EventAuxInfo.h"
 
-#include "sTGC_Digitization/sTgcDigitInfoCollection.h"
-
 #include "CLHEP/Random/RandGaussZiggurat.h"
 #include "CLHEP/Random/RandomEngine.h"
 #include "CLHEP/Geometry/Point3D.h"
@@ -131,7 +129,6 @@ private:
   ActiveStoreSvc*                          m_activeStore;
   sTgcHitIdHelper*                         m_hitIdHelper;
   sTgcDigitContainer*                      m_digitContainer;
-  sTgcDigitInfoCollection*				   m_digitInfoCollection;
   const sTgcIdHelper*                      m_idHelper;
   const MuonGM::MuonDetectorManager*       m_mdManager;
   sTgcDigitMaker*                          m_digitizer;
@@ -143,8 +140,6 @@ private:
   std::string m_outputDigitCollectionName; // name of the output digits
   std::string m_outputSDO_CollectionName; // name of the output SDOs
 
-  std::string m_outputDigitInfoCollectionName;
-
   bool m_doToFCorrection;
   int m_doChannelTypes;
   //double m_noiseFactor;
diff --git a/MuonSpectrometer/MuonDigitization/sTGC_Digitization/src/sTgcDigitizationTool.cxx b/MuonSpectrometer/MuonDigitization/sTGC_Digitization/src/sTgcDigitizationTool.cxx
index 71b8681379ea89fd0ff3aee45c51ef125b563096..b13fb68c449880fc74f145ede820f391b27d1fc7 100644
--- a/MuonSpectrometer/MuonDigitization/sTGC_Digitization/src/sTgcDigitizationTool.cxx
+++ b/MuonSpectrometer/MuonDigitization/sTGC_Digitization/src/sTgcDigitizationTool.cxx
@@ -112,7 +112,6 @@ sTgcDigitizationTool::sTgcDigitizationTool(const std::string& type, const std::s
     m_inputHitCollectionName("sTGCSensitiveDetector"),
     m_outputDigitCollectionName("sTGC_DIGITS"),
     m_outputSDO_CollectionName("sTGC_SDO"),
-	m_outputDigitInfoCollectionName("sTGC_DIGIT_INFO"),
     m_doToFCorrection(0),
     m_doChannelTypes(3),
     m_readoutThreshold(0),
@@ -154,7 +153,6 @@ sTgcDigitizationTool::sTgcDigitizationTool(const std::string& type, const std::s
   declareProperty("InputObjectName",         m_inputHitCollectionName    = "sTGCSensitiveDetector", "name of the input object");
   declareProperty("OutputObjectName",        m_outputDigitCollectionName = "sTGC_DIGITS",           "name of the output object");
   declareProperty("OutputSDOName",           m_outputSDO_CollectionName  = "sTGC_SDO"); 
-  declareProperty("OutputDigitInfoName",     m_outputDigitInfoCollectionName = "sTGC_DIGIT_INFO");
   declareProperty("doToFCorrection",         m_doToFCorrection); 
   declareProperty("doChannelTypes",          m_doChannelTypes); 
   declareProperty("DeadtimeElectronicsStrip",m_deadtimeStrip); 
@@ -451,17 +449,6 @@ StatusCode sTgcDigitizationTool::recordDigitAndSdoContainers() {
     ATH_MSG_DEBUG("sTgcSDOCollection recorded in StoreGate.");
   }
 
-  m_digitInfoCollection = new sTgcDigitInfoCollection();
-
-  status = m_sgSvc->record(m_digitInfoCollection, m_outputDigitInfoCollectionName);
-  if(status.isFailure())  {
-      ATH_MSG_FATAL("Unable to record digit info collection in StoreGate");
-      return status;
-  } else {
-	  ATH_MSG_DEBUG("Digit info collection recorded in StoreGate.");
-  }
-
-
   return status;
 }
 /*******************************************************************************/
@@ -540,8 +527,6 @@ StatusCode sTgcDigitizationTool::doDigitization() {
 
   sTgcDigitCollection* digitCollection = 0;  //output digits
 
-  m_digitInfoCollection->clear();
-
   ATH_MSG_DEBUG("create PRD container of size " << m_idHelper->detectorElement_hash_max());
 
   IdContext tgcContext = m_idHelper->module_context();
@@ -563,10 +548,10 @@ StatusCode sTgcDigitizationTool::doDigitization() {
           ATH_MSG_VERBOSE("Hit Particle ID : " << hit.particleEncoding() );
           float eventTime = phit.eventTime(); 
           if(eventTime < earliestEventTime) earliestEventTime = eventTime;
-	  // Cut on energy deposit of the particle
-	  if(hit.depositEnergy() < m_energyDepositThreshold) {
-	    ATH_MSG_VERBOSE("Hit with Energy Deposit of " << hit.depositEnergy() << " less than 300.eV  Skip this hit." );
-	    continue;
+	      // Cut on energy deposit of the particle
+	      if(hit.depositEnergy() < m_energyDepositThreshold) {
+	        ATH_MSG_VERBOSE("Hit with Energy Deposit of " << hit.depositEnergy() << " less than 300.eV  Skip this hit." );
+	        continue;
           }
           if(eventTime != 0){
              msg(MSG::DEBUG) << "Updated hit global time to include off set of " << eventTime << " ns from OOT bunch." << endmsg;
diff --git a/MuonSpectrometer/MuonGeoModel/MuonGeoModel/DBReader.h b/MuonSpectrometer/MuonGeoModel/MuonGeoModel/DBReader.h
index fa27ec620feb32f4898351840768366701e0b8b9..0c0fee583a1da2590260dd08f4ef7a16c2533d87 100755
--- a/MuonSpectrometer/MuonGeoModel/MuonGeoModel/DBReader.h
+++ b/MuonSpectrometer/MuonGeoModel/MuonGeoModel/DBReader.h
@@ -15,7 +15,7 @@
 
 //<<<<<< INCLUDES                                                       >>>>>>
 #include "StoreGate/StoreGateSvc.h"
-#include "GeoModelKernel/Units.h"
+#include "GaudiKernel/SystemOfUnits.h"
 #include "AthenaKernel/getMessageSvc.h"
 #include <string>
 #include <iostream>
@@ -176,19 +176,19 @@ namespace MuonGM {
                 //std::cout<<" ProcessMDT "<<s<<" index "<<i<<" jsta ="<<wmdt[i].iw<<std::endl;
                 
                 mdt->numOfLayers=wmdt[i].laymdt;
-                mdt->innerRadius=wmdt[i].tubrad*GeoModelKernelUnits::cm;
-                mdt->totalThickness=wmdt[i].tubsta*GeoModelKernelUnits::cm;
-                mdt->pitch=wmdt[i].tubpit*GeoModelKernelUnits::cm;
+                mdt->innerRadius=wmdt[i].tubrad*Gaudi::Units::cm;
+                mdt->totalThickness=wmdt[i].tubsta*Gaudi::Units::cm;
+                mdt->pitch=wmdt[i].tubpit*Gaudi::Units::cm;
                 mdt->thickness=mdt->totalThickness;
                 mdt->tubeDeadLength = 0; // cannot be defined here (it depends on chamber size)
                 //mdt->endPlugLength  is not OK in p03
-                //mdt->endPlugLength = wmdt[i].tubdea*GeoModelKernelUnits::cm;
-                mdt->tubeEndPlugLength = wmdt[i].tubdea*GeoModelKernelUnits::cm;
+                //mdt->endPlugLength = wmdt[i].tubdea*Gaudi::Units::cm;
+                mdt->tubeEndPlugLength = wmdt[i].tubdea*Gaudi::Units::cm;
                                 
-                mdt->tubeWallThickness = wmdt[i].tubwal*GeoModelKernelUnits::cm;
+                mdt->tubeWallThickness = wmdt[i].tubwal*Gaudi::Units::cm;
                 
-                for(unsigned int k=0; k<4;k++) mdt->y[k]=wmdt[i].tubyco[k]*GeoModelKernelUnits::cm;
-                for(unsigned int j=0; j<4;j++) mdt->x[j]=wmdt[i].tubxco[j]*GeoModelKernelUnits::cm;
+                for(unsigned int k=0; k<4;k++) mdt->y[k]=wmdt[i].tubyco[k]*Gaudi::Units::cm;
+                for(unsigned int j=0; j<4;j++) mdt->x[j]=wmdt[i].tubxco[j]*Gaudi::Units::cm;
                 //std::cout << mdt->numOfLayers << std::endl;
             }
             //std::cout<<" nstruct in processMDT "<< nStruct<<" at iter "<<i<<std::endl;
@@ -214,17 +214,17 @@ namespace MuonGM {
         //std::cout << " TECH. A new RPC named " <<s<<" nrpc = "<<nrpc<<std::endl;
         //std::cout<<" Creating a RPC at "<<rpc<<" named "<<s<<std::endl;
     
-        rpc->centralSupPanelThickness          = (wrpcall->tckfsp)*GeoModelKernelUnits::cm;
-        rpc->centralAlSupPanelThickness        = (wrpcall->ackfsp)*GeoModelKernelUnits::cm;
+        rpc->centralSupPanelThickness          = (wrpcall->tckfsp)*Gaudi::Units::cm;
+        rpc->centralAlSupPanelThickness        = (wrpcall->ackfsp)*Gaudi::Units::cm;
         if (RPCprint)
             std::cout<<"ProcessRPC:: RPC central sup panel: tot & Al "<<rpc->centralSupPanelThickness<<" "
                      <<rpc->centralAlSupPanelThickness<<std::endl;
 
-        rpc->bakeliteThickness                  =(wrpcall->tckbak)*GeoModelKernelUnits::cm;
-        rpc->bakeliteframesize                  =0.5*(wrpcall->sdedmi)*GeoModelKernelUnits::cm;
-        rpc->gasThickness                       =(wrpcall->tckgas)*GeoModelKernelUnits::cm;
-        rpc->bakelitePetThickness               =0.190*GeoModelKernelUnits::mm; // TBM same as Amdb, why hardwired? Not in DblQ00Wrpc!
-        rpc->totalAirThickness = 0.52*GeoModelKernelUnits::mm;                  // TBM added
+        rpc->bakeliteThickness                  =(wrpcall->tckbak)*Gaudi::Units::cm;
+        rpc->bakeliteframesize                  =0.5*(wrpcall->sdedmi)*Gaudi::Units::cm;
+        rpc->gasThickness                       =(wrpcall->tckgas)*Gaudi::Units::cm;
+        rpc->bakelitePetThickness               =0.190*Gaudi::Units::mm; // TBM same as Amdb, why hardwired? Not in DblQ00Wrpc!
+        rpc->totalAirThickness = 0.52*Gaudi::Units::mm;                  // TBM added
         rpc->GasGapThickness=2.*rpc->bakeliteThickness+
                              rpc->gasThickness        +
                              2.*rpc->bakelitePetThickness +
@@ -242,26 +242,26 @@ namespace MuonGM {
         if (RPCprint)
             std::cout<<"ProcessRPC::WARNING redefining RPC::bakeliteThickness to include pet "
                      <<rpc->bakeliteThickness<<std::endl;    
-        rpc->spacerDiameter                     =(wrpcall->spdiam)*GeoModelKernelUnits::cm;
-        rpc->spacerPitch                        =(wrpcall->sppitc)*GeoModelKernelUnits::cm;
+        rpc->spacerDiameter                     =(wrpcall->spdiam)*Gaudi::Units::cm;
+        rpc->spacerPitch                        =(wrpcall->sppitc)*Gaudi::Units::cm;
         rpc->MidChamberDeadRegion_in_s          =2.*rpc->bakeliteframesize;
-        rpc->MidChamberDeadRegion_in_z          =(wrpcall->zdedmi)*GeoModelKernelUnits::cm;
+        rpc->MidChamberDeadRegion_in_z          =(wrpcall->zdedmi)*Gaudi::Units::cm;
         if (RPCprint)
             std::cout<<" ProcessRPC:: spacerDiam, pitch, MidChamberDeadRegion_in_s, MidChamberDeadRegion_in_z "
                      <<rpc->spacerDiameter<<" "<<rpc->spacerPitch<<" "
                      <<rpc->MidChamberDeadRegion_in_s<<" "<<rpc->MidChamberDeadRegion_in_z<<std::endl;
 
-        rpc->petFoilThickness    =0.190*GeoModelKernelUnits::mm; //TBM this is the same as bakelite PET thickness?
+        rpc->petFoilThickness    =0.190*Gaudi::Units::mm; //TBM this is the same as bakelite PET thickness?
         if (RPCprint) std::cout
             <<"ProcessRPC:: defining RPC::petfoilThickness = "<<rpc->petFoilThickness
             <<std::endl;    
     
-        rpc->stripPanelFoamThickness            =(wrpcall->tckssu)*GeoModelKernelUnits::cm;
-        rpc->stripPanelCopperSkinThickness      =(wrpcall->tckstr)*GeoModelKernelUnits::cm;
-        rpc->stripPanelStripSidePetThickness    =0.25*GeoModelKernelUnits::mm; //missing in AmdbNova
-        rpc->stripPanelGroundSidePetThickness   =0.07*GeoModelKernelUnits::mm; //missing in AmdbNova
-        rpc->frontendBoardWidth = 36.*GeoModelKernelUnits::mm;
-        rpc->backendBoardWidth  = 21.*GeoModelKernelUnits::mm;
+        rpc->stripPanelFoamThickness            =(wrpcall->tckssu)*Gaudi::Units::cm;
+        rpc->stripPanelCopperSkinThickness      =(wrpcall->tckstr)*Gaudi::Units::cm;
+        rpc->stripPanelStripSidePetThickness    =0.25*Gaudi::Units::mm; //missing in AmdbNova
+        rpc->stripPanelGroundSidePetThickness   =0.07*Gaudi::Units::mm; //missing in AmdbNova
+        rpc->frontendBoardWidth = 36.*Gaudi::Units::mm;
+        rpc->backendBoardWidth  = 21.*Gaudi::Units::mm;
         if (RPCprint) std::cout
             <<"ProcessRPC:: stp panel: foam, 2*copper, petg, pets, fe, be "
             <<rpc->stripPanelFoamThickness<<" "
@@ -283,7 +283,7 @@ namespace MuonGM {
             <<"ProcessRPC::WARNING redefining RPC::stripPanelFoamThickness to include pet on both sides "
             <<rpc->stripPanelFoamThickness <<std::endl;    
         
-        rpc->rpcLayerThickness                  =(wrpcall->tckrla)*GeoModelKernelUnits::cm;
+        rpc->rpcLayerThickness                  =(wrpcall->tckrla)*Gaudi::Units::cm;
         double rpcLayerComputedTck = rpc->GasGapThickness +
                                      2*rpc->stripPanelThickness + rpc->petFoilThickness;    
         if (RPCprint) std::cout<<"ProcessRPC:: rpcLayerComputedTck =  "<<rpcLayerComputedTck
@@ -308,8 +308,8 @@ namespace MuonGM {
                 done = true;
                 //std::cout<<" done for jtech, wrpc[i].jsta = "<<jtech<<" "<<wrpc[i].jsta<<std::endl;
             
-                rpc->externalSupPanelThickness           =(wrpcall->tlohcb)*GeoModelKernelUnits::cm; //TBM
-                rpc->externalAlSupPanelThickness         =(wrpcall->alohcb)*GeoModelKernelUnits::cm; //TBM
+                rpc->externalSupPanelThickness           =(wrpcall->tlohcb)*Gaudi::Units::cm; //TBM
+                rpc->externalAlSupPanelThickness         =(wrpcall->alohcb)*Gaudi::Units::cm; //TBM
                 if (RPCprint) std::cout<<"ProcessRPC:: RPC external sup panel: tot & Al "
                                        <<rpc->centralSupPanelThickness<<" "
                                        <<rpc->centralAlSupPanelThickness<<std::endl;
@@ -323,13 +323,13 @@ namespace MuonGM {
                                                           rpc->externalSupPanelThickness;
                 if (RPCprint) std::cout<<"ProcessRPC:: (computed) Total RPC thickness = "
                                        <<rpc->TotalThickness<<std::endl;
-                rpc->maxThickness = 46.*GeoModelKernelUnits::mm;  // TBM same as (wrpcall->tottck)*GeoModelKernelUnits::cm;
+                rpc->maxThickness = 46.*Gaudi::Units::mm;  // TBM same as (wrpcall->tottck)*Gaudi::Units::cm;
                 rpc->thickness = rpc->maxThickness;
                 if (RPCprint) std::cout<<"ProcessRPC:: RPC max thickness "<<rpc->maxThickness <<std::endl;
                         
-                rpc->stripPitchS                        =(wrpc[i].spitch)*GeoModelKernelUnits::cm;
-                rpc->stripPitchZ                        =(wrpc[i].zpitch)*GeoModelKernelUnits::cm;
-                rpc->stripSeparation                    =(wrpc[i].dedstr)*GeoModelKernelUnits::cm;
+                rpc->stripPitchS                        =(wrpc[i].spitch)*Gaudi::Units::cm;
+                rpc->stripPitchZ                        =(wrpc[i].zpitch)*Gaudi::Units::cm;
+                rpc->stripSeparation                    =(wrpc[i].dedstr)*Gaudi::Units::cm;
                 if (RPCprint) std::cout<<"ProcessRPC:: s_pitch, z_pitch "
                                        <<rpc->stripPitchS <<" "<<rpc->stripPitchZ<<std::endl;
             
@@ -375,11 +375,11 @@ namespace MuonGM {
             if( s.substr(3,s.size()-3) == MuonGM::buildString(wtgcall[i].jsta,2) )
             {
                 tgc->nlayers  =wtgcall[i].nbevol;
-                tgc->thickness=wtgcall[i].widchb*GeoModelKernelUnits::cm;
+                tgc->thickness=wtgcall[i].widchb*Gaudi::Units::cm;
                 //std::cout<<" ProcessTGC accepted "<<s<<" index "<<i<<" jsta ="<<wtgcall[i].jsta
                 //         <<" internal struct has "<<tgc->nlayers<<" layers; thickness is "<<tgc->thickness<<std::endl;
-                tgc->frame_h  =wtgcall[i].fwirch*GeoModelKernelUnits::cm;
-                tgc->frame_ab =wtgcall[i].fwixch*GeoModelKernelUnits::cm;
+                tgc->frame_h  =wtgcall[i].fwirch*Gaudi::Units::cm;
+                tgc->frame_ab =wtgcall[i].fwixch*Gaudi::Units::cm;
                 //int subtype = wtgcall[i].jsta;
                 //             std::cout<<" thick, frame_h, frame_ab "<< tgc->thickness
                 //                      <<" "<<tgc->frame_h<<" "<<tgc->frame_ab<<std::endl;
@@ -394,8 +394,8 @@ namespace MuonGM {
                     n++;
                     //std::cout<<" select this by jsta = "<<wtgc[j].jsta<<" until now "<<n<<" selected"<<std::endl;
                     mat=(int)wtgc[j].icovol;
-                    p=wtgc[j].zpovol*GeoModelKernelUnits::cm;
-                    t=wtgc[j].widvol*GeoModelKernelUnits::cm;
+                    p=wtgc[j].zpovol*Gaudi::Units::cm;
+                    t=wtgc[j].widvol*Gaudi::Units::cm;
                     tgc->materials.push_back(v[mat-1]);
                     //std::cerr<<" Processing TGC iw = "<<s<<" mat = "<<mat<<" v[mat-1] "<<v[mat-1]<<std::endl;
                     tgc->positions.push_back(p);
@@ -454,25 +454,25 @@ namespace MuonGM {
                     //                    std::cout<<" ProcessCSC "<<s<<" index "<<i<<" jsta ="<<wcsc[i].jsta<<std::endl;
                     
                     csc->numOfLayers=wcsc[i].laycsc;
-                    csc->totalThickness=wcsc[i].ttotal*GeoModelKernelUnits::cm;
+                    csc->totalThickness=wcsc[i].ttotal*Gaudi::Units::cm;
                     csc->thickness=csc->totalThickness;
-                    csc->honeycombthick=wcsc[i].tnomex*GeoModelKernelUnits::cm;
+                    csc->honeycombthick=wcsc[i].tnomex*Gaudi::Units::cm;
                     
-                    csc->g10thick=wcsc[i].tlag10*GeoModelKernelUnits::cm;  //csc->g10thick=0.0820*GeoModelKernelUnits::cm;
+                    csc->g10thick=wcsc[i].tlag10*Gaudi::Units::cm;  //csc->g10thick=0.0820*Gaudi::Units::cm;
 
                     // wire spacing 
-                    csc->wirespacing =wcsc[i].wispa*GeoModelKernelUnits::cm;
+                    csc->wirespacing =wcsc[i].wispa*Gaudi::Units::cm;
                     // anode-cathode distance
-                    csc->anocathodist=wcsc[i].dancat*GeoModelKernelUnits::cm;
+                    csc->anocathodist=wcsc[i].dancat*Gaudi::Units::cm;
                     // gapbetwcathstrips
-                    csc->gapbetwcathstrips=wcsc[i].gstrip*GeoModelKernelUnits::cm;
+                    csc->gapbetwcathstrips=wcsc[i].gstrip*Gaudi::Units::cm;
 
                     // precision (Radial) strip pitch
-                    csc->cathreadoutpitch=wcsc[i].pcatre*GeoModelKernelUnits::cm; // it was not used before but set by hand in CscReadoutEl.
+                    csc->cathreadoutpitch=wcsc[i].pcatre*Gaudi::Units::cm; // it was not used before but set by hand in CscReadoutEl.
                     // Azimuthal strip pitch
 
-                    //csc->phireadoutpitch = wcsc[i].psndco*GeoModelKernelUnits::cm;
-                    csc->phireadoutpitch = wcsc[i].azcat*GeoModelKernelUnits::cm;
+                    //csc->phireadoutpitch = wcsc[i].psndco*Gaudi::Units::cm;
+                    csc->phireadoutpitch = wcsc[i].azcat*Gaudi::Units::cm;
                     //std::cerr<<" do we come here ??? csc->phireadoutpitch = "<<csc->phireadoutpitch<<std::endl;
 
                     //std::cerr<<" csc->phireadoutpitch = "<<csc->phireadoutpitch<<"  csc->cathreadoutpitch "<< csc->cathreadoutpitch<<std::endl;
@@ -485,20 +485,20 @@ namespace MuonGM {
                     csc->nPhistrips = 48;
 
                     // precision (Radial) strip width
-                    csc->readoutstripswidth=wcsc[i].wrestr*GeoModelKernelUnits::cm;
+                    csc->readoutstripswidth=wcsc[i].wrestr*Gaudi::Units::cm;
                     // Azimuthal strip width
                     csc->floatingstripswidth =0.;
-                    csc->phistripwidth      = wcsc[i].wflstr*GeoModelKernelUnits::cm; // CTB and layout Q interpretation
+                    csc->phistripwidth      = wcsc[i].wflstr*Gaudi::Units::cm; // CTB and layout Q interpretation
 
                     // dead materials 
-                    csc->rectwasherthick=wcsc[i].trrwas*GeoModelKernelUnits::cm;
-                    csc->roxacellwith = 54.96*GeoModelKernelUnits::mm; //  CTB, layout Q, R, etc: must be computed
-                    csc->roxwirebargap=wcsc[i].groxwi*GeoModelKernelUnits::cm;
-                    csc->fullgasgapwirewidth=wcsc[i].wgasba*GeoModelKernelUnits::cm;
-                    csc->fullwirefixbarwidth=wcsc[i].wfixwi*GeoModelKernelUnits::cm;
-                    csc->wirebarposx=wcsc[i].pba1wi*GeoModelKernelUnits::cm;
-                    csc->wirebarposy=wcsc[i].pba2wi*GeoModelKernelUnits::cm;
-                    csc->wirebarposz=wcsc[i].pba3wi*GeoModelKernelUnits::cm;
+                    csc->rectwasherthick=wcsc[i].trrwas*Gaudi::Units::cm;
+                    csc->roxacellwith = 54.96*Gaudi::Units::mm; //  CTB, layout Q, R, etc: must be computed
+                    csc->roxwirebargap=wcsc[i].groxwi*Gaudi::Units::cm;
+                    csc->fullgasgapwirewidth=wcsc[i].wgasba*Gaudi::Units::cm;
+                    csc->fullwirefixbarwidth=wcsc[i].wfixwi*Gaudi::Units::cm;
+                    csc->wirebarposx=wcsc[i].pba1wi*Gaudi::Units::cm;
+                    csc->wirebarposy=wcsc[i].pba2wi*Gaudi::Units::cm;
+                    csc->wirebarposz=wcsc[i].pba3wi*Gaudi::Units::cm;
 //                    std::cerr<<"A) tname, s, csc->numOfLayers "<<tname<<" "<<s<<" "<<csc->numOfLayers<<std::endl;
                     if (tname == s) return;
                     
@@ -524,14 +524,14 @@ namespace MuonGM {
                 log<<MSG::WARNING<<" update by hand a few numbers for the current technology sub-type "<<s
                    <<" // Layout = "<<mysql->getGeometryVersion()<<" OK if layout is Q02, Q02_initial"<<endmsg;
                 // precision (Radial) strip pitch
-                csc->cathreadoutpitch  =5.31*GeoModelKernelUnits::mm;
+                csc->cathreadoutpitch  =5.31*Gaudi::Units::mm;
                 // Azimuthal strip pitch
-                csc->phireadoutpitch   =21.0*GeoModelKernelUnits::mm;
+                csc->phireadoutpitch   =21.0*Gaudi::Units::mm;
                 // precision (Radial) strip width
-                csc->readoutstripswidth=1.52*GeoModelKernelUnits::mm;
+                csc->readoutstripswidth=1.52*Gaudi::Units::mm;
                 // Azimuthal strip width
                 csc->floatingstripswidth = 0; // layout P interpretation
-                csc->phistripwidth    =20.60*GeoModelKernelUnits::mm;
+                csc->phistripwidth    =20.60*Gaudi::Units::mm;
                 return;
             }
         }
@@ -552,9 +552,9 @@ namespace MuonGM {
         //std::cerr << " TECH. A new SPA named " <<s<<" nspa = "<<nspa<<std::endl;
         for (unsigned int i=0; i<dhwspa->size(); i++) {
             //        sprintf(ind,"%i",wspa[i].type);
-            //if(s[3]==ind[0]) spa->thickness=wspa[i].tckspa*GeoModelKernelUnits::cm;
+            //if(s[3]==ind[0]) spa->thickness=wspa[i].tckspa*Gaudi::Units::cm;
             if( s.substr(3,s.size()-3) == MuonGM::buildString(wspa[i].jsta,2) )
-                spa->thickness=wspa[i].tckspa*GeoModelKernelUnits::cm;
+                spa->thickness=wspa[i].tckspa*Gaudi::Units::cm;
         }
     } // end of ProcessSPA
     
@@ -576,17 +576,17 @@ namespace MuonGM {
             //        sprintf(ind,"%i",wsup[i].type);
             if( s.substr(3,s.size()-3) == MuonGM::buildString(wsup[i].jsta,2) )
             {
-                sup->alFlangeThickness=wsup[i].xxsup[0]*GeoModelKernelUnits::cm;
+                sup->alFlangeThickness=wsup[i].xxsup[0]*Gaudi::Units::cm;
                 //if (s[3]=='3') //SUP3
                 if( s.substr(3,s.size()-3) == "03" )
                 {
-                    sup->alHorFlangeLength=(fabs)(wsup[i].zzsup[1])*GeoModelKernelUnits::cm;
-                    sup->alVerFlangeLength=wsup[i].xxsup[1]*GeoModelKernelUnits::cm - wsup[i].xxsup[0]*GeoModelKernelUnits::cm;
-                    sup->alVerProfileThickness=wsup[i].zzsup[3]*GeoModelKernelUnits::cm;
-                    sup->alHorProfileThickness=wsup[i].xxsup[3]*GeoModelKernelUnits::cm - wsup[i].xxsup[2]*GeoModelKernelUnits::cm;
-                    sup->largeVerClearance=wsup[i].xxsup[3]*GeoModelKernelUnits::cm;
-                    sup->smallVerClearance=wsup[i].xxsup[2]*GeoModelKernelUnits::cm;
-                    sup->HorClearance=wsup[i].zzsup[2]*GeoModelKernelUnits::cm;
+                    sup->alHorFlangeLength=(fabs)(wsup[i].zzsup[1])*Gaudi::Units::cm;
+                    sup->alVerFlangeLength=wsup[i].xxsup[1]*Gaudi::Units::cm - wsup[i].xxsup[0]*Gaudi::Units::cm;
+                    sup->alVerProfileThickness=wsup[i].zzsup[3]*Gaudi::Units::cm;
+                    sup->alHorProfileThickness=wsup[i].xxsup[3]*Gaudi::Units::cm - wsup[i].xxsup[2]*Gaudi::Units::cm;
+                    sup->largeVerClearance=wsup[i].xxsup[3]*Gaudi::Units::cm;
+                    sup->smallVerClearance=wsup[i].xxsup[2]*Gaudi::Units::cm;
+                    sup->HorClearance=wsup[i].zzsup[2]*Gaudi::Units::cm;
                     sup->xAMDB0 = -sup->largeVerClearance -sup->alHorProfileThickness/2.;
                     sup->yAMDB0 = 0.;
                     sup->zAMDB0 = - sup->alVerProfileThickness
@@ -596,11 +596,11 @@ namespace MuonGM {
                 }
                 else //SUP1 and SUP2
                 {
-                    sup->alHorFlangeLength=wsup[i].zzsup[0]*GeoModelKernelUnits::cm;
+                    sup->alHorFlangeLength=wsup[i].zzsup[0]*Gaudi::Units::cm;
                     sup->alVerFlangeLength=0.;
-                    sup->alVerProfileThickness=wsup[i].xxsup[0]*GeoModelKernelUnits::cm;
+                    sup->alVerProfileThickness=wsup[i].xxsup[0]*Gaudi::Units::cm;
                     sup->alHorProfileThickness=0.;
-                    sup->largeVerClearance=wsup[i].xxsup[1]*GeoModelKernelUnits::cm;
+                    sup->largeVerClearance=wsup[i].xxsup[1]*Gaudi::Units::cm;
                     sup->smallVerClearance=0.;
                     sup->HorClearance=0.;
                     double totzgm = 2.*sup->alHorFlangeLength+sup->alVerProfileThickness+sup->HorClearance;
@@ -643,11 +643,11 @@ namespace MuonGM {
         for (unsigned int i=0; i<dhwded->size(); i++) {
             if( s.substr(3,s.size()-3) == MuonGM::buildString(wded[i].jsta,2) )
             {
-//                 ded->AlThickness=(wded[i].tckded)*GeoModelKernelUnits::cm;
-//                 ded->AlThickness = ded->AlThickness * GeoModelKernelUnits::cm;
+//                 ded->AlThickness=(wded[i].tckded)*Gaudi::Units::cm;
+//                 ded->AlThickness = ded->AlThickness * Gaudi::Units::cm;
 // a lot of confusion in the various versions of the geometry in nova
-                ded->AlThickness=0.3*GeoModelKernelUnits::mm;
-                ded->thickness=(wded[i].auphcb)*GeoModelKernelUnits::cm;
+                ded->AlThickness=0.3*Gaudi::Units::mm;
+                ded->thickness=(wded[i].auphcb)*Gaudi::Units::cm;
                 ded->HoneyCombThickness=ded->thickness-2.*ded->AlThickness;
                 break;
             }
@@ -670,9 +670,9 @@ namespace MuonGM {
         for (int i=0; i<nStruct; i++) {
             if( s.substr(3,s.size()-3) == MuonGM::buildString(wchv[i].jsta,2) )
             {
-                chv->thickness=wchv[i].thickness*GeoModelKernelUnits::cm;
-                chv->largeness=wchv[i].largeness*GeoModelKernelUnits::cm;
-                chv->height=wchv[i].heightness*GeoModelKernelUnits::cm;
+                chv->thickness=wchv[i].thickness*Gaudi::Units::cm;
+                chv->largeness=wchv[i].largeness*Gaudi::Units::cm;
+                chv->height=wchv[i].heightness*Gaudi::Units::cm;
             }
         }
     }// end of ProcessCHV
@@ -694,9 +694,9 @@ namespace MuonGM {
         for (int i=0; i<nStruct; i++) {
             if( s.substr(3,s.size()-3) == MuonGM::buildString(wcro[i].jsta,2) )
             {
-                cro->thickness=wcro[i].thickness*GeoModelKernelUnits::cm;
-                cro->largeness=wcro[i].largeness*GeoModelKernelUnits::cm;
-                cro->height=wcro[i].heightness*GeoModelKernelUnits::cm;
+                cro->thickness=wcro[i].thickness*Gaudi::Units::cm;
+                cro->largeness=wcro[i].largeness*Gaudi::Units::cm;
+                cro->height=wcro[i].heightness*Gaudi::Units::cm;
                 //std::cerr<<" thick, width, height "<<cro->thickness<<" "<<cro->largeness<<" "<<cro->height<<std::endl;
             }
         }
@@ -719,9 +719,9 @@ namespace MuonGM {
         for (int i=0; i<nStruct; i++) {
             if( s.substr(3,s.size()-3) == MuonGM::buildString(wcmi[i].jsta,2) )
             {
-                cmi->thickness=wcmi[i].thickness*GeoModelKernelUnits::cm;
-                cmi->largeness=wcmi[i].largeness*GeoModelKernelUnits::cm;
-                cmi->height=wcmi[i].heightness*GeoModelKernelUnits::cm;
+                cmi->thickness=wcmi[i].thickness*Gaudi::Units::cm;
+                cmi->largeness=wcmi[i].largeness*Gaudi::Units::cm;
+                cmi->height=wcmi[i].heightness*Gaudi::Units::cm;
             }
         }
     }// end of ProcessCMI
@@ -743,10 +743,10 @@ namespace MuonGM {
         for (int i=0; i<nStruct; i++) {
             if( s.substr(2,s.size()-2) == MuonGM::buildString(wlbi[i].jsta,2) )
             {
-                lbi->thickness=wlbi[i].thickness*GeoModelKernelUnits::cm;
-                lbi->height=wlbi[i].height*GeoModelKernelUnits::cm;
-                lbi->lowerThickness=wlbi[i].lowerThickness*GeoModelKernelUnits::cm;
-                lbi->yShift=wlbi[i].yShift*GeoModelKernelUnits::cm;
+                lbi->thickness=wlbi[i].thickness*Gaudi::Units::cm;
+                lbi->height=wlbi[i].height*Gaudi::Units::cm;
+                lbi->lowerThickness=wlbi[i].lowerThickness*Gaudi::Units::cm;
+                lbi->yShift=wlbi[i].yShift*Gaudi::Units::cm;
             }
         }
     } // end of ProcessLBI
@@ -860,13 +860,13 @@ namespace MuonGM {
                 //std::cout<<" ---- iz,fi  "<<p.zindex<<", "<<p.phiindex;
                 p.phi      = aptp[ipos].dphi+double(phiindex)*45.;
                 //std::cout<<" phi is "<<p.phi;
-                p.radius   = aptp[ipos].r*GeoModelKernelUnits::cm;
+                p.radius   = aptp[ipos].r*Gaudi::Units::cm;
                 //std::cout<<"  r  is "<<p.radius<<std::endl;
-                p.z        = aptp[ipos].z*GeoModelKernelUnits::cm;
+                p.z        = aptp[ipos].z*Gaudi::Units::cm;
                 if (p.zindex<0 && name.substr(0,1) == "B" && hasMdts) p.z = p.z-halfpitch;
             
                 //std::cout<<"  z  is "<<p.z<<std::endl;
-                p.shift    = aptp[ipos].s*GeoModelKernelUnits::cm;
+                p.shift    = aptp[ipos].s*Gaudi::Units::cm;
                 if (verbose_posmap) std::cout<<"p.zindex,p.phi "<<p.zindex<<" "<<p.phiindex<<" shift is "<<p.shift<<std::endl;
                 // amdb seems to follow the opposite convention about the sign
                 // of rotation around the azimuthal axis (foro them it is a rotation
@@ -1045,9 +1045,9 @@ namespace MuonGM {
                             //                       std::cout << "FindPosition found the match for " << stname
                             //                                 << std::endl;
                             AlignPos ap;
-                            ap.tras=0.*GeoModelKernelUnits::cm; // in cm from NOVA...
-                            ap.traz=0.*GeoModelKernelUnits::cm; // in cm
-                            ap.trat=0.*GeoModelKernelUnits::cm; // in cm
+                            ap.tras=0.*Gaudi::Units::cm; // in cm from NOVA...
+                            ap.traz=0.*Gaudi::Units::cm; // in cm
+                            ap.trat=0.*Gaudi::Units::cm; // in cm
                             ap.rots=0.; // in radians
                             ap.rotz=0.; // in radians
                             ap.rott=0.; // in radians             
@@ -1055,9 +1055,9 @@ namespace MuonGM {
 			    
                             if (controlAlines >= 111111) 
                             {
-                                ap.tras=aszt[ipos].tras*GeoModelKernelUnits::cm; // in cm from NOVA...
-                                ap.traz=aszt[ipos].traz*GeoModelKernelUnits::cm; // in cm
-                                ap.trat=aszt[ipos].trat*GeoModelKernelUnits::cm; // in cm
+                                ap.tras=aszt[ipos].tras*Gaudi::Units::cm; // in cm from NOVA...
+                                ap.traz=aszt[ipos].traz*Gaudi::Units::cm; // in cm
+                                ap.trat=aszt[ipos].trat*Gaudi::Units::cm; // in cm
                                 ap.rots=aszt[ipos].rots; // in radians
                                 ap.rotz=aszt[ipos].rotz; // in radians
                                 ap.rott=aszt[ipos].rott; // in radians
@@ -1083,17 +1083,17 @@ namespace MuonGM {
                                 }
                                 if  (int(controlAlines/1000)%10 != 0)
                                 {
-                                    ap.trat=aszt[ipos].trat*GeoModelKernelUnits::cm;
+                                    ap.trat=aszt[ipos].trat*Gaudi::Units::cm;
                                     //std::cout<<" setting up t-translation "<<ap.trat<<endl;
                                 }
                                 if  (int(controlAlines/10000)%10 != 0)
                                 {
-                                    ap.traz=aszt[ipos].traz*GeoModelKernelUnits::cm;
+                                    ap.traz=aszt[ipos].traz*Gaudi::Units::cm;
                                     //std::cout<<" setting up z-translation "<<ap.traz<<endl;
                                 }
                                 if  (int(controlAlines/100000)%10 != 0)
                                 {
-                                    ap.tras=aszt[ipos].tras*GeoModelKernelUnits::cm;
+                                    ap.tras=aszt[ipos].tras*Gaudi::Units::cm;
                                     //std::cout<<" setting up s-translation "<<ap.tras<<endl;
                                 }
                             }
@@ -1153,7 +1153,7 @@ namespace MuonGM {
 
         // that doesn't seem right for BME/BMG chambers - no idea if has an impact at the end
         // in any case it was wrong since every and would have been wrong also in previous code
-        double default_halfpitch = 15.0175*GeoModelKernelUnits::mm;
+        double default_halfpitch = 15.0175*Gaudi::Units::mm;
 	double halfpitch = default_halfpitch;
 	
         // loop over the banks of station components: ALMN
@@ -1220,7 +1220,7 @@ namespace MuonGM {
 			<< " for " << name << std::endl;
 		      continue;
 		    }
-		    halfpitch = 0.5*wmdt[jtech-1].tubpit*GeoModelKernelUnits::cm;
+		    halfpitch = 0.5*wmdt[jtech-1].tubpit*Gaudi::Units::cm;
 		    log << MSG::DEBUG
 		      << "Found new halfpitch: " << halfpitch
 		      << " for " << name << std::endl;
@@ -1268,19 +1268,19 @@ namespace MuonGM {
             }
 
             // define here common properties
-            c->posx=almn[icomp].dx*GeoModelKernelUnits::cm;
-            c->posy=almn[icomp].dy*GeoModelKernelUnits::cm;
-            c->posz=almn[icomp].dz*GeoModelKernelUnits::cm;
+            c->posx=almn[icomp].dx*Gaudi::Units::cm;
+            c->posy=almn[icomp].dy*Gaudi::Units::cm;
+            c->posz=almn[icomp].dz*Gaudi::Units::cm;
             c->index=almn[icomp].job;
             c->name=cartec+MuonGM::buildString(almn[icomp].iw, 2);
             c->iswap=almn[icomp].ishape;
-            c->dx1=almn[icomp].width_xs*GeoModelKernelUnits::cm;
-            c->dx2=almn[icomp].width_xl*GeoModelKernelUnits::cm;
-            c->dy=almn[icomp].length_y*GeoModelKernelUnits::cm;
-            c->excent=almn[icomp].excent*GeoModelKernelUnits::cm;
-            c->deadx=almn[icomp].dead1*GeoModelKernelUnits::cm;
-            c->deady=almn[icomp].dead2*GeoModelKernelUnits::cm;
-            c->dead3=almn[icomp].dead3*GeoModelKernelUnits::cm;
+            c->dx1=almn[icomp].width_xs*Gaudi::Units::cm;
+            c->dx2=almn[icomp].width_xl*Gaudi::Units::cm;
+            c->dy=almn[icomp].length_y*Gaudi::Units::cm;
+            c->excent=almn[icomp].excent*Gaudi::Units::cm;
+            c->deadx=almn[icomp].dead1*Gaudi::Units::cm;
+            c->deady=almn[icomp].dead2*Gaudi::Units::cm;
+            c->dead3=almn[icomp].dead3*Gaudi::Units::cm;
 
             //std::cout<<" This component of station "<<name<<" is a "<<c->name<<std::endl;
             if (cartec == "CSC")
@@ -1289,10 +1289,10 @@ namespace MuonGM {
                 if (derc == NULL) std::cout<<" There is a problem"<<std::endl;
                 if (name[2] == 'L'){
                     //std::cout<<" here is a CSL ..."<<std::endl;
-                    derc->dy = 1129.20*GeoModelKernelUnits::mm;  // AMDB-Q and CTB
+                    derc->dy = 1129.20*Gaudi::Units::mm;  // AMDB-Q and CTB
                     // DHW: fix values from AMDB
-                    //else derc->dy = 1111.5*GeoModelKernelUnits::mm;
-                    derc->maxwdy = almn[icomp].length_y*GeoModelKernelUnits::cm;
+                    //else derc->dy = 1111.5*Gaudi::Units::mm;
+                    derc->maxwdy = almn[icomp].length_y*Gaudi::Units::cm;
                 }
                 else  derc->maxwdy = c->dy;
                 //ProcessCSC(derc->name);
@@ -1302,7 +1302,7 @@ namespace MuonGM {
                 derc->maxwdy = derc->dy;
                 if (jtech == 6 && name.substr(0,3) == "CSL") 
                 {
-                    derc->dy     = 1129.20*GeoModelKernelUnits::mm; // AMDB-Q and CTB
+                    derc->dy     = 1129.20*Gaudi::Units::mm; // AMDB-Q and CTB
                 }
                 //ProcessSPA(derc->name);
             }
@@ -1409,10 +1409,10 @@ template <class TYPEdnacut, class TYPEacut, class TYPEdnalin, class TYPEalin,
 		     << " component with subcut i="<<alin[ialin].i
 		     << endmsg;
 		  Cutout *c = new Cutout();
-		  c->dx = alin[ialin].dx*GeoModelKernelUnits::cm;
-		  c->dy = alin[ialin].dy*GeoModelKernelUnits::cm;
-		  c->widthXs = alin[ialin].width_xs*GeoModelKernelUnits::cm;
-		  c->widthXl = alin[ialin].width_xl*GeoModelKernelUnits::cm;
+		  c->dx = alin[ialin].dx*Gaudi::Units::cm;
+		  c->dy = alin[ialin].dy*Gaudi::Units::cm;
+		  c->widthXs = alin[ialin].width_xs*Gaudi::Units::cm;
+		  c->widthXl = alin[ialin].width_xl*Gaudi::Units::cm;
                   //std::string::size_type locmystr = mysql->get_DBMuonVersion().find("Egg");
                   //if ( locmystr != std::string::npos )
                   //{                      
@@ -1425,19 +1425,19 @@ template <class TYPEdnacut, class TYPEacut, class TYPEdnalin, class TYPEalin,
                   //    if (alin[ialin].jtyp == 11 && c->dy>0.1)
                   //    {
                   //        std::cout<<"DBREADER redefining dy of the cutout from "<<c->dy;
-                  //        c->dy = 1021.2000*GeoModelKernelUnits::mm;
+                  //        c->dy = 1021.2000*Gaudi::Units::mm;
                   //        std::cout<<" to "<<c->dy<<std::endl;
                   //    }
                   //    else if (alin[ialin].jtyp == 11 && c->dy>0.0001)
                   if (alin[ialin].jtyp == 11 && (c->dy>0.0001 && c->dy<1.))
                   {
                     std::cout<<"DBREADER redefining dy of the cutout from "<<c->dy;
-                    c->dy = 0.000*GeoModelKernelUnits::mm;
+                    c->dy = 0.000*Gaudi::Units::mm;
                     std::cout<<" to "<<c->dy<<std::endl;
                   }
                   //}
-		  c->lengthY = alin[ialin].length_y*GeoModelKernelUnits::cm;
-		  c->excent = alin[ialin].excent*GeoModelKernelUnits::cm;
+		  c->lengthY = alin[ialin].length_y*Gaudi::Units::cm;
+		  c->excent = alin[ialin].excent*Gaudi::Units::cm;
                   c->dead1 = alin[ialin].dead1;
 		  // temporary fix for bug in Nova/Oracle: 18/05/2006 I don't think this is needed anymore 
 		  // c->dead1 = 10.*alin[ialin].dead1;
diff --git a/MuonSpectrometer/MuonGeoModel/src/Cutout.cxx b/MuonSpectrometer/MuonGeoModel/src/Cutout.cxx
index cc232c57233652e79481a4ada9befaabff349162..7844e3848879ea336c0db3461d0888037f0ee2da 100755
--- a/MuonSpectrometer/MuonGeoModel/src/Cutout.cxx
+++ b/MuonSpectrometer/MuonGeoModel/src/Cutout.cxx
@@ -10,7 +10,7 @@
 #include "GeoModelKernel/GeoTransform.h"
 #include "GeoModelKernel/GeoShapeShift.h"
 #include "GeoModelKernel/GeoDefinitions.h"
-#include "GeoModelKernel/Units.h"
+#include "GaudiKernel/SystemOfUnits.h"
 
 namespace MuonGM {
 
@@ -79,15 +79,15 @@ const GeoShape* Cutout::build()
       double alpha = atan(2.*excent/lengthY);
       // polar and azimuthal angles of vector describing offset of
       //   cutout planes:
-      double theta = -dead1*GeoModelKernelUnits::degree;
-      double phi = -90.*GeoModelKernelUnits::degree;
+      double theta = -dead1*Gaudi::Units::degree;
+      double phi = -90.*Gaudi::Units::degree;
       // GeoPara requires the +/- z faces be parallel to the x-y plane,
       //   so choose x = width, y=length, z=thickness:
       GeoPara *cutoutpara = new GeoPara(widthXs/2.,lengthY/2.,thickness/2.,
 					alpha,theta,phi);
       // now rotate it so thickness is x-axis, width is y-axis, length z-axis:
-      GeoTrf::Transform3D xRot = GeoTrf::RotateX3D(-90.*GeoModelKernelUnits::degree)*
-	GeoTrf::RotateY3D(-90.*GeoModelKernelUnits::degree);
+      GeoTrf::Transform3D xRot = GeoTrf::RotateX3D(-90.*Gaudi::Units::degree)*
+	GeoTrf::RotateY3D(-90.*Gaudi::Units::degree);
       xfTemp = xfTemp * xRot;
       sCutout = & ( (*cutoutpara) <<xfTemp);
       cutoutpara->ref();
@@ -95,7 +95,7 @@ const GeoShape* Cutout::build()
     }
   else  
     {
-      GeoTrap *cutouttrap = new GeoTrap(thickness/2.,dead1*GeoModelKernelUnits::degree,90.*GeoModelKernelUnits::degree,
+      GeoTrap *cutouttrap = new GeoTrap(thickness/2.,dead1*Gaudi::Units::degree,90.*Gaudi::Units::degree,
 					excent,widthXs/2.,widthXl/2.,
 					atan((2.*excent+(widthXl-widthXs)/2.)/
 					     lengthY),
@@ -104,8 +104,8 @@ const GeoShape* Cutout::build()
 					     lengthY)
 					);
       // now rotate it so thickness is x-axis, width is y-axis, length z-axis:
-      GeoTrf::Transform3D xRot = GeoTrf::RotateX3D(-90.*GeoModelKernelUnits::degree)*
-	GeoTrf::RotateY3D(-90.*GeoModelKernelUnits::degree);
+      GeoTrf::Transform3D xRot = GeoTrf::RotateX3D(-90.*Gaudi::Units::degree)*
+	GeoTrf::RotateY3D(-90.*Gaudi::Units::degree);
       xfTemp = xfTemp * xRot;
       sCutout = & ( (*cutouttrap) <<xfTemp);
       cutouttrap->ref();
diff --git a/MuonSpectrometer/MuonGeoModel/src/DriftTube.cxx b/MuonSpectrometer/MuonGeoModel/src/DriftTube.cxx
index f891c49739454e3b7f6e45c4b1033062d798734e..8372afc9b2cb93fd4f4fe557e6fdc67034ca6a46 100755
--- a/MuonSpectrometer/MuonGeoModel/src/DriftTube.cxx
+++ b/MuonSpectrometer/MuonGeoModel/src/DriftTube.cxx
@@ -18,70 +18,63 @@
 
 namespace MuonGM {
 
-DriftTube::DriftTube(std::string n): DetectorElement(n),
-  length(0.) // length is set in MultiLayer.cxx
+DriftTube::DriftTube(std::string n)
+  : DetectorElement(n)
+  , length(0.) // length is set in MultiLayer.cxx
 {
-    //    std::cout<<" drift tube is in "<<name<<" "<<n<<std::endl;
-    gasMaterial="muo::ArCO2";
-    tubeMaterial="std::Aluminium";
-    plugMaterial="std::Bakelite";
-    wireMaterial="std::Aluminium";
-    MYSQL *amdb=MYSQL::GetPointer();	
-    MDT *md=(MDT *)amdb->GetTechnology(name.substr(0,5));
-    gasRadius   = md->innerRadius;
-    outerRadius = gasRadius+md->tubeWallThickness;
-    plugLength  = md->tubeEndPlugLength;
-    
-//    std::cout<<" drift tube gasR, outerR, plugL "<<gasRadius<<" "<<outerRadius<<" "<<plugLength<<std::endl;
-// 	outerRadius=1.5*GeoModelKernelUnits::cm;
-// 	gasRadius=1.46*GeoModelKernelUnits::cm;
-// 	plugLength=7*GeoModelKernelUnits::cm;
+  gasMaterial="muo::ArCO2";
+  tubeMaterial="std::Aluminium";
+  plugMaterial="std::Bakelite";
+  wireMaterial="std::Aluminium";
+  MYSQL *amdb=MYSQL::GetPointer();	
+  MDT *md=(MDT *)amdb->GetTechnology(name.substr(0,5));
+  gasRadius   = md->innerRadius;
+  outerRadius = gasRadius+md->tubeWallThickness;
+  plugLength  = md->tubeEndPlugLength;    
 }
-
+  
 GeoVPhysVol *DriftTube::build()
 {
-    const GeoTube     *stube   = new GeoTube(0.0, outerRadius, length/2.0);
-	const GeoMaterial *mtube   = matManager->getMaterial(tubeMaterial);
-	const GeoLogVol   *ltube   = new GeoLogVol("MDTDriftWall", stube, mtube);
-          GeoPhysVol  *ptube   = new GeoPhysVol(ltube);
-
-	const GeoTube     *splug   = new GeoTube(0.0, outerRadius, plugLength/2.0);
-	const GeoMaterial *mplug   = matManager->getMaterial(plugMaterial);
-	const GeoLogVol   *lplug   = new GeoLogVol("Endplug",splug, mplug);
-          GeoPhysVol  *pplug   = new GeoPhysVol(lplug);
-
-	const GeoTube     *sgas    = new GeoTube(0, gasRadius, length/2.0-plugLength);
-	const GeoMaterial *mgas    = matManager->getMaterial(gasMaterial);
-	const GeoLogVol   *lgas    = new GeoLogVol("SensitiveGas",sgas,mgas);
-	      GeoPhysVol  *pgas    = new GeoPhysVol(lgas);
-
-    GeoSerialDenominator *plugDenominator= new GeoSerialDenominator("Tube Endplug");
-	GeoTransform *ec0X = new GeoTransform(GeoTrf::TranslateZ3D(+(length-plugLength)/2));
-	GeoTransform *ec1X = new GeoTransform(GeoTrf::TranslateZ3D(-(length-plugLength)/2));
-        std::string sGasName = "SensitiveGas";
-	GeoNameTag           *gasDenominator = new GeoNameTag(sGasName);
-
-	ptube->add(plugDenominator);
-        ptube->add(ec0X);
-	ptube->add(pplug);
-	ptube->add(ec1X);
-	ptube->add(pplug);
-	ptube->add(gasDenominator);
-	ptube->add(pgas);
-
-    return ptube;
-
-
+  const GeoTube     *stube   = new GeoTube(0.0, outerRadius, length/2.0);
+  const GeoMaterial *mtube   = matManager->getMaterial(tubeMaterial);
+  const GeoLogVol   *ltube   = new GeoLogVol("MDTDriftWall", stube, mtube);
+  GeoPhysVol  *ptube   = new GeoPhysVol(ltube);
+  
+  const GeoTube     *splug   = new GeoTube(0.0, outerRadius, plugLength/2.0);
+  const GeoMaterial *mplug   = matManager->getMaterial(plugMaterial);
+  const GeoLogVol   *lplug   = new GeoLogVol("Endplug",splug, mplug);
+  GeoPhysVol  *pplug   = new GeoPhysVol(lplug);
+  
+  const GeoTube     *sgas    = new GeoTube(0, gasRadius, length/2.0-plugLength);
+  const GeoMaterial *mgas    = matManager->getMaterial(gasMaterial);
+  const GeoLogVol   *lgas    = new GeoLogVol("SensitiveGas",sgas,mgas);
+  GeoPhysVol  *pgas    = new GeoPhysVol(lgas);
+  
+  GeoSerialDenominator *plugDenominator= new GeoSerialDenominator("Tube Endplug");
+  GeoTransform *ec0X = new GeoTransform(GeoTrf::TranslateZ3D(+(length-plugLength)/2));
+  GeoTransform *ec1X = new GeoTransform(GeoTrf::TranslateZ3D(-(length-plugLength)/2));
+  std::string sGasName = "SensitiveGas";
+  GeoNameTag           *gasDenominator = new GeoNameTag(sGasName);
+  
+  ptube->add(plugDenominator);
+  ptube->add(ec0X);
+  ptube->add(pplug);
+  ptube->add(ec1X);
+  ptube->add(pplug);
+  ptube->add(gasDenominator);
+  ptube->add(pgas);
+  
+  return ptube;
 }
 
 void DriftTube::print()
 {
-	std::cout << "Drift tube " << name.c_str() << " :" << std::endl;
-	std::cout << "		Tube material 	: " << tubeMaterial.c_str() << std::endl;
-	std::cout << "		Radius		: " << outerRadius << std::endl;
-	std::cout << "		Length		: " << length;
-	std::cout << "		Thickness	: " << outerRadius-gasRadius << " mm" << std::endl;
-	std::cout << "		Gas material	: " << gasMaterial.c_str() << std::endl;
-	std::cout << "		EP length	: " << plugLength << std::endl;
+  std::cout << "Drift tube " << name.c_str() << " :" << std::endl;
+  std::cout << "		Tube material 	: " << tubeMaterial.c_str() << std::endl;
+  std::cout << "		Radius		: " << outerRadius << std::endl;
+  std::cout << "		Length		: " << length;
+  std::cout << "		Thickness	: " << outerRadius-gasRadius << " mm" << std::endl;
+  std::cout << "		Gas material	: " << gasMaterial.c_str() << std::endl;
+  std::cout << "		EP length	: " << plugLength << std::endl;
 }
 } // namespace MuonGM
diff --git a/MuonSpectrometer/MuonGeoModel/src/MultiLayer.cxx b/MuonSpectrometer/MuonGeoModel/src/MultiLayer.cxx
index d928e6b937babb54671a015c44b9dde4e65ff904..f627916c10901c5aa92f7b1db79108388cc7785a 100755
--- a/MuonSpectrometer/MuonGeoModel/src/MultiLayer.cxx
+++ b/MuonSpectrometer/MuonGeoModel/src/MultiLayer.cxx
@@ -20,7 +20,6 @@
 #include "GeoModelKernel/GeoIdentifierTag.h"
 #include "GeoModelKernel/GeoSerialIdentifier.h"
 #include "GeoModelKernel/GeoDefinitions.h"
-#include "GeoModelKernel/Units.h"
 #include "GeoGenericFunctions/Variable.h"
 // for cutouts
 #include "GeoModelKernel/GeoShape.h"
@@ -28,6 +27,7 @@
 #include "GeoModelKernel/GeoShapeUnion.h"
 #include "GeoModelKernel/GeoShapeSubtraction.h"
 #include "GeoModelKernel/GeoTube.h"
+#include "GaudiKernel/SystemOfUnits.h"
 
 #include <vector>
 #include <cassert>
@@ -88,11 +88,11 @@ GeoFullPhysVol* MultiLayer::build()
 
     if (foamthicknessup > foamthicknesslow) {
       foamthicknesslow = 0.;
-      if (fabs(foamthicknessup - 15*GeoModelKernelUnits::mm) < 0.1) foamthicknessup = 15*GeoModelKernelUnits::mm;
-      else if (fabs(foamthicknessup - 30.75*GeoModelKernelUnits::mm) < 0.1) foamthicknessup = 30.75*GeoModelKernelUnits::mm;
-      else if (fabs(foamthicknessup - 30.00*GeoModelKernelUnits::mm) < 0.1) foamthicknessup = 30.00*GeoModelKernelUnits::mm;
-      else if (fabs(foamthicknessup - 10.00*GeoModelKernelUnits::mm) < 0.1
-               && logVolName.find("BMG") != std::string::npos ) foamthicknessup = 10.00*GeoModelKernelUnits::mm;
+      if (fabs(foamthicknessup - 15*Gaudi::Units::mm) < 0.1) foamthicknessup = 15*Gaudi::Units::mm;
+      else if (fabs(foamthicknessup - 30.75*Gaudi::Units::mm) < 0.1) foamthicknessup = 30.75*Gaudi::Units::mm;
+      else if (fabs(foamthicknessup - 30.00*Gaudi::Units::mm) < 0.1) foamthicknessup = 30.00*Gaudi::Units::mm;
+      else if (fabs(foamthicknessup - 10.00*Gaudi::Units::mm) < 0.1
+               && logVolName.find("BMG") != std::string::npos ) foamthicknessup = 10.00*Gaudi::Units::mm;
       else if ( logVolName == "BME1MDT09" || logVolName == "BME2MDT09" ) { //@@
 	foamthicknesslow = 0.;
 	foamthicknessup  = 0.;
@@ -103,11 +103,11 @@ GeoFullPhysVol* MultiLayer::build()
 
     } else {
       foamthicknessup = 0.;
-      if (fabs(foamthicknesslow - 15*GeoModelKernelUnits::mm) < 0.1) foamthicknesslow = 15*GeoModelKernelUnits::mm;
-      else if (fabs(foamthicknesslow - 30.75*GeoModelKernelUnits::mm) < 0.1) foamthicknesslow = 30.75*GeoModelKernelUnits::mm;
-      else if (fabs(foamthicknesslow - 30.00*GeoModelKernelUnits::mm) < 0.1) foamthicknesslow = 30.00*GeoModelKernelUnits::mm;
-      else if (fabs(foamthicknesslow - 10.00*GeoModelKernelUnits::mm) < 0.1
-               && logVolName.find("BMG") != std::string::npos ) foamthicknesslow = 10.00*GeoModelKernelUnits::mm;
+      if (fabs(foamthicknesslow - 15*Gaudi::Units::mm) < 0.1) foamthicknesslow = 15*Gaudi::Units::mm;
+      else if (fabs(foamthicknesslow - 30.75*Gaudi::Units::mm) < 0.1) foamthicknesslow = 30.75*Gaudi::Units::mm;
+      else if (fabs(foamthicknesslow - 30.00*Gaudi::Units::mm) < 0.1) foamthicknesslow = 30.00*Gaudi::Units::mm;
+      else if (fabs(foamthicknesslow - 10.00*Gaudi::Units::mm) < 0.1
+               && logVolName.find("BMG") != std::string::npos ) foamthicknesslow = 10.00*Gaudi::Units::mm;
       else if ( logVolName == "BME1MDT09" || logVolName == "BME2MDT09" ) { //@@
 	foamthicknesslow = 0.;
 	foamthicknessup  = 0.;
@@ -239,23 +239,23 @@ GeoFullPhysVol* MultiLayer::build()
     const GeoShape* stube = NULL;
     double tL = longWidth/2.0 - (tubePitch/2.)*TrdDwoverL;
     stube = new GeoTube(0.0, tubePitch/2., tL);
-    stube = & ( (*stube) << GeoTrf::RotateX3D(90.*GeoModelKernelUnits::deg) );
+    stube = & ( (*stube) << GeoTrf::RotateX3D(90.*Gaudi::Units::deg) );
     const GeoShape* stubewithcut = NULL;
     if (cutoutNsteps > 1) {
       double toptubelength = cutoutTubeLength[cutoutNsteps-1];
       if (cutoutFullLength[cutoutNsteps-1]) toptubelength = longWidth;
       stubewithcut = new GeoTube(0.0, tubePitch/2., toptubelength/2.0);
-      stubewithcut = & ( (*stubewithcut) << GeoTrf::RotateX3D(90.*GeoModelKernelUnits::deg) );
+      stubewithcut = & ( (*stubewithcut) << GeoTrf::RotateX3D(90.*Gaudi::Units::deg) );
     }
 
     GeoShape* sbox = new GeoTrd(mdtthickness, mdtthickness, longWidth, 
                                 longWidth, tubePitch/2.);
     GeoShape* sboxf = new GeoTrd(mdtthickness, mdtthickness, longWidth, 
-                                 longWidth, tubePitch/4.+1*GeoModelKernelUnits::mm);
+                                 longWidth, tubePitch/4.+1*Gaudi::Units::mm);
     slay = &(slay->subtract( (*sbox)<<GeoTrf::Translate3D(0.,0.,length/2.)));
 
     for (int i = 0; i < nrOfLayers; i++) {
-      if (xx[i] > tubePitch/2. + 10.*GeoModelKernelUnits::mm) {
+      if (xx[i] > tubePitch/2. + 10.*Gaudi::Units::mm) {
         // subtract tube at the start
         if (verbose_multilayer) std::cout << " Cutting tube at xx = " << yy[i]
                                           << " z = " << -length/2. << std::endl;
@@ -533,7 +533,7 @@ GeoFullPhysVol* MultiLayer::build()
             lstart = loffset - length/2. + xx[i];
             GeoGenfun::Variable K;
             GeoGenfun::GENFUNCTION f = tubePitch*K + lstart;
-            TRANSFUNCTION t = GeoTrf::TranslateY3D(0.)*GeoTrf::RotateX3D(90*GeoModelKernelUnits::deg)*
+            TRANSFUNCTION t = GeoTrf::TranslateY3D(0.)*GeoTrf::RotateX3D(90*Gaudi::Units::deg)*
                               GeoTrf::TranslateX3D(tstart)*Pow(GeoTrf::TranslateY3D(1.0),f);
             GeoSerialTransformer* s = new GeoSerialTransformer(tV,&t,nt);
             play->add(new GeoSerialIdentifier(100*(i+1)+nttot + 1));
@@ -595,7 +595,7 @@ GeoFullPhysVol* MultiLayer::build()
             lstart = loffset - length/2. + xx[i];
             GeoGenfun::Variable K;
             GeoGenfun::GENFUNCTION f = tubePitch*K + lstart;
-            TRANSFUNCTION t = GeoTrf::TranslateY3D(dy)*GeoTrf::RotateX3D(90*GeoModelKernelUnits::deg)*
+            TRANSFUNCTION t = GeoTrf::TranslateY3D(dy)*GeoTrf::RotateX3D(90*Gaudi::Units::deg)*
                               GeoTrf::TranslateX3D(tstart)*Pow(GeoTrf::TranslateY3D(1.0),f);
             GeoSerialTransformer* s = new GeoSerialTransformer(tV,&t,nt);
             play->add(new GeoSerialIdentifier(100*(i+1)+nttot + 1));
@@ -620,7 +620,7 @@ GeoFullPhysVol* MultiLayer::build()
 //                  << std::endl;
         GeoGenfun::Variable K;
         GeoGenfun::GENFUNCTION f = tubePitch*K + lstart;
-        TRANSFUNCTION t = GeoTrf::RotateX3D(90*GeoModelKernelUnits::deg)*GeoTrf::TranslateX3D(tstart)*
+        TRANSFUNCTION t = GeoTrf::RotateX3D(90*Gaudi::Units::deg)*GeoTrf::TranslateX3D(tstart)*
                           Pow(GeoTrf::TranslateY3D(1.0),f);
         GeoVPhysVol* tV = tubeVector[0];	
         GeoSerialTransformer* s = new GeoSerialTransformer(tV,&t,nrOfTubes);
@@ -639,7 +639,7 @@ GeoFullPhysVol* MultiLayer::build()
           lstart = loffset - length/2. + xx[i]; 
           GeoGenfun::Variable K;
           GeoGenfun::GENFUNCTION f = tubePitch*K + lstart;
-          TRANSFUNCTION t = GeoTrf::RotateX3D(90*GeoModelKernelUnits::deg)*GeoTrf::TranslateX3D(tstart)*
+          TRANSFUNCTION t = GeoTrf::RotateX3D(90*Gaudi::Units::deg)*GeoTrf::TranslateX3D(tstart)*
                             Pow(GeoTrf::TranslateY3D(1.0),f);
           GeoSerialTransformer* s = new GeoSerialTransformer(tV,&t,nrTubesPerStep);
           play->add(new GeoSerialIdentifier(100*(i+1)+j*nrTubesPerStep + 1));
diff --git a/MuonSpectrometer/MuonGeoModel/src/MuonChamber.cxx b/MuonSpectrometer/MuonGeoModel/src/MuonChamber.cxx
index 9b7ed80bb2653846b597370e4879f3cff92efa32..76c7bfe10c2f4855fd41d3727f48996842e0f645 100755
--- a/MuonSpectrometer/MuonGeoModel/src/MuonChamber.cxx
+++ b/MuonSpectrometer/MuonGeoModel/src/MuonChamber.cxx
@@ -64,7 +64,7 @@
 #include "GeoModelKernel/GeoShapeIntersection.h"   
 #include "GeoModelKernel/GeoIdentifierTag.h"
 #include "GeoModelKernel/GeoDefinitions.h"
-#include "GeoModelKernel/Units.h"
+#include "GaudiKernel/SystemOfUnits.h"
 #include <vector>
 #include <fstream>
 #include <iomanip>
@@ -227,10 +227,10 @@ MuonChamber::build(MuonDetectorManager* manager, int zi,
       GeoShape* box = new GeoBox((totthick+2.)/2., (longWidth+2.)/2., halfpitch);
       box->ref();
       const GeoShape* frontcyl = new GeoTube(0.0, halfpitch+0.001, longWidth/2.);
-      frontcyl = &( (*frontcyl) << GeoTrf::RotateX3D(90.*GeoModelKernelUnits::deg) );
+      frontcyl = &( (*frontcyl) << GeoTrf::RotateX3D(90.*Gaudi::Units::deg) );
       frontcyl->ref();
       const GeoShape* backcyl = new GeoTube(0.0, halfpitch-0.001, (longWidth+2.)/2.);
-      backcyl = &( (*backcyl) << GeoTrf::RotateX3D(90.*GeoModelKernelUnits::deg) );
+      backcyl = &( (*backcyl) << GeoTrf::RotateX3D(90.*Gaudi::Units::deg) );
       backcyl->ref();
 
       if (index > 0) {
@@ -256,7 +256,7 @@ MuonChamber::build(MuonDetectorManager* manager, int zi,
         }
       }
       if (stname != "EIL") {
-        if (zi < 0 && !is_mirrored) strd = &( (*strd) << GeoTrf::RotateX3D(180.*GeoModelKernelUnits::deg) );
+        if (zi < 0 && !is_mirrored) strd = &( (*strd) << GeoTrf::RotateX3D(180.*Gaudi::Units::deg) );
       }
 
       box->unref();
@@ -319,21 +319,21 @@ MuonChamber::build(MuonDetectorManager* manager, int zi,
             //  of the cutouts wrt mother volume:
             if ( fabs(cut->dx-600.7)<0.1 )
             {
-                cut->dx      = cut->dx + 10.*GeoModelKernelUnits::mm;
-                cut->widthXs = cut->widthXs + 20.*GeoModelKernelUnits::mm;
-                cut->widthXl = cut->widthXl + 20.*GeoModelKernelUnits::mm;
+                cut->dx      = cut->dx + 10.*Gaudi::Units::mm;
+                cut->widthXs = cut->widthXs + 20.*Gaudi::Units::mm;
+                cut->widthXl = cut->widthXl + 20.*Gaudi::Units::mm;
                 //std::cout<<" redefining par.s for BOG1 cutouts "
                 //<<std::endl;
             }
             if ( fabs(cut->dx+600.7)<0.1 )
             {
-                cut->dx      = cut->dx - 10.*GeoModelKernelUnits::mm;
-                cut->widthXs = cut->widthXs + 20.*GeoModelKernelUnits::mm;
-                cut->widthXl = cut->widthXl + 20.*GeoModelKernelUnits::mm;
+                cut->dx      = cut->dx - 10.*Gaudi::Units::mm;
+                cut->widthXs = cut->widthXs + 20.*Gaudi::Units::mm;
+                cut->widthXl = cut->widthXl + 20.*Gaudi::Units::mm;
             }
             if (fabs(cut->lengthY-180.2)<0.001)
             {
-                cut->lengthY = cut->lengthY+(0.010)*GeoModelKernelUnits::mm;
+                cut->lengthY = cut->lengthY+(0.010)*Gaudi::Units::mm;
                 //imt	    std::cout<<"Redefining "<<stName<<" cut lengthY to "
                 //imt		     <<cut->lengthY
                 //imt		     <<std::endl;
@@ -559,7 +559,7 @@ MuonChamber::build(MuonDetectorManager* manager, int zi,
         cut->dx = tempdx;
         cut->dy = tempdy;
 
-	if (fabs(cut->dead1) > 1. && techname=="MDT03") cut->dy = cut->dy+15.0*cos(cut->dead1*GeoModelKernelUnits::deg);
+	if (fabs(cut->dead1) > 1. && techname=="MDT03") cut->dy = cut->dy+15.0*cos(cut->dead1*Gaudi::Units::deg);
 	// should compensate for the dy position defined in amdb at the bottom of the foam in ML 1 of EMS1,3 and BOS 6
 	// can be applied only for layout >=r.04.04 in rel 15.6.X.Y due to the frozen Tier0 policy
 
@@ -609,7 +609,7 @@ MuonChamber::build(MuonDetectorManager* manager, int zi,
         if (stName.substr(0,3) == "BOS" && zi == -6 && type == "MDT") {
           cut->dy = c->dy - cut->dy - cut->lengthY - halfpitch;
 	  cut->dead1 = 30.; // why this is not 30. or -30. already ?????
-	  if (techname=="MDT03") cut->dy = cut->dy + 30.0; // *cos(cut->dead1*GeoModelKernelUnits::deg);
+	  if (techname=="MDT03") cut->dy = cut->dy + 30.0; // *cos(cut->dead1*Gaudi::Units::deg);
 	  if (verbose) log <<MSG::VERBOSE <<"Cut dead1 for BOS 6 on C side is "<< cut->dead1<<endmsg;
         }
 
@@ -623,7 +623,7 @@ MuonChamber::build(MuonDetectorManager* manager, int zi,
           // reverse the position (x amdb) of the cutout if the m_station is mirrored
           Cutout* cutmirr = new Cutout(*cut);
           cutmirr->dx = - cutmirr->dx;
-          // this way, after the rotation by 180 GeoModelKernelUnits::deg, the cut will be at the same global phi
+          // this way, after the rotation by 180 Gaudi::Units::deg, the cut will be at the same global phi
           // it has for the m_station at z>0
           vcutdef.push_back(cutmirr);
           vcutdef_todel.push_back(cutmirr);
@@ -689,19 +689,19 @@ MuonChamber::build(MuonDetectorManager* manager, int zi,
       htcomponent = GeoTrf::TranslateX3D(ypos)*GeoTrf::TranslateZ3D(zpos)*GeoTrf::TranslateY3D(xpos);
       if (zi < 0 && !is_mirrored && stName[0] == 'B') { 
         // this (rotation +  shift of halfpitch) will mirror the tube structure w.r.t. the chamber at z>0
-         htcomponent = htcomponent*GeoTrf::RotateX3D(180.*GeoModelKernelUnits::deg);
+         htcomponent = htcomponent*GeoTrf::RotateX3D(180.*Gaudi::Units::deg);
          htcomponent = htcomponent*GeoTrf::TranslateZ3D(halfpitch);
       }
           
       // ss - 24-05-2006 I don't really understand if this is needed at all
       //      it was introduced by Isabel T.
       if (zi < 0 && stName.substr(0,3) == "BOG" && is_mirrored) {
-        //	      htcomponent = htcomponent*GeoTrf::RotateX3D(180.*GeoModelKernelUnits::deg);
+        //	      htcomponent = htcomponent*GeoTrf::RotateX3D(180.*Gaudi::Units::deg);
         //      tubes OK but chambers wrong
-        //	      htcomponent = GeoTrf::RotateX3D(180.*GeoModelKernelUnits::deg)*htcomponent;
+        //	      htcomponent = GeoTrf::RotateX3D(180.*Gaudi::Units::deg)*htcomponent;
         //      chambers OK but tubes wrong
-        htcomponent = GeoTrf::RotateX3D(180.*GeoModelKernelUnits::deg)*htcomponent*
-                      GeoTrf::RotateX3D(180.*GeoModelKernelUnits::deg);  // turn chambers but go back for tubes
+        htcomponent = GeoTrf::RotateX3D(180.*Gaudi::Units::deg)*htcomponent*
+                      GeoTrf::RotateX3D(180.*Gaudi::Units::deg);  // turn chambers but go back for tubes
       } // ss - 24-05-2006 I don't really understand if this is needed at all
           
       xfaligncomponent = new GeoAlignableTransform(htcomponent);
@@ -926,7 +926,7 @@ MuonChamber::build(MuonDetectorManager* manager, int zi,
                       GeoTrf::TranslateY3D(xpos)*GeoTrf::TranslateZ3D(zpos);
         if (rp->iswap == -1) // this is like amdb iswap 
         {
-          htcomponent = htcomponent*GeoTrf::RotateY3D(180*GeoModelKernelUnits::deg);
+          htcomponent = htcomponent*GeoTrf::RotateY3D(180*Gaudi::Units::deg);
         }
         xfaligncomponent = new GeoAlignableTransform(htcomponent);
         //xfrpccomponent.push_back(xfcomponent);
@@ -986,7 +986,7 @@ MuonChamber::build(MuonDetectorManager* manager, int zi,
       if (is_mirrored) xpos = -xpos;
       htcomponent = GeoTrf::TranslateX3D(ypos)*GeoTrf::TranslateY3D(xpos)*GeoTrf::TranslateZ3D(zpos);
       //if (stname == "BMS" && (zi == -2 || zi == -4) && c->name == "DED03") 
-      //   htcomponent = htcomponent*GeoTrf::RotateY3D(180*GeoModelKernelUnits::deg);
+      //   htcomponent = htcomponent*GeoTrf::RotateY3D(180*Gaudi::Units::deg);
       xfcomponent = new GeoTransform(htcomponent);
 
       bool dedCutoutFlag = (stname == "BOS" && std::abs(zi) == 6) ||
@@ -1450,25 +1450,25 @@ MuonChamber::build(MuonDetectorManager* manager, int zi,
           if    (zi <= 0 && !is_mirrored) {
             // the special cases 
             doubletZ = 1;
-            if (zpos<-zdivision*GeoModelKernelUnits::mm)    doubletZ=2;
-            if (fabs(xpos) > 100.*GeoModelKernelUnits::mm && ndbz[doubletR-1] > 2) {
+            if (zpos<-zdivision*Gaudi::Units::mm)    doubletZ=2;
+            if (fabs(xpos) > 100.*Gaudi::Units::mm && ndbz[doubletR-1] > 2) {
               doubletZ = 3;
               nfields++;
             }
-            if (fabs(xpos) > 100.*GeoModelKernelUnits::mm ) ndbz[doubletR-1]--;
+            if (fabs(xpos) > 100.*Gaudi::Units::mm ) ndbz[doubletR-1]--;
           } else {
             doubletZ = 1;
-            if (zpos > zdivision*GeoModelKernelUnits::mm) doubletZ=2;
-            if (fabs(xpos) > 100.*GeoModelKernelUnits::mm && ndbz[doubletR-1] > 2) {
+            if (zpos > zdivision*Gaudi::Units::mm) doubletZ=2;
+            if (fabs(xpos) > 100.*Gaudi::Units::mm && ndbz[doubletR-1] > 2) {
               doubletZ = 3;
               nfields++;
             }
-            if (fabs(xpos) > 100.*GeoModelKernelUnits::mm ) ndbz[doubletR-1]--;
+            if (fabs(xpos) > 100.*Gaudi::Units::mm ) ndbz[doubletR-1]--;
           }
 
           int dbphi = 1;
 	  //std::cout<<stName<<" ----------------------------------- dbphi = "<<dbphi<<std::endl;
-          if (xpos > 400.*GeoModelKernelUnits::mm) dbphi = 2; // this special patch is needed for BMS in the ribs where xpos is ~950mm; the theshold to 100mm (too low) caused a bug
+          if (xpos > 400.*Gaudi::Units::mm) dbphi = 2; // this special patch is needed for BMS in the ribs where xpos is ~950mm; the theshold to 100mm (too low) caused a bug
 	  // in BOG at eta +/-4 and stationEta 7 (not 6) ==>> 28 Jan 2016 raising the threshold to 400.mm 
           // doublet phi not aware of pos. in space !!!
 	  //std::cout<<" dbphi reset to  "<<dbphi<<" due to xpos "<< xpos <<" >10cm "<<std::endl;
diff --git a/MuonSpectrometer/MuonGeoModel/src/MuonDetectorFactory001.cxx b/MuonSpectrometer/MuonGeoModel/src/MuonDetectorFactory001.cxx
index 5748ed1644d96640f6d5e82a90ea0e33b60697c0..1831ad3eb060b7c1615865d9f578698d2a902963 100755
--- a/MuonSpectrometer/MuonGeoModel/src/MuonDetectorFactory001.cxx
+++ b/MuonSpectrometer/MuonGeoModel/src/MuonDetectorFactory001.cxx
@@ -52,11 +52,11 @@
 #include "GeoModelKernel/GeoIdentifierTag.h"
 #include "GeoModelKernel/GeoPerfUtils.h"
 #include "GeoModelKernel/GeoDefinitions.h"
-#include "GeoModelKernel/Units.h"
 #include "GeoPrimitives/CLHEPtoEigenConverter.h"
 #include "GeoModelInterfaces/StoredMaterialManager.h"
 
 #include "StoreGate/StoreGateSvc.h"
+#include "GaudiKernel/SystemOfUnits.h"
 
 #include "GeoGenericFunctions/Variable.h"
 
@@ -95,15 +95,15 @@ namespace MuonGM {
   {
     MsgStream log(Athena::getMessageSvc(), "MuonGeoModel");
     m_muon = new MuonSystemDescription( "MuonSystem" );
-    m_muon->barrelInnerRadius =  4.30*GeoModelKernelUnits::m;
-    m_muon->innerRadius       =  0.07*GeoModelKernelUnits::m;
-    m_muon->outerRadius       = 13.00*GeoModelKernelUnits::m;
-    m_muon->endcapFrontFace   =  6.74*GeoModelKernelUnits::m;
-    m_muon->length            = 22.03*GeoModelKernelUnits::m;
-    m_muon->barreLength       =  6.53*GeoModelKernelUnits::m; 
-    m_muon->barrelInterRadius =  3.83*GeoModelKernelUnits::m;
-    m_muon->extraZ = 12.9*GeoModelKernelUnits::m;
-    m_muon->extraR = 12.5*GeoModelKernelUnits::m;
+    m_muon->barrelInnerRadius =  4.30*Gaudi::Units::m;
+    m_muon->innerRadius       =  0.07*Gaudi::Units::m;
+    m_muon->outerRadius       = 13.00*Gaudi::Units::m;
+    m_muon->endcapFrontFace   =  6.74*Gaudi::Units::m;
+    m_muon->length            = 22.03*Gaudi::Units::m;
+    m_muon->barreLength       =  6.53*Gaudi::Units::m; 
+    m_muon->barrelInterRadius =  3.83*Gaudi::Units::m;
+    m_muon->extraZ = 12.9*Gaudi::Units::m;
+    m_muon->extraR = 12.5*Gaudi::Units::m;
 
     m_selectedStations = std::vector<std::string>(0);
     m_selectedStEta    = std::vector<int>(0);
@@ -470,7 +470,7 @@ namespace MuonGM {
   
     const GeoMaterial* m4 = theMaterialManager->getMaterial( "std::Air" );
     GeoLogVol*  l4;
-    GeoPcon* c4 = new GeoPcon( 0, 360*GeoModelKernelUnits::deg );
+    GeoPcon* c4 = new GeoPcon( 0, 360*Gaudi::Units::deg );
     //--- --- --- CREATE ENVELOPE --- --- ---
     // First try to get data from the GeomDB
     IRDBRecordset_ptr muonSysRec = m_pRDBAccess->getRecordsetPtr("MuonSystem",OracleTag,OracleNode);
@@ -552,7 +552,7 @@ namespace MuonGM {
   
     // Cannot (yet) cope with this:
     // G4UserLimits *ul=new G4UserLimits;
-    // ul->SetMaxAllowedStep(5*GeoModelKernelUnits::cm);
+    // ul->SetMaxAllowedStep(5*Gaudi::Units::cm);
     // lv->GetLogicalVolume()->SetUserLimits(ul);
   
     m_manager->addTreeTop(p4); // This is the top!
diff --git a/MuonSpectrometer/MuonGeoModel/src/RDBReaderAtlas.cxx b/MuonSpectrometer/MuonGeoModel/src/RDBReaderAtlas.cxx
index 4597fc40b033ac35db5485e8337f1eb7dfd80560..cf2325b57b1628ece2e3e6bcb3a2a8192a840162 100755
--- a/MuonSpectrometer/MuonGeoModel/src/RDBReaderAtlas.cxx
+++ b/MuonSpectrometer/MuonGeoModel/src/RDBReaderAtlas.cxx
@@ -13,8 +13,7 @@
 #include "RDBAccessSvc/IRDBRecordset.h"
 #include "RDBAccessSvc/IRDBQuery.h"
 #include "MuonReadoutGeometry/TgcReadoutParams.h"
-#include "GeoModelKernel/Units.h"
-
+#include "GaudiKernel/SystemOfUnits.h"
 
 #include "MuonGeoModel/TGC_Technology.h"
 
@@ -421,7 +420,7 @@ void RDBReaderAtlas::ProcessTGCreadout () {
 
     
         int version = (int) (*ggsd)[0]->getDouble("VERS");
-        float wirespacing = (*ggsd)[0]->getDouble("WIRESP")*GeoModelKernelUnits::cm;
+        float wirespacing = (*ggsd)[0]->getDouble("WIRESP")*Gaudi::Units::cm;
         log<<MSG::INFO
            <<" ProcessTGCreadout - version "<<version<<" wirespacing "<<wirespacing<<endmsg;
     
@@ -519,7 +518,7 @@ void RDBReaderAtlas::ProcessTGCreadout () {
         IRDBRecordset_ptr ggln = m_pRDBAccess->getRecordsetPtr("GGLN",m_geoTag,m_geoNode);
 
         int version = (int) (*ggln)[0]->getInt("VERS");
-        float wirespacing = (*ggln)[0]->getFloat("WIRESP")*GeoModelKernelUnits::mm;
+        float wirespacing = (*ggln)[0]->getFloat("WIRESP")*Gaudi::Units::mm;
         log<<MSG::INFO
            <<" ProcessTGCreadout - version "<<version<<" wirespacing "<<wirespacing<<endmsg;
 
@@ -618,11 +617,11 @@ void RDBReaderAtlas::ProcessTGCreadout () {
 	    tgc->offsetWireSupport[0] = (*ggln)[ich]->getFloat("SP1WI");
 	    tgc->offsetWireSupport[1] = (*ggln)[ich]->getFloat("SP2WI");
 	    tgc->offsetWireSupport[2] = (*ggln)[ich]->getFloat("SP3WI");
-	    tgc->angleTilt            = (*ggln)[ich]->getFloat("TILT")*GeoModelKernelUnits::deg;
+	    tgc->angleTilt            = (*ggln)[ich]->getFloat("TILT")*Gaudi::Units::deg;
 	    tgc->radiusButton         = (*ggln)[ich]->getFloat("SP1BU");
 	    tgc->pitchButton[0]       = (*ggln)[ich]->getFloat("SP2BU");
 	    tgc->pitchButton[1]       = (*ggln)[ich]->getFloat("SP3BU");
-	    tgc->angleButton          = (*ggln)[ich]->getFloat("SP4BU")*GeoModelKernelUnits::deg;
+	    tgc->angleButton          = (*ggln)[ich]->getFloat("SP4BU")*Gaudi::Units::deg;
 
         }
     }
diff --git a/MuonSpectrometer/MuonGeoModel/src/Rpc.cxx b/MuonSpectrometer/MuonGeoModel/src/Rpc.cxx
index d447b0c9037697ebabaa095760eba02aa8bcf71b..050fe4aa697dd69f7a7d4be18f72b284fba55646 100755
--- a/MuonSpectrometer/MuonGeoModel/src/Rpc.cxx
+++ b/MuonSpectrometer/MuonGeoModel/src/Rpc.cxx
@@ -20,7 +20,7 @@
 #include "GeoModelKernel/GeoShapeSubtraction.h"
 #include "GeoModelKernel/GeoShapeIntersection.h"
 #include "GeoModelKernel/GeoDefinitions.h"
-#include "GeoModelKernel/Units.h"
+#include "GaudiKernel/SystemOfUnits.h"
 
 #include <iomanip>
 #include <cassert>
@@ -281,7 +281,7 @@ GeoFullPhysVol* Rpc::build(int minimalgeo, int cutoutson,
      GeoTransform* tugg = new GeoTransform(GeoTrf::TranslateX3D(newpos) );
      if (RPCprint) std::cout<< " Rpc:: put upper RPC layer at " << newpos
                             << " from centre " << std::endl;
-     GeoTransform* rugg = new GeoTransform(GeoTrf::RotateY3D(180*GeoModelKernelUnits::deg) );
+     GeoTransform* rugg = new GeoTransform(GeoTrf::RotateY3D(180*Gaudi::Units::deg) );
      if (!skip_rpc) {
        prpc->add(new GeoIdentifierTag(2));
        prpc->add(tugg);
diff --git a/MuonSpectrometer/MuonGeoModel/src/Spacer.cxx b/MuonSpectrometer/MuonGeoModel/src/Spacer.cxx
index df585ef779642a22971f88b84a4eafcff547227e..7de91280b119321d332713005d88a242e48c35ba 100755
--- a/MuonSpectrometer/MuonGeoModel/src/Spacer.cxx
+++ b/MuonSpectrometer/MuonGeoModel/src/Spacer.cxx
@@ -20,7 +20,7 @@
 #include "GeoModelKernel/GeoShapeShift.h"
 #include "GeoModelKernel/GeoSerialIdentifier.h"
 #include "GeoModelKernel/GeoDefinitions.h"
-#include "GeoModelKernel/Units.h"
+#include "GaudiKernel/SystemOfUnits.h"
 // for cutouts:
 #include "GeoModelKernel/GeoShapeSubtraction.h"
 
@@ -135,7 +135,7 @@ GeoVPhysVol * Spacer::build(int /*cutoutson*/)
 
     for (int k1 = 0; k1 < 2; k1++){
       for (int k = 0; k < 2; k++){
-        GeoTransform* ttube = new GeoTransform(GeoTrf::RotateX3D(-90*GeoModelKernelUnits::deg)* GeoTrf::Translate3D(
+        GeoTransform* ttube = new GeoTransform(GeoTrf::RotateX3D(-90*Gaudi::Units::deg)* GeoTrf::Translate3D(
                                                0.,
                                                -(vtubl+tckibeam)/2.-(k-1)*(vtubl+tckibeam),
                                                -length/4.-(k1-1)*length/2));
diff --git a/MuonSpectrometer/MuonGeoModel/src/Station.cxx b/MuonSpectrometer/MuonGeoModel/src/Station.cxx
index d15abe2472823c54b4afa8bf71b019e42d705be9..309c8e8bd25ee0d299c48d33f1c1d326aaf7c766 100755
--- a/MuonSpectrometer/MuonGeoModel/src/Station.cxx
+++ b/MuonSpectrometer/MuonGeoModel/src/Station.cxx
@@ -8,8 +8,8 @@
 #include "MuonGeoModel/StandardComponent.h"
 #include "MuonGeoModel/SupComponent.h"
 #include "MuonGeoModel/TgcComponent.h"
-#include "GeoModelKernel/Units.h"
 #include "GaudiKernel/MsgStream.h"
+#include "GaudiKernel/SystemOfUnits.h"
 #include "AthenaKernel/getMessageSvc.h"
 #include <iostream>
 #include <algorithm>
@@ -687,7 +687,7 @@ GeoTrf::Transform3D Station::native_to_tsz_frame( const Position & p ) const {
     {
         if (m_name[0]=='B' )
         {
-            mirrsym = GeoTrf::RotateX3D(180.*GeoModelKernelUnits::deg);
+            mirrsym = GeoTrf::RotateX3D(180.*Gaudi::Units::deg);
         }
     }
 
@@ -732,10 +732,10 @@ GeoTrf::Transform3D Station::native_to_tsz_frame( const Position & p ) const {
     }
 
     // // define the rotations by alpha, beta, gamma
-    // GeoTrf::Rotate3D ralpha = GeoTrf::RotateX3D(p.alpha*GeoModelKernelUnits::deg);
-    // GeoTrf::Rotate3D rbeta  = GeoTrf::RotateZ3D(p.beta*GeoModelKernelUnits::deg);
+    // GeoTrf::Rotate3D ralpha = GeoTrf::RotateX3D(p.alpha*Gaudi::Units::deg);
+    // GeoTrf::Rotate3D rbeta  = GeoTrf::RotateZ3D(p.beta*Gaudi::Units::deg);
     // GeoTrf::Rotate3D rgamma;
-    // rgamma = GeoTrf::RotateY3D(p.gamma*GeoModelKernelUnits::deg);
+    // rgamma = GeoTrf::RotateY3D(p.gamma*Gaudi::Units::deg);
     // log<<MSG::VERBOSE<<" gamma is not changing sign - original "<<p.gamma<<" new one "<<p.gamma<<endmsg;
     // log<<MSG::VERBOSE<<" alpha / beta "<<p.alpha<<" "<<p.beta<<endmsg;
 
@@ -768,10 +768,10 @@ GeoTrf::Transform3D Station::tsz_to_global_frame( const Position & p ) const {
       }
     else
         RAD=p.radius;
-    vec.x() = RAD*cos(p.phi*GeoModelKernelUnits::deg);
-    vec.x() = vec.x()-p.shift*sin((p.phi)*GeoModelKernelUnits::deg);
-    vec.y() = RAD*sin(p.phi*GeoModelKernelUnits::deg);
-    vec.y() = vec.y()+p.shift*cos((p.phi)*GeoModelKernelUnits::deg);
+    vec.x() = RAD*cos(p.phi*Gaudi::Units::deg);
+    vec.x() = vec.x()-p.shift*sin((p.phi)*Gaudi::Units::deg);
+    vec.y() = RAD*sin(p.phi*Gaudi::Units::deg);
+    vec.y() = vec.y()+p.shift*cos((p.phi)*Gaudi::Units::deg);
     // 
     if (p.isMirrored)
         if ( (p.isBarrelLike) || (m_name[0]=='B') )
@@ -805,9 +805,9 @@ GeoTrf::Transform3D Station::tsz_to_global_frame( const Position & p ) const {
 
     /////// NEWEWEWWEWEWEWEWEWEWEWEWEW
     // // define the rotations by alpha, beta, gamma
-    GeoTrf::RotateX3D ralpha(p.alpha*GeoModelKernelUnits::deg);
-    GeoTrf::RotateZ3D rbeta(p.beta*GeoModelKernelUnits::deg);
-    GeoTrf::RotateY3D rgamma(p.gamma*GeoModelKernelUnits::deg);
+    GeoTrf::RotateX3D ralpha(p.alpha*Gaudi::Units::deg);
+    GeoTrf::RotateZ3D rbeta(p.beta*Gaudi::Units::deg);
+    GeoTrf::RotateY3D rgamma(p.gamma*Gaudi::Units::deg);
     if (pLvl) {
       log<<MSG::VERBOSE<<" gamma is not changing sign - original "<<p.gamma<<" new one "<<p.gamma<<endmsg;
       log<<MSG::VERBOSE<<" alpha / beta "<<p.alpha<<" "<<p.beta<<endmsg;
@@ -824,29 +824,29 @@ GeoTrf::Transform3D Station::tsz_to_global_frame( const Position & p ) const {
     if ( m_name[0]=='B' || p.isBarrelLike )
     {    
         // here all Barrel chambers 
-        nominalTransf =  GeoTrf::RotateZ3D(p.phi*GeoModelKernelUnits::deg);
+        nominalTransf =  GeoTrf::RotateZ3D(p.phi*Gaudi::Units::deg);
     }
     else
     {
 // replace this with the folowing lines 8/06/2006 SS because, EC not mirrored chambers have anyway to be rotated
 // by 180deg around z to mov ecoherently their local reference frame and the tube-layer numbering
 //         if ( p.z>=0 || ( p.z<0 && !(p.isMirrored) ) ){
-//             nominalTransf =  GeoTrf::Transform3D(GeoTrf::RotateY3D(-90*GeoModelKernelUnits::deg)*
-// 					    GeoTrf::RotateX3D(p.phi*GeoModelKernelUnits::deg-180*GeoModelKernelUnits::deg));
+//             nominalTransf =  GeoTrf::Transform3D(GeoTrf::RotateY3D(-90*Gaudi::Units::deg)*
+// 					    GeoTrf::RotateX3D(p.phi*Gaudi::Units::deg-180*Gaudi::Units::deg));
 //         }
 //         else if (p.z<0 && p.isMirrored){
-//             nominalTransf =  GeoTrf::Transform3D(GeoTrf::RotateY3D(-90*GeoModelKernelUnits::deg)*
-//                                             GeoTrf::RotateX3D(p.phi*GeoModelKernelUnits::deg-180*GeoModelKernelUnits::deg)*
-//                                             GeoTrf::RotateZ3D(180*GeoModelKernelUnits::deg));
+//             nominalTransf =  GeoTrf::Transform3D(GeoTrf::RotateY3D(-90*Gaudi::Units::deg)*
+//                                             GeoTrf::RotateX3D(p.phi*Gaudi::Units::deg-180*Gaudi::Units::deg)*
+//                                             GeoTrf::RotateZ3D(180*Gaudi::Units::deg));
 //         }
         if ( p.z>=0 ){
-            nominalTransf =  GeoTrf::Transform3D(GeoTrf::RotateY3D(-90*GeoModelKernelUnits::deg)*
-					    GeoTrf::RotateX3D(p.phi*GeoModelKernelUnits::deg-180*GeoModelKernelUnits::deg));
+            nominalTransf =  GeoTrf::Transform3D(GeoTrf::RotateY3D(-90*Gaudi::Units::deg)*
+					    GeoTrf::RotateX3D(p.phi*Gaudi::Units::deg-180*Gaudi::Units::deg));
         }
         else if ( p.z<0 ){
-            nominalTransf =  GeoTrf::Transform3D(GeoTrf::RotateY3D(-90*GeoModelKernelUnits::deg)*
-                                            GeoTrf::RotateX3D(p.phi*GeoModelKernelUnits::deg-180*GeoModelKernelUnits::deg)*
-                                            GeoTrf::RotateZ3D(180*GeoModelKernelUnits::deg));
+            nominalTransf =  GeoTrf::Transform3D(GeoTrf::RotateY3D(-90*Gaudi::Units::deg)*
+                                            GeoTrf::RotateX3D(p.phi*Gaudi::Units::deg-180*Gaudi::Units::deg)*
+                                            GeoTrf::RotateZ3D(180*Gaudi::Units::deg));
         }
 	else log << MSG::WARNING<<" AAAAAA problem here p.z, mirrored "
 		    <<p.z<<" "<<p.isMirrored<<endmsg;
@@ -1038,13 +1038,13 @@ double Station::getAmdbOrigine_along_thickness() const
 //     if (m_name[0]=='B') {
 //         // defining the position of the centre of any station
 //         // here using the stations in DBSC (described in amdb + the ones at z<0)
-//         vec.setX((p.radius+GetThickness()/2.)*cos(p.phi*GeoModelKernelUnits::deg));
-//         vec.setX(vec.x()-p.shift*sin((p.phi)*GeoModelKernelUnits::deg));
-//         vec.setY((p.radius+GetThickness()/2.)*sin(p.phi*GeoModelKernelUnits::deg));
-//         vec.setY(vec.y()+p.shift*cos((p.phi)*GeoModelKernelUnits::deg));
+//         vec.setX((p.radius+GetThickness()/2.)*cos(p.phi*Gaudi::Units::deg));
+//         vec.setX(vec.x()-p.shift*sin((p.phi)*Gaudi::Units::deg));
+//         vec.setY((p.radius+GetThickness()/2.)*sin(p.phi*Gaudi::Units::deg));
+//         vec.setY(vec.y()+p.shift*cos((p.phi)*Gaudi::Units::deg));
 //         vec.setZ(p.z+GetLength()/2.);
-//         AMDBorgTranslation = GeoTrf::Translate3D(GetThickness()*cos(p.phi*GeoModelKernelUnits::deg)/2.,
-//                                             GetThickness()*sin(p.phi*GeoModelKernelUnits::deg)/2.,
+//         AMDBorgTranslation = GeoTrf::Translate3D(GetThickness()*cos(p.phi*Gaudi::Units::deg)/2.,
+//                                             GetThickness()*sin(p.phi*Gaudi::Units::deg)/2.,
 //                                             GetLength()/2.);
 //     }
 //     else {      // if (m_name[0]=='T')
@@ -1057,18 +1057,18 @@ double Station::getAmdbOrigine_along_thickness() const
 //             RAD=p.radius;
 //         if (m_name[0]!='C')
 //         {
-//             vec.setX((RAD+GetLength()/2.)*cos(p.phi*GeoModelKernelUnits::deg));
-//             vec.setX(vec.x()-p.shift*sin((p.phi)*GeoModelKernelUnits::deg));
-//             vec.setY((RAD+GetLength()/2.)*sin(p.phi*GeoModelKernelUnits::deg));
-//             vec.setY(vec.y()+p.shift*cos((p.phi)*GeoModelKernelUnits::deg));
+//             vec.setX((RAD+GetLength()/2.)*cos(p.phi*Gaudi::Units::deg));
+//             vec.setX(vec.x()-p.shift*sin((p.phi)*Gaudi::Units::deg));
+//             vec.setY((RAD+GetLength()/2.)*sin(p.phi*Gaudi::Units::deg));
+//             vec.setY(vec.y()+p.shift*cos((p.phi)*Gaudi::Units::deg));
 //             vec.setZ(p.z+GetThickness()/2.);
 //         }
 //         else
 //         {
-//             vec.setX(RAD*cos(p.phi*GeoModelKernelUnits::deg));
-//             vec.setX(vec.x()-p.shift*sin((p.phi)*GeoModelKernelUnits::deg));
-//             vec.setY(RAD*sin(p.phi*GeoModelKernelUnits::deg));
-//             vec.setY(vec.y()+p.shift*cos((p.phi)*GeoModelKernelUnits::deg));
+//             vec.setX(RAD*cos(p.phi*Gaudi::Units::deg));
+//             vec.setX(vec.x()-p.shift*sin((p.phi)*Gaudi::Units::deg));
+//             vec.setY(RAD*sin(p.phi*Gaudi::Units::deg));
+//             vec.setY(vec.y()+p.shift*cos((p.phi)*Gaudi::Units::deg));
 //             if (p.z>0) vec.setZ(p.z);
 //             else vec.setZ(p.z+GetThickness());
 //         }
@@ -1082,31 +1082,31 @@ double Station::getAmdbOrigine_along_thickness() const
 //     const HepVector3D phiaxis = HepVector3D(-raxis.y(), raxis.x(), 0.); // phi = z cross r
 //     // order of extra rotations is alpha(r), then beta(z), then gamma(phi)
 //     GeoTrf::Rotate3D ralpha, rbeta, rgamma;
-//     ralpha = GeoTrf::Rotate3D(p.alpha*GeoModelKernelUnits::deg, raxis);
-//     rbeta  = GeoTrf::Rotate3D(p.beta*GeoModelKernelUnits::deg,  zaxis);
+//     ralpha = GeoTrf::Rotate3D(p.alpha*Gaudi::Units::deg, raxis);
+//     rbeta  = GeoTrf::Rotate3D(p.beta*Gaudi::Units::deg,  zaxis);
 //     if ( p.zindex<0 && !(m_name[0] == 'B') ) {
-//         rgamma = GeoTrf::Rotate3D(p.gamma*GeoModelKernelUnits::deg, phiaxis);
+//         rgamma = GeoTrf::Rotate3D(p.gamma*Gaudi::Units::deg, phiaxis);
 //         //            if (m_name[0]=='C') log << MSG::DEBUG <<"zi,fi  gamma applied "<<m_name<<" "<<p.zindex<<" "<<p.phiindex<<" "<<p.gamma<<endmsg;
 //     }
 //     else {
-//         rgamma = GeoTrf::Rotate3D(-p.gamma*GeoModelKernelUnits::deg, phiaxis);
+//         rgamma = GeoTrf::Rotate3D(-p.gamma*Gaudi::Units::deg, phiaxis);
 //         //            if (m_name[0]=='C') log << MSG::DEBUG<<"zi,fi  gamma applied "<<m_name<<" "<<p.zindex<<" "<<p.phiindex<<" "<<-p.gamma<<endmsg;
 //     }
 //     if (m_name[0]=='B' || p.isBarrelLike)
 //     {
 //         // here all Barrel chambers
-//         if (p.isMirrored) nominalTransf = GeoTrf::RotateZ3D(p.phi*GeoModelKernelUnits::deg)*GeoTrf::RotateX3D(180.*GeoModelKernelUnits::deg);
-//         else nominalTransf =  GeoTrf::RotateZ3D(p.phi*GeoModelKernelUnits::deg);
+//         if (p.isMirrored) nominalTransf = GeoTrf::RotateZ3D(p.phi*Gaudi::Units::deg)*GeoTrf::RotateX3D(180.*Gaudi::Units::deg);
+//         else nominalTransf =  GeoTrf::RotateZ3D(p.phi*Gaudi::Units::deg);
 //     }
 //     else
 //     {
 //         if ( p.z>=0 || ( p.z<0 && !(p.isMirrored) ) ){
-//             nominalTransf =  GeoTrf::Transform3D(GeoTrf::RotateY3D(-90*GeoModelKernelUnits::deg)*GeoTrf::RotateX3D(p.phi*GeoModelKernelUnits::deg-180*GeoModelKernelUnits::deg));
+//             nominalTransf =  GeoTrf::Transform3D(GeoTrf::RotateY3D(-90*Gaudi::Units::deg)*GeoTrf::RotateX3D(p.phi*Gaudi::Units::deg-180*Gaudi::Units::deg));
 //         }
 //         else if (p.z<0 && p.isMirrored){
-//             nominalTransf =  GeoTrf::Transform3D(GeoTrf::RotateY3D(-90*GeoModelKernelUnits::deg)*
-//                                             GeoTrf::RotateX3D(p.phi*GeoModelKernelUnits::deg-180*GeoModelKernelUnits::deg)*
-//                                             GeoTrf::RotateZ3D(180*GeoModelKernelUnits::deg));
+//             nominalTransf =  GeoTrf::Transform3D(GeoTrf::RotateY3D(-90*Gaudi::Units::deg)*
+//                                             GeoTrf::RotateX3D(p.phi*Gaudi::Units::deg-180*Gaudi::Units::deg)*
+//                                             GeoTrf::RotateZ3D(180*Gaudi::Units::deg));
 //         }
 //         else log << MSG::WARNING<<" AAAAAA problem here p.z, mirrored "
 // 	        <<p.z<<" "<<p.isMirrored<<endmsg;
@@ -1114,7 +1114,7 @@ double Station::getAmdbOrigine_along_thickness() const
 //     GeoTrf::Transform3D transf;
 //     if (m_name[0]!='C') transf = GeoTrf::Translate3D(vec)*rgamma*rbeta*ralpha*nominalTransf;
 //     else transf = GeoTrf::Translate3D(vec)*nominalTransf*
-//                   GeoTrf::RotateY3D(p.gamma*GeoModelKernelUnits::deg)*
+//                   GeoTrf::RotateY3D(p.gamma*Gaudi::Units::deg)*
 //                   GeoTrf::Translate3D(GetThickness()/2.,0.,GetLength()/2.);
 //     return transf;
 // }
diff --git a/MuonSpectrometer/MuonGeoModel/src/Tgc.cxx b/MuonSpectrometer/MuonGeoModel/src/Tgc.cxx
index 3abfde6a635ad8a3a4969d568f6f3db88b0c424d..e8871b0443011b2e92066f4e19f4fc0917c1ffe2 100755
--- a/MuonSpectrometer/MuonGeoModel/src/Tgc.cxx
+++ b/MuonSpectrometer/MuonGeoModel/src/Tgc.cxx
@@ -24,6 +24,7 @@
 #include "GeoModelKernel/GeoShapeSubtraction.h"
 #include "GeoModelKernel/GeoShapeIntersection.h"
 #include "GeoModelKernel/GeoShapeShift.h"
+#include "GaudiKernel/SystemOfUnits.h"
 
 #define skip_tgc false
 
@@ -119,11 +120,11 @@ Tgc::build(int minimalgeo, int cutoutson, std::vector<Cutout*> vcutdef)
 
 	// wire supports
 	GeoTrd* strdsup = new GeoTrd(t->tck[i]/2, t->tck[i]/2, t->widthWireSupport/2,
-                                     t->widthWireSupport/2, lengthActive/2-0.1*GeoModelKernelUnits::mm);
+                                     t->widthWireSupport/2, lengthActive/2-0.1*Gaudi::Units::mm);
 	// button supports
 	GeoTube* stubesup = new GeoTube(0., t->radiusButton,
-					    t->tck[i]/2.+0.005*GeoModelKernelUnits::mm);
-	GeoTrf::RotateY3D rotY(3.14159264/2.*GeoModelKernelUnits::rad);
+					    t->tck[i]/2.+0.005*Gaudi::Units::mm);
+	GeoTrf::RotateY3D rotY(3.14159264/2.*Gaudi::Units::rad);
 	  
 	int iymin = int( -(widthActive/2. + lengthActive*tan(t->angleTilt) - t->widthWireSupport/2.
 			  + t->offsetWireSupport[iSenLyr])/t->distanceWireSupport );
@@ -188,7 +189,7 @@ Tgc::build(int minimalgeo, int cutoutson, std::vector<Cutout*> vcutdef)
                 GeoTrd* strdsupex = new GeoTrd(t->tck[i]/2, t->tck[i]/2,
                                                t->widthWireSupport/2,
                                                t->widthWireSupport/2,
-                                               lengthWireSupportEx/2-0.1*GeoModelKernelUnits::mm);
+                                               lengthWireSupportEx/2-0.1*Gaudi::Units::mm);
                 GeoTrf::Translate3D vtrans(0.,
 					   t->offsetWireSupport[iSenLyr]+t->distanceWireSupport*isupy + lengthActive/2.*tan(sign*t->angleTilt),
 					   (lengthActive-lengthWireSupportEx)/2.);
@@ -202,7 +203,7 @@ Tgc::build(int minimalgeo, int cutoutson, std::vector<Cutout*> vcutdef)
 	  			 + t->offsetWireSupport[iSenLyr]
 				       +lengthActive*tan( t->angleTilt))
 		                      -(-widthActive/2.);
-            if (widthLeftTrd > 8.*GeoModelKernelUnits::cm) {
+            if (widthLeftTrd > 8.*Gaudi::Units::cm) {
               double yLongBase;
               if ((name == "TGC01" || name == "TGC06" || name == "TGC12") &&
 	   	      t->distanceWireSupport*(iymin-1)+t->offsetWireSupport[iSenLyr]
@@ -230,7 +231,7 @@ Tgc::build(int minimalgeo, int cutoutson, std::vector<Cutout*> vcutdef)
 					+t->offsetWireSupport[iSenLyr]
 					+lengthActive*tan(-t->angleTilt));
 	      
-            if (widthRightTrd > 8.*GeoModelKernelUnits::cm) {
+            if (widthRightTrd > 8.*Gaudi::Units::cm) {
               double yLongBase;
               if ((name == "TGC01" || name == "TGC06" || name == "TGC12") &&
 		      t->distanceWireSupport*(iymax+1)+t->offsetWireSupport[iSenLyr]
diff --git a/MuonSpectrometer/MuonRDO/MuonRDO/CscRawDataCollection_Cache.h b/MuonSpectrometer/MuonRDO/MuonRDO/CscRawDataCollection_Cache.h
new file mode 100644
index 0000000000000000000000000000000000000000..c11f6fb18404baabef94e09b7e891fa143abd643
--- /dev/null
+++ b/MuonSpectrometer/MuonRDO/MuonRDO/CscRawDataCollection_Cache.h
@@ -0,0 +1,12 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+
+#pragma once
+
+#include "EventContainers/IdentifiableCache.h"
+#include "MuonRDO/CscRawDataCollection.h"
+
+typedef EventContainers::IdentifiableCache< CscRawDataCollection> CscRawDataCollection_Cache;
+
+CLASS_DEF( CscRawDataCollection_Cache , 1099187284 , 1 )
\ No newline at end of file
diff --git a/MuonSpectrometer/MuonRDO/MuonRDO/CscRawDataContainer.h b/MuonSpectrometer/MuonRDO/MuonRDO/CscRawDataContainer.h
index d5d5586cc4f4b3c715dcc24d15b21b7d84cc3bac..462876e256c2ddeac2b34a87b7f6484fc5e4bb38 100755
--- a/MuonSpectrometer/MuonRDO/MuonRDO/CscRawDataContainer.h
+++ b/MuonSpectrometer/MuonRDO/MuonRDO/CscRawDataContainer.h
@@ -9,6 +9,7 @@
 
 #include "MuonRDO/CscRawDataCollection.h"
 #include "MuonRDO/CscRawDataCollectionIdHash.h"
+#include "MuonRDO/CscRawDataCollection_Cache.h"
 #include "AthenaKernel/CLASS_DEF.h"
 #include "EventContainers/IdentifiableContainer.h" 
 
@@ -23,6 +24,8 @@ class CscRawDataContainer
 public:  
   CscRawDataContainer();
   CscRawDataContainer(unsigned int hashmax);
+  CscRawDataContainer(CscRawDataCollection_Cache* cache);
+  
   virtual ~CscRawDataContainer(); 
   
   typedef IdentifiableContainer<CscRawDataCollection> MyBase; 
diff --git a/MuonSpectrometer/MuonRDO/MuonRDO/MM_RawDataCollection_Cache.h b/MuonSpectrometer/MuonRDO/MuonRDO/MM_RawDataCollection_Cache.h
new file mode 100644
index 0000000000000000000000000000000000000000..ec71952dbc553584c0deafb1b8d60f98be778784
--- /dev/null
+++ b/MuonSpectrometer/MuonRDO/MuonRDO/MM_RawDataCollection_Cache.h
@@ -0,0 +1,12 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+
+#pragma once
+
+#include "EventContainers/IdentifiableCache.h"
+#include "MuonRDO/MM_RawDataCollection.h"
+
+typedef EventContainers::IdentifiableCache< Muon::MM_RawDataCollection> MM_RawDataCollection_Cache;
+
+CLASS_DEF( MM_RawDataCollection_Cache , 1330272288 , 1 )
\ No newline at end of file
diff --git a/MuonSpectrometer/MuonRDO/MuonRDO/MM_RawDataContainer.h b/MuonSpectrometer/MuonRDO/MuonRDO/MM_RawDataContainer.h
index 339fc829e1490617f59a6bad54eb4145563018ff..993898afa69f517e2e24ec91f04e80f6cfcddf4c 100755
--- a/MuonSpectrometer/MuonRDO/MuonRDO/MM_RawDataContainer.h
+++ b/MuonSpectrometer/MuonRDO/MuonRDO/MM_RawDataContainer.h
@@ -6,6 +6,7 @@
 #define MUONRDO_MM_RAWDATACONAINTER_H
 
 #include "MuonRDO/MM_RawDataCollection.h"
+#include "MuonRDO/MM_RawDataCollection_Cache.h"
 #include "AthenaKernel/CLASS_DEF.h"
 #include "EventContainers/IdentifiableContainer.h" 
 
@@ -18,6 +19,7 @@ class MM_RawDataContainer
 public:  
   MM_RawDataContainer(unsigned int hashmax);
   MM_RawDataContainer(); 
+  MM_RawDataContainer(MM_RawDataCollection_Cache* cache); 
   virtual ~MM_RawDataContainer(); 
 
   /// class ID
diff --git a/MuonSpectrometer/MuonRDO/MuonRDO/MuonRDODict.h b/MuonSpectrometer/MuonRDO/MuonRDO/MuonRDODict.h
index 755165fddbe4cdcdc23a70b109a8fada66a1c64c..90b11bfcfd7234006acbfc01e662c05190c9d9b3 100755
--- a/MuonSpectrometer/MuonRDO/MuonRDO/MuonRDODict.h
+++ b/MuonSpectrometer/MuonRDO/MuonRDO/MuonRDODict.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 /*
@@ -16,14 +16,20 @@
 #include "MuonRDO/RpcPadContainer.h"
 #include "MuonRDO/TgcRdoContainer.h"
 #include "MuonRDO/CscRawDataContainer.h"
+#include "MuonRDO/STGC_RawDataContainer.h"
 
 // collection
 #include "MuonRDO/MdtCsm.h"
 #include "MuonRDO/RpcPad.h"
 #include "MuonRDO/TgcRdo.h"
 #include "MuonRDO/CscRawDataCollection.h"
+#include "MuonRDO/STGC_RawDataCollection.h"
 
 // cache
 #include "MuonRDO/MdtCsm_Cache.h"
+#include "MuonRDO/RpcPad_Cache.h"
+#include "MuonRDO/TgcRdo_Cache.h"
+#include "MuonRDO/CscRawDataCollection_Cache.h"
+#include "MuonRDO/STGC_RawDataCollection_Cache.h"
 
 #endif
diff --git a/MuonSpectrometer/MuonRDO/MuonRDO/RpcPadContainer.h b/MuonSpectrometer/MuonRDO/MuonRDO/RpcPadContainer.h
index 9d25c59a24571fbaa6f1991c3c3e9bc4259e37b9..6e77bec928abd5af9908dd4d321fb03f01707ce5 100755
--- a/MuonSpectrometer/MuonRDO/MuonRDO/RpcPadContainer.h
+++ b/MuonSpectrometer/MuonRDO/MuonRDO/RpcPadContainer.h
@@ -13,6 +13,7 @@
 #include <string>
 #include "MuonRDO/RpcCoinMatrix.h"
 #include "MuonRDO/RpcPad.h"
+#include "MuonRDO/RpcPad_Cache.h"
 //#include "MuonRDO/RpcPadIdHash.h"
 #include "AthenaKernel/CLASS_DEF.h"
 #include "EventContainers/IdentifiableContainer.h" 
@@ -26,6 +27,8 @@ class RpcPadContainer
 
 public:  
    RpcPadContainer(unsigned int hashmax) ; 
+   RpcPadContainer(RpcPad_Cache* cache) ; 
+
   ~RpcPadContainer() ; 
 
   typedef RpcPad::size_type size_type ; 
diff --git a/MuonSpectrometer/MuonRDO/MuonRDO/RpcPad_Cache.h b/MuonSpectrometer/MuonRDO/MuonRDO/RpcPad_Cache.h
new file mode 100644
index 0000000000000000000000000000000000000000..db6f46cce4b2b921d1265a4cb698295fac843a9d
--- /dev/null
+++ b/MuonSpectrometer/MuonRDO/MuonRDO/RpcPad_Cache.h
@@ -0,0 +1,12 @@
+/* 
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+
+#pragma once
+
+#include "EventContainers/IdentifiableCache.h"
+#include "MuonRDO/RpcPad.h"
+
+typedef EventContainers::IdentifiableCache< RpcPad> RpcPad_Cache;
+
+CLASS_DEF( RpcPad_Cache , 31498359 , 1 )
\ No newline at end of file
diff --git a/MuonSpectrometer/MuonRDO/MuonRDO/STGC_RawDataCollection_Cache.h b/MuonSpectrometer/MuonRDO/MuonRDO/STGC_RawDataCollection_Cache.h
new file mode 100644
index 0000000000000000000000000000000000000000..9a925eb4b50889899df82adba68ad482905c7d69
--- /dev/null
+++ b/MuonSpectrometer/MuonRDO/MuonRDO/STGC_RawDataCollection_Cache.h
@@ -0,0 +1,12 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+
+#pragma once
+
+#include "EventContainers/IdentifiableCache.h"
+#include "MuonRDO/STGC_RawDataCollection.h"
+
+typedef EventContainers::IdentifiableCache< Muon::STGC_RawDataCollection> STGC_RawDataCollection_Cache;
+
+CLASS_DEF( STGC_RawDataCollection_Cache , 1118886635 , 1 )
\ No newline at end of file
diff --git a/MuonSpectrometer/MuonRDO/MuonRDO/STGC_RawDataContainer.h b/MuonSpectrometer/MuonRDO/MuonRDO/STGC_RawDataContainer.h
index 5283fd3c5304d577e341406fe0beceaec797911b..69dbdfd350c40ba46c74486f4f6f18fcc78e0517 100755
--- a/MuonSpectrometer/MuonRDO/MuonRDO/STGC_RawDataContainer.h
+++ b/MuonSpectrometer/MuonRDO/MuonRDO/STGC_RawDataContainer.h
@@ -6,6 +6,7 @@
 #define MUONRDO_STGC_RawDataCONAINTER_H
 
 #include "MuonRDO/STGC_RawDataCollection.h"
+#include "MuonRDO/STGC_RawDataCollection_Cache.h"
 #include "AthenaKernel/CLASS_DEF.h"
 #include "EventContainers/IdentifiableContainer.h" 
 
@@ -18,6 +19,7 @@ class STGC_RawDataContainer
 public:  
   STGC_RawDataContainer();
   STGC_RawDataContainer(unsigned int hashmax);
+  STGC_RawDataContainer(STGC_RawDataCollection_Cache* cache);
   ~STGC_RawDataContainer(); 
   
   // class ID
diff --git a/MuonSpectrometer/MuonRDO/MuonRDO/TgcRdoContainer.h b/MuonSpectrometer/MuonRDO/MuonRDO/TgcRdoContainer.h
index 881212512383e9ef5fd87c836e6537c7d499fa9e..f323c42aaa14188738d3f51f70f237eb8aac4a5b 100755
--- a/MuonSpectrometer/MuonRDO/MuonRDO/TgcRdoContainer.h
+++ b/MuonSpectrometer/MuonRDO/MuonRDO/TgcRdoContainer.h
@@ -9,6 +9,7 @@
 
 #include "MuonRDO/TgcRdo.h"
 #include "MuonRDO/TgcRdoIdHash.h"
+#include "MuonRDO/TgcRdo_Cache.h"
 #include "AthenaKernel/CLASS_DEF.h"
 #include "EventContainers/IdentifiableContainer.h" 
 
@@ -25,6 +26,8 @@ class TgcRdoContainer
 public:  
   TgcRdoContainer();
   TgcRdoContainer(unsigned int hashmax);
+  TgcRdoContainer(TgcRdo_Cache* cache);
+
   ~TgcRdoContainer(); 
   
   typedef IdentifiableContainer<TgcRdo> MyBase; 
diff --git a/MuonSpectrometer/MuonRDO/MuonRDO/TgcRdo_Cache.h b/MuonSpectrometer/MuonRDO/MuonRDO/TgcRdo_Cache.h
new file mode 100644
index 0000000000000000000000000000000000000000..9dcecd537252086757ee3a46c466186f5abb598a
--- /dev/null
+++ b/MuonSpectrometer/MuonRDO/MuonRDO/TgcRdo_Cache.h
@@ -0,0 +1,12 @@
+/* 
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+
+#pragma once
+
+#include "EventContainers/IdentifiableCache.h"
+#include "MuonRDO/TgcRdo.h"
+
+typedef EventContainers::IdentifiableCache< TgcRdo> TgcRdo_Cache;
+
+CLASS_DEF( TgcRdo_Cache , 92530520 , 1 )
\ No newline at end of file
diff --git a/MuonSpectrometer/MuonRDO/MuonRDO/selection.xml b/MuonSpectrometer/MuonRDO/MuonRDO/selection.xml
index bd4933b1c5b636c3d750f16617fd0d4fd0f1e81d..7e8b304148d0f9d266e33965a26d4b27a0a611c9 100755
--- a/MuonSpectrometer/MuonRDO/MuonRDO/selection.xml
+++ b/MuonSpectrometer/MuonRDO/MuonRDO/selection.xml
@@ -54,6 +54,7 @@
   <class name="TgcRdoContainer" />
   <class name="std::vector<TgcRdo * >" />
   <class name="DataVector<TgcRdo>" id="FBF8D72D-A6B9-4689-8E02-BB0F435BF2F7" />
+  <class name="TgcRdo_Cache" />
 
   <class name="MdtCsmContainer" />
   <class name="std::vector<MdtCsm * >" />
@@ -63,14 +64,17 @@
   <class name="RpcPadContainer" />
   <class name="std::vector<RpcPad * >" />
   <class name="DataVector<RpcPad>" id="85B897F6-E15D-4215-9DAC-EA2828BCEEC9" />
+  <class name="RpcPad_Cache" />
 
   <class name="CscRawDataContainer" />
   <class name="std::vector<CscRawDataCollection * >" />
   <class name="DataVector<CscRawDataCollection>" id="D7600810-31BC-4344-A3C6-9C59F47E5551" />
+  <class name="CscRawDataCollection_Cache" />
 
-  <class name="sTGC_RawDataContainer" />
-  <class name="std::vector<sTGC_RawDataCollection * >" />
-  <class name="DataVector<sTGC_RawDataCollection>" id="3786AB67-8A7A-4DA5-B178-3FE9CB3A6FD2" />
+  <class name="STGC_RawDataContainer" />
+  <class name="std::vector<STGC_RawDataCollection * >" />
+  <class name="DataVector<STGC_RawDataCollection>" id="3786AB67-8A7A-4DA5-B178-3FE9CB3A6FD2" />
+  <class name="STGC_RawDataCollection_Cache" />
 
 
 </lcgdict>
diff --git a/MuonSpectrometer/MuonRDO/src/CscRawDataContainer.cxx b/MuonSpectrometer/MuonRDO/src/CscRawDataContainer.cxx
index 4e5c7e34075a40785a79f585492bf3216a86b1ed..da7669a8f31eab2970365cd76e7782717ed04fc1 100755
--- a/MuonSpectrometer/MuonRDO/src/CscRawDataContainer.cxx
+++ b/MuonSpectrometer/MuonRDO/src/CscRawDataContainer.cxx
@@ -16,6 +16,11 @@ CscRawDataContainer::CscRawDataContainer(unsigned int hashmax)
 {
 }
 
+CscRawDataContainer::CscRawDataContainer(CscRawDataCollection_Cache* cache)
+  : IdentifiableContainer<CscRawDataCollection>(cache) 
+{
+}
+
 // Destructor.
 CscRawDataContainer::~CscRawDataContainer() 
 {}
diff --git a/MuonSpectrometer/MuonRDO/src/MM_RawDataContainer.cxx b/MuonSpectrometer/MuonRDO/src/MM_RawDataContainer.cxx
index 869216a5ec0c780e8a285b4cb3afa36d2b00a532..eeaafc236b0bc422fe0afd5d397708916b39356a 100755
--- a/MuonSpectrometer/MuonRDO/src/MM_RawDataContainer.cxx
+++ b/MuonSpectrometer/MuonRDO/src/MM_RawDataContainer.cxx
@@ -16,6 +16,11 @@ Muon::MM_RawDataContainer::MM_RawDataContainer(unsigned int hashmax)
 {
 }
 
+Muon::MM_RawDataContainer::MM_RawDataContainer(MM_RawDataCollection_Cache* cache)
+: IdentifiableContainer<MM_RawDataCollection>(cache) 
+{
+}
+
 // Destructor.
 Muon::MM_RawDataContainer::~MM_RawDataContainer() {
 
diff --git a/MuonSpectrometer/MuonRDO/src/RpcPadContainer.cxx b/MuonSpectrometer/MuonRDO/src/RpcPadContainer.cxx
index 9ea18fbb527d0422042dab0f721aebb14c77df75..1f0eb8831db17d15713d24a11d1aa5ae0d425866 100755
--- a/MuonSpectrometer/MuonRDO/src/RpcPadContainer.cxx
+++ b/MuonSpectrometer/MuonRDO/src/RpcPadContainer.cxx
@@ -38,6 +38,12 @@ RpcPadContainer::RpcPadContainer( unsigned int hashmax)
   // std::cout<<"RpcPadContainer ctor ["<<this<<"]"<<std::endl;
 }
 
+RpcPadContainer::RpcPadContainer( RpcPad_Cache* cache)
+: IdentifiableContainer<RpcPad>(cache) 
+{
+  // std::cout<<"RpcPadContainer ctor ["<<this<<"]"<<std::endl;
+}
+
 //**********************************************************************
 
 // Destructor.
diff --git a/MuonSpectrometer/MuonRDO/src/STGC_RawDataContainer.cxx b/MuonSpectrometer/MuonRDO/src/STGC_RawDataContainer.cxx
index 3db6dae06e772a8e91fd843e698b6a9b62ff0257..d812479fc1e9212c0a67eb919bab78212cd09475 100755
--- a/MuonSpectrometer/MuonRDO/src/STGC_RawDataContainer.cxx
+++ b/MuonSpectrometer/MuonRDO/src/STGC_RawDataContainer.cxx
@@ -15,6 +15,12 @@ Muon::STGC_RawDataContainer::STGC_RawDataContainer(unsigned int hashmax)
 {
 }
 
+Muon::STGC_RawDataContainer::STGC_RawDataContainer(STGC_RawDataCollection_Cache* cache)
+: IdentifiableContainer<STGC_RawDataCollection>(cache) 
+{
+}
+
+
 // Destructor.
 Muon::STGC_RawDataContainer::~STGC_RawDataContainer() {
 
diff --git a/MuonSpectrometer/MuonRDO/src/TgcRdoContainer.cxx b/MuonSpectrometer/MuonRDO/src/TgcRdoContainer.cxx
index fed2bb8a881c023b73413515edf7afcd3c0939b6..e91962cd477760a319900cf913c48ee27dea567d 100755
--- a/MuonSpectrometer/MuonRDO/src/TgcRdoContainer.cxx
+++ b/MuonSpectrometer/MuonRDO/src/TgcRdoContainer.cxx
@@ -22,6 +22,11 @@ TgcRdoContainer::TgcRdoContainer(unsigned int hashmax)
 {
 }
 
+TgcRdoContainer::TgcRdoContainer(TgcRdo_Cache* cache)
+  : IdentifiableContainer<TgcRdo>(cache) 
+{
+}
+
 
 // Destructor.
 TgcRdoContainer::~TgcRdoContainer() 
diff --git a/MuonSpectrometer/MuonValidation/MuonPRDTest/macros/NSWMatching_offline/NSWstudies.C b/MuonSpectrometer/MuonValidation/MuonPRDTest/macros/NSWMatching_offline/NSWstudies.C
new file mode 100644
index 0000000000000000000000000000000000000000..b0834871e3af8154a6a9afd30670f260b113a303
--- /dev/null
+++ b/MuonSpectrometer/MuonValidation/MuonPRDTest/macros/NSWMatching_offline/NSWstudies.C
@@ -0,0 +1,47 @@
+/*
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+*/
+
+#define NSWstudies_cxx
+#include "NSWstudies.h"
+#include <TH2.h>
+#include <TStyle.h>
+#include <TCanvas.h>
+
+void NSWstudies::Loop()
+{
+//   In a ROOT session, you can do:
+//      root> .L NSWstudies.C
+//      root> NSWstudies t
+//      root> t.GetEntry(12); // Fill t data members with entry number 12
+//      root> t.Show();       // Show values of entry 12
+//      root> t.Show(16);     // Read and show values of entry 16
+//      root> t.Loop();       // Loop on all entries
+//
+
+//     This is the loop skeleton where:
+//    jentry is the global entry number in the chain
+//    ientry is the entry number in the current Tree
+//  Note that the argument to GetEntry must be:
+//    jentry for TChain::GetEntry
+//    ientry for TTree::GetEntry and TBranch::GetEntry
+//
+//       To read only selected branches, Insert statements like:
+// METHOD1:
+//    fChain->SetBranchStatus("*",0);  // disable all branches
+//    fChain->SetBranchStatus("branchname",1);  // activate branchname
+// METHOD2: replace line
+//    fChain->GetEntry(jentry);       //read all branches
+//by  b_branchname->GetEntry(ientry); //read only this branch
+   if (fChain == 0) return;
+
+   Long64_t nentries = fChain->GetEntriesFast();
+
+   Long64_t nbytes = 0, nb = 0;
+   for (Long64_t jentry=0; jentry<nentries;jentry++) {
+      Long64_t ientry = LoadTree(jentry);
+      if (ientry < 0) break;
+      nb = fChain->GetEntry(jentry);   nbytes += nb;
+      // if (Cut(ientry) < 0) continue;
+   }
+}
diff --git a/MuonSpectrometer/MuonValidation/MuonPRDTest/macros/NSWMatching_offline/NSWstudies.h b/MuonSpectrometer/MuonValidation/MuonPRDTest/macros/NSWMatching_offline/NSWstudies.h
new file mode 100644
index 0000000000000000000000000000000000000000..484895fdec71656fff94a55e7168a0b591cebc86
--- /dev/null
+++ b/MuonSpectrometer/MuonValidation/MuonPRDTest/macros/NSWMatching_offline/NSWstudies.h
@@ -0,0 +1,1222 @@
+/*
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+*/
+
+//////////////////////////////////////////////////////////
+// This class has been automatically generated on
+// Thu Jul 26 12:33:06 2018 by ROOT version 6.12/04
+// from TTree NSWHitsTree/Ntuple of NSWHits
+// found on file: NSWPRDValAlg.full.ntuple.root
+//////////////////////////////////////////////////////////
+
+#ifndef NSWstudies_h
+#define NSWstudies_h
+
+#include <TROOT.h>
+#include <TChain.h>
+#include <TFile.h>
+
+// Header file for the classes stored in the TTree if any.
+#include "vector"
+#include "vector"
+#include "vector"
+#include "vector"
+#include "vector"
+#include "vector"
+
+class NSWstudies {
+public :
+   //Additions
+   void match_Hits_Digits (Flocalize_collection&, Flocalize_collection&);
+   void fillHists (Flocalize_collection& oData, vector< TH1I* >& hist_vec);
+   void plotError (Flocalize_collection oPRD, vector<TH1F*> hists_pull);
+
+   TTree          *fChain;   //!pointer to the analyzed TTree or TChain
+   Int_t           fCurrent; //!current Tree number in a TChain
+
+// Fixed size dimensions of array or collections stored in the TTree if any.
+
+   // Declaration of leaf types
+   UInt_t          runNumber;
+   UInt_t          eventNumber;
+   UInt_t          TruthVertex_n;
+   vector<double>  *TruthVertex_X;
+   vector<double>  *TruthVertex_Y;
+   vector<double>  *TruthVertex_Z;
+   vector<double>  *TruthVertex_T;
+   vector<int>     *TruthVertex_Id;
+   UInt_t          TruthParticle_n;
+   vector<double>  *TruthParticle_Pt;
+   vector<double>  *TruthParticle_Eta;
+   vector<double>  *TruthParticle_Phi;
+   vector<double>  *TruthParticle_E;
+   vector<double>  *TruthParticle_M;
+   vector<int>     *TruthParticle_Pdg;
+   vector<int>     *TruthParticle_Status;
+   vector<int>     *TruthParticle_Barcode;
+   vector<int>     *TruthParticle_Production_vertex_id;
+   vector<int>     *TruthParticle_End_vertex_id;
+   UInt_t          MuEntry_Particle_n;
+   vector<double>  *MuEntry_Particle_Pt;
+   vector<double>  *MuEntry_Particle_Eta;
+   vector<double>  *MuEntry_Particle_Phi;
+   vector<int>     *MuEntry_Particle_Pdg;
+   vector<int>     *MuEntry_Particle_Barcode;
+   vector<double>  *MuEntry_Position_Eta;
+   vector<double>  *MuEntry_Position_Phi;
+   vector<double>  *MuEntry_Position_X;
+   vector<double>  *MuEntry_Position_Y;
+   vector<double>  *MuEntry_Position_Z;
+   UInt_t          Hits_sTGC_n;
+   vector<int>     *Hits_sTGC_trackId;
+   vector<bool>    *Hits_sTGC_isInsideBounds;
+   vector<double>  *Hits_sTGC_globalTime;
+   vector<double>  *Hits_sTGC_hitGlobalPositionX;
+   vector<double>  *Hits_sTGC_hitGlobalPositionY;
+   vector<double>  *Hits_sTGC_hitGlobalPositionZ;
+   vector<double>  *Hits_sTGC_hitGlobalPositionR;
+   vector<double>  *Hits_sTGC_hitGlobalPositionP;
+   vector<double>  *Hits_sTGC_hitGlobalDirectionX;
+   vector<double>  *Hits_sTGC_hitGlobalDirectionY;
+   vector<double>  *Hits_sTGC_hitGlobalDirectionZ;
+   vector<double>  *Hits_sTGC_hitLocalPositionX;
+   vector<double>  *Hits_sTGC_hitLocalPositionY;
+   vector<double>  *Hits_sTGC_hitLocalPositionZ;
+   vector<double>  *Hits_sTGC_detector_globalPositionX;
+   vector<double>  *Hits_sTGC_detector_globalPositionY;
+   vector<double>  *Hits_sTGC_detector_globalPositionZ;
+   vector<double>  *Hits_sTGC_detector_globalPositionR;
+   vector<double>  *Hits_sTGC_detector_globalPositionP;
+   vector<double>  *Hits_sTGC_hitToDsurfacePositionX;
+   vector<double>  *Hits_sTGC_hitToDsurfacePositionY;
+   vector<double>  *Hits_sTGC_hitToDsurfacePositionZ;
+   vector<double>  *Hits_sTGC_hitToRsurfacePositionX;
+   vector<double>  *Hits_sTGC_hitToRsurfacePositionY;
+   vector<double>  *Hits_sTGC_hitToRsurfacePositionZ;
+   vector<double>  *Hits_sTGC_FastDigitRsurfacePositionX;
+   vector<double>  *Hits_sTGC_FastDigitRsurfacePositionY;
+   vector<int>     *Hits_sTGC_particleEncoding;
+   vector<double>  *Hits_sTGC_kineticEnergy;
+   vector<double>  *Hits_sTGC_depositEnergy;
+   vector<double>  *Hits_sTGC_StepLength;
+   vector<string>  *Hits_sTGC_sim_stationName;
+   vector<int>     *Hits_sTGC_wedgeId;
+   vector<int>     *Hits_sTGC_wedgeType;
+   vector<int>     *Hits_sTGC_detectorNumber;
+   vector<int>     *Hits_sTGC_sim_stationEta;
+   vector<int>     *Hits_sTGC_sim_stationPhi;
+   vector<int>     *Hits_sTGC_sim_multilayer;
+   vector<int>     *Hits_sTGC_sim_layer;
+   vector<int>     *Hits_sTGC_sim_side;
+   vector<int>     *Hits_sTGC_stripNumber;
+   vector<int>     *Hits_sTGC_wireNumber;
+   vector<string>  *Hits_sTGC_off_stationName;
+   vector<int>     *Hits_sTGC_off_stationEta;
+   vector<int>     *Hits_sTGC_off_stationPhi;
+   vector<int>     *Hits_sTGC_off_multiplet;
+   vector<int>     *Hits_sTGC_off_gas_gap;
+   vector<int>     *Hits_sTGC_off_channel_type;
+   vector<int>     *Hits_sTGC_off_channel;
+   UInt_t          Digits_sTGC;
+   UInt_t          Digits_sTGC_Pad_Digits;
+   vector<double>  *Digits_sTGC_time;
+   vector<int>     *Digits_sTGC_bctag;
+   vector<double>  *Digits_sTGC_charge;
+   vector<bool>    *Digits_sTGC_isDead;
+   vector<bool>    *Digits_sTGC_isPileup;
+   vector<string>  *Digits_sTGC_stationName;
+   vector<int>     *Digits_sTGC_stationEta;
+   vector<int>     *Digits_sTGC_stationPhi;
+   vector<int>     *Digits_sTGC_multiplet;
+   vector<int>     *Digits_sTGC_gas_gap;
+   vector<int>     *Digits_sTGC_channel_type;
+   vector<int>     *Digits_sTGC_channel;
+   vector<int>     *Digits_sTGC_stationEtaMin;
+   vector<int>     *Digits_sTGC_stationEtaMax;
+   vector<int>     *Digits_sTGC_stationPhiMin;
+   vector<int>     *Digits_sTGC_stationPhiMax;
+   vector<int>     *Digits_sTGC_gas_gapMin;
+   vector<int>     *Digits_sTGC_gas_gapMax;
+   vector<int>     *Digits_sTGC_padEta;
+   vector<int>     *Digits_sTGC_padPhi;
+   vector<int>     *Digits_sTGC_numberOfMultilayers;
+   vector<int>     *Digits_sTGC_multilayerMin;
+   vector<int>     *Digits_sTGC_multilayerMax;
+   vector<int>     *Digits_sTGC_channelTypeMin;
+   vector<int>     *Digits_sTGC_channelTypeMax;
+   vector<int>     *Digits_sTGC_channelMin;
+   vector<int>     *Digits_sTGC_channelMax;
+   vector<int>     *Digits_sTGC_channelNumber;
+   vector<double>  *Digits_sTGC_channelPosX;
+   vector<double>  *Digits_sTGC_channelPosY;
+   vector<double>  *Digits_sTGC_localPosX;
+   vector<double>  *Digits_sTGC_localPosY;
+   vector<double>  *Digits_sTGC_globalPosX;
+   vector<double>  *Digits_sTGC_globalPosY;
+   vector<double>  *Digits_sTGC_globalPosZ;
+   vector<double>  *Digits_sTGC_PadglobalCornerPosX;
+   vector<double>  *Digits_sTGC_PadglobalCornerPosY;
+   vector<double>  *Digits_sTGC_PadglobalCornerPosZ;
+   UInt_t          SDO_sTGC;
+   vector<string>  *SDO_sTGC_stationName;
+   vector<int>     *SDO_sTGC_stationEta;
+   vector<int>     *SDO_sTGC_stationPhi;
+   vector<int>     *SDO_sTGC_multiplet;
+   vector<int>     *SDO_sTGC_gas_gap;
+   vector<int>     *SDO_sTGC_channel;
+   vector<int>     *SDO_sTGC_channel_type;
+   vector<int>     *SDO_sTGC_word;
+   vector<int>     *SDO_sTGC_barcode;
+   vector<double>  *SDO_sTGC_globalPosX;
+   vector<double>  *SDO_sTGC_globalPosY;
+   vector<double>  *SDO_sTGC_globalPosZ;
+   vector<double>  *SDO_sTGC_global_time;
+   vector<double>  *SDO_sTGC_Energy;
+   vector<double>  *SDO_sTGC_tof;
+   vector<double>  *SDO_sTGC_localPosX;
+   vector<double>  *SDO_sTGC_localPosY;
+   Int_t           RDO_sTGC_n;
+   vector<string>  *RDO_sTGC_stationName;
+   vector<int>     *RDO_sTGC_stationEta;
+   vector<int>     *RDO_sTGC_stationPhi;
+   vector<int>     *RDO_sTGC_multiplet;
+   vector<int>     *RDO_sTGC_gas_gap;
+   vector<int>     *RDO_sTGC_channel;
+   vector<int>     *RDO_sTGC_channel_type;
+   vector<double>  *RDO_sTGC_time;
+   vector<double>  *RDO_sTGC_charge;
+   vector<unsigned short> *RDO_sTGC_bcTag;
+   vector<bool>    *RDO_sTGC_isDead;
+   UInt_t          PRD_sTGC;
+   vector<string>  *PRD_sTGC_stationName;
+   vector<int>     *PRD_sTGC_stationEta;
+   vector<int>     *PRD_sTGC_stationPhi;
+   vector<int>     *PRD_sTGC_multiplet;
+   vector<int>     *PRD_sTGC_gas_gap;
+   vector<int>     *PRD_sTGC_channel_type;
+   vector<int>     *PRD_sTGC_channel;
+   vector<double>  *PRD_sTGC_globalPosX;
+   vector<double>  *PRD_sTGC_globalPosY;
+   vector<double>  *PRD_sTGC_globalPosZ;
+   vector<double>  *PRD_sTGC_localPosX;
+   vector<double>  *PRD_sTGC_localPosY;
+   vector<double>  *PRD_sTGC_covMatrix_1_1;
+   vector<double>  *PRD_sTGC_covMatrix_2_2;
+   UInt_t          Hits_MM_n;
+   vector<int>     *Hits_MM_trackId;
+   vector<bool>    *Hits_MM_isInsideBounds;
+   vector<double>  *Hits_MM_globalTime;
+   vector<double>  *Hits_MM_hitGlobalPositionX;
+   vector<double>  *Hits_MM_hitGlobalPositionY;
+   vector<double>  *Hits_MM_hitGlobalPositionZ;
+   vector<double>  *Hits_MM_hitGlobalPositionR;
+   vector<double>  *Hits_MM_hitGlobalPositionP;
+   vector<double>  *Hits_MM_hitGlobalDirectionX;
+   vector<double>  *Hits_MM_hitGlobalDirectionY;
+   vector<double>  *Hits_MM_hitGlobalDirectionZ;
+   vector<double>  *Hits_MM_hitLocalPositionX;
+   vector<double>  *Hits_MM_hitLocalPositionY;
+   vector<double>  *Hits_MM_hitLocalPositionZ;
+   vector<double>  *Hits_MM_detector_globalPositionX;
+   vector<double>  *Hits_MM_detector_globalPositionY;
+   vector<double>  *Hits_MM_detector_globalPositionZ;
+   vector<double>  *Hits_MM_detector_globalPositionR;
+   vector<double>  *Hits_MM_detector_globalPositionP;
+   vector<double>  *Hits_MM_hitToDsurfacePositionX;
+   vector<double>  *Hits_MM_hitToDsurfacePositionY;
+   vector<double>  *Hits_MM_hitToDsurfacePositionZ;
+   vector<double>  *Hits_MM_hitToRsurfacePositionX;
+   vector<double>  *Hits_MM_hitToRsurfacePositionY;
+   vector<double>  *Hits_MM_hitToRsurfacePositionZ;
+   vector<double>  *Hits_MM_FastDigitRsurfacePositionX;
+   vector<double>  *Hits_MM_FastDigitRsurfacePositionY;
+   vector<int>     *Hits_MM_particleEncoding;
+   vector<double>  *Hits_MM_kineticEnergy;
+   vector<double>  *Hits_MM_depositEnergy;
+   vector<double>  *Hits_MM_StepLength;
+   vector<string>  *Hits_MM_sim_stationName;
+   vector<int>     *Hits_MM_sim_stationEta;
+   vector<int>     *Hits_MM_sim_stationPhi;
+   vector<int>     *Hits_MM_sim_multilayer;
+   vector<int>     *Hits_MM_sim_layer;
+   vector<int>     *Hits_MM_sim_side;
+   vector<string>  *Hits_MM_off_stationName;
+   vector<int>     *Hits_MM_off_stationEta;
+   vector<int>     *Hits_MM_off_stationPhi;
+   vector<int>     *Hits_MM_off_multiplet;
+   vector<int>     *Hits_MM_off_gas_gap;
+   vector<int>     *Hits_MM_off_channel;
+   UInt_t          Digits_MM;
+   vector<string>  *Digits_MM_stationName;
+   vector<int>     *Digits_MM_stationEta;
+   vector<int>     *Digits_MM_stationPhi;
+   vector<int>     *Digits_MM_multiplet;
+   vector<int>     *Digits_MM_gas_gap;
+   vector<int>     *Digits_MM_channel;
+   vector<vector<float> > *Digits_MM_time;
+   vector<vector<float> > *Digits_MM_charge;
+   vector<vector<int> > *Digits_MM_stripPosition;
+   vector<vector<double> > *Digits_MM_stripLposX;
+   vector<vector<double> > *Digits_MM_stripLposY;
+   vector<vector<double> > *Digits_MM_stripGposX;
+   vector<vector<double> > *Digits_MM_stripGposY;
+   vector<vector<double> > *Digits_MM_stripGposZ;
+   vector<vector<float> > *Digits_MM_stripResponse_time;
+   vector<vector<float> > *Digits_MM_stripResponse_charge;
+   vector<vector<int> > *Digits_MM_stripResponse_stripPosition;
+   vector<vector<double> > *Digits_MM_stripResponse_stripLposX;
+   vector<vector<double> > *Digits_MM_stripResponse_stripLposY;
+   vector<vector<double> > *Digits_MM_stripresponse_stripGposX;
+   vector<vector<double> > *Digits_MM_stripResponse_stripGposY;
+   vector<vector<double> > *Digits_MM_stripResponse_stripGposZ;
+   vector<vector<float> > *Digits_MM_time_trigger;
+   vector<vector<float> > *Digits_MM_charge_trigger;
+   vector<vector<int> > *Digits_MM_position_trigger;
+   vector<vector<int> > *Digits_MM_MMFE_VMM_id_trigger;
+   vector<vector<int> > *Digits_MM_VMM_id_trigger;
+   UInt_t          SDO_MM;
+   vector<string>  *SDO_MM_stationName;
+   vector<int>     *SDO_MM_stationEta;
+   vector<int>     *SDO_MM_stationPhi;
+   vector<int>     *SDO_MM_multiplet;
+   vector<int>     *SDO_MM_gas_gap;
+   vector<int>     *SDO_MM_channel;
+   vector<int>     *SDO_MM_word;
+   vector<int>     *SDO_MM_barcode;
+   vector<double>  *SDO_MM_globalPosX;
+   vector<double>  *SDO_MM_globalPosY;
+   vector<double>  *SDO_MM_globalPosZ;
+   vector<double>  *SDO_MM_global_time;
+   vector<double>  *SDO_MM_localPosX;
+   vector<double>  *SDO_MM_localPosY;
+   Int_t           RDO_MM_n;
+   vector<string>  *RDO_MM_stationName;
+   vector<int>     *RDO_MM_stationEta;
+   vector<int>     *RDO_MM_stationPhi;
+   vector<int>     *RDO_MM_multiplet;
+   vector<int>     *RDO_MM_gas_gap;
+   vector<int>     *RDO_MM_channel;
+   vector<int>     *RDO_MM_time;
+   vector<int>     *RDO_MM_charge;
+   UInt_t          PRD_MM;
+   vector<string>  *PRD_MM_stationName;
+   vector<int>     *PRD_MM_stationEta;
+   vector<int>     *PRD_MM_stationPhi;
+   vector<int>     *PRD_MM_multiplet;
+   vector<int>     *PRD_MM_gas_gap;
+   vector<int>     *PRD_MM_channel;
+   vector<double>  *PRD_MM_globalPosX;
+   vector<double>  *PRD_MM_globalPosY;
+   vector<double>  *PRD_MM_globalPosZ;
+   vector<double>  *PRD_MM_localPosX;
+   vector<double>  *PRD_MM_localPosY;
+   vector<double>  *PRD_MM_covMatrix_1_1;
+
+   // List of branches
+   TBranch        *b_runNumber;   //!
+   TBranch        *b_eventNumber;   //!
+   TBranch        *b_TruthVertex_n;   //!
+   TBranch        *b_TruthVertex_X;   //!
+   TBranch        *b_TruthVertex_Y;   //!
+   TBranch        *b_TruthVertex_Z;   //!
+   TBranch        *b_TruthVertex_T;   //!
+   TBranch        *b_TruthVertex_Id;   //!
+   TBranch        *b_TruthParticle_n;   //!
+   TBranch        *b_TruthParticle_Pt;   //!
+   TBranch        *b_TruthParticle_Eta;   //!
+   TBranch        *b_TruthParticle_Phi;   //!
+   TBranch        *b_TruthParticle_E;   //!
+   TBranch        *b_TruthParticle_M;   //!
+   TBranch        *b_TruthParticle_Pdg;   //!
+   TBranch        *b_TruthParticle_Status;   //!
+   TBranch        *b_TruthParticle_Barcode;   //!
+   TBranch        *b_TruthParticle_Production_vertex_id;   //!
+   TBranch        *b_TruthParticle_End_vertex_id;   //!
+   TBranch        *b_MuEntryParticle_n;   //!
+   TBranch        *b_MuEntry_Particle_Pt;   //!
+   TBranch        *b_MuEntry_Particle_Eta;   //!
+   TBranch        *b_MuEntry_Particle_Phi;   //!
+   TBranch        *b_MuEntry_Particle_Pdg;   //!
+   TBranch        *b_MuEntry_Particle_Barcode;   //!
+   TBranch        *b_MuEntry_Position_Eta;   //!
+   TBranch        *b_MuEntry_Position_Phi;   //!
+   TBranch        *b_MuEntry_Position_X;   //!
+   TBranch        *b_MuEntry_Position_Y;   //!
+   TBranch        *b_MuEntry_Position_Z;   //!
+   TBranch        *b_Hits_sTGC_nSimHits;   //!
+   TBranch        *b_Hits_sTGC_trackId;   //!
+   TBranch        *b_Hits_sTGC_isInsideBounds;   //!
+   TBranch        *b_Hits_sTGC_globalTime;   //!
+   TBranch        *b_Hits_sTGC_hitGlobalPositionX;   //!
+   TBranch        *b_Hits_sTGC_hitGlobalPositionY;   //!
+   TBranch        *b_Hits_sTGC_hitGlobalPositionZ;   //!
+   TBranch        *b_Hits_sTGC_hitGlobalPositionR;   //!
+   TBranch        *b_Hits_sTGC_hitGlobalPositionP;   //!
+   TBranch        *b_Hits_sTGC_hitGlobalDirectionX;   //!
+   TBranch        *b_Hits_sTGC_hitGlobalDirectionY;   //!
+   TBranch        *b_Hits_sTGC_hitGlobalDirectionZ;   //!
+   TBranch        *b_Hits_sTGC_hitLocalPositionX;   //!
+   TBranch        *b_Hits_sTGC_hitLocalPositionY;   //!
+   TBranch        *b_Hits_sTGC_hitLocalPositionZ;   //!
+   TBranch        *b_Hits_sTGC_detector_globalPositionX;   //!
+   TBranch        *b_Hits_sTGC_detector_globalPositionY;   //!
+   TBranch        *b_Hits_sTGC_detector_globalPositionZ;   //!
+   TBranch        *b_Hits_sTGC_detector_globalPositionR;   //!
+   TBranch        *b_Hits_sTGC_detector_globalPositionP;   //!
+   TBranch        *b_Hits_sTGC_hitToDsurfacePositionX;   //!
+   TBranch        *b_Hits_sTGC_hitToDsurfacePositionY;   //!
+   TBranch        *b_Hits_sTGC_hitToDsurfacePositionZ;   //!
+   TBranch        *b_Hits_sTGC_hitToRsurfacePositionX;   //!
+   TBranch        *b_Hits_sTGC_hitToRsurfacePositionY;   //!
+   TBranch        *b_Hits_sTGC_hitToRsurfacePositionZ;   //!
+   TBranch        *b_Hits_sTGC_FastDigitRsurfacePositionX;   //!
+   TBranch        *b_Hits_sTGC_FastDigitRsurfacePositionY;   //!
+   TBranch        *b_Hits_sTGC_particleEncoding;   //!
+   TBranch        *b_Hits_sTGC_kineticEnergy;   //!
+   TBranch        *b_Hits_sTGC_depositEnergy;   //!
+   TBranch        *b_Hits_sTGC_StepLength;   //!
+   TBranch        *b_Hits_sTGC_sim_stationName;   //!
+   TBranch        *b_Hits_sTGC_wedgeId;   //!
+   TBranch        *b_Hits_sTGC_wedgeType;   //!
+   TBranch        *b_Hits_sTGC_detectorNumber;   //!
+   TBranch        *b_Hits_sTGC_sim_stationEta;   //!
+   TBranch        *b_Hits_sTGC_sim_stationPhi;   //!
+   TBranch        *b_Hits_sTGC_sim_multilayer;   //!
+   TBranch        *b_Hits_sTGC_sim_layer;   //!
+   TBranch        *b_Hits_sTGC_sim_side;   //!
+   TBranch        *b_Hits_sTGC_stripNumber;   //!
+   TBranch        *b_Hits_sTGC_wireNumber;   //!
+   TBranch        *b_Hits_sTGC_off_stationName;   //!
+   TBranch        *b_Hits_sTGC_off_stationEta;   //!
+   TBranch        *b_Hits_sTGC_off_stationPhi;   //!
+   TBranch        *b_Hits_sTGC_off_multiplet;   //!
+   TBranch        *b_Hits_sTGC_off_gas_gap;   //!
+   TBranch        *b_Hits_sTGC_off_channel_type;   //!
+   TBranch        *b_Hits_sTGC_off_channel;   //!
+   TBranch        *b_Digits_sTGC_n;   //!
+   TBranch        *b_Digits_sTGC_Pad_Digits_n;   //!
+   TBranch        *b_Digits_sTGC_time;   //!
+   TBranch        *b_Digits_sTGC_bctag;   //!
+   TBranch        *b_Digits_sTGC_charge;   //!
+   TBranch        *b_Digits_sTGC_isDead;   //!
+   TBranch        *b_Digits_sTGC_isPileup;   //!
+   TBranch        *b_Digits_sTGC_stationName;   //!
+   TBranch        *b_Digits_sTGC_stationEta;   //!
+   TBranch        *b_Digits_sTGC_stationPhi;   //!
+   TBranch        *b_Digits_sTGC_multiplet;   //!
+   TBranch        *b_Digits_sTGC_gas_gap;   //!
+   TBranch        *b_Digits_sTGC_channel_type;   //!
+   TBranch        *b_Digits_sTGC_channel;   //!
+   TBranch        *b_Digits_sTGC_stationEtaMin;   //!
+   TBranch        *b_Digits_sTGC_stationEtaMax;   //!
+   TBranch        *b_Digits_sTGC_stationPhiMin;   //!
+   TBranch        *b_Digits_sTGC_stationPhiMax;   //!
+   TBranch        *b_Digits_sTGC_gas_gapMin;   //!
+   TBranch        *b_Digits_sTGC_gas_gapMax;   //!
+   TBranch        *b_Digits_sTGC_padEta;   //!
+   TBranch        *b_Digits_sTGC_padPhi;   //!
+   TBranch        *b_Digits_sTGC_numberOfMultilayers;   //!
+   TBranch        *b_Digits_sTGC_multilayerMin;   //!
+   TBranch        *b_Digits_sTGC_multilayerMax;   //!
+   TBranch        *b_Digits_sTGC_channelTypeMin;   //!
+   TBranch        *b_Digits_sTGC_channelTypeMax;   //!
+   TBranch        *b_Digits_sTGC_channelMin;   //!
+   TBranch        *b_Digits_sTGC_channelMax;   //!
+   TBranch        *b_Digits_sTGC_channelNumber;   //!
+   TBranch        *b_Digits_sTGC_channelPosX;   //!
+   TBranch        *b_Digits_sTGC_channelPosY;   //!
+   TBranch        *b_Digits_sTGC_localPosX;   //!
+   TBranch        *b_Digits_sTGC_localPosY;   //!
+   TBranch        *b_Digits_sTGC_globalPosX;   //!
+   TBranch        *b_Digits_sTGC_globalPosY;   //!
+   TBranch        *b_Digits_sTGC_globalPosZ;   //!
+   TBranch        *b_Digits_sTGC_PadglobalCornerPosX;   //!
+   TBranch        *b_Digits_sTGC_PadglobalCornerPosY;   //!
+   TBranch        *b_Digits_sTGC_PadglobalCornerPosZ;   //!
+   TBranch        *b_SDOs_sTGC_n;   //!
+   TBranch        *b_SDO_sTGC_stationName;   //!
+   TBranch        *b_SDO_sTGC_stationEta;   //!
+   TBranch        *b_SDO_sTGC_stationPhi;   //!
+   TBranch        *b_SDO_sTGC_multiplet;   //!
+   TBranch        *b_SDO_sTGC_gas_gap;   //!
+   TBranch        *b_SDO_sTGC_channel;   //!
+   TBranch        *b_SDO_sTGC_channel_type;   //!
+   TBranch        *b_SDO_sTGC_word;   //!
+   TBranch        *b_SDO_sTGC_barcode;   //!
+   TBranch        *b_SDO_sTGC_globalPosX;   //!
+   TBranch        *b_SDO_sTGC_globalPosY;   //!
+   TBranch        *b_SDO_sTGC_globalPosZ;   //!
+   TBranch        *b_SDO_sTGC_global_time;   //!
+   TBranch        *b_SDO_sTGC_Energy;   //!
+   TBranch        *b_SDO_sTGC_tof;   //!
+   TBranch        *b_SDO_sTGC_localPosX;   //!
+   TBranch        *b_SDO_sTGC_localPosY;   //!
+   TBranch        *b_RDO_sTGC_n;   //!
+   TBranch        *b_RDO_sTGC_stationName;   //!
+   TBranch        *b_RDO_sTGC_stationEta;   //!
+   TBranch        *b_RDO_sTGC_stationPhi;   //!
+   TBranch        *b_RDO_sTGC_multiplet;   //!
+   TBranch        *b_RDO_sTGC_gas_gap;   //!
+   TBranch        *b_RDO_sTGC_channel;   //!
+   TBranch        *b_RDO_sTGC_channel_type;   //!
+   TBranch        *b_RDO_sTGC_time;   //!
+   TBranch        *b_RDO_sTGC_charge;   //!
+   TBranch        *b_RDO_sTGC_bcTag;   //!
+   TBranch        *b_RDO_sTGC_isDead;   //!
+   TBranch        *b_PRDs_sTGC_n;   //!
+   TBranch        *b_PRD_sTGC_stationName;   //!
+   TBranch        *b_PRD_sTGC_stationEta;   //!
+   TBranch        *b_PRD_sTGC_stationPhi;   //!
+   TBranch        *b_PRD_sTGC_multiplet;   //!
+   TBranch        *b_PRD_sTGC_gas_gap;   //!
+   TBranch        *b_PRD_sTGC_channel_type;   //!
+   TBranch        *b_PRD_sTGC_channel;   //!
+   TBranch        *b_PRD_sTGC_globalPosX;   //!
+   TBranch        *b_PRD_sTGC_globalPosY;   //!
+   TBranch        *b_PRD_sTGC_globalPosZ;   //!
+   TBranch        *b_PRD_sTGC_localPosX;   //!
+   TBranch        *b_PRD_sTGC_localPosY;   //!
+   TBranch        *b_PRD_sTGC_covMatrix_1_1;   //!
+   TBranch        *b_PRD_sTGC_covMatrix_2_2;   //!
+   TBranch        *b_Hits_MM_n;   //!
+   TBranch        *b_Hits_MM_trackId;   //!
+   TBranch        *b_Hits_MM_isInsideBounds;   //!
+   TBranch        *b_Hits_MM_globalTime;   //!
+   TBranch        *b_Hits_MM_hitGlobalPositionX;   //!
+   TBranch        *b_Hits_MM_hitGlobalPositionY;   //!
+   TBranch        *b_Hits_MM_hitGlobalPositionZ;   //!
+   TBranch        *b_Hits_MM_hitGlobalPositionR;   //!
+   TBranch        *b_Hits_MM_hitGlobalPositionP;   //!
+   TBranch        *b_Hits_MM_hitGlobalDirectionX;   //!
+   TBranch        *b_Hits_MM_hitGlobalDirectionY;   //!
+   TBranch        *b_Hits_MM_hitGlobalDirectionZ;   //!
+   TBranch        *b_Hits_MM_hitLocalPositionX;   //!
+   TBranch        *b_Hits_MM_hitLocalPositionY;   //!
+   TBranch        *b_Hits_MM_hitLocalPositionZ;   //!
+   TBranch        *b_Hits_MM_detector_globalPositionX;   //!
+   TBranch        *b_Hits_MM_detector_globalPositionY;   //!
+   TBranch        *b_Hits_MM_detector_globalPositionZ;   //!
+   TBranch        *b_Hits_MM_detector_globalPositionR;   //!
+   TBranch        *b_Hits_MM_detector_globalPositionP;   //!
+   TBranch        *b_Hits_MM_hitToDsurfacePositionX;   //!
+   TBranch        *b_Hits_MM_hitToDsurfacePositionY;   //!
+   TBranch        *b_Hits_MM_hitToDsurfacePositionZ;   //!
+   TBranch        *b_Hits_MM_hitToRsurfacePositionX;   //!
+   TBranch        *b_Hits_MM_hitToRsurfacePositionY;   //!
+   TBranch        *b_Hits_MM_hitToRsurfacePositionZ;   //!
+   TBranch        *b_Hits_MM_FastDigitRsurfacePositionX;   //!
+   TBranch        *b_Hits_MM_FastDigitRsurfacePositionY;   //!
+   TBranch        *b_Hits_MM_particleEncoding;   //!
+   TBranch        *b_Hits_MM_kineticEnergy;   //!
+   TBranch        *b_Hits_MM_depositEnergy;   //!
+   TBranch        *b_Hits_MM_StepLength;   //!
+   TBranch        *b_Hits_MM_sim_stationName;   //!
+   TBranch        *b_Hits_MM_sim_stationEta;   //!
+   TBranch        *b_Hits_MM_sim_stationPhi;   //!
+   TBranch        *b_Hits_MM_sim_multilayer;   //!
+   TBranch        *b_Hits_MM_sim_layer;   //!
+   TBranch        *b_Hits_MM_sim_side;   //!
+   TBranch        *b_Hits_MM_off_stationName;   //!
+   TBranch        *b_Hits_MM_off_stationEta;   //!
+   TBranch        *b_Hits_MM_off_stationPhi;   //!
+   TBranch        *b_Hits_MM_off_multiplet;   //!
+   TBranch        *b_Hits_MM_off_gas_gap;   //!
+   TBranch        *b_Hits_MM_off_channel;   //!
+   TBranch        *b_Digits_MM_n;   //!
+   TBranch        *b_Digits_MM_stationName;   //!
+   TBranch        *b_Digits_MM_stationEta;   //!
+   TBranch        *b_Digits_MM_stationPhi;   //!
+   TBranch        *b_Digits_MM_multiplet;   //!
+   TBranch        *b_Digits_MM_gas_gap;   //!
+   TBranch        *b_Digits_MM_channel;   //!
+   TBranch        *b_Digits_MM_time;   //!
+   TBranch        *b_Digits_MM_charge;   //!
+   TBranch        *b_Digits_MM_stripPosition;   //!
+   TBranch        *b_Digits_MM_stripLposX;   //!
+   TBranch        *b_Digits_MM_stripLposY;   //!
+   TBranch        *b_Digits_MM_stripGposX;   //!
+   TBranch        *b_Digits_MM_stripGposY;   //!
+   TBranch        *b_Digits_MM_stripGposZ;   //!
+   TBranch        *b_Digits_MM_stripResponse_time;   //!
+   TBranch        *b_Digits_MM_stripResponse_charge;   //!
+   TBranch        *b_Digits_MM_stripResponse_stripPosition;   //!
+   TBranch        *b_Digits_MM_stripResponse_stripLposX;   //!
+   TBranch        *b_Digits_MM_stripResponse_stripLposY;   //!
+   TBranch        *b_Digits_MM_stripresponse_stripGposX;   //!
+   TBranch        *b_Digits_MM_stripResponse_stripGposY;   //!
+   TBranch        *b_Digits_MM_stripResponse_stripGposZ;   //!
+   TBranch        *b_Digits_MM_time_trigger;   //!
+   TBranch        *b_Digits_MM_charge_trigger;   //!
+   TBranch        *b_Digits_MM_position_trigger;   //!
+   TBranch        *b_Digits_MM_MMFE_VMM_id_trigger;   //!
+   TBranch        *b_Digits_MM_VMM_id_trigger;   //!
+   TBranch        *b_SDOs_MM_n;   //!
+   TBranch        *b_SDO_MM_stationName;   //!
+   TBranch        *b_SDO_MM_stationEta;   //!
+   TBranch        *b_SDO_MM_stationPhi;   //!
+   TBranch        *b_SDO_MM_multiplet;   //!
+   TBranch        *b_SDO_MM_gas_gap;   //!
+   TBranch        *b_SDO_MM_channel;   //!
+   TBranch        *b_SDO_MM_word;   //!
+   TBranch        *b_SDO_MM_barcode;   //!
+   TBranch        *b_SDO_MM_globalPosX;   //!
+   TBranch        *b_SDO_MM_globalPosY;   //!
+   TBranch        *b_SDO_MM_globalPosZ;   //!
+   TBranch        *b_SDO_MM_global_time;   //!
+   TBranch        *b_SDO_MM_localPosX;   //!
+   TBranch        *b_SDO_MM_localPosY;   //!
+   TBranch        *b_RDO_MM_n;   //!
+   TBranch        *b_RDO_MM_stationName;   //!
+   TBranch        *b_RDO_MM_stationEta;   //!
+   TBranch        *b_RDO_MM_stationPhi;   //!
+   TBranch        *b_RDO_MM_multiplet;   //!
+   TBranch        *b_RDO_MM_gas_gap;   //!
+   TBranch        *b_RDO_MM_channel;   //!
+   TBranch        *b_RDO_MM_time;   //!
+   TBranch        *b_RDO_MM_charge;   //!
+   TBranch        *b_PRDs_MM_n;   //!
+   TBranch        *b_PRD_MM_stationName;   //!
+   TBranch        *b_PRD_MM_stationEta;   //!
+   TBranch        *b_PRD_MM_stationPhi;   //!
+   TBranch        *b_PRD_MM_multiplet;   //!
+   TBranch        *b_PRD_MM_gas_gap;   //!
+   TBranch        *b_PRD_MM_channel;   //!
+   TBranch        *b_PRD_MM_globalPosX;   //!
+   TBranch        *b_PRD_MM_globalPosY;   //!
+   TBranch        *b_PRD_MM_globalPosZ;   //!
+   TBranch        *b_PRD_MM_localPosX;   //!
+   TBranch        *b_PRD_MM_localPosY;   //!
+   TBranch        *b_PRD_MM_covMatrix_1_1;   //!
+
+   NSWstudies(TTree *tree=0);
+   virtual ~NSWstudies();
+   virtual Int_t    Cut(Long64_t entry);
+   virtual Int_t    GetEntry(Long64_t entry);
+   virtual Long64_t LoadTree(Long64_t entry);
+   virtual void     Init(TTree *tree);
+   virtual void     Loop();
+   virtual Bool_t   Notify();
+   virtual void     Show(Long64_t entry = -1);
+};
+
+#endif
+
+#ifdef NSWstudies_cxx
+NSWstudies::NSWstudies(TTree *tree) : fChain(0) 
+{
+// if parameter tree is not specified (or zero), connect the file
+// used to generate this class and read the Tree.
+   if (tree == 0) {
+      TFile *f = (TFile*)gROOT->GetListOfFiles()->FindObject("NSWPRDValAlg.reco.ntuple.root");
+      if (!f || !f->IsOpen()) {
+         f = new TFile("NSWPRDValAlg.reco.ntuple.root");
+      }
+      f->GetObject("NSWValTree",tree);
+
+   }
+   Init(tree);
+}
+
+NSWstudies::~NSWstudies()
+{
+   if (!fChain) return;
+   delete fChain->GetCurrentFile();
+}
+
+Int_t NSWstudies::GetEntry(Long64_t entry)
+{
+// Read contents of entry.
+   if (!fChain) return 0;
+   return fChain->GetEntry(entry);
+}
+Long64_t NSWstudies::LoadTree(Long64_t entry)
+{
+// Set the environment to read one entry
+   if (!fChain) return -5;
+   Long64_t centry = fChain->LoadTree(entry);
+   if (centry < 0) return centry;
+   if (fChain->GetTreeNumber() != fCurrent) {
+      fCurrent = fChain->GetTreeNumber();
+      Notify();
+   }
+   return centry;
+}
+
+void NSWstudies::Init(TTree *tree)
+{
+   // The Init() function is called when the selector needs to initialize
+   // a new tree or chain. Typically here the branch addresses and branch
+   // pointers of the tree will be set.
+   // It is normally not necessary to make changes to the generated
+   // code, but the routine can be extended by the user if needed.
+   // Init() will be called many times when running on PROOF
+   // (once per file to be processed).
+
+   // Set object pointer
+   TruthVertex_X = 0;
+   TruthVertex_Y = 0;
+   TruthVertex_Z = 0;
+   TruthVertex_T = 0;
+   TruthVertex_Id = 0;
+   TruthParticle_Pt = 0;
+   TruthParticle_Eta = 0;
+   TruthParticle_Phi = 0;
+   TruthParticle_E = 0;
+   TruthParticle_M = 0;
+   TruthParticle_Pdg = 0;
+   TruthParticle_Status = 0;
+   TruthParticle_Barcode = 0;
+   TruthParticle_Production_vertex_id = 0;
+   TruthParticle_End_vertex_id = 0;
+   MuEntry_Particle_Pt = 0;
+   MuEntry_Particle_Eta = 0;
+   MuEntry_Particle_Phi = 0;
+   MuEntry_Particle_Pdg = 0;
+   MuEntry_Particle_Barcode = 0;
+   MuEntry_Position_Eta = 0;
+   MuEntry_Position_Phi = 0;
+   MuEntry_Position_X = 0;
+   MuEntry_Position_Y = 0;
+   MuEntry_Position_Z = 0;
+   Hits_sTGC_trackId = 0;
+   Hits_sTGC_isInsideBounds = 0;
+   Hits_sTGC_globalTime = 0;
+   Hits_sTGC_hitGlobalPositionX = 0;
+   Hits_sTGC_hitGlobalPositionY = 0;
+   Hits_sTGC_hitGlobalPositionZ = 0;
+   Hits_sTGC_hitGlobalPositionR = 0;
+   Hits_sTGC_hitGlobalPositionP = 0;
+   Hits_sTGC_hitGlobalDirectionX = 0;
+   Hits_sTGC_hitGlobalDirectionY = 0;
+   Hits_sTGC_hitGlobalDirectionZ = 0;
+   Hits_sTGC_hitLocalPositionX = 0;
+   Hits_sTGC_hitLocalPositionY = 0;
+   Hits_sTGC_hitLocalPositionZ = 0;
+   Hits_sTGC_detector_globalPositionX = 0;
+   Hits_sTGC_detector_globalPositionY = 0;
+   Hits_sTGC_detector_globalPositionZ = 0;
+   Hits_sTGC_detector_globalPositionR = 0;
+   Hits_sTGC_detector_globalPositionP = 0;
+   Hits_sTGC_hitToDsurfacePositionX = 0;
+   Hits_sTGC_hitToDsurfacePositionY = 0;
+   Hits_sTGC_hitToDsurfacePositionZ = 0;
+   Hits_sTGC_hitToRsurfacePositionX = 0;
+   Hits_sTGC_hitToRsurfacePositionY = 0;
+   Hits_sTGC_hitToRsurfacePositionZ = 0;
+   Hits_sTGC_FastDigitRsurfacePositionX = 0;
+   Hits_sTGC_FastDigitRsurfacePositionY = 0;
+   Hits_sTGC_particleEncoding = 0;
+   Hits_sTGC_kineticEnergy = 0;
+   Hits_sTGC_depositEnergy = 0;
+   Hits_sTGC_StepLength = 0;
+   Hits_sTGC_sim_stationName = 0;
+   Hits_sTGC_wedgeId = 0;
+   Hits_sTGC_wedgeType = 0;
+   Hits_sTGC_detectorNumber = 0;
+   Hits_sTGC_sim_stationEta = 0;
+   Hits_sTGC_sim_stationPhi = 0;
+   Hits_sTGC_sim_multilayer = 0;
+   Hits_sTGC_sim_layer = 0;
+   Hits_sTGC_sim_side = 0;
+   Hits_sTGC_stripNumber = 0;
+   Hits_sTGC_wireNumber = 0;
+   Hits_sTGC_off_stationName = 0;
+   Hits_sTGC_off_stationEta = 0;
+   Hits_sTGC_off_stationPhi = 0;
+   Hits_sTGC_off_multiplet = 0;
+   Hits_sTGC_off_gas_gap = 0;
+   Hits_sTGC_off_channel_type = 0;
+   Hits_sTGC_off_channel = 0;
+   Digits_sTGC_time = 0;
+   Digits_sTGC_bctag = 0;
+   Digits_sTGC_charge = 0;
+   Digits_sTGC_isDead = 0;
+   Digits_sTGC_isPileup = 0;
+   Digits_sTGC_stationName = 0;
+   Digits_sTGC_stationEta = 0;
+   Digits_sTGC_stationPhi = 0;
+   Digits_sTGC_multiplet = 0;
+   Digits_sTGC_gas_gap = 0;
+   Digits_sTGC_channel_type = 0;
+   Digits_sTGC_channel = 0;
+   Digits_sTGC_stationEtaMin = 0;
+   Digits_sTGC_stationEtaMax = 0;
+   Digits_sTGC_stationPhiMin = 0;
+   Digits_sTGC_stationPhiMax = 0;
+   Digits_sTGC_gas_gapMin = 0;
+   Digits_sTGC_gas_gapMax = 0;
+   Digits_sTGC_padEta = 0;
+   Digits_sTGC_padPhi = 0;
+   Digits_sTGC_numberOfMultilayers = 0;
+   Digits_sTGC_multilayerMin = 0;
+   Digits_sTGC_multilayerMax = 0;
+   Digits_sTGC_channelTypeMin = 0;
+   Digits_sTGC_channelTypeMax = 0;
+   Digits_sTGC_channelMin = 0;
+   Digits_sTGC_channelMax = 0;
+   Digits_sTGC_channelNumber = 0;
+   Digits_sTGC_channelPosX = 0;
+   Digits_sTGC_channelPosY = 0;
+   Digits_sTGC_localPosX = 0;
+   Digits_sTGC_localPosY = 0;
+   Digits_sTGC_globalPosX = 0;
+   Digits_sTGC_globalPosY = 0;
+   Digits_sTGC_globalPosZ = 0;
+   Digits_sTGC_PadglobalCornerPosX = 0;
+   Digits_sTGC_PadglobalCornerPosY = 0;
+   Digits_sTGC_PadglobalCornerPosZ = 0;
+   SDO_sTGC_stationName = 0;
+   SDO_sTGC_stationEta = 0;
+   SDO_sTGC_stationPhi = 0;
+   SDO_sTGC_multiplet = 0;
+   SDO_sTGC_gas_gap = 0;
+   SDO_sTGC_channel = 0;
+   SDO_sTGC_channel_type = 0;
+   SDO_sTGC_word = 0;
+   SDO_sTGC_barcode = 0;
+   SDO_sTGC_globalPosX = 0;
+   SDO_sTGC_globalPosY = 0;
+   SDO_sTGC_globalPosZ = 0;
+   SDO_sTGC_global_time = 0;
+   SDO_sTGC_Energy = 0;
+   SDO_sTGC_tof = 0;
+   SDO_sTGC_localPosX = 0;
+   SDO_sTGC_localPosY = 0;
+   RDO_sTGC_stationName = 0;
+   RDO_sTGC_stationEta = 0;
+   RDO_sTGC_stationPhi = 0;
+   RDO_sTGC_multiplet = 0;
+   RDO_sTGC_gas_gap = 0;
+   RDO_sTGC_channel = 0;
+   RDO_sTGC_channel_type = 0;
+   RDO_sTGC_time = 0;
+   RDO_sTGC_charge = 0;
+   RDO_sTGC_bcTag = 0;
+   RDO_sTGC_isDead = 0;
+   PRD_sTGC_stationName = 0;
+   PRD_sTGC_stationEta = 0;
+   PRD_sTGC_stationPhi = 0;
+   PRD_sTGC_multiplet = 0;
+   PRD_sTGC_gas_gap = 0;
+   PRD_sTGC_channel_type = 0;
+   PRD_sTGC_channel = 0;
+   PRD_sTGC_globalPosX = 0;
+   PRD_sTGC_globalPosY = 0;
+   PRD_sTGC_globalPosZ = 0;
+   PRD_sTGC_localPosX = 0;
+   PRD_sTGC_localPosY = 0;
+   PRD_sTGC_covMatrix_1_1 = 0;
+   PRD_sTGC_covMatrix_2_2 = 0;
+   Hits_MM_trackId = 0;
+   Hits_MM_isInsideBounds = 0;
+   Hits_MM_globalTime = 0;
+   Hits_MM_hitGlobalPositionX = 0;
+   Hits_MM_hitGlobalPositionY = 0;
+   Hits_MM_hitGlobalPositionZ = 0;
+   Hits_MM_hitGlobalPositionR = 0;
+   Hits_MM_hitGlobalPositionP = 0;
+   Hits_MM_hitGlobalDirectionX = 0;
+   Hits_MM_hitGlobalDirectionY = 0;
+   Hits_MM_hitGlobalDirectionZ = 0;
+   Hits_MM_hitLocalPositionX = 0;
+   Hits_MM_hitLocalPositionY = 0;
+   Hits_MM_hitLocalPositionZ = 0;
+   Hits_MM_detector_globalPositionX = 0;
+   Hits_MM_detector_globalPositionY = 0;
+   Hits_MM_detector_globalPositionZ = 0;
+   Hits_MM_detector_globalPositionR = 0;
+   Hits_MM_detector_globalPositionP = 0;
+   Hits_MM_hitToDsurfacePositionX = 0;
+   Hits_MM_hitToDsurfacePositionY = 0;
+   Hits_MM_hitToDsurfacePositionZ = 0;
+   Hits_MM_hitToRsurfacePositionX = 0;
+   Hits_MM_hitToRsurfacePositionY = 0;
+   Hits_MM_hitToRsurfacePositionZ = 0;
+   Hits_MM_FastDigitRsurfacePositionX = 0;
+   Hits_MM_FastDigitRsurfacePositionY = 0;
+   Hits_MM_particleEncoding = 0;
+   Hits_MM_kineticEnergy = 0;
+   Hits_MM_depositEnergy = 0;
+   Hits_MM_StepLength = 0;
+   Hits_MM_sim_stationName = 0;
+   Hits_MM_sim_stationEta = 0;
+   Hits_MM_sim_stationPhi = 0;
+   Hits_MM_sim_multilayer = 0;
+   Hits_MM_sim_layer = 0;
+   Hits_MM_sim_side = 0;
+   Hits_MM_off_stationName = 0;
+   Hits_MM_off_stationEta = 0;
+   Hits_MM_off_stationPhi = 0;
+   Hits_MM_off_multiplet = 0;
+   Hits_MM_off_gas_gap = 0;
+   Hits_MM_off_channel = 0;
+   Digits_MM_stationName = 0;
+   Digits_MM_stationEta = 0;
+   Digits_MM_stationPhi = 0;
+   Digits_MM_multiplet = 0;
+   Digits_MM_gas_gap = 0;
+   Digits_MM_channel = 0;
+   Digits_MM_time = 0;
+   Digits_MM_charge = 0;
+   Digits_MM_stripPosition = 0;
+   Digits_MM_stripLposX = 0;
+   Digits_MM_stripLposY = 0;
+   Digits_MM_stripGposX = 0;
+   Digits_MM_stripGposY = 0;
+   Digits_MM_stripGposZ = 0;
+   Digits_MM_stripResponse_time = 0;
+   Digits_MM_stripResponse_charge = 0;
+   Digits_MM_stripResponse_stripPosition = 0;
+   Digits_MM_stripResponse_stripLposX = 0;
+   Digits_MM_stripResponse_stripLposY = 0;
+   Digits_MM_stripresponse_stripGposX = 0;
+   Digits_MM_stripResponse_stripGposY = 0;
+   Digits_MM_stripResponse_stripGposZ = 0;
+   Digits_MM_time_trigger = 0;
+   Digits_MM_charge_trigger = 0;
+   Digits_MM_position_trigger = 0;
+   Digits_MM_MMFE_VMM_id_trigger = 0;
+   Digits_MM_VMM_id_trigger = 0;
+   SDO_MM_stationName = 0;
+   SDO_MM_stationEta = 0;
+   SDO_MM_stationPhi = 0;
+   SDO_MM_multiplet = 0;
+   SDO_MM_gas_gap = 0;
+   SDO_MM_channel = 0;
+   SDO_MM_word = 0;
+   SDO_MM_barcode = 0;
+   SDO_MM_globalPosX = 0;
+   SDO_MM_globalPosY = 0;
+   SDO_MM_globalPosZ = 0;
+   SDO_MM_global_time = 0;
+   SDO_MM_localPosX = 0;
+   SDO_MM_localPosY = 0;
+   RDO_MM_stationName = 0;
+   RDO_MM_stationEta = 0;
+   RDO_MM_stationPhi = 0;
+   RDO_MM_multiplet = 0;
+   RDO_MM_gas_gap = 0;
+   RDO_MM_channel = 0;
+   RDO_MM_time = 0;
+   RDO_MM_charge = 0;
+   PRD_MM_stationName = 0;
+   PRD_MM_stationEta = 0;
+   PRD_MM_stationPhi = 0;
+   PRD_MM_multiplet = 0;
+   PRD_MM_gas_gap = 0;
+   PRD_MM_channel = 0;
+   PRD_MM_globalPosX = 0;
+   PRD_MM_globalPosY = 0;
+   PRD_MM_globalPosZ = 0;
+   PRD_MM_localPosX = 0;
+   PRD_MM_localPosY = 0;
+   PRD_MM_covMatrix_1_1 = 0;
+   // Set branch addresses and branch pointers
+   if (!tree) return;
+   fChain = tree;
+   fCurrent = -1;
+   fChain->SetMakeClass(1);
+
+   fChain->SetBranchAddress("runNumber", &runNumber, &b_runNumber);
+   fChain->SetBranchAddress("eventNumber", &eventNumber, &b_eventNumber);
+   fChain->SetBranchAddress("TruthVertex_n", &TruthVertex_n, &b_TruthVertex_n);
+   fChain->SetBranchAddress("TruthVertex_X", &TruthVertex_X, &b_TruthVertex_X);
+   fChain->SetBranchAddress("TruthVertex_Y", &TruthVertex_Y, &b_TruthVertex_Y);
+   fChain->SetBranchAddress("TruthVertex_Z", &TruthVertex_Z, &b_TruthVertex_Z);
+   fChain->SetBranchAddress("TruthVertex_T", &TruthVertex_T, &b_TruthVertex_T);
+   fChain->SetBranchAddress("TruthVertex_Id", &TruthVertex_Id, &b_TruthVertex_Id);
+   fChain->SetBranchAddress("TruthParticle_n", &TruthParticle_n, &b_TruthParticle_n);
+   fChain->SetBranchAddress("TruthParticle_Pt", &TruthParticle_Pt, &b_TruthParticle_Pt);
+   fChain->SetBranchAddress("TruthParticle_Eta", &TruthParticle_Eta, &b_TruthParticle_Eta);
+   fChain->SetBranchAddress("TruthParticle_Phi", &TruthParticle_Phi, &b_TruthParticle_Phi);
+   fChain->SetBranchAddress("TruthParticle_E", &TruthParticle_E, &b_TruthParticle_E);
+   fChain->SetBranchAddress("TruthParticle_M", &TruthParticle_M, &b_TruthParticle_M);
+   fChain->SetBranchAddress("TruthParticle_Pdg", &TruthParticle_Pdg, &b_TruthParticle_Pdg);
+   fChain->SetBranchAddress("TruthParticle_Status", &TruthParticle_Status, &b_TruthParticle_Status);
+   fChain->SetBranchAddress("TruthParticle_Barcode", &TruthParticle_Barcode, &b_TruthParticle_Barcode);
+   fChain->SetBranchAddress("TruthParticle_Production_vertex_id", &TruthParticle_Production_vertex_id, &b_TruthParticle_Production_vertex_id);
+   fChain->SetBranchAddress("TruthParticle_End_vertex_id", &TruthParticle_End_vertex_id, &b_TruthParticle_End_vertex_id);
+   fChain->SetBranchAddress("MuEntry_Particle_n", &MuEntry_Particle_n, &b_MuEntryParticle_n);
+   fChain->SetBranchAddress("MuEntry_Particle_Pt", &MuEntry_Particle_Pt, &b_MuEntry_Particle_Pt);
+   fChain->SetBranchAddress("MuEntry_Particle_Eta", &MuEntry_Particle_Eta, &b_MuEntry_Particle_Eta);
+   fChain->SetBranchAddress("MuEntry_Particle_Phi", &MuEntry_Particle_Phi, &b_MuEntry_Particle_Phi);
+   fChain->SetBranchAddress("MuEntry_Particle_Pdg", &MuEntry_Particle_Pdg, &b_MuEntry_Particle_Pdg);
+   fChain->SetBranchAddress("MuEntry_Particle_Barcode", &MuEntry_Particle_Barcode, &b_MuEntry_Particle_Barcode);
+   fChain->SetBranchAddress("MuEntry_Position_Eta", &MuEntry_Position_Eta, &b_MuEntry_Position_Eta);
+   fChain->SetBranchAddress("MuEntry_Position_Phi", &MuEntry_Position_Phi, &b_MuEntry_Position_Phi);
+   fChain->SetBranchAddress("MuEntry_Position_X", &MuEntry_Position_X, &b_MuEntry_Position_X);
+   fChain->SetBranchAddress("MuEntry_Position_Y", &MuEntry_Position_Y, &b_MuEntry_Position_Y);
+   fChain->SetBranchAddress("MuEntry_Position_Z", &MuEntry_Position_Z, &b_MuEntry_Position_Z);
+   fChain->SetBranchAddress("Hits_sTGC_n", &Hits_sTGC_n, &b_Hits_sTGC_nSimHits);
+   fChain->SetBranchAddress("Hits_sTGC_trackId", &Hits_sTGC_trackId, &b_Hits_sTGC_trackId);
+   fChain->SetBranchAddress("Hits_sTGC_isInsideBounds", &Hits_sTGC_isInsideBounds, &b_Hits_sTGC_isInsideBounds);
+   fChain->SetBranchAddress("Hits_sTGC_globalTime", &Hits_sTGC_globalTime, &b_Hits_sTGC_globalTime);
+   fChain->SetBranchAddress("Hits_sTGC_hitGlobalPositionX", &Hits_sTGC_hitGlobalPositionX, &b_Hits_sTGC_hitGlobalPositionX);
+   fChain->SetBranchAddress("Hits_sTGC_hitGlobalPositionY", &Hits_sTGC_hitGlobalPositionY, &b_Hits_sTGC_hitGlobalPositionY);
+   fChain->SetBranchAddress("Hits_sTGC_hitGlobalPositionZ", &Hits_sTGC_hitGlobalPositionZ, &b_Hits_sTGC_hitGlobalPositionZ);
+   fChain->SetBranchAddress("Hits_sTGC_hitGlobalPositionR", &Hits_sTGC_hitGlobalPositionR, &b_Hits_sTGC_hitGlobalPositionR);
+   fChain->SetBranchAddress("Hits_sTGC_hitGlobalPositionP", &Hits_sTGC_hitGlobalPositionP, &b_Hits_sTGC_hitGlobalPositionP);
+   fChain->SetBranchAddress("Hits_sTGC_hitGlobalDirectionX", &Hits_sTGC_hitGlobalDirectionX, &b_Hits_sTGC_hitGlobalDirectionX);
+   fChain->SetBranchAddress("Hits_sTGC_hitGlobalDirectionY", &Hits_sTGC_hitGlobalDirectionY, &b_Hits_sTGC_hitGlobalDirectionY);
+   fChain->SetBranchAddress("Hits_sTGC_hitGlobalDirectionZ", &Hits_sTGC_hitGlobalDirectionZ, &b_Hits_sTGC_hitGlobalDirectionZ);
+   fChain->SetBranchAddress("Hits_sTGC_hitLocalPositionX", &Hits_sTGC_hitLocalPositionX, &b_Hits_sTGC_hitLocalPositionX);
+   fChain->SetBranchAddress("Hits_sTGC_hitLocalPositionY", &Hits_sTGC_hitLocalPositionY, &b_Hits_sTGC_hitLocalPositionY);
+   fChain->SetBranchAddress("Hits_sTGC_hitLocalPositionZ", &Hits_sTGC_hitLocalPositionZ, &b_Hits_sTGC_hitLocalPositionZ);
+   fChain->SetBranchAddress("Hits_sTGC_detector_globalPositionX", &Hits_sTGC_detector_globalPositionX, &b_Hits_sTGC_detector_globalPositionX);
+   fChain->SetBranchAddress("Hits_sTGC_detector_globalPositionY", &Hits_sTGC_detector_globalPositionY, &b_Hits_sTGC_detector_globalPositionY);
+   fChain->SetBranchAddress("Hits_sTGC_detector_globalPositionZ", &Hits_sTGC_detector_globalPositionZ, &b_Hits_sTGC_detector_globalPositionZ);
+   fChain->SetBranchAddress("Hits_sTGC_detector_globalPositionR", &Hits_sTGC_detector_globalPositionR, &b_Hits_sTGC_detector_globalPositionR);
+   fChain->SetBranchAddress("Hits_sTGC_detector_globalPositionP", &Hits_sTGC_detector_globalPositionP, &b_Hits_sTGC_detector_globalPositionP);
+   fChain->SetBranchAddress("Hits_sTGC_hitToDsurfacePositionX", &Hits_sTGC_hitToDsurfacePositionX, &b_Hits_sTGC_hitToDsurfacePositionX);
+   fChain->SetBranchAddress("Hits_sTGC_hitToDsurfacePositionY", &Hits_sTGC_hitToDsurfacePositionY, &b_Hits_sTGC_hitToDsurfacePositionY);
+   fChain->SetBranchAddress("Hits_sTGC_hitToDsurfacePositionZ", &Hits_sTGC_hitToDsurfacePositionZ, &b_Hits_sTGC_hitToDsurfacePositionZ);
+   fChain->SetBranchAddress("Hits_sTGC_hitToRsurfacePositionX", &Hits_sTGC_hitToRsurfacePositionX, &b_Hits_sTGC_hitToRsurfacePositionX);
+   fChain->SetBranchAddress("Hits_sTGC_hitToRsurfacePositionY", &Hits_sTGC_hitToRsurfacePositionY, &b_Hits_sTGC_hitToRsurfacePositionY);
+   fChain->SetBranchAddress("Hits_sTGC_hitToRsurfacePositionZ", &Hits_sTGC_hitToRsurfacePositionZ, &b_Hits_sTGC_hitToRsurfacePositionZ);
+   fChain->SetBranchAddress("Hits_sTGC_FastDigitRsurfacePositionX", &Hits_sTGC_FastDigitRsurfacePositionX, &b_Hits_sTGC_FastDigitRsurfacePositionX);
+   fChain->SetBranchAddress("Hits_sTGC_FastDigitRsurfacePositionY", &Hits_sTGC_FastDigitRsurfacePositionY, &b_Hits_sTGC_FastDigitRsurfacePositionY);
+   fChain->SetBranchAddress("Hits_sTGC_particleEncoding", &Hits_sTGC_particleEncoding, &b_Hits_sTGC_particleEncoding);
+   fChain->SetBranchAddress("Hits_sTGC_kineticEnergy", &Hits_sTGC_kineticEnergy, &b_Hits_sTGC_kineticEnergy);
+   fChain->SetBranchAddress("Hits_sTGC_depositEnergy", &Hits_sTGC_depositEnergy, &b_Hits_sTGC_depositEnergy);
+   fChain->SetBranchAddress("Hits_sTGC_StepLength", &Hits_sTGC_StepLength, &b_Hits_sTGC_StepLength);
+   fChain->SetBranchAddress("Hits_sTGC_sim_stationName", &Hits_sTGC_sim_stationName, &b_Hits_sTGC_sim_stationName);
+   fChain->SetBranchAddress("Hits_sTGC_wedgeId", &Hits_sTGC_wedgeId, &b_Hits_sTGC_wedgeId);
+   fChain->SetBranchAddress("Hits_sTGC_wedgeType", &Hits_sTGC_wedgeType, &b_Hits_sTGC_wedgeType);
+   fChain->SetBranchAddress("Hits_sTGC_detectorNumber", &Hits_sTGC_detectorNumber, &b_Hits_sTGC_detectorNumber);
+   fChain->SetBranchAddress("Hits_sTGC_sim_stationEta", &Hits_sTGC_sim_stationEta, &b_Hits_sTGC_sim_stationEta);
+   fChain->SetBranchAddress("Hits_sTGC_sim_stationPhi", &Hits_sTGC_sim_stationPhi, &b_Hits_sTGC_sim_stationPhi);
+   fChain->SetBranchAddress("Hits_sTGC_sim_multilayer", &Hits_sTGC_sim_multilayer, &b_Hits_sTGC_sim_multilayer);
+   fChain->SetBranchAddress("Hits_sTGC_sim_layer", &Hits_sTGC_sim_layer, &b_Hits_sTGC_sim_layer);
+   fChain->SetBranchAddress("Hits_sTGC_sim_side", &Hits_sTGC_sim_side, &b_Hits_sTGC_sim_side);
+   fChain->SetBranchAddress("Hits_sTGC_stripNumber", &Hits_sTGC_stripNumber, &b_Hits_sTGC_stripNumber);
+   fChain->SetBranchAddress("Hits_sTGC_wireNumber", &Hits_sTGC_wireNumber, &b_Hits_sTGC_wireNumber);
+   fChain->SetBranchAddress("Hits_sTGC_off_stationName", &Hits_sTGC_off_stationName, &b_Hits_sTGC_off_stationName);
+   fChain->SetBranchAddress("Hits_sTGC_off_stationEta", &Hits_sTGC_off_stationEta, &b_Hits_sTGC_off_stationEta);
+   fChain->SetBranchAddress("Hits_sTGC_off_stationPhi", &Hits_sTGC_off_stationPhi, &b_Hits_sTGC_off_stationPhi);
+   fChain->SetBranchAddress("Hits_sTGC_off_multiplet", &Hits_sTGC_off_multiplet, &b_Hits_sTGC_off_multiplet);
+   fChain->SetBranchAddress("Hits_sTGC_off_gas_gap", &Hits_sTGC_off_gas_gap, &b_Hits_sTGC_off_gas_gap);
+   fChain->SetBranchAddress("Hits_sTGC_off_channel_type", &Hits_sTGC_off_channel_type, &b_Hits_sTGC_off_channel_type);
+   fChain->SetBranchAddress("Hits_sTGC_off_channel", &Hits_sTGC_off_channel, &b_Hits_sTGC_off_channel);
+   fChain->SetBranchAddress("Digits_sTGC", &Digits_sTGC, &b_Digits_sTGC_n);
+   fChain->SetBranchAddress("Digits_sTGC_Pad_Digits", &Digits_sTGC_Pad_Digits, &b_Digits_sTGC_Pad_Digits_n);
+   fChain->SetBranchAddress("Digits_sTGC_time", &Digits_sTGC_time, &b_Digits_sTGC_time);
+   fChain->SetBranchAddress("Digits_sTGC_bctag", &Digits_sTGC_bctag, &b_Digits_sTGC_bctag);
+   fChain->SetBranchAddress("Digits_sTGC_charge", &Digits_sTGC_charge, &b_Digits_sTGC_charge);
+   fChain->SetBranchAddress("Digits_sTGC_isDead", &Digits_sTGC_isDead, &b_Digits_sTGC_isDead);
+   fChain->SetBranchAddress("Digits_sTGC_isPileup", &Digits_sTGC_isPileup, &b_Digits_sTGC_isPileup);
+   fChain->SetBranchAddress("Digits_sTGC_stationName", &Digits_sTGC_stationName, &b_Digits_sTGC_stationName);
+   fChain->SetBranchAddress("Digits_sTGC_stationEta", &Digits_sTGC_stationEta, &b_Digits_sTGC_stationEta);
+   fChain->SetBranchAddress("Digits_sTGC_stationPhi", &Digits_sTGC_stationPhi, &b_Digits_sTGC_stationPhi);
+   fChain->SetBranchAddress("Digits_sTGC_multiplet", &Digits_sTGC_multiplet, &b_Digits_sTGC_multiplet);
+   fChain->SetBranchAddress("Digits_sTGC_gas_gap", &Digits_sTGC_gas_gap, &b_Digits_sTGC_gas_gap);
+   fChain->SetBranchAddress("Digits_sTGC_channel_type", &Digits_sTGC_channel_type, &b_Digits_sTGC_channel_type);
+   fChain->SetBranchAddress("Digits_sTGC_channel", &Digits_sTGC_channel, &b_Digits_sTGC_channel);
+   fChain->SetBranchAddress("Digits_sTGC_stationEtaMin", &Digits_sTGC_stationEtaMin, &b_Digits_sTGC_stationEtaMin);
+   fChain->SetBranchAddress("Digits_sTGC_stationEtaMax", &Digits_sTGC_stationEtaMax, &b_Digits_sTGC_stationEtaMax);
+   fChain->SetBranchAddress("Digits_sTGC_stationPhiMin", &Digits_sTGC_stationPhiMin, &b_Digits_sTGC_stationPhiMin);
+   fChain->SetBranchAddress("Digits_sTGC_stationPhiMax", &Digits_sTGC_stationPhiMax, &b_Digits_sTGC_stationPhiMax);
+   fChain->SetBranchAddress("Digits_sTGC_gas_gapMin", &Digits_sTGC_gas_gapMin, &b_Digits_sTGC_gas_gapMin);
+   fChain->SetBranchAddress("Digits_sTGC_gas_gapMax", &Digits_sTGC_gas_gapMax, &b_Digits_sTGC_gas_gapMax);
+   fChain->SetBranchAddress("Digits_sTGC_padEta", &Digits_sTGC_padEta, &b_Digits_sTGC_padEta);
+   fChain->SetBranchAddress("Digits_sTGC_padPhi", &Digits_sTGC_padPhi, &b_Digits_sTGC_padPhi);
+   fChain->SetBranchAddress("Digits_sTGC_numberOfMultilayers", &Digits_sTGC_numberOfMultilayers, &b_Digits_sTGC_numberOfMultilayers);
+   fChain->SetBranchAddress("Digits_sTGC_multilayerMin", &Digits_sTGC_multilayerMin, &b_Digits_sTGC_multilayerMin);
+   fChain->SetBranchAddress("Digits_sTGC_multilayerMax", &Digits_sTGC_multilayerMax, &b_Digits_sTGC_multilayerMax);
+   fChain->SetBranchAddress("Digits_sTGC_channelTypeMin", &Digits_sTGC_channelTypeMin, &b_Digits_sTGC_channelTypeMin);
+   fChain->SetBranchAddress("Digits_sTGC_channelTypeMax", &Digits_sTGC_channelTypeMax, &b_Digits_sTGC_channelTypeMax);
+   fChain->SetBranchAddress("Digits_sTGC_channelMin", &Digits_sTGC_channelMin, &b_Digits_sTGC_channelMin);
+   fChain->SetBranchAddress("Digits_sTGC_channelMax", &Digits_sTGC_channelMax, &b_Digits_sTGC_channelMax);
+   fChain->SetBranchAddress("Digits_sTGC_channelNumber", &Digits_sTGC_channelNumber, &b_Digits_sTGC_channelNumber);
+   fChain->SetBranchAddress("Digits_sTGC_channelPosX", &Digits_sTGC_channelPosX, &b_Digits_sTGC_channelPosX);
+   fChain->SetBranchAddress("Digits_sTGC_channelPosY", &Digits_sTGC_channelPosY, &b_Digits_sTGC_channelPosY);
+   fChain->SetBranchAddress("Digits_sTGC_localPosX", &Digits_sTGC_localPosX, &b_Digits_sTGC_localPosX);
+   fChain->SetBranchAddress("Digits_sTGC_localPosY", &Digits_sTGC_localPosY, &b_Digits_sTGC_localPosY);
+   fChain->SetBranchAddress("Digits_sTGC_globalPosX", &Digits_sTGC_globalPosX, &b_Digits_sTGC_globalPosX);
+   fChain->SetBranchAddress("Digits_sTGC_globalPosY", &Digits_sTGC_globalPosY, &b_Digits_sTGC_globalPosY);
+   fChain->SetBranchAddress("Digits_sTGC_globalPosZ", &Digits_sTGC_globalPosZ, &b_Digits_sTGC_globalPosZ);
+   fChain->SetBranchAddress("Digits_sTGC_PadglobalCornerPosX", &Digits_sTGC_PadglobalCornerPosX, &b_Digits_sTGC_PadglobalCornerPosX);
+   fChain->SetBranchAddress("Digits_sTGC_PadglobalCornerPosY", &Digits_sTGC_PadglobalCornerPosY, &b_Digits_sTGC_PadglobalCornerPosY);
+   fChain->SetBranchAddress("Digits_sTGC_PadglobalCornerPosZ", &Digits_sTGC_PadglobalCornerPosZ, &b_Digits_sTGC_PadglobalCornerPosZ);
+   fChain->SetBranchAddress("SDO_sTGC", &SDO_sTGC, &b_SDOs_sTGC_n);
+   fChain->SetBranchAddress("SDO_sTGC_stationName", &SDO_sTGC_stationName, &b_SDO_sTGC_stationName);
+   fChain->SetBranchAddress("SDO_sTGC_stationEta", &SDO_sTGC_stationEta, &b_SDO_sTGC_stationEta);
+   fChain->SetBranchAddress("SDO_sTGC_stationPhi", &SDO_sTGC_stationPhi, &b_SDO_sTGC_stationPhi);
+   fChain->SetBranchAddress("SDO_sTGC_multiplet", &SDO_sTGC_multiplet, &b_SDO_sTGC_multiplet);
+   fChain->SetBranchAddress("SDO_sTGC_gas_gap", &SDO_sTGC_gas_gap, &b_SDO_sTGC_gas_gap);
+   fChain->SetBranchAddress("SDO_sTGC_channel", &SDO_sTGC_channel, &b_SDO_sTGC_channel);
+   fChain->SetBranchAddress("SDO_sTGC_channel_type", &SDO_sTGC_channel_type, &b_SDO_sTGC_channel_type);
+   fChain->SetBranchAddress("SDO_sTGC_word", &SDO_sTGC_word, &b_SDO_sTGC_word);
+   fChain->SetBranchAddress("SDO_sTGC_barcode", &SDO_sTGC_barcode, &b_SDO_sTGC_barcode);
+   fChain->SetBranchAddress("SDO_sTGC_globalPosX", &SDO_sTGC_globalPosX, &b_SDO_sTGC_globalPosX);
+   fChain->SetBranchAddress("SDO_sTGC_globalPosY", &SDO_sTGC_globalPosY, &b_SDO_sTGC_globalPosY);
+   fChain->SetBranchAddress("SDO_sTGC_globalPosZ", &SDO_sTGC_globalPosZ, &b_SDO_sTGC_globalPosZ);
+   fChain->SetBranchAddress("SDO_sTGC_global_time", &SDO_sTGC_global_time, &b_SDO_sTGC_global_time);
+   fChain->SetBranchAddress("SDO_sTGC_Energy", &SDO_sTGC_Energy, &b_SDO_sTGC_Energy);
+   fChain->SetBranchAddress("SDO_sTGC_tof", &SDO_sTGC_tof, &b_SDO_sTGC_tof);
+   fChain->SetBranchAddress("SDO_sTGC_localPosX", &SDO_sTGC_localPosX, &b_SDO_sTGC_localPosX);
+   fChain->SetBranchAddress("SDO_sTGC_localPosY", &SDO_sTGC_localPosY, &b_SDO_sTGC_localPosY);
+   fChain->SetBranchAddress("RDO_sTGC_n", &RDO_sTGC_n, &b_RDO_sTGC_n);
+   fChain->SetBranchAddress("RDO_sTGC_stationName", &RDO_sTGC_stationName, &b_RDO_sTGC_stationName);
+   fChain->SetBranchAddress("RDO_sTGC_stationEta", &RDO_sTGC_stationEta, &b_RDO_sTGC_stationEta);
+   fChain->SetBranchAddress("RDO_sTGC_stationPhi", &RDO_sTGC_stationPhi, &b_RDO_sTGC_stationPhi);
+   fChain->SetBranchAddress("RDO_sTGC_multiplet", &RDO_sTGC_multiplet, &b_RDO_sTGC_multiplet);
+   fChain->SetBranchAddress("RDO_sTGC_gas_gap", &RDO_sTGC_gas_gap, &b_RDO_sTGC_gas_gap);
+   fChain->SetBranchAddress("RDO_sTGC_channel", &RDO_sTGC_channel, &b_RDO_sTGC_channel);
+   fChain->SetBranchAddress("RDO_sTGC_channel_type", &RDO_sTGC_channel_type, &b_RDO_sTGC_channel_type);
+   fChain->SetBranchAddress("RDO_sTGC_time", &RDO_sTGC_time, &b_RDO_sTGC_time);
+   fChain->SetBranchAddress("RDO_sTGC_charge", &RDO_sTGC_charge, &b_RDO_sTGC_charge);
+   fChain->SetBranchAddress("RDO_sTGC_bcTag", &RDO_sTGC_bcTag, &b_RDO_sTGC_bcTag);
+   fChain->SetBranchAddress("RDO_sTGC_isDead", &RDO_sTGC_isDead, &b_RDO_sTGC_isDead);
+   fChain->SetBranchAddress("PRD_sTGC", &PRD_sTGC, &b_PRDs_sTGC_n);
+   fChain->SetBranchAddress("PRD_sTGC_stationName", &PRD_sTGC_stationName, &b_PRD_sTGC_stationName);
+   fChain->SetBranchAddress("PRD_sTGC_stationEta", &PRD_sTGC_stationEta, &b_PRD_sTGC_stationEta);
+   fChain->SetBranchAddress("PRD_sTGC_stationPhi", &PRD_sTGC_stationPhi, &b_PRD_sTGC_stationPhi);
+   fChain->SetBranchAddress("PRD_sTGC_multiplet", &PRD_sTGC_multiplet, &b_PRD_sTGC_multiplet);
+   fChain->SetBranchAddress("PRD_sTGC_gas_gap", &PRD_sTGC_gas_gap, &b_PRD_sTGC_gas_gap);
+   fChain->SetBranchAddress("PRD_sTGC_channel_type", &PRD_sTGC_channel_type, &b_PRD_sTGC_channel_type);
+   fChain->SetBranchAddress("PRD_sTGC_channel", &PRD_sTGC_channel, &b_PRD_sTGC_channel);
+   fChain->SetBranchAddress("PRD_sTGC_globalPosX", &PRD_sTGC_globalPosX, &b_PRD_sTGC_globalPosX);
+   fChain->SetBranchAddress("PRD_sTGC_globalPosY", &PRD_sTGC_globalPosY, &b_PRD_sTGC_globalPosY);
+   fChain->SetBranchAddress("PRD_sTGC_globalPosZ", &PRD_sTGC_globalPosZ, &b_PRD_sTGC_globalPosZ);
+   fChain->SetBranchAddress("PRD_sTGC_localPosX", &PRD_sTGC_localPosX, &b_PRD_sTGC_localPosX);
+   fChain->SetBranchAddress("PRD_sTGC_localPosY", &PRD_sTGC_localPosY, &b_PRD_sTGC_localPosY);
+   fChain->SetBranchAddress("PRD_sTGC_covMatrix_1_1", &PRD_sTGC_covMatrix_1_1, &b_PRD_sTGC_covMatrix_1_1);
+   fChain->SetBranchAddress("PRD_sTGC_covMatrix_2_2", &PRD_sTGC_covMatrix_2_2, &b_PRD_sTGC_covMatrix_2_2);
+   fChain->SetBranchAddress("Hits_MM_n", &Hits_MM_n, &b_Hits_MM_n);
+   fChain->SetBranchAddress("Hits_MM_trackId", &Hits_MM_trackId, &b_Hits_MM_trackId);
+   fChain->SetBranchAddress("Hits_MM_isInsideBounds", &Hits_MM_isInsideBounds, &b_Hits_MM_isInsideBounds);
+   fChain->SetBranchAddress("Hits_MM_globalTime", &Hits_MM_globalTime, &b_Hits_MM_globalTime);
+   fChain->SetBranchAddress("Hits_MM_hitGlobalPositionX", &Hits_MM_hitGlobalPositionX, &b_Hits_MM_hitGlobalPositionX);
+   fChain->SetBranchAddress("Hits_MM_hitGlobalPositionY", &Hits_MM_hitGlobalPositionY, &b_Hits_MM_hitGlobalPositionY);
+   fChain->SetBranchAddress("Hits_MM_hitGlobalPositionZ", &Hits_MM_hitGlobalPositionZ, &b_Hits_MM_hitGlobalPositionZ);
+   fChain->SetBranchAddress("Hits_MM_hitGlobalPositionR", &Hits_MM_hitGlobalPositionR, &b_Hits_MM_hitGlobalPositionR);
+   fChain->SetBranchAddress("Hits_MM_hitGlobalPositionP", &Hits_MM_hitGlobalPositionP, &b_Hits_MM_hitGlobalPositionP);
+   fChain->SetBranchAddress("Hits_MM_hitGlobalDirectionX", &Hits_MM_hitGlobalDirectionX, &b_Hits_MM_hitGlobalDirectionX);
+   fChain->SetBranchAddress("Hits_MM_hitGlobalDirectionY", &Hits_MM_hitGlobalDirectionY, &b_Hits_MM_hitGlobalDirectionY);
+   fChain->SetBranchAddress("Hits_MM_hitGlobalDirectionZ", &Hits_MM_hitGlobalDirectionZ, &b_Hits_MM_hitGlobalDirectionZ);
+   fChain->SetBranchAddress("Hits_MM_hitLocalPositionX", &Hits_MM_hitLocalPositionX, &b_Hits_MM_hitLocalPositionX);
+   fChain->SetBranchAddress("Hits_MM_hitLocalPositionY", &Hits_MM_hitLocalPositionY, &b_Hits_MM_hitLocalPositionY);
+   fChain->SetBranchAddress("Hits_MM_hitLocalPositionZ", &Hits_MM_hitLocalPositionZ, &b_Hits_MM_hitLocalPositionZ);
+   fChain->SetBranchAddress("Hits_MM_detector_globalPositionX", &Hits_MM_detector_globalPositionX, &b_Hits_MM_detector_globalPositionX);
+   fChain->SetBranchAddress("Hits_MM_detector_globalPositionY", &Hits_MM_detector_globalPositionY, &b_Hits_MM_detector_globalPositionY);
+   fChain->SetBranchAddress("Hits_MM_detector_globalPositionZ", &Hits_MM_detector_globalPositionZ, &b_Hits_MM_detector_globalPositionZ);
+   fChain->SetBranchAddress("Hits_MM_detector_globalPositionR", &Hits_MM_detector_globalPositionR, &b_Hits_MM_detector_globalPositionR);
+   fChain->SetBranchAddress("Hits_MM_detector_globalPositionP", &Hits_MM_detector_globalPositionP, &b_Hits_MM_detector_globalPositionP);
+   fChain->SetBranchAddress("Hits_MM_hitToDsurfacePositionX", &Hits_MM_hitToDsurfacePositionX, &b_Hits_MM_hitToDsurfacePositionX);
+   fChain->SetBranchAddress("Hits_MM_hitToDsurfacePositionY", &Hits_MM_hitToDsurfacePositionY, &b_Hits_MM_hitToDsurfacePositionY);
+   fChain->SetBranchAddress("Hits_MM_hitToDsurfacePositionZ", &Hits_MM_hitToDsurfacePositionZ, &b_Hits_MM_hitToDsurfacePositionZ);
+   fChain->SetBranchAddress("Hits_MM_hitToRsurfacePositionX", &Hits_MM_hitToRsurfacePositionX, &b_Hits_MM_hitToRsurfacePositionX);
+   fChain->SetBranchAddress("Hits_MM_hitToRsurfacePositionY", &Hits_MM_hitToRsurfacePositionY, &b_Hits_MM_hitToRsurfacePositionY);
+   fChain->SetBranchAddress("Hits_MM_hitToRsurfacePositionZ", &Hits_MM_hitToRsurfacePositionZ, &b_Hits_MM_hitToRsurfacePositionZ);
+   fChain->SetBranchAddress("Hits_MM_FastDigitRsurfacePositionX", &Hits_MM_FastDigitRsurfacePositionX, &b_Hits_MM_FastDigitRsurfacePositionX);
+   fChain->SetBranchAddress("Hits_MM_FastDigitRsurfacePositionY", &Hits_MM_FastDigitRsurfacePositionY, &b_Hits_MM_FastDigitRsurfacePositionY);
+   fChain->SetBranchAddress("Hits_MM_particleEncoding", &Hits_MM_particleEncoding, &b_Hits_MM_particleEncoding);
+   fChain->SetBranchAddress("Hits_MM_kineticEnergy", &Hits_MM_kineticEnergy, &b_Hits_MM_kineticEnergy);
+   fChain->SetBranchAddress("Hits_MM_depositEnergy", &Hits_MM_depositEnergy, &b_Hits_MM_depositEnergy);
+   fChain->SetBranchAddress("Hits_MM_StepLength", &Hits_MM_StepLength, &b_Hits_MM_StepLength);
+   fChain->SetBranchAddress("Hits_MM_sim_stationName", &Hits_MM_sim_stationName, &b_Hits_MM_sim_stationName);
+   fChain->SetBranchAddress("Hits_MM_sim_stationEta", &Hits_MM_sim_stationEta, &b_Hits_MM_sim_stationEta);
+   fChain->SetBranchAddress("Hits_MM_sim_stationPhi", &Hits_MM_sim_stationPhi, &b_Hits_MM_sim_stationPhi);
+   fChain->SetBranchAddress("Hits_MM_sim_multilayer", &Hits_MM_sim_multilayer, &b_Hits_MM_sim_multilayer);
+   fChain->SetBranchAddress("Hits_MM_sim_layer", &Hits_MM_sim_layer, &b_Hits_MM_sim_layer);
+   fChain->SetBranchAddress("Hits_MM_sim_side", &Hits_MM_sim_side, &b_Hits_MM_sim_side);
+   fChain->SetBranchAddress("Hits_MM_off_stationName", &Hits_MM_off_stationName, &b_Hits_MM_off_stationName);
+   fChain->SetBranchAddress("Hits_MM_off_stationEta", &Hits_MM_off_stationEta, &b_Hits_MM_off_stationEta);
+   fChain->SetBranchAddress("Hits_MM_off_stationPhi", &Hits_MM_off_stationPhi, &b_Hits_MM_off_stationPhi);
+   fChain->SetBranchAddress("Hits_MM_off_multiplet", &Hits_MM_off_multiplet, &b_Hits_MM_off_multiplet);
+   fChain->SetBranchAddress("Hits_MM_off_gas_gap", &Hits_MM_off_gas_gap, &b_Hits_MM_off_gas_gap);
+   fChain->SetBranchAddress("Hits_MM_off_channel", &Hits_MM_off_channel, &b_Hits_MM_off_channel);
+   fChain->SetBranchAddress("Digits_MM", &Digits_MM, &b_Digits_MM_n);
+   fChain->SetBranchAddress("Digits_MM_stationName", &Digits_MM_stationName, &b_Digits_MM_stationName);
+   fChain->SetBranchAddress("Digits_MM_stationEta", &Digits_MM_stationEta, &b_Digits_MM_stationEta);
+   fChain->SetBranchAddress("Digits_MM_stationPhi", &Digits_MM_stationPhi, &b_Digits_MM_stationPhi);
+   fChain->SetBranchAddress("Digits_MM_multiplet", &Digits_MM_multiplet, &b_Digits_MM_multiplet);
+   fChain->SetBranchAddress("Digits_MM_gas_gap", &Digits_MM_gas_gap, &b_Digits_MM_gas_gap);
+   fChain->SetBranchAddress("Digits_MM_channel", &Digits_MM_channel, &b_Digits_MM_channel);
+   fChain->SetBranchAddress("Digits_MM_time", &Digits_MM_time, &b_Digits_MM_time);
+   fChain->SetBranchAddress("Digits_MM_charge", &Digits_MM_charge, &b_Digits_MM_charge);
+   fChain->SetBranchAddress("Digits_MM_stripPosition", &Digits_MM_stripPosition, &b_Digits_MM_stripPosition);
+   fChain->SetBranchAddress("Digits_MM_stripLposX", &Digits_MM_stripLposX, &b_Digits_MM_stripLposX);
+   fChain->SetBranchAddress("Digits_MM_stripLposY", &Digits_MM_stripLposY, &b_Digits_MM_stripLposY);
+   fChain->SetBranchAddress("Digits_MM_stripGposX", &Digits_MM_stripGposX, &b_Digits_MM_stripGposX);
+   fChain->SetBranchAddress("Digits_MM_stripGposY", &Digits_MM_stripGposY, &b_Digits_MM_stripGposY);
+   fChain->SetBranchAddress("Digits_MM_stripGposZ", &Digits_MM_stripGposZ, &b_Digits_MM_stripGposZ);
+   fChain->SetBranchAddress("Digits_MM_stripResponse_time", &Digits_MM_stripResponse_time, &b_Digits_MM_stripResponse_time);
+   fChain->SetBranchAddress("Digits_MM_stripResponse_charge", &Digits_MM_stripResponse_charge, &b_Digits_MM_stripResponse_charge);
+   fChain->SetBranchAddress("Digits_MM_stripResponse_stripPosition", &Digits_MM_stripResponse_stripPosition, &b_Digits_MM_stripResponse_stripPosition);
+   fChain->SetBranchAddress("Digits_MM_stripResponse_stripLposX", &Digits_MM_stripResponse_stripLposX, &b_Digits_MM_stripResponse_stripLposX);
+   fChain->SetBranchAddress("Digits_MM_stripResponse_stripLposY", &Digits_MM_stripResponse_stripLposY, &b_Digits_MM_stripResponse_stripLposY);
+   fChain->SetBranchAddress("Digits_MM_stripresponse_stripGposX", &Digits_MM_stripresponse_stripGposX, &b_Digits_MM_stripresponse_stripGposX);
+   fChain->SetBranchAddress("Digits_MM_stripResponse_stripGposY", &Digits_MM_stripResponse_stripGposY, &b_Digits_MM_stripResponse_stripGposY);
+   fChain->SetBranchAddress("Digits_MM_stripResponse_stripGposZ", &Digits_MM_stripResponse_stripGposZ, &b_Digits_MM_stripResponse_stripGposZ);
+   fChain->SetBranchAddress("Digits_MM_time_trigger", &Digits_MM_time_trigger, &b_Digits_MM_time_trigger);
+   fChain->SetBranchAddress("Digits_MM_charge_trigger", &Digits_MM_charge_trigger, &b_Digits_MM_charge_trigger);
+   fChain->SetBranchAddress("Digits_MM_position_trigger", &Digits_MM_position_trigger, &b_Digits_MM_position_trigger);
+   fChain->SetBranchAddress("Digits_MM_MMFE_VMM_id_trigger", &Digits_MM_MMFE_VMM_id_trigger, &b_Digits_MM_MMFE_VMM_id_trigger);
+   fChain->SetBranchAddress("Digits_MM_VMM_id_trigger", &Digits_MM_VMM_id_trigger, &b_Digits_MM_VMM_id_trigger);
+   fChain->SetBranchAddress("SDO_MM", &SDO_MM, &b_SDOs_MM_n);
+   fChain->SetBranchAddress("SDO_MM_stationName", &SDO_MM_stationName, &b_SDO_MM_stationName);
+   fChain->SetBranchAddress("SDO_MM_stationEta", &SDO_MM_stationEta, &b_SDO_MM_stationEta);
+   fChain->SetBranchAddress("SDO_MM_stationPhi", &SDO_MM_stationPhi, &b_SDO_MM_stationPhi);
+   fChain->SetBranchAddress("SDO_MM_multiplet", &SDO_MM_multiplet, &b_SDO_MM_multiplet);
+   fChain->SetBranchAddress("SDO_MM_gas_gap", &SDO_MM_gas_gap, &b_SDO_MM_gas_gap);
+   fChain->SetBranchAddress("SDO_MM_channel", &SDO_MM_channel, &b_SDO_MM_channel);
+   fChain->SetBranchAddress("SDO_MM_word", &SDO_MM_word, &b_SDO_MM_word);
+   fChain->SetBranchAddress("SDO_MM_barcode", &SDO_MM_barcode, &b_SDO_MM_barcode);
+   fChain->SetBranchAddress("SDO_MM_globalPosX", &SDO_MM_globalPosX, &b_SDO_MM_globalPosX);
+   fChain->SetBranchAddress("SDO_MM_globalPosY", &SDO_MM_globalPosY, &b_SDO_MM_globalPosY);
+   fChain->SetBranchAddress("SDO_MM_globalPosZ", &SDO_MM_globalPosZ, &b_SDO_MM_globalPosZ);
+   fChain->SetBranchAddress("SDO_MM_global_time", &SDO_MM_global_time, &b_SDO_MM_global_time);
+   fChain->SetBranchAddress("SDO_MM_localPosX", &SDO_MM_localPosX, &b_SDO_MM_localPosX);
+   fChain->SetBranchAddress("SDO_MM_localPosY", &SDO_MM_localPosY, &b_SDO_MM_localPosY);
+   fChain->SetBranchAddress("RDO_MM_n", &RDO_MM_n, &b_RDO_MM_n);
+   fChain->SetBranchAddress("RDO_MM_stationName", &RDO_MM_stationName, &b_RDO_MM_stationName);
+   fChain->SetBranchAddress("RDO_MM_stationEta", &RDO_MM_stationEta, &b_RDO_MM_stationEta);
+   fChain->SetBranchAddress("RDO_MM_stationPhi", &RDO_MM_stationPhi, &b_RDO_MM_stationPhi);
+   fChain->SetBranchAddress("RDO_MM_multiplet", &RDO_MM_multiplet, &b_RDO_MM_multiplet);
+   fChain->SetBranchAddress("RDO_MM_gas_gap", &RDO_MM_gas_gap, &b_RDO_MM_gas_gap);
+   fChain->SetBranchAddress("RDO_MM_channel", &RDO_MM_channel, &b_RDO_MM_channel);
+   fChain->SetBranchAddress("RDO_MM_time", &RDO_MM_time, &b_RDO_MM_time);
+   fChain->SetBranchAddress("RDO_MM_charge", &RDO_MM_charge, &b_RDO_MM_charge);
+   fChain->SetBranchAddress("PRD_MM", &PRD_MM, &b_PRDs_MM_n);
+   fChain->SetBranchAddress("PRD_MM_stationName", &PRD_MM_stationName, &b_PRD_MM_stationName);
+   fChain->SetBranchAddress("PRD_MM_stationEta", &PRD_MM_stationEta, &b_PRD_MM_stationEta);
+   fChain->SetBranchAddress("PRD_MM_stationPhi", &PRD_MM_stationPhi, &b_PRD_MM_stationPhi);
+   fChain->SetBranchAddress("PRD_MM_multiplet", &PRD_MM_multiplet, &b_PRD_MM_multiplet);
+   fChain->SetBranchAddress("PRD_MM_gas_gap", &PRD_MM_gas_gap, &b_PRD_MM_gas_gap);
+   fChain->SetBranchAddress("PRD_MM_channel", &PRD_MM_channel, &b_PRD_MM_channel);
+   fChain->SetBranchAddress("PRD_MM_globalPosX", &PRD_MM_globalPosX, &b_PRD_MM_globalPosX);
+   fChain->SetBranchAddress("PRD_MM_globalPosY", &PRD_MM_globalPosY, &b_PRD_MM_globalPosY);
+   fChain->SetBranchAddress("PRD_MM_globalPosZ", &PRD_MM_globalPosZ, &b_PRD_MM_globalPosZ);
+   fChain->SetBranchAddress("PRD_MM_localPosX", &PRD_MM_localPosX, &b_PRD_MM_localPosX);
+   fChain->SetBranchAddress("PRD_MM_localPosY", &PRD_MM_localPosY, &b_PRD_MM_localPosY);
+   fChain->SetBranchAddress("PRD_MM_covMatrix_1_1", &PRD_MM_covMatrix_1_1, &b_PRD_MM_covMatrix_1_1);
+   Notify();
+}
+
+Bool_t NSWstudies::Notify()
+{
+   // The Notify() function is called when a new file is opened. This
+   // can be either for a new TTree in a TChain or when when a new TTree
+   // is started when using PROOF. It is normally not necessary to make changes
+   // to the generated code, but the routine can be extended by the
+   // user if needed. The return value is currently not used.
+
+   return kTRUE;
+}
+
+void NSWstudies::Show(Long64_t entry)
+{
+// Print contents of entry.
+// If entry is not specified, print current entry
+   if (!fChain) return;
+   fChain->Show(entry);
+}
+Int_t NSWstudies::Cut(Long64_t entry)
+{
+// This function may be called from Loop.
+// returns  1 if entry is accepted.
+// returns -1 otherwise.
+   return 1;
+}
+#endif // #ifdef NSWstudies_cxx
diff --git a/MuonSpectrometer/MuonValidation/MuonPRDTest/macros/NSWMatching_offline/NSWstudies_match.C b/MuonSpectrometer/MuonValidation/MuonPRDTest/macros/NSWMatching_offline/NSWstudies_match.C
new file mode 100644
index 0000000000000000000000000000000000000000..fc59bc4428ab917be247a67f2e6d641153516ebe
--- /dev/null
+++ b/MuonSpectrometer/MuonValidation/MuonPRDTest/macros/NSWMatching_offline/NSWstudies_match.C
@@ -0,0 +1,456 @@
+/*
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+*/
+
+#define NSWstudies_cxx
+#include <TH2.h>
+#include <TStyle.h>
+#include <TCanvas.h>
+#include <TFile.h>
+#include <TH1.h>
+#include <TH3.h>
+#include <cmath>
+#include <iostream>
+
+#include "../efficiency.C"
+
+#include "NSWstudies_match.h"
+#include "NSWstudies.h"
+
+using namespace std;
+
+void validateHits(Flocalize_collection& Hits, vector<bool>* insideBounds, vector<int>* pdgCodes);
+void init_hists (vector< TH1I* >& hist_vec, bool isMM, string datatype, string matchedwith);
+bool doEvt (int evtnr);
+void write_and_delete (vector< TH1I* > vec);
+void init_hist_pull (vector< TH1F*>& hist_pull);
+
+//Inputs
+int min_mismatched_channel = 0;
+int max_diff = 3;
+
+// log settings
+bool quiet = true;
+bool printDigits = false;
+bool printHits = false;
+
+// Helpers in development:
+// Validate hits beforehand
+bool digi_test = false;
+// Does the electron check do anything?
+bool doElectronCheck = true;
+
+
+// To test two data objects versus each other change the input of match_Hits_Digits and fillHists functions!!
+void NSWstudies::Loop()
+{
+   bool doMM = 1;
+   bool dosTGC = 1;
+
+   TFile *outFile = new TFile("RootFiles/NSWVal_Hists.root", "recreate");
+   vector< TH1I* > hist_MM_digits;
+   vector< TH1I* > hist_MM_hits;
+   vector< TH1I* > hist_sTGC_digits;
+   vector< TH1I* > hist_sTGC_hits;
+   TH2D *hist_MM_global_digits = new TH2D ("MM_Global_pos_mismatched_digits", "MM_Global_pos_mismatched_digits", 50, -6000., 6000., 50, -6000., 6000.);
+   TH2D *hist_MM_global_hits = new TH2D ("MM_Global_pos_mismatched_hits", "MM_Global_pos_mismatched_hits", 50, -6000., 6000., 50, -6000., 6000.);
+   TH2D *hist_sTGC_global_digits = new TH2D ("sTGC_Global_pos_mismatched_digits", "sTGC_Global_pos_mismatched_digits", 50, -6000., 6000., 50, -6000., 6000.);
+   TH2D *hist_sTGC_global_hits = new TH2D ("sTGC_Global_pos_mismatched_hits", "sTGC_Global_pos_mismatched_hits", 50, -6000., 6000., 50, -6000., 6000.);
+
+   vector< TH1F* > hist_pull;
+   init_hist_pull(hist_pull);
+
+//   In a ROOT session, you can do:
+//      root> .L NSWstudies.C
+//      root> NSWstudies t
+//      root> t.GetEntry(12); // Fill t data members with entry number 12
+//      root> t.Show();       // Show values of entry 12
+//      root> t.Show(16);     // Read and show values of entry 16
+//      root> t.Loop();       // Loop on all entriess
+//
+
+//     This is the loop skeleton where:
+//    jentry is the global entry number in the chain
+//    ientry is the entry number in the current Tree
+//  Note that the argument to GetEntry must be:
+//    jentry for TChain::GetEntry
+//    ientry for TTree::GetEntry and TBranch::GetEntry
+//
+//       To read only selected branches, Insert statements like:
+// METHOD1:
+//    fChain->SetBranchStatus("*",0);  // disable all branches
+//    fChain->SetBranchStatus("branchname",1);  // activate branchname
+// METHOD2: replace line
+//    fChain->GetEntry(jentry);       //read all branches
+//by  b_branchname->GetEntry(ientry); //read only this branch
+   if (fChain == 0) return;
+
+   Long64_t nentries = fChain->GetEntriesFast();
+
+   //DEBUG: look only at n events
+   Long64_t firstentry = 0;
+   //nentries = 100;
+
+   Long64_t jentry;
+   Long64_t nbytes = 0, nb = 0;
+   for (jentry=firstentry; jentry<nentries;jentry++) {
+      Long64_t ientry = LoadTree(jentry);
+      if (ientry < 0) break;
+      nb = fChain->GetEntry(jentry);   nbytes += nb;
+      if (!doEvt(eventNumber)) {continue;}
+      // if (Cut(ientry) < 0) continue;
+     
+      //only muon events:
+      bool allMu = true;
+      int mu_pdg = 13;
+      for (int pdg : *TruthParticle_Pdg) { allMu &= (abs(pdg) == mu_pdg); }
+      if (!allMu) { continue; }
+      
+      if (!quiet) {
+         printf("\n**** Event: %d ****\n", eventNumber);
+       /*  printf("\nMM's\n");printf("number of truthparticles: %lu\n", TruthParticle_Pdg->size());
+            for (int pdg : *TruthParticle_Pdg) { printf("   namely: %d\n", pdg);}
+            for (double Pt : *TruthParticle_Pt) { printf("  Pt: %f\n", Pt); }*/
+      }
+
+      if (dosTGC) {
+         Flocalize_collection oHits_sTGC ("Hits", Hits_sTGC_off_stationName, Hits_sTGC_off_stationEta, Hits_sTGC_off_stationPhi, Hits_sTGC_off_multiplet, Hits_sTGC_off_gas_gap, Hits_sTGC_off_channel, Hits_sTGC_off_channel_type);
+         if (digi_test) validateHits(oHits_sTGC, Hits_sTGC_isInsideBounds, Hits_sTGC_particleEncoding);
+         Flocalize_collection oDigits_sTGC ("Digits", Digits_sTGC_stationName, Digits_sTGC_stationEta, Digits_sTGC_stationPhi, Digits_sTGC_multiplet, Digits_sTGC_gas_gap, Digits_sTGC_channel, Digits_sTGC_channel_type);
+         Flocalize_collection oSDO_sTGC ("SDOs", SDO_sTGC_stationName, SDO_sTGC_stationEta, SDO_sTGC_stationPhi, SDO_sTGC_multiplet, SDO_sTGC_gas_gap, SDO_sTGC_channel, SDO_sTGC_channel_type);
+         Flocalize_collection oRDO_sTGC ("RDOs", RDO_sTGC_stationName, RDO_sTGC_stationEta, RDO_sTGC_stationPhi, RDO_sTGC_multiplet, RDO_sTGC_gas_gap, RDO_sTGC_channel, RDO_sTGC_channel_type);
+         Flocalize_collection oPRD_sTGC ("PRDs", PRD_sTGC_stationName, PRD_sTGC_stationEta, PRD_sTGC_stationPhi, PRD_sTGC_multiplet, PRD_sTGC_gas_gap, PRD_sTGC_channel, PRD_sTGC_channel_type);
+         match_Hits_Digits(oRDO_sTGC, oPRD_sTGC);
+         fillHists(oRDO_sTGC, hist_sTGC_hits);
+         fillHists(oPRD_sTGC, hist_sTGC_digits);
+
+         plotError (oPRD_sTGC, hist_pull);
+         
+         /*/Digits to Hits 2D:
+         for (unsigned int k = 0; k < oDigits_sTGC.size(); ++k) {
+            int diff = oDigits_sTGC.matchedchannel.at(k) - oDigits_sTGC.channel->at(k);
+            if ((oDigits_sTGC.matchedchannel.at(k) < 0 || abs(diff) > 3) && oDigits_sTGC.channel->at(k) > min_mismatched_channel) {
+               hist_sTGC_global_digits->Fill(Digits_sTGC_globalPosX->at(k), Digits_sTGC_globalPosY->at(k));
+            }
+         }
+         //Hits to Digits 2D:
+         for (unsigned int k = 0; k < oHits_sTGC.size(); ++k) {
+            int diff = oHits_sTGC.matchedchannel.at(k) - oHits_sTGC.channel->at(k);
+            if ((oHits_sTGC.matchedchannel.at(k) < 0 || abs(diff) > 3) && oHits_sTGC.channel->at(k) > min_mismatched_channel) {
+               hist_sTGC_global_hits->Fill(Hits_sTGC_detector_globalPositionX->at(k), Hits_sTGC_detector_globalPositionY->at(k));
+            }
+         }*/
+      }
+      if (doMM) {
+         // No channel type for MM!
+         Flocalize_collection oHits_MM ("Hits", Hits_MM_off_stationName, Hits_MM_off_stationEta, Hits_MM_off_stationPhi, Hits_MM_off_multiplet, Hits_MM_off_gas_gap, Hits_MM_off_channel);
+         if (digi_test) validateHits(oHits_MM, Hits_MM_isInsideBounds, Hits_MM_particleEncoding);
+         Flocalize_collection oDigits_MM ("Digits", Digits_MM_stationName, Digits_MM_stationEta, Digits_MM_stationPhi, Digits_MM_multiplet, Digits_MM_gas_gap, Digits_MM_channel);
+         Flocalize_collection oSDO_MM ("SDOs", SDO_MM_stationName, SDO_MM_stationEta, SDO_MM_stationPhi, SDO_MM_multiplet, SDO_MM_gas_gap, SDO_MM_channel);
+         Flocalize_collection oRDO_MM ("RDOs", RDO_MM_stationName, RDO_MM_stationEta, RDO_MM_stationPhi, RDO_MM_multiplet, RDO_MM_gas_gap, RDO_MM_channel);
+         Flocalize_collection oPRD_MM ("PRDs", PRD_MM_stationName, PRD_MM_stationEta, PRD_MM_stationPhi, PRD_MM_multiplet, PRD_MM_gas_gap, PRD_MM_channel);
+         match_Hits_Digits(oRDO_MM, oPRD_MM);
+         fillHists(oRDO_MM, hist_MM_hits);
+         fillHists(oPRD_MM, hist_MM_digits);
+
+         plotError (oPRD_MM, hist_pull);
+
+         /*/Digits to Hits 2D:
+         for (unsigned int k = 0; k < oDigits_MM.sizes(); ++k) {
+            int diff = oDigits_MM.matchedchannel.at(k) - oDigits_MM.channel->at(k);
+            if ((oDigits_MM.matchedchannel.at(k) < 0 || abs(diff) > 3) && oDigits_MM.channel->at(k) > min_mismatched_channel) {
+               hist_MM_global_digits->Fill(Digits_MM_globalPosX->at(k), Digits_MM_globalPosY->at(k));
+            }
+         }/
+         // //Hits to Digits 2D:
+         for (unsigned int k = 0; k < oHits_MM.size(); ++k) {
+            int diff = oHits_MM.matchedchannel.at(k) - oHits_MM.channel->at(k);
+            if ((oHits_MM.matchedchannel.at(k) < 0 || abs(diff) > 3) && oHits_MM.channel->at(k) > min_mismatched_channel) {
+               hist_MM_global_hits->Fill(Hits_MM_detector_globalPositionX->at(k), Hits_MM_detector_globalPositionY->at(k));
+            }
+         }*/
+      }
+   }
+   // Print efficiencies
+   float mm_digits, mm_hits, stgc_digits, stgc_hits, mm_hit_miss, stgc_hit_miss, mm_digit_miss, stgc_digit_miss;
+   if (doMM) {
+   	mm_digits = hist_MM_digits[1]->GetEntries();
+   	mm_hits = hist_MM_hits[1]->GetEntries();
+   	mm_hit_miss = hist_MM_hits[3]->GetEntries();
+   	mm_digit_miss = hist_MM_digits[3]->GetEntries();
+   	std::cout << "MM: Conversion forwards: ";
+   	efficiency(mm_hit_miss, mm_hits);
+   	std::cout << "MM: Conversion backwards: ";
+   	efficiency(mm_digit_miss, mm_digits);
+   } 
+   if (dosTGC) {
+	   stgc_digits = hist_sTGC_digits[1]->GetEntries();
+	   stgc_hits = hist_sTGC_hits[1]->GetEntries();
+	   stgc_hit_miss = hist_sTGC_hits[3]->GetEntries();
+	   stgc_digit_miss = hist_sTGC_digits[3]->GetEntries();
+   	std::cout << "sTGC: Conversion forwards: ";
+   	efficiency(stgc_hit_miss, stgc_hits);
+   	std::cout << "sTGC: Conversion backwards: ";
+   	efficiency(stgc_digit_miss, stgc_digits);
+   }
+   // Bookkeeping: MM: Digits
+   write_and_delete(hist_MM_digits);
+   if (doMM) hist_MM_global_digits->Write();
+   delete hist_MM_global_digits;
+   //Hits
+   write_and_delete(hist_MM_hits);
+   if (doMM) hist_MM_global_hits->Write();
+   delete hist_MM_global_hits;
+   // sTGC: Digits
+   write_and_delete(hist_sTGC_digits);
+   if (dosTGC) hist_sTGC_global_digits->Write();
+   delete hist_sTGC_global_digits;
+   // Hits
+   write_and_delete(hist_sTGC_hits);
+   if (dosTGC) hist_sTGC_global_hits->Write();
+   delete hist_sTGC_global_hits;
+   // 
+   for (TH1F* _h: hist_pull) {
+      _h->Write();
+      delete _h;
+   }
+   // File
+   delete outFile;
+}
+
+void validateHits(Flocalize_collection& Hits, vector<bool>* insideBounds, vector<int>* pdgCodes) {
+	//Function to take out hits which should not be digitized
+	bool accept_hit;
+	for (unsigned int i = 0; i < Hits.size(); ++i) {
+		accept_hit = true;
+		// check if hit is inside active volume
+		accept_hit &= insideBounds->at(i);
+		// check if hit is a muon hit
+		accept_hit &= abs(pdgCodes->at(i)) == 13;
+		// Alex: For the sTGC wire digits, channel numbers can only go up to 59. However I made it so that hits placed in the dead region are given the channelnumber 63. As 63 isn't a valid channel number, the digit isn't added.
+		if (!Hits.isMM) accept_hit &= (Hits.channel_type->at(i) != 2 || Hits.channel->at(i) != 63);
+		// Flag hits which should not be digitized
+		if (!accept_hit) { Hits.matchedchannel.at(i) = -100; }
+	}
+}
+
+
+void NSWstudies::match_Hits_Digits (Flocalize_collection& Hits, Flocalize_collection& Digits) {
+	static bool done_once = 0;
+	if (!done_once) { printf("Converting %s to %s\n", Hits.name.data(), Digits.name.data()); done_once = 1; } 
+   //first level check: sizes
+   if (!quiet) printf("About to match, size of Hits: %lu, size of Digits:%lu \n", Hits.size(), Digits.size());
+
+   for (unsigned int i = 0; i < Hits.size(); ++i)
+   {
+   	if (Hits.matchedchannel.at(i) == -100) { continue; }
+      //printf("current i: %d\n", i);
+      int nMatch = 0;
+      for (unsigned int j = 0; j < Digits.size(); ++j)
+      {
+         //printf("current j: %d\n", j);
+         if (Hits.at(i).isEqual( Digits.at(j) ) )
+         {
+            nMatch++;
+            Hits.update_match(i, Digits.channel->at(j), j);
+            Digits.update_match(j, Hits.channel->at(i), i);
+            //printf("Found Hits in Digits at Hits index: %d, and Digits index: %d\n", i, j);
+         }
+      }
+      if (quiet) continue;
+      //Check for other matches
+      if (nMatch > 1 && Digits.isMM) {
+         printf("\nWARNING: More than 1 match for MM!, namely: %d matches\n", nMatch);
+      }
+      if (nMatch == 0) {
+         printf("\nWARNING: No match found!\n");
+         printf("Hits info: \n");
+         Hits.at(i).printInfo();
+      }
+      //debug
+      if (nMatch == 1 ) { 
+         //printf("Found single Digit for this Hit!\n");
+         //(Hits.at(i).channel == Digits.at(jfound).channel) ? printf("Channels are the same: %d\n", Hits.at(i).channel) : printf("Channels are different: %d for Hit, %d for Digit\n", Hits.at(i).channel, Digits.at(jfound).channel);
+      }
+   }
+   Hits.matchedwith = Digits.name;
+	Digits.matchedwith = Hits.name;
+   if (printDigits) { printf("\nFull digits info (event: %d): \n", eventNumber); Digits.printInfo(); }
+   if (printHits) { printf("\nFull hits info (event: %d): \n", eventNumber); Hits.printInfo(); }
+ }
+
+void NSWstudies::fillHists (Flocalize_collection& oData, vector< TH1I* >& hist_vec) {
+   if (hist_vec.empty()) { init_hists(hist_vec, oData.isMM, oData.name, oData.matchedwith); }
+   TH1I* hist_diff = hist_vec[0];
+   TH1I* hist_ndigits = hist_vec[1];
+   TH1I* hist_match = hist_vec[2];
+   TH1I* hist_missmatch = hist_vec[3];
+   TH1I* hist_missmatched_evt = hist_vec[4];
+   TH1I* hist_missmatched_chc = hist_vec[5];
+   bool hasMissed = false;
+   for (unsigned int i = 0; i < oData.size(); ++i) { 
+      int diff = oData.matchedchannel.at(i) - oData.channel->at(i);
+      if (abs(diff) > 19 ) { diff = -20; /*printf("Matchedchannel more then 20 strips away! Matchedchannel: %d\n", oData.matchedchannel.at(i));*/ }
+      //Check if hit inside volume & only muon:
+      if (oData.matchedchannel.at(i) == -100) { continue; }
+      if (oData.name == "Hits" && !digi_test && doElectronCheck) {
+         if (oData.isMM) { 
+            bool accept_hit = Hits_MM_isInsideBounds->at(i) * (abs(Hits_MM_particleEncoding->at(i)) == 13);
+            //diff = accept_hit * diff; 
+            if (!accept_hit) { continue; }
+         } else { 
+         	// For the wire digits, channel numbers can only go up to 59. However I made it so that hits placed in the dead region are given the channelnumber 63. As 63 isn't a valid channel number, the digit isn't added.
+            bool accept_hit = Hits_sTGC_isInsideBounds->at(i) * 
+            						(abs(Hits_sTGC_particleEncoding->at(i)) == 13) * 
+            						(oData.channel_type->at(i) != 2 || oData.channel->at(i) != 63);
+            //diff = accept_hit * diff; 
+            if (!accept_hit) { continue; }
+         }
+      }
+      //
+      hist_diff->Fill(diff); 
+      int nextbin = oData.localize(i);
+      const char* eta_sign = (oData.stationEta->at(i) > 0) ? "+" : "-" ;
+      int cht = oData.isMM ? -1 : oData.channel_type->at(i);
+      TString binName;
+      binName.Form("#eta:%s,%s,mp:%d,gg:%d,cht:%d", eta_sign, oData.stationName->at(i).data(), oData.multiplet->at(i), oData.gas_gap->at(i), cht);
+      // Note bin numbering for setbinlabel starts at 1
+      hist_match->GetXaxis()->SetBinLabel(nextbin + 1, binName);
+      hist_missmatch->GetXaxis()->SetBinLabel(nextbin + 1, binName);
+      hist_ndigits->GetXaxis()->SetBinLabel(nextbin + 1, binName);
+      hist_ndigits->Fill(nextbin);
+      //Increment hist by 1 for each matched hit in matchedindices
+      //printf("size matchedindices: %d, empty: %d\n", oData.matchedindices.at(i).size() , 1 * oData.matchedindices.at(i).empty());
+      for (unsigned int j = 0; j < oData.matchedindices.at(i).size(); ++j) { 
+         hist_match->Fill(nextbin);
+      }
+      if (abs(diff) > max_diff && oData.channel->at(i) > min_mismatched_channel) { 
+         hist_missmatch->Fill(nextbin);
+         hist_missmatched_chc->Fill(oData.channel->at(i));
+         hasMissed = true;
+         if (!quiet) { printf("\nFound mismatched digit in event %d. Digit info:\n", eventNumber); oData.at(i).printInfo(); }
+      }
+   }
+   if (hasMissed) {
+      hist_missmatched_evt->Fill(eventNumber);
+   }
+}
+
+void init_hists (vector< TH1I* >& hist_vec, bool isMM, string datatype, string matchedwith) {
+   int ndigits;
+   const char* obj = datatype.c_str();
+   const char* type;
+   TString title;
+   if (isMM) {
+      ndigits = 34;
+      type = "MM";
+   } else {
+      ndigits = 100;
+      type = "sTGC";
+   }
+   title.Form("%s_Nearest_matched(%s)channel_minus_Channel_%s", type, matchedwith.c_str(), obj);
+   hist_vec.push_back( new TH1I (title.Data(), title.Data(), 40, -20, 20) );
+   hist_vec[0]->GetXaxis()->SetTitle("Difference(strips) (-20 = out of range)");
+   title.Form("%s_Occurence_of_%s", type, obj);
+   hist_vec.push_back( new TH1I (title.Data(), title.Data(), ndigits, 0, ndigits) );
+   title.Form("%s_%s_per_%s",type, obj, matchedwith.c_str());
+   hist_vec.push_back( new TH1I (title.Data(), title.Data(), ndigits, 0, ndigits) );
+   title.Form("%s_Nr_mismatched_%s", type, obj);
+   hist_vec.push_back( new TH1I (title.Data(), title.Data(), ndigits, 0, ndigits) );
+   title.Form("%s_Mismatched_events_%s", type, obj);
+   hist_vec.push_back( new TH1I (title.Data(), title.Data(), 1000, 0, 1000) );
+   title.Form("%s_Mismatched_channel_%s", type, obj);
+   hist_vec.push_back( new TH1I (title.Data(), title.Data(), 100, 0, 500) );
+}
+
+void NSWstudies::plotError (Flocalize_collection oPRD, vector<TH1F*> hists_pull) {
+	bool isMM = oPRD.isMM;
+
+   double sTGC_error, sTGC_locX, sTGC_truthX, sTGC_pull;
+   double MM_error, MM_locX, MM_truthX, MM_pull;
+   int i, j ,chTy, gg;
+   for (i = 0; i < oPRD.size(); ++i) {
+	   // assume only one SDO per PRD, if not, select the first one
+	   j = oPRD.matchedindices[i][0];
+	   if (!isMM) {
+	   	// sTGC part
+	      sTGC_locX = PRD_sTGC_localPosX->at(i);
+	      sTGC_error = sqrt (PRD_sTGC_covMatrix_1_1->at(i));
+	      sTGC_truthX = SDO_sTGC_localPosX->at(j);
+	      sTGC_pull = (sTGC_locX - sTGC_truthX) / sTGC_error;
+
+	      printf("PRD sTGC channel: %d, matched with SDO channel: %d\n", PRD_sTGC_channel->at(i), SDO_sTGC_channel->at(j));
+	      printf("PRD sTGC locX: %f, SDO locx: %f\n\n", sTGC_locX, sTGC_truthX);
+
+	      //printf("sTGC1\n");
+	      chTy = oPRD.channel_type->at(i);
+	      //printf("sTGC2\n");
+	      hists_pull[chTy]->Fill((sTGC_locX - sTGC_truthX));
+	      //printf("sTGC3\n");
+	      hists_pull[chTy + 3]->Fill(sTGC_pull);
+
+   	} else {
+
+	      // MM part
+	      MM_locX = PRD_MM_localPosX->at(i);
+	      MM_error = sqrt (PRD_MM_covMatrix_1_1->at(i));
+	      MM_truthX = SDO_MM_localPosX->at(j);
+	      MM_pull = (MM_locX - MM_truthX) / MM_error;
+
+	      printf("PRD MM channel: %d, matched with SDO channel: %d\n", PRD_MM_channel->at(i), SDO_MM_channel->at(j));
+	      printf("PRD MM locX: %f, SDO locx: %f\n\n", MM_locX, MM_truthX);
+
+	      gg = oPRD.gas_gap->at(i) + 5;
+	      hists_pull[gg]->Fill((MM_locX - MM_truthX));
+	      hists_pull[gg + 4]->Fill(MM_pull);
+   	}
+   }
+}
+
+bool doEvt (int evtnr) {
+   //do all events:
+   return true;
+   //int events_to_investigate[] = { 11, 19, 21, 22, 25 };
+   int events_to_investigate[] = {11};
+   bool keep_event = false;
+   int size = sizeof(events_to_investigate)/sizeof(events_to_investigate[0]);
+   for (int i = 0; i < size; ++i) { keep_event |= events_to_investigate[i] == evtnr; }
+   return keep_event;
+}
+
+void write_and_delete (vector< TH1I* > vec) {
+   for (TH1I* _h: vec) {
+      _h->Write();
+      delete _h;
+   }
+}
+
+
+void init_hist_pull (vector< TH1F*>& hist_pull) {
+	hist_pull.push_back (new TH1F("sTGC_pad_distance", "sTGC_pad_distance", 200, -200, 200));
+   hist_pull.push_back (new TH1F("sTGC_strip_distance", "sTGC_strip_distance", 200, -200, 200));
+   hist_pull.push_back (new TH1F("sTGC_wire_distance", "sTGC_wire_distance", 200, -200, 200));
+   hist_pull.push_back (new TH1F("sTGC_pad_pull", "sTGC_pad_pull", 200, -100, 100));
+   hist_pull.push_back (new TH1F("sTGC_strip_pull", "sTGC_strip_pull", 200, -100, 100));
+   hist_pull.push_back (new TH1F("sTGC_wire_pull", "sTGC_wire_pull", 200, -100, 100));
+
+   hist_pull.push_back (new TH1F("MM_gg1_distance", "MM_gg1_distance", 200, -20, 20));
+   hist_pull.push_back (new TH1F("MM_gg2_distance", "MM_gg2_distance", 200, -20, 20));
+   hist_pull.push_back (new TH1F("MM_gg3_distance", "MM_gg3_distance", 200, -20, 20));
+   hist_pull.push_back (new TH1F("MM_gg4_distance", "MM_gg4_distance", 200, -20, 20));
+   hist_pull.push_back (new TH1F("MM_gg1_pull", "MM_gg1_pull", 200, -20, 20));
+   hist_pull.push_back (new TH1F("MM_gg2_pull", "MM_gg2_pull", 200, -20, 20));
+   hist_pull.push_back (new TH1F("MM_gg3_pull", "MM_gg3_pull", 200, -20, 20));
+   hist_pull.push_back (new TH1F("MM_gg4_pull", "MM_gg4_pull", 200, -20, 20));
+
+}
+
+
+
+
+
+
+
+
+
+
diff --git a/MuonSpectrometer/MuonValidation/MuonPRDTest/macros/NSWMatching_offline/NSWstudies_match.h b/MuonSpectrometer/MuonValidation/MuonPRDTest/macros/NSWMatching_offline/NSWstudies_match.h
new file mode 100644
index 0000000000000000000000000000000000000000..2e2c68ce778f204e01123b782a8c1555f10e33cc
--- /dev/null
+++ b/MuonSpectrometer/MuonValidation/MuonPRDTest/macros/NSWMatching_offline/NSWstudies_match.h
@@ -0,0 +1,202 @@
+/*
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef NSWstudies_match_h
+#define NSWstudies_match_h
+
+#include <TROOT.h>
+#include <TChain.h>
+#include <TFile.h>
+
+// Header file for the classes stored in the TTree if any.
+#include "vector"
+
+using namespace std;
+
+class Flocalize {
+private:
+public:
+   ~Flocalize() {;}
+   Flocalize () {
+      stationName = string("");
+      stationEta = 0;
+      stationPhi = 0;
+      multiplet = 0;
+      gas_gap = 0;
+      channel_type = 0;
+      channel = 0;
+   }
+   Flocalize (string i_stationName, int i_stationEta, int i_stationPhi, int i_multiplet, int i_gas_gap, int i_channel, int i_channel_type, int i_matchedchannel) {
+      stationName = i_stationName;
+      stationEta = i_stationEta;
+      stationPhi = i_stationPhi;
+      multiplet = i_multiplet;
+      gas_gap = i_gas_gap;
+      channel_type = i_channel_type;
+      channel = i_channel;
+      matchedchannel = i_matchedchannel;
+   }
+   //To do: oveload == operator?
+   bool isEqual(Flocalize _other) {
+      return ( stationName.compare(_other.stationName) == 0 
+               && stationEta == _other.stationEta
+               && stationPhi == _other.stationPhi 
+               && multiplet == _other.multiplet 
+               && gas_gap == _other.gas_gap 
+               && channel_type == _other.channel_type 
+               //&& channel == _other.channel
+               );
+   }
+   bool isEqualecho (Flocalize _other) {
+      bool equal = true;
+      if (stationName.compare(_other.stationName) != 0) {printf("stationName is not equal\n"); equal = false;}
+      if (stationPhi != _other.stationPhi) {printf("stationPhi is not equal\n"); equal = false;}
+      if (multiplet != _other.multiplet) {printf("multiplet is not equal\n"); equal = false;}
+      if (gas_gap != _other.gas_gap) {printf("gas_gap is not equal\n"); equal = false;}
+      if (channel_type != _other.channel_type) {printf("channel_type is not equal\n"); equal = false;}
+      if (channel != _other.channel) {printf("channel is not equal\n"); equal = false;}
+      return equal;
+   }
+   void printInfo () {
+      printf("%-15s %-15s %-15s %-15s %-15s %-15s %-15s %-15s\n", "stationname", "stationEta", "stationPhi", "multiplet", "gas_gap", "channeltype", "channel", "matchedchannel");
+      printf("%-15s %-15d %-15d %-15d %-15d %-15d %-15d %-15d\n", stationName.data(), stationEta, stationPhi, multiplet, gas_gap, channel_type, channel, matchedchannel);
+   }
+   string stationName;
+   int stationEta;
+   int stationPhi;
+   int multiplet;
+   int gas_gap;
+   int channel_type;
+   int channel;
+   int matchedchannel;
+};
+
+class Flocalize_collection {
+   //A class to hold all info to find a Hit in the Digits collection. Generalized to also be used on the RDO's. Does not take ownership of any of the parameters used, just a way to collect pointers.
+private:
+public:
+   Flocalize_collection () {
+      stationName = NULL;
+      stationEta = NULL;
+      stationPhi = NULL;
+      multiplet = NULL;
+      gas_gap = NULL;
+      channel_type = NULL;
+      channel = NULL;
+   }
+   ~Flocalize_collection() {;}
+   //NB: MM has no detector type: make this last entry, and ajust member functions for no type possibility.
+   Flocalize_collection (string i_name, vector<string>* i_stationName, vector<int>* i_stationEta, vector<int>* i_stationPhi, vector<int>* i_multiplet, vector<int>* i_gas_gap, vector<int>* i_channel, vector<int>* i_channel_type = nullptr) {
+      isMM = (i_channel_type == nullptr) ? 1 : 0; 
+      stationName = i_stationName;
+      stationEta = i_stationEta;
+      stationPhi = i_stationPhi;
+      multiplet = i_multiplet;
+      gas_gap = i_gas_gap;
+      channel_type = i_channel_type;
+      channel = i_channel;
+      vector<int> mc(this->size());
+      for (unsigned int i = 0; i < this->size(); ++i) { mc[i] = -10; }
+      matchedchannel = mc;
+      vector<vector<unsigned int>> mi(this->size());
+      matchedindices = mi;
+      name = i_name;
+      this->checksize();
+   }
+   size_t size() {
+      this->checksize();
+      return stationName->size();
+   }
+   bool checksize() {
+      size_t channel_type_size;
+      size_t col_size = stationName->size();
+      //skip channel_type check if MM, as MM does not have this parameter.
+      channel_type_size = (isMM) ? col_size : channel_type->size();
+      if (! (stationEta->size() == col_size ||
+          stationPhi->size() == col_size ||
+          multiplet->size() == col_size ||
+          gas_gap->size() == col_size ||
+          channel_type_size == col_size ||
+          channel->size() == col_size) ) { printf("Sizes of localize collection do not match!\n"); return false;}
+      //else { printf("size checks out\n"); }
+      return true;
+   }
+   //also overlod operator [] ?
+   Flocalize at(unsigned int index) {
+      if (index > this->size()) { Flocalize local; return local; }
+      // set channel type to 0 if it is MM, as MM does not have channel type
+      int type_val;
+      type_val = (isMM) ? 0 : channel_type->at(index);
+      Flocalize local(stationName->at(index), stationEta->at(index), stationPhi->at(index), multiplet->at(index), gas_gap->at(index), channel->at(index), type_val, matchedchannel.at(index));
+      return local;
+   }
+   void printInfo () {
+      if (isMM) {
+         printf("%-15s %-15s %-15s %-15s %-15s %-15s %-15s\n", "stationname", "stationEta", "stationPhi", "multiplet", "gas_gap", "channel", "matchedchannel");
+         for (unsigned int i = 0; i < this->size(); ++i)
+            { printf("%-15s %-15d %-15d %-15d %-15d %-15d %-15d\n", stationName->at(i).data(), stationEta->at(i), stationPhi->at(i), multiplet->at(i), gas_gap->at(i), channel->at(i), matchedchannel.at(i));}
+      } else {
+         printf("%-15s %-15s %-15s %-15s %-15s %-15s %-15s %-15s\n", "stationname", "stationEta", "stationPhi", "multiplet", "gas_gap", "channel_type", "channel", "matchedchannel");
+         for (unsigned int i = 0; i < this->size(); ++i)
+            { printf("%-15s %-15d %-15d %-15d %-15d %-15d %-15d %-15d\n", stationName->at(i).data(), stationEta->at(i), stationPhi->at(i), multiplet->at(i), gas_gap->at(i), channel_type->at(i), channel->at(i), matchedchannel.at(i));}
+      }
+   }
+   bool update_match(int index, int ch_candidate, unsigned int index_match) {
+      matchedindices.at(index).push_back(index_match);
+      if ( matchedchannel.at(index) == -10 ) { matchedchannel.at(index) = ch_candidate; }
+      if ( ch_candidate == -1 ) { return false; }
+      if (abs(ch_candidate - channel->at(index)) <  abs(channel->at(index) - matchedchannel.at(index)) ) { 
+         matchedchannel.at(index) = ch_candidate;
+         return true; 
+      }
+      return false;
+   }
+   //Give a unique integer (1-16) based on name(2), multiplet(2) and gas gap(4)
+   int loc_unique (int index) {
+      return loc_unique_expanded(index);
+      int iname = (stationName->at(index).back() == 'L') + 1; 
+      int unique = 100 * iname + 10 * multiplet->at(index) + gas_gap->at(index);
+      return unique;
+   }
+   int loc_unique_expanded (int index) {
+      int iname = (stationName->at(index).back() == 'L') + 1;
+      int iEta = (stationEta->at(index) > 0) + 1;
+      int i_cht = (isMM) ? 9 : channel_type->at(index);
+      int unique = 10000 * iEta + 1000 * i_cht + 100 * iname + 10 * multiplet->at(index) + gas_gap->at(index);
+      return unique;
+   }
+   int localize (int index) {
+      int _i = isMM ? localize_MM(index) : localize_sTGC(index);
+      return (_i);
+   }
+   int localize_sTGC (int index) {
+      int unique = loc_unique(index);
+      static vector<int> _vloc;
+      for (unsigned int i = 0; i < _vloc.size(); ++i) {if (_vloc[i] == unique ) {return i;} }
+      _vloc.push_back(unique);
+      return (_vloc.size() - 1);
+   } 
+   int localize_MM (int index) {
+      int unique = loc_unique(index);
+      static vector<int> _vloc;
+      for (unsigned int i = 0; i < _vloc.size(); ++i) {if (_vloc[i] == unique ) {return i;} }
+      _vloc.push_back(unique);
+      return (_vloc.size() - 1);
+   } 
+   vector<string>  *stationName;
+   vector<int>     *stationEta;
+   vector<int>     *stationPhi;
+   vector<int>     *multiplet;
+   vector<int>     *gas_gap;
+   vector<int>     *channel_type;
+   vector<int>     *channel;
+   vector<int>     matchedchannel;
+   vector<vector<unsigned int>> matchedindices;
+   string name;
+   string matchedwith;
+   bool isMM;
+
+ };
+
+ #endif
\ No newline at end of file
diff --git a/MuonSpectrometer/MuonValidation/MuonPRDTest/macros/NSWMatching_offline/run_matching.C b/MuonSpectrometer/MuonValidation/MuonPRDTest/macros/NSWMatching_offline/run_matching.C
new file mode 100644
index 0000000000000000000000000000000000000000..9e5a3eb1195bfe749a9477581189ca64260c7437
--- /dev/null
+++ b/MuonSpectrometer/MuonValidation/MuonPRDTest/macros/NSWMatching_offline/run_matching.C
@@ -0,0 +1,29 @@
+/*
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+*/
+
+#include "TROOT.h"
+
+void run_loop () {
+	gROOT->ProcessLine(".L NSWstudies_match.C++");
+	gROOT->ProcessLine("NSWstudies t;");
+	gROOT->ProcessLine("t.Loop()");
+}
+
+/*
+This folder contains files used to makes histograms comparing various EDM objects of the NSW digitization chain. 
+The underlying matchin method is integrated in the NSW PRD Test, these files are to document the histogram production. 
+This is to allow others to reproduce results produced with these files.
+
+To use: 
+Copy the containts of this folder to any directory you like, it works offline.
+A NSW Ntuple, as produced by the NSWPRDTest, needs to be present in the same directory.
+(By default the filename is hardcoded to "NSWPRDValAlg.reco.ntuple.root", to allow a different name, change the creator in NSWstudies.h)
+You will need to crate an extra directory named "Rootfiles", where the output histograms will be placed
+To run simply run this file (terminal: root -l -q run_loop.C)
+In the beginning of the "NSWstudies_match.C" file, the input variables of the NSW Matching algorithm can be set.
+(These have the same default values as the NSWPRDTest version)
+
+By default the program will check RDO<->PRD for both sTGC and MM. 
+To test other objects, change the input of the match_Hits_Digits and fillHists in the Loop function of NSWstudies_match.C
+*/
\ No newline at end of file
diff --git a/MuonSpectrometer/MuonValidation/MuonPRDTest/src/EDM_object.cxx b/MuonSpectrometer/MuonValidation/MuonPRDTest/src/EDM_object.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..73694f6d0eac9de31a2f34839a1004c2151d4ec7
--- /dev/null
+++ b/MuonSpectrometer/MuonValidation/MuonPRDTest/src/EDM_object.cxx
@@ -0,0 +1,121 @@
+/*
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+*/
+
+#include <vector>
+#include <string>
+#include <iostream>
+
+#include "TTree.h"
+#include "TBranch.h"
+#include "TFile.h"
+
+#include "EDM_object.h"
+
+EDM_object::EDM_object () { 
+	m_stationName = nullptr; 
+	m_stationEta = nullptr;
+	m_stationPhi = nullptr;
+	m_multiplet = nullptr;
+	m_gas_gap = nullptr;
+	m_channel_type = nullptr;
+	m_channel = nullptr;
+	m_matchedchannel = nullptr;
+	m_mismatches = 0;
+	m_total = 0;
+}
+
+void EDM_object::clearVars () { 
+	if (m_matchedchannel) {
+		delete m_matchedchannel; 
+		m_matchedchannel = nullptr; 
+	}
+}
+
+size_t EDM_object::size() {
+	if (!m_stationName) { return 0; }
+	checksize();
+	return m_stationName->size();
+}
+
+void EDM_object::checksize() {
+   size_t channel_type_size;
+   size_t size = m_stationName->size();
+   //skip channel_type check if MM, as MM does not have this parameter.
+   channel_type_size = (m_channel_type) ? m_channel_type->size() : size;
+   if (! (m_stationEta->size() == size ||
+       	 m_stationPhi->size() == size ||
+       	 m_multiplet->size()  == size ||
+       	 m_gas_gap->size() 	 == size ||
+       	 channel_type_size    == size ||
+       	 m_channel->size() 	 == size) ) 
+   	{ printf("NSWMatchingAlg: Sizes of data object %s_%s do not match!\n", m_name.Data(), m_detector.Data()); }
+}
+
+void EDM_object::printInfo () {
+	// sTGC
+   if (m_channel_type) {
+     printf("%-15s %-15s %-15s %-15s %-15s %-15s %-15s %-15s\n", "stationname", "stationEta", "stationPhi", "multiplet", "gas_gap", "channel_type", "channel", "matchedchannel");
+      for (uint i = 0; i < this->size(); ++i)
+         { printf("%-15s %-15d %-15d %-15d %-15d %-15d %-15d %-15d\n", m_stationName->at(i).data(), m_stationEta->at(i), m_stationPhi->at(i), m_multiplet->at(i), m_gas_gap->at(i), m_channel_type->at(i), m_channel->at(i), m_matchedchannel->at(i));}
+   // MM
+   } else {
+      printf("%-15s %-15s %-15s %-15s %-15s %-15s %-15s\n", "stationname", "stationEta", "stationPhi", "multiplet", "gas_gap", "channel", "matchedchannel");
+      for (uint i = 0; i < this->size(); ++i)
+         { printf("%-15s %-15d %-15d %-15d %-15d %-15d %-15d\n", m_stationName->at(i).data(), m_stationEta->at(i), m_stationPhi->at(i), m_multiplet->at(i), m_gas_gap->at(i), m_channel->at(i), m_matchedchannel->at(i));}
+   }
+}
+
+bool EDM_object::identifierMatch(EDM_object &data0, EDM_object &data1, uint i, uint j) {
+	bool match = true;
+	match &= data0.m_channel_type ?  data0.m_channel_type->at(i) == data1.m_channel_type->at(j) : true;
+	match &= data0.m_stationName->at(i).compare(data1.m_stationName->at(j)) == 0;
+	match &= data0.m_stationEta->at(i) == data1.m_stationEta->at(j);
+	match &= data0.m_stationPhi->at(i) == data1.m_stationPhi->at(j);
+	match &= data0.m_multiplet->at(i)  == data1.m_multiplet->at(j);
+	match &= data0.m_gas_gap->at(i) 	== data1.m_gas_gap->at(j);
+	return match;
+}
+
+bool EDM_object::update_match(int index, int ch_candidate) {
+	// make sure the machedchannel is set to the default value (-10)
+	if (!m_matchedchannel) { return false; }
+	// If any match found, overwarite default value
+	if ( m_matchedchannel->at(index) == -10 ) { m_matchedchannel->at(index) = ch_candidate; }
+	// Default channel value in digitization = -1
+	if ( ch_candidate == -1 ) { return false; }
+	// Check if the match is close enough
+	if (abs(ch_candidate - m_channel->at(index)) <  abs(m_channel->at(index) - m_matchedchannel->at(index)) ) { 
+		m_matchedchannel->at(index) = ch_candidate;
+		return true; 
+	}
+	return false;
+}
+
+void EDM_object::init_matching () {
+	if (empty()) { return; }
+	m_matchedchannel = new std::vector<int>(this->size());
+	for ( uint i = 0; i < this->size(); ++i) { m_matchedchannel->at(i) = -10; }
+}
+
+bool EDM_object::empty () {
+	if (!m_stationName) { return true; }
+	if (m_stationName->empty()) { return true; }
+	return false; 
+}
+
+void EDM_object::update_efficiency ( int maximum_difference ) {
+	uint nMatches = 0;
+	size_t n_obj = size();
+	m_total += n_obj;
+	for (uint i = 0; i < n_obj; ++i) {
+		nMatches += abs( m_channel->at(i) - m_matchedchannel->at(i) ) <= maximum_difference;
+	}
+	m_mismatches += (n_obj - nMatches);
+}
+
+void EDM_object::printEfficiency(std::ofstream& file) {
+	file << "\nMatching " << m_name << " to " << m_matchedwith << " for " << m_detector << std::endl;
+	file << "Total: " << m_total << ", number of mismatches: " << m_mismatches << std::endl;
+	file << "Efficiency: " << (m_total - m_mismatches) / (double)m_total * 100. << "%" << std::endl;
+}
diff --git a/MuonSpectrometer/MuonValidation/MuonPRDTest/src/EDM_object.h b/MuonSpectrometer/MuonValidation/MuonPRDTest/src/EDM_object.h
new file mode 100644
index 0000000000000000000000000000000000000000..235e9a313b12e3e2963089018d1b8dd23f551daa
--- /dev/null
+++ b/MuonSpectrometer/MuonValidation/MuonPRDTest/src/EDM_object.h
@@ -0,0 +1,64 @@
+/*
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef EDM_OBJECT_H
+#define EDM_OBJECT_H
+
+#include "TString.h"
+
+#include <fstream>
+#include <vector>
+
+class EDM_object
+{
+public:
+	// Matching
+	void init_matching();
+	bool update_match(int index, int ch_candidate);
+	bool identifierMatch(EDM_object &data0, EDM_object &data1, uint i, uint j);
+
+	// Efficiency	
+	void update_efficiency ( int maximum_difference );
+	void printEfficiency (std::ofstream& file);
+
+	// setters
+	void setName (TString name) { m_name = name; }
+	void setName (TString name, TString detector) { m_name = name; m_detector = detector; }
+	void setDetector (TString detector) { m_detector = detector; }
+	void setMatchedwith (TString matchedwith) { m_matchedwith = matchedwith; }
+
+	// getters 
+	TString getName () { return m_name; }
+	TString getDetector () { return m_detector; }
+	TString getMatchedwith () { return m_matchedwith; }
+
+	// Helper functions
+	size_t size ();
+	void checksize ();
+	void printInfo();
+	void clearVars();
+	bool empty ();
+
+	EDM_object ();
+	~EDM_object () { clearVars(); }
+
+	std::vector<std::string>  *m_stationName;
+	std::vector<int>     *m_stationEta;
+	std::vector<int>     *m_stationPhi;
+	std::vector<int>     *m_multiplet;
+	std::vector<int>     *m_gas_gap;
+	std::vector<int>     *m_channel_type;
+	std::vector<int>     *m_channel;
+
+	std::vector<int>     *m_matchedchannel;
+
+private:
+	TString m_name;
+	TString m_matchedwith;
+	TString m_detector;
+	int m_mismatches;
+	int m_total;
+};
+
+#endif
\ No newline at end of file
diff --git a/MuonSpectrometer/MuonValidation/MuonPRDTest/src/MMRDOVariables.cxx b/MuonSpectrometer/MuonValidation/MuonPRDTest/src/MMRDOVariables.cxx
index 2b965366b218a79f8766227f0cdadf75bb9910a7..4446264704aa9619ab0ad21b110c81f91546d592 100644
--- a/MuonSpectrometer/MuonValidation/MuonPRDTest/src/MMRDOVariables.cxx
+++ b/MuonSpectrometer/MuonValidation/MuonPRDTest/src/MMRDOVariables.cxx
@@ -68,9 +68,24 @@ StatusCode MMRDOVariables::fillVariables()
       m_NSWMM_rdo_charge->push_back(rdo->charge());
 
       // get the readout element class where the RDO is recorded
-      // int isSmall = (stName[2] == 'S');
-      // const MuonGM::MMReadoutElement* rdoEl = m_detManager->getMMRElement_fromIdFields(isSmall, stationEta, stationPhi, multiplet );
-
+      int isSmall = (stName[2] == 'S');
+      const MuonGM::MMReadoutElement* rdoEl = m_detManager->getMMRElement_fromIdFields(isSmall, stationEta, stationPhi, multiplet );
+
+      Amg::Vector2D localStripPos(0.,0.);
+      if ( rdoEl->stripPosition(Id,localStripPos) )  {
+        m_NSWMM_rdo_localPosX->push_back(localStripPos.x());
+        m_NSWMM_rdo_localPosY->push_back(localStripPos.y());
+        ATH_MSG_DEBUG("MM RDO: local pos.:  x=" << localStripPos[0] << ",  y=" << localStripPos[1]);
+      } else { 
+        ATH_MSG_WARNING("MM RDO: local Strip position not defined"); 
+      }
+      
+      // asking the detector element to transform this local to the global position
+      Amg::Vector3D globalStripPos(0., 0., 0.);
+      rdoEl->surface(Id).localToGlobal(localStripPos,Amg::Vector3D(0.,0.,0.),globalStripPos);
+      m_NSWMM_rdo_globalPosX->push_back(globalStripPos.x());
+      m_NSWMM_rdo_globalPosY->push_back(globalStripPos.y());
+      m_NSWMM_rdo_globalPosZ->push_back(globalStripPos.z());
 
       // rdo counter for the ntuple
       m_NSWMM_nrdo++;
@@ -99,6 +114,13 @@ StatusCode MMRDOVariables::clearVariables()
   m_NSWMM_rdo_time->clear();
   m_NSWMM_rdo_charge->clear();
 
+  m_NSWMM_rdo_globalPosX->clear();
+  m_NSWMM_rdo_globalPosY->clear();
+  m_NSWMM_rdo_globalPosZ->clear();
+
+  m_NSWMM_rdo_localPosX->clear();
+  m_NSWMM_rdo_localPosY->clear();
+
   return StatusCode::SUCCESS;
 }
 
@@ -118,6 +140,13 @@ StatusCode MMRDOVariables::initializeVariables()
   m_NSWMM_rdo_time        = new std::vector<int>();
   m_NSWMM_rdo_charge      = new std::vector<int>();
 
+  m_NSWMM_rdo_localPosX   = new std::vector<double>();
+  m_NSWMM_rdo_localPosY   = new std::vector<double>();
+
+  m_NSWMM_rdo_globalPosX   = new std::vector<double>();
+  m_NSWMM_rdo_globalPosY   = new std::vector<double>();
+  m_NSWMM_rdo_globalPosZ   = new std::vector<double>();
+
 
   if(m_tree) {
     m_tree->Branch("RDO_MM_n",           &m_NSWMM_nrdo);
@@ -129,6 +158,14 @@ StatusCode MMRDOVariables::initializeVariables()
     m_tree->Branch("RDO_MM_channel",     &m_NSWMM_rdo_channel);
     m_tree->Branch("RDO_MM_time",        &m_NSWMM_rdo_time);
     m_tree->Branch("RDO_MM_charge",      &m_NSWMM_rdo_charge);
+    
+    m_tree->Branch("RDO_MM_localPosX",   &m_NSWMM_rdo_localPosX);
+    m_tree->Branch("RDO_MM_localPosY",   &m_NSWMM_rdo_localPosY);
+
+    m_tree->Branch("RDO_MM_globalPosX",  &m_NSWMM_rdo_globalPosX);
+    m_tree->Branch("RDO_MM_globalPosY",  &m_NSWMM_rdo_globalPosY);
+    m_tree->Branch("RDO_MM_globalPosZ",  &m_NSWMM_rdo_globalPosZ);
+
   }
 
   return StatusCode::SUCCESS;
@@ -147,7 +184,12 @@ void MMRDOVariables::deleteVariables()
   delete m_NSWMM_rdo_channel;
   delete m_NSWMM_rdo_time;
   delete m_NSWMM_rdo_charge;
-  
+  delete m_NSWMM_rdo_localPosX;
+  delete m_NSWMM_rdo_localPosY;
+  delete m_NSWMM_rdo_globalPosX;
+  delete m_NSWMM_rdo_globalPosY;
+  delete m_NSWMM_rdo_globalPosZ;
+
 
   m_NSWMM_nrdo = 0;
   m_NSWMM_rdo_stationName = nullptr;
@@ -158,6 +200,11 @@ void MMRDOVariables::deleteVariables()
   m_NSWMM_rdo_channel = nullptr;
   m_NSWMM_rdo_time = nullptr;
   m_NSWMM_rdo_charge = nullptr;
+  m_NSWMM_rdo_localPosX = nullptr;
+  m_NSWMM_rdo_localPosY = nullptr;
+  m_NSWMM_rdo_globalPosX = nullptr;
+  m_NSWMM_rdo_globalPosY = nullptr;
+  m_NSWMM_rdo_globalPosZ = nullptr;
 
   return;
 }
diff --git a/MuonSpectrometer/MuonValidation/MuonPRDTest/src/MMRDOVariables.h b/MuonSpectrometer/MuonValidation/MuonPRDTest/src/MMRDOVariables.h
index 2b587179d2c9ddc02fef65db73afeeeaced94c0a..4eac77ac855dfc078fbe88b9232cc7f55f346b38 100644
--- a/MuonSpectrometer/MuonValidation/MuonPRDTest/src/MMRDOVariables.h
+++ b/MuonSpectrometer/MuonValidation/MuonPRDTest/src/MMRDOVariables.h
@@ -29,7 +29,12 @@ class MMRDOVariables : public ValAlgVariables
     m_NSWMM_rdo_gas_gap(0),
     m_NSWMM_rdo_channel(0),
     m_NSWMM_rdo_time(0),
-    m_NSWMM_rdo_charge(0)
+    m_NSWMM_rdo_charge(0),
+    m_NSWMM_rdo_localPosX(0),
+    m_NSWMM_rdo_localPosY(0),
+    m_NSWMM_rdo_globalPosX(0),
+    m_NSWMM_rdo_globalPosY(0),
+    m_NSWMM_rdo_globalPosZ(0)
   {
     setHelper(idhelper);
   }
@@ -67,6 +72,11 @@ class MMRDOVariables : public ValAlgVariables
   std::vector<int> *m_NSWMM_rdo_time;
   std::vector<int> *m_NSWMM_rdo_charge;
 
+  std::vector<double> *m_NSWMM_rdo_localPosX;
+  std::vector<double> *m_NSWMM_rdo_localPosY;
+  std::vector<double> *m_NSWMM_rdo_globalPosX;
+  std::vector<double> *m_NSWMM_rdo_globalPosY;
+  std::vector<double> *m_NSWMM_rdo_globalPosZ;
 };
 
 #endif // MMRDOVARIABLES_H
diff --git a/MuonSpectrometer/MuonValidation/MuonPRDTest/src/NSWPRDValAlg.cxx b/MuonSpectrometer/MuonValidation/MuonPRDTest/src/NSWPRDValAlg.cxx
index f1be5669b149a1c2fb13b62e12dab87906eb8bf0..59e12232675258d427e359ab746dd902014fe7aa 100644
--- a/MuonSpectrometer/MuonValidation/MuonPRDTest/src/NSWPRDValAlg.cxx
+++ b/MuonSpectrometer/MuonValidation/MuonPRDTest/src/NSWPRDValAlg.cxx
@@ -1,7 +1,10 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
+#include <fstream>
+
+// NSWValAlg inlcudes
 #include "NSWPRDValAlg.h"
 
 #include "MMDigitVariables.h"
@@ -21,18 +24,23 @@
 #include "MuEntryVariables.h"
 #include "TruthVariables.h"
 
-#include "GaudiKernel/ITHistSvc.h"
-#include "TTree.h"
+#include "EDM_object.h"
 
+// Other NSW includes
 #include "MuonReadoutGeometry/MuonDetectorManager.h"
-
 #include "MuonIdHelpers/MmIdHelper.h"
 #include "MuonIdHelpers/sTgcIdHelper.h"
 #include "MuonIdHelpers/CscIdHelper.h"
 
+// ROOT includes
+#include "TTree.h"
+
+// Misc includes
+#include "GaudiKernel/ITHistSvc.h"
 #include "EventInfo/EventInfo.h"
 #include "EventInfo/EventID.h"
 
+
 NSWPRDValAlg::NSWPRDValAlg(const std::string& name, ISvcLocator* pSvcLocator)
   : AthAlgorithm(name, pSvcLocator),
     m_TruthVar(nullptr),
@@ -45,7 +53,7 @@ NSWPRDValAlg::NSWPRDValAlg(const std::string& name, ISvcLocator* pSvcLocator)
     m_sTgcPrdVar(nullptr),
     m_MmSimHitVar(nullptr),
     m_MmSdoVar(nullptr),
-	 m_MmFastSdoVar(nullptr),
+    m_MmFastSdoVar(nullptr),
     m_MmDigitVar(nullptr),
     m_MmRdoVar(nullptr),
     m_MmPrdVar(nullptr),
@@ -59,6 +67,7 @@ NSWPRDValAlg::NSWPRDValAlg(const std::string& name, ISvcLocator* pSvcLocator)
     m_runNumber(0),
     m_eventNumber(0)
 {
+  // Input properties: Container names
   declareProperty("Truth_ContainerName",            m_Truth_ContainerName="TruthEvent");
   declareProperty("MuonEntryLayer_ContainerName",   m_MuEntry_ContainerName="MuonEntryLayer");
   declareProperty("NSWsTGC_ContainerName",          m_NSWsTGC_ContainerName="sTGCSensitiveDetector");
@@ -73,6 +82,7 @@ NSWPRDValAlg::NSWPRDValAlg(const std::string& name, ISvcLocator* pSvcLocator)
   declareProperty("NSWMM_PRDContainerName",         m_NSWMM_PRDContainerName="MM_Measurements");
   declareProperty("CSC_DigitContainerName",         m_CSC_DigitContainerName="CSC_DIGITS");
 
+  // Input properties: do EDM objects
   declareProperty("doTruth",         m_doTruth=false);
   declareProperty("doMuEntry",       m_doMuEntry=false);
   declareProperty("doSTGCHit",       m_doSTGCHit=false);
@@ -86,6 +96,11 @@ NSWPRDValAlg::NSWPRDValAlg(const std::string& name, ISvcLocator* pSvcLocator)
   declareProperty("doMMRDO",         m_doMMRDO=false);
   declareProperty("doMMPRD",         m_doMMPRD=false);
   declareProperty("doCSCDigit",      m_doCSCDigit=false);
+
+  // Input properties: NSW Maching algorithm
+  declareProperty("doNSWMatchingAlg",   m_doNSWMatching=true);
+  declareProperty("doNSWMatchingMuonOnly",  m_doNSWMatchingMuon=false);
+  declareProperty("setMaxStripDistance",  m_maxStripDiff=3);
 }
 
 StatusCode NSWPRDValAlg::initialize() {
@@ -94,11 +109,11 @@ StatusCode NSWPRDValAlg::initialize() {
 
   ATH_CHECK( service("THistSvc", m_thistSvc) );
 
-  m_tree = new TTree("NSWHitsTree", "Ntuple of NSWHits");
+  m_tree = new TTree("NSWValTree", "Ntuple for NSW EDM Validation");
   m_tree->Branch("runNumber", &m_runNumber, "runNumber/i");
   m_tree->Branch("eventNumber", &m_eventNumber, "eventNumber/i");
 
-  ATH_CHECK( m_thistSvc->regTree("/NSWPRDValAlg/NSWHitsTree", m_tree) );
+  ATH_CHECK( m_thistSvc->regTree("/NSWPRDValAlg/NSWValTree", m_tree) );
 
   ATH_CHECK( detStore()->retrieve( m_detManager ) );
 
@@ -210,7 +225,8 @@ StatusCode NSWPRDValAlg::initialize() {
 
 StatusCode NSWPRDValAlg::finalize()
 {
-  ATH_MSG_INFO("finalize()");
+  ATH_MSG_DEBUG("NSWPRDValAlg:: Finalize + Matching");
+  if (m_doNSWMatching) { ATH_CHECK ( NSWMatchingAlg() );} 
 
   if (m_TruthVar) { delete m_TruthVar; m_TruthVar=0;}
   if (m_doMuEntry) { delete m_MuEntryVar; m_MuEntryVar=0;}
@@ -233,7 +249,7 @@ StatusCode NSWPRDValAlg::finalize()
 
 StatusCode NSWPRDValAlg::execute()
 {
-  ATH_MSG_INFO("execute()");
+  ATH_MSG_DEBUG("execute()");
 
   // Event information
   const EventInfo* pevt(0);
@@ -278,3 +294,197 @@ StatusCode NSWPRDValAlg::execute()
   return StatusCode::SUCCESS;
 }
 
+/*****************************************************************************************************************************************
+The rest of this file is the NSW matching algorithm. This can be (de)activated with the input variable doNSWMatchingAlg. 
+The matching algorithm will check each conversion in the Hit->PRD digitization chain.
+For each conversion, the algorithm will try to match the two objects. 
+The input variable setMaxStripDistance (default value = 3) give the maximum strip distance two objects can have, while still be considered a match
+The input variable doNSWMatchingMuonOnly can be set to true to only use events which contain exclusively muons 
+******************************************************************************************************************************************/
+
+// First set up which object should be matched, given the input used to fill the NSW Ntuple
+StatusCode NSWPRDValAlg::NSWMatchingAlg () {
+
+  ATH_MSG_DEBUG("NSWMatchingAlg: building Data objects");
+  
+  // Use the EDM object, as defined in EDM_object.h, to build the hits, digits, SDO, RDO and PRD for both sTGC and MM
+  EDM_object Hits_sTGC, Digits_sTGC, SDO_sTGC, RDO_sTGC, PRD_sTGC;
+  EDM_object Hits_MM, Digits_MM, SDO_MM, RDO_MM, PRD_MM;
+
+  Hits_sTGC.setName("Hits", "sTGC");
+  Digits_sTGC.setName("Digits", "sTGC");
+  SDO_sTGC.setName("SDO", "sTGC");
+  RDO_sTGC.setName("RDO", "sTGC");
+  PRD_sTGC.setName("PRD", "sTGC");
+
+  Hits_MM.setName("Hits", "MM");
+  Digits_MM.setName("Digits", "MM");
+  SDO_MM.setName("SDO", "MM");
+  RDO_MM.setName("RDO", "MM");
+  PRD_MM.setName("PRD", "MM");
+
+  // Match the EDM objects with the variables in the NSW Validation Ntuple
+  TString branch_name;
+  TObjArray* brlst = m_tree->GetListOfBranches();
+  for (TBranch *branch = (TBranch*) brlst->First(); branch; branch = (TBranch*) brlst->After(branch)) {
+    branch_name = branch->GetName(); 
+    ATH_MSG_VERBOSE("About to check branch: " << branch_name);
+
+    ATH_CHECK( setDataAdress(Hits_sTGC, branch_name) ); 
+    ATH_CHECK( setDataAdress(Digits_sTGC, branch_name) ); 
+    ATH_CHECK( setDataAdress(SDO_sTGC, branch_name) ); 
+    ATH_CHECK( setDataAdress(RDO_sTGC, branch_name) ); 
+    ATH_CHECK( setDataAdress(PRD_sTGC, branch_name) ); 
+
+    ATH_CHECK( setDataAdress(Hits_MM, branch_name) ); 
+    ATH_CHECK( setDataAdress(Digits_MM, branch_name) ); 
+    ATH_CHECK( setDataAdress(SDO_MM, branch_name) ); 
+    ATH_CHECK( setDataAdress(RDO_MM, branch_name) ); 
+    ATH_CHECK( setDataAdress(PRD_MM, branch_name) ); 
+  }
+
+  // Prepare the output file
+  std::ofstream efficiencies;
+  efficiencies.open("NSWMatchingAlg_efficiencies.txt");
+  efficiencies << "NSW Matching algorithm, efficiencies of conversion from and to various EDM objects" << std::endl;
+  efficiencies << "Settings:\n" << m_doNSWMatchingMuon << std::endl;
+  efficiencies << " 'Maximum Strip Distance':" << m_maxStripDiff << std::endl;
+  efficiencies.close();
+
+  // sTGC matching
+  if (m_doSTGCHit && m_doSTGCDigit) { 
+    ATH_CHECK( NSWMatchingAlg(Hits_sTGC, Digits_sTGC) ); 
+    ATH_CHECK( NSWMatchingAlg(Hits_sTGC, SDO_sTGC) );
+  }
+  if (m_doSTGCDigit && m_doSTGCRDO) { 
+    ATH_CHECK( NSWMatchingAlg(Digits_sTGC, RDO_sTGC) );
+    ATH_CHECK( NSWMatchingAlg(SDO_sTGC, RDO_sTGC) );
+  }
+  if (m_doSTGCRDO && m_doSTGCPRD) { ATH_CHECK( NSWMatchingAlg(RDO_sTGC, PRD_sTGC) ); }
+
+  // sTGC fast digitization
+  if (m_doSTGCHit && m_doSTGCFastDigit) { 
+    ATH_CHECK( NSWMatchingAlg(Hits_sTGC, PRD_sTGC) );
+    ATH_CHECK( NSWMatchingAlg(Hits_sTGC, SDO_sTGC) );
+    ATH_CHECK( NSWMatchingAlg(SDO_sTGC, PRD_sTGC) );
+  }
+
+  // MM matching
+  if (m_doMMHit && m_doMMDigit) { 
+    ATH_CHECK( NSWMatchingAlg(Hits_MM, Digits_MM) );
+    ATH_CHECK( NSWMatchingAlg(Hits_MM, SDO_MM) );
+  }
+  if (m_doMMDigit && m_doMMRDO) { 
+    ATH_CHECK( NSWMatchingAlg(Digits_MM, RDO_MM) );
+    ATH_CHECK( NSWMatchingAlg(SDO_MM, RDO_MM) );
+  }
+  if (m_doMMRDO && m_doMMPRD) { ATH_CHECK( NSWMatchingAlg(RDO_MM, PRD_MM) ); }
+
+  //  MM fast digitization
+  if (m_doMMHit && m_doMMFastDigit) { 
+    ATH_CHECK( NSWMatchingAlg(Hits_MM, PRD_MM) );
+    ATH_CHECK( NSWMatchingAlg(Hits_MM, SDO_MM) );
+    ATH_CHECK( NSWMatchingAlg(SDO_MM, PRD_MM) );
+  }
+
+  return StatusCode::SUCCESS;
+}
+
+// This part of the matching algortihm does the actual comparison given two EDM obects
+StatusCode NSWPRDValAlg::NSWMatchingAlg (EDM_object data0, EDM_object data1) {
+  if (data0.getDetector() != data1.getDetector()) { ATH_MSG_ERROR ("Matching " << data0.getDetector() << " data with " << data1.getDetector() << " data. This is not implemented in this algorithm"); }
+  
+  ATH_MSG_INFO("NSWMatchingAlg: Start matching " << data0.getName() << " and " << data1.getName() << " for " << data0.getDetector());
+  data0.setMatchedwith(data1.getName());
+  data1.setMatchedwith(data0.getName());
+
+  // Prepare Muon only check
+  std::vector<int>* TruthParticle_Pdg;
+  if ( m_doNSWMatchingMuon ) { m_tree->SetBranchAddress("TruthParticle_Pdg", &TruthParticle_Pdg); }
+
+  Long64_t nEntries = m_tree->GetEntriesFast();
+  for (Long64_t i_entry = 0; i_entry < nEntries; ++i_entry) {
+    // event numbering starts at 1
+    ATH_MSG_DEBUG("Now checking event number " << i_entry + 1);
+    m_tree->GetEntry(i_entry);
+    
+    if (data0.empty()) { ATH_MSG_WARNING("No " << data0.getDetector() << data0.getName() << " found in event " << i_entry + 1); continue; }
+    if (data1.empty()) { ATH_MSG_WARNING("No " << data1.getDetector() << data1.getName() << " found in event " << i_entry + 1); continue; }
+
+    ATH_MSG_DEBUG("Number of " << data0.getDetector() << data0.getName() << ": " << data0.size() << 
+                  ", number of " << data1.getDetector() << data1.getName() << ": " << data1.size());
+
+  //only muon events:
+  if (m_doNSWMatchingMuon) {
+    bool allMu = true;
+    int mu_pdg = 13;
+    for ( int pdg : *TruthParticle_Pdg ) { allMu &= (abs(pdg) == mu_pdg); }
+    if ( !allMu ) { ATH_MSG_VERBOSE("Skipping event, because doNSWMatchingMuonOnly is true and there non muon particles"); continue; }
+  }
+
+  // Reset variables to have a clean sheet
+    data0.init_matching();
+    data1.init_matching();
+
+    // Actual Matching
+    for (uint i = 0; i < data0.size(); ++i)
+     {
+      int nMatch = 0;
+        for (uint j = 0; j < data1.size(); ++j)
+        {
+           if ( data0.identifierMatch(data0, data1, i, j) )
+           {
+              nMatch++;
+              data0.update_match(i, data1.m_channel->at(j));
+              data1.update_match(j, data0.m_channel->at(i));
+           }
+        }
+        ATH_MSG_VERBOSE("Total Number of matches found: " << nMatch << " " << data1.getName() << " for a single " << data0.getName() );
+        if (nMatch == 0) {
+          ATH_MSG_WARNING("No match found!");
+        }
+     }
+    if (msgLevel() <= MSG::DEBUG) { 
+      ATH_MSG_DEBUG("Full info for " << data0.getName() << data0.getDetector());
+      data0.printInfo(); 
+      ATH_MSG_DEBUG("Full info for " << data1.getName() << data1.getDetector());
+      data1.printInfo(); 
+    }
+    
+    data0.update_efficiency(m_maxStripDiff);
+    data1.update_efficiency(m_maxStripDiff);
+
+  // The data0 vs data1 matching will now be overwritten
+  data0.clearVars();
+  data1.clearVars();
+  }
+
+  // Write result to file
+  std::ofstream efficiencies; 
+  efficiencies.open("NSWMatchingAlg_efficiencies.txt", std::ofstream::app);
+  data0.printEfficiency(efficiencies);
+  data1.printEfficiency(efficiencies);
+  efficiencies.close();
+
+  return StatusCode::SUCCESS;
+
+}
+
+// This function couples the branch of the NSW validation Ntuple with the EDM object. 
+// In case the brach does not exist, or is completely empty, the object will remain empty and the code will skip the matching entirly, giving a ATH_WARNING in the process
+StatusCode NSWPRDValAlg::setDataAdress (EDM_object &oData, TString branch_name) {
+  bool setBranch = false;
+  if (!(branch_name.Contains(oData.getName()) && branch_name.Contains(oData.getDetector()))) { return StatusCode::SUCCESS; }
+  // For sim hits select the offline identifiers, rather than the sim identifiers
+  if (branch_name.Contains("_sim_")) { return StatusCode::SUCCESS; }
+  if (branch_name.EndsWith("stationName")) { m_tree->SetBranchAddress(branch_name, &oData.m_stationName); setBranch = true; }
+  if (branch_name.EndsWith("stationEta")) { m_tree->SetBranchAddress(branch_name, &oData.m_stationEta); setBranch = true; }
+  if (branch_name.EndsWith("stationPhi")) { m_tree->SetBranchAddress(branch_name, &oData.m_stationPhi); setBranch = true; }
+  if (branch_name.EndsWith("multiplet")) { m_tree->SetBranchAddress(branch_name, &oData.m_multiplet); setBranch = true; }
+  if (branch_name.EndsWith("gas_gap")) { m_tree->SetBranchAddress(branch_name, &oData.m_gas_gap); setBranch = true; }
+  if (branch_name.EndsWith("channel")) { m_tree->SetBranchAddress(branch_name, &oData.m_channel); setBranch = true; }
+  if (branch_name.EndsWith("channel_type")) { m_tree->SetBranchAddress(branch_name, &oData.m_channel_type); setBranch = true; }
+  if (setBranch) { ATH_MSG_DEBUG("Set data adress of branch " << branch_name); }
+  
+  return StatusCode::SUCCESS;
+}
diff --git a/MuonSpectrometer/MuonValidation/MuonPRDTest/src/NSWPRDValAlg.h b/MuonSpectrometer/MuonValidation/MuonPRDTest/src/NSWPRDValAlg.h
index 8dd43410e0901d0586030780361d073867fe9c7e..90d3026b0b5d5ee1d81cbbb967f6becb071db455 100644
--- a/MuonSpectrometer/MuonValidation/MuonPRDTest/src/NSWPRDValAlg.h
+++ b/MuonSpectrometer/MuonValidation/MuonPRDTest/src/NSWPRDValAlg.h
@@ -1,11 +1,12 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef NSWPRDVALALG_H
 #define NSWPRDVALALG_H
 
 #include "AthenaBaseComps/AthAlgorithm.h"
+#include "EDM_object.h"
 
 #include <vector>
 
@@ -45,6 +46,11 @@ class NSWPRDValAlg:public AthAlgorithm
   StatusCode finalize();
   StatusCode execute();
 
+  // Matching algorithm
+  StatusCode NSWMatchingAlg();  // First set up which object should be matched, given the input used to fill the NSW Ntuple
+  StatusCode NSWMatchingAlg (EDM_object data0, EDM_object data1); // This part of the matching algortihm does the actual comparison given two EDM obects
+  StatusCode setDataAdress (EDM_object &oData, TString branch_name); // This function couples the branch of the NSW validation Ntuple with the EDM object. 
+
  private:
   TruthVariables*         m_TruthVar;
   MuEntryVariables*       m_MuEntryVar;
@@ -100,6 +106,11 @@ class NSWPRDValAlg:public AthAlgorithm
   std::string m_NSWMM_RDOContainerName;
   std::string m_NSWMM_PRDContainerName;
   std::string m_CSC_DigitContainerName;
+
+  // Matching algorithm
+  BooleanProperty m_doNSWMatching;
+  BooleanProperty m_doNSWMatchingMuon;
+  uint m_maxStripDiff;
 };
 
 #endif // NSWPRDVALALG_H
diff --git a/MuonSpectrometer/MuonValidation/MuonPRDTest/src/sTGCRDOVariables.cxx b/MuonSpectrometer/MuonValidation/MuonPRDTest/src/sTGCRDOVariables.cxx
index 02760eb31faded040d481a3905e7b0cd63a6e1bc..1544fe8c2588c1826708d3f9bc4ce397ea010ddb 100644
--- a/MuonSpectrometer/MuonValidation/MuonPRDTest/src/sTGCRDOVariables.cxx
+++ b/MuonSpectrometer/MuonValidation/MuonPRDTest/src/sTGCRDOVariables.cxx
@@ -5,6 +5,7 @@
 #include "sTGCRDOVariables.h"
 #include "AthenaBaseComps/AthAlgorithm.h"
 
+#include "MuonReadoutGeometry/sTgcReadoutElement.h"
 #include "MuonSimData/MuonSimDataCollection.h"
 
 #include "MuonRDO/STGC_RawDataContainer.h"
@@ -70,6 +71,26 @@ StatusCode sTGCRDOVariables::fillVariables()
       m_NSWsTGC_rdo_bcTag->push_back(rdo->bcTag());
       m_NSWsTGC_rdo_isDead->push_back(rdo->isDead());
 
+      // get the readout element class where the RDO is recorded
+      int isSmall = stName[2] == 'S';
+      const MuonGM::sTgcReadoutElement* rdoEl = m_detManager->getsTgcRElement_fromIdFields(isSmall, stationEta, stationPhi, multiplet );
+
+      Amg::Vector2D localStripPos(0.,0.);
+      if ( rdoEl->stripPosition(Id,localStripPos) )  {
+        m_NSWsTGC_rdo_localPosX->push_back(localStripPos.x());
+        m_NSWsTGC_rdo_localPosY->push_back(localStripPos.y());
+        ATH_MSG_DEBUG("sTGC RDO: local pos.:  x=" << localStripPos[0] << ",  y=" << localStripPos[1]);
+      } else { 
+        ATH_MSG_WARNING("sTGC RDO: local Strip position not defined"); 
+      }
+
+       // asking the detector element to transform this local to the global position
+      Amg::Vector3D globalStripPos(0., 0., 0.);
+      rdoEl->surface(Id).localToGlobal(localStripPos,Amg::Vector3D(0.,0.,0.),globalStripPos);
+      m_NSWsTGC_rdo_globalPosX->push_back(globalStripPos.x());
+      m_NSWsTGC_rdo_globalPosY->push_back(globalStripPos.y());
+      m_NSWsTGC_rdo_globalPosZ->push_back(globalStripPos.z());
+
       // rdo counter for the ntuple
       m_NSWsTGC_nrdo++;
     }
@@ -100,6 +121,13 @@ StatusCode sTGCRDOVariables::clearVariables()
   m_NSWsTGC_rdo_bcTag->clear();
   m_NSWsTGC_rdo_isDead->clear();
 
+  m_NSWsTGC_rdo_globalPosX->clear();
+  m_NSWsTGC_rdo_globalPosY->clear();
+  m_NSWsTGC_rdo_globalPosZ->clear();
+
+  m_NSWsTGC_rdo_localPosX->clear();
+  m_NSWsTGC_rdo_localPosY->clear();
+
   return StatusCode::SUCCESS;
 }
 
@@ -122,6 +150,12 @@ StatusCode sTGCRDOVariables::initializeVariables()
   m_NSWsTGC_rdo_bcTag       = new std::vector<uint16_t>();
   m_NSWsTGC_rdo_isDead      = new std::vector<bool>();
 
+  m_NSWsTGC_rdo_localPosX   = new std::vector<double>();
+  m_NSWsTGC_rdo_localPosY   = new std::vector<double>();
+
+  m_NSWsTGC_rdo_globalPosX   = new std::vector<double>();
+  m_NSWsTGC_rdo_globalPosY   = new std::vector<double>();
+  m_NSWsTGC_rdo_globalPosZ   = new std::vector<double>();
 
   if(m_tree) {
     m_tree->Branch("RDO_sTGC_n",            &m_NSWsTGC_nrdo);
@@ -136,6 +170,13 @@ StatusCode sTGCRDOVariables::initializeVariables()
     m_tree->Branch("RDO_sTGC_charge",       &m_NSWsTGC_rdo_charge);
     m_tree->Branch("RDO_sTGC_bcTag",        &m_NSWsTGC_rdo_bcTag);
     m_tree->Branch("RDO_sTGC_isDead",       &m_NSWsTGC_rdo_isDead);
+
+    m_tree->Branch("RDO_sTGC_localPosX",   &m_NSWsTGC_rdo_localPosX);
+    m_tree->Branch("RDO_sTGC_localPosY",   &m_NSWsTGC_rdo_localPosY);
+
+    m_tree->Branch("RDO_sTGC_globalPosX",  &m_NSWsTGC_rdo_globalPosX);
+    m_tree->Branch("RDO_sTGC_globalPosY",  &m_NSWsTGC_rdo_globalPosY);
+    m_tree->Branch("RDO_sTGC_globalPosZ",  &m_NSWsTGC_rdo_globalPosZ);
   }
 
   return StatusCode::SUCCESS;
@@ -157,6 +198,11 @@ void sTGCRDOVariables::deleteVariables()
   delete m_NSWsTGC_rdo_charge;
   delete m_NSWsTGC_rdo_bcTag;
   delete m_NSWsTGC_rdo_isDead;
+  delete m_NSWsTGC_rdo_localPosX;
+  delete m_NSWsTGC_rdo_localPosY;
+  delete m_NSWsTGC_rdo_globalPosX;
+  delete m_NSWsTGC_rdo_globalPosY;
+  delete m_NSWsTGC_rdo_globalPosZ;
 
   m_NSWsTGC_nrdo = 0;
   m_NSWsTGC_rdo_stationName = nullptr;
@@ -170,6 +216,11 @@ void sTGCRDOVariables::deleteVariables()
   m_NSWsTGC_rdo_charge = nullptr;
   m_NSWsTGC_rdo_bcTag = nullptr;
   m_NSWsTGC_rdo_isDead = nullptr;
+  m_NSWsTGC_rdo_localPosX = nullptr;
+  m_NSWsTGC_rdo_localPosY = nullptr;
+  m_NSWsTGC_rdo_globalPosX = nullptr;
+  m_NSWsTGC_rdo_globalPosY = nullptr;
+  m_NSWsTGC_rdo_globalPosZ = nullptr;
 
   return;
 }
diff --git a/MuonSpectrometer/MuonValidation/MuonPRDTest/src/sTGCRDOVariables.h b/MuonSpectrometer/MuonValidation/MuonPRDTest/src/sTGCRDOVariables.h
index 2e89de331a01b75d91271170e6b933821572a02c..f5717c023a71be13bfddcc6cd1708a7a6346fc5f 100644
--- a/MuonSpectrometer/MuonValidation/MuonPRDTest/src/sTGCRDOVariables.h
+++ b/MuonSpectrometer/MuonValidation/MuonPRDTest/src/sTGCRDOVariables.h
@@ -32,7 +32,12 @@ class sTGCRDOVariables : public ValAlgVariables
     m_NSWsTGC_rdo_time(0),
     m_NSWsTGC_rdo_charge(0),
     m_NSWsTGC_rdo_bcTag(0),
-    m_NSWsTGC_rdo_isDead(0)
+    m_NSWsTGC_rdo_isDead(0),
+    m_NSWsTGC_rdo_localPosX(0),
+    m_NSWsTGC_rdo_localPosY(0),
+    m_NSWsTGC_rdo_globalPosX(0),
+    m_NSWsTGC_rdo_globalPosY(0),
+    m_NSWsTGC_rdo_globalPosZ(0)
   {
     setHelper(idhelper);
   }
@@ -70,6 +75,12 @@ class sTGCRDOVariables : public ValAlgVariables
   std::vector<uint16_t> *m_NSWsTGC_rdo_bcTag;
   std::vector<bool> *m_NSWsTGC_rdo_isDead;
 
+  std::vector<double> *m_NSWsTGC_rdo_localPosX;
+  std::vector<double> *m_NSWsTGC_rdo_localPosY;
+
+  std::vector<double> *m_NSWsTGC_rdo_globalPosX;
+  std::vector<double> *m_NSWsTGC_rdo_globalPosY;
+  std::vector<double> *m_NSWsTGC_rdo_globalPosZ;
 };
 
 #endif // STGCRDOVARIABLES_H
diff --git a/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleSelectionAlg.cxx b/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleSelectionAlg.cxx
index 8b1ed66e74622798d9e9549518e8df60124d0ba0..71aa8ee757f87f61c490b3d32681bf275535291e 100644
--- a/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleSelectionAlg.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleSelectionAlg.cxx
@@ -1,7 +1,7 @@
 ///////////////////////// -*- C++ -*- /////////////////////////////
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 // ParticleSelectionAlg.cxx
@@ -68,8 +68,6 @@
 ParticleSelectionAlg::ParticleSelectionAlg( const std::string& name,
                                             ISvcLocator* pSvcLocator ) :
   ::AthAnalysisAlgorithm( name, pSvcLocator ),
-  m_selTools(),     // makes these tools public
-  m_selWVtxTools(), // makes these tools public
   m_evtInfoName("EventInfo"),
   m_inPrimVtxCont("PrimaryVertices"),
   m_inCollKey(""),
@@ -99,8 +97,6 @@ ParticleSelectionAlg::ParticleSelectionAlg( const std::string& name,
   declareProperty("OutputContainerOwnershipPolicy", m_outOwnPolicyName,
                   "Defines the ownership policy of the output container (default: 'OWN_ELEMENTS'; also allowed: 'VIEW_ELEMENTS')");
 
-  declareProperty("SelectionToolList",       m_selTools,     "The list of IAsgSelectionTools");
-  declareProperty("SelectionWithPVToolList", m_selWVtxTools, "The list of IAsgSelectionWithVertexTools");
   declareProperty("Selection",               m_selection,
                   "The selection string that defines which xAOD::IParticles to select from the container");
 
@@ -159,10 +155,6 @@ StatusCode ParticleSelectionAlg::initialize()
     return StatusCode::FAILURE;
   }
 
-  // Retrieve all tools
-  ATH_CHECK( m_selTools.retrieve() );
-  ATH_CHECK( m_selWVtxTools.retrieve() );
-
   ATH_MSG_DEBUG ( "==> done with initialize " << name() << "..." );
   return StatusCode::SUCCESS;
 }
@@ -173,10 +165,6 @@ StatusCode ParticleSelectionAlg::finalize()
 {
   ATH_MSG_DEBUG ("Finalizing " << name() << "...");
 
-  // Release all tools and services
-  ATH_CHECK( m_selTools.release() );
-  ATH_CHECK( m_selWVtxTools.release() );
-
   // Clean up the memory
   if (m_parser) {
     delete m_parser;
@@ -231,62 +219,6 @@ StatusCode ParticleSelectionAlg::beginRun()
     ATH_MSG_VERBOSE( "Recorded xAOD::CutBookkeeperContainer " << m_cutBKCName.value() << "Aux." );
   }
 
-  //------------- for the AsgSelectionTools --------------
-  // Now, register one CutBookkeeper per cut that will be applied.
-  // For each of the registered tools, get the TAccept and ask it for all known cuts.
-  for ( std::size_t toolIdx=0; toolIdx < m_selTools.size(); ++toolIdx ){
-    const auto& tool = m_selTools[toolIdx];
-    // Fill the index bookkeeping at what index in the CutBookkeeperContainer
-    // the CutBookkeepers for this tool start.
-    m_selToolIdxOffset.push_back( cutBKCont->size() );
-    // Get some needed quantities
-    const std::string toolName = tool->name();
-    const Root::TAccept& tAccept = tool->getTAccept();
-    const unsigned int nCuts = tAccept.getNCuts();
-    for ( unsigned int iCut=0; iCut<nCuts; ++iCut ){
-      // Get the name and description of this cut
-      const std::string cutName  = (tAccept.getCutName(iCut)).Data();
-      const std::string cutDescr = (tAccept.getCutDescription(iCut)).Data();
-      // Create a new xAOD::CutBookkeeper and add it to the container
-      xAOD::CutBookkeeper* cutBK = new xAOD::CutBookkeeper();
-      cutBKCont->push_back(cutBK);
-      // Now, set its properties
-      cutBK->setName(toolName+"_"+cutName);
-      cutBK->setDescription(cutDescr);
-      cutBK->setCutLogic(xAOD::CutBookkeeper::CutLogic::REQUIRE); // Each cut must be passed, thus REQUIRE, i.e, logical AND
-      cutBK->setInputStream(inputStreamName);
-      cutBK->setCycle(maxInputCycle);
-    }
-  }
-
-  //------------- for the AsgSelectionWithVertexTools --------------
-  // Now, register one CutBookkeeper per cut that will be applied.
-  // For each of the registered tools, get the TAccept and ask it for all known cuts.
-  for ( std::size_t toolIdx=0; toolIdx < m_selWVtxTools.size(); ++toolIdx ){
-    const auto& tool = m_selWVtxTools[toolIdx];
-    // Fill the index bookkeeping at what index in the CutBookkeeperContainer
-    // the CutBookkeepers for this tool start.
-    m_selWPVToolIdxOffset.push_back( cutBKCont->size() );
-    // Get some needed quantities
-    const std::string toolName = tool->name();
-    const Root::TAccept& tAccept = tool->getTAccept();
-    const unsigned int nCuts = tAccept.getNCuts();
-    for ( unsigned int iCut=0; iCut<nCuts; ++iCut ){
-      // Get the name and description of this cut
-      const std::string cutName  = (tAccept.getCutName(iCut)).Data();
-      const std::string cutDescr = (tAccept.getCutDescription(iCut)).Data();
-      // Create a new xAOD::CutBookkeeper and add it to the container
-      xAOD::CutBookkeeper* cutBK = new xAOD::CutBookkeeper();
-      cutBKCont->push_back(cutBK);
-      // Now, set its properties
-      cutBK->setName(toolName+"_"+cutName);
-      cutBK->setDescription(cutDescr);
-      cutBK->setCutLogic(xAOD::CutBookkeeper::CutLogic::REQUIRE); // Each cut must be passed, thus REQUIRE, i.e, logical AND
-      cutBK->setInputStream(inputStreamName);
-      cutBK->setCycle(maxInputCycle);
-    }
-  }
-
   //------------- for the ExpressionParsing in this algorithm --------------
   if ( !(m_selection.value().empty()) ){
     // Create a new xAOD::CutBookkeeper and add it to the container
diff --git a/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleSelectionAlg.h b/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleSelectionAlg.h
index e332ae73b3c1ed0206c046ad815d6f375609e202..bcc5633c1f60a992d423f3d1b97ae7db133ea4b1 100644
--- a/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleSelectionAlg.h
+++ b/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleSelectionAlg.h
@@ -1,7 +1,7 @@
 ///////////////////////// -*- C++ -*- /////////////////////////////
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 // ParticleSelectionAlg.h
@@ -22,8 +22,6 @@
 #include "AthAnalysisBaseComps/AthAnalysisAlgorithm.h"
 #include "xAODBase/IParticleContainer.h"
 //#include "TrigDecisionTool/TrigDecisionTool.h"
-#include "PATCore/IAsgSelectionTool.h"
-#include "PATCore/IAsgSelectionWithVertexTool.h"
 
 // // Forward declarations
 // namespace Trig{
@@ -78,12 +76,6 @@ class ParticleSelectionAlg
   // Private data:
   ///////////////////////////////////////////////////////////////////
  private:
-  /// The list of IAsgSelectionTools
-  ToolHandleArray<IAsgSelectionTool> m_selTools;
-
-  /// The list of IAsgSelectionWithVertexTools
-  ToolHandleArray<IAsgSelectionWithVertexTool> m_selWVtxTools;
-
   /// Name of the EventInfo object
   StringProperty m_evtInfoName;
 
diff --git a/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleSelectionAlg.icc b/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleSelectionAlg.icc
index 7e88f764b4e97167ecb25fe280a4c2575756c06c..84370ef7b9c8c34021cd3454469d9d9b0098e633 100644
--- a/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleSelectionAlg.icc
+++ b/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleSelectionAlg.icc
@@ -1,7 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 
@@ -12,7 +12,8 @@
 #include "xAODTracking/VertexContainer.h"
 #include "xAODTracking/Vertex.h"
 #include "xAODCutFlow/CutBookkeeperContainer.h"
-#include "PATCore/TAccept.h"
+#include "PATCore/AcceptInfo.h"
+#include "PATCore/AcceptData.h"
 
 
 
@@ -81,75 +82,6 @@ StatusCode ParticleSelectionAlg::selectParticles(const xAOD::IParticleContainer*
     // the remainder of the cuts will not even be tried
     bool passEverything = true;
 
-    //------------- for the AsgSelectionTools --------------
-    // Loop over all selection tools
-    ATH_MSG_VERBOSE("Loop over all selection tools");
-    for ( std::size_t toolIdx=0; toolIdx < m_selTools.size(); ++toolIdx ){
-      if (passEverything){
-        ATH_MSG_VERBOSE("Now going to try AsgSelectionTools number " << toolIdx );
-        const Root::TAccept& tAccept = m_selTools[toolIdx]->accept(part);
-        if (!m_doCutFlow){ passEverything &= static_cast<bool>(tAccept); }
-        else {
-          const std::size_t cbkStartIdx = m_selToolIdxOffset[toolIdx];
-          const unsigned int nCuts = tAccept.getNCuts();
-          for ( unsigned int iCut=0; iCut<nCuts; ++iCut ){
-            passEverything &= tAccept.getCutResult(iCut);
-            if (passEverything){
-              const std::size_t currentCBKIdx = cbkStartIdx + iCut;
-              xAOD::CutBookkeeper* cutBK = cutBKCont->at(currentCBKIdx);
-              cutBK->addNAcceptedEvents(1);
-              cutBK->addSumOfEventWeights(eventWeight);
-              cutBK->addSumOfEventWeightsSquared(eventWeight*eventWeight);
-            }
-          }
-        } // Done doing detailed particle cut-flow for this tool
-        ATH_MSG_VERBOSE("AsgSelectionTools number " << toolIdx << " passed/failed: " << passEverything );
-      }
-    }
-
-    //------------- for the AsgSelectionWithVertexTools --------------
-    // If we have at least one, we have to get the primary vertex
-    if ( m_selWVtxTools.size() ){
-      // Get the primary vertex container
-      const xAOD::VertexContainer* primVtxCont = nullptr;
-      ATH_CHECK( evtStore()->retrieve( primVtxCont, m_inPrimVtxCont.value() ) );
-      const xAOD::Vertex* primVtx = nullptr;
-      for ( const xAOD::Vertex* vtx  :  *primVtxCont ) {
-        // Get THE primary vertex
-        if ( vtx->vertexType() == xAOD::VxType::PriVtx ) {
-          primVtx = vtx;
-          break;
-        }
-      }
-      if ( !primVtx ) {
-        ATH_MSG_WARNING("Couldn't find a primary vertex in this event!");
-      }
-      // Now, we go ahead and loop over the tools
-      ATH_MSG_VERBOSE("Loop over all selection with vertex tools: " << passEverything);
-      for ( std::size_t toolIdx=0; toolIdx < m_selWVtxTools.size(); ++toolIdx ){
-        if (passEverything){
-          ATH_MSG_VERBOSE("Now going to try AsgSelectionWithVertexTools number " << toolIdx );
-          const Root::TAccept& tAccept = m_selWVtxTools[toolIdx]->accept(part,primVtx);
-          if (!m_doCutFlow){ passEverything &= static_cast<bool>(tAccept); }
-          else {
-            const std::size_t cbkStartIdx = m_selWPVToolIdxOffset[toolIdx];
-            const unsigned int nCuts = tAccept.getNCuts();
-            for ( unsigned int iCut=0; iCut<nCuts; ++iCut ){
-              passEverything &= tAccept.getCutResult(iCut);
-              if (passEverything){
-                const std::size_t currentCBKIdx = cbkStartIdx + iCut;
-                xAOD::CutBookkeeper* cutBK = cutBKCont->at(currentCBKIdx);
-                cutBK->addNAcceptedEvents(1);
-                cutBK->addSumOfEventWeights(eventWeight);
-                cutBK->addSumOfEventWeightsSquared(eventWeight*eventWeight);
-              }
-            }
-          } // Done doing detailed particle cut-flow for this tool
-          ATH_MSG_VERBOSE("AsgSelectionWithVertexTools number " << toolIdx << " passed/failed: " << passEverything );
-        }
-      }// Done looping over the selection tools
-    } // End: if ( m_selWVtxTools.size() ){
-
     //------------- for the ExpressionParsing in this algorithm --------------
     ATH_MSG_VERBOSE("Looking at expression parser result: " << passEverything);
     if ( passEverything && !(resultVec.empty()) ){
diff --git a/PhysicsAnalysis/AnalysisCommon/PATCore/PATCore/AcceptData.h b/PhysicsAnalysis/AnalysisCommon/PATCore/PATCore/AcceptData.h
index 19ba480d9608e434ec606359ed60122dd7392451..f0d7fc2245f758e3036dac2ece1f8fd022810192 100644
--- a/PhysicsAnalysis/AnalysisCommon/PATCore/PATCore/AcceptData.h
+++ b/PhysicsAnalysis/AnalysisCommon/PATCore/PATCore/AcceptData.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 // Dear emacs, this is -*-c++-*-
@@ -21,6 +21,7 @@
 #include <string>
 #include <map>
 #include <bitset>
+#include <cassert>
 #include <PATCore/AcceptInfo.h>
 
 
@@ -142,6 +143,13 @@ namespace asg {
       m_accept[cutPosition] = cutResult;
     }
 
+    AcceptData& operator|= (const AcceptData& other)
+    {
+      assert (m_info == other.m_info);
+      m_accept |= other.m_accept;
+      return *this;
+    }
+
 
     // Private members
   private:
diff --git a/PhysicsAnalysis/AnalysisCommon/PATCore/PATCore/IAsgSelectionTool.h b/PhysicsAnalysis/AnalysisCommon/PATCore/PATCore/IAsgSelectionTool.h
index f57e1dd8124fbb5e3c1a0b0c30dd80ea12a47148..791dea0bd9e28e910ff64d45da45849ab38590df 100644
--- a/PhysicsAnalysis/AnalysisCommon/PATCore/PATCore/IAsgSelectionTool.h
+++ b/PhysicsAnalysis/AnalysisCommon/PATCore/PATCore/IAsgSelectionTool.h
@@ -1,7 +1,7 @@
 ///////////////////////// -*- C++ -*- /////////////////////////////
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 // IAsgSelectionTool.h 
@@ -18,7 +18,8 @@
 #include "AsgTools/IAsgTool.h"
 
 // Include the return object
-#include "PATCore/TAccept.h"
+#include "PATCore/AcceptInfo.h"
+#include "PATCore/AcceptData.h"
 
 // Forward declaration
 namespace xAOD{
@@ -26,11 +27,7 @@ namespace xAOD{
 }
 
 
-//static const InterfaceID IID_IAsgSelectionTool("IAsgSelectionTool", 1, 0);
-
-// this ought to be deprecated, but we have so many clients, that we
-// are not doing it yet.
-class [[deprecated("do not use for multi-threaded code")]] IAsgSelectionTool
+class  IAsgSelectionTool
   : virtual public asg::IAsgTool
 { 
   /// Declare the interface ID for this pure-virtual interface class to the Athena framework
@@ -46,15 +43,12 @@ class [[deprecated("do not use for multi-threaded code")]] IAsgSelectionTool
   // Const methods: 
   ///////////////////////////////////////////////////////////////////
 
-  /** Method to get the plain TAccept.
-      This is needed so that one can already get the TAccept 
-      and query what cuts are defined before the first object 
-      is passed to the tool. */
-  virtual const Root::TAccept& getTAccept( ) const = 0;
+  /** Method to get the AcceptInfo to query what cuts are defined. */
+  virtual const asg::AcceptInfo& getAcceptInfo( ) const = 0;
 
 
   /** The main accept method: the actual cuts are applied here */
-  virtual const Root::TAccept& accept( const xAOD::IParticle* /*part*/ ) const = 0;
+  virtual asg::AcceptData accept( const xAOD::IParticle* /*part*/ ) const = 0;
 
 
 }; 
diff --git a/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/CMakeLists.txt b/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/CMakeLists.txt
index 4f90a5e19dbbf3c024f3ce3c87fdb47ac89b3b5a..1ee9db08366f95766b6ef6a9a28933e8180c0b53 100644
--- a/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/CMakeLists.txt
+++ b/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/CMakeLists.txt
@@ -60,7 +60,7 @@ atlas_add_component( InDetD3PDMaker
                      src/*.cxx
                      src/components/*.cxx
                      INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${HEPMC_INCLUDE_DIRS} ${HEPPDT_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${Boost_LIBRARIES} ${HEPMC_LIBRARIES} ${HEPPDT_LIBRARIES}  GaudiKernel CommissionEvent AthContainers AthenaKernel StoreGateLib AtlasDetDescr GeoAdaptors Identifier EventPrimitives xAODEventInfo xAODTracking InDetBeamSpotService SCT_ConditionsTools TRT_ConditionsServices InDetIdentifier InDetReadoutGeometry SCT_CablingLib InDetRawData InDetPrepRawData InDetRIO_OnTrack InDetSimEvent D3PDMakerUtils MCTruthClassifier ParticleTruth ITrackToVertex muonEvent Particle TrkCompetingRIOsOnTrack TrkEventPrimitives TrkParameters TrkParticleBase TrkPrepRawData TrkRIO_OnTrack TrkTrack TrkTrackSummary TrkTruthData TrkV0Vertex VxVertex TrkToolInterfaces TrkVertexFitterValidationUtils )
+                     LINK_LIBRARIES ${Boost_LIBRARIES} ${HEPMC_LIBRARIES} ${HEPPDT_LIBRARIES}  GaudiKernel CommissionEvent AthContainers AthenaKernel StoreGateLib AtlasDetDescr GeoAdaptors Identifier EventPrimitives xAODEventInfo xAODTracking InDetBeamSpotService SCT_ConditionsToolsLib TRT_ConditionsServices InDetIdentifier InDetReadoutGeometry SCT_CablingLib InDetRawData InDetPrepRawData InDetRIO_OnTrack InDetSimEvent D3PDMakerUtils MCTruthClassifier ParticleTruth ITrackToVertex muonEvent Particle TrkCompetingRIOsOnTrack TrkEventPrimitives TrkParameters TrkParticleBase TrkPrepRawData TrkRIO_OnTrack TrkTrack TrkTrackSummary TrkTruthData TrkV0Vertex VxVertex TrkToolInterfaces TrkVertexFitterValidationUtils )
 
 # Install files from the package:
 atlas_install_headers( InDetD3PDMaker )
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronEfficiencyCorrection/Root/TElectronEfficiencyCorrectionTool.cxx b/PhysicsAnalysis/ElectronPhotonID/ElectronEfficiencyCorrection/Root/TElectronEfficiencyCorrectionTool.cxx
index 1fd6b01d35555645e07fe4e336d98b76a5274c74..0120f7bc9e263e1e7da860beab275ec2565c138f 100644
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronEfficiencyCorrection/Root/TElectronEfficiencyCorrectionTool.cxx
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronEfficiencyCorrection/Root/TElectronEfficiencyCorrectionTool.cxx
@@ -124,17 +124,6 @@ int Root::TElectronEfficiencyCorrectionTool::initialize() {
   ATH_MSG_DEBUG("Initializing tool with " << m_corrFileNameList.size() 
                 << " configuration file(s)");
 
-  /* 
-   * Check if the first file can be opened 
-   * It is needed for auto-setting of the seed based on the md5-sum of the file
-   */
-  const std::unique_ptr<char> fname(gSystem->ExpandPathName(m_corrFileNameList[0].c_str()));
-  std::unique_ptr<TFile> rootFile_tmp( TFile::Open(fname.get(), "READ") );
-  if (!rootFile_tmp) {
-    ATH_MSG_ERROR("No ROOT file found here: " << m_corrFileNameList[0]);
-    return 0;
-  }
-  rootFile_tmp->Close();
   
   if (m_doToyMC && m_doCombToyMC) {
     ATH_MSG_ERROR(" Both regular and combined toy MCs booked!" << " Only use one!");
@@ -146,6 +135,8 @@ int Root::TElectronEfficiencyCorrectionTool::initialize() {
    */
   if (m_doToyMC || m_doCombToyMC) {
     if (m_seed == 0) {
+    // Use the name of the correction  for auto-setting of the seed based on the md5-sum of the file
+      const std::unique_ptr<char[]> fname(gSystem->ExpandPathName(m_corrFileNameList[0].c_str()));
       std::unique_ptr<TMD5> tmd=CxxUtils::make_unique<TMD5>();
       const char* tmd_as_string=tmd->FileChecksum(fname.get())->AsString();
       m_seed = *(reinterpret_cast<const unsigned long int*>(tmd_as_string));
@@ -650,10 +641,9 @@ int Root::TElectronEfficiencyCorrectionTool::getHistograms() {
   /*
    * Get all ROOT files and histograms
    */
-
   for (unsigned int i = 0; i < m_corrFileNameList.size(); ++i) {
     // Load the ROOT file
-    const std::unique_ptr<char> fname (gSystem->ExpandPathName(m_corrFileNameList[i].c_str()));
+    const std::unique_ptr<char[]> fname (gSystem->ExpandPathName(m_corrFileNameList[i].c_str()));
     std::unique_ptr<TFile> rootFile( TFile::Open(fname.get(), "READ") );
     if (!rootFile) {
       ATH_MSG_ERROR( "No ROOT file found here: " <<m_corrFileNameList[i]);
@@ -661,21 +651,21 @@ int Root::TElectronEfficiencyCorrectionTool::getHistograms() {
     }
     // Loop over all directories inside the root file (correspond to the run number ranges
     TIter nextdir(rootFile->GetListOfKeys());
-    TKey *dir;
-    TObject *obj;
+    TKey *dir=nullptr;
+    TObject *obj=nullptr;
     while ((dir = (TKey *) nextdir())) {
       obj = dir->ReadObj();
       if (obj->IsA()->InheritsFrom("TDirectory")) {
         // splits string by delimiter --> e.g RunNumber1_RunNumber2
-        TObjArray dirNameArray = *(TString(obj->GetName()).Tokenize("_"));
+        std::unique_ptr<TObjArray> dirNameArray(TString(obj->GetName()).Tokenize("_"));
         // returns index of last string --> if one, the directory name does not contain any run numbers
-        int lastIdx = dirNameArray.GetLast();
+        int lastIdx = dirNameArray->GetLast();
         if (lastIdx != 1) {
           ATH_MSG_ERROR("The folder name seems to have the wrong format! Directory name:"<< obj->GetName());
           return 0;
         }
         rootFile->cd(obj->GetName());
-        if (0 == this->setupHistogramsInFolder(dirNameArray, lastIdx)) {
+        if (0 == this->setupHistogramsInFolder(*dirNameArray, lastIdx)) {
           ATH_MSG_ERROR("Unable to setup the histograms in directory " << dir->GetName()
                         << "in file " << m_corrFileNameList[i]);
           return 0;
@@ -733,8 +723,8 @@ int Root::TElectronEfficiencyCorrectionTool::setupHistogramsInFolder(const TObjA
   std::vector<TObjArray > sysObjsFast;
 
   TIter nextkey(gDirectory->GetListOfKeys());
-  TKey *key;
-  TObject *obj(0);
+  TKey *key=nullptr;
+  TObject *obj=nullptr;
   int seenSystematics= 0;
 
   //Loop of the keys 
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/CMakeLists.txt b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/CMakeLists.txt
index e5d09c5a10ef675047bd05525d7b92e301b021d1..29e15c8097da60b75160db165630be39aff9b178 100644
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/CMakeLists.txt
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/CMakeLists.txt
@@ -52,8 +52,7 @@ endif()
 
 atlas_add_dictionary( ElectronPhotonSelectorToolsDict
   ElectronPhotonSelectorTools/ElectronPhotonSelectorToolsCoreDict.h
-  ElectronPhotonSelectorTools/selectionCore.xml
-  LINK_LIBRARIES ElectronPhotonSelectorToolsLib )
+  ElectronPhotonSelectorTools/selectionCore.xml)
 
 atlas_add_dictionary( ElectronPhotonSelectorToolsPythonDict
   ElectronPhotonSelectorTools/ElectronPhotonSelectorToolsPythonDict.h
diff --git a/PhysicsAnalysis/EventTag/EventTagUtils/src/RegistrationStreamTrig.cxx b/PhysicsAnalysis/EventTag/EventTagUtils/src/RegistrationStreamTrig.cxx
index f009ba23d8c9c0064dddf7ae1693bda6b99e2661..c78c67087ff57b4ba5c74254ab464f3a3343d844 100755
--- a/PhysicsAnalysis/EventTag/EventTagUtils/src/RegistrationStreamTrig.cxx
+++ b/PhysicsAnalysis/EventTag/EventTagUtils/src/RegistrationStreamTrig.cxx
@@ -21,8 +21,6 @@
 
 #include "DBDataModel/CollectionMetadata.h"
 
-//#include "EventInfo/EventIncident.h"
-
 #include "AthenaPoolUtilities/TagMetadataKey.h"
 
 #include "TPython.h"
diff --git a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/BTaggingConfiguration.py b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/BTaggingConfiguration.py
index b60906a410f2e42ac72a1fb14e3a7355e61c76fc..997be8f346728088a503057e186b0255d27e2965 100644
--- a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/BTaggingConfiguration.py
+++ b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/BTaggingConfiguration.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 
 # Python function implementation of B-tagging configuration
 # Wouter van den Wollenberg (2013-2015)
@@ -487,6 +487,7 @@ class Configuration:
               raise RuntimeError
           print self.BTagTag()+' - INFO - Adding JetBTaggerAlg for '+jetcol
           from BTagging.BTaggingConf import Analysis__JetBTaggerAlg as JetBTaggerAlg
+          objs = {}
           options = dict(options)
           options.setdefault('OutputLevel', BTaggingFlags.OutputLevel)
           # setup the Analysis__BTagTrackAssociation tool
@@ -495,7 +496,7 @@ class Configuration:
           self._BTaggingConfig_MainAssociatorTools[jetcol] = thisBTagTrackAssociation
           options.setdefault('BTagTrackAssocTool', thisBTagTrackAssociation)
           # setup the secondary vertexing tool
-          thisSecVtxTool = self.setupSecVtxTool('SecVx'+self.GeneralToolSuffix(), jetcol, ToolSvc, Verbose)
+          thisSecVtxTool = self.setupSecVtxTool('SecVx'+self.GeneralToolSuffix(), jetcol, ToolSvc, Verbose, objs=objs)
           self._BTaggingConfig_SecVtxTools[jetcol] = thisSecVtxTool
           options.setdefault('BTagSecVertexing', thisSecVtxTool)
           # Setup the associator tool
@@ -507,8 +508,11 @@ class Configuration:
           options.setdefault('JetCollectionName', jetcol.replace('Track','PV0Track') + "Jets")
           options.setdefault('BTaggingCollectionName', btagname)
           options['BTagTool'] = self._BTaggingConfig_JetCollections.get(jetcol, None)
+          objs['xAOD::BTaggingContainer'] = options['BTaggingCollectionName']
           # -- create main BTagging algorithm and add it to topSequence
           jetbtaggeralg = JetBTaggerAlg(**options)
+          from RecExConfig.ObjKeyStore import objKeyStore
+          objKeyStore.addManyTypesTransient(objs)
           if not topSequence is None:
               topSequence += jetbtaggeralg
           if Verbose:
@@ -1380,7 +1384,7 @@ class Configuration:
           ToolSvc += tool
       return tool
 
-  def setupSecVtxTool(self, name, JetCollection, ToolSvc, Verbose = False, options={}):
+  def setupSecVtxTool(self, name, JetCollection, ToolSvc, Verbose = False, options={}, objs=None):
       """Adds a SecVtxTool instance and registers it.
 
       input: name:               The tool's name.
@@ -1388,7 +1392,9 @@ class Configuration:
              ToolSvc:            The ToolSvc instance.
              Verbose:            Whether to print detailed information about the tool.
              options:            Python dictionary of options to be passed to the SecVtxTool.
-      output: The tool."""
+      output: The tool.
+
+      If OBJS is set, then it is filled with objects written to SG."""
       jetcol = JetCollection
       secVtxFinderList = []
       secVtxFinderTrackNameList = []
@@ -1426,6 +1432,9 @@ class Configuration:
       options.setdefault('JetFitterVariableFactory', jetFitterVF)
       options.setdefault('MSVVariableFactory', varFactory)
       options['name'] = name
+      if objs:
+        objs['xAOD::VertexContainer'] = options['BTagSVCollectionName']
+        objs['xAOD::BTagVertexContainer'] = options['BTagJFVtxCollectionName']
       from BTagging.BTaggingConf import Analysis__BTagSecVertexing
       tool = Analysis__BTagSecVertexing(**options)
       if self._name == "Trig":
diff --git a/PhysicsAnalysis/JetTagging/JetTagPerformanceCalibration/xAODBTaggingEfficiency/Root/BTaggingSelectionTool.cxx b/PhysicsAnalysis/JetTagging/JetTagPerformanceCalibration/xAODBTaggingEfficiency/Root/BTaggingSelectionTool.cxx
index f6aadc0a1869df9d7d4ddb0bc22e6c863ae4019c..1fe5e41825a8a4c359ea687a727a553c5a0b8aac 100644
--- a/PhysicsAnalysis/JetTagging/JetTagPerformanceCalibration/xAODBTaggingEfficiency/Root/BTaggingSelectionTool.cxx
+++ b/PhysicsAnalysis/JetTagging/JetTagPerformanceCalibration/xAODBTaggingEfficiency/Root/BTaggingSelectionTool.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "xAODBTaggingEfficiency/BTaggingSelectionTool.h"
@@ -145,37 +145,34 @@ StatusCode BTaggingSelectionTool::initialize() {
 
   return StatusCode::SUCCESS;
 }
-const Root::TAccept& BTaggingSelectionTool::getTAccept() const {
+const asg::AcceptInfo& BTaggingSelectionTool::getAcceptInfo() const {
   return m_accept;
 }
 
-const Root::TAccept& BTaggingSelectionTool::accept( const xAOD::IParticle* p ) const {
-  // Reset the result:
-  m_accept.clear();
-
+asg::AcceptData BTaggingSelectionTool::accept( const xAOD::IParticle* p ) const {
   // Check if this is a jet:
   if( p->type() != xAOD::Type::Jet ) {
     ATH_MSG_ERROR( "accept(...) Function received a non-jet" );
-    return m_accept;
+    return asg::AcceptData (&m_accept);
   }
 
   // Cast it to a jet:
   const xAOD::Jet* jet = dynamic_cast< const xAOD::Jet* >( p );
   if( ! jet ) {
     ATH_MSG_FATAL( "accept(...) Failed to cast particle to jet" );
-    return m_accept;
+    return asg::AcceptData (&m_accept);
   }
 
   // Let the specific function do the work:
   return accept( *jet );
 }
 
-const Root::TAccept& BTaggingSelectionTool::accept( const xAOD::Jet& jet ) const {
-  m_accept.clear();
+asg::AcceptData BTaggingSelectionTool::accept( const xAOD::Jet& jet ) const {
+  asg::AcceptData acceptData (&m_accept);
 
   if (! m_initialised) {
     ATH_MSG_ERROR("BTaggingSelectionTool has not been initialised");
-    return m_accept;
+    return acceptData;
   }
 
   if ("AntiKt2PV0TrackJets"== m_jetAuthor ||
@@ -183,7 +180,7 @@ const Root::TAccept& BTaggingSelectionTool::accept( const xAOD::Jet& jet ) const
       "AntiKtVR30Rmax4Rmin02TrackJets"== m_jetAuthor
       ){
     // We want at least 2 tracks in a track jet
-    m_accept.setCutResult( "NConstituents", jet.numConstituents() >= 2 );
+    acceptData.setCutResult( "NConstituents", jet.numConstituents() >= 2 );
   }
 
   double pT = jet.pt();
@@ -198,7 +195,7 @@ const Root::TAccept& BTaggingSelectionTool::accept( const xAOD::Jet& jet ) const
       ATH_MSG_ERROR("Failed to retrieve "+m_taggerName+" weight!");
     }
     ATH_MSG_VERBOSE( "MV2c20 " <<  weight_mv2 );
-    return accept(pT, eta, weight_mv2);
+    acceptData |= accept(pT, eta, weight_mv2);
   }
   else {
     double weight_mv2c100(-10.);
@@ -212,18 +209,18 @@ const Root::TAccept& BTaggingSelectionTool::accept( const xAOD::Jet& jet ) const
     }
     ATH_MSG_VERBOSE( "MV2cl100 "  <<  weight_mv2cl100 );
     ATH_MSG_VERBOSE( "MV2c100 " <<  weight_mv2c100 );
-    return accept(pT, eta, weight_mv2cl100, weight_mv2c100 );
-
+    acceptData |= accept(pT, eta, weight_mv2cl100, weight_mv2c100 );
   }
+  return acceptData;
 }
 
-const Root::TAccept& BTaggingSelectionTool::accept(double pT, double eta, double weight_mv2) const
+asg::AcceptData BTaggingSelectionTool::accept(double pT, double eta, double weight_mv2) const
 {
-  m_accept.clear();
+  asg::AcceptData acceptData (&m_accept);
 
   if (! m_initialised) {
     ATH_MSG_ERROR("BTaggingSelectionTool has not been initialised");
-    return m_accept;
+    return acceptData;
   }
 
   // flat cut for out of range pTs
@@ -232,8 +229,8 @@ const Root::TAccept& BTaggingSelectionTool::accept(double pT, double eta, double
 
   eta = std::fabs(eta);
 
-  if (! checkRange(pT, eta))
-    return m_accept;
+  if (! checkRange(pT, eta, acceptData))
+    return acceptData;
 
   // After initialization, either m_spline or m_constcut should be non-zero
   // Else, the initialization was incorrect and should be revisited
@@ -248,23 +245,23 @@ const Root::TAccept& BTaggingSelectionTool::accept(double pT, double eta, double
   ATH_MSG_VERBOSE( "Cut value " << cutvalue );
 
   if (  weight_mv2 < cutvalue ){
-    return m_accept;
+    return acceptData;
   }
-  m_accept.setCutResult( "WorkingPoint", true );
+  acceptData.setCutResult( "WorkingPoint", true );
 
   // Return the result:
-  return m_accept;
+  return acceptData;
 }
 
 
 
-const Root::TAccept& BTaggingSelectionTool::accept(double pT, double eta, double weight_mv2cl100, double weight_mv2c100) const
+asg::AcceptData BTaggingSelectionTool::accept(double pT, double eta, double weight_mv2cl100, double weight_mv2c100) const
 {
-  m_accept.clear();
+  asg::AcceptData acceptData (&m_accept);
 
   if (! m_initialised) {
     ATH_MSG_ERROR("BTaggingSelectionTool has not been initialised");
-    return m_accept;
+    return acceptData;
   }
 
   // flat cut for out of range pTs
@@ -273,8 +270,8 @@ const Root::TAccept& BTaggingSelectionTool::accept(double pT, double eta, double
 
   eta = std::fabs(eta);
 
-  if (! checkRange(pT, eta))
-    return m_accept;
+  if (! checkRange(pT, eta, acceptData))
+    return acceptData;
 
   // After initialization, either m_spline or m_constcut should be non-zero
   // Else, the initialization was incorrect and should be revisited
@@ -288,12 +285,12 @@ const Root::TAccept& BTaggingSelectionTool::accept(double pT, double eta, double
   ATH_MSG_VERBOSE( "Cut values " << cutvalueA << " " << cutvalueB );
 
   if ( !(  weight_mv2cl100 > cutvalueA && weight_mv2c100 < cutvalueB )  ){
-    return m_accept;
+    return acceptData;
   }
-  m_accept.setCutResult( "WorkingPoint", true ); // IF we arrived here, the jet is tagged
+  acceptData.setCutResult( "WorkingPoint", true ); // IF we arrived here, the jet is tagged
 
   // Return the result:
-  return m_accept;
+  return acceptData;
 }
 
 
@@ -303,14 +300,14 @@ int BTaggingSelectionTool::getQuantile( const xAOD::IParticle* p ) const {
   // Check if this is a jet:
   if( p->type() != xAOD::Type::Jet ) {
     ATH_MSG_ERROR( "accept(...) Function received a non-jet" );
-    return m_accept;
+    return -1;
   }
 
   // Cast it to a jet:
   const xAOD::Jet* jet = dynamic_cast< const xAOD::Jet* >( p );
   if( ! jet ) {
     ATH_MSG_FATAL( "accept(...) Failed to cast particle to jet" );
-    return m_accept;
+    return -1;
   }
 
   // Let the specific function do the work:
@@ -349,7 +346,8 @@ int BTaggingSelectionTool::getQuantile(double pT, double eta, double weight_mv2
 
   int bin_index(-1);
 
-  if (! checkRange(pT, eta)) return bin_index;
+  asg::AcceptData acceptData (&m_accept);
+  if (! checkRange(pT, eta, acceptData)) return bin_index;
 
   // If in b-tagging acceptance, cont.tagging
   for (int i=0; i<=5; ++i) {
@@ -364,20 +362,21 @@ int BTaggingSelectionTool::getQuantile(double pT, double eta, double weight_mv2
   return bin_index;
 }
 
-bool BTaggingSelectionTool::checkRange(double pT, double eta) const
+bool BTaggingSelectionTool::checkRange(double pT, double eta,
+                                       asg::AcceptData& acceptData) const
 {
   // Do the |eta| cut:
   if( eta > m_maxEta ) {
     return false;
   }
-  m_accept.setCutResult( "Eta", true );
+  acceptData.setCutResult( "Eta", true );
 
   // Do the pT cut:
   ATH_MSG_VERBOSE( "Jet pT: " << pT );
   if( pT < m_minPt ) {
     return false;
   }
-  m_accept.setCutResult( "Pt", true );
+  acceptData.setCutResult( "Pt", true );
 
   return true;
 }
diff --git a/PhysicsAnalysis/JetTagging/JetTagPerformanceCalibration/xAODBTaggingEfficiency/xAODBTaggingEfficiency/BTaggingSelectionTool.h b/PhysicsAnalysis/JetTagging/JetTagPerformanceCalibration/xAODBTaggingEfficiency/xAODBTaggingEfficiency/BTaggingSelectionTool.h
index 36e63e58975b40c55f8254d6632901461d8f16b7..f64e69f1ee6a803bbefb04134d4002d63742c86a 100644
--- a/PhysicsAnalysis/JetTagging/JetTagPerformanceCalibration/xAODBTaggingEfficiency/xAODBTaggingEfficiency/BTaggingSelectionTool.h
+++ b/PhysicsAnalysis/JetTagging/JetTagPerformanceCalibration/xAODBTaggingEfficiency/xAODBTaggingEfficiency/BTaggingSelectionTool.h
@@ -1,7 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 ///////////////////////////////////////////////////////////////////
@@ -42,34 +42,35 @@ class BTaggingSelectionTool: public asg::AsgTool,
   public:  
   /// Create a constructor for standalone usage
   BTaggingSelectionTool( const std::string& name );
-  StatusCode initialize();
+  virtual StatusCode initialize() override;
   /// Get an object describing the "selection steps" of the tool
-  virtual const Root::TAccept& getTAccept() const;
+  virtual const asg::AcceptInfo& getAcceptInfo() const override;
 
   /// Get the decision using a generic IParticle pointer
-  virtual const Root::TAccept& accept( const xAOD::IParticle* p ) const;
-  virtual const Root::TAccept& accept( const xAOD::Jet& jet ) const;
+  virtual asg::AcceptData accept( const xAOD::IParticle* p ) const override;
+  virtual asg::AcceptData accept( const xAOD::Jet& jet ) const override;
 
   /// Get the decision using thet jet's pt and mv2c20 weight values
-  virtual const Root::TAccept& accept(double /* jet pt */, double /* jet eta */, double /* mv2c20 weight */ ) const;
-  virtual const Root::TAccept& accept(double /* jet pt */, double /* jet eta */, double /* mv2c00 weight */, double /* mv2c100 weight */ ) const;
+  virtual asg::AcceptData accept(double /* jet pt */, double /* jet eta */, double /* mv2c20 weight */ ) const override;
+  virtual asg::AcceptData accept(double /* jet pt */, double /* jet eta */, double /* mv2c00 weight */, double /* mv2c100 weight */ ) const override;
 
   /// Decide in which quantile of the MV2c20 weight distribution the jet belongs (continuous tagging)
   /// The return value represents the bin index of the quantile distribution
-  virtual int getQuantile( const xAOD::IParticle* ) const;
-  virtual int getQuantile( const xAOD::Jet& ) const;
-  virtual int getQuantile( double /* jet pt */, double /* jet eta */, double /* mv2c20 weight */  ) const;
+  virtual int getQuantile( const xAOD::IParticle* ) const override;
+  virtual int getQuantile( const xAOD::Jet& ) const override;
+  virtual int getQuantile( double /* jet pt */, double /* jet eta */, double /* mv2c20 weight */  ) const override;
 
-  virtual double getCutValue() const; // Only for 1D flat cut
+  virtual double getCutValue() const override; // Only for 1D flat cut
 
 private:
   /// Helper function that decides whether a jet belongs to the correct jet selection for b-tagging
-  virtual bool checkRange( double /* jet pt */, double /* jet eta */ ) const;
+  virtual bool checkRange( double pT, double eta,
+                           asg::AcceptData& acceptData) const;
 
   bool m_initialised;
 
-   /// Object used to store the last decision
-  mutable Root::TAccept m_accept;
+  /// Object used to store selection information.
+  asg::AcceptInfo m_accept;
  
   double m_maxEta;
   double m_minPt;
diff --git a/PhysicsAnalysis/JetTagging/JetTagPerformanceCalibration/xAODBTaggingEfficiency/xAODBTaggingEfficiency/IBTaggingSelectionTool.h b/PhysicsAnalysis/JetTagging/JetTagPerformanceCalibration/xAODBTaggingEfficiency/xAODBTaggingEfficiency/IBTaggingSelectionTool.h
index b83aeb370aad66748fba5981bc2f0fb5d9da53e6..4a6c529c0eb31446b5866954989bcecb944801bd 100644
--- a/PhysicsAnalysis/JetTagging/JetTagPerformanceCalibration/xAODBTaggingEfficiency/xAODBTaggingEfficiency/IBTaggingSelectionTool.h
+++ b/PhysicsAnalysis/JetTagging/JetTagPerformanceCalibration/xAODBTaggingEfficiency/xAODBTaggingEfficiency/IBTaggingSelectionTool.h
@@ -1,7 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 ///////////////////////////////////////////////////////////////////
@@ -13,7 +13,8 @@
 
 #include "AsgTools/IAsgTool.h"
 #include "xAODJet/Jet.h"
-#include "PATCore/TAccept.h"
+#include "PATCore/AcceptData.h"
+#include "PATCore/AcceptInfo.h"
 #include <string>
 
 class IBTaggingSelectionTool : virtual public asg::IAsgTool {
@@ -23,13 +24,13 @@ class IBTaggingSelectionTool : virtual public asg::IAsgTool {
 
     public:
 
-    virtual const Root::TAccept& getTAccept() const = 0;
+    virtual const asg::AcceptInfo& getAcceptInfo() const = 0;
     /// Get the decision using a generic IParticle pointer
-    virtual const Root::TAccept& accept( const xAOD::IParticle* p ) const = 0;
-    virtual const Root::TAccept& accept( const xAOD::Jet& j ) const = 0;
+    virtual asg::AcceptData accept( const xAOD::IParticle* p ) const = 0;
+    virtual asg::AcceptData accept( const xAOD::Jet& j ) const = 0;
     /// Get the decision using thet jet's pt and mv2c20 weight values
-    virtual const Root::TAccept& accept(double /* jet pt */, double /* jet eta */, double /* mv2c20 weight */ ) const = 0;
-    virtual const Root::TAccept& accept(double /* jet pt */, double /* jet eta */, double /* mv2c20 weight */, double /* mv2c20 weight */ ) const = 0;
+    virtual asg::AcceptData accept(double /* jet pt */, double /* jet eta */, double /* mv2c20 weight */ ) const = 0;
+    virtual asg::AcceptData  accept(double /* jet pt */, double /* jet eta */, double /* mv2c20 weight */, double /* mv2c20 weight */ ) const = 0;
     /// Decide in which quantile of the MV2c20 weight distribution the jet belongs
     /// The return value represents the bin index of the quantile distribution
     virtual int getQuantile( const xAOD::IParticle* ) const = 0;
diff --git a/PhysicsAnalysis/MuonID/MuonSelectorTools/MuonSelectorTools/IMuonSelectionTool.h b/PhysicsAnalysis/MuonID/MuonSelectorTools/MuonSelectorTools/IMuonSelectionTool.h
index 3855f135be205f4daefd130bdc9d9a128fe694c2..744b5b1e3c68142b8799f3c3de3cd5873fda40f4 100644
--- a/PhysicsAnalysis/MuonID/MuonSelectorTools/MuonSelectorTools/IMuonSelectionTool.h
+++ b/PhysicsAnalysis/MuonID/MuonSelectorTools/MuonSelectorTools/IMuonSelectionTool.h
@@ -1,7 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2017, 2019 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: IMuonSelectionTool.h 299883 2014-03-28 17:34:16Z krasznaa $
@@ -10,7 +10,8 @@
 
 // Framework include(s):
 #include "AsgTools/IAsgTool.h"
-#include "PATCore/TAccept.h"
+#include "PATCore/AcceptInfo.h"
+#include "PATCore/AcceptData.h"
 
 // EDM include(s):
 #include "xAODMuon/Muon.h"
@@ -34,7 +35,10 @@ namespace CP {
 
    public:
       /// Decide whether the muon in question is a "good muon" or not
-      virtual const Root::TAccept& accept( const xAOD::Muon& mu ) const = 0;
+      virtual const asg::AcceptInfo& getAcceptInfo() const = 0;
+
+      /// Decide whether the muon in question is a "good muon" or not
+      virtual asg::AcceptData accept( const xAOD::Muon& mu ) const = 0;
 
       /// set the passes ID cuts variable of the muon 
       virtual void setPassesIDCuts( xAOD::Muon& mu ) const = 0;
diff --git a/PhysicsAnalysis/MuonID/MuonSelectorTools/MuonSelectorTools/MuonSelectionTool.h b/PhysicsAnalysis/MuonID/MuonSelectorTools/MuonSelectorTools/MuonSelectionTool.h
index 9c4cea00cf8bd0bfcae23444b3eb12036cd0da98..454632425f04692d39a1ed139286ca14feab238b 100644
--- a/PhysicsAnalysis/MuonID/MuonSelectorTools/MuonSelectorTools/MuonSelectionTool.h
+++ b/PhysicsAnalysis/MuonID/MuonSelectorTools/MuonSelectorTools/MuonSelectionTool.h
@@ -1,7 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2017, 2019 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: MuonSelectionTool.h 299883 2014-03-28 17:34:16Z krasznaa $
@@ -48,7 +48,7 @@ namespace CP {
       /// @{
 
       /// Function initialising the tool
-      virtual StatusCode initialize();
+      virtual StatusCode initialize() override;
 
       /// @}
 
@@ -56,10 +56,10 @@ namespace CP {
       /// @{
 
       /// Get an object describing the "selection steps" of the tool
-      virtual const Root::TAccept& getTAccept() const;
+      virtual const asg::AcceptInfo& getAcceptInfo() const override;
 
       /// Get the decision using a generic IParticle pointer
-      virtual const Root::TAccept& accept( const xAOD::IParticle* p ) const;
+      virtual asg::AcceptData accept( const xAOD::IParticle* p ) const override;
 
       /// @}
 
@@ -67,47 +67,47 @@ namespace CP {
       /// @{
 
       /// Get the decision for a specific Muon object
-      virtual const Root::TAccept& accept( const xAOD::Muon& mu ) const;
+      virtual asg::AcceptData accept( const xAOD::Muon& mu ) const override;
 
       /// set the passes ID cuts variable of the muon 
-      void setPassesIDCuts(xAOD::Muon&) const;
+      virtual void setPassesIDCuts(xAOD::Muon&) const override;
 	  
       /// set the passes high pT cuts variable of the muon 
-      void setPassesHighPtCuts( xAOD::Muon& mu ) const;
+      virtual void setPassesHighPtCuts( xAOD::Muon& mu ) const override;
 
       /// set the passes low pT cuts variable of the muon
       //void setPassesLowPtEfficiencyCuts( xAOD::Muon& mu ) const;
      
       /// set the passes quality variable of the muon 
-      void setQuality( xAOD::Muon& mu ) const;
+      virtual void setQuality( xAOD::Muon& mu ) const override;
 
       /// Returns true if the muon passes the standard MCP ID cuts. To set the value on the muon, instead call setPassesIDCuts(xAOD::Muon&) const
-      bool passedIDCuts(const xAOD::Muon&) const;
+      virtual bool passedIDCuts(const xAOD::Muon&) const override;
  
       /// Returns true if the muon passes a standardized loose preselection.
-      bool passedMuonCuts(const xAOD::Muon&) const;
+      virtual bool passedMuonCuts(const xAOD::Muon&) const override;
 
       /// Returns true if the track particle passes the standard MCP ID cuts.
-      bool passedIDCuts(const xAOD::TrackParticle&) const;
+      virtual bool passedIDCuts(const xAOD::TrackParticle&) const override;
      
       /// Returns true if the muon passes the standard MCP High Pt cuts. To set the value on the muon, instead call setPassesHighPtCuts(xAOD::Muon&) const
-      bool passedHighPtCuts(const xAOD::Muon&) const;
+      virtual bool passedHighPtCuts(const xAOD::Muon&) const override;
 
       /// Returns true if the muon passes the standard MCP low pt cuts. To set the value on the muon, instead call setPassesLowPtEfficiencyCuts(xAOD::Muon&) const
-      bool passedLowPtEfficiencyCuts(const xAOD::Muon&) const;
-      bool passedLowPtEfficiencyCuts(const xAOD::Muon&, xAOD::Muon::Quality thisMu_quality) const;
+      virtual bool passedLowPtEfficiencyCuts(const xAOD::Muon&) const override;
+      virtual bool passedLowPtEfficiencyCuts(const xAOD::Muon&, xAOD::Muon::Quality thisMu_quality) const override;
 
       /// Returns true if a CB muon fails a pt- and eta-dependent cut on the relative CB q/p error
-      bool passedErrorCutCB(const xAOD::Muon&) const;
+      virtual bool passedErrorCutCB(const xAOD::Muon&) const override;
 
       /// Returns true if a CB muon fails some loose quaility requirements designed to remove pathological tracks
-      bool isBadMuon(const xAOD::Muon&) const;
+      virtual bool isBadMuon(const xAOD::Muon&) const override;
 
       /// Returns the quality of the muon. To set the value on the muon, instead call setQuality(xAOD::Muon&) const
-      xAOD::Muon::Quality getQuality( const xAOD::Muon& mu ) const;
+      virtual xAOD::Muon::Quality getQuality( const xAOD::Muon& mu ) const override;
 
       /// Returns true if the muon passed additional calo-tag quality cuts
-      bool passedCaloTagQuality (const xAOD::Muon& mu) const;
+      virtual bool passedCaloTagQuality (const xAOD::Muon& mu) const override;
 
       /// Returns true if the muon passed the tight working point cuts    
       bool passTight(const xAOD::Muon& mu, float rho, float oneOverPSig) const;
@@ -125,8 +125,8 @@ namespace CP {
      int  m_quality;
      bool m_isSimulation;
      
-     /// Object used to store the last decision
-     mutable Root::TAccept m_accept;
+     /// Store selection information.
+     asg::AcceptInfo m_acceptInfo;
      
      bool m_toroidOff;
      bool m_developMode;
diff --git a/PhysicsAnalysis/MuonID/MuonSelectorTools/Root/MuonSelectionTool.cxx b/PhysicsAnalysis/MuonID/MuonSelectorTools/Root/MuonSelectionTool.cxx
index b3065bcb5b2648cd999f0380e001773813b425d0..679d83020ba8fd24e67e7ebadff11c5158ba54af 100644
--- a/PhysicsAnalysis/MuonID/MuonSelectorTools/Root/MuonSelectionTool.cxx
+++ b/PhysicsAnalysis/MuonID/MuonSelectorTools/Root/MuonSelectionTool.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: MuonSelectionTool.cxx 299883 2014-03-28 17:34:16Z krasznaa $
@@ -14,7 +14,7 @@ namespace CP {
   MuonSelectionTool::MuonSelectionTool( const std::string& name )
     : asg::AsgTool( name ),
       m_name(name),
-      m_accept( "MuonSelection" ){
+      m_acceptInfo( "MuonSelection" ){
     
     declareProperty( "MaxEta", m_maxEta = 2.7 );
     //xAOD::MuonQuality enum {Tight, Medium, Loose, VeryLoose}
@@ -46,7 +46,7 @@ namespace CP {
       m_name(toCopy.m_name+"_copy"),
       m_maxEta( toCopy.m_maxEta ),
       m_quality( toCopy.m_quality ),
-      m_accept( toCopy.m_accept ),
+      m_acceptInfo( toCopy.m_acceptInfo ),
       m_toroidOff( toCopy.m_toroidOff ),
       m_developMode( toCopy.m_developMode ),
       m_TrtCutOff( toCopy.m_TrtCutOff ),
@@ -101,14 +101,14 @@ namespace CP {
     if (m_custom_dir!="") ATH_MSG_WARNING("!! SETTING UP WITH USER SPECIFIED INPUT LOCATION \""<<m_custom_dir<<"\"!! FOR DEVELOPMENT USE ONLY !! ");
 
     // Set up the TAccept object:
-    m_accept.addCut( "Eta",
-		     "Selection of muons according to their pseudorapidity" );
-    m_accept.addCut( "IDHits",
-                     "Selection of muons according to whether they passed the MCP ID Hit cuts" );
-    m_accept.addCut( "Preselection",
-                     "Selection of muons according to their type/author" );
-    m_accept.addCut( "Quality",
-		     "Selection of muons according to their tightness" );
+    m_acceptInfo.addCut( "Eta",
+                         "Selection of muons according to their pseudorapidity" );
+    m_acceptInfo.addCut( "IDHits",
+                         "Selection of muons according to whether they passed the MCP ID Hit cuts" );
+    m_acceptInfo.addCut( "Preselection",
+                         "Selection of muons according to their type/author" );
+    m_acceptInfo.addCut( "Quality",
+                         "Selection of muons according to their tightness" );
     // Sanity check
     if(m_quality>5 ){
       ATH_MSG_ERROR( "Invalid quality (i.e. selection WP) set: " << m_quality << " - it must be an integer between 0 and 5! (0=Tight, 1=Medium, 2=Loose, 3=Veryloose, 4=HighPt, 5=LowPtEfficiency)" );
@@ -173,59 +173,55 @@ namespace CP {
   }
 
   
-  const Root::TAccept& MuonSelectionTool::getTAccept() const {
+  const asg::AcceptInfo& MuonSelectionTool::getAcceptInfo() const {
     
-    return m_accept;
+    return m_acceptInfo;
   }
   
-  const Root::TAccept&
+  asg::AcceptData
   MuonSelectionTool::accept( const xAOD::IParticle* p ) const {
-    
-    // Reset the result:
-    m_accept.clear();
-    
+  
     // Check if this is a muon:
     if( p->type() != xAOD::Type::Muon ) {
       ATH_MSG_ERROR( "accept(...) Function received a non-muon" );
-      return m_accept;
+      return asg::AcceptData (&m_acceptInfo);
     }
     
     // Cast it to a muon:
     const xAOD::Muon* mu = dynamic_cast< const xAOD::Muon* >( p );
     if( ! mu ) {
       ATH_MSG_FATAL( "accept(...) Failed to cast particle to muon" );
-      return m_accept;
+      return asg::AcceptData (&m_acceptInfo);
     }
     
     // Let the specific function do the work:
     return accept( *mu );
   }
   
-  const Root::TAccept& MuonSelectionTool::accept( const xAOD::Muon& mu ) const {
+  asg::AcceptData MuonSelectionTool::accept( const xAOD::Muon& mu ) const {
     
-    // Reset the result:
-    m_accept.clear();
+    asg::AcceptData acceptData (&m_acceptInfo);
 
     // Do the eta cut:
     ATH_MSG_VERBOSE( "Muon eta: " << mu.eta() );
     if( std::abs( mu.eta() ) > m_maxEta ) {
-      return m_accept;
+      return acceptData;
     }
-    m_accept.setCutResult( "Eta", true );
+    acceptData.setCutResult( "Eta", true );
 
     // Passes ID hit cuts 
     ATH_MSG_VERBOSE( "Passes ID Hit cuts " << passedIDCuts(mu) );
     if( !passedIDCuts (mu) ) {
-      return m_accept;
+      return acceptData;
     }
-    m_accept.setCutResult( "IDHits", true );
+    acceptData.setCutResult( "IDHits", true );
     
     // Passes muon preselection
     ATH_MSG_VERBOSE( "Passes preselection cuts " << passedMuonCuts(mu) );
     if( !passedMuonCuts (mu) ) {
-      return m_accept;
+      return acceptData;
     }
-    m_accept.setCutResult( "Preselection", true );
+    acceptData.setCutResult( "Preselection", true );
 
     // Passes quality requirements 
     xAOD::Muon::Quality thisMu_quality = getQuality(mu);
@@ -233,17 +229,17 @@ namespace CP {
     bool thisMu_lowptE = passedLowPtEfficiencyCuts(mu,thisMu_quality);
     ATH_MSG_VERBOSE( "Muon quality: " << thisMu_quality << " passes HighPt: "<< thisMu_highpt << " passes LowPtEfficiency: "<< thisMu_lowptE );
     if(m_quality<4 && thisMu_quality > m_quality){
-      return m_accept;
+      return acceptData;
     }
     if(m_quality==4 && !thisMu_highpt){
-      return m_accept;
+      return acceptData;
     }
     if(m_quality==5 && !thisMu_lowptE){
-      return m_accept;
+      return acceptData;
     }
-    m_accept.setCutResult( "Quality", true );
+    acceptData.setCutResult( "Quality", true );
     // Return the result:
-    return m_accept;
+    return acceptData;
   }
   
   void MuonSelectionTool::setQuality( xAOD::Muon& mu ) const {
diff --git a/PhysicsAnalysis/RingerSelectorTools/RingerSelectorTools/AsgElectronRingerSelector.h b/PhysicsAnalysis/RingerSelectorTools/RingerSelectorTools/AsgElectronRingerSelector.h
index c8975bdf65a4b77934a5916efe67849504f32d29..0cc6981faecf485c34516c74dafc3198bb9dce94 100644
--- a/PhysicsAnalysis/RingerSelectorTools/RingerSelectorTools/AsgElectronRingerSelector.h
+++ b/PhysicsAnalysis/RingerSelectorTools/RingerSelectorTools/AsgElectronRingerSelector.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2017, 2019 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: AsgElectronRingerSelector.h 704615 2015-10-29 18:50:12Z wsfreund $
@@ -14,7 +14,8 @@
 
 #ifndef RINGER_STANDALONE
 // Athena includes
-#include "PATCore/TAccept.h"
+#include "PATCore/AcceptData.h"
+#include "PATCore/AcceptInfo.h"
 #include "AsgTools/AsgMetadataTool.h"
 #include "AsgTools/ToolHandle.h"
 #include "EgammaAnalysisInterfaces/IAsgElectronIsEMSelector.h"
@@ -74,7 +75,7 @@ class AsgElectronRingerSelector : public asg::AsgMetadataTool,
     virtual ~AsgElectronRingerSelector();
 
     /** Gaudi Service Interface method implementations */
-    virtual StatusCode initialize();
+    virtual StatusCode initialize() override;
 
     /** External initialize method */
     StatusCode initialize( const char *metaName, unsigned int cutMask
@@ -82,34 +83,34 @@ class AsgElectronRingerSelector : public asg::AsgMetadataTool,
         , RingerConfStruct &confStruct);
 
     /** Gaudi Service Interface method implementations */
-    virtual StatusCode finalize();
+    virtual StatusCode finalize() override;
 
     /// Main methods for IAsgSelectionTool interface
     ///@{
     /**
      * @brief Set the discrimination configuration file
      **/
-    void setDiscrFile( const std::string path );
+    virtual void setDiscrFile( const std::string path ) override;
 
     /**
      * @brief Set the threshold configuration file
      **/
-    void setThresFile( const std::string path );
+    virtual void setThresFile( const std::string path ) override;
 
     /**
      * @brief Set the threshold configuration file
      **/
-    void setCutMask( const unsigned int cutMask );
+    virtual void setCutMask( const unsigned int cutMask ) override;
 
     /**
      * @brief Set the CutIDSelector to be used
      **/
-    void setCutIDSelector( IAsgElectronIsEMSelector *cutID );
+    virtual void setCutIDSelector( IAsgElectronIsEMSelector *cutID ) override;
 
     /**
      * @brief Set the RingSetConfContainer (MetaData) key
      **/
-    void setRSMetaName( const std::string name );
+    virtual void setRSMetaName( const std::string name ) override;
 
     /**
      * @brief Set whether to cache the meta data and assume it will be the same
@@ -120,78 +121,82 @@ class AsgElectronRingerSelector : public asg::AsgMetadataTool,
     /**
      * @brief This method will bypass accept to xAOD::Electron if it is possible.
      **/
-    const Root::TAccept& accept( const xAOD::IParticle* part ) const;
+    virtual asg::AcceptData accept( const xAOD::IParticle* part ) const override;
 
     /**
      * @brief Identification procedure is done in this method
      **/
-    const Root::TAccept& accept( const xAOD::Electron* part ) const;
+    virtual asg::AcceptData accept( const xAOD::Electron* part ) const override;
 
     /**
      * @brief Identification procedure is done in this method
      **/
-    const Root::TAccept& accept( const xAOD::Electron* part, const double mu ) const;
+    virtual asg::AcceptData accept( const xAOD::Electron* part, const double mu ) const;
 
     /**
      * @brief Identification procedure is done in this method
      **/
-    const Root::TAccept& accept( const xAOD::Egamma* eg ) const;
+    virtual asg::AcceptData accept( const xAOD::Egamma* eg ) const;
 
     /**
      * @brief Identification procedure is done in this method
      **/
-    const Root::TAccept& accept( const xAOD::Egamma* eg, const double mu ) const;
+    virtual asg::AcceptData  accept( const xAOD::Egamma* eg, const double mu ) const;
 
     /**
      * @brief Accept using Electron reference
      **/
-    const Root::TAccept& accept( const xAOD::Electron& part ) const;
+    virtual asg::AcceptData accept( const xAOD::Electron& part ) const override;
     /**
      * @brief Accept using Electron reference
      **/
-    const Root::TAccept& accept( const xAOD::Electron& part, const double mu ) const;
+    virtual asg::AcceptData  accept( const xAOD::Electron& part, const double mu ) const;
     /**
      * @brief Accept using IParticle reference
      **/
-    const Root::TAccept& accept( const xAOD::IParticle& part ) const;
+    virtual asg::AcceptData accept( const xAOD::IParticle& part ) const override;
 
     /**
      * @brief Identification procedure is done in this method
      **/
-    const Root::TAccept& accept( const xAOD::Egamma& eg ) const;
+    virtual asg::AcceptData accept( const xAOD::Egamma& eg ) const;
 
     /**
      * @brief Identification procedure is done in this method
      **/
-    const Root::TAccept& accept( const xAOD::Egamma& eg, const double mu ) const;
+    virtual asg::AcceptData accept( const xAOD::Egamma& eg, const double mu ) const;
 
     /**
      * @brief Method to get the plain TAccept for the last particle.
      **/
-    const Root::TAccept& getTAccept() const;
+    virtual const asg::AcceptInfo& getAcceptInfo() const override;
 
     /** Method to get output space representation */
-    const std::vector<float>& getOutputSpace() const;
+    virtual const std::vector<float>& getOutputSpace() const override;
 
     /**
      * @brief Execute without mu information
      **/
-    StatusCode execute(const xAOD::Electron* eg) const;
+    virtual StatusCode execute(const xAOD::Electron* eg,
+                               asg::AcceptData& acceptData) const override;
 
     /**
      * @brief Main execute method
      **/
-    StatusCode execute(const xAOD::Electron* eg, const double mu) const;
+    StatusCode execute(const xAOD::Electron* eg, const double mu,
+                       asg::AcceptData& acceptData) const;
 
     /**
      * @brief Execute without tracking information, potentially used by trigger.
      **/
-    StatusCode execute(const xAOD::Egamma* eg) const;
+    virtual StatusCode execute(const xAOD::Egamma* eg,
+                               asg::AcceptData& acceptData) const override;
 
     /**
      * @brief Execute without tracking information, potentially used by trigger.
      **/
-    StatusCode execute(const xAOD::Egamma* eg, const double mu) const;
+    StatusCode execute(const xAOD::Egamma* eg, const double mu,
+                       asg::AcceptData& acceptData) const;
     ///@}
 
     /**
@@ -204,12 +209,12 @@ class AsgElectronRingerSelector : public asg::AsgMetadataTool,
     /**
      * @brief Update metadata information held
      */
-    StatusCode beginInputFile();
+    virtual StatusCode beginInputFile() override;
 
     /**
      * @brief Called when entering a new event
      **/
-    StatusCode beginEvent();
+    virtual StatusCode beginEvent() override;
 
   private:
 
@@ -255,11 +260,8 @@ class AsgElectronRingerSelector : public asg::AsgMetadataTool,
     /// @brief The particles CaloRings decorations reader
     xAOD::caloRingsReader_t* m_ringsELReader;
 
-    /// @brief Last particle decision bitmask (the inverse of the IsEM)
-    ATH_RINGER_MUTABLE Root::TAccept m_partDecMsk;
-
     /// @brief Last particle accept bitmask (already applying the m_cutsToUse)
-    ATH_RINGER_MUTABLE Root::TAccept m_accept;
+    asg::AcceptInfo m_accept;
 
     /// @brief Which subset of decisions to use
     ElectronTAccept::bitMskWord m_cutsToUse;
@@ -306,11 +308,6 @@ class AsgElectronRingerSelector : public asg::AsgMetadataTool,
      * @brief Configure wrappers
      **/
     StatusCode configureFromStruct(RingerConfStruct &fileConf);
-
-    /**
-     * Set TAccept value
-     **/
-    void fillTAccept() const;
     /// @}
 };
 
@@ -407,7 +404,7 @@ void AsgElectronRingerSelector::setCacheMetaData( bool flag )
 
 //=============================================================================
 inline
-const Root::TAccept& AsgElectronRingerSelector::accept(
+asg::AcceptData AsgElectronRingerSelector::accept(
     const xAOD::Electron& part, double mu = -99. ) const
 {
   return accept (&part, mu);
@@ -415,7 +412,7 @@ const Root::TAccept& AsgElectronRingerSelector::accept(
 
 //=============================================================================
 inline
-const Root::TAccept& AsgElectronRingerSelector::accept(
+asg::AcceptData AsgElectronRingerSelector::accept(
     const xAOD::IParticle& part ) const
 {
   return accept(&part);
@@ -423,7 +420,7 @@ const Root::TAccept& AsgElectronRingerSelector::accept(
 
 //=============================================================================
 inline
-const Root::TAccept& AsgElectronRingerSelector::accept(
+asg::AcceptData AsgElectronRingerSelector::accept(
     const xAOD::Egamma& part ) const
 {
   return accept (&part, -99);
@@ -431,44 +428,46 @@ const Root::TAccept& AsgElectronRingerSelector::accept(
 
 //=============================================================================
 inline
-StatusCode AsgElectronRingerSelector::execute(const xAOD::Egamma* eg) const
+StatusCode AsgElectronRingerSelector::execute(const xAOD::Egamma* eg,
+                                              asg::AcceptData& acceptData) const
 {
-  return execute( eg, -99 );
+  return execute( eg, -99, acceptData);
 }
 //=============================================================================
 inline
-StatusCode AsgElectronRingerSelector::execute(const xAOD::Electron* eg) const
+StatusCode AsgElectronRingerSelector::execute(const xAOD::Electron* eg,
+                                              asg::AcceptData& acceptData) const
 {
-  return execute( eg, -99 );
+  return execute( eg, -99, acceptData );
 }
 //=============================================================================
 inline
-const Root::TAccept& AsgElectronRingerSelector::accept( const xAOD::Egamma& eg, const double mu ) const
+asg::AcceptData AsgElectronRingerSelector::accept( const xAOD::Egamma& eg, const double mu ) const
 {
   return accept( &eg, mu );
 }
 //=============================================================================
 inline
-const Root::TAccept& AsgElectronRingerSelector::accept( const xAOD::Egamma* eg ) const
+asg::AcceptData AsgElectronRingerSelector::accept( const xAOD::Egamma* eg ) const
 {
   return accept( eg, -99 );
 }
 //=============================================================================
 inline
-const Root::TAccept& AsgElectronRingerSelector::accept( const xAOD::Electron* part ) const
+asg::AcceptData AsgElectronRingerSelector::accept( const xAOD::Electron* part ) const
 {
   return accept( part, -99 );
 }
 //=============================================================================
 inline
-const Root::TAccept& AsgElectronRingerSelector::accept( const xAOD::Electron& part ) const
+asg::AcceptData AsgElectronRingerSelector::accept( const xAOD::Electron& part ) const
 {
   return accept( &part );
 }
 
 //=============================================================================
 inline
-const Root::TAccept& AsgElectronRingerSelector::getTAccept() const
+const asg::AcceptInfo& AsgElectronRingerSelector::getAcceptInfo() const
 {
   return m_accept;
 }
diff --git a/PhysicsAnalysis/RingerSelectorTools/RingerSelectorTools/ElectronTAccept.h b/PhysicsAnalysis/RingerSelectorTools/RingerSelectorTools/ElectronTAccept.h
index e6e3a659318a6d21d6a097019c871fd923b1980a..6710bfa82cf119eb7a3d78dd0fd47873a4ebf3c6 100644
--- a/PhysicsAnalysis/RingerSelectorTools/RingerSelectorTools/ElectronTAccept.h
+++ b/PhysicsAnalysis/RingerSelectorTools/RingerSelectorTools/ElectronTAccept.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: ElectronTAccept.h 670599 2015-05-28 14:15:35Z wsfreund $
@@ -9,7 +9,7 @@
 #define RINGERSELECTORTOOLS_ELECTRONTACCEPT_H
 
 // Athena includes:
-#include "PATCore/TAccept.h"
+#include "PATCore/AcceptInfo.h"
 
 // Local includes:
 #include "RingerSelectorTools/RingerSelectorToolsDefs.h"
@@ -33,7 +33,7 @@ class ElectronTAccept_v1 {
 #ifdef XAOD_ANALYSIS
     typedef std::bitset<32> bitMskWord;
 #else
-    typedef std::bitset<Root::TAccept::NBITS> bitMskWord;
+    typedef std::bitset<asg::AcceptInfo::NBITS> bitMskWord;
 #endif
 
     // Grant access to m_accept for BitdefElectron_v1
@@ -49,7 +49,7 @@ class ElectronTAccept_v1 {
     /**
      * @brief Retrieve copy of the ElectronTAccept_v1 template
      **/
-    static Root::TAccept retrieveTAcceptTemplate(){ return m_accept;}
+    static const asg::AcceptInfo& retrieveTAcceptTemplate(){ return m_accept;}
     /// @}
 
 
@@ -84,7 +84,7 @@ class ElectronTAccept_v1 {
     ElectronTAccept_v1();
 
     /// The TAccept:
-    static Root::TAccept m_accept;
+    static asg::AcceptInfo m_accept;
 };
 
 /**
diff --git a/PhysicsAnalysis/RingerSelectorTools/RingerSelectorTools/IAsgElectronRingerSelector.h b/PhysicsAnalysis/RingerSelectorTools/RingerSelectorTools/IAsgElectronRingerSelector.h
index bc12474534fd8c280760f32f7f24264862168364..7551f768d1eb7cc3aa298a6d549d394072c03c65 100644
--- a/PhysicsAnalysis/RingerSelectorTools/RingerSelectorTools/IAsgElectronRingerSelector.h
+++ b/PhysicsAnalysis/RingerSelectorTools/RingerSelectorTools/IAsgElectronRingerSelector.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: IAsgElectronRingerSelector.h 704615 2015-10-29 18:50:12Z wsfreund $
@@ -22,7 +22,8 @@
 #include "PATCore/IAsgSelectionTool.h"
 
 // Include the return object and the underlying ROOT tool
-#include "PATCore/TAccept.h"
+#include "PATCore/AcceptData.h"
+#include "PATCore/AcceptInfo.h"
 
 // Forward declarations:
 #include "xAODEgamma/EgammaFwd.h"
@@ -41,25 +42,27 @@ class IAsgElectronRingerSelector : virtual public IAsgSelectionTool
   virtual ~IAsgElectronRingerSelector() {};
 
   /** The main accept method: using the generic interface */
-  virtual const Root::TAccept& accept( const xAOD::IParticle* part ) const = 0;
+  virtual asg::AcceptData accept( const xAOD::IParticle* part ) const = 0;
 
   /** The main accept method: the actual cuts are applied here */
-  virtual const Root::TAccept& accept( const xAOD::Electron* part ) const = 0;
+  virtual asg::AcceptData accept( const xAOD::Electron* part ) const = 0;
 
   /** The main accept method: using the generic interface */
-  virtual const Root::TAccept& accept( const xAOD::IParticle& part ) const = 0;
+  virtual asg::AcceptData accept( const xAOD::IParticle& part ) const = 0;
 
   /** The main accept method: the actual cuts are applied here */
-  virtual const Root::TAccept& accept( const xAOD::Electron& part ) const = 0;
+  virtual asg::AcceptData accept( const xAOD::Electron& part ) const = 0;
 
   /** The basic Ringer selector tool execution */
-  virtual StatusCode execute(const xAOD::Electron* eg) const = 0;
+  virtual StatusCode execute(const xAOD::Electron* eg,
+                             asg::AcceptData& acceptData) const = 0;
 
   /** The Ringer selector tool execution for HLT */
-  virtual StatusCode execute(const xAOD::Egamma* eg) const = 0;
+  virtual StatusCode execute(const xAOD::Egamma* eg,
+                             asg::AcceptData& acceptData) const = 0;
 
   /** Get last executed TAccept answer */
-  virtual const Root::TAccept& getTAccept() const = 0;
+  virtual const asg::AcceptInfo& getAcceptInfo() const = 0;
 
   /** Get last executed TResult value */
   virtual const std::vector<float>& getOutputSpace() const = 0;
diff --git a/PhysicsAnalysis/RingerSelectorTools/RingerSelectorTools/tools/RingerCommonSelector.h b/PhysicsAnalysis/RingerSelectorTools/RingerSelectorTools/tools/RingerCommonSelector.h
index 06b7707948094d543629e6e08af8ab463a10fb13..79c774c9252ba3eeee300060723ee114f4d17ac1 100644
--- a/PhysicsAnalysis/RingerSelectorTools/RingerSelectorTools/tools/RingerCommonSelector.h
+++ b/PhysicsAnalysis/RingerSelectorTools/RingerSelectorTools/tools/RingerCommonSelector.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: RingerCommonSelector.h 668868 2015-05-20 20:26:18Z wsfreund $
@@ -18,7 +18,7 @@
 #include "xAODTracking/TrackParticleFwd.h"
 
 // ROOT includes:
-#include "PATCore/TAccept.h"
+#include "PATCore/AcceptData.h"
 
 namespace Ringer {
 
@@ -39,7 +39,6 @@ class RingerCommonSelector : public RedirectMsgStream
     RingerCommonSelector(
       const Ringer::IDiscrWrapperCollection *discrWrapperCol,
       const Ringer::IThresWrapper *thresWrapper,
-      Root::TAccept *partDecMsk,
       const Ringer::RingerConfStruct& fileConf );
 
     /**
@@ -53,7 +52,8 @@ class RingerCommonSelector : public RedirectMsgStream
     StatusCode execute(
         const DepVarStruct &depVar,
         const xAOD::CaloRings* clRings,
-        const TrackPatternsHolder *trackPat);
+        const TrackPatternsHolder *trackPat,
+        asg::AcceptData& acceptData);
 
     /**
      * @brief Get output space
@@ -66,7 +66,6 @@ class RingerCommonSelector : public RedirectMsgStream
     /// @{
     const Ringer::IDiscrWrapperCollection *m_discrWrapperCol;
     const Ringer::IThresWrapper *m_thresWrapper;
-    Root::TAccept *m_partDecMsk;
     const bool m_useTrackPat;
     const bool m_useRawTrackPat;
     const bool m_useCaloCommittee;
diff --git a/PhysicsAnalysis/RingerSelectorTools/Root/AsgElectronRingerSelector.cxx b/PhysicsAnalysis/RingerSelectorTools/Root/AsgElectronRingerSelector.cxx
index fc4704fd1773afed43b146d180cc484d8af8ffcd..5b60dc74c0c4108db86b9e116d69a36dbe96812d 100644
--- a/PhysicsAnalysis/RingerSelectorTools/Root/AsgElectronRingerSelector.cxx
+++ b/PhysicsAnalysis/RingerSelectorTools/Root/AsgElectronRingerSelector.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: AsgElectronRingerSelector.cxx 791627 2017-01-10 04:45:53Z wsfreund $
@@ -13,7 +13,8 @@
 #ifndef RINGER_STANDALONE
 // Athena framework includes:
 # include "AsgTools/AsgTool.h"
-# include "PATCore/TAccept.h"
+# include "PATCore/AcceptInfo.h"
+# include "PATCore/AcceptData.h"
 # include "PathResolver/PathResolver.h"
 # include "AthContainers/exceptions.h"
 
@@ -107,7 +108,6 @@ AsgElectronRingerSelector::AsgElectronRingerSelector(std::string asgToolName) :
   m_thresWrapper(nullptr),
   m_ringSelCommon(nullptr),
   m_trackPat(nullptr),
-  m_partDecMsk(Ringer::ElectronTAccept::retrieveTAcceptTemplate()),
   m_accept(Ringer::ElectronTAccept::retrieveTAcceptTemplate()),
   m_useCutIDDecision(false),
   m_metaDataCached(false),
@@ -289,7 +289,6 @@ StatusCode AsgElectronRingerSelector::configureFromStruct(RingerConfStruct &file
   m_ringSelCommon = new Ringer::RingerCommonSelector(
       &m_discrWrapperCol,
       m_thresWrapper,
-      &m_partDecMsk,
       fileConf);
 
   // Set RingerCommonSelector message stream:
@@ -327,7 +326,7 @@ StatusCode AsgElectronRingerSelector::configureFromStruct(RingerConfStruct &file
 
 
 //=============================================================================
-const Root::TAccept& AsgElectronRingerSelector::accept(
+asg::AcceptData AsgElectronRingerSelector::accept(
     const xAOD::IParticle* part ) const
 {
   ATH_MSG_DEBUG("Entering accept( const IParticle* part )");
@@ -344,74 +343,63 @@ const Root::TAccept& AsgElectronRingerSelector::accept(
 
 
 // =============================================================================
-const Root::TAccept& AsgElectronRingerSelector::accept(
+asg::AcceptData AsgElectronRingerSelector::accept(
     const xAOD::Electron* el, const double mu) const
 {
   ATH_MSG_DEBUG("Entering accept( const xAOD::Electron* el)");
 
-  StatusCode sc = execute(el, mu);
+  asg::AcceptData acceptData (&m_accept);
+  StatusCode sc = execute(el, mu, acceptData);
 
   if (sc.isFailure()) {
     ATH_MSG_ERROR("Error while on particle AsgSelector execution.");
   }
 
-  return m_accept;
+  return acceptData;
 }
 
 
 // =============================================================================
-const Root::TAccept& AsgElectronRingerSelector::accept(
+asg::AcceptData AsgElectronRingerSelector::accept(
     const xAOD::Egamma* eg, const double mu ) const
 {
   ATH_MSG_DEBUG("Entering accept( const xAOD::Egamma* part )");
 
-  StatusCode sc = execute(eg, mu);
+  asg::AcceptData acceptData (&m_accept);
+  StatusCode sc = execute(eg, mu, acceptData);
 
   if (sc.isFailure()) {
     ATH_MSG_ERROR("Error while on particle AsgSelector execution.");
   }
 
-  return m_accept;
+  return acceptData;
 }
 
 
 // =============================================================================
 StatusCode AsgElectronRingerSelector::execute(
-    const xAOD::Electron* el, const double mu) const
+    const xAOD::Electron* el, const double mu,
+    asg::AcceptData& acceptData) const
 {
 
   ATH_MSG_DEBUG("Entering execute(const xAOD::Electron* el...)");
 
-#if RINGER_USE_NEW_CPP_FEATURES
-  // In this case, we only do this to have a more harmonic code:
-  Root::TAccept &partDecMsk_ref = m_partDecMsk;
-#else
-  // Well, since we do not have mutable properties, we need to do this ugly
-  // things...
-  Root::TAccept &partDecMsk_ref =
-    const_cast<Root::TAccept&>(m_partDecMsk);
-#endif
-
-  // Clear particle decision mask and previous result (set everything as if it
-  // was passed), prepare to refill it:
-  partDecMsk_ref.clear();
-
   m_ringSelCommon->clear();
 
   // No error occurred so far, flag it:
-  partDecMsk_ref.setCutResult(
+  acceptData.setCutResult(
       BitdefElectron::NoErrorBit,
       true);
 
   // Set if it was requested to execute CutID:
-  partDecMsk_ref.setCutResult(
+  acceptData.setCutResult(
       BitdefElectron::ExecCutID,
       m_useCutIDDecision );
 
   if (!el){
     ATH_MSG_ERROR("Invalid electron pointer.");
 
-    partDecMsk_ref.setCutResult(
+    acceptData.setCutResult(
         BitdefElectron::NoErrorBit,
         false);
 
@@ -431,7 +419,7 @@ StatusCode AsgElectronRingerSelector::execute(
 
     ATH_MSG_ERROR("Particle does not have CaloRings decoratorion.");
 
-    partDecMsk_ref.setCutResult(
+    acceptData.setCutResult(
         BitdefElectron::NoErrorBit,
         false);
 
@@ -443,7 +431,7 @@ StatusCode AsgElectronRingerSelector::execute(
   if ( !caloRingsLinks->at(0).isValid() ){
     ATH_MSG_DEBUG("Ignoring candidate with invalid ElementLink.");
 
-    partDecMsk_ref.setCutResult(
+    acceptData.setCutResult(
         BitdefElectron::NoErrorBit,
         false);
 
@@ -459,7 +447,7 @@ StatusCode AsgElectronRingerSelector::execute(
     ATH_MSG_ERROR("There isn't CaloRings Decoration available"
         " for input particle." );
 
-    partDecMsk_ref.setCutResult(
+    acceptData.setCutResult(
         BitdefElectron::NoErrorBit,
         false );
 
@@ -496,13 +484,14 @@ StatusCode AsgElectronRingerSelector::execute(
     if ( m_ringSelCommon->execute(
           depVar,
           clrings,
-          trackPat_ref).isFailure() )
+          trackPat_ref,
+          acceptData).isFailure() )
     {
 
       ATH_MSG_ERROR("Error while executing "
           "RingerCommonSelector.");
 
-      partDecMsk_ref.setCutResult(
+      acceptData.setCutResult(
           BitdefElectron::NoErrorBit,
           false);
 
@@ -512,7 +501,7 @@ StatusCode AsgElectronRingerSelector::execute(
     ATH_MSG_ERROR("Error while executing "
         "RingerCommonSelector. Reason: " << e.what() );
 
-    partDecMsk_ref.setCutResult(
+    acceptData.setCutResult(
         BitdefElectron::NoErrorBit,
         false);
 
@@ -521,7 +510,7 @@ StatusCode AsgElectronRingerSelector::execute(
   // Add the CutID track decision bit (if requested):
   if ( m_useCutIDDecision ) {
     try {
-      partDecMsk_ref.setCutResult(
+      acceptData.setCutResult(
           BitdefElectron::CutIDDec,
           static_cast<bool>(m_cutIDSelector->accept(el)) );
 
@@ -530,11 +519,11 @@ StatusCode AsgElectronRingerSelector::execute(
       ATH_MSG_ERROR("Error while executing "
           "AsgElectronRingerSelector. Reason:" << e.what() );
 
-      partDecMsk_ref.setCutResult(
+      acceptData.setCutResult(
           BitdefElectron::NoErrorBit,
           false );
 
-      partDecMsk_ref.setCutResult(
+      acceptData.setCutResult(
           BitdefElectron::CutIDDec ,
           false );
 
@@ -542,17 +531,23 @@ StatusCode AsgElectronRingerSelector::execute(
   } else {
 
     // If we do not run it, set track decision to true:
-    partDecMsk_ref.setCutResult(
+    acceptData.setCutResult(
         BitdefElectron::CutIDDec ,
         true );
 
   }
 
-  // We have finished, then fill decision mask:
-  fillTAccept();
+  // Clear unused bits.
+  for (unsigned bit = 0; bit < BitdefElectron::NUsedBits(); ++bit ){
+    // m_partDec mask is set to true if passed cut.
+    // m_cutsToUse is set to true if cut is to be used.
+    if (!m_cutsToUse[bit]) {
+      acceptData.setCutResult (bit, false);
+    }
+  }
 
   // Check if an error occurred, and flag it:
-  if ( partDecMsk_ref.getCutResult(
+  if ( acceptData.getCutResult(
         BitdefElectron::NoErrorBit ) )
   {
     return StatusCode::SUCCESS;
@@ -562,13 +557,14 @@ StatusCode AsgElectronRingerSelector::execute(
 }
 
 //==============================================================================
-StatusCode AsgElectronRingerSelector::execute(const xAOD::Egamma* eg, const double mu) const
+StatusCode AsgElectronRingerSelector::execute(const xAOD::Egamma* eg, const double mu,
+                                              asg::AcceptData& acceptData) const
 {
   ATH_MSG_DEBUG("entering execute(const xAOD::Egamma* eg...)");
 
   if (eg){
     // We cast it to electron and use xAOD::type to determine whether it is an electron or not
-    this->execute( static_cast<const xAOD::Electron*>(eg), mu );
+    this->execute( static_cast<const xAOD::Electron*>(eg), mu, acceptData );
   } else {
     ATH_MSG_ERROR("Egamma pointer is null.");
     return StatusCode::FAILURE;
@@ -577,27 +573,6 @@ StatusCode AsgElectronRingerSelector::execute(const xAOD::Egamma* eg, const doub
   return StatusCode::SUCCESS;
 }
 
-//=============================================================================
-// Fill the m_accept from the m_partDecMsk mask using the m_cutsToUse
-//=============================================================================
-void AsgElectronRingerSelector::fillTAccept() const
-{
-#if RINGER_USE_NEW_CPP_FEATURES
-  // In this case, we only do this to have a more harmonic code:
-  Root::TAccept &accept_ref = m_accept;
-#else
-  // Well, since we do not have mutable properties, we need to do this ugly
-  // things...
-  Root::TAccept &accept_ref = const_cast<Root::TAccept&>(m_accept);
-#endif
-  for (unsigned bit = 0; bit < BitdefElectron::NUsedBits(); ++bit ){
-    // m_partDec mask is set to true if passed cut.
-    // m_cutsToUse is set to true if cut is to be used.
-    accept_ref.setCutResult( bit,
-        (m_partDecMsk.getCutResult(bit)) || !m_cutsToUse[bit] );
-  }
-}
-
 //==============================================================================
 StatusCode AsgElectronRingerSelector::beginInputFile()
 {
diff --git a/PhysicsAnalysis/RingerSelectorTools/Root/ElectronTAccept.cxx b/PhysicsAnalysis/RingerSelectorTools/Root/ElectronTAccept.cxx
index 12e1828abe019892d3f0377e8c39a4941b925c11..62dc1d7e67b3c511a1f9126c79c12ec9724c8283 100644
--- a/PhysicsAnalysis/RingerSelectorTools/Root/ElectronTAccept.cxx
+++ b/PhysicsAnalysis/RingerSelectorTools/Root/ElectronTAccept.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: ElectronTAccept.cxx 704615 2015-10-29 18:50:12Z wsfreund $
@@ -19,7 +19,7 @@ DEFINE_COUNTER( ElectronNBits )
 
 // =============================================================================
 /// Define the ElectronTAcceptHolder_v1 holden TAccept:
-Root::TAccept ElectronTAccept_v1::m_accept("ElectronDecisionMask");
+asg::AcceptInfo ElectronTAccept_v1::m_accept("ElectronDecisionMask");
 
 // =============================================================================
 // Define the bit counter:
diff --git a/PhysicsAnalysis/RingerSelectorTools/Root/tools/RingerCommonSelector.cxx b/PhysicsAnalysis/RingerSelectorTools/Root/tools/RingerCommonSelector.cxx
index d19e91fede3cc2c86e05864608c33c427c2d74d5..d0ba8fbcea744183f08e1b52148d4b56457bf38b 100644
--- a/PhysicsAnalysis/RingerSelectorTools/Root/tools/RingerCommonSelector.cxx
+++ b/PhysicsAnalysis/RingerSelectorTools/Root/tools/RingerCommonSelector.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: RingerCommonSelector.cxx 668868 2015-05-20 20:26:18Z wsfreund $
@@ -27,11 +27,9 @@ namespace Ringer {
 RingerCommonSelector::RingerCommonSelector(
     const Ringer::IDiscrWrapperCollection *discrWrapperCol,
     const Ringer::IThresWrapper *thresWrapper,
-    Root::TAccept *partDecMsk,
     const RingerConfStruct &fileConf)
   : m_discrWrapperCol(discrWrapperCol),
     m_thresWrapper(thresWrapper),
-    m_partDecMsk(partDecMsk),
     m_useTrackPat(fileConf.useTrackPat),
     m_useRawTrackPat(fileConf.useRawTrackPat),
     m_useCaloCommittee(fileConf.useCaloCommittee),
@@ -48,11 +46,6 @@ RingerCommonSelector::RingerCommonSelector(
         "without threshold wrapper.");
   }
 
-  if ( !m_partDecMsk ) {
-    throw std::runtime_error("Cannot create RingerCommonSelector"
-        "without a decision mask.");
-  }
-
   m_discrWrapperColSize = discrWrapperCol->size();
 
   m_fstDiscrLayer  = (*m_discrWrapperCol)[0];
@@ -66,7 +59,8 @@ RingerCommonSelector::RingerCommonSelector(
 StatusCode RingerCommonSelector::execute(
     const DepVarStruct &depVar,
     const xAOD::CaloRings* clRings,
-    const TrackPatternsHolder* trackPat)
+    const TrackPatternsHolder* trackPat,
+    asg::AcceptData& acceptData)
 {
   ATH_MSG_DEBUG( "Starting executing RingerCommonSelector.");
 
@@ -197,7 +191,7 @@ StatusCode RingerCommonSelector::execute(
 
   // Save discrimination into particle decision mask. We only use the first
   // decision vector output:
-  m_partDecMsk->setCutResult( BitdefElectron_v1::RingerChainDec, m_decVec[0] );
+  acceptData.setCutResult( BitdefElectron_v1::RingerChainDec, m_decVec[0] );
 
   return StatusCode::SUCCESS;
 
diff --git a/PhysicsAnalysis/TauID/TauAnalysisTools/Root/SelectionCuts.cxx b/PhysicsAnalysis/TauID/TauAnalysisTools/Root/SelectionCuts.cxx
index 56f1c3e55a223427cf93007aaf74b02a6f195ff6..4912cc1503554ffa0033def94d4609990eedbc81 100644
--- a/PhysicsAnalysis/TauID/TauAnalysisTools/Root/SelectionCuts.cxx
+++ b/PhysicsAnalysis/TauID/TauAnalysisTools/Root/SelectionCuts.cxx
@@ -1,7 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 
@@ -107,10 +107,15 @@ void SelectionCutPt::fillHistogram(const xAOD::TauJet& xTau, TH1F& hHist)
 }
 
 //______________________________________________________________________________
-bool SelectionCutPt::accept(const xAOD::TauJet& xTau)
+void SelectionCutPt::setAcceptInfo(asg::AcceptInfo& info) const
+{
+  info.addCut( "Pt",
+               "Selection of taus according to their transverse momentum" );
+}
+//______________________________________________________________________________
+bool SelectionCutPt::accept(const xAOD::TauJet& xTau,
+                            asg::AcceptData& acceptData)
 {
-  m_tTST->m_aAccept.addCut( "Pt",
-                            "Selection of taus according to their transverse momentum" );
   // save tau pt in GeV
   double pt = xTau.pt() / 1000.;
   // in case of only one entry in vector, run for lower limits
@@ -118,7 +123,7 @@ bool SelectionCutPt::accept(const xAOD::TauJet& xTau)
   {
     if ( pt >= m_tTST->m_vPtRegion.at(0) )
     {
-      m_tTST->m_aAccept.setCutResult( "Pt", true );
+      acceptData.setCutResult( "Pt", true );
       return true;
     }
   }
@@ -127,7 +132,7 @@ bool SelectionCutPt::accept(const xAOD::TauJet& xTau)
   {
     if ( pt >= m_tTST->m_vPtRegion.at(iPtRegion*2) and pt <= m_tTST->m_vPtRegion.at(iPtRegion*2+1))
     {
-      m_tTST->m_aAccept.setCutResult( "Pt", true );
+      acceptData.setCutResult( "Pt", true );
       return true;
     }
   }
@@ -151,17 +156,22 @@ void SelectionCutAbsEta::fillHistogram(const xAOD::TauJet& xTau, TH1F& hHist)
 }
 
 //______________________________________________________________________________
-bool SelectionCutAbsEta::accept(const xAOD::TauJet& xTau)
+void SelectionCutAbsEta::setAcceptInfo(asg::AcceptInfo& info) const
+{
+  info.addCut( "AbsEta",
+               "Selection of taus according to their absolute pseudorapidity" );
+}
+//______________________________________________________________________________
+bool SelectionCutAbsEta::accept(const xAOD::TauJet& xTau,
+                                asg::AcceptData& acceptData)
 {
   // check regions of eta, if tau is in one region then return true; false otherwise
-  m_tTST->m_aAccept.addCut( "AbsEta",
-                            "Selection of taus according to their absolute pseudorapidity" );
   unsigned int iNumEtaRegion = m_tTST->m_vAbsEtaRegion.size()/2;
   for( unsigned int iEtaRegion = 0; iEtaRegion < iNumEtaRegion; iEtaRegion++ )
   {
     if ( std::abs( xTau.eta() ) >= m_tTST->m_vAbsEtaRegion.at(iEtaRegion*2) and std::abs( xTau.eta() ) <= m_tTST->m_vAbsEtaRegion.at(iEtaRegion*2+1))
     {
-      m_tTST->m_aAccept.setCutResult( "AbsEta", true );
+      acceptData.setCutResult( "AbsEta", true );
       return true;
     }
   }
@@ -185,16 +195,21 @@ void SelectionCutAbsCharge::fillHistogram(const xAOD::TauJet& xTau, TH1F& hHist)
 }
 
 //______________________________________________________________________________
-bool SelectionCutAbsCharge::accept(const xAOD::TauJet& xTau)
+void SelectionCutAbsCharge::setAcceptInfo(asg::AcceptInfo& info) const
+{
+  info.addCut( "AbsCharge",
+               "Selection of taus according to their absolute charge" );
+}
+//______________________________________________________________________________
+bool SelectionCutAbsCharge::accept(const xAOD::TauJet& xTau,
+                            asg::AcceptData& acceptData)
 {
   // check charge, if tau has one of the charges requiered then return true; false otherwise
-  m_tTST->m_aAccept.addCut( "AbsCharge",
-                            "Selection of taus according to their absolute charge" );
   for( unsigned int iCharge = 0; iCharge < m_tTST->m_vAbsCharges.size(); iCharge++ )
   {
     if ( std::abs( xTau.charge() ) == m_tTST->m_vAbsCharges.at(iCharge) )
     {
-      m_tTST->m_aAccept.setCutResult( "AbsCharge", true );
+      acceptData.setCutResult( "AbsCharge", true );
       return true;
     }
   }
@@ -218,16 +233,21 @@ void SelectionCutNTracks::fillHistogram(const xAOD::TauJet& xTau, TH1F& hHist)
 }
 
 //______________________________________________________________________________
-bool SelectionCutNTracks::accept(const xAOD::TauJet& xTau)
+void SelectionCutNTracks::setAcceptInfo(asg::AcceptInfo& info) const
+{
+  info.addCut( "NTrack",
+               "Selection of taus according to their number of associated tracks" );
+}
+//______________________________________________________________________________
+bool SelectionCutNTracks::accept(const xAOD::TauJet& xTau,
+                                 asg::AcceptData& acceptData)
 {
   // check track multiplicity, if tau has one of the number of tracks requiered then return true; false otherwise
-  m_tTST->m_aAccept.addCut( "NTrack",
-                            "Selection of taus according to their number of associated tracks" );
   for( size_t iNumTrack = 0; iNumTrack < m_tTST->m_vNTracks.size(); iNumTrack++ )
   {
     if ( xTau.nTracks() == m_tTST->m_vNTracks.at(iNumTrack) )
     {
-      m_tTST->m_aAccept.setCutResult( "NTrack", true );
+      acceptData.setCutResult( "NTrack", true );
       return true;
     }
   }
@@ -251,18 +271,23 @@ void SelectionCutBDTJetScore::fillHistogram(const xAOD::TauJet& xTau, TH1F& hHis
 }
 
 //______________________________________________________________________________
-bool SelectionCutBDTJetScore::accept(const xAOD::TauJet& xTau)
+void SelectionCutBDTJetScore::setAcceptInfo(asg::AcceptInfo& info) const
+{
+  info.addCut( "JetBDTScore",
+               "Selection of taus according to their JetBDTScore" );
+}
+//______________________________________________________________________________
+bool SelectionCutBDTJetScore::accept(const xAOD::TauJet& xTau,
+                                     asg::AcceptData& acceptData)
 {
   // check JetBDTscore, if tau has a JetBDT score in one of the regions requiered then return true; false otherwise
-  m_tTST->m_aAccept.addCut( "JetBDTScore",
-                            "Selection of taus according to their JetBDTScore" );
   double dJetBDTScore = xTau.discriminant(xAOD::TauJetParameters::BDTJetScore);
   unsigned int iNumJetBDTRegion = m_tTST->m_vJetBDTRegion.size()/2;
   for( unsigned int iJetBDTRegion = 0; iJetBDTRegion < iNumJetBDTRegion; iJetBDTRegion++ )
   {
     if ( dJetBDTScore >= m_tTST->m_vJetBDTRegion.at(iJetBDTRegion*2) and dJetBDTScore <= m_tTST->m_vJetBDTRegion.at(iJetBDTRegion*2+1))
     {
-      m_tTST->m_aAccept.setCutResult( "JetBDTScore", true );
+      acceptData.setCutResult( "JetBDTScore", true );
       return true;
     }
   }
@@ -303,11 +328,16 @@ void SelectionCutJetIDWP::fillHistogram(const xAOD::TauJet& xTau, TH1F& hHist)
 }
 
 //______________________________________________________________________________
-bool SelectionCutJetIDWP::accept(const xAOD::TauJet& xTau)
+void SelectionCutJetIDWP::setAcceptInfo(asg::AcceptInfo& info) const
+{
+  info.addCut( "JetIDWP",
+               "Selection of taus according to their JetIDScore" );
+}
+//______________________________________________________________________________
+bool SelectionCutJetIDWP::accept(const xAOD::TauJet& xTau,
+                                 asg::AcceptData& acceptData)
 {
   // check Jet ID working point, if tau passes JetID working point then return true; false otherwise
-  m_tTST->m_aAccept.addCut( "JetIDWP",
-                            "Selection of taus according to their JetIDScore" );
   bool bPass = false;
   switch (m_tTST->m_iJetIDWP)
   {
@@ -358,7 +388,7 @@ bool SelectionCutJetIDWP::accept(const xAOD::TauJet& xTau)
   }
   if (bPass)
   {
-    m_tTST->m_aAccept.setCutResult( "JetIDWP", true );
+    acceptData.setCutResult( "JetIDWP", true );
     return true;
   }
   m_tTST->msg() << MSG::VERBOSE << "Tau failed JetBDTWP requirement, tau JetBDTScore: " << xTau.discriminant(xAOD::TauJetParameters::BDTJetScore) << endmsg;
@@ -388,11 +418,16 @@ void SelectionCutBDTEleScore::fillHistogram(const xAOD::TauJet& xTau, TH1F& hHis
 }
 
 //______________________________________________________________________________
-bool SelectionCutBDTEleScore::accept(const xAOD::TauJet& xTau)
+void SelectionCutBDTEleScore::setAcceptInfo(asg::AcceptInfo& info) const
+{
+  info.addCut( "EleBDTScore",
+               "Selection of taus according to their EleBDTScore" );
+}
+//______________________________________________________________________________
+bool SelectionCutBDTEleScore::accept(const xAOD::TauJet& xTau,
+                                     asg::AcceptData& acceptData)
 {
   // check EleBDTscore, if tau has a EleBDT score in one of the regions requiered then return true; false otherwise
-  m_tTST->m_aAccept.addCut( "EleBDTScore",
-                            "Selection of taus according to their EleBDTScore" );
   SG::AuxElement::ConstAccessor<float> accEleBDT(m_sEleBDTDecorationName);
   float fEleBDTScore = accEleBDT(xTau);
   unsigned int iNumEleBDTRegion = m_tTST->m_vEleBDTRegion.size()/2;
@@ -400,7 +435,7 @@ bool SelectionCutBDTEleScore::accept(const xAOD::TauJet& xTau)
   {
     if ( fEleBDTScore >= m_tTST->m_vEleBDTRegion.at(iEleBDTRegion*2) and fEleBDTScore <= m_tTST->m_vEleBDTRegion.at(iEleBDTRegion*2+1))
     {
-      m_tTST->m_aAccept.setCutResult("EleBDTScore", true );
+      acceptData.setCutResult("EleBDTScore", true );
       return true;
     }
   }
@@ -448,11 +483,16 @@ void SelectionCutEleBDTWP::fillHistogram(const xAOD::TauJet& xTau, TH1F& hHist)
 }
 
 //______________________________________________________________________________
-bool SelectionCutEleBDTWP::accept(const xAOD::TauJet& xTau)
+void SelectionCutEleBDTWP::setAcceptInfo(asg::AcceptInfo& info) const
+{
+  info.addCut( "EleBDTWP",
+               "Selection of taus according to their EleBDTScore" );
+}
+//______________________________________________________________________________
+bool SelectionCutEleBDTWP::accept(const xAOD::TauJet& xTau,
+                                  asg::AcceptData& acceptData)
 {
   // check EleBDTscore, if tau passes EleBDT working point then return true; false otherwise
-  m_tTST->m_aAccept.addCut( "EleBDTWP",
-                            "Selection of taus according to their EleBDTScore" );
 
   SG::AuxElement::ConstAccessor<float> accEleBDT(m_sEleBDTDecorationName);
   float fEleBDTScore = accEleBDT(xTau);
@@ -478,7 +518,7 @@ bool SelectionCutEleBDTWP::accept(const xAOD::TauJet& xTau)
   }
   if (bPass)
   {
-    m_tTST->m_aAccept.setCutResult( "EleBDTWP", true );
+    acceptData.setCutResult( "EleBDTWP", true );
     return true;
   }
   m_tTST->msg() << MSG::VERBOSE << "Tau failed EleBDT requirement, tau EleBDTScore: " << fEleBDTScore << endmsg;
@@ -515,20 +555,25 @@ void SelectionCutEleOLR::fillHistogram(const xAOD::TauJet& xTau, TH1F& hHist)
 }
 
 //______________________________________________________________________________
-bool SelectionCutEleOLR::accept(const xAOD::TauJet& xTau)
+void SelectionCutEleOLR::setAcceptInfo(asg::AcceptInfo& info) const
+{
+  info.addCut( "EleOLR",
+               "Selection of taus according to the LH score of a matched electron" );
+}
+//______________________________________________________________________________
+bool SelectionCutEleOLR::accept(const xAOD::TauJet& xTau,
+                                asg::AcceptData& acceptData)
 {
-  m_tTST->m_aAccept.addCut( "EleOLR",
-                            "Selection of taus according to the LH score of a matched electron" );
 
   if (!m_tTST->m_bEleOLR)
   {
-    m_tTST->m_aAccept.setCutResult( "EleOLR", true );
+    acceptData.setCutResult( "EleOLR", true );
     return true;
   }
 
   if (getEvetoPass(xTau))
   {
-    m_tTST->m_aAccept.setCutResult( "EleOLR", true );
+    acceptData.setCutResult( "EleOLR", true );
     return true;
   }
 
@@ -584,20 +629,25 @@ void SelectionCutMuonVeto::fillHistogram(const xAOD::TauJet& xTau, TH1F& hHist)
 }
 
 //______________________________________________________________________________
-bool SelectionCutMuonVeto::accept(const xAOD::TauJet& xTau)
+void SelectionCutMuonVeto::setAcceptInfo(asg::AcceptInfo& info) const
+{
+  info.addCut( "MuonVeto",
+               "Selection of taus according to their MuonVeto" );
+}
+//______________________________________________________________________________
+bool SelectionCutMuonVeto::accept(const xAOD::TauJet& xTau,
+                                  asg::AcceptData& acceptData)
 {
   // check EleBDTscore, if tau passes EleBDT working point then return true; false otherwise
-  m_tTST->m_aAccept.addCut( "MuonVeto",
-                            "Selection of taus according to their MuonVeto" );
   if (!m_tTST->m_bMuonVeto)
   {
-    m_tTST->m_aAccept.setCutResult( "MuonVeto", true );
+    acceptData.setCutResult( "MuonVeto", true );
     return true;
   }
 
   if (!xTau.isTau(xAOD::TauJetParameters::MuonVeto ))
   {
-    m_tTST->m_aAccept.setCutResult( "MuonVeto", true );
+    acceptData.setCutResult( "MuonVeto", true );
     return true;
   }
   m_tTST->msg() << MSG::VERBOSE << "Tau failed MuonVeto requirement" << endmsg;
@@ -632,13 +682,18 @@ void SelectionCutMuonOLR::fillHistogram(const xAOD::TauJet& xTau, TH1F& hHist)
 }
 
 //______________________________________________________________________________
-bool SelectionCutMuonOLR::accept(const xAOD::TauJet& xTau)
+void SelectionCutMuonOLR::setAcceptInfo(asg::AcceptInfo& info) const
+{
+  info.addCut( "MuonOLR",
+               "Selection of taus according to their MuonOLR" );
+}
+//______________________________________________________________________________
+bool SelectionCutMuonOLR::accept(const xAOD::TauJet& xTau,
+                                 asg::AcceptData& acceptData)
 {
-  m_tTST->m_aAccept.addCut( "MuonOLR",
-                            "Selection of taus according to their MuonOLR" );
   if (!m_tTST->m_bMuonOLR)
   {
-    m_tTST->m_aAccept.setCutResult( "MuonOLR", true );
+    acceptData.setCutResult( "MuonOLR", true );
     return true;
   }
   // MuonOLR : removing tau overlapped with muon satisfying pt>2GeV and not calo-tagged
@@ -660,7 +715,7 @@ bool SelectionCutMuonOLR::accept(const xAOD::TauJet& xTau)
   }
   if(m_bTauMuonOLR == true)
   {
-    m_tTST->m_aAccept.setCutResult( "MuonOLR", true );
+    acceptData.setCutResult( "MuonOLR", true );
     return true;
   }
 
diff --git a/PhysicsAnalysis/TauID/TauAnalysisTools/Root/TauSelectionTool.cxx b/PhysicsAnalysis/TauID/TauAnalysisTools/Root/TauSelectionTool.cxx
index bbd90d111c1d6fbd5495ffab7b6944d7ed51c0e6..da163955ce500ef35913822c7978954201205ddd 100644
--- a/PhysicsAnalysis/TauID/TauAnalysisTools/Root/TauSelectionTool.cxx
+++ b/PhysicsAnalysis/TauID/TauAnalysisTools/Root/TauSelectionTool.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 // Local include(s):
@@ -351,6 +351,9 @@ StatusCode TauSelectionTool::initialize()
     ATH_CHECK(m_tTOELLHDecorator.initialize());
   }
 
+  for (auto entry : m_cMap)
+    entry.second->setAcceptInfo (m_aAccept);
+
   return StatusCode::SUCCESS;
 }
 
@@ -458,23 +461,20 @@ StatusCode TauSelectionTool::beginEvent()
 }
 
 //______________________________________________________________________________
-const Root::TAccept& TauSelectionTool::getTAccept() const
+const asg::AcceptInfo& TauSelectionTool::getAcceptInfo() const
 {
   return m_aAccept;
 }
 
 //______________________________________________________________________________
-const Root::TAccept&
+asg::AcceptData
 TauSelectionTool::accept( const xAOD::IParticle* xP ) const
 {
-  // Reset the result:
-  m_aAccept.clear();
-
   // Check if this is a tau:
   if( xP->type() != xAOD::Type::Tau )
   {
     ATH_MSG_ERROR( "accept(...) Function received a non-tau" );
-    return m_aAccept;
+    return asg::AcceptData (&m_aAccept);
   }
 
   // Cast it to a tau:
@@ -482,7 +482,7 @@ TauSelectionTool::accept( const xAOD::IParticle* xP ) const
   if( ! xTau )
   {
     ATH_MSG_FATAL( "accept(...) Failed to cast particle to tau" );
-    return m_aAccept;
+    return asg::AcceptData (&m_aAccept);
   }
 
   // Let the specific function do the work:
@@ -490,17 +490,18 @@ TauSelectionTool::accept( const xAOD::IParticle* xP ) const
 }
 
 //______________________________________________________________________________
-const Root::TAccept& TauSelectionTool::accept( const xAOD::TauJet& xTau ) const
+asg::AcceptData
+TauSelectionTool::accept( const xAOD::TauJet& xTau ) const
 {
-  // Reset the result:
-  m_aAccept.clear();
+  asg::AcceptData acceptData (&m_aAccept);
+
   int iNBin = 0;
   if (m_iSelectionCuts & CutEleOLR or m_bCreateControlPlots)
   {
     if (m_tTOELLHDecorator->decorate(xTau).isFailure())
     {
       ATH_MSG_ERROR("Failed decorating information for CutEleOLR");
-      return m_aAccept;
+      return acceptData;
     }
   }
 
@@ -518,8 +519,8 @@ const Root::TAccept& TauSelectionTool::accept( const xAOD::TauJet& xTau ) const
     {
       if (m_iSelectionCuts & entry.first)
       {
-        if (!entry.second->accept(xTau))
-          return m_aAccept;
+        if (!entry.second->accept(xTau, acceptData))
+          return acceptData;
         else
         {
           if (m_bCreateControlPlots)
@@ -545,7 +546,7 @@ const Root::TAccept& TauSelectionTool::accept( const xAOD::TauJet& xTau ) const
   }
 
   // // Return the result:
-  return m_aAccept;
+  return acceptData;
 }
 
 //______________________________________________________________________________
diff --git a/PhysicsAnalysis/TauID/TauAnalysisTools/TauAnalysisTools/ITauSelectionTool.h b/PhysicsAnalysis/TauID/TauAnalysisTools/TauAnalysisTools/ITauSelectionTool.h
index 6ad6093cca2762f7a569017082406b6656c587b3..c8fdfa0980cfdeed203e5e95e36c8acf68ae02af 100644
--- a/PhysicsAnalysis/TauID/TauAnalysisTools/TauAnalysisTools/ITauSelectionTool.h
+++ b/PhysicsAnalysis/TauID/TauAnalysisTools/TauAnalysisTools/ITauSelectionTool.h
@@ -1,7 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TAUANALYSISTOOLS_ITAUONSELECTIONTOOL_H
@@ -19,7 +19,8 @@
 
 // Framework include(s):
 #include "AsgTools/IAsgTool.h"
-#include "PATCore/TAccept.h"
+#include "PATCore/AcceptInfo.h"
+#include "PATCore/AcceptData.h"
 
 // EDM include(s):
 #include "xAODTau/TauJet.h"
@@ -46,13 +47,13 @@ public:
   virtual StatusCode initializeEvent() __attribute__ ((deprecated("This function is deprecated. Please remove it from your code.\nFor further information please refer to the README:\nhttps://svnweb.cern.ch/trac/atlasoff/browser/PhysicsAnalysis/TauID/TauAnalysisTools/trunk/doc/README-TauSelectionTool.rst"))) = 0;
 
   /// Get an object describing the "selection steps" of the tool
-  virtual const Root::TAccept& getTAccept() const = 0;
+  virtual const asg::AcceptInfo& getAcceptInfo() const = 0;
 
   /// Get the decision using a generic IParticle pointer
-  virtual const Root::TAccept& accept( const xAOD::IParticle* p ) const = 0;
+  virtual asg::AcceptData accept( const xAOD::IParticle* p ) const = 0;
 
   /// Get the decision for a specific TauJet object
-  virtual const Root::TAccept& accept( const xAOD::TauJet& tau ) const = 0;
+  virtual asg::AcceptData accept( const xAOD::TauJet& tau ) const = 0;
 
   /// Set output file for histograms
   virtual void setOutFile( TFile* fOutFile ) = 0;
diff --git a/PhysicsAnalysis/TauID/TauAnalysisTools/TauAnalysisTools/SelectionCuts.h b/PhysicsAnalysis/TauID/TauAnalysisTools/TauAnalysisTools/SelectionCuts.h
index 0482cc4db9e187b0611de766d37bddf2822dc2ad..81e9f71ef3dbd2bb64892b8558013a1345dd99d5 100644
--- a/PhysicsAnalysis/TauID/TauAnalysisTools/TauAnalysisTools/SelectionCuts.h
+++ b/PhysicsAnalysis/TauID/TauAnalysisTools/TauAnalysisTools/SelectionCuts.h
@@ -1,7 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TAUANALYSISTOOLS_SELECTIONCUTS_H
@@ -19,7 +19,8 @@
 
 // Framework include(s):
 #include "xAODTau/TauJet.h"
-#include "PATCore/TAccept.h"
+#include "PATCore/AcceptData.h"
+#include "PATCore/AcceptInfo.h"
 
 // ROOT include(s):
 #include "TH1F.h"
@@ -42,7 +43,9 @@ public:
   void writeControlHistograms();
   void fillHistogramCutPre(const xAOD::TauJet& xTau);
   void fillHistogramCut(const xAOD::TauJet& xTau);
-  virtual bool accept(const xAOD::TauJet& xTau) = 0;
+  virtual void setAcceptInfo (asg::AcceptInfo& info) const = 0;
+  virtual bool accept(const xAOD::TauJet& xTau,
+                      asg::AcceptData& accept) = 0;
   TH1F* CreateControlPlot(const char* sName, const char* sTitle, int iBins, double dXLow, double dXUp);
 
   std::string getName()
@@ -73,7 +76,9 @@ class SelectionCutPt
 {
 public:
   SelectionCutPt(TauSelectionTool* tTST);
-  bool accept(const xAOD::TauJet& xTau);
+  virtual void setAcceptInfo (asg::AcceptInfo& info) const override;
+  virtual bool accept(const xAOD::TauJet& xTau,
+                      asg::AcceptData& accept) override;
 private:
   void fillHistogram(const xAOD::TauJet& xTau, TH1F& hHist);
 };
@@ -83,7 +88,9 @@ class SelectionCutAbsEta
 {
 public:
   SelectionCutAbsEta(TauSelectionTool* tTST);
-  bool accept(const xAOD::TauJet& xTau);
+  virtual void setAcceptInfo (asg::AcceptInfo& info) const override;
+  virtual bool accept(const xAOD::TauJet& xTau,
+                      asg::AcceptData& accept) override;
 private:
   void fillHistogram(const xAOD::TauJet& xTau, TH1F& hHist);
 };
@@ -93,7 +100,9 @@ class SelectionCutAbsCharge
 {
 public:
   SelectionCutAbsCharge(TauSelectionTool* tTST);
-  bool accept(const xAOD::TauJet& xTau);
+  virtual void setAcceptInfo (asg::AcceptInfo& info) const override;
+  virtual bool accept(const xAOD::TauJet& xTau,
+                      asg::AcceptData& accept) override;
 private:
   void fillHistogram(const xAOD::TauJet& xTau, TH1F& hHist);
 };
@@ -103,7 +112,9 @@ class SelectionCutNTracks
 {
 public:
   SelectionCutNTracks(TauSelectionTool* tTST);
-  bool accept(const xAOD::TauJet& xTau);
+  virtual void setAcceptInfo (asg::AcceptInfo& info) const override;
+  virtual bool accept(const xAOD::TauJet& xTau,
+                      asg::AcceptData& accept) override;
 private:
   void fillHistogram(const xAOD::TauJet& xTau, TH1F& hHist);
 };
@@ -113,7 +124,9 @@ class SelectionCutBDTJetScore
 {
 public:
   SelectionCutBDTJetScore(TauSelectionTool* tTST);
-  bool accept(const xAOD::TauJet& xTau);
+  virtual void setAcceptInfo (asg::AcceptInfo& info) const override;
+  virtual bool accept(const xAOD::TauJet& xTau,
+                      asg::AcceptData& accept) override;
 private:
   void fillHistogram(const xAOD::TauJet& xTau, TH1F& hHist);
 };
@@ -123,7 +136,9 @@ class SelectionCutJetIDWP
 {
 public:
   SelectionCutJetIDWP(TauSelectionTool* tTST);
-  bool accept(const xAOD::TauJet& xTau);
+  virtual void setAcceptInfo (asg::AcceptInfo& info) const override;
+  virtual bool accept(const xAOD::TauJet& xTau,
+                      asg::AcceptData& accept) override;
 private:
   void fillHistogram(const xAOD::TauJet& xTau, TH1F& hHist);
 };
@@ -133,7 +148,9 @@ class SelectionCutBDTEleScore
 {
 public:
   SelectionCutBDTEleScore(TauSelectionTool* tTST);
-  bool accept(const xAOD::TauJet& xTau);
+  virtual void setAcceptInfo (asg::AcceptInfo& info) const override;
+  virtual bool accept(const xAOD::TauJet& xTau,
+                      asg::AcceptData& accept) override;
 private:
   std::string m_sEleBDTDecorationName;
   void fillHistogram(const xAOD::TauJet& xTau, TH1F& hHist);
@@ -144,7 +161,9 @@ class SelectionCutEleBDTWP
 {
 public:
   SelectionCutEleBDTWP(TauSelectionTool* tTST);
-  bool accept(const xAOD::TauJet& xTau);
+  virtual void setAcceptInfo (asg::AcceptInfo& info) const override;
+  virtual bool accept(const xAOD::TauJet& xTau,
+                      asg::AcceptData& accept) override;
 private:
   std::string m_sEleBDTDecorationName;
   void fillHistogram(const xAOD::TauJet& xTau, TH1F& hHist);
@@ -155,8 +174,10 @@ class SelectionCutEleOLR
 {
 public:
   SelectionCutEleOLR(TauSelectionTool* tTST);
-  bool accept(const xAOD::TauJet& xTau);
-  ~SelectionCutEleOLR();
+  virtual ~SelectionCutEleOLR();
+  virtual void setAcceptInfo (asg::AcceptInfo& info) const override;
+  virtual bool accept(const xAOD::TauJet& xTau,
+                      asg::AcceptData& accept) override;
 
   bool getEvetoPass(const xAOD::TauJet& xTau);
 private:
@@ -176,7 +197,9 @@ class SelectionCutMuonVeto
 {
 public:
   SelectionCutMuonVeto(TauSelectionTool* tTST);
-  bool accept(const xAOD::TauJet& xTau);
+  virtual void setAcceptInfo (asg::AcceptInfo& info) const override;
+  virtual bool accept(const xAOD::TauJet& xTau,
+                      asg::AcceptData& accept) override;
 private:
   void fillHistogram(const xAOD::TauJet& xTau, TH1F& hHist);
 };
@@ -188,7 +211,9 @@ class SelectionCutMuonOLR
 {
 public:
   SelectionCutMuonOLR(TauSelectionTool* tTST);
-  bool accept(const xAOD::TauJet& xTau);
+  virtual void setAcceptInfo (asg::AcceptInfo& info) const override;
+  virtual bool accept(const xAOD::TauJet& xTau,
+                      asg::AcceptData& accept) override;
 private:
   bool m_bTauMuonOLR; //False: overlapped, the tau is not kept. True: not overlapped, the tau is kept.)
   const xAOD::MuonContainer* m_xMuonContainer;
diff --git a/PhysicsAnalysis/TauID/TauAnalysisTools/TauAnalysisTools/TauSelectionTool.h b/PhysicsAnalysis/TauID/TauAnalysisTools/TauAnalysisTools/TauSelectionTool.h
index b22870789b1bd335636fd8f125c9fdb0d5e9eb13..8b9e1eddc2e74d425b18f83b3a0190a8323216b3 100644
--- a/PhysicsAnalysis/TauID/TauAnalysisTools/TauAnalysisTools/TauSelectionTool.h
+++ b/PhysicsAnalysis/TauID/TauAnalysisTools/TauAnalysisTools/TauSelectionTool.h
@@ -1,7 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TAUANALYSISTOOLS_TAUSELECTIONTOOL_H
@@ -100,32 +100,32 @@ public:
   virtual ~TauSelectionTool();
 
   /// Function initialising the tool
-  virtual StatusCode initialize();
+  virtual StatusCode initialize() override;
 
   /// Function initialising the tool
-  virtual StatusCode initializeEvent() __attribute__ ((deprecated("This function is deprecated. Please remove it from your code.\nFor further information please refer to the README:\nhttps://svnweb.cern.ch/trac/atlasoff/browser/PhysicsAnalysis/TauID/TauAnalysisTools/trunk/doc/README-TauSelectionTool.rst")));
+  virtual StatusCode initializeEvent() override __attribute__ ((deprecated("This function is deprecated. Please remove it from your code.\nFor further information please refer to the README:\nhttps://svnweb.cern.ch/trac/atlasoff/browser/PhysicsAnalysis/TauID/TauAnalysisTools/trunk/doc/README-TauSelectionTool.rst")));
 
   /// Get an object describing the "selection steps" of the tool
-  virtual const Root::TAccept& getTAccept() const;
+  virtual const asg::AcceptInfo& getAcceptInfo() const override;
 
   /// Get the decision using a generic IParticle pointer
-  virtual const Root::TAccept& accept( const xAOD::IParticle* p ) const;
+  virtual asg::AcceptData accept( const xAOD::IParticle* p ) const override;
 
   /// Get the decision for a specific TauJet object
-  virtual const Root::TAccept& accept( const xAOD::TauJet& tau ) const;
+  virtual asg::AcceptData accept( const xAOD::TauJet& tau ) const override;
 
   /// Set output file for control histograms
-  void setOutFile( TFile* fOutFile );
+  virtual void setOutFile( TFile* fOutFile ) override;
 
   /// Write control histograms to output file
-  void writeControlHistograms();
+  virtual void writeControlHistograms() override;
 
 private:
 
   // Execute at each new input file
-  virtual StatusCode beginInputFile();
+  virtual StatusCode beginInputFile() override;
   // Execute at each event
-  virtual StatusCode beginEvent();
+  virtual StatusCode beginEvent() override;
 
   template<typename T, typename U>
   void FillRegionVector(std::vector<T>& vRegion, U tMin, U tMax);
@@ -202,8 +202,8 @@ private:
 protected:
   bool m_bCreateControlPlots;
 
-  /// Object used to store the last decision
-  mutable Root::TAccept m_aAccept;
+  /// Object used to store selection information.
+  asg::AcceptInfo m_aAccept;
 
 
 
diff --git a/Projects/AnalysisBase/CMakeLists.txt b/Projects/AnalysisBase/CMakeLists.txt
index add794f885d0df2fcc840071abb4b731c6484c5b..1a91179210d702d31cb432836c78322ab553cda4 100644
--- a/Projects/AnalysisBase/CMakeLists.txt
+++ b/Projects/AnalysisBase/CMakeLists.txt
@@ -4,7 +4,7 @@
 #
 
 # The minimum required CMake version:
-cmake_minimum_required( VERSION 3.2 FATAL_ERROR )
+cmake_minimum_required( VERSION 3.6 FATAL_ERROR )
 
 # Read in the project's version from a file called version.txt. But let it be
 # overridden from the command line if necessary.
@@ -22,20 +22,6 @@ find_package( AnalysisBaseExternals REQUIRED )
 # against Python to correct it.
 find_package( PythonInterp )
 
-# Add the project's modules directory to CMAKE_MODULE_PATH:
-list( INSERT CMAKE_MODULE_PATH 0 ${CMAKE_SOURCE_DIR}/modules )
-list( REMOVE_DUPLICATES CMAKE_MODULE_PATH )
-
-# Install the files from modules/:
-install( DIRECTORY ${CMAKE_SOURCE_DIR}/modules/
-   DESTINATION cmake/modules
-   USE_SOURCE_PERMISSIONS
-   PATTERN ".svn" EXCLUDE
-   PATTERN "*~" EXCLUDE )
-
-# Include the AnalysisBase specific function(s):
-include( AnalysisBaseFunctions )
-
 # Set up the build/runtime environment:
 set( AnalysisBaseReleaseEnvironment_DIR ${CMAKE_SOURCE_DIR} )
 find_package( AnalysisBaseReleaseEnvironment REQUIRED )
@@ -52,15 +38,6 @@ atlas_project( AnalysisBase ${ANALYSISBASE_PROJECT_VERSION}
    USE AnalysisBaseExternals ${AnalysisBaseExternals_VERSION}
    PROJECT_ROOT ${CMAKE_SOURCE_DIR}/../../ )
 
-# Generate the RootCore/Packages.h header:
-analysisbase_generate_release_header()
-
-# Set up the load_packages.C script:
-configure_file( ${CMAKE_SOURCE_DIR}/scripts/load_packages.C.in
-   ${CMAKE_SCRIPT_OUTPUT_DIRECTORY}/load_packages.C @ONLY )
-install( FILES ${CMAKE_SCRIPT_OUTPUT_DIRECTORY}/load_packages.C
-   DESTINATION ${CMAKE_INSTALL_SCRIPTDIR} )
-
 # Configure and install the post-configuration file:
 configure_file( ${CMAKE_SOURCE_DIR}/PostConfig.cmake.in
    ${CMAKE_BINARY_DIR}/PostConfig.cmake @ONLY )
diff --git a/Projects/AnalysisBase/build.sh b/Projects/AnalysisBase/build.sh
index e6f04f22b375dddc86a5461f8e4b0678f2e647d2..97717bd1f5b5f94eb108b25de8e7bf6ff6f1d871 100755
--- a/Projects/AnalysisBase/build.sh
+++ b/Projects/AnalysisBase/build.sh
@@ -8,12 +8,13 @@ _time_() { local c="time -p " ; while test "X$1" != "X" ; do c+=" \"$1\"" ; shif
 
 # Function printing the usage information for the script
 usage() {
-    echo "Usage: build.sh [-t type] [-b dir] [-g generator] [-c] [-m] [-i] [-p] [-a]"
+    echo "Usage: build.sh [-t type] [-b dir] [-g generator] [-c] [-m] [-i] [-p] [-a] [-x opt]"
     echo ""
     echo "  General flags:"
     echo "    -t: The (optional) CMake build type to use."
     echo "    -b: The (optional) build directory to use."
     echo "    -g: The (optional) CMake generator to use."
+    echo "    -x: Custom argument(s) to pass to the CMake configuration"
     echo "    -a: Abort on error."
     echo "  Build step selection:"
     echo "    -c: Execute the CMake step."
@@ -35,7 +36,8 @@ EXE_MAKE=""
 EXE_INSTALL=""
 EXE_CPACK=""
 NIGHTLY=true
-while getopts ":t:b:g:hcmipa" opt; do
+EXTRACMAKE=()
+while getopts ":t:b:g:hcmipax:" opt; do
     case $opt in
         t)
             BUILDTYPE=$OPTARG
@@ -61,6 +63,9 @@ while getopts ":t:b:g:hcmipa" opt; do
         a)
             NIGHTLY=false
             ;;
+        x)
+            EXTRACMAKE+=($OPTARG)
+            ;;
         h)
             usage
             exit 0
@@ -122,7 +127,7 @@ if [ -n "$EXE_CMAKE" ]; then
     # Now run the actual CMake configuration:
     _time_ cmake -G "${GENERATOR}" \
          -DCMAKE_BUILD_TYPE:STRING=${BUILDTYPE} \
-         ${USE_LAUNCHERS} \
+         ${USE_LAUNCHERS} ${EXTRACMAKE[@]} \
          ${AnalysisBaseSrcDir} 2>&1 | tee cmake_config.log
 fi
 
diff --git a/Projects/AnalysisBase/build_externals.sh b/Projects/AnalysisBase/build_externals.sh
index 234b2db78b24cf6c176ac45823798c5bff455cce..26089095a33d7babfe64c5844dbd55a2d6ea3594 100755
--- a/Projects/AnalysisBase/build_externals.sh
+++ b/Projects/AnalysisBase/build_externals.sh
@@ -8,11 +8,13 @@ set -e
 
 # Function printing the usage information for the script
 usage() {
-    echo "Usage: build_externals.sh [-t build_type] [-b build_dir] [-f] [-c]"
+    echo "Usage: build_externals.sh [-t build_type] [-b build_dir] [-f] [-c] [-x opt]"
     echo " -f: Force rebuild of externals, otherwise if script"
     echo "     finds an external build present it will simply exit"
     echo " -c: Build the externals for the continuous integration (CI) system,"
     echo "     skipping the build of the externals RPMs."
+    echo " -x: Extra cmake argument(s) to provide for the build(configuration)"
+    echo "     of all externals needed by Athena."
     echo "If a build_dir is not given the default is '../build'"
     echo "relative to the athena checkout"
 }
@@ -22,7 +24,8 @@ BUILDDIR=""
 BUILDTYPE="RelWithDebInfo"
 FORCE=""
 CI=""
-while getopts ":t:b:fch" opt; do
+EXTRACMAKE=()
+while getopts ":t:b:x:fch" opt; do
     case $opt in
         t)
             BUILDTYPE=$OPTARG
@@ -36,6 +39,9 @@ while getopts ":t:b:fch" opt; do
         c)
             CI="1"
             ;;
+        x)
+            EXTRACMAKE+=($OPTARG)
+            ;;
         h)
             usage
             exit 0
@@ -95,12 +101,13 @@ fi
 # Read in the tag/branch to use for AnalysisBaseExternals:
 AnalysisBaseExternalsVersion=$(awk '/^AnalysisBaseExternalsVersion/{print $3}' ${thisdir}/externals.txt)
 
+# Stop on all errors in the following (piped) commands:
 set -o pipefail
 
 # Check out AnalysisBaseExternals from the right branch/tag:
 ${scriptsdir}/checkout_atlasexternals.sh \
     -t ${AnalysisBaseExternalsVersion} \
-    -s ${BUILDDIR}/src/AnalysisBaseExternals 2>&1  | tee ${BUILDDIR}/src/checkout.AnalysisBaseExternals.log
+    -s ${BUILDDIR}/src/AnalysisBaseExternals 2>&1 | tee ${BUILDDIR}/src/checkout.AnalysisBaseExternals.log
 
 # Build AnalysisBaseExternals:
 export NICOS_PROJECT_HOME=$(cd ${BUILDDIR}/install;pwd)/AnalysisBaseExternals
@@ -109,4 +116,4 @@ ${scriptsdir}/build_atlasexternals.sh \
     -b ${BUILDDIR}/build/AnalysisBaseExternals \
     -i ${BUILDDIR}/install/AnalysisBaseExternals/${NICOS_PROJECT_VERSION} \
     -p AnalysisBaseExternals ${RPMOPTIONS} -t ${BUILDTYPE} \
-    -v ${NICOS_PROJECT_VERSION}
+    -v ${NICOS_PROJECT_VERSION} ${EXTRACMAKE[@]/#/-x }
diff --git a/Projects/AnalysisBase/externals.txt b/Projects/AnalysisBase/externals.txt
index 9a2a23b5125f752d48de471144064110acd3076c..624cd41a081c1162bc1a8c52af0bb77bb234f9b7 100644
--- a/Projects/AnalysisBase/externals.txt
+++ b/Projects/AnalysisBase/externals.txt
@@ -6,4 +6,4 @@
 # forbidden.
 
 # The version of atlas/atlasexternals to use:
-AnalysisBaseExternalsVersion = 2.0.20
+AnalysisBaseExternalsVersion = 2.0.21
diff --git a/Projects/AnalysisBase/modules/AnalysisBaseFunctions.cmake b/Projects/AnalysisBase/modules/AnalysisBaseFunctions.cmake
deleted file mode 100644
index 9e16d92bf9674d2c0038f0f725fcb02204f6f8e1..0000000000000000000000000000000000000000
--- a/Projects/AnalysisBase/modules/AnalysisBaseFunctions.cmake
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# This module collects CMake functions that are useful when setting up an
-# analysis release.
-#
-
-# Function generating a RootCore/Packages.h header
-#
-# This function should be called in the main CMakeLists.txt file of the
-# project, after the atlas_project(...) call, in order to generate a header file
-# called "RootCore/Packages.h", in the format that RootCore generates it in.
-# With one define statement per package that was found in he release.
-#
-# Usage: analysisbase_generate_release_header()
-#
-function( analysisbase_generate_release_header )
-
-   # Get the list of packages that were found:
-   get_property( _packages GLOBAL PROPERTY ATLAS_EXPORTED_PACKAGES )
-
-   # Generate a "RootCore/Package.h" file, in the same format that
-   # RootCore does/did:
-   set( _packagesFileName
-      ${CMAKE_BINARY_DIR}/RootCore/include/RootCore/Packages.h )
-   file( MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/RootCore/include/RootCore )
-   file( WRITE ${_packagesFileName}
-      "// Auto-generated file, please do not edit\n"
-      "#ifndef ROOTCORE_PACKAGES_H\n"
-      "#define ROOTCORE_PACKAGES_H\n\n" )
-   foreach( pkgname ${_packages} )
-      file( APPEND ${_packagesFileName}
-         "#define ROOTCORE_PACKAGE_${pkgname}\n" )
-   endforeach()
-   file( APPEND ${_packagesFileName} "\n#endif // not ROOTCORE_PACKAGES_H\n" )
-   unset( _packagesFileName )
-   unset( _packages )
-
-   # Install the header in the usual place:
-   install( DIRECTORY ${CMAKE_BINARY_DIR}/RootCore/include/
-      DESTINATION RootCore/include )
-
-endfunction( analysisbase_generate_release_header )
diff --git a/Projects/AnalysisBase/package_filters.txt b/Projects/AnalysisBase/package_filters.txt
index 7fcded02d0e9894158f680a5b1624d8a37905a06..0faac768a091ad51a52d4cafe8e034b33e824f85 100644
--- a/Projects/AnalysisBase/package_filters.txt
+++ b/Projects/AnalysisBase/package_filters.txt
@@ -10,80 +10,19 @@
 + Control/AthToolSupport/.*
 + Control/CxxUtils
 + Control/xAODRootAccess.*
-+ DataQuality/GoodRunsLists
 + DetectorDescription/GeoPrimitives
 + DetectorDescription/IRegionSelector
 + DetectorDescription/RoiDescriptor
 + Event/EventPrimitives
 + Event/FourMomUtils
 - Event/xAOD/.*AthenaPool
-+ Event/xAOD/xAODMetaDataCnv
-+ Event/xAOD/xAODTriggerCnv
 - Event/xAOD/.*Cnv
 + Event/xAOD/.*
 + Generators/TruthUtils
-+ InnerDetector/InDetRecTools/InDetTrackSelectionTool
-+ InnerDetector/InDetRecTools/TrackVertexAssociationTool
 + MuonSpectrometer/MuonIdHelpers
-+ PhysicsAnalysis/AnalysisCommon/AssociationUtils
-+ PhysicsAnalysis/AnalysisCommon/CPAnalysisExamples
-+ PhysicsAnalysis/AnalysisCommon/FsrUtils
-+ PhysicsAnalysis/AnalysisCommon/IsolationSelection
-+ PhysicsAnalysis/AnalysisCommon/PATCore
-+ PhysicsAnalysis/AnalysisCommon/PATInterfaces
-+ PhysicsAnalysis/AnalysisCommon/PMGTools
-+ PhysicsAnalysis/AnalysisCommon/ParticleJetTools
-+ PhysicsAnalysis/AnalysisCommon/PileupReweighting
-+ PhysicsAnalysis/AnalysisCommon/ReweightUtils
-+ PhysicsAnalysis/D3PDTools/.*
-- PhysicsAnalysis/ElectronPhotonID/ElectronPhotonTagTools
-+ PhysicsAnalysis/ElectronPhotonID/.*
-+ PhysicsAnalysis/HiggsPhys/Run2/HZZ/Tools/ZMassConstraint
-+ PhysicsAnalysis/Interfaces/.*
-+ PhysicsAnalysis/JetMissingEtID/JetSelectorTools
-+ PhysicsAnalysis/JetPhys/SemileptonicCorr
-+ PhysicsAnalysis/JetTagging/JetTagPerformanceCalibration/CalibrationDataInterface
-+ PhysicsAnalysis/JetTagging/JetTagPerformanceCalibration/xAODBTaggingEfficiency
-+ PhysicsAnalysis/MCTruthClassifier
-+ PhysicsAnalysis/MuonID/MuonIDAnalysis/.*
-+ PhysicsAnalysis/MuonID/MuonSelectorTools
-+ PhysicsAnalysis/SUSYPhys/SUSYTools
-+ PhysicsAnalysis/TauID/DiTauMassTools
-+ PhysicsAnalysis/TauID/TauAnalysisTools
-+ PhysicsAnalysis/TauID/TauCorrUncert
-+ PhysicsAnalysis/TopPhys/QuickAna
-+ PhysicsAnalysis/TrackingID/.*
-+ Reconstruction/EventShapes/EventShapeInterface
-- Reconstruction/Jet/JetAnalysisTools/JetAnalysisEDM
-- Reconstruction/Jet/JetEvent.*
-- Reconstruction/Jet/JetMonitoring
-+ Reconstruction/Jet/JetReclustering
-- Reconstruction/Jet/JetRec.+
-- Reconstruction/Jet/JetSimTools
-- Reconstruction/Jet/JetValidation
-+ Reconstruction/Jet/Jet.*
-+ Reconstruction/MET/METInterface
-+ Reconstruction/MET/METUtilities
-+ Reconstruction/MVAUtils
-+ Reconstruction/PFlow/PFlowUtils
-+ Reconstruction/egamma/egammaLayerRecalibTool
-+ Reconstruction/egamma/egammaMVACalib
-+ Reconstruction/egamma/egammaRecEvent
-+ Reconstruction/tauRecTools
 + Tools/PathResolver
-+ Trigger/TrigAnalysis/TrigAnalysisInterfaces
-+ Trigger/TrigAnalysis/TrigBunchCrossingTool
-+ Trigger/TrigAnalysis/TrigDecisionTool
-+ Trigger/TrigAnalysis/TrigTauAnalysis/TrigTauMatching
-+ Trigger/TrigAnalysis/TriggerMatchingTool
 + Trigger/TrigConfiguration/TrigConfBase
-+ Trigger/TrigConfiguration/TrigConfHLTData
-+ Trigger/TrigConfiguration/TrigConfInterfaces
 + Trigger/TrigConfiguration/TrigConfL1Data
-+ Trigger/TrigConfiguration/TrigConfxAOD
-+ Trigger/TrigEvent/TrigDecisionInterface
++ Trigger/TrigConfiguration/TrigConfHLTData
 + Trigger/TrigEvent/TrigNavStructure
-+ Trigger/TrigEvent/TrigRoiConversion
-+ Trigger/TrigEvent/TrigSteeringEvent
-+ Trigger/TrigValidation/TrigAnalysisTest
 - .*
diff --git a/Projects/AnalysisBase/scripts/load_packages.C.in b/Projects/AnalysisBase/scripts/load_packages.C.in
deleted file mode 100644
index 9d47dbba4f5e387d305f51263578180496e9ba73..0000000000000000000000000000000000000000
--- a/Projects/AnalysisBase/scripts/load_packages.C.in
+++ /dev/null
@@ -1,48 +0,0 @@
-//
-// This is a much simplified version of the RootCore script with the same
-// name, basically just here to provide the existing scripts/tests with a
-// file that they can use.
-//
-
-// System include(s):
-#include <stdexcept>
-
-// ROOT include(s):
-#include <TSystem.h>
-#include <TROOT.h>
-
-/// Function setting up interactive ROOT to use the analysis release
-///
-/// In order to use macros or PyROOT scripts that make use of symbols
-/// defined in the analysis release, the user has to execute this macro.
-/// It takes care of setting up the compilation options of ACLiC, and
-/// of calling xAOD::Init().
-///
-/// @param options An unused parameter, just to mimic the RootCore function
-///
-void load_packages( const char* options = "" ) {
-
-   // Make sure that some reasonable environment is set up:
-   const char* ROOTCOREDIR = gSystem->Getenv( "ROOTCOREDIR" );
-   if( ! ROOTCOREDIR ) {
-      throw std::runtime_error( "ROOTCOREDIR not set, please set "
-                                "the environment" );
-   }
-   const std::string dir = ROOTCOREDIR;
-
-   const char* ROOTCOREBIN = gSystem->Getenv( "ROOTCOREBIN" );
-   if( ! ROOTCOREBIN ) {
-      throw std::runtime_error( "ROOTCOREBIN not set, please set "
-                                "the environment");
-   }
-   const std::string bin = ROOTCOREBIN;
-
-   // Set the compilation options for ACLiC:
-   gSystem->AddIncludePath( "@CMAKE_CXX_FLAGS@" );
-
-   // Load the xAODRootAccess library, in a hard-coded way:
-   gSystem->Load( "libxAODRootAccess" );
-   gROOT->ProcessLine( "xAOD::Init().ignore()" );
-
-   return;
-}
diff --git a/Projects/AnalysisBase/version.txt b/Projects/AnalysisBase/version.txt
index 24ba9a38de68d00674ec97b283a967699716b9f4..01c3bca9e331e9935cb0d5c49ecf2bdcdbca5caf 100644
--- a/Projects/AnalysisBase/version.txt
+++ b/Projects/AnalysisBase/version.txt
@@ -1 +1 @@
-2.7.0
+22.0.1
diff --git a/Projects/AnalysisTop/externals.txt b/Projects/AnalysisTop/externals.txt
index b05c766d18f829cb8970aaf42fce91932d5d13c0..86228c86567dc8d7f74172bd3e5b871ca807156a 100644
--- a/Projects/AnalysisTop/externals.txt
+++ b/Projects/AnalysisTop/externals.txt
@@ -1,4 +1,4 @@
 # Versions of the various externals to build before starting the build of
 # this project, when doing a full stack nightly build.
 
-AnalysisBaseExternalsVersion = 2.0.20
+AnalysisBaseExternalsVersion = 2.0.21
diff --git a/Projects/AthDataQuality/CMakeLists.txt b/Projects/AthDataQuality/CMakeLists.txt
index 29a3b3edeb6ee4a9e307181c6dc32ec87710541c..c1835daae634a8346f9c48fce0612df0ee465db5 100644
--- a/Projects/AthDataQuality/CMakeLists.txt
+++ b/Projects/AthDataQuality/CMakeLists.txt
@@ -1,6 +1,6 @@
 
 # Set the minimum required CMake version:
-cmake_minimum_required( VERSION 3.2 FATAL_ERROR )
+cmake_minimum_required( VERSION 3.6 )
 
 # Read in the project's version from a file called version.txt. But let it be
 # overridden from the command line if necessary.
@@ -11,14 +11,18 @@ set( ATHDATAQUALITY_PROJECT_VERSION ${_version}
 unset( _version )
 
 # Set the version of tdaq-common to use for the build:
-set( TDAQ-COMMON_VERSION "02-04-00" )
-set( TDAQ-COMMON_ROOT
-   "$ENV{TDAQ_RELEASE_BASE}/tdaq-common/tdaq-common-${TDAQ-COMMON_VERSION}" )
+set( TDAQ-COMMON_VERSION "02-09-00" CACHE STRING
+   "The version of tdaq-common to use for the build" )
+set( TDAQ-COMMON_ATROOT
+   "$ENV{TDAQ_RELEASE_BASE}/tdaq-common/tdaq-common-${TDAQ-COMMON_VERSION}"
+   CACHE PATH "The directory to pick up tdaq-common from" )
 
 # Set the version of dqm-common to use for the build:
-set( DQM-COMMON_VERSION "01-04-00" )
-set( DQM-COMMON_ROOT
-   "$ENV{TDAQ_RELEASE_BASE}/dqm-common/dqm-common-${DQM-COMMON_VERSION}" )
+set( DQM-COMMON_VERSION "01-09-00" CACHE STRING
+   "The version of dqm-common to use for the build" )
+set( DQM-COMMON_ATROOT
+   "$ENV{TDAQ_RELEASE_BASE}/dqm-common/dqm-common-${DQM-COMMON_VERSION}"
+   CACHE PATH "The directory to pick up dqm-common from" )
 
 # Pick up the AtlasCMake code:
 find_package( AtlasCMake REQUIRED )
@@ -26,7 +30,7 @@ find_package( AtlasCMake REQUIRED )
 # Build the project against LCG:
 set( LCG_VERSION_POSTFIX ""
    CACHE STRING "Version postfix for the LCG release to use" )
-set( LCG_VERSION_NUMBER 91
+set( LCG_VERSION_NUMBER 94
    CACHE STRING "Version number for the LCG release to use" )
 find_package( LCG ${LCG_VERSION_NUMBER} EXACT REQUIRED )
 
@@ -52,11 +56,12 @@ lcg_generate_env( SH_FILE ${CMAKE_BINARY_DIR}/${ATLAS_PLATFORM}/env_setup.sh )
 set( _replacements )
 if( NOT "$ENV{NICOS_PROJECT_HOME}" STREQUAL "" )
    get_filename_component( _buildDir $ENV{NICOS_PROJECT_HOME} PATH )
-   list( APPEND _replacements ${_buildDir} "\${Athena_DIR}/../../../.." )
+   list( APPEND _replacements ${_buildDir}
+      "\${AthDataQuality_DIR}/../../../.." )
 endif()
 if( NOT "$ENV{NICOS_PROJECT_RELNAME}" STREQUAL "" )
    list( APPEND _replacements $ENV{NICOS_PROJECT_RELNAME}
-      "\${Athena_VERSION}" )
+      "\${AthDataQuality_VERSION}" )
 endif()
 if( NOT "$ENV{TDAQ_RELEASE_BASE}" STREQUAL "" )
    list( APPEND _replacements $ENV{TDAQ_RELEASE_BASE}
@@ -72,13 +77,13 @@ install( FILES ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/env_setup_install.sh
 
 # Configure and install the post-configuration file:
 string( REPLACE "$ENV{TDAQ_RELEASE_BASE}" "\$ENV{TDAQ_RELEASE_BASE}"
-   TDAQ-COMMON_ROOT "${TDAQ-COMMON_ROOT}" )
+   TDAQ-COMMON_ATROOT "${TDAQ-COMMON_ATROOT}" )
 string( REPLACE "${TDAQ-COMMON_VERSION}" "\${TDAQ-COMMON_VERSION}"
-   TDAQ-COMMON_ROOT "${TDAQ-COMMON_ROOT}" )
+   TDAQ-COMMON_ATROOT "${TDAQ-COMMON_ATROOT}" )
 string( REPLACE "$ENV{TDAQ_RELEASE_BASE}" "\$ENV{TDAQ_RELEASE_BASE}"
-   DQM-COMMON_ROOT "${DQM-COMMON_ROOT}" )
+   DQM-COMMON_ATROOT "${DQM-COMMON_ATROOT}" )
 string( REPLACE "${DQM-COMMON_VERSION}" "\${DQM-COMMON_VERSION}"
-   DQM-COMMON_ROOT "${DQM-COMMON_ROOT}" )
+   DQM-COMMON_ATROOT "${DQM-COMMON_ATROOT}" )
 configure_file( ${CMAKE_SOURCE_DIR}/PostConfig.cmake.in
    ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/PostConfig.cmake @ONLY )
 install( FILES ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/PostConfig.cmake
diff --git a/Projects/AthDataQuality/PostConfig.cmake.in b/Projects/AthDataQuality/PostConfig.cmake.in
index 8d8218256cb333bcc7ecd13342b79b6380e2f385..29b54887ad02cdf3452dfd612745893aa8281c9b 100644
--- a/Projects/AthDataQuality/PostConfig.cmake.in
+++ b/Projects/AthDataQuality/PostConfig.cmake.in
@@ -4,8 +4,12 @@
 #
 
 # Set the versions of the TDAQ projects:
-set( TDAQ-COMMON_VERSION "@TDAQ-COMMON_VERSION@" )
-set( TDAQ-COMMON_ROOT "@TDAQ-COMMON_ROOT@" )
+set( TDAQ-COMMON_VERSION "@TDAQ-COMMON_VERSION@" CACHE STRING
+   "The version of tdaq-common to use for the build" )
+set( TDAQ-COMMON_ATROOT "@TDAQ-COMMON_ATROOT@" CACHE PATH
+   "The directory to pick up tdaq-common from" )
 
-set( DQM-COMMON_VERSION "@DQM-COMMON_VERSION@" )
-set( DQM-COMMON_ROOT "@DQM-COMMON_ROOT@" )
+set( DQM-COMMON_VERSION "@DQM-COMMON_VERSION@" CACHE STRING
+   "The version of dqm-common to use for the build" )
+set( DQM-COMMON_ATROOT "@DQM-COMMON_ATROOT@" CACHE PATH
+   "The directory to pick up dqm-common from" )
diff --git a/Projects/AthDataQuality/externals.txt b/Projects/AthDataQuality/externals.txt
index 905a85343618c2d95999498b3a4390d0b4914226..f7c7926e3e79f08624d78ced59cbea346b8cd606 100644
--- a/Projects/AthDataQuality/externals.txt
+++ b/Projects/AthDataQuality/externals.txt
@@ -5,4 +5,4 @@
 # an "origin/" prefix before it. For tags however this is explicitly
 # forbidden.
 
-AtlasExternalsVersion = 2.0.20
+AtlasExternalsVersion = 2.0.21
diff --git a/Projects/AthSimulation/CMakeLists.txt b/Projects/AthSimulation/CMakeLists.txt
index 88b4d21a38342d5604715293656ada6e1d95f18d..fc01c1d8aa7d82a093e38b60aa6f304d8701a046 100644
--- a/Projects/AthSimulation/CMakeLists.txt
+++ b/Projects/AthSimulation/CMakeLists.txt
@@ -1,6 +1,6 @@
 
 # The minimum required CMake version:
-cmake_minimum_required( VERSION 3.2 FATAL_ERROR )
+cmake_minimum_required( VERSION 3.6 )
 
 # Read in the project's version from a file called version.txt. But let it be
 # overridden from the command line if necessary.
@@ -33,7 +33,7 @@ foreach( _external ${_externals} )
    include( ${_external} )
    get_filename_component( _extName ${_external} NAME_WE )
    string( TOUPPER ${_extName} _extNameUpper )
-   message( STATUS "Taking ${_extName} from: ${${_extNameUpper}_ROOT}" )
+   message( STATUS "Taking ${_extName} from: ${${_extNameUpper}_LCGROOT}" )
    unset( _extName )
    unset( _extNameUpper )
 endforeach()
@@ -45,7 +45,7 @@ atlas_ctest_setup()
 
 # Declare project name and version
 atlas_project( AthSimulation ${ATHSIMULATION_PROJECT_VERSION}
-   USE AthSimulationExternals 0.0.1
+   USE AthSimulationExternals ${AthSimulationExternals_VERSION}
    PROJECT_ROOT ${CMAKE_SOURCE_DIR}/../../
    FORTRAN )
 
diff --git a/Projects/AthSimulation/PostConfig.cmake.in b/Projects/AthSimulation/PostConfig.cmake.in
index 6a201c5346f60ee4fc64c726dbcfd38da47a4f0c..f6a306b369d5a676079d409a6646c71fb2b03e0e 100644
--- a/Projects/AthSimulation/PostConfig.cmake.in
+++ b/Projects/AthSimulation/PostConfig.cmake.in
@@ -4,7 +4,11 @@
 #
 
 # Find Gaudi:
-find_package( Gaudi REQUIRED )
+if( AthSimulation_FIND_QUIETLY )
+   find_package( Gaudi REQUIRED QUIET )
+else()
+   find_package( Gaudi REQUIRED )
+endif()
 
 # Temporarily setting additional compile flags here:
 add_definitions( -DSIMULATIONBASE )
@@ -21,7 +25,7 @@ foreach( _external ${_externals} )
    get_filename_component( _extName ${_external} NAME_WE )
    string( TOUPPER ${_extName} _extNameUpper )
    if( NOT AthSimulation_FIND_QUIETLY )
-      message( STATUS "Taking ${_extName} from: ${${_extNameUpper}_ROOT}" )
+      message( STATUS "Taking ${_extName} from: ${${_extNameUpper}_LCGROOT}" )
    endif()
    unset( _extName )
    unset( _extNameUpper )
diff --git a/Projects/AthSimulation/externals.txt b/Projects/AthSimulation/externals.txt
index a0bf3b54617b47908d38dd8e14a6684c42b6e9b5..18c99554427fbd96d600d086fa0b22cba4ca9366 100644
--- a/Projects/AthSimulation/externals.txt
+++ b/Projects/AthSimulation/externals.txt
@@ -6,7 +6,7 @@
 # forbidden.
 
 # The version of atlas/atlasexternals to use:
-AthSimulationExternalsVersion = 2.0.20
+AthSimulationExternalsVersion = 2.0.21
 
 # The version of atlas/Gaudi to use:
 GaudiVersion = v31r0.001
diff --git a/Projects/AthSimulation/externals/HEPUtils.cmake b/Projects/AthSimulation/externals/HEPUtils.cmake
index f16c2e48e92c56530f74d9e87b43b7109d860a3e..27acb546c018a84bbefb77daf190b94a47cde026 100644
--- a/Projects/AthSimulation/externals/HEPUtils.cmake
+++ b/Projects/AthSimulation/externals/HEPUtils.cmake
@@ -2,6 +2,6 @@
 # File specifying the location of HEPUtils to use.
 #
 
-set( HEPUTILS_VERSION 1.1.0 )
-set( HEPUTILS_ROOT
-   ${LCG_RELEASE_DIR}/MCGenerators/heputils/${HEPUTILS_VERSION}/${LCG_PLATFORM} )
+set( HEPUTILS_LCGVERSION 1.1.0 )
+set( HEPUTILS_LCGROOT
+   ${LCG_RELEASE_DIR}/MCGenerators/heputils/${HEPUTILS_LCGVERSION}/${LCG_PLATFORM} )
diff --git a/Projects/AthSimulation/externals/MCUtils.cmake b/Projects/AthSimulation/externals/MCUtils.cmake
index 86c3b4c6653d3be9ae848ca9754d00de40ff0e64..f9b41cbffd2eff6f01b2cba597def942b275d18e 100644
--- a/Projects/AthSimulation/externals/MCUtils.cmake
+++ b/Projects/AthSimulation/externals/MCUtils.cmake
@@ -2,6 +2,6 @@
 # File specifying the location of MCUtils to use.
 #
 
-set( MCUTILS_VERSION 1.3.2 )
-set( MCUTILS_ROOT
-   ${LCG_RELEASE_DIR}/MCGenerators/mcutils/${MCUTILS_VERSION}/${LCG_PLATFORM} )
+set( MCUTILS_LCGVERSION 1.3.2 )
+set( MCUTILS_LCGROOT
+   ${LCG_RELEASE_DIR}/MCGenerators/mcutils/${MCUTILS_LCGVERSION}/${LCG_PLATFORM} )
diff --git a/Projects/AthSimulation/externals/README.md b/Projects/AthSimulation/externals/README.md
index fefec01c5dd69345aaed504db51b2499744f3e1e..410c717ff11283b6947403d0736b116ed4e89c50 100644
--- a/Projects/AthSimulation/externals/README.md
+++ b/Projects/AthSimulation/externals/README.md
@@ -12,9 +12,9 @@ the external in question.
 The files should define all the variables expected by the Find<Bla> modules,
 which normally boil down to variables:
 
-`EXTNAME_ROOT`
-`EXTNAME_VERSION`
+  - `EXTNAME_LCGROOT`
+  - `EXTNAME_LCGVERSION`
 
-But some modules may require other variables. In which case the `_ROOT`
+But some modules may require other variables. In which case the `_LCGROOT`
 variable should still be set, to get a nice printout from the Athena
 project during the build about the location of the used external.
diff --git a/Projects/AthSimulation/externals/YODA.cmake b/Projects/AthSimulation/externals/YODA.cmake
index 9d7213d9cd010538e07fc581667dae8ffc240a48..9aae31a0fe1633ec3d5e971a1bfeddea96d93c42 100644
--- a/Projects/AthSimulation/externals/YODA.cmake
+++ b/Projects/AthSimulation/externals/YODA.cmake
@@ -2,6 +2,6 @@
 # File specifying the location of YODA to use.
 #
 
-set( YODA_VERSION 1.6.6 )
-set( YODA_ROOT
-   ${LCG_RELEASE_DIR}/MCGenerators/yoda/${YODA_VERSION}/${LCG_PLATFORM} )
+set( YODA_LCGVERSION 1.6.6 )
+set( YODA_LCGROOT
+   ${LCG_RELEASE_DIR}/MCGenerators/yoda/${YODA_LCGVERSION}/${LCG_PLATFORM} )
diff --git a/Projects/Athena/CMakeLists.txt b/Projects/Athena/CMakeLists.txt
index f92e3b2516b8fc164e939173f565b83006567c27..e930cb3d5407f3ff8cda87112a30bc57a63dc06c 100644
--- a/Projects/Athena/CMakeLists.txt
+++ b/Projects/Athena/CMakeLists.txt
@@ -1,5 +1,6 @@
+
 # The minimum required CMake version:
-cmake_minimum_required( VERSION 3.2 FATAL_ERROR )
+cmake_minimum_required( VERSION 3.6 )
 
 # Read in the project's version from a file called version.txt. But let it be
 # overridden from the command line if necessary.
@@ -16,26 +17,37 @@ if( NOT LCG_NIGHTLY )
        message( STATUS "Using LCG_NIGHTLY: ${LCG_NIGHTLY}" )
    endif()
 endif()
- 
+
 # Set the versions of the TDAQ externals to pick up for the build:
 if( LCG_NIGHTLY )
     # TDAQ_RELEASE_BASE should be set to a NIGHTLY TDAQ build!
-    set( TDAQ-COMMON_VERSION "99-00-00" )
-    set( DQM-COMMON_VERSION "99-00-00" )
-    set( TDAQ_VERSION "99-00-00" )
+    set( TDAQ-COMMON_VERSION "99-00-00" CACHE STRING
+       "The version of tdaq-common to use for the build" )
+    set( DQM-COMMON_VERSION "99-00-00" CACHE STRING
+       "The version of dqm-common to use for the build" )
+    set( TDAQ_VERSION "99-00-00" CACHE STRING
+       "The version of tdaq to use for the build" )
 else()
-    set( TDAQ-COMMON_VERSION "02-09-00" )
-    set( DQM-COMMON_VERSION "01-09-00" )
-    set( TDAQ_VERSION "08-01-01" )
+    set( TDAQ-COMMON_VERSION "02-09-00" CACHE STRING
+       "The version of tdaq-common to use for the build" )
+    set( DQM-COMMON_VERSION "01-09-00" CACHE STRING
+       "The version of dqm-common to use for the build" )
+    set( TDAQ_VERSION "08-01-01" CACHE STRING
+       "The version of tdaq to use for the build" )
 endif()
 
-set( TDAQ-COMMON_ROOT
-   "$ENV{TDAQ_RELEASE_BASE}/tdaq-common/tdaq-common-${TDAQ-COMMON_VERSION}" )
-set( DQM-COMMON_ROOT
-   "$ENV{TDAQ_RELEASE_BASE}/dqm-common/dqm-common-${DQM-COMMON_VERSION}" )
-set( TDAQ_PROJECT_NAME "tdaq")
-set( TDAQ_ROOT
-   "$ENV{TDAQ_RELEASE_BASE}/${TDAQ_PROJECT_NAME}/${TDAQ_PROJECT_NAME}-${TDAQ_VERSION}" )
+set( TDAQ-COMMON_ATROOT
+   "$ENV{TDAQ_RELEASE_BASE}/tdaq-common/tdaq-common-${TDAQ-COMMON_VERSION}"
+   CACHE PATH "The directory to pick up tdaq-common from" )
+set( DQM-COMMON_ATROOT
+   "$ENV{TDAQ_RELEASE_BASE}/dqm-common/dqm-common-${DQM-COMMON_VERSION}"
+   CACHE PATH "The directory to pick up dqm-common from" )
+set( TDAQ_PROJECT_NAME "tdaq" CACHE STRING "The name of the tdaq project" )
+set( TDAQ_ATROOT
+   "$ENV{TDAQ_RELEASE_BASE}/${TDAQ_PROJECT_NAME}/${TDAQ_PROJECT_NAME}-${TDAQ_VERSION}"
+   CACHE PATH "The directory to pick up tdaq from" )
+mark_as_advanced( TDAQ-COMMON_ATROOT DQM-COMMON_ATROOT TDAQ_PROJECT_NAME
+   TDAQ_ATROOT )
 
 # Find the ATLAS CMake code:
 find_package( AtlasCMake QUIET )
@@ -54,7 +66,7 @@ foreach( _external ${_externals} )
    include( ${_external} )
    get_filename_component( _extName ${_external} NAME_WE )
    string( TOUPPER ${_extName} _extNameUpper )
-   message( STATUS "Taking ${_extName} from: ${${_extNameUpper}_ROOT}" )
+   message( STATUS "Taking ${_extName} from: ${${_extNameUpper}_LCGROOT}" )
    unset( _extName )
    unset( _extNameUpper )
 endforeach()
@@ -66,7 +78,7 @@ atlas_ctest_setup()
 
 # Declare project name and version
 atlas_project( Athena ${ATHENA_PROJECT_VERSION}
-   USE AthenaExternals 0.0.1
+   USE AthenaExternals ${AthenaExternals_VERSION}
    PROJECT_ROOT ${CMAKE_SOURCE_DIR}/../../
    FORTRAN )
 
@@ -96,19 +108,19 @@ install( FILES ${CMAKE_BINARY_DIR}/env_setup_install.sh
 
 # Configure and install the post-configuration file:
 string( REPLACE "$ENV{TDAQ_RELEASE_BASE}" "\$ENV{TDAQ_RELEASE_BASE}"
-   TDAQ-COMMON_ROOT "${TDAQ-COMMON_ROOT}" )
+   TDAQ-COMMON_ATROOT "${TDAQ-COMMON_ATROOT}" )
 string( REPLACE "${TDAQ-COMMON_VERSION}" "\${TDAQ-COMMON_VERSION}"
-   TDAQ-COMMON_ROOT "${TDAQ-COMMON_ROOT}" )
+   TDAQ-COMMON_ATROOT "${TDAQ-COMMON_ATROOT}" )
 string( REPLACE "$ENV{TDAQ_RELEASE_BASE}" "\$ENV{TDAQ_RELEASE_BASE}"
-   DQM-COMMON_ROOT "${DQM-COMMON_ROOT}" )
+   DQM-COMMON_ATROOT "${DQM-COMMON_ATROOT}" )
 string( REPLACE "${DQM-COMMON_VERSION}" "\${DQM-COMMON_VERSION}"
-   DQM-COMMON_ROOT "${DQM-COMMON_ROOT}" )
+   DQM-COMMON_ATROOT "${DQM-COMMON_ATROOT}" )
 
 # Temporarily add tdaq dependency to Athena build:
 string( REPLACE "$ENV{TDAQ_RELEASE_BASE}" "\$ENV{TDAQ_RELEASE_BASE}"
-   TDAQ_ROOT "${TDAQ_ROOT}" )
+   TDAQ_ATROOT "${TDAQ_ATROOT}" )
 string( REPLACE "${TDAQ_VERSION}" "\${TDAQ_VERSION}"
-   TDAQ_ROOT "${TDAQ_ROOT}" )
+   TDAQ_ATROOT "${TDAQ_ATROOT}" )
 
 configure_file( ${CMAKE_SOURCE_DIR}/PostConfig.cmake.in
    ${CMAKE_BINARY_DIR}/PostConfig.cmake @ONLY )
diff --git a/Projects/Athena/PostConfig.cmake.in b/Projects/Athena/PostConfig.cmake.in
index 3e372f98e1665622c8f95cf193b4416125d76fb1..1140a49ce202d80d35a735ae775c137671e90a75 100644
--- a/Projects/Athena/PostConfig.cmake.in
+++ b/Projects/Athena/PostConfig.cmake.in
@@ -4,18 +4,29 @@
 #
 
 # Set the versions of the TDAQ projects:
+set( TDAQ_PROJECT_NAME "@TDAQ_PROJECT_NAME@" CACHE STRING
+   "Name of the tdaq project" )
+set( TDAQ_VERSION "@TDAQ_VERSION@" CACHE STRING
+   "The version of tdaq to use for the build" ) 
+set( TDAQ_ATROOT "@TDAQ_ATROOT@" CACHE PATH
+   "The directory to pick up tdaq from" )
 
-set( TDAQ_VERSION "@TDAQ_VERSION@" ) 
-set( TDAQ_ROOT "@TDAQ_ROOT@" )
+set( TDAQ-COMMON_VERSION "@TDAQ-COMMON_VERSION@" CACHE STRING
+   "The version of tdaq-common to use for the build" )
+set( TDAQ-COMMON_ATROOT "@TDAQ-COMMON_ATROOT@" CACHE PATH
+   "The directory to pick up tdaq-common from" )
 
-set( TDAQ-COMMON_VERSION "@TDAQ-COMMON_VERSION@" )
-set( TDAQ-COMMON_ROOT "@TDAQ-COMMON_ROOT@" )
-
-set( DQM-COMMON_VERSION "@DQM-COMMON_VERSION@" )
-set( DQM-COMMON_ROOT "@DQM-COMMON_ROOT@" )
+set( DQM-COMMON_VERSION "@DQM-COMMON_VERSION@" CACHE STRING
+   "The version of dqm-common to use for the build" )
+set( DQM-COMMON_ATROOT "@DQM-COMMON_ATROOT@" CACHE PATH
+   "The directory to pick up dqm-common from" )
 
 # Find Gaudi:
-find_package( Gaudi REQUIRED )
+if( Athena_FIND_QUIETLY )
+   find_package( Gaudi REQUIRED QUIET )
+else()
+   find_package( Gaudi REQUIRED )
+endif()
 
 # Load all the files from the externals/ subdirectory:
 get_filename_component( _thisdir ${CMAKE_CURRENT_LIST_FILE} PATH )
@@ -26,7 +37,7 @@ foreach( _external ${_externals} )
    get_filename_component( _extName ${_external} NAME_WE )
    string( TOUPPER ${_extName} _extNameUpper )
    if( NOT Athena_FIND_QUIETLY )
-      message( STATUS "Taking ${_extName} from: ${${_extNameUpper}_ROOT}" )
+      message( STATUS "Taking ${_extName} from: ${${_extNameUpper}_LCGROOT}" )
    endif()
    unset( _extName )
    unset( _extNameUpper )
diff --git a/Projects/Athena/externals.txt b/Projects/Athena/externals.txt
index b2ff34243dffdd290feff852378824e76ba7acfb..389ed070ccb13a8b432cb95ea98201c7ac43ed45 100644
--- a/Projects/Athena/externals.txt
+++ b/Projects/Athena/externals.txt
@@ -6,7 +6,7 @@
 # forbidden.
 
 # The version of atlas/atlasexternals to use:
-AthenaExternalsVersion = 2.0.20
+AthenaExternalsVersion = 2.0.21
 
 # The version of atlas/Gaudi to use:
 GaudiVersion = v31r0.001
diff --git a/Projects/Athena/externals/Crmc.cmake b/Projects/Athena/externals/Crmc.cmake
index 25c348f2ac3ff8bc595ba979ab0d34a82b2c7abd..a7d9d68fe02d184eb226fa572a888fbdbd1fa9b3 100644
--- a/Projects/Athena/externals/Crmc.cmake
+++ b/Projects/Athena/externals/Crmc.cmake
@@ -2,6 +2,6 @@
 # File specifying the location of Crmc to use.
 #
 
-set( CRMC_VERSION 1.5.4 )
-set( CRMC_ROOT
-   ${LCG_RELEASE_DIR}/MCGenerators/crmc/${CRMC_VERSION}/${LCG_PLATFORM} )
+set( CRMC_LCGVERSION 1.5.4 )
+set( CRMC_LCGROOT
+   ${LCG_RELEASE_DIR}/MCGenerators/crmc/${CRMC_LCGVERSION}/${LCG_PLATFORM} )
diff --git a/Projects/Athena/externals/EvtGen.cmake b/Projects/Athena/externals/EvtGen.cmake
index 5e867d801b1ee177d32ed3e533420223b94d5138..b6b2c0a3ec1c49804836fc840bd70edd7fc02666 100644
--- a/Projects/Athena/externals/EvtGen.cmake
+++ b/Projects/Athena/externals/EvtGen.cmake
@@ -2,6 +2,6 @@
 # File specifying the location of EvtGen to use.
 #
 
-set( EVTGEN_VERSION 1.6.0 )
-set( EVTGEN_ROOT
-   ${LCG_RELEASE_DIR}/MCGenerators/evtgen/${EVTGEN_VERSION}/${LCG_PLATFORM} )
+set( EVTGEN_LCGVERSION 1.6.0 )
+set( EVTGEN_LCGROOT
+   ${LCG_RELEASE_DIR}/MCGenerators/evtgen/${EVTGEN_LCGVERSION}/${LCG_PLATFORM} )
diff --git a/Projects/Athena/externals/HEPUtils.cmake b/Projects/Athena/externals/HEPUtils.cmake
index f16c2e48e92c56530f74d9e87b43b7109d860a3e..27acb546c018a84bbefb77daf190b94a47cde026 100644
--- a/Projects/Athena/externals/HEPUtils.cmake
+++ b/Projects/Athena/externals/HEPUtils.cmake
@@ -2,6 +2,6 @@
 # File specifying the location of HEPUtils to use.
 #
 
-set( HEPUTILS_VERSION 1.1.0 )
-set( HEPUTILS_ROOT
-   ${LCG_RELEASE_DIR}/MCGenerators/heputils/${HEPUTILS_VERSION}/${LCG_PLATFORM} )
+set( HEPUTILS_LCGVERSION 1.1.0 )
+set( HEPUTILS_LCGROOT
+   ${LCG_RELEASE_DIR}/MCGenerators/heputils/${HEPUTILS_LCGVERSION}/${LCG_PLATFORM} )
diff --git a/Projects/Athena/externals/Herwig.cmake b/Projects/Athena/externals/Herwig.cmake
index 6edc8f04a192952ea92fa843271592edc8e59578..5b0f25a9dd997512afcba3e585edcf2a0f49a606 100644
--- a/Projects/Athena/externals/Herwig.cmake
+++ b/Projects/Athena/externals/Herwig.cmake
@@ -2,6 +2,6 @@
 # File specifying the location of Herwig to use.
 #
 
-set( HERWIG_VERSION 6.520.2 )
-set( HERWIG_ROOT
-   ${LCG_RELEASE_DIR}/MCGenerators/herwig/${HERWIG_VERSION}/${LCG_PLATFORM} )
+set( HERWIG_LCGVERSION 6.520.2 )
+set( HERWIG_LCGROOT
+   ${LCG_RELEASE_DIR}/MCGenerators/herwig/${HERWIG_LCGVERSION}/${LCG_PLATFORM} )
diff --git a/Projects/Athena/externals/Herwig3.cmake b/Projects/Athena/externals/Herwig3.cmake
index b110df59c09fd0b53990526854738d29ed7801a0..85b274e718d80c99f20cc7dd3855faa8c184f0db 100644
--- a/Projects/Athena/externals/Herwig3.cmake
+++ b/Projects/Athena/externals/Herwig3.cmake
@@ -2,6 +2,6 @@
 # File specifying the location of Herwig3 to use.
 #
 
-set( HERWIG3_VERSION 7.0.4 )
-set( HERWIG3_ROOT
-   ${LCG_RELEASE_DIR}/MCGenerators/herwig++/${HERWIG3_VERSION}/${LCG_PLATFORM} )
+set( HERWIG3_LCGVERSION 7.0.4 )
+set( HERWIG3_LCGROOT
+   ${LCG_RELEASE_DIR}/MCGenerators/herwig++/${HERWIG3_LCGVERSION}/${LCG_PLATFORM} )
diff --git a/Projects/Athena/externals/Hydjet.cmake b/Projects/Athena/externals/Hydjet.cmake
index a0ff58d0dfdf4f429ba464d6d30f1f7e59776080..637f1ac350e446e81fc09b6c3a22246734ddc48b 100644
--- a/Projects/Athena/externals/Hydjet.cmake
+++ b/Projects/Athena/externals/Hydjet.cmake
@@ -2,6 +2,6 @@
 # File specifying the location of Hydjet to use.
 #
 
-set( HYDJET_VERSION 1.6 )
-set( HYDJET_ROOT
-   ${LCG_RELEASE_DIR}/MCGenerators/hydjet/${HYDJET_VERSION}/${LCG_PLATFORM} )
+set( HYDJET_LCGVERSION 1.6 )
+set( HYDJET_LCGROOT
+   ${LCG_RELEASE_DIR}/MCGenerators/hydjet/${HYDJET_LCGVERSION}/${LCG_PLATFORM} )
diff --git a/Projects/Athena/externals/Lhapdf.cmake b/Projects/Athena/externals/Lhapdf.cmake
index 3eb6fa66064be4ac0d0fbcbbcb5ed590616338f3..11910812fa83aa285cc4dfb09f3b42cf9381f691 100644
--- a/Projects/Athena/externals/Lhapdf.cmake
+++ b/Projects/Athena/externals/Lhapdf.cmake
@@ -2,6 +2,6 @@
 # File specifying the location of Lhapdf to use.
 #
 
-set( LHAPDF_VERSION 6.2.1 )
-set( LHAPDF_ROOT
-   ${LCG_RELEASE_DIR}/MCGenerators/lhapdf/${LHAPDF_VERSION}/${LCG_PLATFORM} )
+set( LHAPDF_LCGVERSION 6.2.1 )
+set( LHAPDF_LCGROOT
+   ${LCG_RELEASE_DIR}/MCGenerators/lhapdf/${LHAPDF_LCGVERSION}/${LCG_PLATFORM} )
diff --git a/Projects/Athena/externals/MCUtils.cmake b/Projects/Athena/externals/MCUtils.cmake
index 86c3b4c6653d3be9ae848ca9754d00de40ff0e64..f9b41cbffd2eff6f01b2cba597def942b275d18e 100644
--- a/Projects/Athena/externals/MCUtils.cmake
+++ b/Projects/Athena/externals/MCUtils.cmake
@@ -2,6 +2,6 @@
 # File specifying the location of MCUtils to use.
 #
 
-set( MCUTILS_VERSION 1.3.2 )
-set( MCUTILS_ROOT
-   ${LCG_RELEASE_DIR}/MCGenerators/mcutils/${MCUTILS_VERSION}/${LCG_PLATFORM} )
+set( MCUTILS_LCGVERSION 1.3.2 )
+set( MCUTILS_LCGROOT
+   ${LCG_RELEASE_DIR}/MCGenerators/mcutils/${MCUTILS_LCGVERSION}/${LCG_PLATFORM} )
diff --git a/Projects/Athena/externals/MadGraph5Amc.cmake b/Projects/Athena/externals/MadGraph5Amc.cmake
index a410e52e444b95018cf3fdcaa1e90304e8e58145..b21334f72a785c478dc2fda21b64e83c1b7ee7c3 100644
--- a/Projects/Athena/externals/MadGraph5Amc.cmake
+++ b/Projects/Athena/externals/MadGraph5Amc.cmake
@@ -2,6 +2,6 @@
 # File specifying the location of MadGraph to use.
 #
 
-set( MADGRAPH5AMC_VERSION 2.6.1.atlas )
-set( MADGRAPH5AMC_ROOT
-   ${LCG_RELEASE_DIR}/MCGenerators/madgraph5amc/${MADGRAPH5AMC_VERSION}/${LCG_PLATFORM} )
+set( MADGRAPH5AMC_LCGVERSION 2.6.1.atlas )
+set( MADGRAPH5AMC_LCGROOT
+   ${LCG_RELEASE_DIR}/MCGenerators/madgraph5amc/${MADGRAPH5AMC_LCGVERSION}/${LCG_PLATFORM} )
diff --git a/Projects/Athena/externals/Photospp.cmake b/Projects/Athena/externals/Photospp.cmake
index 3e6761fdf16174f647ae91fdd04ac5556736eea5..8e0b8c2deae56c516c33438e44d0ce2257191861 100644
--- a/Projects/Athena/externals/Photospp.cmake
+++ b/Projects/Athena/externals/Photospp.cmake
@@ -2,6 +2,6 @@
 # File specifying the location of Photos++ to use.
 #
 
-set( PHOTOSPP_VERSION 3.61 )
-set( PHOTOSPP_ROOT
-   ${LCG_RELEASE_DIR}/MCGenerators/photos++/${PHOTOSPP_VERSION}/${LCG_PLATFORM} )
+set( PHOTOSPP_LCGVERSION 3.61 )
+set( PHOTOSPP_LCGROOT
+   ${LCG_RELEASE_DIR}/MCGenerators/photos++/${PHOTOSPP_LCGVERSION}/${LCG_PLATFORM} )
diff --git a/Projects/Athena/externals/Pythia6.cmake b/Projects/Athena/externals/Pythia6.cmake
index bc6307fb19db2ecab9fdcb5ced868f6be9371240..0531af48046a6a4edc06cb56ebe1554edb69c057 100644
--- a/Projects/Athena/externals/Pythia6.cmake
+++ b/Projects/Athena/externals/Pythia6.cmake
@@ -2,6 +2,6 @@
 # File specifying the location of Pythia 6 to use.
 #
 
-set( PYTHIA6_VERSION 428.2 )
-set( PYTHIA6_ROOT
-   ${LCG_RELEASE_DIR}/MCGenerators/pythia6/${PYTHIA6_VERSION}/${LCG_PLATFORM} )
+set( PYTHIA6_LCGVERSION 428.2 )
+set( PYTHIA6_LCGROOT
+   ${LCG_RELEASE_DIR}/MCGenerators/pythia6/${PYTHIA6_LCGVERSION}/${LCG_PLATFORM} )
diff --git a/Projects/Athena/externals/Pythia8.cmake b/Projects/Athena/externals/Pythia8.cmake
index c4482eec04f8c3fed0c030c2e88ae49b98795b52..1e58aa7b7c47b0c62cb290608239e61a2e12821f 100644
--- a/Projects/Athena/externals/Pythia8.cmake
+++ b/Projects/Athena/externals/Pythia8.cmake
@@ -2,7 +2,6 @@
 # File specifying the location of Pythia 8 to use.
 #
 
-set( PYTHIA8_VERSION 219.pdf6plugin )
-
-set( PYTHIA8_ROOT
-   ${LCG_RELEASE_DIR}/MCGenerators/pythia8/${PYTHIA8_VERSION}/${LCG_PLATFORM} )
+set( PYTHIA8_LCGVERSION 219.pdf6plugin )
+set( PYTHIA8_LCGROOT
+   ${LCG_RELEASE_DIR}/MCGenerators/pythia8/${PYTHIA8_LCGVERSION}/${LCG_PLATFORM} )
diff --git a/Projects/Athena/externals/README.md b/Projects/Athena/externals/README.md
index fefec01c5dd69345aaed504db51b2499744f3e1e..410c717ff11283b6947403d0736b116ed4e89c50 100644
--- a/Projects/Athena/externals/README.md
+++ b/Projects/Athena/externals/README.md
@@ -12,9 +12,9 @@ the external in question.
 The files should define all the variables expected by the Find<Bla> modules,
 which normally boil down to variables:
 
-`EXTNAME_ROOT`
-`EXTNAME_VERSION`
+  - `EXTNAME_LCGROOT`
+  - `EXTNAME_LCGVERSION`
 
-But some modules may require other variables. In which case the `_ROOT`
+But some modules may require other variables. In which case the `_LCGROOT`
 variable should still be set, to get a nice printout from the Athena
 project during the build about the location of the used external.
diff --git a/Projects/Athena/externals/Rivet.cmake b/Projects/Athena/externals/Rivet.cmake
index 6ef04ba05c8d054f320b60be3ab25adb4663cc2f..b42b8058bd6ee60114681df62f20403bdce2c33a 100644
--- a/Projects/Athena/externals/Rivet.cmake
+++ b/Projects/Athena/externals/Rivet.cmake
@@ -2,6 +2,6 @@
 # File specifying the location of Rivet to use.
 #
 
-set( RIVET_VERSION 2.6.0 )
-set( RIVET_ROOT
-   ${LCG_RELEASE_DIR}/MCGenerators/rivet/${RIVET_VERSION}/${LCG_PLATFORM} )
+set( RIVET_LCGVERSION 2.6.0 )
+set( RIVET_LCGROOT
+   ${LCG_RELEASE_DIR}/MCGenerators/rivet/${RIVET_LCGVERSION}/${LCG_PLATFORM} )
diff --git a/Projects/Athena/externals/Sherpa.cmake b/Projects/Athena/externals/Sherpa.cmake
index 1a89135be3b911e601e82aa5414dfc3f13bea21b..3ea89cce7b1d824cb361c3c5227e123b15dda021 100644
--- a/Projects/Athena/externals/Sherpa.cmake
+++ b/Projects/Athena/externals/Sherpa.cmake
@@ -2,6 +2,6 @@
 # File specifying the location of Sherpa to use.
 #
 
-set( SHERPA_VERSION 2.2.5 )
-set( SHERPA_ROOT
-   ${LCG_RELEASE_DIR}/MCGenerators/sherpa/${SHERPA_VERSION}/${LCG_PLATFORM} )
+set( SHERPA_LCGVERSION 2.2.5 )
+set( SHERPA_LCGROOT
+   ${LCG_RELEASE_DIR}/MCGenerators/sherpa/${SHERPA_LCGVERSION}/${LCG_PLATFORM} )
diff --git a/Projects/Athena/externals/Starlight.cmake b/Projects/Athena/externals/Starlight.cmake
index 4ac46cb1bd74e3f76e7e96c7c3605fe2c8fe82b2..614bc44908dab0ae5638acdea3d4c38f14b0e4e7 100644
--- a/Projects/Athena/externals/Starlight.cmake
+++ b/Projects/Athena/externals/Starlight.cmake
@@ -2,6 +2,6 @@
 # File specifying the location of Starlight to use.
 #
 
-set( STARLIGHT_VERSION r193 )
-set( STARLIGHT_ROOT
-   ${LCG_RELEASE_DIR}/MCGenerators/starlight/${STARLIGHT_VERSION}/${LCG_PLATFORM} )
+set( STARLIGHT_LCGVERSION r193 )
+set( STARLIGHT_LCGROOT
+   ${LCG_RELEASE_DIR}/MCGenerators/starlight/${STARLIGHT_LCGVERSION}/${LCG_PLATFORM} )
diff --git a/Projects/Athena/externals/Tauolapp.cmake b/Projects/Athena/externals/Tauolapp.cmake
index f7ccd72db65ffb778a2c5ab1e8428f13711cb1f4..375c6944f2a508160192f49f9f816570e11746cf 100644
--- a/Projects/Athena/externals/Tauolapp.cmake
+++ b/Projects/Athena/externals/Tauolapp.cmake
@@ -2,6 +2,6 @@
 # File specifying the location of Tauola++ to use.
 #
 
-set( TAUOLAPP_VERSION 1.1.6 )
-set( TAUOLAPP_ROOT
-   ${LCG_RELEASE_DIR}/MCGenerators/tauola++/${TAUOLAPP_VERSION}/${LCG_PLATFORM} )
+set( TAUOLAPP_LCGVERSION 1.1.6 )
+set( TAUOLAPP_LCGROOT
+   ${LCG_RELEASE_DIR}/MCGenerators/tauola++/${TAUOLAPP_LCGVERSION}/${LCG_PLATFORM} )
diff --git a/Projects/Athena/externals/ThePEG.cmake b/Projects/Athena/externals/ThePEG.cmake
index 08e607dcb69f8a0abecc761d3216885664652b71..d4739d0012fee887f240c06720e752307d39f90c 100644
--- a/Projects/Athena/externals/ThePEG.cmake
+++ b/Projects/Athena/externals/ThePEG.cmake
@@ -2,6 +2,6 @@
 # File specifying the location of ThePEG to use.
 #
 
-set( THEPEG_VERSION 2.0.4 )
-set( THEPEG_ROOT
-   ${LCG_RELEASE_DIR}/MCGenerators/thepeg/${THEPEG_VERSION}/${LCG_PLATFORM} )
+set( THEPEG_LCGVERSION 2.0.4 )
+set( THEPEG_LCGROOT
+   ${LCG_RELEASE_DIR}/MCGenerators/thepeg/${THEPEG_LCGVERSION}/${LCG_PLATFORM} )
diff --git a/Projects/Athena/externals/YODA.cmake b/Projects/Athena/externals/YODA.cmake
index 5c4f7b407c391d984605c9a8f2b51e9cc25252f3..bc0106b3654d6ef953b5f663ad28def43ae8e8d7 100644
--- a/Projects/Athena/externals/YODA.cmake
+++ b/Projects/Athena/externals/YODA.cmake
@@ -2,6 +2,6 @@
 # File specifying the location of YODA to use.
 #
 
-set( YODA_VERSION 1.7.0 )
-set( YODA_ROOT
-   ${LCG_RELEASE_DIR}/MCGenerators/yoda/${YODA_VERSION}/${LCG_PLATFORM} )
+set( YODA_LCGVERSION 1.7.0 )
+set( YODA_LCGROOT
+   ${LCG_RELEASE_DIR}/MCGenerators/yoda/${YODA_LCGVERSION}/${LCG_PLATFORM} )
diff --git a/Reconstruction/DiTauRec/DiTauRec/CellFinder.h b/Reconstruction/DiTauRec/DiTauRec/CellFinder.h
index 31b0c43cc689e1a43085bbdd23a61e4d2aa74d5a..c6cf526005acfad4cce103fbcdab73eb5a27d31c 100644
--- a/Reconstruction/DiTauRec/DiTauRec/CellFinder.h
+++ b/Reconstruction/DiTauRec/DiTauRec/CellFinder.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef DITAUREC_CELLFINDER_H
@@ -25,14 +25,13 @@ public:
  //-------------------------------------------------------------
  virtual ~CellFinder();
 
- virtual StatusCode initialize();
+ virtual StatusCode initialize() override;
 
- virtual StatusCode execute(DiTauCandidateData * data);
+ virtual StatusCode execute(DiTauCandidateData * data,
+                            const EventContext& ctx) const override;
 
- virtual StatusCode eventFinalize(DiTauCandidateData *data);
 
-
- virtual void cleanup(DiTauCandidateData *) { }
+ virtual void cleanup(DiTauCandidateData *) override { }
  
 
 private:
diff --git a/Reconstruction/DiTauRec/DiTauRec/DiTauBuilder.h b/Reconstruction/DiTauRec/DiTauRec/DiTauBuilder.h
index b251aa67a6666adb8fd0630b6b73e35687f65772..f0081719297d96ae0c8f881250f4d0905ec2c8e0 100644
--- a/Reconstruction/DiTauRec/DiTauRec/DiTauBuilder.h
+++ b/Reconstruction/DiTauRec/DiTauRec/DiTauBuilder.h
@@ -1,30 +1,37 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef DITAUREC_DITAUBUILDER_H
 #define DITAUREC_DITAUBUILDER_H 1
 
-#include "AthenaBaseComps/AthAlgorithm.h"
+#include "AthenaBaseComps/AthReentrantAlgorithm.h"
 #include "AthenaBaseComps/AthAlgTool.h"
+#include "StoreGate/WriteHandleKey.h"
+#include "StoreGate/ReadHandleKey.h"
+#include "xAODTau/DiTauJetContainer.h"
+#include "xAODJet/JetContainer.h"
 
 #include "DiTauToolBase.h"
 #include "GaudiKernel/ToolHandle.h"
 
 
-class DiTauBuilder: public ::AthAlgorithm { 
+class DiTauBuilder: public ::AthReentrantAlgorithm { 
 	public: 
 		DiTauBuilder( const std::string& name, ISvcLocator* pSvcLocator );
 		virtual ~DiTauBuilder(); 
 
-		virtual StatusCode  initialize();
-		virtual StatusCode  execute();
-		virtual StatusCode  finalize();
+		virtual StatusCode  initialize() override;
+		virtual StatusCode  execute(const EventContext&) const override;
+		virtual StatusCode  finalize() override;
 
 	private: 
-		std::string m_diTauContainerName;  // ditau output container name
-		std::string m_diTauAuxContainerName;  // ditau output aux container name
-		std::string m_seedJetName;  // name for seed jet collection name
+                // ditau output container name
+                SG::WriteHandleKey<xAOD::DiTauJetContainer> m_diTauContainerName
+                { this, "DiTauContainer", "DiTauJets", "" };
+                // name for seed jet collection name
+                SG::ReadHandleKey<xAOD::JetContainer> m_seedJetName
+                { this, "SeedJetName", "AntiKt10LCTopoJets", "" };
 		float m_minPt;  // minimal jet seed pt
 		float m_maxEta;  // maximal jet seed eta
 		float m_Rjet;   // jet radius
diff --git a/Reconstruction/DiTauRec/DiTauRec/DiTauToolBase.h b/Reconstruction/DiTauRec/DiTauRec/DiTauToolBase.h
index cc88c1f763027867cd0a96b11666b4f50bc099d6..f437d9d683d47753bfec7f3f327596e68980f913 100644
--- a/Reconstruction/DiTauRec/DiTauRec/DiTauToolBase.h
+++ b/Reconstruction/DiTauRec/DiTauRec/DiTauToolBase.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TOOLBASE_DITAU_H
@@ -42,18 +42,14 @@
          //-----------------------------------------------------------------
          //! Execute - called for each Ditau candidate
          //-----------------------------------------------------------------
-         virtual StatusCode execute( DiTauCandidateData *data );
+         virtual StatusCode execute( DiTauCandidateData *data,
+                                     const EventContext& ctx) const;
  
          //-----------------------------------------------------------------
          //! Cleanup - called for each Ditau rejected candidate
          //-----------------------------------------------------------------
          virtual void cleanup( DiTauCandidateData *data );
  
-         //-----------------------------------------------------------------
-         //! Event finalizer - called at the end of each event
-         //-----------------------------------------------------------------
-         virtual StatusCode eventFinalize( DiTauCandidateData *data );
- 
          //-----------------------------------------------------------------
          //! Finalizer
          //-----------------------------------------------------------------
@@ -70,4 +66,4 @@
  
  };
  
- #endif // TOOLBASE_DITAU_H
\ No newline at end of file
+ #endif // TOOLBASE_DITAU_H
diff --git a/Reconstruction/DiTauRec/DiTauRec/DiTauTrackFinder.h b/Reconstruction/DiTauRec/DiTauRec/DiTauTrackFinder.h
index 4c6f7043f473c3bf1004a43db21150d667750d92..5d1dc38ee558d8ad7e06022894cf5c42129484ea 100644
--- a/Reconstruction/DiTauRec/DiTauRec/DiTauTrackFinder.h
+++ b/Reconstruction/DiTauRec/DiTauRec/DiTauTrackFinder.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef DITAUREC_TRACKFINDER_H
@@ -8,6 +8,7 @@
 #include "DiTauToolBase.h"
 
 #include "GaudiKernel/ToolHandle.h"
+#include "StoreGate/ReadHandleKey.h"
 
 #include "xAODTracking/Vertex.h"
 #include "xAODTracking/TrackParticle.h"
@@ -31,12 +32,10 @@ public:
  //-------------------------------------------------------------
  virtual ~DiTauTrackFinder();
 
- virtual StatusCode initialize();
-
- virtual StatusCode execute(DiTauCandidateData * data);
-
- virtual StatusCode eventFinalize(DiTauCandidateData *data);
+ virtual StatusCode initialize() override;
 
+ virtual StatusCode execute(DiTauCandidateData * data,
+                            const EventContext& ctx) const override;
 
  virtual void cleanup(DiTauCandidateData *) { }
  
@@ -55,11 +54,11 @@ public:
                        const xAOD::Vertex*,
                        std::vector<const xAOD::TrackParticle*>&,
                        std::vector<const xAOD::TrackParticle*>&,
-                       std::vector<const xAOD::TrackParticle*>& );
+                       std::vector<const xAOD::TrackParticle*>& ) const;
 
  DiTauTrackType diTauTrackType( const DiTauCandidateData*,
                                 const xAOD::TrackParticle*,
-                                const xAOD::Vertex* );
+                                const xAOD::Vertex* ) const;
 
 
 
@@ -67,7 +66,8 @@ public:
 private:
  float m_MaxDrJet;
  float m_MaxDrSubjet;
- std::string m_TrackParticleContainerName;
+ SG::ReadHandleKey<xAOD::TrackParticleContainer> m_TrackParticleContainerName
+ { this, "TrackParticleContainer", "InDetTrackParticles", "" };
  ToolHandle<Trk::ITrackSelectorTool> m_TrackSelectorTool;
  // ToolHandle< Trk::IParticleCaloExtensionTool > m_ParticleCaloExtensionTool;
 
diff --git a/Reconstruction/DiTauRec/DiTauRec/ElMuFinder.h b/Reconstruction/DiTauRec/DiTauRec/ElMuFinder.h
index b391a8ffba23bb5b9253310dc30b7ccc2222ecd6..e114f613a3cccd99ab0d1b34d8115056326c211e 100644
--- a/Reconstruction/DiTauRec/DiTauRec/ElMuFinder.h
+++ b/Reconstruction/DiTauRec/DiTauRec/ElMuFinder.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef DITAUREC_ELMUFINDER_H
@@ -7,11 +7,14 @@
 
 #include "DiTauToolBase.h"
 
+#include "StoreGate/ReadHandle.h"
 #include "GaudiKernel/ToolHandle.h"
 
 // #include "MuonSelectorTools/IMuonSelectionTool.h"
 // #include "MuonSelectorTools/errorcheck.h"
 #include "MuonSelectorTools/MuonSelectionTool.h"
+#include "xAODEgamma/ElectronContainer.h"
+#include "xAODMuon/MuonContainer.h"
 
 class ElMuFinder : public DiTauToolBase {
 public:
@@ -28,21 +31,21 @@ public:
  //-------------------------------------------------------------
  virtual ~ElMuFinder();
 
- virtual StatusCode initialize();
+ virtual StatusCode initialize() override;
 
- virtual StatusCode execute(DiTauCandidateData * data);
+ virtual StatusCode execute(DiTauCandidateData * data,
+                            const EventContext& ctx) const override;
 
- virtual StatusCode eventFinalize(DiTauCandidateData *data);
-
-
- virtual void cleanup(DiTauCandidateData *) { }
+ virtual void cleanup(DiTauCandidateData *) override { }
  
 
 private:
-  std::string m_elContName;
+  SG::ReadHandleKey<xAOD::ElectronContainer> m_elContName
+  { this, "ElectronContainer", "Electrons", "" };
   float m_elMinPt;
   float m_elMaxEta;
-  std::string m_muContName;
+  SG::ReadHandleKey<xAOD::MuonContainer> m_muContName
+  { this, "MuonContainer", "Muons", "" };
   float m_muMinPt;
   float m_muMaxEta;
   int m_muQual;
diff --git a/Reconstruction/DiTauRec/DiTauRec/IDVarCalculator.h b/Reconstruction/DiTauRec/DiTauRec/IDVarCalculator.h
index 16511d91eaf6a0e7d2defeb3cf0810d7cd9e19fb..2fa83a432a752a8d0021f61951eadb80e24dc68e 100644
--- a/Reconstruction/DiTauRec/DiTauRec/IDVarCalculator.h
+++ b/Reconstruction/DiTauRec/DiTauRec/IDVarCalculator.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef DITAUREC_IDVARCALCULATOR_H
@@ -25,14 +25,12 @@ public:
  //-------------------------------------------------------------
  virtual ~IDVarCalculator();
 
- virtual StatusCode initialize();
+ virtual StatusCode initialize() override;
 
- virtual StatusCode execute(DiTauCandidateData * data);
+ virtual StatusCode execute(DiTauCandidateData * data,
+                            const EventContext& ctx) const override;
 
- virtual StatusCode eventFinalize(DiTauCandidateData *data);
-
-
- virtual void cleanup(DiTauCandidateData *) { }
+ virtual void cleanup(DiTauCandidateData *) override { }
  
 
 private:
diff --git a/Reconstruction/DiTauRec/DiTauRec/SeedJetBuilder.h b/Reconstruction/DiTauRec/DiTauRec/SeedJetBuilder.h
index 96cd09974b9dae26aa8fdab0375e487516593fb9..63ecf9116a72a307b96fa6d4d60ae0d29c6d5743 100644
--- a/Reconstruction/DiTauRec/DiTauRec/SeedJetBuilder.h
+++ b/Reconstruction/DiTauRec/DiTauRec/SeedJetBuilder.h
@@ -1,11 +1,13 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef DITAUREC_SEEDJETBUILDER_H
 #define DITAUREC_SEEDJETBUILDER_H
 
 #include "DiTauToolBase.h"
+#include "xAODJet/JetContainer.h"
+#include "StoreGate/ReadHandle.h"
 
 
 class SeedJetBuilder : public DiTauToolBase {
@@ -23,16 +25,16 @@ public:
  //-------------------------------------------------------------
  virtual ~SeedJetBuilder();
 
- virtual StatusCode initialize();
+ virtual StatusCode initialize() override;
 
- virtual StatusCode execute(DiTauCandidateData * data);
+ virtual StatusCode execute(DiTauCandidateData * data,
+                            const EventContext& ctx) const override;
 
- virtual StatusCode eventFinalize(DiTauCandidateData *data);
-
- virtual void cleanup(DiTauCandidateData *) { }
+ virtual void cleanup(DiTauCandidateData *) override { }
 
 private:
-	std::string m_jetContainerName;
+ SG::ReadHandleKey<xAOD::JetContainer> m_jetContainerName
+ { this, "JetCollection", "AntiKt10LCTopoJets", "" };
 };
 
-#endif  /* SEEDJETBUILDER_H */
\ No newline at end of file
+#endif  /* SEEDJETBUILDER_H */
diff --git a/Reconstruction/DiTauRec/DiTauRec/SubjetBuilder.h b/Reconstruction/DiTauRec/DiTauRec/SubjetBuilder.h
index 9fa6c26aacb5634a0c162d2fa870e96169627d4e..57dc5a27419e9d76ecff67cc7a0bef3661ca2b17 100644
--- a/Reconstruction/DiTauRec/DiTauRec/SubjetBuilder.h
+++ b/Reconstruction/DiTauRec/DiTauRec/SubjetBuilder.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef DITAUREC_SUBJETBUILDER_H
@@ -24,13 +24,12 @@ public:
  //-------------------------------------------------------------
  virtual ~SubjetBuilder();
 
- virtual StatusCode initialize();
+ virtual StatusCode initialize() override;
 
- virtual StatusCode execute(DiTauCandidateData * data);
+ virtual StatusCode execute(DiTauCandidateData * data,
+                            const EventContext& ctx) const override;
 
- virtual StatusCode eventFinalize(DiTauCandidateData *data);
-
- virtual void cleanup(DiTauCandidateData *) { }
+ virtual void cleanup(DiTauCandidateData *) override { }
 
 
 private:
@@ -43,4 +42,4 @@ private:
 
 };
 
-#endif  /* SUBJETBUILDER_H */
\ No newline at end of file
+#endif  /* SUBJETBUILDER_H */
diff --git a/Reconstruction/DiTauRec/DiTauRec/VertexFinder.h b/Reconstruction/DiTauRec/DiTauRec/VertexFinder.h
index 8bf4b0b22c2ca50c4d55ff1f4b50c11714e54bc5..e43b0a0155ca934f7be59601796de8d47267f4be 100644
--- a/Reconstruction/DiTauRec/DiTauRec/VertexFinder.h
+++ b/Reconstruction/DiTauRec/DiTauRec/VertexFinder.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef DITAUREC_VERTEXFINDER_H
@@ -7,6 +7,8 @@
 
 #include "DiTauToolBase.h"
 #include "JetEDM/TrackVertexAssociation.h"
+#include "xAODTracking/VertexContainer.h"
+#include "StoreGate/ReadHandleKey.h"
 
 class VertexFinder : public DiTauToolBase {
 public:
@@ -23,13 +25,14 @@ public:
  //-------------------------------------------------------------
  virtual ~VertexFinder();
 
- virtual StatusCode initialize();
+ virtual StatusCode initialize() override;
 
- virtual StatusCode execute(DiTauCandidateData * data);
+ virtual StatusCode execute(DiTauCandidateData * data,
+                            const EventContext& ctx) const override;
 
- virtual StatusCode eventFinalize(DiTauCandidateData *data);
-
- ElementLink<xAOD::VertexContainer> getPV_TJVA(const xAOD::DiTauJet*, const xAOD::VertexContainer*);
+ ElementLink<xAOD::VertexContainer> getPV_TJVA(const xAOD::DiTauJet*, const xAOD::VertexContainer*,
+                                               float& maxJVF,
+                                               const EventContext& ctx) const;
 
  float getJetVertexFraction(const xAOD::Vertex*, const std::vector<const xAOD::TrackParticle*>&, const jet::TrackVertexAssociation*) const;
 
@@ -37,12 +40,11 @@ public:
 
 
 private:
-	std::string m_primVtxContainerName;
-	std::string m_assocTracksName;
-	std::string m_trackVertexAssocName;
-	float m_maxJVF;
-
-
+ SG::ReadHandleKey<xAOD::VertexContainer> m_primVtxContainerName
+ { this, "PrimVtxContainerName", "PrimaryVertices", "" };
+ std::string m_assocTracksName;
+ SG::ReadHandleKey<jet::TrackVertexAssociation> m_trackVertexAssocName
+ { this, "TrackVertexAssociation", "JetTrackVtxAssoc_forDiTaus", "" };
 };
 
 #endif  /* VERTEXFINDER_H */
diff --git a/Reconstruction/DiTauRec/python/DiTauBuilder.py b/Reconstruction/DiTauRec/python/DiTauBuilder.py
index eba03f923b39b71079269acbdc0c1dc4e45ecfeb..0b3a307eca41b324fa6d671e3beaf109d866064d 100644
--- a/Reconstruction/DiTauRec/python/DiTauBuilder.py
+++ b/Reconstruction/DiTauRec/python/DiTauBuilder.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 
 import os
 
@@ -74,7 +74,6 @@ class DiTauBuilder(Configured):
         DiTauBuilder = DiTauBuilder(
             name=self.name,
             DiTauContainer=_outputKey,
-            DiTauAuxContainer=_outputAuxKey,
             Tools=tools,
             SeedJetName=_jet_container,
             minPt=diTauFlags.diTauRecJetSeedPt(),
diff --git a/Reconstruction/DiTauRec/src/CellFinder.cxx b/Reconstruction/DiTauRec/src/CellFinder.cxx
index 912d0e94cd442efa7f467bedeb6ba4bc58c46f74..67618f55b2cb24c16c0362fbd0077eac6e929664 100644
--- a/Reconstruction/DiTauRec/src/CellFinder.cxx
+++ b/Reconstruction/DiTauRec/src/CellFinder.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 
@@ -56,20 +56,12 @@ StatusCode CellFinder::initialize() {
     return StatusCode::SUCCESS;
 }
 
-//-------------------------------------------------------------------------
-// Event Finalize
-//-------------------------------------------------------------------------
-
-StatusCode CellFinder::eventFinalize(DiTauCandidateData * ) {
-
-    return StatusCode::SUCCESS;
-}
-
 //-------------------------------------------------------------------------
 // execute
 //-------------------------------------------------------------------------
 
-StatusCode CellFinder::execute(DiTauCandidateData * data) {
+StatusCode CellFinder::execute(DiTauCandidateData * data,
+                               const EventContext& /*ctx*/) const {
 
     ATH_MSG_DEBUG("execute CellFinder...");
 
diff --git a/Reconstruction/DiTauRec/src/DiTauBuilder.cxx b/Reconstruction/DiTauRec/src/DiTauBuilder.cxx
index 7a0918ec5f3ffad1f3b789ed57140c55ed642b66..92ee2a0918e6f222dae4ba5f7fb8a76bc6e071c6 100644
--- a/Reconstruction/DiTauRec/src/DiTauBuilder.cxx
+++ b/Reconstruction/DiTauRec/src/DiTauBuilder.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "DiTauRec/DiTauBuilder.h"
@@ -14,13 +14,12 @@
 #include "xAODTau/DiTauJet.h"
 #include "xAODTau/DiTauJetContainer.h"
 #include "xAODTau/DiTauJetAuxContainer.h"
+#include "StoreGate/WriteHandle.h"
+#include "StoreGate/ReadHandle.h"
 
 
 DiTauBuilder::DiTauBuilder( const std::string& name, ISvcLocator* pSvcLocator ) : 
-    AthAlgorithm( name, pSvcLocator ),
-    m_diTauContainerName("DiTauJets"),
-    m_diTauAuxContainerName("DiTauAuxJets."),
-    m_seedJetName("AntiKt10LCTopoJets"),
+    AthReentrantAlgorithm( name, pSvcLocator ),
     m_minPt(10000),
     m_maxEta(2.5),
     m_Rjet(1.0),
@@ -28,9 +27,6 @@ DiTauBuilder::DiTauBuilder( const std::string& name, ISvcLocator* pSvcLocator )
     m_Rcore(0.1),
     m_tools(this)
 {
-    declareProperty("DiTauContainer", m_diTauContainerName);
-    declareProperty("DiTauAuxContainer", m_diTauAuxContainerName);
-    declareProperty("SeedJetName", m_seedJetName);
     declareProperty("minPt", m_minPt);
     declareProperty("maxEta", m_maxEta);
     declareProperty("Rjet", m_Rjet);
@@ -48,7 +44,6 @@ StatusCode DiTauBuilder::initialize() {
     ATH_MSG_INFO ("Initializing " << name() << "...");
 
     // no tools allocated
-    StatusCode sc;
     if (m_tools.size() == 0) {
         ATH_MSG_ERROR("no tools given!");
         return StatusCode::FAILURE;
@@ -63,8 +58,7 @@ StatusCode DiTauBuilder::initialize() {
     unsigned int tool_count = 0;
 
     for (; itT != itTE; ++itT) {
-        sc = itT->retrieve();
-        if (sc.isFailure()) {
+        if (itT->retrieve().isFailure()) {
             ATH_MSG_WARNING("Cannot find tool named <" << *itT << ">");
         } else {
          ++tool_count;
@@ -79,6 +73,8 @@ StatusCode DiTauBuilder::initialize() {
         return StatusCode::FAILURE;
     }
 
+    ATH_CHECK( m_diTauContainerName.initialize() );
+    ATH_CHECK( m_seedJetName.initialize() );
 
     return StatusCode::SUCCESS;
 }
@@ -91,42 +87,22 @@ StatusCode DiTauBuilder::finalize() {
 }
 
 
-StatusCode DiTauBuilder::execute() {  
+StatusCode DiTauBuilder::execute(const EventContext& ctx) const {
     ATH_MSG_DEBUG ("Executing " << name() << "...");
     
-    StatusCode sc;
-
     // ----------------------------------------------------------------------------
     // preparing DiTau Candidate Container and storage in DiTauData
     // ----------------------------------------------------------------------------
     DiTauCandidateData rDiTauData;
 
-    xAOD::DiTauJetContainer* pContainer = 0;
-    xAOD::DiTauJetAuxContainer * pAuxContainer = 0;
-
-    pContainer = new xAOD::DiTauJetContainer();
-    sc = evtStore()->record(pContainer, m_diTauContainerName);
-    if (sc.isFailure()) {
-        ATH_MSG_ERROR("could not record DiTauContainer");
-        delete pContainer;
-        return StatusCode::FAILURE;
-    }
-
-    pAuxContainer = new xAOD::DiTauJetAuxContainer();
-    sc = evtStore()->record(pAuxContainer, m_diTauAuxContainerName);
-    if (sc.isFailure()) {
-        ATH_MSG_ERROR("could not record DiTauAuxContainer");
-        delete pAuxContainer;
-        return StatusCode::FAILURE;
-    }
-
-    pContainer->setStore(pAuxContainer);
-
+    auto pContainer = std::make_unique<xAOD::DiTauJetContainer>();
+    auto pAuxContainer = std::make_unique<xAOD::DiTauJetAuxContainer>();
+    pContainer->setStore(pAuxContainer.get());
 
     // set properties of DiTau Candidate 
     rDiTauData.xAODDiTau = 0;
-    rDiTauData.xAODDiTauContainer = pContainer; //
-    rDiTauData.diTauAuxContainer = pAuxContainer; //
+    rDiTauData.xAODDiTauContainer = pContainer.get(); //
+    rDiTauData.diTauAuxContainer = pAuxContainer.get(); //
     rDiTauData.seed = 0;
     rDiTauData.seedContainer = 0;
 
@@ -134,18 +110,18 @@ StatusCode DiTauBuilder::execute() {
     rDiTauData.Rsubjet = m_Rsubjet;
     rDiTauData.Rcore = m_Rcore;
 
+    SG::WriteHandle<xAOD::DiTauJetContainer> diTauContainerH 
+      (m_diTauContainerName, ctx);
+    ATH_CHECK( diTauContainerH.record (std::move (pContainer),
+                                       std::move (pAuxContainer)) );
+
     // ----------------------------------------------------------------------------
     // retrieve di-tau seed jets and loop over seeds
     // ----------------------------------------------------------------------------
 
-    const xAOD::JetContainer* pSeedContainer;
-    sc = evtStore()->retrieve(pSeedContainer, m_seedJetName);
-    if (sc.isFailure() || !pSeedContainer) {
-        ATH_MSG_FATAL("could not find seed jets with key:" << m_seedJetName);
-        return StatusCode::FAILURE;
-    }
+    SG::ReadHandle<xAOD::JetContainer> pSeedContainer (m_seedJetName, ctx);
 
-    rDiTauData.seedContainer = pSeedContainer;
+    rDiTauData.seedContainer = pSeedContainer.get();
 
     for (const auto* seed: *pSeedContainer) {
         ATH_MSG_DEBUG("Seed pt: "<< seed->pt() << "  eta: "<< seed->eta());
@@ -162,9 +138,9 @@ StatusCode DiTauBuilder::execute() {
         rDiTauData.xAODDiTauContainer->push_back(rDiTauData.xAODDiTau);
 
         // handle di-tau candidate
+        StatusCode sc = StatusCode::SUCCESS;
         for (auto tool: m_tools) {
-            sc = tool->execute(&rDiTauData);
-
+            sc = tool->execute(&rDiTauData, ctx);
             if (sc.isFailure()) break;
         }
 
@@ -180,13 +156,7 @@ StatusCode DiTauBuilder::execute() {
     // // TODO: tool finalizers needed here
     // sc = StatusCode::SUCCESS;
 
-    ATH_MSG_DEBUG("execute tool finializers");
     rDiTauData.xAODDiTau = 0;
-    for (auto tool: m_tools) {
-        sc = tool->eventFinalize(&rDiTauData);
-        if (!sc.isSuccess())
-            return StatusCode::FAILURE;
-    }
 
     ATH_MSG_DEBUG("end execute()");
     return StatusCode::SUCCESS;
diff --git a/Reconstruction/DiTauRec/src/DiTauToolBase.cxx b/Reconstruction/DiTauRec/src/DiTauToolBase.cxx
index 93c929d7e141428ecb07ee91fe368cf9c6c84852..c88521637e4a1aabeef5cd268e187c0df833b74c 100644
--- a/Reconstruction/DiTauRec/src/DiTauToolBase.cxx
+++ b/Reconstruction/DiTauRec/src/DiTauToolBase.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 //-----------------------------------------------------------------------------
@@ -57,7 +57,8 @@
  //-------------------------------------------------------------------------
  // Execute
  //-------------------------------------------------------------------------
- StatusCode DiTauToolBase :: execute( DiTauCandidateData * )
+ StatusCode DiTauToolBase :: execute( DiTauCandidateData *,
+                                      const EventContext& /*ctx*/) const
  {
      return StatusCode :: SUCCESS;
  }
@@ -69,14 +70,6 @@
  {
  }
  
- //-------------------------------------------------------------------------
- // Finalizer
- //-------------------------------------------------------------------------
- StatusCode DiTauToolBase :: eventFinalize( DiTauCandidateData * )
- {
-     return StatusCode :: SUCCESS;
- }
- 
  //-------------------------------------------------------------------------
  // Finalizer
  //-------------------------------------------------------------------------
@@ -107,4 +100,4 @@
          ATH_MSG_VERBOSE("Retrieved tool " << tool);
      }
      return true;
- }
\ No newline at end of file
+ }
diff --git a/Reconstruction/DiTauRec/src/DiTauTrackFinder.cxx b/Reconstruction/DiTauRec/src/DiTauTrackFinder.cxx
index 6c7e05369ac456593268076f3287c26eda866b8c..9eb9b0a1d553a083d6be6df004eb7b7159a007f2 100644
--- a/Reconstruction/DiTauRec/src/DiTauTrackFinder.cxx
+++ b/Reconstruction/DiTauRec/src/DiTauTrackFinder.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 
@@ -17,6 +17,7 @@
 
 #include "tauRecTools/TrackSort.h"
 #include "tauRecTools/KineUtils.h"
+#include "StoreGate/ReadHandle.h"
 
 #include "fastjet/PseudoJet.hh"
 
@@ -31,14 +32,12 @@ DiTauTrackFinder::DiTauTrackFinder(const std::string& type,
     DiTauToolBase(type, name, parent),
     m_MaxDrJet(1.0),
     m_MaxDrSubjet(0.2),
-    m_TrackParticleContainerName("InDetTrackParticles"),
     m_TrackSelectorTool("")
     // m_ParticleCaloExtensionTool("")
 {
     declareInterface<DiTauToolBase > (this);
     declareProperty("MaxDrJet", m_MaxDrJet);
     declareProperty("MaxDrSubjet", m_MaxDrSubjet);
-    declareProperty("TrackParticleContainer", m_TrackParticleContainerName);
     declareProperty("TrackSelectorTool", m_TrackSelectorTool);
     // declareProperty("ParticleCaloExtensionTool", m_ParticleCaloExtensionTool);
 }
@@ -56,33 +55,18 @@ DiTauTrackFinder::~DiTauTrackFinder() {
 
 StatusCode DiTauTrackFinder::initialize() {
 
-    if (m_TrackSelectorTool.retrieve().isFailure()) {
-        ATH_MSG_FATAL("could not retrieve track TrackSelectorTool");
-        return StatusCode::FAILURE;
-    }
-    // if (m_ParticleCaloExtensionTool.retrieve().isFailure()) {
-        // ATH_MSG_FATAL("could not retrieve track ParticleCaloExtensionTool");
-        // return StatusCode::FAILURE;
-    // }
-
-    return StatusCode::SUCCESS;
-}
-
-//-------------------------------------------------------------------------
-// Event Finalize
-//-------------------------------------------------------------------------
-
-StatusCode DiTauTrackFinder::eventFinalize(DiTauCandidateData * ) {
-
-    return StatusCode::SUCCESS;
+  ATH_CHECK( m_TrackSelectorTool.retrieve() );
+  ATH_CHECK( m_TrackParticleContainerName.initialize() );
+  return StatusCode::SUCCESS;
 }
 
 //-------------------------------------------------------------------------
 // execute
 //-------------------------------------------------------------------------
 
-StatusCode DiTauTrackFinder::execute(DiTauCandidateData * data) {
-
+StatusCode DiTauTrackFinder::execute(DiTauCandidateData * data,
+                                     const EventContext& ctx) const
+{
     ATH_MSG_DEBUG("execute DiTauTrackFinder...");
 
     xAOD::DiTauJet *pDiTau = data->xAODDiTau;
@@ -92,15 +76,9 @@ StatusCode DiTauTrackFinder::execute(DiTauCandidateData * data) {
         return StatusCode::FAILURE;
     }
 
-    StatusCode sc;
-
     // retrieve track container
-    const xAOD::TrackParticleContainer* pTrackParticleCont = 0;
-    sc = evtStore()->retrieve(pTrackParticleCont, m_TrackParticleContainerName);
-    if (sc.isFailure() || !pTrackParticleCont) {
-        ATH_MSG_WARNING("could not find seed jets with key:" << m_TrackParticleContainerName);        
-        return StatusCode::FAILURE;
-    }
+    SG::ReadHandle<xAOD::TrackParticleContainer> pTrackParticleCont
+      (m_TrackParticleContainerName, ctx);
 
     std::vector<const xAOD::TrackParticle*> tauTracks;    // good tracks in subjets
     std::vector<const xAOD::TrackParticle*> isoTracks;    // good tracks in isolation region
@@ -117,7 +95,7 @@ StatusCode DiTauTrackFinder::execute(DiTauCandidateData * data) {
     }
 
     // get tracks
-    getTracksFromPV(data, pTrackParticleCont, pVertex, tauTracks, isoTracks, otherTracks);
+    getTracksFromPV(data, pTrackParticleCont.get(), pVertex, tauTracks, isoTracks, otherTracks);
 
     // clear track links before association
     pDiTau->clearTrackLinks();
@@ -164,19 +142,19 @@ StatusCode DiTauTrackFinder::execute(DiTauCandidateData * data) {
     // associate tau tracks
     for (const auto& track : tauTracks ) {
         ATH_MSG_DEBUG("adding subjet track. eta: " << track->eta() << " phi: " << track->phi());
-        pDiTau->addTrack(pTrackParticleCont, track);
+        pDiTau->addTrack(pTrackParticleCont.get(), track);
     }
 
     // associate isolation tracks
     for (const auto& track : isoTracks ) {
         ATH_MSG_DEBUG("adding iso track. eta: " << track->eta() << " phi: " << track->phi());
-        pDiTau->addIsoTrack(pTrackParticleCont, track);
+        pDiTau->addIsoTrack(pTrackParticleCont.get(), track);
     }
 
     // associate other tracks
     for (const auto& track : otherTracks ) {
         ATH_MSG_DEBUG("adding other track. eta: " << track->eta() << " phi: " << track->phi());
-        pDiTau->addOtherTrack(pTrackParticleCont, track);
+        pDiTau->addOtherTrack(pTrackParticleCont.get(), track);
     }
 
 
@@ -189,7 +167,7 @@ void DiTauTrackFinder::getTracksFromPV( const DiTauCandidateData* data,
                                    const xAOD::Vertex* pVertex,
                                    std::vector<const xAOD::TrackParticle*> &tauTracks,
                                    std::vector<const xAOD::TrackParticle*> &isoTracks,
-                                   std::vector<const xAOD::TrackParticle*> &otherTracks) {
+                                   std::vector<const xAOD::TrackParticle*> &otherTracks) const {
     
     for (const auto& track : *pTrackParticleCont ) {
         DiTauTrackType type = diTauTrackType(data, track, pVertex);
@@ -211,7 +189,7 @@ void DiTauTrackFinder::getTracksFromPV( const DiTauCandidateData* data,
 
 DiTauTrackFinder::DiTauTrackType DiTauTrackFinder::diTauTrackType(const DiTauCandidateData* data,
                                                         const xAOD::TrackParticle* track,
-                                                        const xAOD::Vertex* pVertex) {
+                                                        const xAOD::Vertex* pVertex) const {
 
     xAOD::DiTauJet *pDiTau = data->xAODDiTau;
 
diff --git a/Reconstruction/DiTauRec/src/ElMuFinder.cxx b/Reconstruction/DiTauRec/src/ElMuFinder.cxx
index a89833341ebde7fbcecd9ff668e47a1bb705d8d7..94bab9e2304932f2aba8c3a4fb10656dbee9242f 100644
--- a/Reconstruction/DiTauRec/src/ElMuFinder.cxx
+++ b/Reconstruction/DiTauRec/src/ElMuFinder.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2017, 2019 CERN for the benefit of the ATLAS collaboration
 */
 
 
@@ -15,6 +15,8 @@
 #include "MuonSelectorTools/MuonSelectionTool.h"
 
 #include "tauRecTools/KineUtils.h"
+
+#include "StoreGate/ReadHandle.h"
 //-------------------------------------------------------------------------
 // Constructor
 //-------------------------------------------------------------------------
@@ -23,19 +25,15 @@ ElMuFinder::ElMuFinder(const std::string& type,
     const std::string& name,
     const IInterface * parent) :
     DiTauToolBase(type, name, parent),
-    m_elContName("Electrons"),
     m_elMinPt(7000),
     m_elMaxEta(2.47),
-    m_muContName("Muons"),
     m_muMinPt(7000),
     m_muMaxEta(2.47),
     m_muQual(2)
 {
     declareInterface<DiTauToolBase > (this);
-    declareProperty("ElectronContainer", m_elContName);
     declareProperty("ElectronMinPt", m_elMinPt);
     declareProperty("ElectronMaxEta", m_elMaxEta);
-    declareProperty("MuonContainer", m_muContName);
     declareProperty("MuonMinPt", m_muMinPt);
     declareProperty("MuonMaxEta", m_muMaxEta);
     declareProperty("MuonQuality", m_muQual);
@@ -54,23 +52,17 @@ ElMuFinder::~ElMuFinder() {
 
 StatusCode ElMuFinder::initialize() {
 
-    return StatusCode::SUCCESS;
-}
-
-//-------------------------------------------------------------------------
-// Event Finalize
-//-------------------------------------------------------------------------
-
-StatusCode ElMuFinder::eventFinalize(DiTauCandidateData * ) {
-
-    return StatusCode::SUCCESS;
+  ATH_CHECK( m_elContName.initialize() );
+  ATH_CHECK( m_muContName.initialize() );
+  return StatusCode::SUCCESS;
 }
 
 //-------------------------------------------------------------------------
 // execute
 //-------------------------------------------------------------------------
 
-StatusCode ElMuFinder::execute(DiTauCandidateData * data) {
+StatusCode ElMuFinder::execute(DiTauCandidateData * data,
+                               const EventContext& ctx) const {
 
     ATH_MSG_DEBUG("execute ElMuFinder...");
 
@@ -81,24 +73,8 @@ StatusCode ElMuFinder::execute(DiTauCandidateData * data) {
         return StatusCode::FAILURE;
     }
 
-    StatusCode sc;
-
-    const xAOD::ElectronContainer* pElCont = 0;
-    sc = evtStore()->retrieve(pElCont, m_elContName);
-    if (sc.isFailure() || !pElCont) {
-        ATH_MSG_WARNING("could not find electrons with key:" << m_elContName <<
-                        " Continue without electron and muon finding.");
-        return StatusCode::SUCCESS;
-    }
-
-    const xAOD::MuonContainer* pMuCont = 0;
-    sc = evtStore()->retrieve(pMuCont, m_muContName);
-    if (sc.isFailure() || !pMuCont) {        
-        ATH_MSG_WARNING("could not find muons with key:" << m_muContName <<
-                        " Continue without electron and muon finding.");
-        return StatusCode::SUCCESS;
-    }
-
+    SG::ReadHandle<xAOD::ElectronContainer> pElCont (m_elContName, ctx);
+    SG::ReadHandle<xAOD::MuonContainer> pMuCont (m_muContName, ctx);
 
     // select electrons
     data->electrons.clear();
diff --git a/Reconstruction/DiTauRec/src/IDvarCalculator.cxx b/Reconstruction/DiTauRec/src/IDvarCalculator.cxx
index 13362d1d47b14d90cc183195653d74280e66e668..abf9bcaa2338975ae4356e95656364b4146f19f4 100644
--- a/Reconstruction/DiTauRec/src/IDvarCalculator.cxx
+++ b/Reconstruction/DiTauRec/src/IDvarCalculator.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2017, 2019 CERN for the benefit of the ATLAS collaboration
 */
 
 
@@ -42,20 +42,12 @@ StatusCode IDVarCalculator::initialize() {
     return StatusCode::SUCCESS;
 }
 
-//-------------------------------------------------------------------------
-// Event Finalize
-//-------------------------------------------------------------------------
-
-StatusCode IDVarCalculator::eventFinalize(DiTauCandidateData * ) {
-
-    return StatusCode::SUCCESS;
-}
-
 //-------------------------------------------------------------------------
 // execute
 //-------------------------------------------------------------------------
 
-StatusCode IDVarCalculator::execute(DiTauCandidateData * data) {
+StatusCode IDVarCalculator::execute(DiTauCandidateData * data,
+                                    const EventContext& /*ctx*/) const {
 
     ATH_MSG_DEBUG("execute IDVarCalculator...");
 
@@ -85,10 +77,11 @@ StatusCode IDVarCalculator::execute(DiTauCandidateData * data) {
     }
 
     // cells if available 
+    bool useCells = m_useCells;;
     std::vector<const CaloCell*> vSubjetCells = data->subjetCells;
     if (vSubjetCells.size()==0) {
         ATH_MSG_DEBUG("No cell information available.");
-        m_useCells = false; 
+        useCells = false; 
     } 
 
 
@@ -105,7 +98,7 @@ StatusCode IDVarCalculator::execute(DiTauCandidateData * data) {
     // ----------------------------------------------------------------------------
     // write f_core
     // ----------------------------------------------------------------------------
-    if (m_useCells == false) {
+    if (useCells == false) {
         ATH_MSG_DEBUG("no cells are used for ID variable calculation. Continue.");
         return StatusCode::SUCCESS;
     }
diff --git a/Reconstruction/DiTauRec/src/SeedJetBuilder.cxx b/Reconstruction/DiTauRec/src/SeedJetBuilder.cxx
index 1cea2c2f0bfee76fc38119279973dd1e79703e8a..008e585fa607add277529d03ffe9005548cfc6c0 100644
--- a/Reconstruction/DiTauRec/src/SeedJetBuilder.cxx
+++ b/Reconstruction/DiTauRec/src/SeedJetBuilder.cxx
@@ -1,12 +1,13 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 
 #include "DiTauRec/SeedJetBuilder.h"
 #include "DiTauRec/DiTauToolBase.h"
-
 #include "DiTauRec/DiTauCandidateData.h"
+#include "StoreGate/ReadHandle.h"
+
 //-------------------------------------------------------------------------
 // Constructor
 //-------------------------------------------------------------------------
@@ -14,11 +15,9 @@
 SeedJetBuilder::SeedJetBuilder(const std::string& type,
     const std::string& name,
     const IInterface * parent) :
-    DiTauToolBase(type, name, parent),
-    m_jetContainerName("AntiKt10LCTopoJets")
+    DiTauToolBase(type, name, parent)
 {
 	declareInterface<DiTauToolBase > (this);
-	declareProperty("JetCollection", m_jetContainerName);
 }
 
 //-------------------------------------------------------------------------
@@ -33,22 +32,16 @@ SeedJetBuilder::~SeedJetBuilder() {
 //-------------------------------------------------------------------------
 
 StatusCode SeedJetBuilder::initialize() {
-	return StatusCode::SUCCESS;
-}
-
-//-------------------------------------------------------------------------
-// Event Finalize
-//-------------------------------------------------------------------------
-
-StatusCode SeedJetBuilder::eventFinalize(DiTauCandidateData *) {
-	return StatusCode::SUCCESS;
+  ATH_CHECK( m_jetContainerName.initialize() );
+  return StatusCode::SUCCESS;
 }
 
 //-------------------------------------------------------------------------
 // execute
 //-------------------------------------------------------------------------
 
-StatusCode SeedJetBuilder::execute(DiTauCandidateData * data) {
+StatusCode SeedJetBuilder::execute(DiTauCandidateData * data,
+                                   const EventContext& ctx) const {
 
 	ATH_MSG_DEBUG("jet seed finder executing...");
 
@@ -75,11 +68,10 @@ StatusCode SeedJetBuilder::execute(DiTauCandidateData * data) {
 
 
 	// retrieve jet container
-	const xAOD::JetContainer* pJetCont = nullptr;
-	ATH_CHECK(evtStore()->retrieve(pJetCont, m_jetContainerName));
+        SG::ReadHandle<xAOD::JetContainer> pJetCont (m_jetContainerName, ctx);
 	
 
-	pDiTau->setJet(pJetCont, pSeed);
+	pDiTau->setJet(pJetCont.get(), pSeed);
 
 	if (pDiTau->jetLink().isValid()) {
 		ATH_MSG_DEBUG("assciated seed jet with"
diff --git a/Reconstruction/DiTauRec/src/SubjetBuilder.cxx b/Reconstruction/DiTauRec/src/SubjetBuilder.cxx
index af00ffe8e21b6be8b57ca2a84186ef75a568725f..574d2f22f7b83b960d1b1ee80090813923020a4c 100644
--- a/Reconstruction/DiTauRec/src/SubjetBuilder.cxx
+++ b/Reconstruction/DiTauRec/src/SubjetBuilder.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 
@@ -59,20 +59,12 @@ StatusCode SubjetBuilder::initialize() {
 	return StatusCode::SUCCESS;
 }
 
-//-------------------------------------------------------------------------
-// Event Finalize
-//-------------------------------------------------------------------------
-
-StatusCode SubjetBuilder::eventFinalize(DiTauCandidateData * ) {
-
-	return StatusCode::SUCCESS;
-}
-
 //-------------------------------------------------------------------------
 // execute
 //-------------------------------------------------------------------------
 
-StatusCode SubjetBuilder::execute(DiTauCandidateData * data) {
+StatusCode SubjetBuilder::execute(DiTauCandidateData * data,
+                                  const EventContext& /*ctx*/) const {
 
 	ATH_MSG_DEBUG("subjet builder executing...");
 
diff --git a/Reconstruction/DiTauRec/src/VertexFinder.cxx b/Reconstruction/DiTauRec/src/VertexFinder.cxx
index e384456480bd92adb05edfe6bf2a71ce0c11adfd..73f11eb2e6746d43ee74a3569b59a274457b4e64 100644
--- a/Reconstruction/DiTauRec/src/VertexFinder.cxx
+++ b/Reconstruction/DiTauRec/src/VertexFinder.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 
@@ -10,6 +10,7 @@
 
 #include "xAODTracking/VertexContainer.h"
 #include "xAODTracking/Vertex.h"
+#include "StoreGate/ReadHandle.h"
 
 //-------------------------------------------------------------------------
 // Constructor
@@ -19,15 +20,10 @@ VertexFinder::VertexFinder(const std::string& type,
     const std::string& name,
     const IInterface * parent) :
     DiTauToolBase(type, name, parent),
-    m_primVtxContainerName("PrimaryVertices"),
-    m_assocTracksName("GhostTrack"),
-    m_trackVertexAssocName("JetTrackVtxAssoc_forDiTaus"),
-    m_maxJVF(-100)
+    m_assocTracksName("GhostTrack")
 {
     declareInterface<DiTauToolBase > (this);
-    declareProperty("PrimVtxContainerName", m_primVtxContainerName);
     declareProperty("AssociatedTracks", m_assocTracksName);
-    declareProperty("TrackVertexAssociation", m_trackVertexAssocName);
 }
 
 //-------------------------------------------------------------------------
@@ -43,23 +39,17 @@ VertexFinder::~VertexFinder() {
 
 StatusCode VertexFinder::initialize() {
 
-    return StatusCode::SUCCESS;
-}
-
-//-------------------------------------------------------------------------
-// Event Finalize
-//-------------------------------------------------------------------------
-
-StatusCode VertexFinder::eventFinalize(DiTauCandidateData * ) {
-
-    return StatusCode::SUCCESS;
+  ATH_CHECK( m_primVtxContainerName.initialize() );
+  ATH_CHECK( m_trackVertexAssocName.initialize() );
+  return StatusCode::SUCCESS;
 }
 
 //-------------------------------------------------------------------------
 // execute
 //-------------------------------------------------------------------------
 
-StatusCode VertexFinder::execute(DiTauCandidateData * data) {
+StatusCode VertexFinder::execute(DiTauCandidateData * data,
+                                 const EventContext& ctx) const {
 
     ATH_MSG_DEBUG("execute VertexFinder...");
 
@@ -67,15 +57,10 @@ StatusCode VertexFinder::execute(DiTauCandidateData * data) {
   
     // get the primary vertex container from StoreGate
     //do it here because of tau trigger
-    const xAOD::VertexContainer* vxContainer = 0;
     const xAOD::Vertex* vxPrimary = 0;
-  
-    StatusCode sc = evtStore()->retrieve(vxContainer, m_primVtxContainerName);
-    if (sc.isFailure() || vxContainer->size() == 0) {
-        ATH_MSG_WARNING("Container (" << m_primVtxContainerName << 
-                        ") not found in StoreGate.");
-        return StatusCode::FAILURE;
-    }
+
+    SG::ReadHandle<xAOD::VertexContainer> vxContainer
+      (m_primVtxContainerName, ctx);
 
     // find default PrimaryVertex
     // see https://twiki.cern.ch/twiki/bin/viewauth/AtlasProtected/VertexReselectionOnAOD
@@ -96,19 +81,20 @@ StatusCode VertexFinder::execute(DiTauCandidateData * data) {
     }
         
     // associate vertex to tau
-    pDiTau->setVertex(vxContainer, vxPrimary);
+    pDiTau->setVertex(vxContainer.get(), vxPrimary);
        
 
     // try to find new PV with TJVA
     ATH_MSG_DEBUG("TJVA enabled -> try to find new PV for the tau candidate");
 
-    ElementLink<xAOD::VertexContainer> newPrimaryVertexLink = getPV_TJVA(pDiTau, vxContainer);
+    float maxJVF = -100;
+    ElementLink<xAOD::VertexContainer> newPrimaryVertexLink = getPV_TJVA(pDiTau, vxContainer.get(), maxJVF, ctx);
     if (newPrimaryVertexLink.isValid()) {
         // set new primary vertex
         // will overwrite default one which was set above
         pDiTau->setVertexLink(newPrimaryVertexLink);
         // save highest JVF value
-        pDiTau->setDetail(xAOD::DiTauJetParameters::TauJetVtxFraction,static_cast<float>(m_maxJVF));
+        pDiTau->setDetail(xAOD::DiTauJetParameters::TauJetVtxFraction,static_cast<float>(maxJVF));
         ATH_MSG_DEBUG("TJVA vertex found and set");
     }
     else {
@@ -119,7 +105,9 @@ StatusCode VertexFinder::execute(DiTauCandidateData * data) {
 }
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-ElementLink<xAOD::VertexContainer> VertexFinder::getPV_TJVA(const xAOD::DiTauJet* pDiTau, const xAOD::VertexContainer* vertices)
+ElementLink<xAOD::VertexContainer> VertexFinder::getPV_TJVA(const xAOD::DiTauJet* pDiTau, const xAOD::VertexContainer* vertices,
+                                                            float& maxJVF,
+                                                            const EventContext& ctx) const
 {
     const xAOD::Jet* pJetSeed = (*pDiTau->jetLink());
 
@@ -133,26 +121,23 @@ ElementLink<xAOD::VertexContainer> VertexFinder::getPV_TJVA(const xAOD::DiTauJet
     }
 
     // Get the TVA object
-    const jet::TrackVertexAssociation* tva = NULL;
-    if (evtStore()->retrieve(tva, m_trackVertexAssocName).isFailure()) {
-        ATH_MSG_ERROR("Could not retrieve the TrackVertexAssociation from evtStore: " << m_trackVertexAssocName);
-        return ElementLink<xAOD::VertexContainer>();
-    }
+    SG::ReadHandle<jet::TrackVertexAssociation> tva
+      (m_trackVertexAssocName, ctx);
 
     // Calculate Jet Vertex Fraction
     std::vector<float> jvf;
     jvf.resize(vertices->size());
     for (size_t iVertex = 0; iVertex < vertices->size(); ++iVertex) {
-        jvf.at(iVertex) = getJetVertexFraction(vertices->at(iVertex),assocTracks,tva);
+      jvf.at(iVertex) = getJetVertexFraction(vertices->at(iVertex),assocTracks,tva.get());
     }
     
     // Get the highest JVF vertex and store maxJVF for later use
     // Note: the official JetMomentTools/JetVertexFractionTool doesn't provide any possibility to access the JVF value, but just the vertex.
-    m_maxJVF=-100.;
+    maxJVF=-100.;
     size_t maxIndex = 0;
     for (size_t iVertex = 0; iVertex < jvf.size(); ++iVertex) {
-        if (jvf.at(iVertex) > m_maxJVF) {
-            m_maxJVF = jvf.at(iVertex);
+        if (jvf.at(iVertex) > maxJVF) {
+            maxJVF = jvf.at(iVertex);
             maxIndex = iVertex;
         }
     }
diff --git a/Reconstruction/HeavyIonRec/HIJetRec/python/HIJetRecTools.py b/Reconstruction/HeavyIonRec/HIJetRec/python/HIJetRecTools.py
index b737f9623e817fc5a610b6b363e7715b9a35ef18..d2732b638a862457da277f09a83fce2fb85d12a0 100644
--- a/Reconstruction/HeavyIonRec/HIJetRec/python/HIJetRecTools.py
+++ b/Reconstruction/HeavyIonRec/HIJetRec/python/HIJetRecTools.py
@@ -194,8 +194,8 @@ if jetFlags.useCaloQualityTool():
 if jetFlags.useTracks(): 
     hi_modifiers += [jtm.jvf, jtm.jvt, jtm.trkmoms]
 if jetFlags.useTruth():
-    hi_modifiers += [jtm.truthpartondr,jtm.partontruthlabel]
-    hi_trk_modifiers += [jtm.truthpartondr,jtm.partontruthlabel]
+    hi_modifiers += [jtm.truthpartondr,jtm.partontruthlabel,jtm.jetdrlabeler]
+    hi_trk_modifiers += [jtm.truthpartondr,jtm.partontruthlabel,jtm.jetdrlabeler]
 
 
 
diff --git a/Reconstruction/MET/METReconstruction/Root/METRecoTool.cxx b/Reconstruction/MET/METReconstruction/Root/METRecoTool.cxx
index cece244e823593f5753ce7912ac8ad1d57e75606..ac454b15e2e8f1f1e78bb561446e132bcd22bddc 100644
--- a/Reconstruction/MET/METReconstruction/Root/METRecoTool.cxx
+++ b/Reconstruction/MET/METReconstruction/Root/METRecoTool.cxx
@@ -1,7 +1,7 @@
 ///////////////////////// -*- C++ -*- /////////////////////////////
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 // METRecoTool.cxx 
@@ -48,6 +48,8 @@ namespace met {
   METRecoTool::METRecoTool(const std::string& name) : 
     AsgTool(name),
     m_doMetSum(false),
+    m_metbuilders(this),
+    m_metrefiners(this),
     m_nevt(0)
   {
     declareProperty( "METBuilders",        m_metbuilders         );
@@ -90,27 +92,8 @@ namespace met {
       ATH_MSG_INFO ("Will not sum MET in this container.");
     }
 
-    // retrieve builders
-    for(ToolHandleArray<IMETToolBase>::const_iterator iBuilder=m_metbuilders.begin();
-	iBuilder != m_metbuilders.end(); ++iBuilder) {
-      ToolHandle<IMETToolBase> tool = *iBuilder;
-      if( tool.retrieve().isFailure() ) {
-	ATH_MSG_FATAL("Failed to retrieve tool: " << tool->name());
-	return StatusCode::FAILURE;
-      };
-      ATH_MSG_INFO("Retrieved tool: " << tool->name() );
-    }
-
-    // retrieve refiners
-    for(ToolHandleArray<IMETToolBase>::const_iterator iRefiner=m_metrefiners.begin();
-	iRefiner != m_metrefiners.end(); ++iRefiner) {
-      ToolHandle<IMETToolBase> tool = *iRefiner;
-      if( tool.retrieve().isFailure() ) {
-	ATH_MSG_FATAL("Failed to retrieve tool: " << tool->name());
-	return StatusCode::FAILURE;
-      };
-      ATH_MSG_INFO("Retrieved tool: " << tool->name() );
-    }
+    ATH_CHECK( m_metbuilders.retrieve() );
+    ATH_CHECK( m_metrefiners.retrieve() );
 
     // generate clocks
     unsigned int ntool = m_metbuilders.size()+m_metrefiners.size();
diff --git a/Reconstruction/MET/METReconstruction/python/METAssocConfig.py b/Reconstruction/MET/METReconstruction/python/METAssocConfig.py
index 4e217139083f6ded89158e5d0d48aa4224d7bbe0..4e4ca3c274ad736d0180b7e805cb02a36e6d379c 100644
--- a/Reconstruction/MET/METReconstruction/python/METAssocConfig.py
+++ b/Reconstruction/MET/METReconstruction/python/METAssocConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 
 from AthenaCommon import CfgMgr
 from GaudiKernel.Constants import INFO
@@ -233,9 +233,7 @@ def getMETAssocAlg(algName='METAssociation',configs={},tools=[],msglvl=INFO):
         assocTools.append(assoctool)
         metFlags.METAssocTools()[key] = assoctool
 
-    from AthenaCommon.AppMgr import ToolSvc
     for tool in assocTools:
-        ToolSvc += tool
         print prefix, 'Added METAssocTool \''+tool.name()+'\' to alg '+algName
 
     assocAlg = CfgMgr.met__METRecoAlg(name=algName,
diff --git a/Reconstruction/MET/METReconstruction/python/METAssocConfig_readAOD.py b/Reconstruction/MET/METReconstruction/python/METAssocConfig_readAOD.py
index 51aa6d682256f85b9f99f905518454ef96e5b5cd..ed9499b25ee1bcd4ff098fc61b1f96720aef1058 100644
--- a/Reconstruction/MET/METReconstruction/python/METAssocConfig_readAOD.py
+++ b/Reconstruction/MET/METReconstruction/python/METAssocConfig_readAOD.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 
 
 
@@ -231,7 +231,6 @@ def getMETAssocAlg(algName='METAssociation',configs={},tools=[]):
 
     from AthenaCommon.AppMgr import ToolSvc
     for tool in assocTools:
-        ToolSvc += tool
         print prefix, 'Added METAssocTool \''+tool.name()+'\' to alg '+algName
 
     assocAlg = CfgMgr.met__METRecoAlg(name=algName,
diff --git a/Reconstruction/MET/METReconstruction/python/METRecoConfig.py b/Reconstruction/MET/METReconstruction/python/METRecoConfig.py
index ae0940762fa1beb00e0c5b5e256ea504d407727e..73c5cece643fd27a849ff5bbfecfeffae33dc181 100644
--- a/Reconstruction/MET/METReconstruction/python/METRecoConfig.py
+++ b/Reconstruction/MET/METReconstruction/python/METRecoConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 
 from AthenaCommon import CfgMgr
 
@@ -135,8 +135,6 @@ def getBuilder(config,suffix,doTracks,doCells,doTriggerMET,doOriginCorrClus):
         else:
             tool.MissingETKey = config.outputKey
     from AthenaCommon.AppMgr import ToolSvc
-    if not hasattr(ToolSvc,tool.name()):
-       ToolSvc += tool
     return tool
 
 #################################################################################
@@ -169,8 +167,6 @@ def getRefiner(config,suffix,trkseltool=None,trkvxtool=None,trkisotool=None,calo
     if config.type == 'MuonEloss':
         tool = CfgMgr.met__METMuonElossTool('MET_MuonElossTool_'+suffix)
     tool.MissingETKey = config.outputKey
-    if not hasattr(ToolSvc,tool.name()):
-        ToolSvc += tool
     return tool
 
 #################################################################################
@@ -185,8 +181,6 @@ def getRegions(config,suffix):
     tool.InputMETKey = config.outputKey
     tool.RegionValues = [ 1.5, 3.2, 10 ]
     from AthenaCommon.AppMgr import ToolSvc
-    if not hasattr(ToolSvc,tool.name()):
-        ToolSvc += tool
     return tool
 
 #################################################################################
@@ -338,7 +332,6 @@ def getMETRecoAlg(algName='METReconstruction',configs={},tools=[]):
 
     from AthenaCommon.AppMgr import ToolSvc
     for tool in recoTools:
-        ToolSvc += tool
         print prefix, 'Added METRecoTool \''+tool.name()+'\' to alg '+algName
 
     recoAlg = CfgMgr.met__METRecoAlg(name=algName,
diff --git a/Reconstruction/MET/METReconstruction/src/METRecoAlg.cxx b/Reconstruction/MET/METReconstruction/src/METRecoAlg.cxx
index 8a0c6e39ff0a52757c5b0d372ae5e0096b2cf9d4..5b31c5cb8952fa650deffe3f538de09c9f7287c0 100644
--- a/Reconstruction/MET/METReconstruction/src/METRecoAlg.cxx
+++ b/Reconstruction/MET/METReconstruction/src/METRecoAlg.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 // METRecoAlg.cxx
@@ -15,7 +15,9 @@ namespace met {
 
   METRecoAlg::METRecoAlg(const std::string& name,
 			 ISvcLocator* pSvcLocator )
-  : ::AthAlgorithm( name, pSvcLocator ) {
+    : ::AthAlgorithm( name, pSvcLocator ),
+      m_recotools (this)
+  {
     declareProperty( "RecoTools", m_recotools);
   }
 
@@ -26,19 +28,9 @@ namespace met {
   //**********************************************************************
 
   StatusCode METRecoAlg::initialize() {
-    ATH_MSG_INFO("Initializing " << name() << "...");
-    ATH_MSG_INFO("Retrieving tools...");
+    ATH_MSG_VERBOSE("Initializing " << name() << "...");
 
-    // retrieve tools
-    for(ToolHandleArray<IMETRecoTool>::const_iterator iTool=m_recotools.begin();
-	iTool != m_recotools.end(); ++iTool) {
-      ToolHandle<IMETRecoTool> tool = *iTool;
-      if( tool.retrieve().isFailure() ) {
-	ATH_MSG_ERROR("Failed to retrieve tool: " << tool->name());
-	return StatusCode::FAILURE;
-      };
-      ATH_MSG_INFO("Retrieved tool: " << tool->name() );
-    }
+    ATH_CHECK( m_recotools.retrieve() );
   
     return StatusCode::SUCCESS;
   }
@@ -46,7 +38,7 @@ namespace met {
   //**********************************************************************
 
   StatusCode METRecoAlg::finalize() {
-    ATH_MSG_INFO ("Finalizing " << name() << "...");
+    ATH_MSG_VERBOSE ("Finalizing " << name() << "...");
     return StatusCode::SUCCESS;
   }
 
diff --git a/Reconstruction/MET/METUtilities/src/METMakerAlg.cxx b/Reconstruction/MET/METUtilities/src/METMakerAlg.cxx
index 60347180be7a67dad4960c771b16f1eca1de05d9..a77c181220185d19605a3110ffbf0cf43ccc216f 100644
--- a/Reconstruction/MET/METUtilities/src/METMakerAlg.cxx
+++ b/Reconstruction/MET/METUtilities/src/METMakerAlg.cxx
@@ -31,12 +31,6 @@ namespace met {
   METMakerAlg::METMakerAlg(const std::string& name,
 			   ISvcLocator* pSvcLocator )
     : ::AthAlgorithm( name, pSvcLocator ),
-    m_ElectronContainerKey(""),
-    m_PhotonContainerKey(""),
-    m_TauJetContainerKey(""),
-    m_MuonContainerKey(""),
-    m_JetContainerKey(""), 
-    m_CoreMetKey(""),
     m_metKey(""),
     m_metMap("METAssoc"),
     m_muonSelTool(""),
@@ -45,18 +39,18 @@ namespace met {
     m_tauSelTool("")
  {
     declareProperty( "Maker",          m_metmaker                        );
-    declareProperty( "METCoreName",    m_corename  = "MET_Core"          );
+    declareProperty( "METCoreName",    m_CoreMetKey  = "MET_Core"        );
     declareProperty("METName",         m_metKey = std::string("MET_Reference"),"MET container");
     declareProperty("METMapName",      m_metMap );
 
     declareProperty( "METSoftClName",  m_softclname  = "SoftClus"        );
     declareProperty( "METSoftTrkName", m_softtrkname = "PVSoftTrk"       );
 
-    declareProperty( "InputJets",      m_jetColl   = "AntiKt4LCTopoJets" );
-    declareProperty( "InputElectrons", m_eleColl   = "Electrons"         );
-    declareProperty( "InputPhotons",   m_gammaColl = "Photons"           );
-    declareProperty( "InputTaus",      m_tauColl   = "TauJets"           );
-    declareProperty( "InputMuons",     m_muonColl  = "Muons"             );
+    declareProperty( "InputJets",      m_JetContainerKey      = "AntiKt4LCTopoJets" );
+    declareProperty( "InputElectrons", m_ElectronContainerKey = "Electrons" );
+    declareProperty( "InputPhotons",   m_PhotonContainerKey   = "Photons"   );
+    declareProperty( "InputTaus",      m_TauJetContainerKey   = "TauJets"   );
+    declareProperty( "InputMuons",     m_MuonContainerKey     = "Muons"     );
 
     declareProperty( "MuonSelectionTool",        m_muonSelTool           );
     declareProperty( "ElectronLHSelectionTool",  m_elecSelLHTool         );
@@ -102,17 +96,11 @@ namespace met {
       ATH_MSG_ERROR("Failed to retrieve tool: " << m_tauSelTool->name());
       return StatusCode::FAILURE;
     };
-    ATH_CHECK( m_ElectronContainerKey.assign(m_eleColl) );
     ATH_CHECK( m_ElectronContainerKey.initialize() );
-    ATH_CHECK( m_PhotonContainerKey.assign(m_gammaColl) );
     ATH_CHECK( m_PhotonContainerKey.initialize() );
-    ATH_CHECK( m_TauJetContainerKey.assign(m_tauColl) );
     ATH_CHECK( m_TauJetContainerKey.initialize() );
-    ATH_CHECK( m_MuonContainerKey.assign(m_muonColl) );
     ATH_CHECK( m_MuonContainerKey.initialize() );
-    ATH_CHECK( m_JetContainerKey.assign(m_jetColl) );
     ATH_CHECK( m_JetContainerKey.initialize() );
-    ATH_CHECK( m_CoreMetKey.assign(m_corename) );
     ATH_CHECK( m_CoreMetKey.initialize() );
     ATH_CHECK( m_metKey.initialize() );
 
@@ -191,7 +179,7 @@ namespace met {
     MissingETBase::UsageHandler::Policy objScale = MissingETBase::UsageHandler::PhysicsObject;
     if(m_doTruthLep) objScale = MissingETBase::UsageHandler::TruthParticle;
     // Electrons
-    if(!m_eleColl.empty()) {
+    if(!m_ElectronContainerKey.empty()) {
       ConstDataVector<ElectronContainer> metElectrons(SG::VIEW_ELEMENTS);
       for(const auto& el : *Electrons) {
     	if(accept(el)) {
@@ -209,7 +197,7 @@ namespace met {
     }
 
     // Photons
-    if(!m_gammaColl.empty()) {
+    if(!m_PhotonContainerKey.empty()) {
       ConstDataVector<PhotonContainer> metPhotons(SG::VIEW_ELEMENTS);
       for(const auto& ph : *Gamma) {
     	if(accept(ph)) {
@@ -226,7 +214,7 @@ namespace met {
     }
 
     // Taus
-    if(!m_tauColl.empty()) {
+    if(!m_TauJetContainerKey.empty()) {
       ConstDataVector<TauJetContainer> metTaus(SG::VIEW_ELEMENTS);
       for(const auto& tau : *TauJets) {
     	if(accept(tau)) {
@@ -243,7 +231,7 @@ namespace met {
     }
 
     // Muons
-    if(!m_muonColl.empty()) {
+    if(!m_MuonContainerKey.empty()) {
       ConstDataVector<MuonContainer> metMuons(SG::VIEW_ELEMENTS);
       for(const auto& mu : *Muons) {
     	if(accept(mu)) {
diff --git a/Reconstruction/MET/METUtilities/src/METMakerAlg.h b/Reconstruction/MET/METUtilities/src/METMakerAlg.h
index c1c357afc3b1418114acc15b5dc28d17160fa909..ca3b2c7e311309f01e66ccbf84f87080be84e432 100644
--- a/Reconstruction/MET/METUtilities/src/METMakerAlg.h
+++ b/Reconstruction/MET/METUtilities/src/METMakerAlg.h
@@ -1,7 +1,7 @@
 ///////////////////////// -*- C++ -*- /////////////////////////////
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 // METMakerAlg.h
@@ -47,12 +47,12 @@ namespace met {
     METMakerAlg(const std::string& name, ISvcLocator* pSvcLocator);
 
     /// Destructor:
-    ~METMakerAlg(); 
+    virtual ~METMakerAlg(); 
 
     /// Athena algorithm's Hooks
-    StatusCode  initialize();
-    StatusCode  execute();
-    StatusCode  finalize();
+    virtual StatusCode  initialize() override;
+    virtual StatusCode  execute() override;
+    virtual StatusCode  finalize() override;
 
   private: 
 
@@ -64,8 +64,6 @@ namespace met {
     bool accept(const xAOD::TauJet* tau);
     bool accept(const xAOD::Muon* muon);
 
-    std::string m_corename;
-
     std::string m_softclname;
     std::string m_softtrkname;
 
@@ -78,12 +76,6 @@ namespace met {
 
     SG::ReadHandleKey<xAOD::MissingETContainer>           m_CoreMetKey;
 
-    std::string m_eleColl;
-    std::string m_gammaColl;
-    std::string m_tauColl;
-    std::string m_jetColl;
-    std::string m_muonColl;
-
     SG::WriteHandleKey<xAOD::MissingETContainer> m_metKey;
     SG::ReadHandle<xAOD::MissingETAssociationMap> m_metMap;
 
diff --git a/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedAlgs.py b/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedAlgs.py
index e5befec9507cb9a32dfa6a49f71d76c026ad851c..bd7a9aacde6b7942122ca476a2bb9b397b862af4 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedAlgs.py
+++ b/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedAlgs.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2017, 2019 CERN for the benefit of the ATLAS collaboration
 
 from MuonCombinedRecExample.MuonCombinedRecFlags import muonCombinedRecFlags
 from AthenaCommon.CfgGetter import getPublicTool, getAlgorithm,getPublicToolClone
@@ -82,8 +82,32 @@ def MuonCombinedAlg( name="MuonCombinedAlg",**kwargs ):
     kwargs.setdefault("CombinedTagMaps", tagmaps)
     return CfgMgr.MuonCombinedAlg(name,**kwargs)
 
+def recordMuonCreatorAlgObjs (kw):
+    Alg = CfgMgr.MuonCreatorAlg
+    def val (prop):
+        d = kw.get (prop)
+        if d == None:
+            d = Alg.__dict__[prop].default
+        return d
+    objs = {'xAOD::MuonContainer': val('MuonContainerLocation'),
+            'xAOD::TrackParticleContainer': (val('CombinedLocation')+'TrackParticles',
+                                             val('ExtrapolatedLocation')+'TrackParticles',
+                                             val('MSOnlyExtrapolatedLocation')+'TrackParticles'),
+            'xAOD::MuonSegmentContainer': val('SegmentContainerName'),
+            }
+    if val('BuildSlowMuon'):
+        objs['xAOD::SlowMuonContainer'] = val('SlowMuonContainerLocation')
+    if val('MakeClusters'):
+        objs['CaloClusterCellLinkContainer'] =  val('CaloClusterCellLinkName') + '_links'
+        objs['xAOD::CaloClusterContainer'] =  val('ClusterContainerName')
+        
+    from RecExConfig.ObjKeyStore import objKeyStore
+    objKeyStore.addManyTypesTransient (objs)
+    return
+    
 def MuonCreatorAlg( name="MuonCreatorAlg",**kwargs ):
     kwargs.setdefault("MuonCreatorTool",getPublicTool("MuonCreatorTool"))
+    recordMuonCreatorAlgObjs (kwargs)
     return CfgMgr.MuonCreatorAlg(name,**kwargs)
 
 def StauCreatorAlg( name="StauCreatorAlg", **kwargs ):
@@ -97,6 +121,7 @@ def StauCreatorAlg( name="StauCreatorAlg", **kwargs ):
     kwargs.setdefault("BuildSlowMuon",1)
     kwargs.setdefault("ClusterContainerName", "SlowMuonClusterCollection")
     kwargs.setdefault("TagMaps",["stauTagMap"])
+    recordMuonCreatorAlgObjs (kwargs)
     return MuonCreatorAlg(name,**kwargs)
 
 class MuonCombinedReconstruction(ConfiguredMuonRec):
diff --git a/Reconstruction/RecExample/RecExCommon/share/BSRead_config.py b/Reconstruction/RecExample/RecExCommon/share/BSRead_config.py
index 18bc3ea2e73933bb91a3a64b1fd70c7b7865eaa9..fb7780507e513a29788298417d43f0cdf8568676 100644
--- a/Reconstruction/RecExample/RecExCommon/share/BSRead_config.py
+++ b/Reconstruction/RecExample/RecExCommon/share/BSRead_config.py
@@ -51,6 +51,8 @@ if DetFlags.readRDOBS.LAr_on():
 if DetFlags.readRDOBS.Tile_on():
     svcMgr.ByteStreamAddressProviderSvc.TypeNames += [
         "TileRawChannelContainer/TileRawChannelCnt",
+        "TileRawChannelContainer/MuRcvRawChCnt",
+        "TileDigitsContainer/MuRcvDigitsCnt",
         "TileL2Container/TileL2Cnt"
       ]
 
diff --git a/Reconstruction/RecoTools/CaloRingerTools/src/CaloRingerElectronsReader.cxx b/Reconstruction/RecoTools/CaloRingerTools/src/CaloRingerElectronsReader.cxx
index aa431450de06933a5d69e866fb5b2d9d9c3f3fd9..4d5e74112d644adfe6a48c56f4badf56b42c71c5 100644
--- a/Reconstruction/RecoTools/CaloRingerTools/src/CaloRingerElectronsReader.cxx
+++ b/Reconstruction/RecoTools/CaloRingerTools/src/CaloRingerElectronsReader.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2017, 2019 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: CaloRingerElectronsReader.cxx 786306 2016-11-24 13:40:42Z wsfreund $
@@ -8,7 +8,7 @@
 
 #include <algorithm>
 
-#include "PATCore/TAccept.h"
+#include "PATCore/AcceptData.h"
 #include "StoreGate/ReadHandle.h"
 
 namespace Ringer {
@@ -136,7 +136,8 @@ StatusCode CaloRingerElectronsReader::execute()
       const auto& selector = m_ringerSelectors[i];
 
       // Execute selector for each electron
-      StatusCode lsc = selector->execute(el);
+      asg::AcceptData acceptData (&selector->getAcceptInfo());
+      StatusCode lsc = selector->execute(el, acceptData);
       sc &= lsc;
 
       if ( lsc.isFailure() ){
@@ -145,19 +146,18 @@ StatusCode CaloRingerElectronsReader::execute()
       }
 
       // Retrieve results:
-      const Root::TAccept& accept = selector->getTAccept();
-      const std::vector<float> &outputSpace = selector->getOutputSpace();
+       const std::vector<float> &outputSpace = selector->getOutputSpace();
 
       ATH_MSG_DEBUG( "Result for " << selector->name() << " is: "
-          << std::boolalpha << static_cast<bool>(accept)
+          << std::boolalpha << static_cast<bool>(acceptData)
           << " and its outputSpace is: "
           << std::noboolalpha << outputSpace);
 
       // Save the bool result
-      selHandles[i](*el) = static_cast<char>(accept);
+      selHandles[i](*el) = static_cast<bool>(acceptData);
 
       //// Save the resulting bitmask
-      isEMHandles[i](*el) = static_cast<unsigned int>(accept.getCutResultInverted());
+      isEMHandles[i](*el) = static_cast<unsigned int>(acceptData.getCutResultInverted());
 
       // Check if output space is empty, if so, use error code
       float outputToSave(std::numeric_limits<float>::min());
diff --git a/Reconstruction/eflowRec/src/PFTrackSelector.cxx b/Reconstruction/eflowRec/src/PFTrackSelector.cxx
index ac7999c93e9c26e9717d339aceb14b801d272a0a..41af12815ed0258a92d1076479a9b917359c10f0 100644
--- a/Reconstruction/eflowRec/src/PFTrackSelector.cxx
+++ b/Reconstruction/eflowRec/src/PFTrackSelector.cxx
@@ -143,7 +143,6 @@ bool PFTrackSelector::isMuon(const xAOD::TrackParticle* track){
 	  const xAOD::TrackParticle* ID_track = *theLink;
 	  if (ID_track){
 	    if (track == ID_track) return true;
-	    return false;
 	  }
 	  else ATH_MSG_WARNING("This muon has a NULL pointer to the track");
 	}
diff --git a/Reconstruction/egamma/egammaMVACalib/egammaMVACalib/egammaMVAFunctions.h b/Reconstruction/egamma/egammaMVACalib/egammaMVACalib/egammaMVAFunctions.h
index a66bd2ca6fb9ed56c0aaaa8eaa4719c8a50d3103..900f75b92f18b277dba65537a83411f452f1ac4f 100644
--- a/Reconstruction/egamma/egammaMVACalib/egammaMVACalib/egammaMVAFunctions.h
+++ b/Reconstruction/egamma/egammaMVACalib/egammaMVACalib/egammaMVAFunctions.h
@@ -207,23 +207,23 @@ namespace egammaMVAFunctions
   std::unique_ptr<funcMap_t> initializeConvertedPhotonFuncs(bool useLayerCorrected);
 
 
-  /// The ConversionHelper struct used by egammaMVATree 
-  /// but not the functions in the dictionaries above.
-  /// (Might want to consider deprecating)
-  struct ConversionHelper
+  /// The ConversionHelper struct is stll used by egammaMVATree 
+  /// but not the functions in the dictionaries above. We could deprecate them
+  struct ConversionHelper : asg::AsgMessaging
   {
     ConversionHelper(const xAOD::Photon* ph)
-      : m_vertex(ph ? ph->vertex() : nullptr),
+      : asg::AsgMessaging("ConversionHelper"),
+        m_vertex(ph ? ph->vertex() : nullptr),
         m_tp0(m_vertex ? m_vertex->trackParticle(0) : nullptr),
         m_tp1(m_vertex ? m_vertex->trackParticle(1) : nullptr),
         m_pt1conv(0.), m_pt2conv(0.)
     {
-      static asg::AsgMessaging static_msg("ConversionHelper");
-      static_msg.msg(MSG::DEBUG) << "init conversion helper";
+     
+      ATH_MSG_DEBUG("init conversion helper");
       if (!m_vertex) return;
 
-      static SG::AuxElement::Accessor<float> accPt1("pt1");
-      static SG::AuxElement::Accessor<float> accPt2("pt2");
+      static const SG::AuxElement::Accessor<float> accPt1("pt1");
+      static const SG::AuxElement::Accessor<float> accPt2("pt2");
       if (accPt1.isAvailable(*m_vertex) && accPt2.isAvailable(*m_vertex))
       {
         m_pt1conv = accPt1(*m_vertex);
@@ -231,7 +231,7 @@ namespace egammaMVAFunctions
       }
       else
       {
-        static_msg.msg(MSG::WARNING) << "pt1/pt2 not available, will approximate from first measurements";
+        ATH_MSG_WARNING("pt1/pt2 not available, will approximate from first measurements");
         m_pt1conv = getPtAtFirstMeasurement(m_tp0);
         m_pt2conv = getPtAtFirstMeasurement(m_tp1);
       }
@@ -247,8 +247,7 @@ namespace egammaMVAFunctions
       uint8_t hits = 0;
       if (m_tp0->summaryValue(hits, xAOD::numberOfPixelHits)) { return hits; }
       else {
-        static asg::AsgMessaging static_msg("ConversionHelper");
-        static_msg.msg(MSG::WARNING) << "cannot read xAOD::numberOfPixelHits";
+        ATH_MSG_WARNING("cannot read xAOD::numberOfPixelHits");
         return 0;
       }
     }
@@ -257,8 +256,7 @@ namespace egammaMVAFunctions
       uint8_t hits;
       if (m_tp1->summaryValue(hits, xAOD::numberOfPixelHits)) { return hits; }
       else {
-        static asg::AsgMessaging static_msg("ConversionHelper");
-        static_msg.msg(MSG::WARNING) << "cannot read xAOD::numberOfPixelHits";
+        ATH_MSG_WARNING("cannot read xAOD::numberOfPixelHits");
         return 0;
       }
     }
@@ -267,8 +265,7 @@ namespace egammaMVAFunctions
       uint8_t hits;
       if (m_tp0->summaryValue(hits, xAOD::numberOfSCTHits)) { return hits; }
       else {
-        static asg::AsgMessaging static_msg("ConversionHelper");
-        static_msg.msg(MSG::WARNING) << "cannot read xAOD::numberOfSCTHits";
+        ATH_MSG_WARNING("cannot read xAOD::numberOfSCTHits");
         return 0;
       }
     }
@@ -277,8 +274,7 @@ namespace egammaMVAFunctions
       uint8_t hits;
       if (m_tp1->summaryValue(hits, xAOD::numberOfSCTHits)) { return hits; }
       else {
-        static asg::AsgMessaging static_msg("ConversionHelper");
-        static_msg.msg(MSG::WARNING) << "cannot read xAOD::numberOfSCTHits";
+        ATH_MSG_WARNING("cannot read xAOD::numberOfSCTHits");
         return 0;
       }
     }
diff --git a/Reconstruction/tauRec/python/TauRecBuilder.py b/Reconstruction/tauRec/python/TauRecBuilder.py
index e1440476500d0397fa0a64d3d5e70567e1e8f129..55ddca6c0d28c83020b63bbf873164c001c7db19 100644
--- a/Reconstruction/tauRec/python/TauRecBuilder.py
+++ b/Reconstruction/tauRec/python/TauRecBuilder.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 
 ################################################################################
 ##
@@ -42,7 +42,12 @@ class TauRecCoreBuilder ( TauRecConfigured ) :
     PhotonConversion will be run here too.
     """
   
-    _output     = { _outputType:_outputKey , _outputAuxType:_outputAuxKey }
+    _output     = { _outputType:_outputKey , _outputAuxType:_outputAuxKey,
+                    'xAOD::TauTrackContainer' : 'TauTracks',
+                    'xAOD::CaloClusterContainer' : 'TauShotClusters',
+                    'xAOD::PFOContainer' : 'TauShotParticleFlowObjects',
+                    'CaloCellContainer' : 'TauCommonPi0Cells',
+                    }
     
     def __init__(self, name = "TauCoreBuilder",doPi0Clus=False, doTJVA=False):
         self.name = name
@@ -59,10 +64,10 @@ class TauRecCoreBuilder ( TauRecConfigured ) :
         
         from RecExConfig.RecFlags import rec    
         
-        # xxx ToDo: still needed?        
         from RecExConfig.ObjKeyStore import objKeyStore
         objKeyStore.addManyTypesStreamESD(self._output)
         objKeyStore.addManyTypesStreamAOD(self._output)              
+        objKeyStore.addManyTypesTransient(self._output)              
         
         import tauRec.TauAlgorithmsHolder as taualgs
         from tauRec.tauRecFlags import tauFlags
diff --git a/Simulation/FastShower/FastCaloSim/FastCaloSim/FastShowerCellBuilderTool.h b/Simulation/FastShower/FastCaloSim/FastCaloSim/FastShowerCellBuilderTool.h
index d0219ddee68bedd3c464538e702bdc27381174e5..9e6a05ff2dd6b1f756eed4a12b2486f0ab187d51 100755
--- a/Simulation/FastShower/FastCaloSim/FastCaloSim/FastShowerCellBuilderTool.h
+++ b/Simulation/FastShower/FastCaloSim/FastCaloSim/FastShowerCellBuilderTool.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef FASTSHOWER_CELLBUILDERTOOL_H
@@ -12,7 +12,7 @@
 
 #include "GaudiKernel/ToolHandle.h"
 #include "GaudiKernel/IIncidentListener.h"
-#include "AthenaKernel/IAtRndmGenSvc.h"
+#include "AthenaKernel/IAthRNGSvc.h"
 #include "FastCaloSim/BasicCellBuilderTool.h"
 //#include "TruthHelper/GenAccessIO.h"
 #include "FastSimulationEvent/GenParticleEnergyDepositMap.h"
@@ -148,8 +148,8 @@ private:
     FastShower::LongitudinalShape* m_longshape;
   */
   ServiceHandle<IPartPropSvc>    m_partPropSvc;
-  ServiceHandle<IAtRndmGenSvc>   m_rndmSvc;
-  CLHEP::HepRandomEngine*        m_randomEngine{};
+  ServiceHandle<IAthRNGSvc>      m_rndmSvc;
+  ATHRNG::RNGWrapper*            m_randomEngine = nullptr;
   std::string                    m_randomEngineName{"FastCaloSimRnd"};         //!< Name of the random number stream
 
   //CaloDepthTool*                 m_calodepth;
diff --git a/Simulation/FastShower/FastCaloSim/share/FastShowerCellBuilderTool_test.py b/Simulation/FastShower/FastCaloSim/share/FastShowerCellBuilderTool_test.py
index bc0583c439923d3b8051a68550be4e4b7abb5276..98021ba93a525a55aabc2fe357f1c7e81bfe80e5 100644
--- a/Simulation/FastShower/FastCaloSim/share/FastShowerCellBuilderTool_test.py
+++ b/Simulation/FastShower/FastCaloSim/share/FastShowerCellBuilderTool_test.py
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration.
 #
 # File: FastCaloSim/share/FastShowerCellBuilderTool_test.py
 # Author: scott snyder
@@ -44,74 +44,74 @@ topSequence = AlgSequence()
 
 theApp.EvtMax=1
 
+
 exp_cells = {
-    (0, -3,  1,  0,  2,  29) :  1082.3,
+    (0, -3,  1,  0,  2,  29) :   873.8,
     (0, -3,  1,  0,  2,  30) :   593.1,
-    (0, -3,  1,  0,  3,  28) :  2893.1,
-    (0, -3,  1,  0,  3,  29) : 85573.6,
-    (0, -3,  1,  0,  3,  30) : 19897.8,
-    (0, -3,  1,  0,  4,  28) :  1775.3,
-    (0, -3,  1,  0,  4,  29) : 13901.8,
-    (0, -3,  1,  0,  4,  30) :  4405.1,
-    (0, -3,  1,  0,  5,  29) :   650.2,
-    (0, -3,  1,  0,  5,  30) :   508.4,
-    (0, -3,  2,  0,  3,  29) :   557.1,
-    (0, -2,  0,  0,  0,  28) :   765.0,
-    (0, -2,  1,  1,  2,  28) :  5965.7,
-    (0, -2,  2,  1,  2, 113) :  1617.0,
-    (0, -2,  2,  1,  2, 114) :  2100.8,
-    (0, -1,  0,  0, 59,  28) :   871.8,
-    (0, -1,  0,  0, 60,  28) :  1184.4,
-    (0,  1,  0,  0, 59,  25) :   282.9,
-    (0,  1,  0,  0, 60,  25) :   208.4,
-    (0,  2,  0,  0,  0,  24) :   567.1,
-    (0,  2,  0,  0,  0,  25) :  4319.5,
-    (0,  2,  0,  0,  1,  25) :   810.2,
-    (0,  2,  1,  1,  1,  25) :   745.2,
-    (0,  2,  1,  1,  2,  25) : 13066.6,
-    (0,  2,  1,  4, 28,  37) :   540.0,
-    (0,  2,  1,  4, 29,  37) :   910.3,
-    (0,  2,  1,  4, 30,  37) :   788.2,
-    (0,  2,  1,  4, 31,  37) :   610.1,
-    (0,  2,  1,  4, 32,  37) :   266.0,
-    (0,  2,  2,  1,  1, 101) :   324.4,
-    (0,  2,  2,  1,  2, 100) :  1023.7,
-    (0,  2,  2,  1,  2, 101) :  6262.3,
-    (0,  2,  2,  1,  2, 102) :   636.3,
-    (0,  2,  2,  1,  3, 101) :   428.5,
-    (0,  2,  2,  1, 29, 149) :   683.1,
-    (0,  2,  2,  1, 29, 150) :  1136.9,
-    (0,  2,  2,  1, 29, 151) :   265.4,
-    (0,  2,  2,  1, 30, 148) :   410.7,
-    (0,  2,  2,  1, 30, 149) :  6159.1,
-    (0,  2,  2,  1, 30, 150) :  9094.0,
-    (0,  2,  2,  1, 30, 151) :   757.1,
-    (0,  2,  2,  1, 31, 148) :   248.7,
-    (0,  2,  2,  1, 31, 149) :  1078.7,
-    (0,  2,  2,  1, 31, 150) :  1348.1,
-    (0,  2,  2,  1, 31, 151) :   396.7,
-    (0,  2,  2,  1, 32, 150) :   165.0,
-    (0,  2,  3,  0, 13, 149) :  6118.8,
-    (0,  2,  3,  0, 13, 150) : 12741.9,
-    (0,  2,  3,  0, 13, 151) :  1333.6,
-    (0,  2,  3,  0, 14, 149) :   853.6,
-    (0,  2,  3,  0, 14, 150) :  1421.6,
-    (0,  2,  3,  0, 14, 151) :   617.1,
-    (1,  2,  0,  0,  6,  36) :   191.8,
-    (1,  2,  0,  0,  6,  37) :  2026.1,
-    (1,  2,  0,  0,  6,  38) :   103.9,
-    (1,  2,  0,  0,  7,  37) :   432.4,
-    (1,  2,  1,  0,  6,  36) :  1347.2,
-    (1,  2,  1,  0,  6,  37) : 13680.3,
-    (1,  2,  1,  0,  6,  38) :  1055.9,
-    (1,  2,  1,  0,  7,  36) :   568.6,
-    (1,  2,  1,  0,  7,  37) :  9250.3,
-    (1,  2,  1,  0,  7,  38) :   589.0,
-    (1,  2,  2,  0,  6,  37) :  1702.3,
-    (1,  2,  2,  0,  7,  37) :  1321.2,
-    (3,  3, -1, 28, 15,   3) :  2566.1,
-    (3,  3,  1, 24, 15,   3) :   690.3,
-    (3,  3,  1, 25, 15,   3) :  9414.4,
+    (0, -3,  1,  0,  3,  28) :  3003.6,
+    (0, -3,  1,  0,  3,  29) : 83002.8,
+    (0, -3,  1,  0,  3,  30) : 19794.6,
+    (0, -3,  1,  0,  4,  28) :  1847.6,
+    (0, -3,  1,  0,  4,  29) : 14195.6,
+    (0, -3,  1,  0,  4,  30) :  4444.7,
+    (0, -3,  1,  0,  5,  29) :   382.2,
+    (0, -3,  1,  0,  5,  30) :   321.8,
+    (0, -3,  2,  0,  3,  29) :   260.3,
+    (0, -2,  0,  0,  0,  28) :   787.8,
+    (0, -2,  1,  1,  1,  28) :   546.6,
+    (0, -2,  1,  1,  2,  28) :  5108.6,
+    (0, -2,  2,  1,  2, 113) :  1382.2,
+    (0, -2,  2,  1,  2, 114) :  1784.3,
+    (0, -1,  0,  0, 59,  28) :   515.6,
+    (0, -1,  0,  0, 60,  28) :   520.8,
+    (0,  1,  0,  0, 59,  25) :    69.6,
+    (0,  1,  0,  0, 60,  25) :    22.92,
+    (0,  2,  0,  0,  0,  24) :    34.7,
+    (0,  2,  0,  0,  0,  25) :   191.5,
+    (0,  2,  0,  0,  1,  25) :    30.1,
+    (0,  2,  1,  1,  1,  25) :   572.2,
+    (0,  2,  1,  1,  2,  25) : 12659.3,
+    (0,  2,  2,  1,  1, 101) :   581.2,
+    (0,  2,  2,  1,  2, 100) :  1557.3,
+    (0,  2,  2,  1,  2, 101) :  9685.9,
+    (0,  2,  2,  1,  2, 102) :  1053.7,
+    (0,  2,  2,  1,  3, 101) :   716.1,
+    (0,  2,  2,  1, 29, 149) :  1217.4,
+    (0,  2,  2,  1, 29, 150) :  2093.2,
+    (0,  2,  2,  1, 29, 151) :   461.8,
+    (0,  2,  2,  1, 30, 148) :   492.0,
+    (0,  2,  2,  1, 30, 149) :  6877.1,
+    (0,  2,  2,  1, 30, 150) : 12497.6,
+    (0,  2,  2,  1, 30, 151) :  1600.2,
+    (0,  2,  2,  1, 31, 148) :   378.3,
+    (0,  2,  2,  1, 31, 149) :  1359.0,
+    (0,  2,  2,  1, 31, 150) :  2037.2,
+    (0,  2,  2,  1, 31, 151) :   651.7,
+    (0,  2,  2,  1, 32, 150) :   294.3,
+    (0,  2,  3,  0, 13, 148) :   859.8,
+    (0,  2,  3,  0, 13, 149) :  6645.7,
+    (0,  2,  3,  0, 13, 150) : 13592.1,
+    (0,  2,  3,  0, 13, 151) :  2535.4,
+    (0,  2,  3,  0, 14, 148) :   561.8,
+    (0,  2,  3,  0, 14, 149) :  2037.4,
+    (0,  2,  3,  0, 14, 150) :  3168.5,
+    (0,  2,  3,  0, 14, 151) :   982.9,
+    (1,  2,  0,  0,  6,  36) :  1028.7,
+    (1,  2,  0,  0,  6,  37) : 10040.6,
+    (1,  2,  0,  0,  6,  38) :  1319.7,
+    (1,  2,  0,  0,  7,  36) :  1187.8,
+    (1,  2,  0,  0,  7,  37) :  5799.3,
+    (1,  2,  0,  0,  8,  37) :  1021.9,
+    (1,  2,  1,  0,  6,  36) :   288.7,
+    (1,  2,  1,  0,  6,  37) :  1598.3,
+    (1,  2,  1,  0,  6,  38) :    94.8,
+    (1,  2,  1,  0,  7,  36) :   330.9,
+    (1,  2,  1,  0,  7,  37) :   887.8,
+    (1,  2,  1,  0,  7,  38) :   525.4,
+    (3,  3, -1, 28, 15,   3) :  4606.0,
+    (3,  3, -1, 29, 15,   3) :   623.9,
+    (3,  3,  1, 24, 15,   3) :  1149.3,
+    (3,  3,  1, 25, 15,   3) :  5667.7,
     }
 
 
diff --git a/Simulation/FastShower/FastCaloSim/share/FastShowerCellBuilderTool_test.ref b/Simulation/FastShower/FastCaloSim/share/FastShowerCellBuilderTool_test.ref
index 980c6beba37570b7e6668f578efcc10d6fd4c62f..287f1ae08c5a200a12875efb5011c388fa755e4d 100644
--- a/Simulation/FastShower/FastCaloSim/share/FastShowerCellBuilderTool_test.ref
+++ b/Simulation/FastShower/FastCaloSim/share/FastShowerCellBuilderTool_test.ref
@@ -1,4 +1,4 @@
-Fri Dec 28 15:03:54 EST 2018
+Thu Jan  3 00:21:53 EST 2019
 Py:Athena            INFO including file "AthenaCommon/Preparation.py"
 Py:Athena            INFO using release [?-21.0.0] [i686-slc5-gcc43-dbg] [?/?] -- built on [?]
 Py:Athena            INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
@@ -70,7 +70,7 @@ Py:FastCaloSimFactory::configure:    INFO all values:
 |-PartPropSvc                                = ServiceHandle('PartPropSvc')
 |-ParticleParametrizationFileName            = '/home/sss/nobackup/atlas/ReleaseData/v20/FastCaloSim/v1/ParticleEnergyParametrization.root'
 |                                            (default: '')
-|-RandomService                              = ServiceHandle('AtDSFMTGenSvc')
+|-RandomService                              = ServiceHandle('AthRNGSvc')
 |-RandomStreamName                           = 'FastCaloSimRnd'
 |-StoreFastShowerInfo                        = False
 |-phi0_em                                    = -1000.0
@@ -86,7 +86,7 @@ ApplicationMgr       INFO Updating Gaudi::PluginService::SetDebug(level) to leve
 ApplicationMgr    SUCCESS 
 ====================================================================================================================================
                                                    Welcome to ApplicationMgr (GaudiCoreSvc v27r1p99)
-                                          running on karma on Fri Dec 28 15:03:57 2018
+                                          running on karma on Thu Jan  3 00:21:56 2019
 ====================================================================================================================================
 ApplicationMgr       INFO Successfully loaded modules : AthenaServices
 ApplicationMgr       INFO Application Manager Configured successfully
@@ -374,10 +374,7 @@ CaloIdMgrDetDes...   INFO  Finished
 CaloIdMgrDetDes...   INFO Initializing CaloIdMgr from values in CaloIdMgrDetDescrCnv 
 PartPropSvc          INFO No table format type specified for "PDGTABLE.MeV". Assuming PDG
 found 298 particles
-AtDSFMTGenSvc        INFO Initializing AtDSFMTGenSvc - package version RngComps-00-00-00
- INITIALISING RANDOM NUMBER STREAMS. 
-AtDSFMTGenSvc        INFO will be reseeded for every event
-AtDSFMTGenSvc     WARNING  INITIALISING FastCaloSimRnd stream with DEFAULT seeds 3591  2309736
+AthRNGSvc            INFO Creating engine ToolSvc.tool1/FastCaloSimRnd
 AtlasFieldSvc        INFO initialize() ...
 AtlasFieldSvc        INFO maps will be chosen reading COOL folder /GLOBAL/BField/Maps
 ClassIDSvc           INFO  getRegistryEntries: read 1128 CLIDRegistry entries for module ALL
@@ -555,6 +552,7 @@ TileBadChannels...   INFO TileBchStatus::isNoGainL1() is defined by: ADC dead; N
 TileBadChannels...   INFO TileBchStatus::isBadTiming() is defined by: Bad timing; Online bad timing; 
 TileBadChannels...   INFO No drawer trips probabilities found in DB
 ClassIDSvc           INFO  getRegistryEntries: read 1104 CLIDRegistry entries for module ALL
+AthRNGSvc         SUCCESS ToolSvc.tool1/FastCaloSimRnd 3630501711 90 3261692434 1073680638 823030377 1073723668 1868930291 1073677174 911996003 1073290479 3711715511 1072694548 2140068716 1072735951 539460630 1073178241 2282305494 1072708986 1641530683 1073202302 2631242835 1073321911 3961765294 1073467950 2626127931 1073272628 2396189536 1073590622 2374465580 1073564482 3416006862 1072800960 1352814095 1073333945 1932808853 1073111336 2004821113 1072722654 164197198 1072846416 751909680 1073721900 808721476 1073468761 690859097 1073483009 418699027 1073306662 1789296916 1073624469 2971093188 1072984953 2555298921 1072770453 3853840956 1073055738 3487439144 1073639698 1894545311 1072884286 626513571 1073631692 3421835136 1073307636 3985124064 1073729249 2607246495 1073094204 4090506844 1073695039 2410441688 1073487241 1069374412 1073423736 1760407317 1072765560 2827875924 1072827462 4146416168 1073037450 3197924302 1073718189 3551167333 1073676036 4115234429 1073230966 98903944 1073088578 4282482954 1073314928 2143692400 1073136393 3296550475 1072843872 3558803953 1073270281 3103842852 1073235469 1882909869 1073459859 916240561 1073339674 536539632 1073614296 1409495660 1073448151 358001842 1073483642 739667300 1073521338 3746187847 1072960505 2594847495 1073654670 3231825006 1073250176 3554125300 1073441586 889397564 1073010193 3102313462 1073424387 912563430 1073190059 2833054885 1073176909 2869107047 1073201355 4064975915 1073425934 3842344805 1073237417 2249570334 1073294265 933655068 1073661856 2823826967 1072983053 3187935985 1073666738 2012177277 1073511885 3705303978 1073354273 2263991526 1072860629 714897335 1073409664 3791090286 1072885706 3668090129 1072928433 4177473366 1073400077 4103000642 1072762422 1446170605 1072828225 2626904048 1073096349 787048638 1073597594 911588237 1072953144 271870086 1073290978 1047360370 1073346157 1872092527 1072822122 2841293698 1073002754 365773320 1073623173 3533126773 1073023548 1827082166 1073011537 769948162 1072741453 716869697 1073421964 950558058 1073688175 3654654741 1073077866 2148938756 1073636271 4042145415 1073729005 2295127568 1073051710 2538781685 1073500775 1382221002 1073134056 84184398 1072699157 1424487447 1073581512 419336873 1073657082 3569483343 1073003194 4070398286 1073300428 4070981007 1072944187 756286778 1073738055 2998212970 1073014133 462886270 1072731246 3544532359 1073371748 3720216818 1073530166 857383700 1073027294 2603143961 1073033720 3719393042 1073014678 3871031172 1073611172 3167825463 1073413837 3430927282 1073037455 2813514352 1073187562 1890932001 1072709290 3303417437 1073036901 1339564205 1073642312 2538448638 1073008042 1026462913 1073603981 1900392973 1072983365 4219218825 1073730572 729915534 1072743555 1592137825 1073699851 3580755983 1073180566 3646051161 1073621980 1888726728 1072884180 2759076898 1072988631 781657975 1072742798 539597383 1072933770 2862823903 1073461460 137639100 1073419163 1282995020 1073635629 2773321850 1073015233 864373926 1072783317 2945299790 1073564429 942801054 1073065933 469421843 1073736865 1205751158 1072817032 2557468817 1073741663 284681309 1073694428 3705796569 1073080815 2784424690 1073534939 87996075 1073165948 4251187390 1073694412 4133058395 1073171507 4148682519 1072914063 1438363651 1073586842 379154910 1072847866 1590169437 1072855295 3490089895 1073313887 2705421280 1073085513 1607354295 1072886471 2501280363 1073136524 1603739927 1072957178 1195334651 1072864186 3489732441 1073038891 1352657795 1072828769 19676344 1073018085 3103839646 1073314627 959564690 1073526279 1963499755 1073449889 250981548 1073668260 1777143703 1072842316 1134371421 1073057027 3860630533 1072887996 3065684433 1072813724 2169295742 1072773648 3514099379 1072862237 2637450043 1072749923 1458646333 1072947546 3991056209 1073352675 398024247 1073245696 456978228 1073685482 1275860529 1073446874 1104928121 1073349174 2709807511 1073414285 1001292837 1073391486 333779909 1072985692 3296251806 1073229593 4052332837 1073177524 3347382464 1072811729 1993826165 1072826950 2930738656 1072797162 3421648372 1073246843 159529425 1073067140 1822199323 1072821862 947562513 1072788222 2999108474 1073410975 3001267519 1073014979 2200426417 1072697229 3839301019 1073211197 653930178 1072821156 347931826 1073260473 3220160560 1072908029 2060537181 1073148903 1819201266 1072725052 752057633 1073712872 1284664544 1073018908 4061523052 1073715276 1678059209 1073120880 1563127687 1073397828 1073017791 1073448950 2160732782 1072736393 98102556 1073574247 2980862331 1073495372 10947338 1073388566 235712746 1073130536 1428538253 1073444911 1034331703 1073135276 1193514266 1073399517 2047530239 1073256035 1763468142 1073656778 95599117 1072831138 510292077 1073359403 2867275526 1073739478 1688604336 1073128745 1834286853 1073632701 1912869948 1073622452 2874594033 1073549554 2314352708 1073707463 1928987767 1073355679 156479999 1073107923 427377340 1073604020 3759005145 1073008275 2186399455 1073470828 27260339 1073631507 2972862105 1072875544 3306058547 1073674887 4243502 1073068761 4219093378 1072818031 2557302325 1073596249 296768555 1073125110 541062411 1073558141 8361674 1072788178 2747074052 1072706485 833875430 1072882109 2173602389 1072846141 1462039115 1073037234 1842330282 1073192077 1623547146 1072931134 718827894 1072939088 2939061236 1073584483 1164526291 1073138367 3530317869 1073444316 1933624563 1072996789 3306818729 1073206511 3465916374 1073208069 770688873 1073187945 1190230823 1072729827 2978207685 1073260241 1919240575 1072738920 4133661157 1073166622 3541555338 1073639985 3200451429 1073296053 2148722180 1073548242 2744498149 1073643883 1743594613 1073269305 3265447442 1073042739 3018353724 1073682837 1469213866 1073277068 4004154164 1073405891 1275293170 1072905879 4237407126 1073252636 808418950 1073598273 3352491937 1072753050 2120097613 1072889002 579900871 1073040505 3264609359 1073727315 741502134 1073187984 1392942119 1073154740 3769930099 1073043915 3825224772 1072940924 1112532450 1072821755 2547148240 1073167418 1931659309 1073124486 2849541086 1072819160 240941813 1072803712 3038640263 1073301050 963999170 1072908536 1707506099 1073606863 1877868468 1072821515 1065662759 1073287087 1700024633 1072995875 619690025 1073209278 2551852602 1072696157 2222723748 1072906116 1927104135 1073194953 2863380179 1073537077 2292713055 1072735008 2272466554 1073455406 2373215093 1073551764 3324063296 1073422970 2302478549 1073020979 1226262167 1073610915 3810494412 1072757930 3598016388 1072968968 3537807466 1072707226 1704779161 1073671798 3085424591 1073315979 585655719 1073193844 3060235115 1073091386 1863225538 1073616828 2550257447 1073138604 1041018708 1073698931 2550281390 1073091244 684679500 1073225758 1124361632 1072992252 3453512710 1072896846 2217085102 1073364366 2210679916 1072698927 313798325 1073055347 160295651 1073721031 2919317005 1073225837 2914657176 1073576644 3628120085 1073475641 1067340581 1073546013 340517196 1073724752 1127352683 1072769370 1492607570 1073392139 4135266509 1072867941 47699585 1072720565 2696229633 1072920700 4026883948 1073401517 1563530900 1073127246 2450531703 1073047787 3190069830 1073274034 654254270 1072925380 2415086862 1073508836 2610776490 1073236289 2122340525 1073009911 2785746802 1073338598 1350136126 1073311616 3970399521 1072852344 3106047532 1073554151 2582386806 1072695066 981697222 1072785304 3195759033 1073700288 2921106626 1073092172 183150695 1073252808 4099644845 1073456800 1288824535 1072940897 1563673146 1073411168 2496781743 1073338375 2962768285 1073223705 1576579287 1072922059 550057400 1073582928 2862331727 1073242743 2852012108 1072891435 2627580467 1073358635 3211577202 1073355904 3039848443 1073447954 3913185655 1073199284 2600647611 1073686940 827096734 1073585076 1554652000 1073406528 4165811413 1073244527 441484542 1072780555 2536639643 1073409915 2310341371 1073452160 114457467 1073379111 2815515709 1073106406 3442879574 1072805611 2247673049 1072875215 1461815981 1073341895 67919517 1073612505 4179474298 1072753058 2515614785 1073709826 124095440 1072847200 1645148762 1072916829 830435430 1073499794 3629871842 1073005476 2223287807 1073122271 3292803050 1072761672 3826188126 1073616228 3721761610 1073580536 3707133827 1073494701 1950134628 1072919780 1522092269 1073542864 1655081062 1073465610 811524494 1072839924 3516415211 1073710058 4222427839 2995058703 2624364569 3711061605 
 ToolSvc.tool1        INFO CaloEntrance not found 
 ToolSvc.tool1        INFO CaloEntrance not found 
 ToolSvc.tool1        INFO CaloEntrance not found 
@@ -577,10 +575,9 @@ testalg1             INFO Finalizing testalg1...
 IncidentProcAlg2     INFO Finalize
 AtlasTrackingGe...   INFO finalize() successful.
 AtlasFieldSvc        INFO finalize() successful
-AtDSFMTGenSvc        INFO  FINALISING 
 PyComponentMgr       INFO Finalizing PyComponentMgr...
 IdDictDetDescrCnv    INFO in finalize
-IOVDbFolder          INFO Folder /EXT/DCS/MAGNETS/SENSORDATA (AttrListColl) db-read 1/2 objs/chan/bytes 4/4/20 ((     0.07 ))s
+IOVDbFolder          INFO Folder /EXT/DCS/MAGNETS/SENSORDATA (AttrListColl) db-read 1/2 objs/chan/bytes 4/4/20 ((     0.06 ))s
 IOVDbFolder          INFO Folder /GLOBAL/BField/Maps (AttrListColl) db-read 1/1 objs/chan/bytes 3/3/202 ((     0.06 ))s
 IOVDbFolder          INFO Folder /GLOBAL/TrackingGeo/LayerMaterialV2 (PoolRef) db-read 1/1 objs/chan/bytes 1/1/231 ((     0.00 ))s
 IOVDbFolder          INFO Folder /LAR/Align (PoolRef) db-read 1/1 objs/chan/bytes 1/1/170 ((     0.06 ))s
@@ -596,12 +593,12 @@ IOVDbFolder          INFO Folder /TILE/OFL02/STATUS/ADC (AttrListColl) db-read 1
 IOVDbFolder          INFO Folder /TILE/OFL02/TIME/CHANNELOFFSET/PHY (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/96 ((     0.00 ))s
 IOVDbFolder          INFO Folder /TILE/ONL01/STATUS/ADC (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/76 ((     0.00 ))s
 IOVDbFolder          INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 1/1 objs/chan/bytes 1/1/195 ((     0.00 ))s
-IOVDbSvc             INFO  bytes in ((      0.30 ))s
+IOVDbSvc             INFO  bytes in ((      0.29 ))s
 IOVDbSvc             INFO Connection sqlite://;schema=mycool.db;dbname=OFLP200 : nConnect: 0 nFolders: 0 ReadTime: ((     0.00 ))s
 IOVDbSvc             INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 2 nFolders: 2 ReadTime: ((     0.06 ))s
 IOVDbSvc             INFO Connection COOLOFL_TILE/OFLP200 : nConnect: 2 nFolders: 11 ReadTime: ((     0.10 ))s
-IOVDbSvc             INFO Connection COOLOFL_GLOBAL/OFLP200 : nConnect: 2 nFolders: 2 ReadTime: ((     0.07 ))s
-IOVDbSvc             INFO Connection COOLOFL_DCS/OFLP200 : nConnect: 2 nFolders: 1 ReadTime: ((     0.07 ))s
+IOVDbSvc             INFO Connection COOLOFL_GLOBAL/OFLP200 : nConnect: 2 nFolders: 2 ReadTime: ((     0.06 ))s
+IOVDbSvc             INFO Connection COOLOFL_DCS/OFLP200 : nConnect: 2 nFolders: 1 ReadTime: ((     0.06 ))s
 TileInfoLoader       INFO TileInfoLoader::finalize()
 AthDictLoaderSvc     INFO in finalize...
 ToolSvc              INFO Removing all tools created by ToolSvc
@@ -622,9 +619,9 @@ ToolSvc.Trackin...   INFO finalize() successful
 *****Chrono*****     INFO ****************************************************************************************************
 *****Chrono*****     INFO  The Final CPU consumption ( Chrono ) Table (ordered)
 *****Chrono*****     INFO ****************************************************************************************************
-cObjR_ALL            INFO Time User   : Tot=  250 [ms] Ave/Min/Max= 83.3(+-   91)/    0/  210 [ms] #=  3
-cObj_ALL             INFO Time User   : Tot=  350 [ms] Ave/Min/Max= 20.6(+- 57.6)/    0/  240 [ms] #= 17
-ChronoStatSvc        INFO Time User   : Tot= 30.5  [s]                                             #=  1
+cObjR_ALL            INFO Time User   : Tot=  240 [ms] Ave/Min/Max=   80(+- 86.4)/    0/  200 [ms] #=  3
+cObj_ALL             INFO Time User   : Tot=  320 [ms] Ave/Min/Max= 18.8(+- 52.9)/    0/  220 [ms] #= 17
+ChronoStatSvc        INFO Time User   : Tot= 29.4  [s]                                             #=  1
 *****Chrono*****     INFO ****************************************************************************************************
 ChronoStatSvc.f...   INFO  Service finalized successfully 
 ApplicationMgr       INFO Application Manager Finalized successfully
diff --git a/Simulation/FastShower/FastCaloSim/src/FastShowerCellBuilderTool.cxx b/Simulation/FastShower/FastCaloSim/src/FastShowerCellBuilderTool.cxx
index a6f9d6b9db12494fb53055c9920aef942d2360cc..b8e20225b9572833e18e147824082794c8897d54 100755
--- a/Simulation/FastShower/FastCaloSim/src/FastShowerCellBuilderTool.cxx
+++ b/Simulation/FastShower/FastCaloSim/src/FastShowerCellBuilderTool.cxx
@@ -35,6 +35,7 @@
 //#include "TruthHelper/IsGenNonInteracting.h"
 
 #include "PathResolver/PathResolver.h"
+#include "AthenaKernel/RNGWrapper.h"
 
 #include "CaloEvent/CaloCellContainer.h"
 #include "CaloDetDescr/CaloDetDescrManager.h"
@@ -115,7 +116,7 @@ FastShowerCellBuilderTool::FastShowerCellBuilderTool(const std::string& type, co
   , m_DB_dirname(0)
   , m_coolhistsvc("CoolHistSvc", name)
   , m_partPropSvc("PartPropSvc", name)
-  , m_rndmSvc("AtDSFMTGenSvc", name)
+  , m_rndmSvc("AthRNGSvc", name)
   , m_extrapolator("")
   , m_caloSurfaceHelper("")
   , m_calo_tb_coord("TBCaloCoordinate")
@@ -381,7 +382,7 @@ StatusCode FastShowerCellBuilderTool::initialize()
   ATH_CHECK(m_rndmSvc.retrieve());
 
   //Get own engine with own seeds:
-  m_randomEngine = m_rndmSvc->GetEngine(m_randomEngineName);
+  m_randomEngine = m_rndmSvc->getEngine(this, m_randomEngineName);
   if (!m_randomEngine) {
     ATH_MSG_ERROR("Could not get random engine '" << m_randomEngineName << "'");
     return StatusCode::FAILURE;
@@ -1176,7 +1177,7 @@ FastShowerCellBuilderTool::process_particle(CaloCellContainer* theCellContainer,
                                             FastShowerInfoContainer* fastShowerInfoContainer,
                                             TRandom3& rndm,
                                             Stats& stats,
-                                            const EventContext& /*ctx*/) const
+                                            const EventContext& ctx) const
 {
   // no intersections with Calo layers found : abort;
   if(!hitVector || !hitVector->size())  {
@@ -1874,8 +1875,9 @@ FastShowerCellBuilderTool::process_particle(CaloCellContainer* theCellContainer,
             }
           */
 
+          CLHEP::HepRandomEngine* engine = m_randomEngine->getEngine (ctx);
           double rndfactor=-1;
-          while(rndfactor<=0) rndfactor=CLHEP::RandGaussZiggurat::shoot(m_randomEngine,1.0,smaple_err/sqrt(ecell/1000));
+          while(rndfactor<=0) rndfactor=CLHEP::RandGaussZiggurat::shoot(engine,1.0,smaple_err/sqrt(ecell/1000));
           ecell*=rndfactor;
           //          if(ecell<0) ecell=0;
           //          log<<" Esmear="<<ecell<<endmsg;
@@ -2553,19 +2555,18 @@ StatusCode FastShowerCellBuilderTool::process(CaloCellContainer* theCellContaine
   return StatusCode::SUCCESS;
 }
 
-StatusCode FastShowerCellBuilderTool::setupEvent (const EventContext& /*ctx*/,
+StatusCode FastShowerCellBuilderTool::setupEvent (const EventContext& ctx,
                                                   TRandom3& rndm) const
 {
-  m_rndmSvc->print(m_randomEngineName);
+  m_rndmSvc->printEngineState(this,m_randomEngineName);
   unsigned int rseed=0;
+  CLHEP::HepRandomEngine* engine = m_randomEngine->getEngine(ctx);
   while(rseed==0) {
-    rseed=(unsigned int)( CLHEP::RandFlat::shoot(m_randomEngine) * std::numeric_limits<unsigned int>::max() );
+    rseed=(unsigned int)( CLHEP::RandFlat::shoot(engine) * std::numeric_limits<unsigned int>::max() );
   }
-  gRandom->SetSeed(rseed);
   rndm.SetSeed(rseed);
 
-  //if(gRandom) log<<" seed(gRandom="<<gRandom->ClassName()<<")="<<gRandom->GetSeed();
-  //            log<<" seed(rndm="<<rndm.ClassName()<<")="<<rndm.GetSeed();
+  //log<<" seed(rndm="<<rndm.ClassName()<<")="<<rndm.GetSeed();
   //log<< endmsg;
 
   return StatusCode::SUCCESS;
diff --git a/Simulation/FastShower/FastCaloSim/src/ParticleEnergyParametrization.cxx b/Simulation/FastShower/FastCaloSim/src/ParticleEnergyParametrization.cxx
index 4d1a30ff11f458d6d446c5490420cbb9ec503ba4..df3f7af3d11cdb18e85178e159d033b6f19ef351 100755
--- a/Simulation/FastShower/FastCaloSim/src/ParticleEnergyParametrization.cxx
+++ b/Simulation/FastShower/FastCaloSim/src/ParticleEnergyParametrization.cxx
@@ -242,7 +242,6 @@ C                Error return
 }
 
 void ParticleEnergyParametrization::DiceParticle(ParticleEnergyShape& p,TRandom& rand) const {
-  TRandom& rand2 = *gRandom;
   if(!m_Ecal_vs_dist) {
     p.E=0;
     p.Ecal=0;
@@ -250,7 +249,7 @@ void ParticleEnergyParametrization::DiceParticle(ParticleEnergyShape& p,TRandom&
     p.dist000=0;
     return;
   }
-  GetRandom2 (rand2, *m_Ecal_vs_dist, p.dist_in, p.Ecal);
+  GetRandom2 (rand, *m_Ecal_vs_dist, p.dist_in, p.Ecal);
   int distbin=m_Ecal_vs_dist->FindBin(p.dist_in);
   if(distbin<1) distbin=1;
   if(distbin>m_Ecal_vs_dist->GetNbinsX()) distbin=m_Ecal_vs_dist->GetNbinsX();
@@ -258,11 +257,11 @@ void ParticleEnergyParametrization::DiceParticle(ParticleEnergyShape& p,TRandom&
   double xmin= m_Ecal_vs_dist->GetXaxis()->GetBinLowEdge(distbin);
   double xmax= m_Ecal_vs_dist->GetXaxis()->GetBinUpEdge(distbin);
 
-  //p.dist_in = GetRandomInBinRange(rand2, xmin,xmax ,(TH1F*)m_h_layer_d_fine);
+  //p.dist_in = GetRandomInBinRange(rand, xmin,xmax ,(TH1F*)m_h_layer_d_fine);
   if(m_h_layer_d_fine) {
     //cout<<" fine hist ptr="<<m_h_layer_d_fine<<endl;
     //cout<<" fine hist="<<m_h_layer_d_fine->GetName()<<" : "<<m_h_layer_d_fine->GetTitle()<<endl;
-    p.dist_in = GetRandomInBinRange(rand2, xmin,xmax ,(TH1*) m_h_layer_d_fine);
+    p.dist_in = GetRandomInBinRange(rand, xmin,xmax ,(TH1*) m_h_layer_d_fine);
   }
 
   const ParticleEnergyParametrizationInDistbin* shapeindist=DistPara(distbin);
@@ -320,7 +319,7 @@ void ParticleEnergyParametrization::DiceParticle(ParticleEnergyShape& p,TRandom&
       p.fcal_layer[i]=0;
       TH1* h1=shapeindist->m_ElayerProp[i];
       if(h1) {
-        double f=GetRandom(rand2, *h1)+shapeindist->m_mean(i);
+        double f=GetRandom(rand, *h1)+shapeindist->m_mean(i);
         if(f<0) f=0;
         p.fcal_layer[i]=f;
         p.fcal_tot+=f;
@@ -333,7 +332,7 @@ void ParticleEnergyParametrization::DiceParticle(ParticleEnergyShape& p,TRandom&
 //    p.fcal_layer[i]=0;
     TH1* h1=shapeindist->m_ElayerProp[i];
     if(h1) {
-      double f=GetRandom(rand2, *h1)+shapeindist->m_mean(i);
+      double f=GetRandom(rand, *h1)+shapeindist->m_mean(i);
       if(f<0) f=0;
 //        p.fcal_layer[i]=f;
       p.fcal_tot_uncor+=f;
diff --git a/Simulation/G4Atlas/G4AtlasApps/python/callbacks.py b/Simulation/G4Atlas/G4AtlasApps/python/callbacks.py
index ed46cfb5f4a90e0c06882d2c3458af7e9ab9aec6..5bfea1d0e246cdf2e2d94be3388c3945cbce027e 100644
--- a/Simulation/G4Atlas/G4AtlasApps/python/callbacks.py
+++ b/Simulation/G4Atlas/G4AtlasApps/python/callbacks.py
@@ -51,3 +51,9 @@ def add_EnergyConservationTest():
     # Enable the energy conservation test action
     simFlags.OptionalUserActionList.addAction(
         'G4UA::EnergyConservationTestTool')
+
+## Range cuts for gamma processes (conv, phot, compt)
+## these are off by default in Geant4
+def turn_on_gamma_range_cuts():
+    from G4AtlasApps.SimFlags import simFlags
+    simFlags.G4Commands += ['/process/em/applyCuts true']
diff --git a/Simulation/G4Utilities/G4DebuggingTools/src/StepHistogram.cxx b/Simulation/G4Utilities/G4DebuggingTools/src/StepHistogram.cxx
index 8c603afaccf2a4d0f95123a1cb27215120fdace9..31120d091e6c29aa0c388b7ad3f24ba3afdd9307 100644
--- a/Simulation/G4Utilities/G4DebuggingTools/src/StepHistogram.cxx
+++ b/Simulation/G4Utilities/G4DebuggingTools/src/StepHistogram.cxx
@@ -15,6 +15,7 @@
 #include "SimHelpers/ServiceAccessor.h"
 
 #include "G4Step.hh"
+#include "G4StepPoint.hh"
 #include "G4VProcess.hh"
 
 #include <iostream>
@@ -29,22 +30,42 @@ namespace G4UA{
   
   void StepHistogram::UserSteppingAction(const G4Step * aStep){
 
+    // track
     G4Track *tr = aStep->GetTrack();
-    G4ThreeVector myPos = aStep->GetPostStepPoint()->GetPosition();
 
+    // pre-step point
+    G4StepPoint *PreStepPoint = aStep->GetPreStepPoint();
+
+    // post-step point
+    G4StepPoint *PostStepPoint = aStep->GetPostStepPoint();
+
+    // pre-step kinetic energy
+    double stepKinetic = PreStepPoint->GetKineticEnergy();
+
+    // post-step kinetic energy
+    double postStepKinetic = PostStepPoint->GetKineticEnergy();
+
+    // pre-step position
+    G4ThreeVector myPos = PreStepPoint->GetPosition();
+
+    // particle name
     G4String particleName = "nucleus";
     if (!(tr->GetDefinition()->GetParticleType() == "nucleus"))
       particleName = G4DebuggingHelpers::ClassifyParticle(tr->GetParticleDefinition());
 
-    G4String volumeName = tr->GetVolume()->GetName();
+    // pre-step volume
+    G4String volumeName = PreStepPoint->GetPhysicalVolume()->GetName();
     volumeName = G4DebuggingHelpers::ClassifyVolume(volumeName);
 
-    G4String materialName = tr->GetMaterial()->GetName();
+    // pre-step material
+    G4String materialName = PreStepPoint->GetMaterial()->GetName();
     materialName = G4DebuggingHelpers::ClassifyMaterial(materialName);
 
-    G4String processName = aStep->GetPostStepPoint()->GetProcessDefinedStep() ?
-                           aStep->GetPostStepPoint()->GetProcessDefinedStep()->GetProcessName() : "Unknown";
+    // process name (uses post-step point)
+    G4String processName = PostStepPoint->GetProcessDefinedStep() ?
+                           PostStepPoint->GetProcessDefinedStep()->GetProcessName() : "Unknown";
 
+    // secondaries
     const std::vector<const G4Track*>* secondaries = aStep->GetSecondaryInCurrentStep();
 
     // 2D map
@@ -75,13 +96,23 @@ namespace G4UA{
 
     // step kinetic energy
     InitializeFillHistogram(m_report.histoMapMap_vol_stepKineticEnergy, "vol_stepKineticEnergy", particleName, volumeName,
-                            1000, -9, 7, log10(tr->GetKineticEnergy()), 1.);
+                            1000, -9, 7, log10(stepKinetic), 1.);
     InitializeFillHistogram(m_report.histoMapMap_mat_stepKineticEnergy, "mat_stepKineticEnergy", particleName, materialName,
-                            1000, -9, 7, log10(tr->GetKineticEnergy()), 1.);
+                            1000, -9, 7, log10(stepKinetic), 1.);
     InitializeFillHistogram(m_report.histoMapMap_prc_stepKineticEnergy, "prc_stepKineticEnergy", particleName, processName,
-                            1000, -9, 7, log10(tr->GetKineticEnergy()), 1.);
-    InitializeFillHistogram(m_report.histoMapMap_stepSecondaryKinetic, "stepKineticEnergy", particleName, "AllATLAS",
-                            1000, -9, 7, log10(tr->GetKineticEnergy()), 1.);
+                            1000, -9, 7, log10(stepKinetic), 1.);
+    InitializeFillHistogram(m_report.histoMapMap_stepKinetic, "stepKineticEnergy", particleName, "AllATLAS",
+                            1000, -9, 7, log10(stepKinetic), 1.);
+
+    // post step kinetic energy
+    InitializeFillHistogram(m_report.histoMapMap_vol_postStepKineticEnergy, "vol_postStepKineticEnergy", particleName, volumeName,
+                            1000, -9, 7, log10(postStepKinetic), 1.);
+    InitializeFillHistogram(m_report.histoMapMap_mat_postStepKineticEnergy, "mat_postStepKineticEnergy", particleName, materialName,
+                            1000, -9, 7, log10(postStepKinetic), 1.);
+    InitializeFillHistogram(m_report.histoMapMap_prc_postStepKineticEnergy, "prc_postStepKineticEnergy", particleName, processName,
+                            1000, -9, 7, log10(postStepKinetic), 1.);
+    InitializeFillHistogram(m_report.histoMapMap_postStepKinetic, "postStepKineticEnergy", particleName, "AllATLAS",
+                            1000, -9, 7, log10(postStepKinetic), 1.);
 
     // step energy deposit
     InitializeFillHistogram(m_report.histoMapMap_vol_stepEnergyDeposit, "vol_stepEnergyDeposit", particleName, volumeName,
@@ -117,13 +148,12 @@ namespace G4UA{
 
     // first step (after initial step)
     if (tr->GetCurrentStepNumber()==1) {
-      m_initialKineticEnergyOfStep = tr->GetKineticEnergy();
-      m_initialKineticEnergyOfStep += aStep->GetTotalEnergyDeposit();
-      for (const auto &track : *secondaries) {
-        m_initialKineticEnergyOfStep += track->GetKineticEnergy();
-      }
+      // initial kinetic energy
+      m_initialKineticEnergyOfStep = stepKinetic;
+
       // save track ID for checking if we later have the same track
       m_trackID = tr->GetTrackID();
+
       // initial energy
       InitializeFillHistogram(m_report.histoMapMap_InitialE, "InitialE", particleName, "AllATLAS",
                               1000, -9, 7, log10(m_initialKineticEnergyOfStep), 1.0);
@@ -229,6 +259,7 @@ namespace G4UA{
   void StepHistogram::Report::merge(const Report & rep) {
     mergeMaps(histoMapMap_vol_stepSize, rep.histoMapMap_vol_stepSize);
     mergeMaps(histoMapMap_vol_stepKineticEnergy, rep.histoMapMap_vol_stepKineticEnergy);
+    mergeMaps(histoMapMap_vol_postStepKineticEnergy, rep.histoMapMap_vol_postStepKineticEnergy);
     mergeMaps(histoMapMap_vol_stepPseudorapidity, rep.histoMapMap_vol_stepPseudorapidity);
     mergeMaps(histoMapMap_vol_stepEnergyDeposit, rep.histoMapMap_vol_stepEnergyDeposit);
     mergeMaps(histoMapMap_vol_stepEnergyNonIonDeposit, rep.histoMapMap_vol_stepEnergyNonIonDeposit);
@@ -236,6 +267,7 @@ namespace G4UA{
 
     mergeMaps(histoMapMap_mat_stepSize, rep.histoMapMap_mat_stepSize);
     mergeMaps(histoMapMap_mat_stepKineticEnergy, rep.histoMapMap_mat_stepKineticEnergy);
+    mergeMaps(histoMapMap_mat_postStepKineticEnergy, rep.histoMapMap_mat_postStepKineticEnergy);
     mergeMaps(histoMapMap_mat_stepPseudorapidity, rep.histoMapMap_mat_stepPseudorapidity);
     mergeMaps(histoMapMap_mat_stepEnergyDeposit, rep.histoMapMap_mat_stepEnergyDeposit);
     mergeMaps(histoMapMap_mat_stepEnergyNonIonDeposit, rep.histoMapMap_mat_stepEnergyNonIonDeposit);
@@ -243,6 +275,7 @@ namespace G4UA{
 
     mergeMaps(histoMapMap_prc_stepSize, rep.histoMapMap_prc_stepSize);
     mergeMaps(histoMapMap_prc_stepKineticEnergy, rep.histoMapMap_prc_stepKineticEnergy);
+    mergeMaps(histoMapMap_prc_postStepKineticEnergy, rep.histoMapMap_prc_postStepKineticEnergy);
     mergeMaps(histoMapMap_prc_stepPseudorapidity, rep.histoMapMap_prc_stepPseudorapidity);
     mergeMaps(histoMapMap_prc_stepEnergyDeposit, rep.histoMapMap_prc_stepEnergyDeposit);
     mergeMaps(histoMapMap_prc_stepEnergyNonIonDeposit, rep.histoMapMap_prc_stepEnergyNonIonDeposit);
@@ -251,7 +284,8 @@ namespace G4UA{
     mergeMaps(histoMapMap_numberOfSteps, rep.histoMapMap_numberOfSteps);
     mergeMaps(histoMapMap_numberOfStepsPerInitialE, rep.histoMapMap_numberOfStepsPerInitialE);
     mergeMaps(histoMapMap_InitialE, rep.histoMapMap_InitialE);
-    mergeMaps(histoMapMap_stepSecondaryKinetic, rep.histoMapMap_stepSecondaryKinetic);
+    mergeMaps(histoMapMap_stepKinetic, rep.histoMapMap_stepKinetic);
+    mergeMaps(histoMapMap_postStepKinetic, rep.histoMapMap_postStepKinetic);
 
     mergeMaps(histoMapMap2D_vol_RZ, rep.histoMapMap2D_vol_RZ);
     mergeMaps(histoMapMap2D_mat_RZ, rep.histoMapMap2D_mat_RZ);
diff --git a/Simulation/G4Utilities/G4DebuggingTools/src/StepHistogram.h b/Simulation/G4Utilities/G4DebuggingTools/src/StepHistogram.h
index 9414b971e623e33b641dfa0739f0e9465db37786..9c0206d131d8634dc2693bde900b3130b8c609ea 100644
--- a/Simulation/G4Utilities/G4DebuggingTools/src/StepHistogram.h
+++ b/Simulation/G4Utilities/G4DebuggingTools/src/StepHistogram.h
@@ -44,6 +44,7 @@ namespace G4UA{
       // distributions per volume per particle type
       HistoMapMap_t histoMapMap_vol_stepSize;
       HistoMapMap_t histoMapMap_vol_stepKineticEnergy;
+      HistoMapMap_t histoMapMap_vol_postStepKineticEnergy;
       HistoMapMap_t histoMapMap_vol_stepPseudorapidity;
       HistoMapMap_t histoMapMap_vol_stepEnergyDeposit;
       HistoMapMap_t histoMapMap_vol_stepEnergyNonIonDeposit;
@@ -52,6 +53,7 @@ namespace G4UA{
       // distributions per material per particle type
       HistoMapMap_t histoMapMap_mat_stepSize;
       HistoMapMap_t histoMapMap_mat_stepKineticEnergy;
+      HistoMapMap_t histoMapMap_mat_postStepKineticEnergy;
       HistoMapMap_t histoMapMap_mat_stepPseudorapidity;
       HistoMapMap_t histoMapMap_mat_stepEnergyDeposit;
       HistoMapMap_t histoMapMap_mat_stepEnergyNonIonDeposit;
@@ -60,6 +62,7 @@ namespace G4UA{
       // distributions per process per particle type
       HistoMapMap_t histoMapMap_prc_stepSize;
       HistoMapMap_t histoMapMap_prc_stepKineticEnergy;
+      HistoMapMap_t histoMapMap_prc_postStepKineticEnergy;
       HistoMapMap_t histoMapMap_prc_stepPseudorapidity;
       HistoMapMap_t histoMapMap_prc_stepEnergyDeposit;
       HistoMapMap_t histoMapMap_prc_stepEnergyNonIonDeposit;
@@ -69,7 +72,8 @@ namespace G4UA{
       HistoMapMap_t histoMapMap_numberOfSteps;
       HistoMapMap_t histoMapMap_numberOfStepsPerInitialE;
       HistoMapMap_t histoMapMap_InitialE;
-      HistoMapMap_t histoMapMap_stepSecondaryKinetic;
+      HistoMapMap_t histoMapMap_stepKinetic;
+      HistoMapMap_t histoMapMap_postStepKinetic;
 
       // 2D maps
       HistoMapMap_t histoMapMap2D_vol_RZ;
diff --git a/Simulation/G4Utilities/G4DebuggingTools/src/StepHistogramTool.cxx b/Simulation/G4Utilities/G4DebuggingTools/src/StepHistogramTool.cxx
index 4ba1e34d061b6a1fa97aab3d7d843610d556908e..2b31f9881bcc827345f37fca83873afc19ee7ea1 100644
--- a/Simulation/G4Utilities/G4DebuggingTools/src/StepHistogramTool.cxx
+++ b/Simulation/G4Utilities/G4DebuggingTools/src/StepHistogramTool.cxx
@@ -61,6 +61,7 @@ namespace G4UA{
     if (m_histSvc) {
       BookHistograms(report.histoMapMap_vol_stepSize, "stepLength/", "volumes/");
       BookHistograms(report.histoMapMap_vol_stepKineticEnergy, "stepKineticEnergy/", "volumes/");
+      BookHistograms(report.histoMapMap_vol_postStepKineticEnergy, "postStepKineticEnergy/", "volumes/");
       BookHistograms(report.histoMapMap_vol_stepPseudorapidity, "stepPseudorapidity/", "volumes/");
       BookHistograms(report.histoMapMap_vol_stepEnergyDeposit, "stepEnergyDeposit/", "volumes/");
       BookHistograms(report.histoMapMap_vol_stepEnergyNonIonDeposit, "stepEnergyNonIonDeposit/", "volumes/");
@@ -69,6 +70,7 @@ namespace G4UA{
       BookHistograms(report.histoMapMap_mat_stepSize, "stepLength/", "materials/");
       BookHistograms(report.histoMapMap_mat_stepKineticEnergy, "stepKineticEnergy/", "materials/");
       BookHistograms(report.histoMapMap_mat_stepPseudorapidity, "stepPseudorapidity/", "materials/");
+      BookHistograms(report.histoMapMap_mat_postStepKineticEnergy, "postStepKineticEnergy/", "materials/");
       BookHistograms(report.histoMapMap_mat_stepEnergyDeposit, "stepEnergyDeposit/", "materials/");
       BookHistograms(report.histoMapMap_mat_stepEnergyNonIonDeposit, "stepEnergyNonIonDeposit/", "materials/");
       BookHistograms(report.histoMapMap_mat_stepSecondaryKinetic, "stepSecondaryKinetic/", "materials/");
@@ -76,6 +78,7 @@ namespace G4UA{
       BookHistograms(report.histoMapMap_prc_stepSize, "stepLength/", "processes/");
       BookHistograms(report.histoMapMap_prc_stepKineticEnergy, "stepKineticEnergy/", "processes/");
       BookHistograms(report.histoMapMap_prc_stepPseudorapidity, "stepPseudorapidity/", "processes/");
+      BookHistograms(report.histoMapMap_prc_postStepKineticEnergy, "postStepKineticEnergy/", "processes/");
       BookHistograms(report.histoMapMap_prc_stepEnergyDeposit, "stepEnergyDeposit/", "processes/");
       BookHistograms(report.histoMapMap_prc_stepEnergyNonIonDeposit, "stepEnergyNonIonDeposit/", "processes/");
       BookHistograms(report.histoMapMap_prc_stepSecondaryKinetic, "stepSecondaryKinetic/", "processes/");
@@ -84,7 +87,8 @@ namespace G4UA{
         BookHistograms(report.histoMapMap_numberOfSteps, "numberOfSteps/", "nSteps/");
         BookHistograms(report.histoMapMap_numberOfStepsPerInitialE, "numberOfStepsPerInitialE/", "nSteps/");
         BookHistograms(report.histoMapMap_InitialE, "InitialE/", "nSteps/");
-        BookHistograms(report.histoMapMap_stepSecondaryKinetic, "stepKineticEnergy/", "nSteps/");
+        BookHistograms(report.histoMapMap_stepKinetic, "stepKineticEnergy/", "nSteps/");
+        BookHistograms(report.histoMapMap_postStepKinetic, "postStepKineticEnergy/", "nSteps/");
       }
 
       if (m_config.do2DHistograms) {
diff --git a/Simulation/G4Utilities/G4UserActions/G4UserActions/LooperThresholdSet.h b/Simulation/G4Utilities/G4UserActions/G4UserActions/LooperThresholdSet.h
new file mode 100644
index 0000000000000000000000000000000000000000..89d0499f5e26dcffbda5403ce413b30f6199f8c7
--- /dev/null
+++ b/Simulation/G4Utilities/G4UserActions/G4UserActions/LooperThresholdSet.h
@@ -0,0 +1,44 @@
+/*
+   Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ */
+
+#ifndef G4UserActions_LooperThresholdSet_H
+#define G4UserActions_LooperThresholdSet_H
+
+#include "G4UserRunAction.hh"
+#include "AthenaBaseComps/AthMessaging.h"
+
+#include "G4Run.hh"
+#include "G4ParticleDefinition.hh"
+#include "G4Transportation.hh"
+#include "G4CoupledTransportation.hh"
+#include "G4SystemOfUnits.hh"
+
+namespace G4UA
+{
+
+class LooperThresholdSet : public AthMessaging, public G4UserRunAction
+{
+public:
+
+struct Config
+{
+        double WarningEnergy = 100.0 * CLHEP::MeV;
+        double ImportantEnergy = 250.0 * CLHEP::MeV;
+        int NumberOfTrials = 10;
+};
+
+LooperThresholdSet( const Config& config );
+virtual void BeginOfRunAction( const G4Run* ) override;
+
+private:
+
+Config m_config;
+
+void ChangeLooperParameters( const G4ParticleDefinition* particleDef );
+std::pair<G4Transportation*, G4CoupledTransportation*> findTransportation( const G4ParticleDefinition* particleDef );
+};   // class LooperThresholdSet
+
+} // namespace G4UA
+
+#endif
diff --git a/Simulation/G4Utilities/G4UserActions/G4UserActions/LooperThresholdSetTool.h b/Simulation/G4Utilities/G4UserActions/G4UserActions/LooperThresholdSetTool.h
new file mode 100644
index 0000000000000000000000000000000000000000..8405b065486f385ad2a654e8ec5a9af5cc5e33e8
--- /dev/null
+++ b/Simulation/G4Utilities/G4UserActions/G4UserActions/LooperThresholdSetTool.h
@@ -0,0 +1,54 @@
+/*
+   Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ */
+
+#ifndef G4USERACTIONS_G4UA_LooperThresholdSetTOOL_H
+#define G4USERACTIONS_G4UA_LooperThresholdSetTOOL_H
+
+// System includes
+#include <string>
+
+// Infrastructure includes
+#include "G4AtlasTools/UserActionToolBase.h"
+
+// Local includes
+#include "G4UserActions/LooperThresholdSet.h"
+
+namespace G4UA
+{
+
+/// @class LooperThresholdSetTool
+/// @brief Tool which manages the Looper Threshold options.
+///
+/// Create the LooperThresholdSet for each worker thread
+///
+/// @author Miha Muskinja
+///
+class LooperThresholdSetTool : public UserActionToolBase<LooperThresholdSet>
+{
+
+public:
+
+/// Standard constructor
+LooperThresholdSetTool(const std::string& type, const std::string& name,
+                       const IInterface* parent);
+
+virtual StatusCode initialize() override;
+virtual StatusCode finalize() override;
+
+protected:
+
+/// Create action for this thread
+virtual std::unique_ptr<LooperThresholdSet>
+makeAndFillAction(G4AtlasUserActions&) override final;
+
+private:
+
+/// Configuration parameters
+LooperThresholdSet::Config m_config;
+
+};   // class LooperThresholdSetTool
+
+} // namespace G4UA
+
+#endif
diff --git a/Simulation/G4Utilities/G4UserActions/python/G4UserActionsConfig.py b/Simulation/G4Utilities/G4UserActions/python/G4UserActionsConfig.py
index 799c1f6d005a43409e65e38dec7fe9b4cd28f881..641db08c0fa50451ba9070cca794ce289b230926 100644
--- a/Simulation/G4Utilities/G4UserActions/python/G4UserActionsConfig.py
+++ b/Simulation/G4Utilities/G4UserActions/python/G4UserActionsConfig.py
@@ -108,3 +108,10 @@ def getRadLengthActionTool(name="G4UA::RadLengthActionTool", **kwargs):
         for prop,value in simFlags.UserActionConfig.get_Value()[name].iteritems():
             kwargs.setdefault(prop,value)
     return CfgMgr.G4UA__RadLengthActionTool(name, **kwargs)
+
+def getLooperThresholdSetTool(name="G4UA::LooperThresholdSetTool", **kwargs):
+    from G4AtlasApps.SimFlags import simFlags
+    if name in simFlags.UserActionConfig.get_Value().keys():
+        for prop,value in simFlags.UserActionConfig.get_Value()[name].iteritems():
+            kwargs.setdefault(prop,value)
+    return CfgMgr.G4UA__LooperThresholdSetTool(name, **kwargs)
diff --git a/Simulation/G4Utilities/G4UserActions/python/G4UserActionsConfigDb.py b/Simulation/G4Utilities/G4UserActions/python/G4UserActionsConfigDb.py
index 0a54357fc924d58acf23a57da5c20b18e1a1cbcc..cc35a37919f70cde08f708e8526ec41326f66277 100644
--- a/Simulation/G4Utilities/G4UserActions/python/G4UserActionsConfigDb.py
+++ b/Simulation/G4Utilities/G4UserActions/python/G4UserActionsConfigDb.py
@@ -25,4 +25,4 @@ addTool("G4UserActions.G4UserActionsConfig.getScoringPlaneTool", "G4UA::ScoringP
 addTool("G4UserActions.G4UserActionsConfig.getRadiationMapsMakerTool", "G4UA::RadiationMapsMakerTool")
 addTool("G4UserActions.G4UserActionsConfig.getStoppedParticleActionTool", "G4UA::StoppedParticleActionTool")
 addTool("G4UserActions.G4UserActionsConfig.getRadLengthActionTool", "G4UA::RadLengthActionTool")
-
+addTool("G4UserActions.G4UserActionsConfig.getLooperThresholdSetTool", "G4UA::LooperThresholdSetTool")
diff --git a/Simulation/G4Utilities/G4UserActions/share/preInclude.LooperThresholdSet.py b/Simulation/G4Utilities/G4UserActions/share/preInclude.LooperThresholdSet.py
new file mode 100644
index 0000000000000000000000000000000000000000..f802373857581c3bb61908fa73b1423ee984ddfc
--- /dev/null
+++ b/Simulation/G4Utilities/G4UserActions/share/preInclude.LooperThresholdSet.py
@@ -0,0 +1,14 @@
+#########################################################
+#
+# G4UserActions/preInclude.LooperThresholdSet.py
+# @author Miha Muskinja
+#
+# Sets the looper threshold values in transportation processes
+#
+#########################################################
+
+from G4AtlasApps.SimFlags import simFlags
+simFlags.OptionalUserActionList.addAction('G4UA::LooperThresholdSetTool')
+simFlags.UserActionConfig.addConfig('G4UA::LooperThresholdSetTool', 'WarningEnergy', 0)
+simFlags.UserActionConfig.addConfig('G4UA::LooperThresholdSetTool', 'ImportantEnergy', 0)
+simFlags.UserActionConfig.addConfig('G4UA::LooperThresholdSetTool', 'NumberOfTrials', 10)
diff --git a/Simulation/G4Utilities/G4UserActions/src/G4LooperThresholdSet.h b/Simulation/G4Utilities/G4UserActions/src/G4LooperThresholdSet.h
new file mode 100644
index 0000000000000000000000000000000000000000..33939dca5563d4fbee0ecd9d5509431603cbae84
--- /dev/null
+++ b/Simulation/G4Utilities/G4UserActions/src/G4LooperThresholdSet.h
@@ -0,0 +1,29 @@
+/*
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef G4UserActions_LooperThresholdSet_H
+#define G4UserActions_LooperThresholdSet_H
+
+#include "G4UserSteppingAction.hh"
+#include "AthenaBaseComps/AthMessaging.h"
+
+#include "G4Run.hh"
+
+namespace G4UA
+{
+
+  /// @brief Kills Monopoles and QBalls with energy < 1 MeV
+  class LooperThresholdSet : public G4UserSteppingAction, public AthMessaging
+  {
+    public:
+      LooperThresholdSet();
+      virtual void BeginOfRunAction(const G4Run* aRun) override;
+    private:
+      void ChangeLooperParameters(const G4ParticleDefinition* particleDef );
+      std::pair<G4Transportation*, G4CoupledTransportation*> findTransportation( const G4ParticleDefinition* particleDef, bool reportError );
+  }; // class LooperThresholdSet
+
+} // namespace G4UA
+
+#endif
diff --git a/Simulation/G4Utilities/G4UserActions/src/LooperThresholdSet.cxx b/Simulation/G4Utilities/G4UserActions/src/LooperThresholdSet.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..f15310c97158c22648581e48db9a86f1615fc080
--- /dev/null
+++ b/Simulation/G4Utilities/G4UserActions/src/LooperThresholdSet.cxx
@@ -0,0 +1,116 @@
+/*
+   Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ */
+
+#include "G4UserActions/LooperThresholdSet.h"
+#include <iostream>
+
+#include "G4Version.hh"
+
+#include "G4Electron.hh"
+#include "G4ProcessManager.hh"
+
+#include "GaudiKernel/Bootstrap.h"
+#include "GaudiKernel/ISvcLocator.h"
+#include "GaudiKernel/IMessageSvc.h"
+
+namespace G4UA
+{
+
+//---------------------------------------------------------------------------
+LooperThresholdSet::LooperThresholdSet(const Config& config) :
+        AthMessaging(Gaudi::svcLocator()->service<IMessageSvc>("MessageSvc"), "LooperThresholdSet"),
+        m_config(config)
+{
+}
+
+//---------------------------------------------------------------------------
+void LooperThresholdSet::BeginOfRunAction(const G4Run*)
+{
+        ChangeLooperParameters( G4Electron::Electron() );
+}
+
+void LooperThresholdSet::ChangeLooperParameters(const G4ParticleDefinition* particleDef)
+{
+        if( particleDef == nullptr )
+                particleDef = G4Electron::Electron();
+        auto transportPair = findTransportation( particleDef );
+        auto transport = transportPair.first;
+        auto coupledTransport = transportPair.second;
+
+        if( transport != nullptr )
+        {
+                // Change the values of the looping particle parameters of Transportation
+                ATH_MSG_INFO("Setting looper values of G4Transportation process...");
+                if( m_config.WarningEnergy   >= 0.0 ) {
+                        transport->SetThresholdWarningEnergy(  m_config.WarningEnergy );
+                        ATH_MSG_INFO("Set ThresholdWarningEnergy to " << m_config.WarningEnergy);
+                }
+                else
+                        ATH_MSG_WARNING("Invalid ThresholdEnergy: " << m_config.WarningEnergy);
+                if( m_config.ImportantEnergy >= 0.0 ) {
+                        transport->SetThresholdImportantEnergy(  m_config.ImportantEnergy );
+                        ATH_MSG_INFO("Set ImportantEnergy to " << m_config.ImportantEnergy);
+
+                }
+                else
+                        ATH_MSG_WARNING("Invalid ImportantEnergy: " << m_config.ImportantEnergy);
+                if( m_config.NumberOfTrials  > 0 ) {
+                        transport->SetThresholdTrials( m_config.NumberOfTrials );
+                        ATH_MSG_INFO("Set NumberOfTrials to " << m_config.NumberOfTrials);
+
+                }
+                else
+                        ATH_MSG_WARNING("Invalid NumberOfTrials: " << m_config.NumberOfTrials);
+                // Geant4 printout
+#if G4VERSION_NUMBER > 1049
+                transport->ReportLooperThresholds();
+#endif
+        }
+        else if( coupledTransport != nullptr )
+        {
+                // Change the values for Coupled Transport
+                ATH_MSG_INFO("Setting looper values of G4CoupledTransportation process...");
+                if( m_config.WarningEnergy   >= 0.0 ) {
+                        coupledTransport->SetThresholdWarningEnergy(  m_config.WarningEnergy );
+                        ATH_MSG_INFO("Set ThresholdWarningEnergy to " << m_config.WarningEnergy);
+                }
+                else
+                        ATH_MSG_WARNING("Invalid ThresholdEnergy: " << m_config.WarningEnergy);
+                if( m_config.ImportantEnergy >= 0.0 ) {
+                        coupledTransport->SetThresholdImportantEnergy(  m_config.ImportantEnergy );
+                        ATH_MSG_INFO("Set ImportantEnergy to " << m_config.ImportantEnergy);
+
+                }
+                else
+                        ATH_MSG_WARNING("Invalid ImportantEnergy: " << m_config.ImportantEnergy);
+                if( m_config.NumberOfTrials  > 0 ) {
+                        coupledTransport->SetThresholdTrials( m_config.NumberOfTrials );
+                        ATH_MSG_INFO("Set NumberOfTrials to " << m_config.NumberOfTrials);
+
+                }
+                else
+                        ATH_MSG_WARNING("Invalid NumberOfTrials: " << m_config.NumberOfTrials);
+                // Geant4 printout
+#if G4VERSION_NUMBER > 1049
+                transport->ReportLooperThresholds();
+#endif
+        }
+}
+
+std::pair<G4Transportation*, G4CoupledTransportation*>
+LooperThresholdSet::findTransportation( const G4ParticleDefinition* particleDef )
+{
+        const auto *partPM =  particleDef->GetProcessManager();
+
+        G4VProcess* partTransport = partPM->GetProcess("Transportation");
+        auto transport = dynamic_cast<G4Transportation*>(partTransport);
+
+        partTransport = partPM->GetProcess("CoupledTransportation");
+        auto coupledTransport=
+                dynamic_cast<G4CoupledTransportation*>(partTransport);
+
+        return std::make_pair( transport, coupledTransport );
+}
+
+} // namespace G4UA
diff --git a/Simulation/G4Utilities/G4UserActions/src/LooperThresholdSetTool.cxx b/Simulation/G4Utilities/G4UserActions/src/LooperThresholdSetTool.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..52964741a01bf4b3f97a324c15eb3ee136834957
--- /dev/null
+++ b/Simulation/G4Utilities/G4UserActions/src/LooperThresholdSetTool.cxx
@@ -0,0 +1,51 @@
+/*
+   Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ */
+
+#include "G4UserActions/LooperThresholdSetTool.h"
+
+namespace G4UA
+{
+
+//---------------------------------------------------------------------------
+// Constructor
+//---------------------------------------------------------------------------
+LooperThresholdSetTool::LooperThresholdSetTool(const std::string& type, const std::string& name,
+                                               const IInterface* parent) :
+        UserActionToolBase<LooperThresholdSet>(type, name, parent),
+        m_config()
+{
+        declareProperty("WarningEnergy", m_config.WarningEnergy);
+        declareProperty("ImportantEnergy", m_config.ImportantEnergy);
+        declareProperty("NumberOfTrials", m_config.NumberOfTrials);
+}
+
+//---------------------------------------------------------------------------
+// Initialize - temporarily here for debugging
+//---------------------------------------------------------------------------
+StatusCode LooperThresholdSetTool::initialize()
+{
+        ATH_MSG_DEBUG("initialize");
+        return StatusCode::SUCCESS;
+}
+
+StatusCode LooperThresholdSetTool::finalize()
+{
+        ATH_MSG_DEBUG("finalize");
+        return StatusCode::SUCCESS;
+}
+
+
+//---------------------------------------------------------------------------
+// Create the action on request
+//---------------------------------------------------------------------------
+std::unique_ptr<LooperThresholdSet>
+LooperThresholdSetTool::makeAndFillAction(G4AtlasUserActions& actionList)
+{
+        ATH_MSG_DEBUG("Making a LooperThresholdSet action");
+        auto action =  std::make_unique<LooperThresholdSet>(m_config);
+        actionList.runActions.push_back( action.get() );
+        return action;
+}
+
+}
diff --git a/Simulation/G4Utilities/G4UserActions/src/components/G4UserActions_entries.cxx b/Simulation/G4Utilities/G4UserActions/src/components/G4UserActions_entries.cxx
index 2273268922ddb90dac6a9e32c10f0fb4921403c2..20927db73188ab9417076fc7ebbdafafaced6e65 100644
--- a/Simulation/G4Utilities/G4UserActions/src/components/G4UserActions_entries.cxx
+++ b/Simulation/G4Utilities/G4UserActions/src/components/G4UserActions_entries.cxx
@@ -15,6 +15,7 @@
 #include "G4UserActions/ScoringPlaneTool.h"
 #include "G4UserActions/RadiationMapsMakerTool.h"
 #include "G4UserActions/RadLengthActionTool.h"
+#include "G4UserActions/LooperThresholdSetTool.h"
 #include "../TestActionTool.h"
 
 DECLARE_COMPONENT( G4UA::G4SimTimerTool )
@@ -34,4 +35,5 @@ DECLARE_COMPONENT( G4UA::FluxRecorderTool )
 DECLARE_COMPONENT( G4UA::ScoringPlaneTool )
 DECLARE_COMPONENT( G4UA::RadiationMapsMakerTool )
 DECLARE_COMPONENT( G4UA::RadLengthActionTool )
+DECLARE_COMPONENT( G4UA::LooperThresholdSetTool )
 DECLARE_COMPONENT( G4UA::TestActionTool )
diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/python/AdditionalConfig.py b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/python/AdditionalConfig.py
index 2973f8d11c68ccdd76bfe1318269446fa2a4bebe..99b8dd896dbf67d99e49cf5416407dd2f7870b5d 100644
--- a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/python/AdditionalConfig.py
+++ b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/python/AdditionalConfig.py
@@ -716,7 +716,7 @@ def getTimedExtrapolator(name="TimedExtrapolator", **kwargs):
 def getDefaultFastShowerCellBuilderTool(name, **kwargs):
     from G4AtlasApps.SimFlags import simFlags
     from ISF_FastCaloSimServices.ISF_FastCaloSimJobProperties import ISF_FastCaloSimFlags
-    kwargs.setdefault("RandomService", simFlags.RandomSvc() )
+    kwargs.setdefault("RandomService", simFlags.RandomSvcMT() )
     kwargs.setdefault("RandomStreamName", ISF_FastCaloSimFlags.RandomStreamName() )
     kwargs.setdefault("DoSimulWithInnerDetectorTruthOnly", True )
     kwargs.setdefault("ID_cut_off_r",                      [1150] )
diff --git a/Simulation/SimulationJobOptions/share/g4/preInclude.GammaRangeCuts.py b/Simulation/SimulationJobOptions/share/g4/preInclude.GammaRangeCuts.py
new file mode 100644
index 0000000000000000000000000000000000000000..e0b028bf53a543ea2a0159510f9dc4ec40f1edad
--- /dev/null
+++ b/Simulation/SimulationJobOptions/share/g4/preInclude.GammaRangeCuts.py
@@ -0,0 +1,4 @@
+# Turn on range cuts for gamma processes (conv, phot, compt)
+
+from G4AtlasApps import callbacks
+callbacks.turn_on_gamma_range_cuts()
diff --git a/TileCalorimeter/TileCalib/TileCalibBlobPython/share/PlotCalibFromCool.py b/TileCalorimeter/TileCalib/TileCalibBlobPython/share/PlotCalibFromCool.py
index 28502519ed6904ed57fda2535b305ee7e8bc3853..beb29e9eefc7e2d0fb507dc51e5690134a5bf596 100755
--- a/TileCalorimeter/TileCalib/TileCalibBlobPython/share/PlotCalibFromCool.py
+++ b/TileCalorimeter/TileCalib/TileCalibBlobPython/share/PlotCalibFromCool.py
@@ -9,7 +9,7 @@
 
 
 import getopt,sys,os,string,math,re
-os.environ['TERM'] = 'linux' 
+os.environ['TERM'] = 'linux'
 
 def usage():
     print "How to use: ",sys.argv[0]," [OPTION] ... "
@@ -37,11 +37,12 @@ def usage():
     print "-c, --chan=     specify channel to use for 1D plots, default is 0"
     print "-g, --gain=, -a, --adc=  specify adc(gain) to use, default is 0 (low gain)"
     print "-v, --val=,  -i, --ind=  specify index of value to use, default is 0 "
+    print "-C, --cut=      specify additional cut on displayed values"
     print "-s, --schema=   specify schema to use, like 'COOLONL_TILE/CONDBR2' or 'sqlite://;schema=tileSqlite.db;dbname=CONDBR2' or tileSqlite.db"
 
 
-letters = "hr:l:s:t:f:a:g:b:e:o:Pp:Tv:i:m:c:I:A:N:X:Y:Z:n"
-words = ["help","run=","lumi=","schema=","tag=","folder=","adc=","gain=","print","module=","opt=","chan=","begin=","end=","tree","val=","ind=","part=","modmin=","modmax=","chmin=","chmax=","gmin=","gmax=","norm"]
+letters = "hr:l:s:t:f:a:g:b:e:o:Pp:Tv:i:m:c:I:A:N:X:Y:Z:C:n"
+words = ["help","run=","lumi=","schema=","tag=","folder=","adc=","gain=","print","module=","opt=","chan=","begin=","end=","tree","val=","ind=","part=","modmin=","modmax=","chmin=","chmax=","gmin=","gmax=","cut=","norm"]
 try:
     options,args = getopt.getopt(sys.argv[1:],letters,words)
 except getopt.GetoptError, err:
@@ -53,7 +54,7 @@ except getopt.GetoptError, err:
 
 
 
-# defaults 
+# defaults
 schema = 'COOLOFL_TILE/CONDBR2'
 folderPath =  "/TILE/OFL02/CALIB/CIS/LIN"
 tag = "UPD4"
@@ -63,7 +64,7 @@ vsbin = False
 plotopt= "dist"
 save_tree = False
 print_msg = False
-opt2d = False 
+opt2d = False
 partname = "LBA"
 modulename = "LBA01"
 modmin=0
@@ -71,7 +72,7 @@ modmax=9999
 chanmin=0
 chanmax=9999
 gainmin=0
-gainmax=1
+gainmax=0
 mod_n = 0
 chan_n = 0
 gain_n = 0
@@ -83,6 +84,7 @@ lumiNum = 0
 one_run = False
 multi = False
 norm = False
+cut = None
 
 for o, a in options:
     if o in ("-f","--folder"):
@@ -114,30 +116,34 @@ for o, a in options:
         val_n = int(a)
     elif o in ("-p","--part"):
         partname = a
-        opt2d = True
+        modulename = partname+"00"
     elif o in ("-I","--modmin"):
         modmin = int(a)
     elif o in ("-A","--modmax"):
         modmax = int(a)
     elif o in ("-N","--chmin"):
         chanmin = int(a)
+        chan_n = chanmin
     elif o in ("-X","--chmax"):
         chanmax = int(a)
     elif o in ("-Y","--gmin"):
         gainmin = int(a)
+        gain_n = gainmin
     elif o in ("-Z","--gmax"):
         gainmax = int(a)
     elif o in ("-o","--opt"):
         plotopt = a
+    elif o in ("-C","--cut"):
+        cut = a
     elif o in ("-T","--tree"):
-        save_tree = True 
+        save_tree = True
     elif o in ("-P","--print"):
-        print_msg = True 
+        print_msg = True
     elif o in ("-n","--norm"):
-        norm = True 
+        norm = True
     elif o in ("-h","--help"):
         usage()
-        sys.exit(2) 
+        sys.exit(2)
     else:
         assert False, "unhandeled option"
 
@@ -152,15 +158,18 @@ elif plotopt == "2d": opt2d = True; one_run = True
 chan_n=max(0,chan_n)
 gain_n=max(0,gain_n)
 val_n=max(0,val_n)
-
-if opt2d: 
+modmin=max(1,modmin)
+modmax=min(64,modmax)
+chanmin=max(0,chanmin)
+chanmax=min(47,chanmax)
+gainmin=max(0,gainmin)
+gainmax=min(5,gainmax) # up to 6 gains for integrators
+nval=1
+
+if opt2d:
     partname=partname[:3]
     modulename=partname+"00"
-    modmin=max(1,modmin)
-    modmax=min(64,modmax)
-    chanmin=max(0,chanmin)
-    chanmax=min(47,chanmax)
-else: 
+else:
     if len(modulename) < 5 or len(modulename) > 5:
         print "Wrong module name:",modulename
         sys.exit(2)
@@ -168,20 +177,15 @@ else:
     modnum=modulename[3:]
     if modnum.isdigit():
         mod_n=int(modnum)
-        if mod_n<1 or mod_n>64:
+        if mod_n<0 or mod_n>64:
             print "Wrong module name:",modulename
             sys.exit(2)
-        modmin=mod_n
-        modmax=mod_n
+        elif mod_n>0:
+            modmin=mod_n
+            modmax=mod_n
     else:
         print "Wrong module name:",modulename
         sys.exit(2)
-    if plotopt != "print":
-        chanmin=chan_n
-        chanmax=chan_n
-if plotopt != "print":
-    gainmin=gain_n
-    gainmax=gain_n
 
 part_dict = {'AUX':0,'LBA':1,'LBC':2,'EBA':3,'EBC':4,'ALL':5}
 if partname in part_dict:
@@ -193,14 +197,49 @@ else:
     else: print "Wrong module name:",modulename
     sys.exit(2)
 
+many=False
+if modmin!=modmax:
+    many=True
+    modulename="%s%2.2d-%s%2.2d" % (partname,modmin,partname,modmax)
+else:
+    mod_n=modmin
+    modulename="%s%2.2d" % (partname,mod_n)
+
+if chanmin!=chanmax:
+    many=True
+    channame="%2.2d-%2.2d" % (chanmin,chanmax)
+else:
+    chan_n=chanmin
+    channame="%2.2d" % (chan_n)
+
+if gainmin!=gainmax:
+    many=True
+    gain_n = -1
+
 if one_run and plotopt == "dist":
     print "Switching to noline mode"
     noline = True
     plotopt = "noline"
 
+if many:
+    many=(line or noline)
+
+if not many and gain_n==-1:
+    gain_n=gainmin
+
+if gain_n == -1:
+    gainname = "AllG"
+elif gain_n == 0:
+    gainname = "LG"
+elif gain_n == 1:
+    gainname = "HG"
+else:
+    gainname = "G"+str(gain_n)
+if val_n>0: gainname += " val[%d]" % (val_n)
+
 
 import ROOT
-from ROOT import TCanvas, TH1D, TH2D, TGraph, TTree
+from ROOT import TCanvas, TH1D, TH2D, TGraph, TTree, TLegend
 from ROOT import gROOT
 from ROOT import kTRUE
 from array import array
@@ -225,6 +264,10 @@ for fp in folderPath:
     log.info("Initializing folder %s with tag %s" % (fp, ft))
     folderTag += [ft]
 multi=(len(folderPath)>1)
+if multi and many:
+    print "Can not calculate product of "+" ".join(folderPath)+" in multi-channel mode"
+    sys.exit(2)
+
 
 #=== Get list of IOVs for given drawer or for comments record
 if ros!=-1:
@@ -331,7 +374,7 @@ if begin != be or end != en:
         end=en
     iovList=iovList[ib:ie]
 
-if one_run: 
+if one_run:
     if opt2d and not (line or noline):
         iovList=iovList[:1]
         print "Plotting values for (Run,Lumi) = (%i,%i) " % (runNum,lumiNum)
@@ -348,8 +391,8 @@ if one_run:
         print iovList
         if not line and runNum!=iovList[-1][0][0]:
             iovList=iovList[:-1]
-            
-if not one_run: 
+
+if not one_run:
     print "Plotting Runs: %i to %i" % (begin, end)
     print len(iovList),"different IOVs in total"
     if iovList[0][0][0]!=begin or iovList[-1][0][0]!=end:
@@ -370,13 +413,14 @@ titsuff=""
 if one_run or opt2d:
     if lumiNum<=0:
         titsuff=" Run " + str(runNum)
-    else: 
+    else:
         titsuff=" Run " + str(runNum) + " LB " + str(lumiNum)
 titsuff+=" Tag " + " ".join(folderTag)
 rlt=titsuff.replace(" ","_").replace("_Tag","")
+gtitle = modulename +" " + " Channel" +("s " if (chanmin!=chanmax) else " ") + channame +" " + gainname + titsuff
 
 if opt2d: fname="%s_g%d_v%d%s_%s" % ( partname,gain_n,val_n,rlt,plotopt)
-else: fname="%s_ch%2.2d_g%d_v%d%s_%s" % ( modulename,chan_n,gain_n,val_n,rlt,plotopt) 
+else: fname="%s_ch%s_g%d_v%d%s_%s" % ( modulename,channame,gain_n,val_n,rlt,plotopt)
 
 if save_tree: tree_file = ROOT.TFile(fname+".root","RECREATE")
 
@@ -385,6 +429,7 @@ run_n = np.zeros(1, dtype = float)
 lumi_n = np.zeros(1, dtype = float)
 channel_n = np.zeros(1, dtype = float)
 module_n = np.zeros(1, dtype = int)
+ros_n = np.zeros(1, dtype = int)
 value = np.zeros(1, dtype = float)
 scale = np.zeros(1, dtype = float)
 
@@ -392,6 +437,7 @@ tree.Branch("runnumber",run_n,'runnumber/D')
 tree.Branch("luminum",lumi_n,'luminum/D')
 tree.Branch("channel",channel_n,'channel/D')
 tree.Branch("module",module_n,'module/I')
+tree.Branch("ros",ros_n,'ros/I')
 tree.Branch("labels", labels)
 tree.Branch("vals", vals)
 if multi: tree.Branch("value", value,'value/D')
@@ -407,7 +453,7 @@ labels.clear()
 one_iov = (len(iovList)<2)
 
 for iovs in iovList:
-        
+
     if one_iov:
         run = runNum
         lumi = lumiNum
@@ -431,8 +477,9 @@ for iovs in iovList:
         labels.clear()
         vals.clear()
         value[0]=1.
-    
+
     for ros in xrange(rosmin,rosmax):
+        ros_n[0] = ros
         for mod in xrange(modmin-1, min(modmax,TileCalibUtils.getMaxDrawer(ros))):
             module_n[0] = mod
             modName = TileCalibUtils.getDrawerString(ros,mod)
@@ -453,7 +500,7 @@ for iovs in iovList:
                                   vals.push_back(flt.getData(chn, adc, val))
                                   if val==0:
                                       value[0] *= flt.getData(chn, adc, val)
-                              if print_msg: 
+                              if print_msg:
                                   if multi:
                                       print fp,msg
                                   else:
@@ -467,7 +514,7 @@ for iovs in iovList:
                                       scale[0]=vals[val_n]
                                   first=False
                               tree.Fill()
-                              if not line:
+                              if not line or many:
                                   labels.clear()
                                   vals.clear()
                                   value[0] = 1.
@@ -513,23 +560,22 @@ ROOT.gStyle.SetOptStat(0)
 if one_run:
     cut_cond = "runnumber == " + str(runNum)
 else:
-    cut_cond = "runnumber >= " + str(begin) + " && " + "runnumber <= " + str(veryEnd) 
-
-##### Which gain to choose
-if gain_n == 0:
-    gainvalue = "LG"
-elif gain_n == 1:
-    gainvalue = "HG"
-else:
-    gainvalue = "G"+str(gain_n)
+    cut_cond = "runnumber >= " + str(begin) + " && " + "runnumber <= " + str(veryEnd)
 
 ##### Which value to choose
 if multi:
-  data = "value"
+    data = "value"
+elif many:
+    data = "vals[%d]"
 else:
-  data = "vals[" + str(val_n) + "]"
+    data = "vals[" + str(val_n) + "]"
+
+if cut:
+    if not "val" in cut: cut = data + cut
+    cut_cond = "(" + cut_cond + ") && (" + cut + ")"
+
 if norm:
-  data += "/scale"
+    data += "/scale"
 
 if (line or noline) and not one_run:
     data += ":runnumber"
@@ -543,43 +589,112 @@ elif one_run:
 
 canv = TCanvas("PlotCalib","plotCalib",0,0,1600,800)
 
-if opt2d: 
+if opt2d:
     hhh = TH2D("hhh","hhh",modmax-modmin+1,modmin-0.5,modmax+0.5,chanmax-chanmin+1,chanmin-0.5,chanmax+0.5)
 
-if vsbin: tree.Draw(data,cut_cond,"goff",15)
-else: tree.Draw(data,cut_cond,"goff")
-
-if (not opt2d and tree.GetSelectedRows() <= 1) or tree.GetSelectedRows() <= 0:
-    print "Not enough points to plot"
-    sys.exit(2)
+if not many and not opt2d:
+    print "Plotting",data
+    print "With cut",cut_cond
+    if vsbin: tree.Draw(data,cut_cond,"goff",15)
+    else: tree.Draw(data,cut_cond,"goff")
 
-if vsbin:
-    if tree.GetSelectedRows() >= 15:
-        print "Maximum number of bins is 15"
+    if tree.GetSelectedRows() <= 0:
+        print "Not enough points to plot"
+        sys.exit(2)
 
+    if vsbin:
+        if tree.GetSelectedRows() >= 15:
+            print "Maximum number of bins is 15"
 
 if line or noline:
-    gr = TGraph(tree.GetSelectedRows(),tree.GetV2(),tree.GetV1())
-    gr.SetTitle(modulename +" " + " Channel "+ str(chan_n) +" " + gainvalue + titsuff)
-    gr.SetMarkerStyle(20)
-    gr.SetMarkerSize(1.3)
-    gr.SetMarkerColor(2)
-    gr.SetLineColor(2)
-    gr.GetXaxis().SetNoExponent(kTRUE)
-    if one_run: gr.GetXaxis().SetTitle("Lumi")
-    else: gr.GetXaxis().SetTitle("Runs")
-    if noline: gr.Draw("ap")
-    else: gr.Draw("apl")
+    if many:
+        first=True
+        color=1
+        grall=[]
+        vmin=1.e+38
+        vmax=-1.e+38
+        cut0 = cut_cond
+        data1 = data
+        leg = TLegend(0.7,0.7,0.9,0.9)
+        for ros in xrange(rosmin,rosmax):
+            for mod in xrange(modmin-1, modmax):
+                for chn in xrange(chanmin,chanmax+1):
+                    for adc in xrange(gainmin,gainmax+1):
+                        if "%d" in data:
+                            data1 = data.replace("%d",str((adc-gainmin)*nval+val_n))
+                        if "%d" in cut_cond:
+                            cut0 = cut_cond.replace("%d",str((adc-gainmin)*nval+val_n))
+                        cut1 = "(ros == %d && module == %d && channel == %d) && %s" % (ros,mod,chn,cut0)
+                        tree.Project("htemp",data1,cut1)
+                        if tree.GetSelectedRows() > 0:
+                            color = color + 1
+                            gr = TGraph(tree.GetSelectedRows(),tree.GetV2(),tree.GetV1())
+                            yy=gr.GetY()
+                            for ii in xrange(len(yy)):
+                                vv=yy[ii]
+                                if vv<vmin: vmin=vv
+                                if vv>vmax: vmax=vv
+                            grall += [gr]
+                            leg.AddEntry(gr,"%s%2.2d ch %2.2d" % ( part_dict.keys()[part_dict.values().index(ros)],mod+1,chn),"lep")
+                            gr.SetMarkerStyle(20)
+                            gr.SetMarkerSize(1.3)
+                            gr.SetMarkerColor(color)
+                            gr.SetLineColor(color)
+                            if first:
+                                print "First plot:"
+                                print "Plotting",data1
+                                print "With cut",cut1
+                                print "Note that in TTree module number starts from 0"
+                                gr.SetTitle(gtitle)
+                                gr.GetXaxis().SetNoExponent(kTRUE)
+                                if one_run: gr.GetXaxis().SetTitle("Lumi")
+                                else: gr.GetXaxis().SetTitle("Runs")
+                                if noline: gr.Draw("ap")
+                                else: gr.Draw("apl")
+                                first=False
+                            else:
+                                if noline: gr.Draw("p")
+                                else: gr.Draw("pl")
+        lg=len(grall)
+        if lg==0:
+            print "Plotting",data
+            print "With cut",cut_cond
+            print "Not enough points to plot"
+            sys.exit(2)
+        if lg>400: nc=20
+        elif lg>144: nc=int(math.sqrt(lg))
+        else: nc=int((lg-1)/12+1)
+        leg.SetNColumns(nc)
+        extra = (2+0.4*int(lg/nc+1))
+        dv=(vmax-vmin)/10.
+        grall[0].SetMinimum(vmin-dv)
+        grall[0].SetMaximum(vmax+dv*extra)
+        if nc>8: nc=8
+        leg.SetX1(0.9-0.1*nc)
+        leg.SetY1(0.9-0.8*(extra-1)/(11+extra))
+        leg.Draw()
+    else:
+        gr = TGraph(tree.GetSelectedRows(),tree.GetV2(),tree.GetV1())
+        gr.SetTitle(gtitle)
+        gr.SetMarkerStyle(20)
+        gr.SetMarkerSize(1.3)
+        gr.SetMarkerColor(2)
+        gr.SetLineColor(2)
+        gr.GetXaxis().SetNoExponent(kTRUE)
+        if one_run: gr.GetXaxis().SetTitle("Lumi")
+        else: gr.GetXaxis().SetTitle("Runs")
+        if noline: gr.Draw("ap")
+        else: gr.Draw("apl")
 
 elif opt2d:
     nentries = tree.GetEntries()
     hhh.SetName(modulename)
-    hhh.SetTitle(partname +" " + gainvalue + titsuff)
+    hhh.SetTitle(gtitle)
     hhh.GetYaxis().SetTitle("Channels")
     hhh.GetXaxis().SetTitle("Modules")
 
     if multi:
-        Matrix = [[1 for y in range(48)] for x in range(64)] 
+        Matrix = [[1 for y in range(48)] for x in range(64)]
         for i in xrange(nentries):
             tree.GetEntry(i)
             if vals.size()>0:
@@ -604,7 +719,7 @@ elif opt2d:
 else:
     h = ROOT.gDirectory.Get("htemp")
     h.SetName(modulename)
-    h.SetTitle(modulename +" " + " Channel "+str(chan_n)  + " " + gainvalue + titsuff)
+    h.SetTitle(gtitle)
     h.SetLineColor(2)
     h.SetLineWidth(2)
     h.GetXaxis().SetTitle("Value")
@@ -613,7 +728,7 @@ else:
         h.SetMarkerSize(1.4)
         h.SetMarkerColor(2)
         h.GetXaxis().SetTitle("Run")
-        if one_run: h.GetXaxis().SetTitle("Lumi");  h.SetTitle(modulename +" " + " Channel "+str(chan_n) +" " + gainvalue + titsuff)
+        if one_run: h.GetXaxis().SetTitle("Lumi");  h.SetTitle(gtitle)
         h.GetYaxis().SetTitle("")
         h.GetYaxis().SetTitleOffset(1.35)
     try:
@@ -631,13 +746,13 @@ canv.Update()
 canv.Print(fname+".eps")
 canv.Print(fname+".png")
 
-if save_tree: 
+if save_tree:
     tree_file.Write()
     tree_file.Close()
 
 
-        #=== display plot
-os.system("display "+fname+".png") 
+#=== display plot
+os.system("display "+fname+".png")
 
 
 #
diff --git a/TileCalorimeter/TileDetDescr/src/CellVolumes.h b/TileCalorimeter/TileDetDescr/src/CellVolumes.h
index e8f75d433ef478eaaf667bc760ee511b6baa3f6a..e52942ffde9d3f7e4a9a90b38f3cf189ec9e19e7 100755
--- a/TileCalorimeter/TileDetDescr/src/CellVolumes.h
+++ b/TileCalorimeter/TileDetDescr/src/CellVolumes.h
@@ -1,48 +1,48 @@
 /*
   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 */
-#include "GeoModelKernel/Units.h"
+#include "GaudiKernel/SystemOfUnits.h"
 
-const double TileDetDescrManager::vBarrelCells[23] = {17799.76*GeoModelKernelUnits::cm3,   //A1
-						      17799.76*GeoModelKernelUnits::cm3,   //A2
-						      18459.01*GeoModelKernelUnits::cm3,   //A3
-						      18459.01*GeoModelKernelUnits::cm3,   //A4
-						      19777.51*GeoModelKernelUnits::cm3,   //A5
-						      20436.76*GeoModelKernelUnits::cm3,   //A6
-						      21096.01*GeoModelKernelUnits::cm3,   //A7
-						      23073.76*GeoModelKernelUnits::cm3,   //A8
-						      24392.26*GeoModelKernelUnits::cm3,   //A9
-						      21096.01*GeoModelKernelUnits::cm3,   //A10
-						      75726.60*GeoModelKernelUnits::cm3,   //BC1
-						      77024.24*GeoModelKernelUnits::cm3,   //BC2
-						      77024.24*GeoModelKernelUnits::cm3,   //BC3
-						      81574.95*GeoModelKernelUnits::cm3,   //BC4
-						      81574.95*GeoModelKernelUnits::cm3,   //BC5
-						      88401.02*GeoModelKernelUnits::cm3,   //BC6
-						      91974.02*GeoModelKernelUnits::cm3,   //BC7
-						      91014.21*GeoModelKernelUnits::cm3,   //BC8
-						      34219.80*GeoModelKernelUnits::cm3,   //B9
-						      110000.61*GeoModelKernelUnits::cm3,  //D0
-						      111375.62*GeoModelKernelUnits::cm3,  //D1
-						      118250.66*GeoModelKernelUnits::cm3,  //D2
-						      137500.77*GeoModelKernelUnits::cm3}; //D3
+const double TileDetDescrManager::vBarrelCells[23] = {17799.76*Gaudi::Units::cm3,   //A1
+						      17799.76*Gaudi::Units::cm3,   //A2
+						      18459.01*Gaudi::Units::cm3,   //A3
+						      18459.01*Gaudi::Units::cm3,   //A4
+						      19777.51*Gaudi::Units::cm3,   //A5
+						      20436.76*Gaudi::Units::cm3,   //A6
+						      21096.01*Gaudi::Units::cm3,   //A7
+						      23073.76*Gaudi::Units::cm3,   //A8
+						      24392.26*Gaudi::Units::cm3,   //A9
+						      21096.01*Gaudi::Units::cm3,   //A10
+						      75726.60*Gaudi::Units::cm3,   //BC1
+						      77024.24*Gaudi::Units::cm3,   //BC2
+						      77024.24*Gaudi::Units::cm3,   //BC3
+						      81574.95*Gaudi::Units::cm3,   //BC4
+						      81574.95*Gaudi::Units::cm3,   //BC5
+						      88401.02*Gaudi::Units::cm3,   //BC6
+						      91974.02*Gaudi::Units::cm3,   //BC7
+						      91014.21*Gaudi::Units::cm3,   //BC8
+						      34219.80*Gaudi::Units::cm3,   //B9
+						      110000.61*Gaudi::Units::cm3,  //D0
+						      111375.62*Gaudi::Units::cm3,  //D1
+						      118250.66*Gaudi::Units::cm3,  //D2
+						      137500.77*Gaudi::Units::cm3}; //D3
 
-const double TileDetDescrManager::vExtendedCells[12] = {11863.88*GeoModelKernelUnits::cm3,   //A12
-							32955.21*GeoModelKernelUnits::cm3,   //A13
-							36909.84*GeoModelKernelUnits::cm3,   //A14
-							39546.25*GeoModelKernelUnits::cm3,   //A15
-							63274.01*GeoModelKernelUnits::cm3,   //A16
-							44472.59*GeoModelKernelUnits::cm3,   //B11
-							75047.49*GeoModelKernelUnits::cm3,   //B12
-							83386.10*GeoModelKernelUnits::cm3,   //B13
-							88945.18*GeoModelKernelUnits::cm3,   //B14
-							97283.79*GeoModelKernelUnits::cm3,   //B15
-							293772.18*GeoModelKernelUnits::cm3,  //D5
-							338967.89*GeoModelKernelUnits::cm3}; //D6
+const double TileDetDescrManager::vExtendedCells[12] = {11863.88*Gaudi::Units::cm3,   //A12
+							32955.21*Gaudi::Units::cm3,   //A13
+							36909.84*Gaudi::Units::cm3,   //A14
+							39546.25*Gaudi::Units::cm3,   //A15
+							63274.01*Gaudi::Units::cm3,   //A16
+							44472.59*Gaudi::Units::cm3,   //B11
+							75047.49*Gaudi::Units::cm3,   //B12
+							83386.10*Gaudi::Units::cm3,   //B13
+							88945.18*Gaudi::Units::cm3,   //B14
+							97283.79*Gaudi::Units::cm3,   //B15
+							293772.18*Gaudi::Units::cm3,  //D5
+							338967.89*Gaudi::Units::cm3}; //D6
 
-const double TileDetDescrManager::vItcGapCells[6] = {13461.47*GeoModelKernelUnits::cm3,  //C10
-						     46542.48*GeoModelKernelUnits::cm3,  //D4
-						     1292.80*GeoModelKernelUnits::cm3,   //E1
-						     1244.11*GeoModelKernelUnits::cm3,   //E2
-						     776.24*GeoModelKernelUnits::cm3,    //E3
-						     468.36*GeoModelKernelUnits::cm3};   //E4
+const double TileDetDescrManager::vItcGapCells[6] = {13461.47*Gaudi::Units::cm3,  //C10
+						     46542.48*Gaudi::Units::cm3,  //D4
+						     1292.80*Gaudi::Units::cm3,   //E1
+						     1244.11*Gaudi::Units::cm3,   //E2
+						     776.24*Gaudi::Units::cm3,    //E3
+						     468.36*Gaudi::Units::cm3};   //E4
diff --git a/TileCalorimeter/TileDetDescr/src/TileDetDescrManager.cxx b/TileCalorimeter/TileDetDescr/src/TileDetDescrManager.cxx
index b16acb26272a3dc8bc162fd66719e2348626db2c..b9aa52c52284e2d79c3e21d119c0e72ad3a4abf7 100755
--- a/TileCalorimeter/TileDetDescr/src/TileDetDescrManager.cxx
+++ b/TileCalorimeter/TileDetDescr/src/TileDetDescrManager.cxx
@@ -13,6 +13,7 @@
 #include "TileIdentifier/TileHWID.h"
 
 #include "GaudiKernel/MsgStream.h"
+#include "GaudiKernel/SystemOfUnits.h"
 #include "AthenaKernel/getMessageSvc.h"
 #include "boost/io/ios_state.hpp"
 
@@ -489,7 +490,7 @@ void TileDetDescrManager::create_elements()
                 // come out to ~ 1e-14, the exact value varying depending
                 // on platform.  For reproducibility, force very small
                 // numbers to 0.
-                if (std::abs(z) < 1e-8 * GeoModelKernelUnits::mm) z = 0;
+                if (std::abs(z) < 1e-8 * Gaudi::Units::mm) z = 0;
 
                 double dz = 0.5 * fabs(cell_dim->getZMax(0)     // special 
                                        -cell_dim->getZMin(0)    // calculations
@@ -570,7 +571,7 @@ void TileDetDescrManager::create_elements()
 		    m_dbManager->SetCurrentSection(TileID::EXTBAR);
 		    double epThickness = 0.0; // only used for tower == 15
 		    double epVolume    = 0.0; // only used for tower == 15
-		    if ( tower == 15 ) epThickness = m_dbManager->TILBdzend2() * GeoModelKernelUnits::cm;
+		    if ( tower == 15 ) epThickness = m_dbManager->TILBdzend2() * Gaudi::Units::cm;
 		    
 		    double volumeInRow[5];  // book large array
 		    for (int iRow = 0; iRow < 5; iRow++) volumeInRow[iRow] = 0.;
@@ -648,12 +649,12 @@ void TileDetDescrManager::create_elements()
 				  {
 				    rowVolume = radMax + radMin;
 				    rowVolume *= (radMax - radMin);
-				    rowVolume -= 0.5*radMin*(27*GeoModelKernelUnits::mm);
+				    rowVolume -= 0.5*radMin*(27*Gaudi::Units::mm);
 				    rowVolume *= Radius2HL *  ( deltaZ + epThickness ); // adding volume of cutted endplate
 				  }
 				else
 				  {
-				    rowVolume = radMax - radMin - 35*GeoModelKernelUnits::mm;
+				    rowVolume = radMax - radMin - 35*Gaudi::Units::mm;
 				    rowVolume *= (radMax + radMin);
 				    rowVolume *= Radius2HL * deltaZ;
 				  }
@@ -666,8 +667,8 @@ void TileDetDescrManager::create_elements()
 			
 			if ( (ModuleNcp == 60) || (ModuleNcp == 37) )
 			  {
-			    double deltax = 38.7*std::cos(25.3125*GeoModelKernelUnits::deg); 
-			    double pstan  = std::tan(25.3125*GeoModelKernelUnits::deg);
+			    double deltax = 38.7*std::cos(25.3125*Gaudi::Units::deg); 
+			    double pstan  = std::tan(25.3125*Gaudi::Units::deg);
                             double inv_pstan = 1. / pstan;
 			    if ( ( 15 == tower ) )
 			      {
@@ -734,7 +735,7 @@ void TileDetDescrManager::create_elements()
 		    m_dbManager->SetCurrentSection(Id4);
 		    
 		    double standardD4dz = elt->dz();
-		    double specialD4dz = m_dbManager->TILBdzmodul()*GeoModelKernelUnits::cm;
+		    double specialD4dz = m_dbManager->TILBdzmodul()*Gaudi::Units::cm;
 		    if ( Id4 == 8 ) specialD4dz = 0.;
 
 		    elt->set_dz(specialD4dz);
@@ -812,7 +813,7 @@ void TileDetDescrManager::create_elements()
 		    if ( Id4 == 8 )
 		      {
 			double standardD5dz = elt->dz();
-			double specialD4dz = m_dbManager->TILBdzmodul()*GeoModelKernelUnits::cm; 
+			double specialD4dz = m_dbManager->TILBdzmodul()*Gaudi::Units::cm; 
 			elt->set_dz(specialD4dz + standardD5dz);
 			elt->set_volume(elt->volume()* (1. + specialD4dz/standardD5dz));
 			
diff --git a/TileCalorimeter/TileG4/TileGeoG4Calib/src/TileGeoG4CalibSD.cc b/TileCalorimeter/TileG4/TileGeoG4Calib/src/TileGeoG4CalibSD.cc
index 29a5d6697acacc69299d6d07a9281643635b9382..5ea892a0a56765284c837a011896b6868ab67a05 100644
--- a/TileCalorimeter/TileG4/TileGeoG4Calib/src/TileGeoG4CalibSD.cc
+++ b/TileCalorimeter/TileG4/TileGeoG4Calib/src/TileGeoG4CalibSD.cc
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 //************************************************************
@@ -60,7 +60,7 @@
 
 //CONSTRUCTOR
 TileGeoG4CalibSD::TileGeoG4CalibSD(const G4String& name, const std::vector<std::string>& outputCollectionNames, ITileCalculator* tileCalculator,
-                                   ServiceHandle<StoreGateSvc> &detStore)
+                                   const ServiceHandle<StoreGateSvc> &detStore)
 : G4VSensitiveDetector(name),
   m_tileActiveCellCalibHits(outputCollectionNames[1]),
   m_tileInactiveCellCalibHits(outputCollectionNames[2]),
diff --git a/TileCalorimeter/TileG4/TileGeoG4Calib/src/TileGeoG4CalibSD.h b/TileCalorimeter/TileG4/TileGeoG4Calib/src/TileGeoG4CalibSD.h
index 84bc556df6c2747e411a1151df281519afbbf09f..6a3a3fd70e4a0b4ee1f8dd03453dce0a23c3f5a6 100644
--- a/TileCalorimeter/TileG4/TileGeoG4Calib/src/TileGeoG4CalibSD.h
+++ b/TileCalorimeter/TileG4/TileGeoG4Calib/src/TileGeoG4CalibSD.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 //************************************************************
@@ -86,7 +86,7 @@ typedef std::vector<double> E_4;
 class TileGeoG4CalibSD: public G4VSensitiveDetector {
 public:
   TileGeoG4CalibSD(const G4String& name, const std::vector<std::string>& m_outputCollectionNames,
-                   ITileCalculator* tileCalculator, ServiceHandle<StoreGateSvc> &detStore);
+                   ITileCalculator* tileCalculator, const ServiceHandle<StoreGateSvc> &detStore);
   ~TileGeoG4CalibSD();
 
   void InvokeUserRunAction();
diff --git a/TileCalorimeter/TileG4/TileGeoG4Calib/src/TileGeoG4DMLookupBuilder.cc b/TileCalorimeter/TileG4/TileGeoG4Calib/src/TileGeoG4DMLookupBuilder.cc
index eceab515f85a159749fe765b0ded6b5f81e99aca..09a9e908db2aafaafb3d6db6cbd948fdf4bf0366 100644
--- a/TileCalorimeter/TileG4/TileGeoG4Calib/src/TileGeoG4DMLookupBuilder.cc
+++ b/TileCalorimeter/TileG4/TileGeoG4Calib/src/TileGeoG4DMLookupBuilder.cc
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 //************************************************************
@@ -44,7 +44,7 @@
 TileGeoG4DMLookupBuilder::TileGeoG4DMLookupBuilder(TileGeoG4LookupBuilder* lookup_builder,
                                                    ServiceHandle<IRDBAccessSvc> &raccess,
                                                    ServiceHandle<IGeoModelSvc> &geo_svc,
-                                                   ServiceHandle<StoreGateSvc> &pDetStore, const int verboseLevel)
+                                                   const ServiceHandle<StoreGateSvc> &pDetStore, const int verboseLevel)
 : rBMin(0),
   rBMax(0),
   zBarrMaxPos(0),
diff --git a/TileCalorimeter/TileG4/TileGeoG4Calib/src/TileGeoG4DMLookupBuilder.h b/TileCalorimeter/TileG4/TileGeoG4Calib/src/TileGeoG4DMLookupBuilder.h
index 81cd050822fd891e3480b0338cfa78e5ff840782..5f3db2a910a0d7021b8540c5ae7541ef18162b80 100644
--- a/TileCalorimeter/TileG4/TileGeoG4Calib/src/TileGeoG4DMLookupBuilder.h
+++ b/TileCalorimeter/TileG4/TileGeoG4Calib/src/TileGeoG4DMLookupBuilder.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 //************************************************************
@@ -33,7 +33,7 @@ class StoreGateSvc;
 class TileGeoG4DMLookupBuilder {
 public:
   TileGeoG4DMLookupBuilder(TileGeoG4LookupBuilder* tile_lookup_builder, ServiceHandle<IRDBAccessSvc> &access,
-                           ServiceHandle<IGeoModelSvc> &geo_svc, ServiceHandle<StoreGateSvc> &pDetStore,
+                           ServiceHandle<IGeoModelSvc> &geo_svc, const ServiceHandle<StoreGateSvc> &pDetStore,
                            const int verboseLevel);
   ~TileGeoG4DMLookupBuilder();
 
diff --git a/TileCalorimeter/TileGeoModel/src/TileAtlasFactory.cxx b/TileCalorimeter/TileGeoModel/src/TileAtlasFactory.cxx
index 474e46831704b109612d53573e526a7de066f846..8731032d12d2ecdc5c673c9df3cf8ebd3002b916 100755
--- a/TileCalorimeter/TileGeoModel/src/TileAtlasFactory.cxx
+++ b/TileCalorimeter/TileGeoModel/src/TileAtlasFactory.cxx
@@ -26,10 +26,6 @@
 #include "GeoModelKernel/GeoSerialIdentifier.h"
 #include "GeoModelKernel/GeoIdentifierTag.h"
 #include "GeoModelKernel/GeoDefinitions.h"
-#include "GeoModelKernel/Units.h"
-
-//#include "GeoModelKernel/GeoCutVolAction.h"
-//#include "GeoModelKernel/GeoSimplePolygonBrep.h"
 
 #include "GeoGenericFunctions/AbsFunction.h"
 #include "GeoGenericFunctions/Variable.h"
@@ -40,6 +36,7 @@
 #include "StoreGate/StoreGateSvc.h"
 
 #include "GaudiKernel/MsgStream.h"
+#include "GaudiKernel/SystemOfUnits.h"
 
 #include <stdexcept>
 #include <iostream>
@@ -87,13 +84,13 @@ void TileAtlasFactory::create(GeoPhysVol *world)
   //int   NcpFrom = 34, NcpPlus = 29; // ext.barrel, special
 
   double deltaPhi = 360./64; // we know apriory that 64 modules makes full cylinder 
-  double AnglMin = (NcpFrom-1)*deltaPhi*GeoModelKernelUnits::deg, AnglMax = (NcpPlus+1)*deltaPhi*GeoModelKernelUnits::deg;
+  double AnglMin = (NcpFrom-1)*deltaPhi*Gaudi::Units::deg, AnglMax = (NcpPlus+1)*deltaPhi*Gaudi::Units::deg;
 
   // phi range of modules with special C10
-  // double AnglMin1 = 38. * deltaPhi*GeoModelKernelUnits::deg;
-  // double AnglMax1 = 42. * deltaPhi*GeoModelKernelUnits::deg;
-  // double AnglMin2 = 54. * deltaPhi*GeoModelKernelUnits::deg;
-  // double AnglMax2 = 58. * deltaPhi*GeoModelKernelUnits::deg;
+  // double AnglMin1 = 38. * deltaPhi*Gaudi::Units::deg;
+  // double AnglMax1 = 42. * deltaPhi*Gaudi::Units::deg;
+  // double AnglMin2 = 54. * deltaPhi*Gaudi::Units::deg;
+  // double AnglMax2 = 58. * deltaPhi*Gaudi::Units::deg;
 
   (*m_log) << MSG::INFO <<" Entering TileAtlasFactory::create()" << endmsg;
 
@@ -118,8 +115,8 @@ void TileAtlasFactory::create(GeoPhysVol *world)
 
      dbManager->SetCurrentSaddle(0);
 
-     DzSaddleSupport = dbManager->DzSaddleSupport()*GeoModelKernelUnits::cm;
-     RadiusSaddle = dbManager->RadiusSaddle()*GeoModelKernelUnits::cm;
+     DzSaddleSupport = dbManager->DzSaddleSupport()*Gaudi::Units::cm;
+     RadiusSaddle = dbManager->RadiusSaddle()*Gaudi::Units::cm;
      if(m_log->level()<=MSG::DEBUG)
        (*m_log) << MSG::DEBUG << " DzSaddleSupport()= "<<DzSaddleSupport<<" RadiusSaddle= "<<RadiusSaddle
 		<< endmsg;
@@ -168,7 +165,7 @@ void TileAtlasFactory::create(GeoPhysVol *world)
 
   // Barrel finger 
   dbManager->SetCurrentTifg(1);
-  BFingerLength  = BFingerLengthNeg  = BFingerLengthPos  = dbManager->TIFGdz()*GeoModelKernelUnits::cm;
+  BFingerLength  = BFingerLengthNeg  = BFingerLengthPos  = dbManager->TIFGdz()*Gaudi::Units::cm;
 
   double EBFingerLength =0;
   double EBFingerLengthNeg =0;
@@ -176,7 +173,7 @@ void TileAtlasFactory::create(GeoPhysVol *world)
 
   // EBarrel finger 
   dbManager->SetCurrentTifg(2);
-  EBFingerLength = EBFingerLengthNeg = EBFingerLengthPos = dbManager->TIFGdz()*GeoModelKernelUnits::cm;
+  EBFingerLength = EBFingerLengthNeg = EBFingerLengthPos = dbManager->TIFGdz()*Gaudi::Units::cm;
 
   int n_env = dbManager->GetNumberOfEnv();
   
@@ -196,13 +193,13 @@ void TileAtlasFactory::create(GeoPhysVol *world)
     if (Type == 3) EBA = true;
     */
 
-    ZLength  [Type] = dbManager->GetEnvZLength()*GeoModelKernelUnits::cm;
-    EnvDZPos [Type] = dbManager->GetEnvDZ()*GeoModelKernelUnits::cm;
+    ZLength  [Type] = dbManager->GetEnvZLength()*Gaudi::Units::cm;
+    EnvDZPos [Type] = dbManager->GetEnvDZ()*Gaudi::Units::cm;
     PhiMin   [Type] = std::min(PhiMin[Type], dbManager->GetEnvDPhi());
     PhiMax   [Type] = std::max(PhiMax[Type], dbManager->GetEnvNModules()*deltaPhi + dbManager->GetEnvDPhi());
-    RInMin   [Type] = std::min(RInMin[Type], dbManager->GetEnvRin()*GeoModelKernelUnits::cm);
-    ROutMax  [Type] = std::max(ROutMax[Type],dbManager->GetEnvRout()*GeoModelKernelUnits::cm);
-    FingerRmax         = std::max(FingerRmax,dbManager->GetEnvRout()*GeoModelKernelUnits::cm);
+    RInMin   [Type] = std::min(RInMin[Type], dbManager->GetEnvRin()*Gaudi::Units::cm);
+    ROutMax  [Type] = std::max(ROutMax[Type],dbManager->GetEnvRout()*Gaudi::Units::cm);
+    FingerRmax         = std::max(FingerRmax,dbManager->GetEnvRout()*Gaudi::Units::cm);
 
     //std::cout << "# Type " <<Type<< " ZLength " <<ZLength [Type]<< " EnvDZPos "<<EnvDZPos [Type]<< "\n"; 
   }
@@ -273,9 +270,9 @@ void TileAtlasFactory::create(GeoPhysVol *world)
   /** setfinger length */
   double BFingerRmin=0, EFingerRmin=0;
   dbManager->SetCurrentSection(TileDddbManager::TILE_BARREL);
-  BFingerRmin = dbManager->TILBrmax()*GeoModelKernelUnits::cm;
+  BFingerRmin = dbManager->TILBrmax()*Gaudi::Units::cm;
   dbManager->SetCurrentSection(TileDddbManager::TILE_EBARREL);
-  EFingerRmin = dbManager->TILBrmax()*GeoModelKernelUnits::cm;
+  EFingerRmin = dbManager->TILBrmax()*Gaudi::Units::cm;
   
   /** calculation PosEnvThickness enlarge mother volume by extra distance between barrel and positive ext.barrel */
   dbManager->SetCurrentEnvByType(3);
@@ -301,7 +298,7 @@ void TileAtlasFactory::create(GeoPhysVol *world)
   // R maximal
   double rmaxTotal = ROutMax[1];
     
-  GeoPcon* tileEnvPconeBarrel = new GeoPcon(PhiMin[1]*GeoModelKernelUnits::deg, PhiMax[1]*GeoModelKernelUnits::deg);
+  GeoPcon* tileEnvPconeBarrel = new GeoPcon(PhiMin[1]*Gaudi::Units::deg, PhiMax[1]*Gaudi::Units::deg);
 
    tileEnvPconeBarrel->addPlane(-endEnvelopeNeg,                   BFingerRmin,             rmaxTotal);
    tileEnvPconeBarrel->addPlane(-endCentralBarrel-DzSaddleSupport, BFingerRmin,             rmaxTotal);
@@ -344,7 +341,7 @@ void TileAtlasFactory::create(GeoPhysVol *world)
   }
 
   dbManager->SetCurrentSection(TileDddbManager::TILE_PLUG1);
-  double PosEndITC1 = (dbManager->TILBzoffset() + dbManager->TILEzshift() + dbManager->TILBdzmodul()/2)*GeoModelKernelUnits::cm;
+  double PosEndITC1 = (dbManager->TILBzoffset() + dbManager->TILEzshift() + dbManager->TILBdzmodul()/2)*Gaudi::Units::cm;
   double corr = PosEndITC - PosEndITC1;
   if (fabs(corr)>0.01) {
      (*m_log) << MSG::WARNING
@@ -353,19 +350,19 @@ void TileAtlasFactory::create(GeoPhysVol *world)
               <<endmsg;
   }
 
-  //double beginITC1   = corr + (dbManager->TILBzoffset() + dbManager->TILEzshift()-dbManager->TILBdzmodul()/2)*GeoModelKernelUnits::cm;
+  //double beginITC1   = corr + (dbManager->TILBzoffset() + dbManager->TILEzshift()-dbManager->TILBdzmodul()/2)*Gaudi::Units::cm;
   dbManager->SetCurrentSection(TileDddbManager::TILE_PLUG2);
-  double PosBeginITC2  = corr + (dbManager->TILBzoffset() + dbManager->TILEzshift()-dbManager->TILBdzmodul()/2)*GeoModelKernelUnits::cm;
+  double PosBeginITC2  = corr + (dbManager->TILBzoffset() + dbManager->TILEzshift()-dbManager->TILBdzmodul()/2)*Gaudi::Units::cm;
   dbManager->SetCurrentSection(TileDddbManager::TILE_PLUG3);
-  double PosBeginGap = corr + (dbManager->TILBzoffset() + dbManager->TILEzshift()-dbManager->TILBdzmodul()/2)*GeoModelKernelUnits::cm;
-  double PosEndGap   = corr + (dbManager->TILBzoffset() + dbManager->TILEzshift()+dbManager->TILBdzmodul()/2)*GeoModelKernelUnits::cm;
+  double PosBeginGap = corr + (dbManager->TILBzoffset() + dbManager->TILEzshift()-dbManager->TILBdzmodul()/2)*Gaudi::Units::cm;
+  double PosEndGap   = corr + (dbManager->TILBzoffset() + dbManager->TILEzshift()+dbManager->TILBdzmodul()/2)*Gaudi::Units::cm;
   dbManager->SetCurrentSection(TileDddbManager::TILE_PLUG4);
-  double PosBeginCrack = corr + (dbManager->TILBzoffset() + dbManager->TILEzshift()-dbManager->TILBdzmodul()/2)*GeoModelKernelUnits::cm;
-  double PosEndCrack   = corr + (dbManager->TILBzoffset() + dbManager->TILEzshift()+dbManager->TILBdzmodul()/2)*GeoModelKernelUnits::cm;
+  double PosBeginCrack = corr + (dbManager->TILBzoffset() + dbManager->TILEzshift()-dbManager->TILBdzmodul()/2)*Gaudi::Units::cm;
+  double PosEndCrack   = corr + (dbManager->TILBzoffset() + dbManager->TILEzshift()+dbManager->TILBdzmodul()/2)*Gaudi::Units::cm;
 
   if (!spC10) { // recovering old (wrong) positioning of gap scintillators
     double GapWidth = PosEndGap - PosBeginGap;
-    PosBeginGap = PosBeginCrack + 0.9 * GeoModelKernelUnits::cm;
+    PosBeginGap = PosBeginCrack + 0.9 * Gaudi::Units::cm;
     PosEndGap   = PosBeginGap + GapWidth;
   }
   
@@ -379,11 +376,11 @@ void TileAtlasFactory::create(GeoPhysVol *world)
   
   // R minimals 
   dbManager->SetCurrentSection(TileDddbManager::TILE_PLUG1);
-  double PosRminITC1  = dbManager->TILBrminimal()*GeoModelKernelUnits::cm;
+  double PosRminITC1  = dbManager->TILBrminimal()*Gaudi::Units::cm;
   dbManager->SetCurrentSection(TileDddbManager::TILE_PLUG2);
-  double PosRminITC   = rMinC10 /* dbManager->TILBrminimal() */ *GeoModelKernelUnits::cm;
+  double PosRminITC   = rMinC10 /* dbManager->TILBrminimal() */ *Gaudi::Units::cm;
   dbManager->SetCurrentSection(TileDddbManager::TILE_PLUG4);
-  double PosRminCrack = rMinE4pos*GeoModelKernelUnits::cm;
+  double PosRminCrack = rMinE4pos*Gaudi::Units::cm;
 
   double PosRminExt = RInMin[3];
     
@@ -399,7 +396,7 @@ void TileAtlasFactory::create(GeoPhysVol *world)
              << " PosRmaxTotal = " << PosRmaxTotal
 	     << endmsg;
 
-  GeoPcon* tileEnvPconePosEndcap = new GeoPcon(PhiMin[3]*GeoModelKernelUnits::deg, PhiMax[3]*GeoModelKernelUnits::deg);
+  GeoPcon* tileEnvPconePosEndcap = new GeoPcon(PhiMin[3]*Gaudi::Units::deg, PhiMax[3]*Gaudi::Units::deg);
 
   // Positive Endcap 
   tileEnvPconePosEndcap->addPlane(PosEndBarrelFinger,             PosRminITC1,              PosRmaxTotal);
@@ -444,7 +441,7 @@ void TileAtlasFactory::create(GeoPhysVol *world)
   }
 
   dbManager->SetCurrentSection(TileDddbManager::TILE_PLUG1);
-  double NegEndITC1 = (dbManager->TILBzoffset() + dbManager->TILEzshift() + dbManager->TILBdzmodul()/2)*GeoModelKernelUnits::cm;
+  double NegEndITC1 = (dbManager->TILBzoffset() + dbManager->TILEzshift() + dbManager->TILBdzmodul()/2)*Gaudi::Units::cm;
   corr = NegEndITC - NegEndITC1;
 
   if (fabs(corr)>0.01) { (*m_log) << MSG::WARNING
@@ -452,19 +449,19 @@ void TileAtlasFactory::create(GeoPhysVol *world)
                                   << NegEndITC << " != " << NegEndITC1 << "; take this into account" 
                                   << endmsg;
     }
-  //double NegBeginITC1 = corr + (dbManager->TILBzoffset() + dbManager->TILEzshift()-dbManager->TILBdzmodul()/2)*GeoModelKernelUnits::cm;
+  //double NegBeginITC1 = corr + (dbManager->TILBzoffset() + dbManager->TILEzshift()-dbManager->TILBdzmodul()/2)*Gaudi::Units::cm;
   dbManager->SetCurrentSection(TileDddbManager::TILE_PLUG2);
-  double NegBeginITC2   = corr + (dbManager->TILBzoffset() + dbManager->TILEzshift()-dbManager->TILBdzmodul()/2)*GeoModelKernelUnits::cm;
+  double NegBeginITC2   = corr + (dbManager->TILBzoffset() + dbManager->TILEzshift()-dbManager->TILBdzmodul()/2)*Gaudi::Units::cm;
   dbManager->SetCurrentSection(TileDddbManager::TILE_PLUG3);
-  double NegBeginGap    = corr + (dbManager->TILBzoffset() + dbManager->TILEzshift()-dbManager->TILBdzmodul()/2)*GeoModelKernelUnits::cm;
-  double NegEndGap      = corr + (dbManager->TILBzoffset() + dbManager->TILEzshift()+dbManager->TILBdzmodul()/2)*GeoModelKernelUnits::cm;
+  double NegBeginGap    = corr + (dbManager->TILBzoffset() + dbManager->TILEzshift()-dbManager->TILBdzmodul()/2)*Gaudi::Units::cm;
+  double NegEndGap      = corr + (dbManager->TILBzoffset() + dbManager->TILEzshift()+dbManager->TILBdzmodul()/2)*Gaudi::Units::cm;
   dbManager->SetCurrentSection(TileDddbManager::TILE_PLUG4);
-  double NegBeginCrack  = corr + (dbManager->TILBzoffset() + dbManager->TILEzshift()-dbManager->TILBdzmodul()/2)*GeoModelKernelUnits::cm;
-  double NegEndCrack    = corr + (dbManager->TILBzoffset() + dbManager->TILEzshift()+dbManager->TILBdzmodul()/2)*GeoModelKernelUnits::cm;
+  double NegBeginCrack  = corr + (dbManager->TILBzoffset() + dbManager->TILEzshift()-dbManager->TILBdzmodul()/2)*Gaudi::Units::cm;
+  double NegEndCrack    = corr + (dbManager->TILBzoffset() + dbManager->TILEzshift()+dbManager->TILBdzmodul()/2)*Gaudi::Units::cm;
 
   if (!spC10) { // recovering old (wrong) positioning of gap scintillators
     double GapWidth = NegEndGap - NegBeginGap;
-    NegBeginGap = NegBeginCrack + 0.9 * GeoModelKernelUnits::cm;
+    NegBeginGap = NegBeginCrack + 0.9 * Gaudi::Units::cm;
     NegEndGap = NegBeginGap + GapWidth;
   }
   
@@ -478,11 +475,11 @@ void TileAtlasFactory::create(GeoPhysVol *world)
 
   // R minimals 
   dbManager->SetCurrentSection(TileDddbManager::TILE_PLUG1);
-  double NegRminITC1 = dbManager->TILBrminimal()*GeoModelKernelUnits::cm;
+  double NegRminITC1 = dbManager->TILBrminimal()*Gaudi::Units::cm;
   dbManager->SetCurrentSection(TileDddbManager::TILE_PLUG2);
-  double NegRminITC = rMinC10 /* dbManager->TILBrminimal() */ *GeoModelKernelUnits::cm;
+  double NegRminITC = rMinC10 /* dbManager->TILBrminimal() */ *Gaudi::Units::cm;
   dbManager->SetCurrentSection(TileDddbManager::TILE_PLUG4);
-  double NegRminCrack = rMinE4neg*GeoModelKernelUnits::cm;
+  double NegRminCrack = rMinE4neg*Gaudi::Units::cm;
   dbManager->SetCurrentSection(TileDddbManager::TILE_EBARREL);
 
   double NegRminExt = RInMin[2];
@@ -499,7 +496,7 @@ void TileAtlasFactory::create(GeoPhysVol *world)
              << " NegRmaxTotal = " << NegRmaxTotal
 	     << endmsg;
 
-  GeoPcon* tileEnvPconeNegEndcap = new GeoPcon(PhiMin[2]*GeoModelKernelUnits::deg, PhiMax[2]*GeoModelKernelUnits::deg);
+  GeoPcon* tileEnvPconeNegEndcap = new GeoPcon(PhiMin[2]*Gaudi::Units::deg, PhiMax[2]*Gaudi::Units::deg);
 
   // Negative Endcap 
   tileEnvPconeNegEndcap->addPlane(-NegEndExtBarrelFinger,          EFingerRmin,              NegRmaxTotal);
@@ -529,8 +526,8 @@ void TileAtlasFactory::create(GeoPhysVol *world)
 	      - (dbManager->TILBnperiod()*2.*(dbManager->TILBdzmast() + dbManager->TILBdzspac()) 
 		 -  dbManager->TILBdzmast()))/(2.*(2.*dbManager->TILBnperiod() - 1));
 
-    sectionBuilder->setBarrelPeriodThickness(2.*(dbManager->TILBdzmast() + dbManager->TILBdzspac() + 2.*dzGlue)*GeoModelKernelUnits::cm);
-    sectionBuilder->setBarrelGlue(dzGlue*GeoModelKernelUnits::cm);
+    sectionBuilder->setBarrelPeriodThickness(2.*(dbManager->TILBdzmast() + dbManager->TILBdzspac() + 2.*dzGlue)*Gaudi::Units::cm);
+    sectionBuilder->setBarrelGlue(dzGlue*Gaudi::Units::cm);
 
     // Ext barrel part
     dbManager->SetCurrentSectionByNumber(2);
@@ -538,7 +535,7 @@ void TileAtlasFactory::create(GeoPhysVol *world)
     dzGlue = (dbManager->TILBdzmodul() - dbManager->TILBdzend1() - dbManager->TILBdzend2() 
 	      - dbManager->TILBnperiod()*2.*(dbManager->TILBdzmast() + dbManager->TILBdzspac()))/(4.*dbManager->TILBnperiod());
 
-    sectionBuilder->setExtendedPeriodThickness(2.*(dbManager->TILBdzmast() + dbManager->TILBdzspac() + 2.*dzGlue)*GeoModelKernelUnits::cm);
+    sectionBuilder->setExtendedPeriodThickness(2.*(dbManager->TILBdzmast() + dbManager->TILBdzspac() + 2.*dzGlue)*Gaudi::Units::cm);
   }
 
   GeoPhysVol *pvBarrelMother{nullptr},     *pvFingerMotherNeg{nullptr}, *pvFingerMotherPos{nullptr}, 
@@ -774,8 +771,8 @@ void TileAtlasFactory::create(GeoPhysVol *world)
       // nominal position of end plate
       zEndSection = ZLength[1]/2 - BFingerLength;
 
-      GeoTubs* GeneralMother = new GeoTubs(dbManager->GetEnvRin()*GeoModelKernelUnits::cm,
-					   dbManager->GetEnvRout()*GeoModelKernelUnits::cm,
+      GeoTubs* GeneralMother = new GeoTubs(dbManager->GetEnvRin()*Gaudi::Units::cm,
+					   dbManager->GetEnvRout()*Gaudi::Units::cm,
 					   zEndSection,
 					   AnglMin, AnglMax);
 
@@ -786,13 +783,13 @@ void TileAtlasFactory::create(GeoPhysVol *world)
       if(m_log->level()<=MSG::DEBUG)
 	(*m_log) << MSG::DEBUG << "Barrel envelope parameters: " 
 		 << " Length=" << zEndSection
-		 << " Rmin=" << dbManager->GetEnvRin()*GeoModelKernelUnits::cm
-		 << " Rmax=" << dbManager->GetEnvRout()*GeoModelKernelUnits::cm
+		 << " Rmin=" << dbManager->GetEnvRin()*Gaudi::Units::cm
+		 << " Rmax=" << dbManager->GetEnvRout()*Gaudi::Units::cm
 		 << endmsg;
       
       // Envelopes for two barrel fingers, positive finger 
       GeoTubs* fingerMotherPos = new GeoTubs(BFingerRmin,
-                                             dbManager->GetEnvRout()*GeoModelKernelUnits::cm,
+                                             dbManager->GetEnvRout()*Gaudi::Units::cm,
                                              BFingerLengthPos/2,
                                              AnglMin, AnglMax);
 
@@ -812,7 +809,7 @@ void TileAtlasFactory::create(GeoPhysVol *world)
 
        // Negative finger
        GeoTubs* fingerMotherNeg = new GeoTubs(BFingerRmin,
-                                              dbManager->GetEnvRout()*GeoModelKernelUnits::cm,
+                                              dbManager->GetEnvRout()*Gaudi::Units::cm,
                                               BFingerLengthNeg/2,
                                               AnglMin, AnglMax);
 
@@ -822,7 +819,7 @@ void TileAtlasFactory::create(GeoPhysVol *world)
        if(m_log->level()<=MSG::DEBUG)
 	 (*m_log) << MSG::DEBUG << "Barrel finger envelope parameters: " 
 		  << " length Pos/Neg=" << BFingerLengthPos << "/" << BFingerLengthNeg
-		  << " Rmin=" << BFingerRmin << " Rmax=" << dbManager->GetEnvRout()*GeoModelKernelUnits::cm
+		  << " Rmin=" << BFingerRmin << " Rmax=" << dbManager->GetEnvRout()*Gaudi::Units::cm
 		  << endmsg;
 
        // Envelopes for two barrel saddle supports, positive
@@ -840,15 +837,15 @@ void TileAtlasFactory::create(GeoPhysVol *world)
     if(EnvType == 3) {   
 
       if(m_log->level()<=MSG::DEBUG)
-	(*m_log) << MSG::DEBUG <<" EBarrelPos DZ "<<(dbManager->GetEnvZLength()*GeoModelKernelUnits::cm- EBFingerLengthPos)/2<< endmsg;
+	(*m_log) << MSG::DEBUG <<" EBarrelPos DZ "<<(dbManager->GetEnvZLength()*Gaudi::Units::cm- EBFingerLengthPos)/2<< endmsg;
 
       checking("EBarrel (+)", false, 0, 
-               dbManager->GetEnvRin()*GeoModelKernelUnits::cm,dbManager->GetEnvRout()*GeoModelKernelUnits::cm,
-               AnglMin,AnglMax,(dbManager->GetEnvZLength()*GeoModelKernelUnits::cm- EBFingerLengthPos)/2);
+               dbManager->GetEnvRin()*Gaudi::Units::cm,dbManager->GetEnvRout()*Gaudi::Units::cm,
+               AnglMin,AnglMax,(dbManager->GetEnvZLength()*Gaudi::Units::cm- EBFingerLengthPos)/2);
 
-      GeoTubs* GeneralMother = new GeoTubs(dbManager->GetEnvRin()*GeoModelKernelUnits::cm,
-					   dbManager->GetEnvRout()*GeoModelKernelUnits::cm,
-					   (dbManager->GetEnvZLength()*GeoModelKernelUnits::cm- EBFingerLengthPos)/2,
+      GeoTubs* GeneralMother = new GeoTubs(dbManager->GetEnvRin()*Gaudi::Units::cm,
+					   dbManager->GetEnvRout()*Gaudi::Units::cm,
+					   (dbManager->GetEnvZLength()*Gaudi::Units::cm- EBFingerLengthPos)/2,
 					   AnglMin, AnglMax);
 
       GeoTubs* ebarrelMotherPos = GeneralMother;
@@ -857,18 +854,18 @@ void TileAtlasFactory::create(GeoPhysVol *world)
 
       if(m_log->level()<=MSG::DEBUG)
 	(*m_log) << MSG::DEBUG << "Positive ext.barrel envelope parameters: " 
-		 << " length=" << (dbManager->GetEnvZLength()*GeoModelKernelUnits::cm- EBFingerLength)
-		 << " Rmin=" << dbManager->GetEnvRin()*GeoModelKernelUnits::cm
-		 << " Rmax=" << dbManager->GetEnvRout()*GeoModelKernelUnits::cm
+		 << " length=" << (dbManager->GetEnvZLength()*Gaudi::Units::cm- EBFingerLength)
+		 << " Rmin=" << dbManager->GetEnvRin()*Gaudi::Units::cm
+		 << " Rmax=" << dbManager->GetEnvRout()*Gaudi::Units::cm
 		 << endmsg;
 
       // Envelope for finger separately
       checking("EBarrel (+)", false, 0, 
-               EFingerRmin,dbManager->GetEnvRout()*GeoModelKernelUnits::cm,
+               EFingerRmin,dbManager->GetEnvRout()*Gaudi::Units::cm,
                AnglMin,AnglMax, EBFingerLength/2);
 
       GeoTubs* fingerMother = new GeoTubs(EFingerRmin,
-					  dbManager->GetEnvRout()*GeoModelKernelUnits::cm,
+					  dbManager->GetEnvRout()*Gaudi::Units::cm,
 					  EBFingerLength/2,
 					  AnglMin, AnglMax);
 
@@ -879,7 +876,7 @@ void TileAtlasFactory::create(GeoPhysVol *world)
 	(*m_log) << MSG::DEBUG << "Positive ext.barrel finger envelope parameters: " 
 		 << " length=" << EBFingerLength
 		 << " Rmin=" << EFingerRmin
-		 << " Rmax=" << (dbManager->GetEnvRout())*GeoModelKernelUnits::cm
+		 << " Rmax=" << (dbManager->GetEnvRout())*Gaudi::Units::cm
 		 << endmsg;
 
       if (dbManager->BoolSaddle())
@@ -900,11 +897,11 @@ void TileAtlasFactory::create(GeoPhysVol *world)
     // Negative Ext.Barrel
     if(EnvType == 2) { 
       if(m_log->level()<=MSG::DEBUG)
-	(*m_log) << MSG::DEBUG <<" EBarrelNeg DZ "<<(dbManager->GetEnvZLength()*GeoModelKernelUnits::cm- EBFingerLengthNeg)/2<< endmsg;
+	(*m_log) << MSG::DEBUG <<" EBarrelNeg DZ "<<(dbManager->GetEnvZLength()*Gaudi::Units::cm- EBFingerLengthNeg)/2<< endmsg;
 
-      GeoTubs* GeneralMother = new GeoTubs(dbManager->GetEnvRin()*GeoModelKernelUnits::cm,
-					   dbManager->GetEnvRout()*GeoModelKernelUnits::cm,
-					   (dbManager->GetEnvZLength()*GeoModelKernelUnits::cm- EBFingerLengthNeg)/2,
+      GeoTubs* GeneralMother = new GeoTubs(dbManager->GetEnvRin()*Gaudi::Units::cm,
+					   dbManager->GetEnvRout()*Gaudi::Units::cm,
+					   (dbManager->GetEnvZLength()*Gaudi::Units::cm- EBFingerLengthNeg)/2,
 					   AnglMin, AnglMax);
 
       GeoTubs* ebarrelMotherNeg = GeneralMother;
@@ -913,14 +910,14 @@ void TileAtlasFactory::create(GeoPhysVol *world)
       
       if(m_log->level()<=MSG::DEBUG)
 	(*m_log) << MSG::DEBUG << "Nevative ext.barrel envelope parameters: " 
-		 << " length=" << (dbManager->GetEnvZLength()*GeoModelKernelUnits::cm- EBFingerLength)
-		 << " Rmin=" << dbManager->GetEnvRin()*GeoModelKernelUnits::cm
-		 << " Rmax=" << dbManager->GetEnvRout()*GeoModelKernelUnits::cm
+		 << " length=" << (dbManager->GetEnvZLength()*Gaudi::Units::cm- EBFingerLength)
+		 << " Rmin=" << dbManager->GetEnvRin()*Gaudi::Units::cm
+		 << " Rmax=" << dbManager->GetEnvRout()*Gaudi::Units::cm
 		 << endmsg;
 
       // Envelope for finger separately
       GeoTubs* fingerMother = new GeoTubs(EFingerRmin,
-					  dbManager->GetEnvRout()*GeoModelKernelUnits::cm,
+					  dbManager->GetEnvRout()*Gaudi::Units::cm,
 					  EBFingerLengthNeg/2,
 					  AnglMin, AnglMax);
       
@@ -931,7 +928,7 @@ void TileAtlasFactory::create(GeoPhysVol *world)
 	(*m_log) << MSG::DEBUG <<"Negative ext.barrel finger envelope parameters: " 
 		 << " length=" << EBFingerLengthNeg
 		 << " Rmin=" << EFingerRmin
-		 << " Rmax=" << dbManager->GetEnvRout()*GeoModelKernelUnits::cm
+		 << " Rmax=" << dbManager->GetEnvRout()*Gaudi::Units::cm
 		 << endmsg;
 
       if (dbManager->BoolSaddle())
@@ -965,27 +962,27 @@ void TileAtlasFactory::create(GeoPhysVol *world)
       dzITC1   = dbManager->TILBdzmodul();
       
       (*m_log) << MSG::INFO << " Positive ITC envelope parameters: PLUG1 " 
-               <<" Rmin= "<<rMinITC1*GeoModelKernelUnits::cm<<" Rmax= "<<rMaxITC1*GeoModelKernelUnits::cm<<" dzITC1= "<<dzITC1/2*GeoModelKernelUnits::cm<< endmsg;
+               <<" Rmin= "<<rMinITC1*Gaudi::Units::cm<<" Rmax= "<<rMaxITC1*Gaudi::Units::cm<<" dzITC1= "<<dzITC1/2*Gaudi::Units::cm<< endmsg;
       (*m_log) << MSG::INFO << "                                   PLUG2 "
-               <<" Rmin= "<<rMinITC2*GeoModelKernelUnits::cm<<" Rmax= "<<rMaxITC2*GeoModelKernelUnits::cm<<" dzITC2= "<<dzITC2/2*GeoModelKernelUnits::cm<< endmsg;
+               <<" Rmin= "<<rMinITC2*Gaudi::Units::cm<<" Rmax= "<<rMaxITC2*Gaudi::Units::cm<<" dzITC2= "<<dzITC2/2*Gaudi::Units::cm<< endmsg;
 
       checking("ITC itcWheel1 (+)", false, 0, 
-               rMinITC1*GeoModelKernelUnits::cm,rMaxITC1*GeoModelKernelUnits::cm, AnglMin,AnglMax, dzITC1/2*GeoModelKernelUnits::cm);
+               rMinITC1*Gaudi::Units::cm,rMaxITC1*Gaudi::Units::cm, AnglMin,AnglMax, dzITC1/2*Gaudi::Units::cm);
 
-      GeoTubs* itcWheel1 = new GeoTubs(rMinITC1*GeoModelKernelUnits::cm,
-                                       rMaxITC1*GeoModelKernelUnits::cm,
-                                       dzITC1/2*GeoModelKernelUnits::cm,
+      GeoTubs* itcWheel1 = new GeoTubs(rMinITC1*Gaudi::Units::cm,
+                                       rMaxITC1*Gaudi::Units::cm,
+                                       dzITC1/2*Gaudi::Units::cm,
                                        AnglMin, AnglMax);
 
       checking("ITC itcWheel2 (+)", false, 0,
-               rMinITC2*GeoModelKernelUnits::cm,rMaxITC2*GeoModelKernelUnits::cm, AnglMin,AnglMax, dzITC2/2*GeoModelKernelUnits::cm);
+               rMinITC2*Gaudi::Units::cm,rMaxITC2*Gaudi::Units::cm, AnglMin,AnglMax, dzITC2/2*Gaudi::Units::cm);
 
-      GeoTubs* itcWheel2 = new GeoTubs(rMinITC2*GeoModelKernelUnits::cm,
-                                       rMaxITC2*GeoModelKernelUnits::cm,
-                                       dzITC2/2*GeoModelKernelUnits::cm,
+      GeoTubs* itcWheel2 = new GeoTubs(rMinITC2*Gaudi::Units::cm,
+                                       rMaxITC2*Gaudi::Units::cm,
+                                       dzITC2/2*Gaudi::Units::cm,
                                        AnglMin, AnglMax);
       
-      Z = ( dzITC1 - dzITC2)/2*GeoModelKernelUnits::cm;
+      Z = ( dzITC1 - dzITC2)/2*Gaudi::Units::cm;
       GeoTrf::Translate3D itcWheel2OffsetPos(0.,0., Z);
 
       zITCStandard = Z;
@@ -999,13 +996,13 @@ void TileAtlasFactory::create(GeoPhysVol *world)
       dbManager->SetCurrentSection(TileDddbManager::TILE_PLUG3);
 
       checking("Gap (+)", false, 0, 
-              dbManager->TILBrminimal()*GeoModelKernelUnits::cm,
-              dbManager->TILBrmaximal()*GeoModelKernelUnits::cm/cos(deltaPhi/2*GeoModelKernelUnits::deg),
-              AnglMin,AnglMax, dbManager->TILBdzmodul()/2*GeoModelKernelUnits::cm);
+              dbManager->TILBrminimal()*Gaudi::Units::cm,
+              dbManager->TILBrmaximal()*Gaudi::Units::cm/cos(deltaPhi/2*Gaudi::Units::deg),
+              AnglMin,AnglMax, dbManager->TILBdzmodul()/2*Gaudi::Units::cm);
 
-      GeoTubs* GapMotherPos = new GeoTubs(dbManager->TILBrminimal()*GeoModelKernelUnits::cm,
-	                                  dbManager->TILBrmaximal()*GeoModelKernelUnits::cm/cos(deltaPhi/2*GeoModelKernelUnits::deg),
-                                          dbManager->TILBdzmodul()/2*GeoModelKernelUnits::cm,
+      GeoTubs* GapMotherPos = new GeoTubs(dbManager->TILBrminimal()*Gaudi::Units::cm,
+	                                  dbManager->TILBrmaximal()*Gaudi::Units::cm/cos(deltaPhi/2*Gaudi::Units::deg),
+                                          dbManager->TILBdzmodul()/2*Gaudi::Units::cm,
                                           AnglMin, AnglMax);
 
       GeoLogVol* lvGapMotherPos = new GeoLogVol("Gap",GapMotherPos,matAir);
@@ -1015,13 +1012,13 @@ void TileAtlasFactory::create(GeoPhysVol *world)
       dbManager->SetCurrentSection(TileDddbManager::TILE_PLUG4);
 
       checking("Crack (+)", spE4, 0, 
-              rMinE4pos*GeoModelKernelUnits::cm,
-              dbManager->TILBrmaximal()*GeoModelKernelUnits::cm/cos(deltaPhi/2*GeoModelKernelUnits::deg),
-              AnglMin,AnglMax, dbManager->TILBdzmodul()/2*GeoModelKernelUnits::cm);
+              rMinE4pos*Gaudi::Units::cm,
+              dbManager->TILBrmaximal()*Gaudi::Units::cm/cos(deltaPhi/2*Gaudi::Units::deg),
+              AnglMin,AnglMax, dbManager->TILBdzmodul()/2*Gaudi::Units::cm);
 
-      GeoTubs* crackMotherPos = new GeoTubs(rMinE4pos*GeoModelKernelUnits::cm,
-				            dbManager->TILBrmaximal()*GeoModelKernelUnits::cm/cos(deltaPhi/2*GeoModelKernelUnits::deg),
-				            dbManager->TILBdzmodul()/2*GeoModelKernelUnits::cm,
+      GeoTubs* crackMotherPos = new GeoTubs(rMinE4pos*Gaudi::Units::cm,
+				            dbManager->TILBrmaximal()*Gaudi::Units::cm/cos(deltaPhi/2*Gaudi::Units::deg),
+				            dbManager->TILBdzmodul()/2*Gaudi::Units::cm,
                                             AnglMin, AnglMax);
     
       GeoLogVol* lvCrackMotherPos = new GeoLogVol("Crack",crackMotherPos,matAir);
@@ -1044,27 +1041,27 @@ void TileAtlasFactory::create(GeoPhysVol *world)
       dzITC1   = dbManager->TILBdzmodul();
       
       (*m_log) << MSG::INFO << " Negative ITC envelope parameters: PLUG1 " 
-               <<" Rmin= "<<rMinITC1*GeoModelKernelUnits::cm<<" Rmax= "<<rMaxITC1*GeoModelKernelUnits::cm<<" dzITC1= "<<dzITC1/2*GeoModelKernelUnits::cm<<endmsg;
+               <<" Rmin= "<<rMinITC1*Gaudi::Units::cm<<" Rmax= "<<rMaxITC1*Gaudi::Units::cm<<" dzITC1= "<<dzITC1/2*Gaudi::Units::cm<<endmsg;
       (*m_log) << MSG::INFO << "                                   PLUG2 "
-               <<" Rmin= "<<rMinITC2*GeoModelKernelUnits::cm<<" Rmax= "<<rMaxITC2*GeoModelKernelUnits::cm<<" dzITC2= "<<dzITC2/2*GeoModelKernelUnits::cm<<endmsg;
+               <<" Rmin= "<<rMinITC2*Gaudi::Units::cm<<" Rmax= "<<rMaxITC2*Gaudi::Units::cm<<" dzITC2= "<<dzITC2/2*Gaudi::Units::cm<<endmsg;
 
       checking("ITC itcWheel1 (-)", false, 0, 
-               rMinITC1*GeoModelKernelUnits::cm,rMaxITC1*GeoModelKernelUnits::cm, AnglMin,AnglMax, dzITC1/2*GeoModelKernelUnits::cm);
+               rMinITC1*Gaudi::Units::cm,rMaxITC1*Gaudi::Units::cm, AnglMin,AnglMax, dzITC1/2*Gaudi::Units::cm);
 
-      GeoTubs* itcWheel1 = new GeoTubs(rMinITC1*GeoModelKernelUnits::cm,
-                                       rMaxITC1*GeoModelKernelUnits::cm,
-                                       dzITC1/2*GeoModelKernelUnits::cm,
+      GeoTubs* itcWheel1 = new GeoTubs(rMinITC1*Gaudi::Units::cm,
+                                       rMaxITC1*Gaudi::Units::cm,
+                                       dzITC1/2*Gaudi::Units::cm,
                                        AnglMin, AnglMax);
 
       checking("ITC itcWheel2 (-)", false, 0,
-               rMinITC2*GeoModelKernelUnits::cm,rMaxITC2*GeoModelKernelUnits::cm, AnglMin,AnglMax, dzITC2/2*GeoModelKernelUnits::cm);
+               rMinITC2*Gaudi::Units::cm,rMaxITC2*Gaudi::Units::cm, AnglMin,AnglMax, dzITC2/2*Gaudi::Units::cm);
 
-      GeoTubs* itcWheel2 = new GeoTubs(rMinITC2*GeoModelKernelUnits::cm,
-                                       rMaxITC2*GeoModelKernelUnits::cm,
-                                       dzITC2/2*GeoModelKernelUnits::cm,
+      GeoTubs* itcWheel2 = new GeoTubs(rMinITC2*Gaudi::Units::cm,
+                                       rMaxITC2*Gaudi::Units::cm,
+                                       dzITC2/2*Gaudi::Units::cm,
                                        AnglMin, AnglMax);
 
-      Z = (-dzITC1 + dzITC2)/2*GeoModelKernelUnits::cm;
+      Z = (-dzITC1 + dzITC2)/2*Gaudi::Units::cm;
       GeoTrf::Translate3D itcWheel2OffsetNeg(0.,0., Z);
 
       zITCStandard = Z;
@@ -1078,13 +1075,13 @@ void TileAtlasFactory::create(GeoPhysVol *world)
       dbManager->SetCurrentSection(TileDddbManager::TILE_PLUG3);
 
       checking("Gap (-)", false, 1, 
-              dbManager->TILBrminimal()*GeoModelKernelUnits::cm,
-              dbManager->TILBrmaximal()*GeoModelKernelUnits::cm/cos(deltaPhi/2*GeoModelKernelUnits::deg),
-              AnglMin,AnglMax, dbManager->TILBdzmodul()/2*GeoModelKernelUnits::cm);
+              dbManager->TILBrminimal()*Gaudi::Units::cm,
+              dbManager->TILBrmaximal()*Gaudi::Units::cm/cos(deltaPhi/2*Gaudi::Units::deg),
+              AnglMin,AnglMax, dbManager->TILBdzmodul()/2*Gaudi::Units::cm);
 
-      GeoTubs* GapMotherNeg = new GeoTubs(dbManager->TILBrminimal()*GeoModelKernelUnits::cm,
-	                                  dbManager->TILBrmaximal()*GeoModelKernelUnits::cm/cos(deltaPhi/2*GeoModelKernelUnits::deg),
-                                          dbManager->TILBdzmodul()/2*GeoModelKernelUnits::cm,
+      GeoTubs* GapMotherNeg = new GeoTubs(dbManager->TILBrminimal()*Gaudi::Units::cm,
+	                                  dbManager->TILBrmaximal()*Gaudi::Units::cm/cos(deltaPhi/2*Gaudi::Units::deg),
+                                          dbManager->TILBdzmodul()/2*Gaudi::Units::cm,
                                           AnglMin, AnglMax);
 
       GeoLogVol* lvGapMotherNeg = new GeoLogVol("Gap",GapMotherNeg,matAir);
@@ -1094,13 +1091,13 @@ void TileAtlasFactory::create(GeoPhysVol *world)
       dbManager->SetCurrentSection(TileDddbManager::TILE_PLUG4);
   
       checking("Crack (-)", spE4, 0, 
-              rMinE4neg*GeoModelKernelUnits::cm,
-              dbManager->TILBrmaximal()*GeoModelKernelUnits::cm/cos(deltaPhi/2*GeoModelKernelUnits::deg),
-              AnglMin,AnglMax, dbManager->TILBdzmodul()/2*GeoModelKernelUnits::cm);
+              rMinE4neg*Gaudi::Units::cm,
+              dbManager->TILBrmaximal()*Gaudi::Units::cm/cos(deltaPhi/2*Gaudi::Units::deg),
+              AnglMin,AnglMax, dbManager->TILBdzmodul()/2*Gaudi::Units::cm);
 
-      GeoTubs* crackMotherNeg = new GeoTubs(rMinE4neg*GeoModelKernelUnits::cm,
-				            dbManager->TILBrmaximal()*GeoModelKernelUnits::cm/cos(deltaPhi/2*GeoModelKernelUnits::deg),
-				            dbManager->TILBdzmodul()/2*GeoModelKernelUnits::cm,
+      GeoTubs* crackMotherNeg = new GeoTubs(rMinE4neg*Gaudi::Units::cm,
+				            dbManager->TILBrmaximal()*Gaudi::Units::cm/cos(deltaPhi/2*Gaudi::Units::deg),
+				            dbManager->TILBdzmodul()/2*Gaudi::Units::cm,
                                             AnglMin, AnglMax);
     
       GeoLogVol* lvCrackMotherNeg = new GeoLogVol("Crack",crackMotherNeg,matAir);
@@ -1119,9 +1116,9 @@ void TileAtlasFactory::create(GeoPhysVol *world)
     // the main loop around all phi modules position
     int ModuleNcp =0;
 
-    GeoTransform* yrotMod = new GeoTransform(GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg));
+    GeoTransform* yrotMod = new GeoTransform(GeoTrf::RotateY3D(90*Gaudi::Units::deg));
     yrotMod->ref();
-    GeoTransform* XYrtMod = new GeoTransform(GeoTrf::RotateX3D(180*GeoModelKernelUnits::deg) * GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg));
+    GeoTransform* XYrtMod = new GeoTransform(GeoTrf::RotateX3D(180*Gaudi::Units::deg) * GeoTrf::RotateY3D(90*Gaudi::Units::deg));
     XYrtMod->ref();
 
     for(int ModCounter = 0; ModCounter < NumberOfMod; ModCounter++){
@@ -1132,9 +1129,9 @@ void TileAtlasFactory::create(GeoPhysVol *world)
       double phi = (double(ModuleNcp-1) + 0.5)*deltaPhi;
       double ph1 = (double(ModuleNcp-1))*deltaPhi;
 
-      GeoTransform* zrotMod = new GeoTransform(GeoTrf::RotateZ3D(phi*GeoModelKernelUnits::deg));
+      GeoTransform* zrotMod = new GeoTransform(GeoTrf::RotateZ3D(phi*Gaudi::Units::deg));
       zrotMod->ref();
-      GeoTransform* zrotSaddle =  new GeoTransform(GeoTrf::RotateZ3D(ph1*GeoModelKernelUnits::deg));
+      GeoTransform* zrotSaddle =  new GeoTransform(GeoTrf::RotateZ3D(ph1*Gaudi::Units::deg));
       zrotSaddle->ref();
 
       dbManager->SetCurrentModuleByIndex(ModuleNcp-1);
@@ -1161,10 +1158,10 @@ void TileAtlasFactory::create(GeoPhysVol *world)
 
 	dbManager->SetCurrentSectionByNumber(ModType);
 
-        thicknessWedgeMother = dbManager->TILBdzmodul() * GeoModelKernelUnits::cm; 
-        heightWedgeMother = (dbManager->TILBrmaximal() - dbManager->TILBrminimal()) * GeoModelKernelUnits::cm;
-        dy1WedgeMother = dbManager->TILBrminimal() * tan(deltaPhi/2*GeoModelKernelUnits::deg) * GeoModelKernelUnits::cm;
-        dy2WedgeMother = dbManager->TILBrmaximal() * tan(deltaPhi/2*GeoModelKernelUnits::deg) * GeoModelKernelUnits::cm;
+        thicknessWedgeMother = dbManager->TILBdzmodul() * Gaudi::Units::cm; 
+        heightWedgeMother = (dbManager->TILBrmaximal() - dbManager->TILBrminimal()) * Gaudi::Units::cm;
+        dy1WedgeMother = dbManager->TILBrminimal() * tan(deltaPhi/2*Gaudi::Units::deg) * Gaudi::Units::cm;
+        dy2WedgeMother = dbManager->TILBrmaximal() * tan(deltaPhi/2*Gaudi::Units::deg) * Gaudi::Units::cm;
        
         dzGlue = (dbManager->TILBdzmodul() - dbManager->TILBdzend1() - dbManager->TILBdzend2() 
                - (dbManager->TILBnperiod()*2.*(dbManager->TILBdzmast() + dbManager->TILBdzspac()) 
@@ -1189,7 +1186,7 @@ void TileAtlasFactory::create(GeoPhysVol *world)
 	}
        
         GeoTransform* xtraMod = new GeoTransform(GeoTrf::TranslateX3D(
-                                    (dbManager->TILBrmaximal() + dbManager->TILBrminimal())/2 * GeoModelKernelUnits::cm));
+                                    (dbManager->TILBrmaximal() + dbManager->TILBrminimal())/2 * Gaudi::Units::cm));
 
         pvBarrelMother->add(zrotMod);
         pvBarrelMother->add(xtraMod);
@@ -1203,9 +1200,9 @@ void TileAtlasFactory::create(GeoPhysVol *world)
 	dbManager->SetCurrentTifg(1);  // Barrel finger 
         zEndSection = dbManager->TILBzoffset() + dbManager->TILBdzmodul()/2;
 
-        heightWedgeMother = (dbManager->TILErmax() - dbManager->TILBrmax())*GeoModelKernelUnits::cm;
-        dy1WedgeMother = dbManager->TILBrmax() * tan(deltaPhi/2*GeoModelKernelUnits::deg)*GeoModelKernelUnits::cm;
-        dy2WedgeMother = dbManager->TILErmax() * tan(deltaPhi/2*GeoModelKernelUnits::deg)*GeoModelKernelUnits::cm;
+        heightWedgeMother = (dbManager->TILErmax() - dbManager->TILBrmax())*Gaudi::Units::cm;
+        dy1WedgeMother = dbManager->TILBrmax() * tan(deltaPhi/2*Gaudi::Units::deg)*Gaudi::Units::cm;
+        dy2WedgeMother = dbManager->TILErmax() * tan(deltaPhi/2*Gaudi::Units::deg)*Gaudi::Units::cm;
 
 	// Finger Positive, positioning (only Left ModFingpattern == 10) 
 	if ( ModFingpattern != 10 ) {
@@ -1225,9 +1222,9 @@ void TileAtlasFactory::create(GeoPhysVol *world)
 				       deltaPhi,
 				       m_testbeamGeometry,
 				       ModuleNcp,
-				       BFingerLengthPos*(1./GeoModelKernelUnits::cm)); 
+				       BFingerLengthPos*(1./Gaudi::Units::cm)); 
 
-	  GeoTransform* xtraModFingerPos  = new GeoTransform(GeoTrf::TranslateX3D((dbManager->TILErmax() + dbManager->TILBrmax())/2*GeoModelKernelUnits::cm));
+	  GeoTransform* xtraModFingerPos  = new GeoTransform(GeoTrf::TranslateX3D((dbManager->TILErmax() + dbManager->TILBrmax())/2*Gaudi::Units::cm));
 
           //(*m_log) << MSG::DEBUG << "R  Index " << ModuleNcp << " Fingpattern "<< ModFingpattern << endmsg;
  
@@ -1258,9 +1255,9 @@ void TileAtlasFactory::create(GeoPhysVol *world)
 				       deltaPhi,
 				       m_testbeamGeometry,
 				       ModuleNcp*100,
-				       BFingerLengthNeg*(1./GeoModelKernelUnits::cm));
+				       BFingerLengthNeg*(1./Gaudi::Units::cm));
 
-	  GeoTransform* xtraModFingerNeg  = new GeoTransform(GeoTrf::TranslateX3D((dbManager->TILErmax() + dbManager->TILBrmax())/2*GeoModelKernelUnits::cm));
+	  GeoTransform* xtraModFingerNeg  = new GeoTransform(GeoTrf::TranslateX3D((dbManager->TILErmax() + dbManager->TILBrmax())/2*Gaudi::Units::cm));
 
           // (*m_log) << MSG::DEBUG << "L  Index " << ModuleNcp << " Fingpattern "<< ModFingpattern << endmsg;
 
@@ -1279,7 +1276,7 @@ void TileAtlasFactory::create(GeoPhysVol *world)
             GeoTubs* SaddleModule = new GeoTubs(BFingerRmin-RadiusSaddle,
                                                 BFingerRmin,
                                                 DzSaddleSupport/2,
-                                                0.,deltaPhi*GeoModelKernelUnits::deg);
+                                                0.,deltaPhi*Gaudi::Units::deg);
      
             GeoLogVol* lvSaddleModule = new GeoLogVol("SaddleModule",SaddleModule,matIron);
             GeoPhysVol* pvSaddleModule = new GeoPhysVol(lvSaddleModule);
@@ -1302,16 +1299,16 @@ void TileAtlasFactory::create(GeoPhysVol *world)
 	dbManager->SetCurrentSectionByNumber(ModType);
 
         // Mother module 
-        thicknessWedgeMother = dbManager->TILBdzmodul() * GeoModelKernelUnits::cm;
-        heightWedgeMother = (dbManager->TILBrmaximal() - dbManager->TILBrminimal()) * GeoModelKernelUnits::cm;
-        dy1WedgeMother = dbManager->TILBrminimal() * tan(deltaPhi/2*GeoModelKernelUnits::deg) * GeoModelKernelUnits::cm;
-        dy2WedgeMother = dbManager->TILBrmaximal() * tan(deltaPhi/2*GeoModelKernelUnits::deg) * GeoModelKernelUnits::cm;
+        thicknessWedgeMother = dbManager->TILBdzmodul() * Gaudi::Units::cm;
+        heightWedgeMother = (dbManager->TILBrmaximal() - dbManager->TILBrminimal()) * Gaudi::Units::cm;
+        dy1WedgeMother = dbManager->TILBrminimal() * tan(deltaPhi/2*Gaudi::Units::deg) * Gaudi::Units::cm;
+        dy2WedgeMother = dbManager->TILBrmaximal() * tan(deltaPhi/2*Gaudi::Units::deg) * Gaudi::Units::cm;
         
         dzGlue = (dbManager->TILBdzmodul() - dbManager->TILBdzend1() - dbManager->TILBdzend2() 
                 - dbManager->TILBnperiod()*2.*(dbManager->TILBdzmast() + dbManager->TILBdzspac()))/(4.*
                   dbManager->TILBnperiod());
         
-        double Radius = (dbManager->TILBrmaximal() + dbManager->TILBrminimal())/2 * GeoModelKernelUnits::cm;
+        double Radius = (dbManager->TILBrmaximal() + dbManager->TILBrminimal())/2 * Gaudi::Units::cm;
 
         checking("EBarrelModule (+)", false, 1, 
                  thicknessWedgeMother/2,thicknessWedgeMother/2,dy1WedgeMother,dy2WedgeMother,heightWedgeMother/2);
@@ -1336,18 +1333,18 @@ void TileAtlasFactory::create(GeoPhysVol *world)
 	  if(m_log->level()<=MSG::DEBUG)
 	    (*m_log) << MSG::DEBUG << " BoolCuts YES "<< dbManager->BoolCuts() << endmsg;
  
-           double PoZ2 =0, PoZ1 =0, thicknessEndPlate =dbManager->TILBdzend1()*GeoModelKernelUnits::cm;
+           double PoZ2 =0, PoZ1 =0, thicknessEndPlate =dbManager->TILBdzend1()*Gaudi::Units::cm;
 
-           PoZ1 = thicknessEndPlate + modl_length/4 - (dbManager->GetEnvZLength()*GeoModelKernelUnits::cm- EBFingerLengthPos)/2;
+           PoZ1 = thicknessEndPlate + modl_length/4 - (dbManager->GetEnvZLength()*Gaudi::Units::cm- EBFingerLengthPos)/2;
            PoZ2 = PoZ1 + modl_length/4;
 
            if ((ModuleNcp>=35 && ModuleNcp<=37) || (ModuleNcp>=60 && ModuleNcp<=62))
-	    { GeoTrf::Transform3D  TransCut2 = GeoTrf::TranslateZ3D(-Radius) * GeoTrf::RotateX3D((90-phi)*GeoModelKernelUnits::deg) * GeoTrf::RotateY3D(180*GeoModelKernelUnits::deg)
+	    { GeoTrf::Transform3D  TransCut2 = GeoTrf::TranslateZ3D(-Radius) * GeoTrf::RotateX3D((90-phi)*Gaudi::Units::deg) * GeoTrf::RotateY3D(180*Gaudi::Units::deg)
                                         * GeoTrf::Translate3D(-PoZ2,0.,-PosY);
  
               if (ModuleNcp>=60 && ModuleNcp<=62)
 	       { GeoTrf::Transform3D TransCutL = GeoTrf::TranslateZ3D(-Radius)
-                                          * GeoTrf::RotateY3D(180*GeoModelKernelUnits::deg) * GeoTrf::RotateX3D(phi*GeoModelKernelUnits::deg)
+                                          * GeoTrf::RotateY3D(180*Gaudi::Units::deg) * GeoTrf::RotateX3D(phi*Gaudi::Units::deg)
                                           * GeoTrf::Translate3D(PoZ1,PosYcut,-PosXcut);
 
                  // Cuting of module (Left)
@@ -1358,8 +1355,8 @@ void TileAtlasFactory::create(GeoPhysVol *world)
 
                } else if (ModuleNcp>=35 && ModuleNcp<=37) 
 	       { GeoTrf::Transform3D TransCutR = GeoTrf::TranslateZ3D(-Radius)
-                                          * GeoTrf::RotateY3D(180*GeoModelKernelUnits::deg) * GeoTrf::RotateX3D(phi*GeoModelKernelUnits::deg)
-                                          * GeoTrf::Translate3D(PoZ1,PosYcut,PosXcut) * GeoTrf::RotateY3D(180*GeoModelKernelUnits::deg);
+                                          * GeoTrf::RotateY3D(180*Gaudi::Units::deg) * GeoTrf::RotateX3D(phi*Gaudi::Units::deg)
+                                          * GeoTrf::Translate3D(PoZ1,PosYcut,PosXcut) * GeoTrf::RotateY3D(180*Gaudi::Units::deg);
 
                  // Cuting of module (Right)
                  const GeoShape& TmR_EBarrelModuleMotherPos = ebarrelModuleMotherPos->subtract((*CutA)<<TransCut2).
@@ -1405,13 +1402,13 @@ void TileAtlasFactory::create(GeoPhysVol *world)
            (*m_log) << MSG::DEBUG << " BoolCuts YES "<< dbManager->BoolCuts() << endmsg;
  
            double PoZ2 =0, PoZ1 =0;
-           double thicknessEndPlate = dbManager->TILBdzend1()*GeoModelKernelUnits::cm;
+           double thicknessEndPlate = dbManager->TILBdzend1()*Gaudi::Units::cm;
 
-           PoZ1 = thicknessEndPlate + modl_length/4 - (dbManager->GetEnvZLength()*GeoModelKernelUnits::cm- EBFingerLengthPos)/2;
+           PoZ1 = thicknessEndPlate + modl_length/4 - (dbManager->GetEnvZLength()*Gaudi::Units::cm- EBFingerLengthPos)/2;
            PoZ2 = modl_length/4 + PoZ1;
 
            if ((ModuleNcp>=35 && ModuleNcp<=37) || (ModuleNcp>=60 && ModuleNcp<=62))
-	    { GeoTrf::Transform3D  TransCut2 = GeoTrf::TranslateZ3D(-Radius) * GeoTrf::RotateX3D((90-phi)*GeoModelKernelUnits::deg) * GeoTrf::RotateY3D(180*GeoModelKernelUnits::deg)
+	    { GeoTrf::Transform3D  TransCut2 = GeoTrf::TranslateZ3D(-Radius) * GeoTrf::RotateX3D((90-phi)*Gaudi::Units::deg) * GeoTrf::RotateY3D(180*Gaudi::Units::deg)
                                         * GeoTrf::Translate3D(-PoZ2,0.,-PosY);
  
               // Cuting of pvEBarrelModuleMotherPos (-)
@@ -1422,7 +1419,7 @@ void TileAtlasFactory::create(GeoPhysVol *world)
 
               if (ModuleNcp>=60 && ModuleNcp<=62)
 	       { GeoTrf::Transform3D TransCutL = GeoTrf::TranslateZ3D(-Radius)
-                                          * GeoTrf::RotateY3D(180*GeoModelKernelUnits::deg) * GeoTrf::RotateX3D(phi*GeoModelKernelUnits::deg)
+                                          * GeoTrf::RotateY3D(180*Gaudi::Units::deg) * GeoTrf::RotateX3D(phi*Gaudi::Units::deg)
                                           * GeoTrf::Translate3D(PoZ1,PosYcut,-PosXcut);
 
                  // Cuting of pvEBarrelModuleMotherPos (Left)
@@ -1435,8 +1432,8 @@ void TileAtlasFactory::create(GeoPhysVol *world)
 
                } else if (ModuleNcp>=35 && ModuleNcp<=37) 
 	       { GeoTrf::Transform3D TransCutR = GeoTrf::TranslateZ3D(-Radius)
-                                          * GeoTrf::RotateY3D(180*GeoModelKernelUnits::deg) * GeoTrf::RotateX3D(phi*GeoModelKernelUnits::deg)
-                                          * GeoTrf::Translate3D(PoZ1,PosYcut,PosXcut) * GeoTrf::RotateY3D(180*GeoModelKernelUnits::deg);
+                                          * GeoTrf::RotateY3D(180*Gaudi::Units::deg) * GeoTrf::RotateX3D(phi*Gaudi::Units::deg)
+                                          * GeoTrf::Translate3D(PoZ1,PosYcut,PosXcut) * GeoTrf::RotateY3D(180*Gaudi::Units::deg);
 
                  // Cuting of pvEBarrelModuleMotherPos (Right)
                  GeoCutVolAction action3(*CutB, TransCutR);
@@ -1459,10 +1456,10 @@ void TileAtlasFactory::create(GeoPhysVol *world)
         dbManager->SetCurrentTifg(2);  //barrel efinger (small)
         
         // Trd - one finger mother
-        thicknessWedgeMother = dbManager->TIFGdz() * GeoModelKernelUnits::cm;
-        heightWedgeMother = (dbManager->TILErmax() - dbManager->TILBrmax()) * GeoModelKernelUnits::cm;
-        dy1WedgeMother = dbManager->TILBrmax() * tan(deltaPhi/2*GeoModelKernelUnits::deg) * GeoModelKernelUnits::cm;
-        dy2WedgeMother = dbManager->TILErmax() * tan(deltaPhi/2*GeoModelKernelUnits::deg) * GeoModelKernelUnits::cm;
+        thicknessWedgeMother = dbManager->TIFGdz() * Gaudi::Units::cm;
+        heightWedgeMother = (dbManager->TILErmax() - dbManager->TILBrmax()) * Gaudi::Units::cm;
+        dy1WedgeMother = dbManager->TILBrmax() * tan(deltaPhi/2*Gaudi::Units::deg) * Gaudi::Units::cm;
+        dy2WedgeMother = dbManager->TILErmax() * tan(deltaPhi/2*Gaudi::Units::deg) * Gaudi::Units::cm;
         
         checking("EFingerModule (+)", false,  1, 
                  thicknessWedgeMother/2,thicknessWedgeMother/2,dy1WedgeMother,dy2WedgeMother,heightWedgeMother/2);
@@ -1486,7 +1483,7 @@ void TileAtlasFactory::create(GeoPhysVol *world)
                                       ModuleNcp);
 	 }
         GeoTransform* xtraModFingerPos  = new GeoTransform(GeoTrf::TranslateX3D(
-                                              (dbManager->TILErmax() + dbManager->TILBrmax())/2*GeoModelKernelUnits::cm));
+                                              (dbManager->TILErmax() + dbManager->TILBrmax())/2*Gaudi::Units::cm));
         pvEFingerMotherPos->add(zrotMod);
         pvEFingerMotherPos->add(xtraModFingerPos);
         pvEFingerMotherPos->add(XYrtMod);
@@ -1501,7 +1498,7 @@ void TileAtlasFactory::create(GeoPhysVol *world)
             GeoTubs* SaddleModule = new GeoTubs(BFingerRmin-RadiusSaddle,
                                                 BFingerRmin,
                                                 DzSaddleSupport/2,
-                                                0.,deltaPhi*GeoModelKernelUnits::deg);
+                                                0.,deltaPhi*Gaudi::Units::deg);
      
             GeoLogVol* lvSaddleModule = new GeoLogVol("SaddleModule",SaddleModule,matIron);
             GeoPhysVol* pvSaddleModule = new GeoPhysVol(lvSaddleModule);
@@ -1521,16 +1518,16 @@ void TileAtlasFactory::create(GeoPhysVol *world)
 	dbManager->SetCurrentSectionByNumber(ModType);
 
         // Mother module
-        thicknessWedgeMother = dbManager->TILBdzmodul() * GeoModelKernelUnits::cm;
-        heightWedgeMother = (dbManager->TILBrmaximal() - dbManager->TILBrminimal()) * GeoModelKernelUnits::cm;
-        dy1WedgeMother = dbManager->TILBrminimal() * tan(deltaPhi/2*GeoModelKernelUnits::deg) * GeoModelKernelUnits::cm;
-        dy2WedgeMother = dbManager->TILBrmaximal() * tan(deltaPhi/2*GeoModelKernelUnits::deg) * GeoModelKernelUnits::cm;
+        thicknessWedgeMother = dbManager->TILBdzmodul() * Gaudi::Units::cm;
+        heightWedgeMother = (dbManager->TILBrmaximal() - dbManager->TILBrminimal()) * Gaudi::Units::cm;
+        dy1WedgeMother = dbManager->TILBrminimal() * tan(deltaPhi/2*Gaudi::Units::deg) * Gaudi::Units::cm;
+        dy2WedgeMother = dbManager->TILBrmaximal() * tan(deltaPhi/2*Gaudi::Units::deg) * Gaudi::Units::cm;
         
         dzGlue = (dbManager->TILBdzmodul() - dbManager->TILBdzend1() - dbManager->TILBdzend2() 
                 - dbManager->TILBnperiod()*2.*(dbManager->TILBdzmast() 
                 + dbManager->TILBdzspac()))/(4.*dbManager->TILBnperiod());
   
-        double Radius = (dbManager->TILBrmaximal() + dbManager->TILBrminimal())/2 * GeoModelKernelUnits::cm;
+        double Radius = (dbManager->TILBrmaximal() + dbManager->TILBrminimal())/2 * Gaudi::Units::cm;
 
         checking("EBarrelModule (-)", false, 1, 
                  thicknessWedgeMother/2,thicknessWedgeMother/2,dy1WedgeMother,dy2WedgeMother,heightWedgeMother/2);
@@ -1555,19 +1552,19 @@ void TileAtlasFactory::create(GeoPhysVol *world)
 	   if(m_log->level()<=MSG::DEBUG)
 	     (*m_log) << MSG::DEBUG << " BoolCuts YES "<< dbManager->BoolCuts() << endmsg;
  
-           double PoZ2 =0, PoZ1 =0, thicknessEndPlate = dbManager->TILBdzend1()*GeoModelKernelUnits::cm;
+           double PoZ2 =0, PoZ1 =0, thicknessEndPlate = dbManager->TILBdzend1()*Gaudi::Units::cm;
 
-           PoZ1 = thicknessEndPlate + modl_length/4 - (dbManager->GetEnvZLength()*GeoModelKernelUnits::cm- EBFingerLengthNeg)/2;
+           PoZ1 = thicknessEndPlate + modl_length/4 - (dbManager->GetEnvZLength()*Gaudi::Units::cm- EBFingerLengthNeg)/2;
            PoZ2 = PoZ1 + modl_length/4;
 
            if ((ModuleNcp>=35 && ModuleNcp<=37) || (ModuleNcp>=60 && ModuleNcp<=62))
 	    { GeoTrf::Transform3D  TransCut2 = GeoTrf::TranslateZ3D(-Radius) 
-                                        * GeoTrf::RotateX3D((phi-90)*GeoModelKernelUnits::deg) * GeoTrf::RotateY3D(180*GeoModelKernelUnits::deg)
+                                        * GeoTrf::RotateX3D((phi-90)*Gaudi::Units::deg) * GeoTrf::RotateY3D(180*Gaudi::Units::deg)
                                         * GeoTrf::Translate3D(-PoZ2,0,-PosY);
  
               if (ModuleNcp>=60 && ModuleNcp<=62)
 	       { GeoTrf::Transform3D TransCutL = GeoTrf::TranslateZ3D(-Radius)
-                                          * GeoTrf::RotateY3D(180*GeoModelKernelUnits::deg) * GeoTrf::RotateX3D(-phi*GeoModelKernelUnits::deg)
+                                          * GeoTrf::RotateY3D(180*Gaudi::Units::deg) * GeoTrf::RotateX3D(-phi*Gaudi::Units::deg)
                                           * GeoTrf::Translate3D(PoZ1,-PosYcut,-PosXcut);
 
                  // Cuting of module (Left)
@@ -1578,8 +1575,8 @@ void TileAtlasFactory::create(GeoPhysVol *world)
 
                } else if (ModuleNcp>=35 && ModuleNcp<=37)
 	       { GeoTrf::Transform3D TransCutR = GeoTrf::TranslateZ3D(-Radius)
-                                          * GeoTrf::RotateY3D(180*GeoModelKernelUnits::deg) * GeoTrf::RotateX3D(-phi*GeoModelKernelUnits::deg)
-                                          * GeoTrf::Translate3D(PoZ1,-PosYcut,PosXcut) * GeoTrf::RotateY3D(180*GeoModelKernelUnits::deg);
+                                          * GeoTrf::RotateY3D(180*Gaudi::Units::deg) * GeoTrf::RotateX3D(-phi*Gaudi::Units::deg)
+                                          * GeoTrf::Translate3D(PoZ1,-PosYcut,PosXcut) * GeoTrf::RotateY3D(180*Gaudi::Units::deg);
 
                  // Cuting of module (Right)
                  const GeoShape& TmR_EBarrelModuleMotherNeg = ebarrelModuleMotherNeg->subtract((*CutA)<<TransCut2).
@@ -1625,14 +1622,14 @@ void TileAtlasFactory::create(GeoPhysVol *world)
            (*m_log) << MSG::DEBUG << " BoolCuts YES "<< dbManager->BoolCuts() << endmsg;
 
            double PoZ2 =0, PoZ1 =0;
-           double thicknessEndPlate = dbManager->TILBdzend1()*GeoModelKernelUnits::cm;
+           double thicknessEndPlate = dbManager->TILBdzend1()*Gaudi::Units::cm;
 
-           PoZ1 = thicknessEndPlate + modl_length/4 - (dbManager->GetEnvZLength()*GeoModelKernelUnits::cm- EBFingerLengthPos)/2;
+           PoZ1 = thicknessEndPlate + modl_length/4 - (dbManager->GetEnvZLength()*Gaudi::Units::cm- EBFingerLengthPos)/2;
            PoZ2 = modl_length/4 + PoZ1;
 
           if ((ModuleNcp>=35 && ModuleNcp<=37) || (ModuleNcp>=60 && ModuleNcp<=62))
 	   { GeoTrf::Transform3D  TransCut2 = GeoTrf::TranslateZ3D(-Radius) 
-                                       * GeoTrf::RotateX3D((phi-90)*GeoModelKernelUnits::deg) * GeoTrf::RotateY3D(180*GeoModelKernelUnits::deg)   
+                                       * GeoTrf::RotateX3D((phi-90)*Gaudi::Units::deg) * GeoTrf::RotateY3D(180*Gaudi::Units::deg)   
                                        * GeoTrf::Translate3D(-PoZ2,0.,-PosY);
 
              // Cuting of pvEBarrelModuleMotherNeg (-)
@@ -1643,7 +1640,7 @@ void TileAtlasFactory::create(GeoPhysVol *world)
 
              if (ModuleNcp>=60 && ModuleNcp<=62)
 	      { GeoTrf::Transform3D TransCutL = GeoTrf::TranslateZ3D(-Radius)
-                                         * GeoTrf::RotateY3D(180*GeoModelKernelUnits::deg) * GeoTrf::RotateX3D(-phi*GeoModelKernelUnits::deg)
+                                         * GeoTrf::RotateY3D(180*Gaudi::Units::deg) * GeoTrf::RotateX3D(-phi*Gaudi::Units::deg)
                                          * GeoTrf::Translate3D(PoZ1,-PosYcut,-PosXcut);
 
                 // Cuting of pvEBarrelModuleMotherNeg (Left)
@@ -1656,8 +1653,8 @@ void TileAtlasFactory::create(GeoPhysVol *world)
 
               } else if (ModuleNcp>=35 && ModuleNcp<=37) 
 	      { GeoTrf::Transform3D TransCutR = GeoTrf::TranslateZ3D(-Radius)
-                                         * GeoTrf::RotateY3D(180*GeoModelKernelUnits::deg) * GeoTrf::RotateX3D(-phi*GeoModelKernelUnits::deg)
-                                         * GeoTrf::Translate3D(PoZ1,-PosYcut,PosXcut) * GeoTrf::RotateY3D(180*GeoModelKernelUnits::deg);
+                                         * GeoTrf::RotateY3D(180*Gaudi::Units::deg) * GeoTrf::RotateX3D(-phi*Gaudi::Units::deg)
+                                         * GeoTrf::Translate3D(PoZ1,-PosYcut,PosXcut) * GeoTrf::RotateY3D(180*Gaudi::Units::deg);
 
                 // Cuting of pvEBarrelModuleMotherNeg (Right)
                 GeoCutVolAction action3(*CutB, TransCutR);
@@ -1681,10 +1678,10 @@ void TileAtlasFactory::create(GeoPhysVol *world)
         //zEndSection = extOffset + dbManager->TILBdzmodul()/2 + dbManager->TILEzshift();
 
         // Trd - one finger mother
-        thicknessWedgeMother = dbManager->TIFGdz() * GeoModelKernelUnits::cm;
-        heightWedgeMother = (dbManager->TILErmax() - dbManager->TILBrmax()) * GeoModelKernelUnits::cm;
-        dy1WedgeMother = dbManager->TILBrmax() * tan(deltaPhi/2*GeoModelKernelUnits::deg) * GeoModelKernelUnits::cm;
-        dy2WedgeMother = dbManager->TILErmax() * tan(deltaPhi/2*GeoModelKernelUnits::deg) * GeoModelKernelUnits::cm;
+        thicknessWedgeMother = dbManager->TIFGdz() * Gaudi::Units::cm;
+        heightWedgeMother = (dbManager->TILErmax() - dbManager->TILBrmax()) * Gaudi::Units::cm;
+        dy1WedgeMother = dbManager->TILBrmax() * tan(deltaPhi/2*Gaudi::Units::deg) * Gaudi::Units::cm;
+        dy2WedgeMother = dbManager->TILErmax() * tan(deltaPhi/2*Gaudi::Units::deg) * Gaudi::Units::cm;
         
         checking("EFingerModule (-)", false, 1, 
                  thicknessWedgeMother/2,thicknessWedgeMother/2,dy1WedgeMother,dy2WedgeMother,heightWedgeMother/2);
@@ -1708,7 +1705,7 @@ void TileAtlasFactory::create(GeoPhysVol *world)
                                       ModuleNcp*100);
          }
         GeoTransform* xtraModFingerNeg  = new GeoTransform(GeoTrf::TranslateX3D(
-                                              (dbManager->TILErmax() + dbManager->TILBrmax())/2*GeoModelKernelUnits::cm));
+                                              (dbManager->TILErmax() + dbManager->TILBrmax())/2*Gaudi::Units::cm));
         pvEFingerMotherNeg->add(zrotMod);
         pvEFingerMotherNeg->add(xtraModFingerNeg); 
         pvEFingerMotherNeg->add(yrotMod);
@@ -1723,7 +1720,7 @@ void TileAtlasFactory::create(GeoPhysVol *world)
             GeoTubs* SaddleModule = new GeoTubs(BFingerRmin-RadiusSaddle,
                                                 BFingerRmin,
                                                 DzSaddleSupport/2,
-                                                0.,deltaPhi*GeoModelKernelUnits::deg);
+                                                0.,deltaPhi*Gaudi::Units::deg);
      
             GeoLogVol* lvSaddleModule = new GeoLogVol("SaddleModule",SaddleModule,matIron);
             GeoPhysVol* pvSaddleModule = new GeoPhysVol(lvSaddleModule);
@@ -1779,7 +1776,7 @@ void TileAtlasFactory::create(GeoPhysVol *world)
            }
          } else
          { (*m_log) << MSG::INFO <<" D4 unavailable "<<endmsg;
-	   dzITC1 = 9.485; //sb [GeoModelKernelUnits::cm]
+	   dzITC1 = 9.485; //sb [Gaudi::Units::cm]
          }
 
         bool specialC10 = (Ifd4 && Ifc10 && rMaxITC2 < rMinITC1);
@@ -1794,10 +1791,10 @@ void TileAtlasFactory::create(GeoPhysVol *world)
           if (Ifd4 || Ifc10) {
 
             //  The first sub shape
-            thicknessWedgeMother = dzITC1 * GeoModelKernelUnits::cm;
-            heightWedgeMother = (rMaxITC1 - rMinITC1) * GeoModelKernelUnits::cm;
-            dy1WedgeMother = rMinITC1 * tan(deltaPhi/2*GeoModelKernelUnits::deg) * GeoModelKernelUnits::cm;
-            dy2WedgeMother = rMaxITC1 * tan(deltaPhi/2*GeoModelKernelUnits::deg) * GeoModelKernelUnits::cm;
+            thicknessWedgeMother = dzITC1 * Gaudi::Units::cm;
+            heightWedgeMother = (rMaxITC1 - rMinITC1) * Gaudi::Units::cm;
+            dy1WedgeMother = rMinITC1 * tan(deltaPhi/2*Gaudi::Units::deg) * Gaudi::Units::cm;
+            dy2WedgeMother = rMaxITC1 * tan(deltaPhi/2*Gaudi::Units::deg) * Gaudi::Units::cm;
 
             checking("ITCModule tcModuleSub1Neg (-) ", false, 1, 
                  thicknessWedgeMother/2,thicknessWedgeMother/2,dy1WedgeMother,dy2WedgeMother,heightWedgeMother/2);
@@ -1808,10 +1805,10 @@ void TileAtlasFactory::create(GeoPhysVol *world)
                                                   dy2WedgeMother,
                                                   heightWedgeMother/2);
             // The second sub shape
-            thicknessWedgeMother = dzITC2 * GeoModelKernelUnits::cm;
-            heightWedgeMother    = (rMaxITC2 - rMinITC2) * GeoModelKernelUnits::cm;
-            dy1WedgeMother = rMinITC2 * tan(deltaPhi/2*GeoModelKernelUnits::deg) * GeoModelKernelUnits::cm;
-            dy2WedgeMother = rMaxITC2 * tan(deltaPhi/2*GeoModelKernelUnits::deg) * GeoModelKernelUnits::cm;
+            thicknessWedgeMother = dzITC2 * Gaudi::Units::cm;
+            heightWedgeMother    = (rMaxITC2 - rMinITC2) * Gaudi::Units::cm;
+            dy1WedgeMother = rMinITC2 * tan(deltaPhi/2*Gaudi::Units::deg) * Gaudi::Units::cm;
+            dy2WedgeMother = rMaxITC2 * tan(deltaPhi/2*Gaudi::Units::deg) * Gaudi::Units::cm;
 
             checking("ITCModule itcModuleSub2Neg (-)", false, 1, 
                  thicknessWedgeMother/2,thicknessWedgeMother/2,dy1WedgeMother,dy2WedgeMother,heightWedgeMother/2);
@@ -1822,8 +1819,8 @@ void TileAtlasFactory::create(GeoPhysVol *world)
                                                   dy2WedgeMother,
                                                   heightWedgeMother/2 );
 
-            X = (dzITC1 - dzITC2)/2*GeoModelKernelUnits::cm; 
-            Z = ((rMinITC2+rMaxITC2)-(rMaxITC1 + rMinITC1))/2*GeoModelKernelUnits::cm;
+            X = (dzITC1 - dzITC2)/2*Gaudi::Units::cm; 
+            Z = ((rMinITC2+rMaxITC2)-(rMaxITC1 + rMinITC1))/2*Gaudi::Units::cm;
 	    if(m_log->level()<=MSG::DEBUG)
 	      (*m_log) << MSG::DEBUG <<"  ITCModule Negative, position X= "<<X<<" Z= "<<Z<< endmsg;
 
@@ -1843,10 +1840,10 @@ void TileAtlasFactory::create(GeoPhysVol *world)
             // The D4, PLUG1
             dbManager->SetCurrentSectionByNumber(Id4);
 
-            thicknessWedgeMother = dzITC1 * GeoModelKernelUnits::cm;
-            heightWedgeMother = (rMaxITC1 - dbManager->TILBrmin()) * GeoModelKernelUnits::cm;
-            dy1WedgeMother = dbManager->TILBrmin() * tan(deltaPhi/2*GeoModelKernelUnits::deg) * GeoModelKernelUnits::cm;
-            dy2WedgeMother = rMaxITC1 * tan(deltaPhi/2*GeoModelKernelUnits::deg) * GeoModelKernelUnits::cm;
+            thicknessWedgeMother = dzITC1 * Gaudi::Units::cm;
+            heightWedgeMother = (rMaxITC1 - dbManager->TILBrmin()) * Gaudi::Units::cm;
+            dy1WedgeMother = dbManager->TILBrmin() * tan(deltaPhi/2*Gaudi::Units::deg) * Gaudi::Units::cm;
+            dy2WedgeMother = rMaxITC1 * tan(deltaPhi/2*Gaudi::Units::deg) * Gaudi::Units::cm;
 	    // ps changes dzITC1 -> dzmodul
             Glue =  dbManager->TILBdzmodul() - dbManager->TILBdzend1() - dbManager->TILBdzend2();
             NbPeriod = dbManager->TILBnperiod();
@@ -1883,7 +1880,7 @@ void TileAtlasFactory::create(GeoPhysVol *world)
                                                    heightWedgeMother/2);
             //Second submother for frontplate
             double dzITC2Bis = (specialC10) ? 0.0 : dzITC2; // for special C10 D4 and C10 do not overlap
-            thicknessWedgeMother = (dbManager->TILBdzmodul() - dzITC2Bis) * GeoModelKernelUnits::cm;
+            thicknessWedgeMother = (dbManager->TILBdzmodul() - dzITC2Bis) * Gaudi::Units::cm;
 	    if(m_log->level()<=MSG::DEBUG)
               if (specialC10)
                 (*m_log) << MSG::DEBUG <<" Separate C10 and D4 in module " << ModuleNcp << endmsg;
@@ -1891,9 +1888,9 @@ void TileAtlasFactory::create(GeoPhysVol *world)
             GeoLogVol *lvPlug1ModuleMotherNeg=0;
             if (thicknessWedgeMother > rless)
              { 
-               heightWedgeMother = (dbManager->TILBrmin() - dbManager->TILBrminimal()) * GeoModelKernelUnits::cm;
-               dy1WedgeMother = dbManager->TILBrminimal() * tan(deltaPhi/2*GeoModelKernelUnits::deg) * GeoModelKernelUnits::cm;
-               dy2WedgeMother = dbManager->TILBrmin() * tan(deltaPhi/2*GeoModelKernelUnits::deg) * GeoModelKernelUnits::cm;
+               heightWedgeMother = (dbManager->TILBrmin() - dbManager->TILBrminimal()) * Gaudi::Units::cm;
+               dy1WedgeMother = dbManager->TILBrminimal() * tan(deltaPhi/2*Gaudi::Units::deg) * Gaudi::Units::cm;
+               dy2WedgeMother = dbManager->TILBrmin() * tan(deltaPhi/2*Gaudi::Units::deg) * Gaudi::Units::cm;
     
                checking("Plug1Module plug2SubMotherNeg (-)", false, 2, 
                    thicknessWedgeMother/2,thicknessWedgeMother/2,dy1WedgeMother,dy2WedgeMother,heightWedgeMother/2);
@@ -1904,8 +1901,8 @@ void TileAtlasFactory::create(GeoPhysVol *world)
                                                       dy2WedgeMother,
                                                       heightWedgeMother/2);
     
-               GeoTrf::Translate3D plug1SubOffsetNeg(-dzITC2Bis*GeoModelKernelUnits::cm/2, 0.,
-                                               (dbManager->TILBrminimal()-dbManager->TILBrmaximal())*GeoModelKernelUnits::cm/2);
+               GeoTrf::Translate3D plug1SubOffsetNeg(-dzITC2Bis*Gaudi::Units::cm/2, 0.,
+                                               (dbManager->TILBrminimal()-dbManager->TILBrmaximal())*Gaudi::Units::cm/2);
     
                const GeoShapeUnion& plug1ModuleMotherNeg = 
                                     plug1SubMotherNeg->add(*plug2SubMotherNeg<<plug1SubOffsetNeg);
@@ -1928,7 +1925,7 @@ void TileAtlasFactory::create(GeoPhysVol *world)
                                            dzITC2Bis); 
              }
         
-            Z = (dbManager->TILBrmin()-dbManager->TILBrminimal())*GeoModelKernelUnits::cm/2;
+            Z = (dbManager->TILBrmin()-dbManager->TILBrminimal())*Gaudi::Units::cm/2;
             GeoTransform* tfPlug1ModuleMotherNeg = new GeoTransform(GeoTrf::Translate3D(0.,0.,Z));
 
             pvITCModuleMotherNeg->add(tfPlug1ModuleMotherNeg);
@@ -1940,10 +1937,10 @@ void TileAtlasFactory::create(GeoPhysVol *world)
               // TILE_PLUG2
               dbManager->SetCurrentSectionByNumber(Ic10);
 
-              thicknessWedgeMother = dbManager->TILBdzmodul() * GeoModelKernelUnits::cm;
-              heightWedgeMother = (dbManager->TILBrmaximal() - dbManager->TILBrminimal()) * GeoModelKernelUnits::cm;
-              dy1WedgeMother = dbManager->TILBrminimal() * tan(deltaPhi/2*GeoModelKernelUnits::deg) * GeoModelKernelUnits::cm;
-              dy2WedgeMother = dbManager->TILBrmaximal() * tan(deltaPhi/2*GeoModelKernelUnits::deg) * GeoModelKernelUnits::cm;
+              thicknessWedgeMother = dbManager->TILBdzmodul() * Gaudi::Units::cm;
+              heightWedgeMother = (dbManager->TILBrmaximal() - dbManager->TILBrminimal()) * Gaudi::Units::cm;
+              dy1WedgeMother = dbManager->TILBrminimal() * tan(deltaPhi/2*Gaudi::Units::deg) * Gaudi::Units::cm;
+              dy2WedgeMother = dbManager->TILBrmaximal() * tan(deltaPhi/2*Gaudi::Units::deg) * Gaudi::Units::cm;
 
               if (dbManager->TILBnperiod() > 1)
                { dzGlue = (dbManager->TILBdzmodul() - dbManager->TILBdzend1() - dbManager->TILBdzend2() 
@@ -1986,12 +1983,12 @@ void TileAtlasFactory::create(GeoPhysVol *world)
 
           double zShift = 0;
           NbPeriod = dbManager->TILBnperiod();
-	  //          Z = (dbManager->TILBdzmodul()-dzITC2)/2*GeoModelKernelUnits::cm;
+	  //          Z = (dbManager->TILBdzmodul()-dzITC2)/2*Gaudi::Units::cm;
 	  // ps Zshift calculated from length of volumes rather than modules (account for special modules) 
 	  //
-          Z = (dzITC1 - dzITC2)/2*GeoModelKernelUnits::cm;
+          Z = (dzITC1 - dzITC2)/2*Gaudi::Units::cm;
 
-          if (NbPeriod == 6 && !Ifspecialgirder && fabs(Z) < fabs(zITCStandard)) zShift = zITCStandard*(1./GeoModelKernelUnits::cm);
+          if (NbPeriod == 6 && !Ifspecialgirder && fabs(Z) < fabs(zITCStandard)) zShift = zITCStandard*(1./Gaudi::Units::cm);
 
 	  if(m_log->level()<=MSG::DEBUG)
 	    (*m_log) << MSG::DEBUG <<"  ITCModule Negative, position X= "<<X<<" Z= "<<Z
@@ -1999,8 +1996,8 @@ void TileAtlasFactory::create(GeoPhysVol *world)
 		     <<endmsg;
 
           GeoTransform* xtraITCNeg = new GeoTransform(GeoTrf::TranslateX3D(
-                                         (dbManager->TILBrmaximal() + dbManager->TILBrminimal())/2*GeoModelKernelUnits::cm));
-	  GeoTransform* ztraITCNeg = new GeoTransform(GeoTrf::TranslateZ3D(zShift*GeoModelKernelUnits::cm));
+                                         (dbManager->TILBrmaximal() + dbManager->TILBrminimal())/2*Gaudi::Units::cm));
+	  GeoTransform* ztraITCNeg = new GeoTransform(GeoTrf::TranslateZ3D(zShift*Gaudi::Units::cm));
 
           pvITCMotherNeg->add(zrotMod);
           pvITCMotherNeg->add(xtraITCNeg);
@@ -2019,10 +2016,10 @@ void TileAtlasFactory::create(GeoPhysVol *world)
           dbManager->SetCurrentSectionByNumber(Igap); 
 
           // Trd - module mother
-          thicknessWedgeMother = dbManager->TILBdzmodul() * GeoModelKernelUnits::cm;
-          heightWedgeMother = (dbManager->TILBrmaximal() - dbManager->TILBrminimal()) * GeoModelKernelUnits::cm;
-          dy1WedgeMother = dbManager->TILBrminimal() * tan(deltaPhi/2*GeoModelKernelUnits::deg) * GeoModelKernelUnits::cm;
-          dy2WedgeMother = dbManager->TILBrmaximal() * tan(deltaPhi/2*GeoModelKernelUnits::deg) * GeoModelKernelUnits::cm;
+          thicknessWedgeMother = dbManager->TILBdzmodul() * Gaudi::Units::cm;
+          heightWedgeMother = (dbManager->TILBrmaximal() - dbManager->TILBrminimal()) * Gaudi::Units::cm;
+          dy1WedgeMother = dbManager->TILBrminimal() * tan(deltaPhi/2*Gaudi::Units::deg) * Gaudi::Units::cm;
+          dy2WedgeMother = dbManager->TILBrmaximal() * tan(deltaPhi/2*Gaudi::Units::deg) * Gaudi::Units::cm;
 
           dzGlue = 0.;
 
@@ -2049,7 +2046,7 @@ void TileAtlasFactory::create(GeoPhysVol *world)
 
           // Module position inside mother
           GeoTransform* xtraGapNeg = new GeoTransform(GeoTrf::TranslateX3D(
-                                         (dbManager->TILBrmaximal() + dbManager->TILBrminimal())/2*GeoModelKernelUnits::cm));
+                                         (dbManager->TILBrmaximal() + dbManager->TILBrminimal())/2*Gaudi::Units::cm));
           pvGapMotherNeg->add(zrotMod);
           pvGapMotherNeg->add(xtraGapNeg);
           pvGapMotherNeg->add(yrotMod);
@@ -2065,10 +2062,10 @@ void TileAtlasFactory::create(GeoPhysVol *world)
           dbManager->SetCurrentSectionByNumber(Icrack);
 
           // mother
-          thicknessWedgeMother = dbManager->TILBdzmodul() * GeoModelKernelUnits::cm;
-          heightWedgeMother = (dbManager->TILBrmaximal() - dbManager->TILBrminimal()) * GeoModelKernelUnits::cm;
-          dy1WedgeMother = dbManager->TILBrminimal() * tan(deltaPhi/2*GeoModelKernelUnits::deg) * GeoModelKernelUnits::cm;
-          dy2WedgeMother = dbManager->TILBrmaximal() * tan(deltaPhi/2*GeoModelKernelUnits::deg) * GeoModelKernelUnits::cm;
+          thicknessWedgeMother = dbManager->TILBdzmodul() * Gaudi::Units::cm;
+          heightWedgeMother = (dbManager->TILBrmaximal() - dbManager->TILBrminimal()) * Gaudi::Units::cm;
+          dy1WedgeMother = dbManager->TILBrminimal() * tan(deltaPhi/2*Gaudi::Units::deg) * Gaudi::Units::cm;
+          dy2WedgeMother = dbManager->TILBrmaximal() * tan(deltaPhi/2*Gaudi::Units::deg) * Gaudi::Units::cm;
     
           dzGlue = 0.;
 
@@ -2094,7 +2091,7 @@ void TileAtlasFactory::create(GeoPhysVol *world)
            }
           // Module position inside mother
           GeoTransform* xtraCrackNeg = new GeoTransform(GeoTrf::TranslateX3D(
-                                           (dbManager->TILBrmaximal() + dbManager->TILBrminimal())/2*GeoModelKernelUnits::cm));
+                                           (dbManager->TILBrmaximal() + dbManager->TILBrminimal())/2*Gaudi::Units::cm));
           pvCrackMotherNeg->add(zrotMod);
           pvCrackMotherNeg->add(xtraCrackNeg);
           pvCrackMotherNeg->add(yrotMod);
@@ -2112,10 +2109,10 @@ void TileAtlasFactory::create(GeoPhysVol *world)
         if(Ifd4 || Ifc10) {
 
           // The first sub shape
-          thicknessWedgeMother = dzITC1 * GeoModelKernelUnits::cm;
-          heightWedgeMother = (rMaxITC1 - rMinITC1) * GeoModelKernelUnits::cm;
-          dy1WedgeMother = rMinITC1 * tan(deltaPhi/2*GeoModelKernelUnits::deg) * GeoModelKernelUnits::cm;
-          dy2WedgeMother = rMaxITC1 * tan(deltaPhi/2*GeoModelKernelUnits::deg) * GeoModelKernelUnits::cm;
+          thicknessWedgeMother = dzITC1 * Gaudi::Units::cm;
+          heightWedgeMother = (rMaxITC1 - rMinITC1) * Gaudi::Units::cm;
+          dy1WedgeMother = rMinITC1 * tan(deltaPhi/2*Gaudi::Units::deg) * Gaudi::Units::cm;
+          dy2WedgeMother = rMaxITC1 * tan(deltaPhi/2*Gaudi::Units::deg) * Gaudi::Units::cm;
 
           checking("ITCModule itcModuleSub2Pos (+)", false, 1,
 	        thicknessWedgeMother/2,thicknessWedgeMother/2,dy1WedgeMother,dy2WedgeMother,heightWedgeMother/2);
@@ -2126,10 +2123,10 @@ void TileAtlasFactory::create(GeoPhysVol *world)
                                                 dy2WedgeMother        ,
                                                 heightWedgeMother/2  );
           // The second sub shape
-          thicknessWedgeMother = dzITC2 * GeoModelKernelUnits::cm;
-          heightWedgeMother    = (rMaxITC2 - rMinITC2) * GeoModelKernelUnits::cm;
-          dy1WedgeMother = rMinITC2 * tan(deltaPhi/2*GeoModelKernelUnits::deg) * GeoModelKernelUnits::cm;
-          dy2WedgeMother = rMaxITC2 * tan(deltaPhi/2*GeoModelKernelUnits::deg) * GeoModelKernelUnits::cm;
+          thicknessWedgeMother = dzITC2 * Gaudi::Units::cm;
+          heightWedgeMother    = (rMaxITC2 - rMinITC2) * Gaudi::Units::cm;
+          dy1WedgeMother = rMinITC2 * tan(deltaPhi/2*Gaudi::Units::deg) * Gaudi::Units::cm;
+          dy2WedgeMother = rMaxITC2 * tan(deltaPhi/2*Gaudi::Units::deg) * Gaudi::Units::cm;
 
           checking("ITCModule itcModuleSub2Pos (+)", false, 1,
 	        thicknessWedgeMother/2,thicknessWedgeMother/2,dy1WedgeMother,dy2WedgeMother,heightWedgeMother/2);
@@ -2140,8 +2137,8 @@ void TileAtlasFactory::create(GeoPhysVol *world)
                                                 dy2WedgeMother        ,
                                                 heightWedgeMother/2  );
 
-          X = (dzITC1 - dzITC2)/2*GeoModelKernelUnits::cm; 
-          Z = ((rMinITC2+rMaxITC2)-(rMaxITC1 + rMinITC1))/2*GeoModelKernelUnits::cm;
+          X = (dzITC1 - dzITC2)/2*Gaudi::Units::cm; 
+          Z = ((rMinITC2+rMaxITC2)-(rMaxITC1 + rMinITC1))/2*Gaudi::Units::cm;
 	  if(m_log->level()<=MSG::DEBUG)
 	    (*m_log) << MSG::DEBUG <<"  ITCModule Positive, position X= "<<X<<" Z= "<<Z<< endmsg;
 
@@ -2161,10 +2158,10 @@ void TileAtlasFactory::create(GeoPhysVol *world)
           // The D4, PLUG1
           dbManager->SetCurrentSectionByNumber(Id4);
 
-          thicknessWedgeMother = dzITC1 * GeoModelKernelUnits::cm;
-          dy1WedgeMother = dbManager->TILBrmin() * tan(deltaPhi/2*GeoModelKernelUnits::deg) * GeoModelKernelUnits::cm;
-          dy2WedgeMother = rMaxITC1 * tan(deltaPhi/2*GeoModelKernelUnits::deg) * GeoModelKernelUnits::cm;
-          heightWedgeMother = (rMaxITC1 - dbManager->TILBrmin()) * GeoModelKernelUnits::cm;
+          thicknessWedgeMother = dzITC1 * Gaudi::Units::cm;
+          dy1WedgeMother = dbManager->TILBrmin() * tan(deltaPhi/2*Gaudi::Units::deg) * Gaudi::Units::cm;
+          dy2WedgeMother = rMaxITC1 * tan(deltaPhi/2*Gaudi::Units::deg) * Gaudi::Units::cm;
+          heightWedgeMother = (rMaxITC1 - dbManager->TILBrmin()) * Gaudi::Units::cm;
 
 	  // ps changes dzITC1 -> dzmodul
 	  Glue =  dbManager->TILBdzmodul() - dbManager->TILBdzend1() - dbManager->TILBdzend2();
@@ -2204,7 +2201,7 @@ void TileAtlasFactory::create(GeoPhysVol *world)
 
           //Second submother C10, PLUG2
           double dzITC2Bis = (specialC10) ? 0.0 : dzITC2; // for special C10 D4 and C10 do not overlap
-          thicknessWedgeMother = (dbManager->TILBdzmodul() - dzITC2Bis) * GeoModelKernelUnits::cm;
+          thicknessWedgeMother = (dbManager->TILBdzmodul() - dzITC2Bis) * Gaudi::Units::cm;
           if(m_log->level()<=MSG::DEBUG)
             if (specialC10)
               (*m_log) << MSG::DEBUG <<" Separate C10 and D4 in module " << ModuleNcp << endmsg;
@@ -2212,9 +2209,9 @@ void TileAtlasFactory::create(GeoPhysVol *world)
           GeoLogVol *lvPlug1ModuleMotherPos=0;
           if (thicknessWedgeMother > rless)
            { 
-             heightWedgeMother = (dbManager->TILBrmin() - dbManager->TILBrminimal()) * GeoModelKernelUnits::cm;
-             dy1WedgeMother = dbManager->TILBrminimal() * tan(deltaPhi/2*GeoModelKernelUnits::deg) * GeoModelKernelUnits::cm;
-             dy2WedgeMother = dbManager->TILBrmin() * tan(deltaPhi/2*GeoModelKernelUnits::deg) * GeoModelKernelUnits::cm;
+             heightWedgeMother = (dbManager->TILBrmin() - dbManager->TILBrminimal()) * Gaudi::Units::cm;
+             dy1WedgeMother = dbManager->TILBrminimal() * tan(deltaPhi/2*Gaudi::Units::deg) * Gaudi::Units::cm;
+             dy2WedgeMother = dbManager->TILBrmin() * tan(deltaPhi/2*Gaudi::Units::deg) * Gaudi::Units::cm;
 
              checking("Plug1Module plug2SubMotherPos (+)", false, 2, 
                  thicknessWedgeMother/2,thicknessWedgeMother/2,dy1WedgeMother,dy2WedgeMother,heightWedgeMother/2);
@@ -2225,8 +2222,8 @@ void TileAtlasFactory::create(GeoPhysVol *world)
                                                     dy2WedgeMother        ,
                                                     heightWedgeMother/2   );
 
-             GeoTrf::Translate3D plug1SubOffsetPos(-dzITC2Bis/2*GeoModelKernelUnits::cm, 0.,
-                                        (dbManager->TILBrminimal()-dbManager->TILBrmaximal())/2*GeoModelKernelUnits::cm);
+             GeoTrf::Translate3D plug1SubOffsetPos(-dzITC2Bis/2*Gaudi::Units::cm, 0.,
+                                        (dbManager->TILBrminimal()-dbManager->TILBrmaximal())/2*Gaudi::Units::cm);
         
              const GeoShapeUnion& plug1ModuleMotherPos = plug1SubMotherPos->add(*plug2SubMotherPos<<plug1SubOffsetPos);
 
@@ -2248,7 +2245,7 @@ void TileAtlasFactory::create(GeoPhysVol *world)
                                          dzITC2Bis);
            }
         
-          Z = (dbManager->TILBrmin()-dbManager->TILBrminimal())*GeoModelKernelUnits::cm/2;
+          Z = (dbManager->TILBrmin()-dbManager->TILBrminimal())*Gaudi::Units::cm/2;
           GeoTransform* tfPlug1ModuleMotherPos = new GeoTransform(GeoTrf::Translate3D(0.,0.,Z));
 
           pvITCModuleMotherPos->add(tfPlug1ModuleMotherPos);
@@ -2260,10 +2257,10 @@ void TileAtlasFactory::create(GeoPhysVol *world)
             // TILE_PLUG2, C10
             dbManager->SetCurrentSectionByNumber(Ic10); 
 
-            thicknessWedgeMother = dzITC2 * GeoModelKernelUnits::cm;
-            heightWedgeMother    = (rMaxITC2 - rMinITC2) * GeoModelKernelUnits::cm;
-            dy1WedgeMother = rMinITC2 * tan(deltaPhi/2*GeoModelKernelUnits::deg) * GeoModelKernelUnits::cm;
-            dy2WedgeMother = rMaxITC2 * tan(deltaPhi/2*GeoModelKernelUnits::deg) * GeoModelKernelUnits::cm;
+            thicknessWedgeMother = dzITC2 * Gaudi::Units::cm;
+            heightWedgeMother    = (rMaxITC2 - rMinITC2) * Gaudi::Units::cm;
+            dy1WedgeMother = rMinITC2 * tan(deltaPhi/2*Gaudi::Units::deg) * Gaudi::Units::cm;
+            dy2WedgeMother = rMaxITC2 * tan(deltaPhi/2*Gaudi::Units::deg) * Gaudi::Units::cm;
 
             if (dbManager->TILBnperiod() > 1)
              { dzGlue = (dzITC2 - dbManager->TILBdzend1() - dbManager->TILBdzend2() 
@@ -2306,10 +2303,10 @@ void TileAtlasFactory::create(GeoPhysVol *world)
 
           double zShift = 0;
           NbPeriod = dbManager->TILBnperiod();
-	  //ps          Z = (dbManager->TILBdzmodul()-dzITC2)/2*GeoModelKernelUnits::cm;
-          Z = (dzITC1 - dzITC2)/2*GeoModelKernelUnits::cm;
+	  //ps          Z = (dbManager->TILBdzmodul()-dzITC2)/2*Gaudi::Units::cm;
+          Z = (dzITC1 - dzITC2)/2*Gaudi::Units::cm;
 
-          if (NbPeriod == 6 && !Ifspecialgirder && fabs(Z) < fabs(zITCStandard)) zShift = zITCStandard*(1./GeoModelKernelUnits::cm);
+          if (NbPeriod == 6 && !Ifspecialgirder && fabs(Z) < fabs(zITCStandard)) zShift = zITCStandard*(1./Gaudi::Units::cm);
 
 	  if(m_log->level()<=MSG::DEBUG)
 	    (*m_log) << MSG::DEBUG <<"  ITCModule Positive, position X= "<<X<<" Z= "<<Z
@@ -2317,8 +2314,8 @@ void TileAtlasFactory::create(GeoPhysVol *world)
 		     <<endmsg;
 
 	  GeoTransform* xtraITCPos = new GeoTransform(GeoTrf::TranslateX3D(
-                                        (dbManager->TILBrmaximal() + dbManager->TILBrminimal())/2*GeoModelKernelUnits::cm));
-	  GeoTransform* ztraITCPos = new GeoTransform(GeoTrf::TranslateZ3D(zShift*GeoModelKernelUnits::cm));
+                                        (dbManager->TILBrmaximal() + dbManager->TILBrminimal())/2*Gaudi::Units::cm));
+	  GeoTransform* ztraITCPos = new GeoTransform(GeoTrf::TranslateZ3D(zShift*Gaudi::Units::cm));
 
           pvITCMotherPos->add(zrotMod);
           pvITCMotherPos->add(xtraITCPos);
@@ -2338,10 +2335,10 @@ void TileAtlasFactory::create(GeoPhysVol *world)
           dbManager->SetCurrentSectionByNumber(Igap); 
 
           // Mother
-          thicknessWedgeMother = dbManager->TILBdzmodul() * GeoModelKernelUnits::cm;
-          heightWedgeMother = (dbManager->TILBrmaximal() - dbManager->TILBrminimal()) * GeoModelKernelUnits::cm;
-          dy1WedgeMother = dbManager->TILBrminimal() * tan(deltaPhi/2*GeoModelKernelUnits::deg) * GeoModelKernelUnits::cm;
-          dy2WedgeMother = dbManager->TILBrmaximal() * tan(deltaPhi/2*GeoModelKernelUnits::deg) * GeoModelKernelUnits::cm;
+          thicknessWedgeMother = dbManager->TILBdzmodul() * Gaudi::Units::cm;
+          heightWedgeMother = (dbManager->TILBrmaximal() - dbManager->TILBrminimal()) * Gaudi::Units::cm;
+          dy1WedgeMother = dbManager->TILBrminimal() * tan(deltaPhi/2*Gaudi::Units::deg) * Gaudi::Units::cm;
+          dy2WedgeMother = dbManager->TILBrmaximal() * tan(deltaPhi/2*Gaudi::Units::deg) * Gaudi::Units::cm;
 
           dzGlue = 0;
 
@@ -2368,7 +2365,7 @@ void TileAtlasFactory::create(GeoPhysVol *world)
 
           // Module position inside mother
           GeoTransform* xtraGapPos = new GeoTransform(GeoTrf::TranslateX3D(
-                                         (dbManager->TILBrmaximal() + dbManager->TILBrminimal())/2*GeoModelKernelUnits::cm));
+                                         (dbManager->TILBrmaximal() + dbManager->TILBrminimal())/2*Gaudi::Units::cm));
           pvGapMotherPos->add(zrotMod);
           pvGapMotherPos->add(xtraGapPos);
           pvGapMotherPos->add(XYrtMod);
@@ -2384,10 +2381,10 @@ void TileAtlasFactory::create(GeoPhysVol *world)
           dbManager->SetCurrentSectionByNumber(Icrack); 
 
           // Trd - module mother
-          thicknessWedgeMother = dbManager->TILBdzmodul() * GeoModelKernelUnits::cm;
-          heightWedgeMother = (dbManager->TILBrmaximal() - dbManager->TILBrminimal()) * GeoModelKernelUnits::cm;
-          dy1WedgeMother = dbManager->TILBrminimal() * tan(deltaPhi/2*GeoModelKernelUnits::deg) * GeoModelKernelUnits::cm;
-          dy2WedgeMother = dbManager->TILBrmaximal() * tan(deltaPhi/2*GeoModelKernelUnits::deg) * GeoModelKernelUnits::cm;
+          thicknessWedgeMother = dbManager->TILBdzmodul() * Gaudi::Units::cm;
+          heightWedgeMother = (dbManager->TILBrmaximal() - dbManager->TILBrminimal()) * Gaudi::Units::cm;
+          dy1WedgeMother = dbManager->TILBrminimal() * tan(deltaPhi/2*Gaudi::Units::deg) * Gaudi::Units::cm;
+          dy2WedgeMother = dbManager->TILBrmaximal() * tan(deltaPhi/2*Gaudi::Units::deg) * Gaudi::Units::cm;
     
           dzGlue = 0.;
     
@@ -2414,7 +2411,7 @@ void TileAtlasFactory::create(GeoPhysVol *world)
     
           // Module position inside mother
           GeoTransform* xtraCrackPos = new GeoTransform(GeoTrf::TranslateX3D(
-                                          (dbManager->TILBrmaximal() + dbManager->TILBrminimal())/2*GeoModelKernelUnits::cm));
+                                          (dbManager->TILBrmaximal() + dbManager->TILBrminimal())/2*Gaudi::Units::cm));
           pvCrackMotherPos->add(zrotMod);
           pvCrackMotherPos->add(xtraCrackPos);
           pvCrackMotherPos->add(XYrtMod);
@@ -2456,9 +2453,9 @@ void TileAtlasFactory::create(GeoPhysVol *world)
       // consider 3 options - with/without ext.barrels and take into account DZ correction
       ztrans = 0;
 
-      tfBarrelMother = new GeoTransform(GeoTrf::TranslateZ3D(ztrans*GeoModelKernelUnits::cm) * GeoTrf::RotateZ3D((dbManager->GetEnvDPhi())*GeoModelKernelUnits::deg));
+      tfBarrelMother = new GeoTransform(GeoTrf::TranslateZ3D(ztrans*Gaudi::Units::cm) * GeoTrf::RotateZ3D((dbManager->GetEnvDPhi())*Gaudi::Units::deg));
 
-      (*m_log) << MSG::INFO <<" Positioning barrel with translation "<<ztrans*GeoModelKernelUnits::cm<< endmsg;
+      (*m_log) << MSG::INFO <<" Positioning barrel with translation "<<ztrans*Gaudi::Units::cm<< endmsg;
 
       GeoNameTag* ntBarrelModuleMother = new GeoNameTag("Barrel"); 
 
@@ -2468,11 +2465,11 @@ void TileAtlasFactory::create(GeoPhysVol *world)
       
       GeoTransform* tfFingerMotherPos;
 
-      ztrans = (dbManager->GetEnvZLength()*GeoModelKernelUnits::cm/2 - BFingerLengthPos/2 + PosDelta)*(1./GeoModelKernelUnits::cm);
+      ztrans = (dbManager->GetEnvZLength()*Gaudi::Units::cm/2 - BFingerLengthPos/2 + PosDelta)*(1./Gaudi::Units::cm);
 
-      tfFingerMotherPos = new GeoTransform(GeoTrf::TranslateZ3D(ztrans*GeoModelKernelUnits::cm)*GeoTrf::RotateZ3D((dbManager->GetEnvDPhi())*GeoModelKernelUnits::deg));
+      tfFingerMotherPos = new GeoTransform(GeoTrf::TranslateZ3D(ztrans*Gaudi::Units::cm)*GeoTrf::RotateZ3D((dbManager->GetEnvDPhi())*Gaudi::Units::deg));
 
-      (*m_log) << MSG::INFO <<" Positioning positive barrel finger with translation "<<ztrans*GeoModelKernelUnits::cm<< endmsg;
+      (*m_log) << MSG::INFO <<" Positioning positive barrel finger with translation "<<ztrans*Gaudi::Units::cm<< endmsg;
 
       GeoNameTag* ntFingerMotherPos = new GeoNameTag("TileFingerPos");
 
@@ -2483,9 +2480,9 @@ void TileAtlasFactory::create(GeoPhysVol *world)
       if (dbManager->BoolSaddle())
       { GeoTransform* tfSaddleMotherPos;
 
-        ztrans = (dbManager->GetEnvZLength()*GeoModelKernelUnits::cm/2 - BFingerLengthPos + DzSaddleSupport/2 + PosDelta)*(1./GeoModelKernelUnits::cm);
+        ztrans = (dbManager->GetEnvZLength()*Gaudi::Units::cm/2 - BFingerLengthPos + DzSaddleSupport/2 + PosDelta)*(1./Gaudi::Units::cm);
 
-        tfSaddleMotherPos = new GeoTransform(GeoTrf::TranslateZ3D(ztrans*GeoModelKernelUnits::cm)*GeoTrf::RotateZ3D((dbManager->GetEnvDPhi())*GeoModelKernelUnits::deg));
+        tfSaddleMotherPos = new GeoTransform(GeoTrf::TranslateZ3D(ztrans*Gaudi::Units::cm)*GeoTrf::RotateZ3D((dbManager->GetEnvDPhi())*Gaudi::Units::deg));
 
         GeoNameTag* ntSaddleMotherPos = new GeoNameTag("TileSaddlePos");
 
@@ -2498,11 +2495,11 @@ void TileAtlasFactory::create(GeoPhysVol *world)
 
       GeoTransform* tfFingerMotherNeg;
 
-      ztrans = (-dbManager->GetEnvZLength()*GeoModelKernelUnits::cm/2 + BFingerLengthNeg/2 - NegDelta)*(1./GeoModelKernelUnits::cm);
+      ztrans = (-dbManager->GetEnvZLength()*Gaudi::Units::cm/2 + BFingerLengthNeg/2 - NegDelta)*(1./Gaudi::Units::cm);
 
-      tfFingerMotherNeg = new GeoTransform(GeoTrf::TranslateZ3D(ztrans*GeoModelKernelUnits::cm)*GeoTrf::RotateZ3D((dbManager->GetEnvDPhi())*GeoModelKernelUnits::deg));
+      tfFingerMotherNeg = new GeoTransform(GeoTrf::TranslateZ3D(ztrans*Gaudi::Units::cm)*GeoTrf::RotateZ3D((dbManager->GetEnvDPhi())*Gaudi::Units::deg));
 
-      (*m_log) << MSG::INFO <<" Positioning negative barrel finger with translation "<<ztrans*GeoModelKernelUnits::cm<< endmsg;
+      (*m_log) << MSG::INFO <<" Positioning negative barrel finger with translation "<<ztrans*Gaudi::Units::cm<< endmsg;
 
       GeoNameTag* ntFingerMotherNeg = new GeoNameTag("TileFingerNeg");
       pvTileEnvelopeBarrel->add(tfFingerMotherNeg);
@@ -2512,9 +2509,9 @@ void TileAtlasFactory::create(GeoPhysVol *world)
       if (dbManager->BoolSaddle())
       { GeoTransform* tfSaddleMotherNeg;
 
-        ztrans = (-dbManager->GetEnvZLength()*GeoModelKernelUnits::cm/2 + BFingerLengthNeg - DzSaddleSupport/2 - NegDelta)*(1./GeoModelKernelUnits::cm);
+        ztrans = (-dbManager->GetEnvZLength()*Gaudi::Units::cm/2 + BFingerLengthNeg - DzSaddleSupport/2 - NegDelta)*(1./Gaudi::Units::cm);
 
-        tfSaddleMotherNeg = new GeoTransform(GeoTrf::TranslateZ3D(ztrans*GeoModelKernelUnits::cm)*GeoTrf::RotateZ3D((dbManager->GetEnvDPhi())*GeoModelKernelUnits::deg));
+        tfSaddleMotherNeg = new GeoTransform(GeoTrf::TranslateZ3D(ztrans*Gaudi::Units::cm)*GeoTrf::RotateZ3D((dbManager->GetEnvDPhi())*Gaudi::Units::deg));
 
         GeoNameTag* ntSaddleMotherNeg = new GeoNameTag("TileSaddleNeg");
 
@@ -2530,9 +2527,9 @@ void TileAtlasFactory::create(GeoPhysVol *world)
     if(EnvType == 3) { // positive ext.barrel is always at positive boundary, after finger
 
       dbManager->SetCurrentSection(TileDddbManager::TILE_EBARREL);
-      double thicknessEndPlate = dbManager->TILBdzend1()*GeoModelKernelUnits::cm;
+      double thicknessEndPlate = dbManager->TILBdzend1()*Gaudi::Units::cm;
 
-      double PoZ1 = thicknessEndPlate + modl_length/4 - (dbManager->GetEnvZLength()*GeoModelKernelUnits::cm- EBFingerLengthPos)/2;
+      double PoZ1 = thicknessEndPlate + modl_length/4 - (dbManager->GetEnvZLength()*Gaudi::Units::cm- EBFingerLengthPos)/2;
       double PoZ2 = modl_length/4 + PoZ1;
 
       //--------------------------------------------------------------------------------------------------------------
@@ -2547,14 +2544,14 @@ void TileAtlasFactory::create(GeoPhysVol *world)
 	if(m_log->level()<=MSG::DEBUG)
 	  (*m_log) << MSG::DEBUG << " Iron1: " << dxIron << " " << dyIron << endmsg;
 
-        GeoTransform* tfIron1 = new GeoTransform(GeoTrf::TranslateZ3D(ztrans*GeoModelKernelUnits::cm) * GeoTrf::Translate3D(dxIron,PosY-dyIron,PoZ2) 
-	                                       * GeoTrf::RotateX3D(90.*GeoModelKernelUnits::deg) * GeoTrf::RotateZ3D(90.*GeoModelKernelUnits::deg)); // Left
+        GeoTransform* tfIron1 = new GeoTransform(GeoTrf::TranslateZ3D(ztrans*Gaudi::Units::cm) * GeoTrf::Translate3D(dxIron,PosY-dyIron,PoZ2) 
+	                                       * GeoTrf::RotateX3D(90.*Gaudi::Units::deg) * GeoTrf::RotateZ3D(90.*Gaudi::Units::deg)); // Left
         pvEBarrelMotherPos->add(tfIron1);
         pvEBarrelMotherPos->add(new GeoIdentifierTag(1));
         pvEBarrelMotherPos->add(pvIron1);
 
-                      tfIron1 = new GeoTransform(GeoTrf::TranslateZ3D(ztrans*GeoModelKernelUnits::cm) * GeoTrf::Translate3D(-dxIron,PosY-dyIron,PoZ2) 
-					       * GeoTrf::RotateX3D(90.*GeoModelKernelUnits::deg) * GeoTrf::RotateZ3D(90.*GeoModelKernelUnits::deg)); // Right
+                      tfIron1 = new GeoTransform(GeoTrf::TranslateZ3D(ztrans*Gaudi::Units::cm) * GeoTrf::Translate3D(-dxIron,PosY-dyIron,PoZ2) 
+					       * GeoTrf::RotateX3D(90.*Gaudi::Units::deg) * GeoTrf::RotateZ3D(90.*Gaudi::Units::deg)); // Right
         pvEBarrelMotherPos->add(tfIron1);
         pvEBarrelMotherPos->add(pvIron1);
 
@@ -2565,14 +2562,14 @@ void TileAtlasFactory::create(GeoPhysVol *world)
 	if(m_log->level()<=MSG::DEBUG)
 	  (*m_log) << MSG::DEBUG << " Iron2: " << dxIron << " " << dyIron << endmsg;
 
-        GeoTransform* tfIron2 = new GeoTransform(GeoTrf::TranslateZ3D(ztrans*GeoModelKernelUnits::cm) * GeoTrf::Translate3D(dxIron,PosY+dyIron,PoZ2) 
-	                      * GeoTrf::RotateZ3D(-84.*GeoModelKernelUnits::deg) * GeoTrf::RotateX3D(90.*GeoModelKernelUnits::deg) * GeoTrf::RotateZ3D(90.*GeoModelKernelUnits::deg)); // Left
+        GeoTransform* tfIron2 = new GeoTransform(GeoTrf::TranslateZ3D(ztrans*Gaudi::Units::cm) * GeoTrf::Translate3D(dxIron,PosY+dyIron,PoZ2) 
+	                      * GeoTrf::RotateZ3D(-84.*Gaudi::Units::deg) * GeoTrf::RotateX3D(90.*Gaudi::Units::deg) * GeoTrf::RotateZ3D(90.*Gaudi::Units::deg)); // Left
         pvEBarrelMotherPos->add(tfIron2);
         pvEBarrelMotherPos->add(new GeoIdentifierTag(2));
         pvEBarrelMotherPos->add(pvIron2);
 
-                      tfIron2 = new GeoTransform(GeoTrf::TranslateZ3D(ztrans*GeoModelKernelUnits::cm) * GeoTrf::Translate3D(-dxIron,PosY+dyIron,PoZ2) 
-	                      * GeoTrf::RotateZ3D(84.*GeoModelKernelUnits::deg) * GeoTrf::RotateX3D(90.*GeoModelKernelUnits::deg) * GeoTrf::RotateZ3D(90.*GeoModelKernelUnits::deg)); // Left
+                      tfIron2 = new GeoTransform(GeoTrf::TranslateZ3D(ztrans*Gaudi::Units::cm) * GeoTrf::Translate3D(-dxIron,PosY+dyIron,PoZ2) 
+	                      * GeoTrf::RotateZ3D(84.*Gaudi::Units::deg) * GeoTrf::RotateX3D(90.*Gaudi::Units::deg) * GeoTrf::RotateZ3D(90.*Gaudi::Units::deg)); // Left
         pvEBarrelMotherPos->add(tfIron2);
         pvEBarrelMotherPos->add(pvIron2);
 
@@ -2583,14 +2580,14 @@ void TileAtlasFactory::create(GeoPhysVol *world)
 	if(m_log->level()<=MSG::DEBUG)
 	  (*m_log) << MSG::DEBUG << " Iron3: " << dxIron << " " << dyIron << endmsg;
 
-        GeoTransform* tfIron3 = new GeoTransform(GeoTrf::TranslateZ3D(ztrans*GeoModelKernelUnits::cm) * GeoTrf::Translate3D(dxIron,PosY+dyIron,PoZ2) 
-	                      * GeoTrf::RotateZ3D(90.*GeoModelKernelUnits::deg) * GeoTrf::RotateX3D(90.*GeoModelKernelUnits::deg) * GeoTrf::RotateZ3D(90.*GeoModelKernelUnits::deg)); // Left
+        GeoTransform* tfIron3 = new GeoTransform(GeoTrf::TranslateZ3D(ztrans*Gaudi::Units::cm) * GeoTrf::Translate3D(dxIron,PosY+dyIron,PoZ2) 
+	                      * GeoTrf::RotateZ3D(90.*Gaudi::Units::deg) * GeoTrf::RotateX3D(90.*Gaudi::Units::deg) * GeoTrf::RotateZ3D(90.*Gaudi::Units::deg)); // Left
         pvEBarrelMotherPos->add(tfIron3);
         pvEBarrelMotherPos->add(new GeoIdentifierTag(3));
         pvEBarrelMotherPos->add(pvIron3);
 
-                      tfIron3 = new GeoTransform(GeoTrf::TranslateZ3D(ztrans*GeoModelKernelUnits::cm) * GeoTrf::Translate3D(-dxIron,PosY+dyIron,PoZ2) 
-	                      * GeoTrf::RotateZ3D(90.*GeoModelKernelUnits::deg) * GeoTrf::RotateX3D(90.*GeoModelKernelUnits::deg) * GeoTrf::RotateZ3D(90.*GeoModelKernelUnits::deg)); // Right
+                      tfIron3 = new GeoTransform(GeoTrf::TranslateZ3D(ztrans*Gaudi::Units::cm) * GeoTrf::Translate3D(-dxIron,PosY+dyIron,PoZ2) 
+	                      * GeoTrf::RotateZ3D(90.*Gaudi::Units::deg) * GeoTrf::RotateX3D(90.*Gaudi::Units::deg) * GeoTrf::RotateZ3D(90.*Gaudi::Units::deg)); // Right
         pvEBarrelMotherPos->add(tfIron3);
         pvEBarrelMotherPos->add(pvIron3);
 
@@ -2599,14 +2596,14 @@ void TileAtlasFactory::create(GeoPhysVol *world)
         dxIron = dbManager->CutsXpos();
 	dyIron = dbManager->CutsYpos();
 
-        GeoTransform* tfIrBoxL = new GeoTransform(GeoTrf::TranslateZ3D(ztrans*GeoModelKernelUnits::cm) * GeoTrf::Translate3D(dxIron,PosY-dyIron,PoZ2) 
-					       * GeoTrf::RotateX3D(90.*GeoModelKernelUnits::deg) * GeoTrf::RotateZ3D(90.*GeoModelKernelUnits::deg)); // Left
+        GeoTransform* tfIrBoxL = new GeoTransform(GeoTrf::TranslateZ3D(ztrans*Gaudi::Units::cm) * GeoTrf::Translate3D(dxIron,PosY-dyIron,PoZ2) 
+					       * GeoTrf::RotateX3D(90.*Gaudi::Units::deg) * GeoTrf::RotateZ3D(90.*Gaudi::Units::deg)); // Left
         pvEBarrelMotherPos->add(tfIrBoxL);
         pvEBarrelMotherPos->add(new GeoIdentifierTag(4));
         pvEBarrelMotherPos->add(pvIrBox);
 
-        GeoTransform* tfIrBoxR = new GeoTransform(GeoTrf::TranslateZ3D(ztrans*GeoModelKernelUnits::cm) * GeoTrf::Translate3D(-dxIron,PosY-dyIron,PoZ2)
-                                                * GeoTrf::RotateX3D(90.*GeoModelKernelUnits::deg) * GeoTrf::RotateZ3D(90.*GeoModelKernelUnits::deg)); // Right
+        GeoTransform* tfIrBoxR = new GeoTransform(GeoTrf::TranslateZ3D(ztrans*Gaudi::Units::cm) * GeoTrf::Translate3D(-dxIron,PosY-dyIron,PoZ2)
+                                                * GeoTrf::RotateX3D(90.*Gaudi::Units::deg) * GeoTrf::RotateZ3D(90.*Gaudi::Units::deg)); // Right
         pvEBarrelMotherPos->add(tfIrBoxR);
         pvEBarrelMotherPos->add(pvIrBox);
 
@@ -2617,16 +2614,16 @@ void TileAtlasFactory::create(GeoPhysVol *world)
 	if(m_log->level()<=MSG::DEBUG)
 	  (*m_log) << MSG::DEBUG << " IrUp: " <<dxIr<< " " <<dyIr<< endmsg;
 
-        GeoTransform* tfIrUp = new GeoTransform(GeoTrf::TranslateZ3D(ztrans*GeoModelKernelUnits::cm) 
+        GeoTransform* tfIrUp = new GeoTransform(GeoTrf::TranslateZ3D(ztrans*Gaudi::Units::cm) 
                              * GeoTrf::Translate3D(PosXcut+dxIr,-PosYcut+dyIr,-PoZ1) 
-		             * GeoTrf::RotateZ3D(90.*GeoModelKernelUnits::deg) * GeoTrf::RotateX3D(90.*GeoModelKernelUnits::deg) * GeoTrf::RotateZ3D(90.*GeoModelKernelUnits::deg)); // Left
+		             * GeoTrf::RotateZ3D(90.*Gaudi::Units::deg) * GeoTrf::RotateX3D(90.*Gaudi::Units::deg) * GeoTrf::RotateZ3D(90.*Gaudi::Units::deg)); // Left
         pvEBarrelMotherPos->add(tfIrUp);
         pvEBarrelMotherPos->add(new GeoIdentifierTag(5));
         pvEBarrelMotherPos->add(pvIrUp);
 
-                      tfIrUp = new GeoTransform(GeoTrf::TranslateZ3D(ztrans*GeoModelKernelUnits::cm) 
+                      tfIrUp = new GeoTransform(GeoTrf::TranslateZ3D(ztrans*Gaudi::Units::cm) 
                              * GeoTrf::Translate3D(-PosXcut-dxIr,-PosYcut+dyIr,-PoZ1) 
-		             * GeoTrf::RotateZ3D(90.*GeoModelKernelUnits::deg) * GeoTrf::RotateX3D(90.*GeoModelKernelUnits::deg) * GeoTrf::RotateZ3D(90.*GeoModelKernelUnits::deg)); // Right
+		             * GeoTrf::RotateZ3D(90.*Gaudi::Units::deg) * GeoTrf::RotateX3D(90.*Gaudi::Units::deg) * GeoTrf::RotateZ3D(90.*Gaudi::Units::deg)); // Right
         pvEBarrelMotherPos->add(tfIrUp);
         pvEBarrelMotherPos->add(pvIrUp);
 
@@ -2637,16 +2634,16 @@ void TileAtlasFactory::create(GeoPhysVol *world)
 	if(m_log->level()<=MSG::DEBUG)
 	  (*m_log) << MSG::DEBUG << " IrDw: " <<dxIr<< " " <<dyIr<< endmsg;
 
-        GeoTransform* tfIrDw = new GeoTransform(GeoTrf::TranslateZ3D(ztrans*GeoModelKernelUnits::cm) 
+        GeoTransform* tfIrDw = new GeoTransform(GeoTrf::TranslateZ3D(ztrans*Gaudi::Units::cm) 
                              * GeoTrf::Translate3D(PosXcut+dxIr,-PosYcut+dyIr,-PoZ1) 
-		             * GeoTrf::RotateZ3D(70.*GeoModelKernelUnits::deg) * GeoTrf::RotateX3D(90.*GeoModelKernelUnits::deg) * GeoTrf::RotateZ3D(90.*GeoModelKernelUnits::deg)); // Left
+		             * GeoTrf::RotateZ3D(70.*Gaudi::Units::deg) * GeoTrf::RotateX3D(90.*Gaudi::Units::deg) * GeoTrf::RotateZ3D(90.*Gaudi::Units::deg)); // Left
         pvEBarrelMotherPos->add(tfIrDw);
         pvEBarrelMotherPos->add(new GeoIdentifierTag(6));
         pvEBarrelMotherPos->add(pvIrDw);
 
-                      tfIrDw = new GeoTransform(GeoTrf::TranslateZ3D(ztrans*GeoModelKernelUnits::cm) 
+                      tfIrDw = new GeoTransform(GeoTrf::TranslateZ3D(ztrans*Gaudi::Units::cm) 
                              * GeoTrf::Translate3D(-PosXcut+dxIr,-PosYcut+dyIr,-PoZ1) 
-		             * GeoTrf::RotateZ3D(-70.*GeoModelKernelUnits::deg) * GeoTrf::RotateX3D(90.*GeoModelKernelUnits::deg) * GeoTrf::RotateZ3D(90.*GeoModelKernelUnits::deg)); // Left
+		             * GeoTrf::RotateZ3D(-70.*Gaudi::Units::deg) * GeoTrf::RotateX3D(90.*Gaudi::Units::deg) * GeoTrf::RotateZ3D(90.*Gaudi::Units::deg)); // Left
 
         pvEBarrelMotherPos->add(tfIrDw);
         pvEBarrelMotherPos->add(pvIrDw);
@@ -2654,12 +2651,12 @@ void TileAtlasFactory::create(GeoPhysVol *world)
       }
       //--------------------------------------------------------------------------------------------------------------
       // Ext.Barrel
-      ztrans = (PosEndCrack + (dbManager->GetEnvZLength()*GeoModelKernelUnits::cm - EBFingerLengthPos)/2 + 19.5)*(1./GeoModelKernelUnits::cm); 
+      ztrans = (PosEndCrack + (dbManager->GetEnvZLength()*Gaudi::Units::cm - EBFingerLengthPos)/2 + 19.5)*(1./Gaudi::Units::cm); 
 
-      GeoTransform* tfEBarrelMotherPos = new GeoTransform(GeoTrf::TranslateZ3D(ztrans*GeoModelKernelUnits::cm) * 
-                                             GeoTrf::RotateZ3D(dbManager->GetEnvDPhi()*GeoModelKernelUnits::deg));
+      GeoTransform* tfEBarrelMotherPos = new GeoTransform(GeoTrf::TranslateZ3D(ztrans*Gaudi::Units::cm) * 
+                                             GeoTrf::RotateZ3D(dbManager->GetEnvDPhi()*Gaudi::Units::deg));
 
-      (*m_log) << MSG::INFO <<" Positioning positive ext.barrel with translation "<< ztrans*GeoModelKernelUnits::cm << endmsg; 
+      (*m_log) << MSG::INFO <<" Positioning positive ext.barrel with translation "<< ztrans*Gaudi::Units::cm << endmsg; 
 
       //
       GeoNameTag* ntEBarrelMotherPos = new GeoNameTag("EBarrelPos");
@@ -2671,12 +2668,12 @@ void TileAtlasFactory::create(GeoPhysVol *world)
 
       //--------------------------------------------------------------------------------------------------------------
       // Finger 
-      ztrans = (PosEndExBarrel + EBFingerLengthPos/2)*(1./GeoModelKernelUnits::cm); 
+      ztrans = (PosEndExBarrel + EBFingerLengthPos/2)*(1./Gaudi::Units::cm); 
 
-      GeoTransform* tfEFingerMotherPos = new GeoTransform(GeoTrf::TranslateZ3D(ztrans*GeoModelKernelUnits::cm) * 
-                                                          GeoTrf::RotateZ3D(dbManager->GetEnvDPhi() * GeoModelKernelUnits::deg));
+      GeoTransform* tfEFingerMotherPos = new GeoTransform(GeoTrf::TranslateZ3D(ztrans*Gaudi::Units::cm) * 
+                                                          GeoTrf::RotateZ3D(dbManager->GetEnvDPhi() * Gaudi::Units::deg));
 
-      (*m_log) << MSG::INFO <<" Positioning positive ext.barrel finger with translation ztrans= "<<ztrans*GeoModelKernelUnits::cm<<endmsg;
+      (*m_log) << MSG::INFO <<" Positioning positive ext.barrel finger with translation ztrans= "<<ztrans*Gaudi::Units::cm<<endmsg;
 
       GeoNameTag* ntEFingerMotherPos = new GeoNameTag("TileEFingerPos");
 
@@ -2687,12 +2684,12 @@ void TileAtlasFactory::create(GeoPhysVol *world)
       //--------------------------------------------------------------------------------------------------------------
       // Ext. Saddle Support
       if (dbManager->BoolSaddle())
-      { ztrans = (PosEndExBarrel + DzSaddleSupport/2)*(1./GeoModelKernelUnits::cm); 
+      { ztrans = (PosEndExBarrel + DzSaddleSupport/2)*(1./Gaudi::Units::cm); 
 
-        GeoTransform* tfESaddleMotherPos = new GeoTransform(GeoTrf::TranslateZ3D(ztrans*GeoModelKernelUnits::cm) * 
-                                                            GeoTrf::RotateZ3D(dbManager->GetEnvDPhi() * GeoModelKernelUnits::deg));
+        GeoTransform* tfESaddleMotherPos = new GeoTransform(GeoTrf::TranslateZ3D(ztrans*Gaudi::Units::cm) * 
+                                                            GeoTrf::RotateZ3D(dbManager->GetEnvDPhi() * Gaudi::Units::deg));
 
-        (*m_log) << MSG::INFO <<" Positioning positive ext.barrel saddle with translation ztrans= "<<ztrans*GeoModelKernelUnits::cm
+        (*m_log) << MSG::INFO <<" Positioning positive ext.barrel saddle with translation ztrans= "<<ztrans*Gaudi::Units::cm
                  << endmsg;
 
         GeoNameTag* ntESaddleMotherPos = new GeoNameTag("TileESaddlePos");
@@ -2710,9 +2707,9 @@ void TileAtlasFactory::create(GeoPhysVol *world)
     if(EnvType == 2) { // negative ext.barrel is always at negative boundary, after finger
 
       dbManager->SetCurrentSection(TileDddbManager::TILE_EBARREL);
-      double thicknessEndPlate = dbManager->TILBdzend1()*GeoModelKernelUnits::cm;
+      double thicknessEndPlate = dbManager->TILBdzend1()*Gaudi::Units::cm;
 
-      double PoZ1 = thicknessEndPlate + modl_length/4 - (dbManager->GetEnvZLength()*GeoModelKernelUnits::cm- EBFingerLengthNeg)/2;
+      double PoZ1 = thicknessEndPlate + modl_length/4 - (dbManager->GetEnvZLength()*Gaudi::Units::cm- EBFingerLengthNeg)/2;
       double PoZ2 = modl_length/4 + PoZ1;
 
       //*>------------------------------------------------------------------------------------------------------
@@ -2724,14 +2721,14 @@ void TileAtlasFactory::create(GeoPhysVol *world)
         dxIron = dbManager->CutsXpos();
 	dyIron = dbManager->CutsYpos();
 
-        GeoTransform* tfIron1 = new GeoTransform(GeoTrf::TranslateZ3D(ztrans*GeoModelKernelUnits::cm) * GeoTrf::Translate3D(dxIron,PosY-dyIron,-PoZ2) 
-					       * GeoTrf::RotateX3D(90.*GeoModelKernelUnits::deg) * GeoTrf::RotateZ3D(90.*GeoModelKernelUnits::deg)); // Left
+        GeoTransform* tfIron1 = new GeoTransform(GeoTrf::TranslateZ3D(ztrans*Gaudi::Units::cm) * GeoTrf::Translate3D(dxIron,PosY-dyIron,-PoZ2) 
+					       * GeoTrf::RotateX3D(90.*Gaudi::Units::deg) * GeoTrf::RotateZ3D(90.*Gaudi::Units::deg)); // Left
         pvEBarrelMotherNeg->add(tfIron1);
         pvEBarrelMotherNeg->add(new GeoIdentifierTag(1));
         pvEBarrelMotherNeg->add(pvIron1);
 
-                      tfIron1 = new GeoTransform(GeoTrf::TranslateZ3D(ztrans*GeoModelKernelUnits::cm) * GeoTrf::Translate3D(-dxIron,PosY-dyIron,-PoZ2)
-					       * GeoTrf::RotateX3D(90.*GeoModelKernelUnits::deg) * GeoTrf::RotateZ3D(90.*GeoModelKernelUnits::deg)); // Right
+                      tfIron1 = new GeoTransform(GeoTrf::TranslateZ3D(ztrans*Gaudi::Units::cm) * GeoTrf::Translate3D(-dxIron,PosY-dyIron,-PoZ2)
+					       * GeoTrf::RotateX3D(90.*Gaudi::Units::deg) * GeoTrf::RotateZ3D(90.*Gaudi::Units::deg)); // Right
         pvEBarrelMotherNeg->add(tfIron1);
         pvEBarrelMotherNeg->add(new GeoIdentifierTag(2));
         pvEBarrelMotherNeg->add(pvIron1);
@@ -2741,14 +2738,14 @@ void TileAtlasFactory::create(GeoPhysVol *world)
         dxIron = dbManager->CutsXpos();
 	dyIron = dbManager->CutsYpos();
 
-        GeoTransform* tfIron2 = new GeoTransform(GeoTrf::TranslateZ3D(ztrans*GeoModelKernelUnits::cm) * GeoTrf::Translate3D(dxIron,PosY+dyIron,-PoZ2) 
-	                      * GeoTrf::RotateZ3D(-84.*GeoModelKernelUnits::deg) * GeoTrf::RotateX3D(90.*GeoModelKernelUnits::deg) * GeoTrf::RotateZ3D(90.*GeoModelKernelUnits::deg)); // Left
+        GeoTransform* tfIron2 = new GeoTransform(GeoTrf::TranslateZ3D(ztrans*Gaudi::Units::cm) * GeoTrf::Translate3D(dxIron,PosY+dyIron,-PoZ2) 
+	                      * GeoTrf::RotateZ3D(-84.*Gaudi::Units::deg) * GeoTrf::RotateX3D(90.*Gaudi::Units::deg) * GeoTrf::RotateZ3D(90.*Gaudi::Units::deg)); // Left
         pvEBarrelMotherNeg->add(tfIron2);
         pvEBarrelMotherNeg->add(new GeoIdentifierTag(2));
         pvEBarrelMotherNeg->add(pvIron2);
 
-                      tfIron2 = new GeoTransform(GeoTrf::TranslateZ3D(ztrans*GeoModelKernelUnits::cm) * GeoTrf::Translate3D(-dxIron,PosY+dyIron,-PoZ2)
-                              * GeoTrf::RotateZ3D(84.*GeoModelKernelUnits::deg) * GeoTrf::RotateX3D(90.*GeoModelKernelUnits::deg) * GeoTrf::RotateZ3D(90.*GeoModelKernelUnits::deg)); // Left
+                      tfIron2 = new GeoTransform(GeoTrf::TranslateZ3D(ztrans*Gaudi::Units::cm) * GeoTrf::Translate3D(-dxIron,PosY+dyIron,-PoZ2)
+                              * GeoTrf::RotateZ3D(84.*Gaudi::Units::deg) * GeoTrf::RotateX3D(90.*Gaudi::Units::deg) * GeoTrf::RotateZ3D(90.*Gaudi::Units::deg)); // Left
         pvEBarrelMotherNeg->add(tfIron2);
         pvEBarrelMotherNeg->add(pvIron2);
 
@@ -2757,14 +2754,14 @@ void TileAtlasFactory::create(GeoPhysVol *world)
         dxIron = dbManager->CutsXpos();
 	dyIron = dbManager->CutsYpos();
 
-        GeoTransform* tfIron3 = new GeoTransform(GeoTrf::TranslateZ3D(ztrans*GeoModelKernelUnits::cm) * GeoTrf::Translate3D(dxIron,PosY+dyIron,-PoZ2) 
-	                      * GeoTrf::RotateZ3D(90.*GeoModelKernelUnits::deg) * GeoTrf::RotateX3D(90.*GeoModelKernelUnits::deg) * GeoTrf::RotateZ3D(90.*GeoModelKernelUnits::deg)); // Left
+        GeoTransform* tfIron3 = new GeoTransform(GeoTrf::TranslateZ3D(ztrans*Gaudi::Units::cm) * GeoTrf::Translate3D(dxIron,PosY+dyIron,-PoZ2) 
+	                      * GeoTrf::RotateZ3D(90.*Gaudi::Units::deg) * GeoTrf::RotateX3D(90.*Gaudi::Units::deg) * GeoTrf::RotateZ3D(90.*Gaudi::Units::deg)); // Left
         pvEBarrelMotherNeg->add(tfIron3);
         pvEBarrelMotherNeg->add(new GeoIdentifierTag(3));
         pvEBarrelMotherNeg->add(pvIron3); 
 
-                      tfIron3 = new GeoTransform(GeoTrf::TranslateZ3D(ztrans*GeoModelKernelUnits::cm) * GeoTrf::Translate3D(-dxIron,PosY+dyIron,-PoZ2)
-                              * GeoTrf::RotateZ3D(90.*GeoModelKernelUnits::deg) * GeoTrf::RotateX3D(90.*GeoModelKernelUnits::deg) * GeoTrf::RotateZ3D(90.*GeoModelKernelUnits::deg)); // Right
+                      tfIron3 = new GeoTransform(GeoTrf::TranslateZ3D(ztrans*Gaudi::Units::cm) * GeoTrf::Translate3D(-dxIron,PosY+dyIron,-PoZ2)
+                              * GeoTrf::RotateZ3D(90.*Gaudi::Units::deg) * GeoTrf::RotateX3D(90.*Gaudi::Units::deg) * GeoTrf::RotateZ3D(90.*Gaudi::Units::deg)); // Right
         pvEBarrelMotherNeg->add(tfIron3);
         pvEBarrelMotherNeg->add(pvIron3);
 
@@ -2772,14 +2769,14 @@ void TileAtlasFactory::create(GeoPhysVol *world)
         volname = "IrBox"; dbManager->SetCurrentCuts(volname); //>>
         dxIron = dbManager->CutsXpos();
 	dyIron = dbManager->CutsYpos();
-        GeoTransform* tfIrBoxL = new GeoTransform(GeoTrf::TranslateZ3D(ztrans*GeoModelKernelUnits::cm) * GeoTrf::Translate3D(dxIron,PosY-dyIron,-PoZ2)
-                               * GeoTrf::RotateX3D(90.*GeoModelKernelUnits::deg) * GeoTrf::RotateZ3D(90.*GeoModelKernelUnits::deg)); // Left
+        GeoTransform* tfIrBoxL = new GeoTransform(GeoTrf::TranslateZ3D(ztrans*Gaudi::Units::cm) * GeoTrf::Translate3D(dxIron,PosY-dyIron,-PoZ2)
+                               * GeoTrf::RotateX3D(90.*Gaudi::Units::deg) * GeoTrf::RotateZ3D(90.*Gaudi::Units::deg)); // Left
         pvEBarrelMotherNeg->add(tfIrBoxL); 
         pvEBarrelMotherNeg->add(new GeoIdentifierTag(4));
         pvEBarrelMotherNeg->add(pvIrBox); 
 
-        GeoTransform* tfIrBoxR = new GeoTransform(GeoTrf::TranslateZ3D(ztrans*GeoModelKernelUnits::cm) *GeoTrf::Translate3D(-dxIron,PosY-dyIron,-PoZ2)
-		               * GeoTrf::RotateX3D(90.*GeoModelKernelUnits::deg) * GeoTrf::RotateZ3D(90.*GeoModelKernelUnits::deg)); // Right
+        GeoTransform* tfIrBoxR = new GeoTransform(GeoTrf::TranslateZ3D(ztrans*Gaudi::Units::cm) *GeoTrf::Translate3D(-dxIron,PosY-dyIron,-PoZ2)
+		               * GeoTrf::RotateX3D(90.*Gaudi::Units::deg) * GeoTrf::RotateZ3D(90.*Gaudi::Units::deg)); // Right
         pvEBarrelMotherNeg->add(tfIrBoxR);
         pvEBarrelMotherNeg->add(pvIrBox);
 
@@ -2788,16 +2785,16 @@ void TileAtlasFactory::create(GeoPhysVol *world)
         dxIr = dbManager->CutsXpos();
 	dyIr = dbManager->CutsYpos();
 
-        GeoTransform* tfIrUp = new GeoTransform(GeoTrf::TranslateZ3D(ztrans*GeoModelKernelUnits::cm) 
+        GeoTransform* tfIrUp = new GeoTransform(GeoTrf::TranslateZ3D(ztrans*Gaudi::Units::cm) 
                              * GeoTrf::Translate3D(PosXcut+dxIr,-PosYcut+dyIr,PoZ1) 
-		             * GeoTrf::RotateZ3D(90.*GeoModelKernelUnits::deg) * GeoTrf::RotateX3D(90.*GeoModelKernelUnits::deg) * GeoTrf::RotateZ3D(90.*GeoModelKernelUnits::deg)); // Left
+		             * GeoTrf::RotateZ3D(90.*Gaudi::Units::deg) * GeoTrf::RotateX3D(90.*Gaudi::Units::deg) * GeoTrf::RotateZ3D(90.*Gaudi::Units::deg)); // Left
         pvEBarrelMotherNeg->add(tfIrUp);
         pvEBarrelMotherNeg->add(new GeoIdentifierTag(5));
         pvEBarrelMotherNeg->add(pvIrUp);
 
-                      tfIrUp = new GeoTransform(GeoTrf::TranslateZ3D(ztrans*GeoModelKernelUnits::cm) 
+                      tfIrUp = new GeoTransform(GeoTrf::TranslateZ3D(ztrans*Gaudi::Units::cm) 
                              * GeoTrf::Translate3D(-PosXcut-dxIr,-PosYcut+dyIr,PoZ1) 
-		             * GeoTrf::RotateZ3D(90.*GeoModelKernelUnits::deg) * GeoTrf::RotateX3D(90.*GeoModelKernelUnits::deg) * GeoTrf::RotateZ3D(90.*GeoModelKernelUnits::deg)); // Right
+		             * GeoTrf::RotateZ3D(90.*Gaudi::Units::deg) * GeoTrf::RotateX3D(90.*Gaudi::Units::deg) * GeoTrf::RotateZ3D(90.*Gaudi::Units::deg)); // Right
         pvEBarrelMotherNeg->add(tfIrUp);
         pvEBarrelMotherNeg->add(pvIrUp);
 
@@ -2806,16 +2803,16 @@ void TileAtlasFactory::create(GeoPhysVol *world)
         dxIr = dbManager->CutsXpos();
 	dyIr = dbManager->CutsYpos();
 
-        GeoTransform* tfIrDw = new GeoTransform(GeoTrf::TranslateZ3D(ztrans*GeoModelKernelUnits::cm) 
+        GeoTransform* tfIrDw = new GeoTransform(GeoTrf::TranslateZ3D(ztrans*Gaudi::Units::cm) 
                              * GeoTrf::Translate3D(PosXcut+dxIr,-PosYcut+dyIr,PoZ1) 
-		             * GeoTrf::RotateZ3D(70.*GeoModelKernelUnits::deg) * GeoTrf::RotateX3D(90.*GeoModelKernelUnits::deg) * GeoTrf::RotateZ3D(90.*GeoModelKernelUnits::deg)); // Left
+		             * GeoTrf::RotateZ3D(70.*Gaudi::Units::deg) * GeoTrf::RotateX3D(90.*Gaudi::Units::deg) * GeoTrf::RotateZ3D(90.*Gaudi::Units::deg)); // Left
         pvEBarrelMotherNeg->add(tfIrDw);
         pvEBarrelMotherNeg->add(new GeoIdentifierTag(6));
         pvEBarrelMotherNeg->add(pvIrDw);
 
-                      tfIrDw = new GeoTransform(GeoTrf::TranslateZ3D(ztrans*GeoModelKernelUnits::cm) 
+                      tfIrDw = new GeoTransform(GeoTrf::TranslateZ3D(ztrans*Gaudi::Units::cm) 
                              * GeoTrf::Translate3D(-PosXcut+dxIr,-PosYcut+dyIr,PoZ1) 
-		             * GeoTrf::RotateZ3D(-70.*GeoModelKernelUnits::deg) * GeoTrf::RotateX3D(90.*GeoModelKernelUnits::deg) * GeoTrf::RotateZ3D(90.*GeoModelKernelUnits::deg)); // Left
+		             * GeoTrf::RotateZ3D(-70.*Gaudi::Units::deg) * GeoTrf::RotateX3D(90.*Gaudi::Units::deg) * GeoTrf::RotateZ3D(90.*Gaudi::Units::deg)); // Left
 
         pvEBarrelMotherNeg->add(tfIrDw);
         pvEBarrelMotherNeg->add(pvIrDw);
@@ -2824,12 +2821,12 @@ void TileAtlasFactory::create(GeoPhysVol *world)
       //
       //*>------------------------------------------------------------------------------------------------------
       // Ext.Barrel
-      ztrans = (-NegEndCrack - (dbManager->GetEnvZLength()*GeoModelKernelUnits::cm - EBFingerLengthNeg)/2 - 19.5)*(1./GeoModelKernelUnits::cm);
+      ztrans = (-NegEndCrack - (dbManager->GetEnvZLength()*Gaudi::Units::cm - EBFingerLengthNeg)/2 - 19.5)*(1./Gaudi::Units::cm);
 
-      GeoTransform* tfEBarrelMotherNeg = new GeoTransform(GeoTrf::TranslateZ3D(ztrans*GeoModelKernelUnits::cm) * 
-                                             GeoTrf::RotateZ3D(dbManager->GetEnvDPhi()*GeoModelKernelUnits::deg));
+      GeoTransform* tfEBarrelMotherNeg = new GeoTransform(GeoTrf::TranslateZ3D(ztrans*Gaudi::Units::cm) * 
+                                             GeoTrf::RotateZ3D(dbManager->GetEnvDPhi()*Gaudi::Units::deg));
 
-      (*m_log) << MSG::INFO <<" Positioning negative ext.barrel with translation ztrans "<<ztrans*GeoModelKernelUnits::cm<<endmsg;
+      (*m_log) << MSG::INFO <<" Positioning negative ext.barrel with translation ztrans "<<ztrans*Gaudi::Units::cm<<endmsg;
       
       GeoNameTag* ntEBarrelMotherNeg = new GeoNameTag("EBarrelNeg");
 
@@ -2840,12 +2837,12 @@ void TileAtlasFactory::create(GeoPhysVol *world)
 
       //*>------------------------------------------------------------------------------------------------------
       // Finger
-      ztrans = (-NegEndExBarrel - EBFingerLengthPos/2)*(1./GeoModelKernelUnits::cm); 
+      ztrans = (-NegEndExBarrel - EBFingerLengthPos/2)*(1./Gaudi::Units::cm); 
 
-      GeoTransform* tfEFingerMotherNeg = new GeoTransform(GeoTrf::TranslateZ3D(ztrans*GeoModelKernelUnits::cm) * 
-                                             GeoTrf::RotateZ3D(dbManager->GetEnvDPhi() * GeoModelKernelUnits::deg));
+      GeoTransform* tfEFingerMotherNeg = new GeoTransform(GeoTrf::TranslateZ3D(ztrans*Gaudi::Units::cm) * 
+                                             GeoTrf::RotateZ3D(dbManager->GetEnvDPhi() * Gaudi::Units::deg));
 
-      (*m_log) << MSG::INFO <<" Positioning negative ext.barrel finger with translation ztrans= "<<ztrans*GeoModelKernelUnits::cm<< endmsg;
+      (*m_log) << MSG::INFO <<" Positioning negative ext.barrel finger with translation ztrans= "<<ztrans*Gaudi::Units::cm<< endmsg;
 
       GeoNameTag* ntEFingerMotherNeg = new GeoNameTag("TileEFingerNeg");
 
@@ -2856,12 +2853,12 @@ void TileAtlasFactory::create(GeoPhysVol *world)
       //*>------------------------------------------------------------------------------------------------------
       // Ext. Saddle Support
       if (dbManager->BoolSaddle())
-      { ztrans = (-NegEndExBarrel - DzSaddleSupport/2)*(1./GeoModelKernelUnits::cm); 
+      { ztrans = (-NegEndExBarrel - DzSaddleSupport/2)*(1./Gaudi::Units::cm); 
 
-        GeoTransform* tfESaddleMotherNeg = new GeoTransform(GeoTrf::TranslateZ3D(ztrans*GeoModelKernelUnits::cm) * 
-                                               GeoTrf::RotateZ3D(dbManager->GetEnvDPhi() * GeoModelKernelUnits::deg));
+        GeoTransform* tfESaddleMotherNeg = new GeoTransform(GeoTrf::TranslateZ3D(ztrans*Gaudi::Units::cm) * 
+                                               GeoTrf::RotateZ3D(dbManager->GetEnvDPhi() * Gaudi::Units::deg));
 
-        (*m_log) << MSG::INFO <<" Positioning negative ext.barrel saddle with translation ztrans= "<<ztrans*GeoModelKernelUnits::cm
+        (*m_log) << MSG::INFO <<" Positioning negative ext.barrel saddle with translation ztrans= "<<ztrans*Gaudi::Units::cm
                  << endmsg;
 
         GeoNameTag* ntESaddleMotherNeg = new GeoNameTag("TileESaddleNeg");
@@ -2880,15 +2877,15 @@ void TileAtlasFactory::create(GeoPhysVol *world)
 
       dbManager->SetCurrentSection(TileDddbManager::TILE_PLUG1);
 
-      ztrans = PosEndBarrelFinger*(1./GeoModelKernelUnits::cm) + dbManager->TILBdzmodul()/2;
+      ztrans = PosEndBarrelFinger*(1./Gaudi::Units::cm) + dbManager->TILBdzmodul()/2;
 
-      //std::cout <<" ztrans "<<ztrans<<" PosEndBarrelFinger/GeoModelKernelUnits::cm "<<PosEndBarrelFinger/GeoModelKernelUnits::cm
-      //          <<" dbManager->TILBdzmodul()/2*GeoModelKernelUnits::cm"<<dbManager->TILBdzmodul()/2<<"\n";
+      //std::cout <<" ztrans "<<ztrans<<" PosEndBarrelFinger/Gaudi::Units::cm "<<PosEndBarrelFinger/Gaudi::Units::cm
+      //          <<" dbManager->TILBdzmodul()/2*Gaudi::Units::cm"<<dbManager->TILBdzmodul()/2<<"\n";
       
-      (*m_log) << MSG::INFO <<" Positioning positive ITC with translation "<<ztrans*GeoModelKernelUnits::cm<< endmsg;
+      (*m_log) << MSG::INFO <<" Positioning positive ITC with translation "<<ztrans*Gaudi::Units::cm<< endmsg;
 
-      GeoTransform* tfITCMotherPos = new GeoTransform(GeoTrf::TranslateZ3D(ztrans*GeoModelKernelUnits::cm) * 
-                                         GeoTrf::RotateZ3D(dbManager->GetEnvDPhi() * GeoModelKernelUnits::deg));
+      GeoTransform* tfITCMotherPos = new GeoTransform(GeoTrf::TranslateZ3D(ztrans*Gaudi::Units::cm) * 
+                                         GeoTrf::RotateZ3D(dbManager->GetEnvDPhi() * Gaudi::Units::deg));
 
       GeoNameTag* ntITCMotherPos = new GeoNameTag("ITCPos");
 
@@ -2897,12 +2894,12 @@ void TileAtlasFactory::create(GeoPhysVol *world)
       pvTileEnvelopePosEndcap->add(pvITCMotherPos);
 
       dbManager->SetCurrentSection(TileDddbManager::TILE_PLUG3);
-      ztrans = PosBeginGap*(1./GeoModelKernelUnits::cm) + dbManager->TILBdzmodul()/2;
+      ztrans = PosBeginGap*(1./Gaudi::Units::cm) + dbManager->TILBdzmodul()/2;
 
-      (*m_log) << MSG::INFO <<" Positioning positive Gap with translation "<<ztrans*GeoModelKernelUnits::cm<<endmsg;
+      (*m_log) << MSG::INFO <<" Positioning positive Gap with translation "<<ztrans*Gaudi::Units::cm<<endmsg;
 
-      GeoTransform* tfGapMotherPos = new GeoTransform(GeoTrf::TranslateZ3D(ztrans*GeoModelKernelUnits::cm)* 
-                                         GeoTrf::RotateZ3D(dbManager->GetEnvDPhi()*GeoModelKernelUnits::deg));
+      GeoTransform* tfGapMotherPos = new GeoTransform(GeoTrf::TranslateZ3D(ztrans*Gaudi::Units::cm)* 
+                                         GeoTrf::RotateZ3D(dbManager->GetEnvDPhi()*Gaudi::Units::deg));
 
       GeoNameTag* ntGapMotherPos = new GeoNameTag("GapPos");
 
@@ -2912,12 +2909,12 @@ void TileAtlasFactory::create(GeoPhysVol *world)
 
       // Crack
       dbManager->SetCurrentSection(TileDddbManager::TILE_PLUG4);
-      ztrans = PosBeginCrack*(1./GeoModelKernelUnits::cm) + dbManager->TILBdzmodul()/2;
+      ztrans = PosBeginCrack*(1./Gaudi::Units::cm) + dbManager->TILBdzmodul()/2;
 
-      (*m_log) << MSG::INFO <<" Positioning positive Crack with translation "<<ztrans*GeoModelKernelUnits::cm<<endmsg;
+      (*m_log) << MSG::INFO <<" Positioning positive Crack with translation "<<ztrans*Gaudi::Units::cm<<endmsg;
 
-      GeoTransform* tfCrackMotherPos = new GeoTransform(GeoTrf::TranslateZ3D(ztrans*GeoModelKernelUnits::cm)* 
-                                         GeoTrf::RotateZ3D(dbManager->GetEnvDPhi()*GeoModelKernelUnits::deg));
+      GeoTransform* tfCrackMotherPos = new GeoTransform(GeoTrf::TranslateZ3D(ztrans*Gaudi::Units::cm)* 
+                                         GeoTrf::RotateZ3D(dbManager->GetEnvDPhi()*Gaudi::Units::deg));
  
       GeoNameTag* ntCrackMotherPos = new GeoNameTag("CrackPos");
 
@@ -2934,12 +2931,12 @@ void TileAtlasFactory::create(GeoPhysVol *world)
     if(EnvType == 4) { 
 
       dbManager->SetCurrentSection(TileDddbManager::TILE_PLUG1);
-      ztrans = -NegEndBarrelFinger*(1./GeoModelKernelUnits::cm) - dbManager->TILBdzmodul()/2;
+      ztrans = -NegEndBarrelFinger*(1./Gaudi::Units::cm) - dbManager->TILBdzmodul()/2;
 
-      (*m_log) << MSG::INFO <<" Positioning negative ITC with translation "<<ztrans*GeoModelKernelUnits::cm<<endmsg;
+      (*m_log) << MSG::INFO <<" Positioning negative ITC with translation "<<ztrans*Gaudi::Units::cm<<endmsg;
 
-      GeoTransform* tfITCMotherNeg = new GeoTransform(GeoTrf::TranslateZ3D(ztrans*GeoModelKernelUnits::cm)* 
-                                         GeoTrf::RotateZ3D(dbManager->GetEnvDPhi()*GeoModelKernelUnits::deg));
+      GeoTransform* tfITCMotherNeg = new GeoTransform(GeoTrf::TranslateZ3D(ztrans*Gaudi::Units::cm)* 
+                                         GeoTrf::RotateZ3D(dbManager->GetEnvDPhi()*Gaudi::Units::deg));
 
       GeoNameTag* ntITCMotherNeg = new GeoNameTag("ITCNeg");
 
@@ -2948,12 +2945,12 @@ void TileAtlasFactory::create(GeoPhysVol *world)
       pvTileEnvelopeNegEndcap->add(pvITCMotherNeg);
 
       dbManager->SetCurrentSection(TileDddbManager::TILE_PLUG3);
-      ztrans = -NegBeginGap*(1./GeoModelKernelUnits::cm) - dbManager->TILBdzmodul()/2;
+      ztrans = -NegBeginGap*(1./Gaudi::Units::cm) - dbManager->TILBdzmodul()/2;
 
-      (*m_log) << MSG::INFO <<" Positioning negative Gap with translation "<<ztrans*GeoModelKernelUnits::cm<<endmsg;
+      (*m_log) << MSG::INFO <<" Positioning negative Gap with translation "<<ztrans*Gaudi::Units::cm<<endmsg;
 
-      GeoTransform* tfGapMotherNeg = new GeoTransform(GeoTrf::TranslateZ3D(ztrans*GeoModelKernelUnits::cm)* 
-                                         GeoTrf::RotateZ3D(dbManager->GetEnvDPhi()*GeoModelKernelUnits::deg));
+      GeoTransform* tfGapMotherNeg = new GeoTransform(GeoTrf::TranslateZ3D(ztrans*Gaudi::Units::cm)* 
+                                         GeoTrf::RotateZ3D(dbManager->GetEnvDPhi()*Gaudi::Units::deg));
 
       GeoNameTag* ntGapMotherNeg = new GeoNameTag("GapNeg");
 
@@ -2963,12 +2960,12 @@ void TileAtlasFactory::create(GeoPhysVol *world)
 
       // Crack
       dbManager->SetCurrentSection(TileDddbManager::TILE_PLUG4);
-      ztrans = -NegBeginCrack*(1./GeoModelKernelUnits::cm) - dbManager->TILBdzmodul()/2;
+      ztrans = -NegBeginCrack*(1./Gaudi::Units::cm) - dbManager->TILBdzmodul()/2;
 
-      (*m_log) << MSG::INFO <<" Positioning negative Crack with translation "<<ztrans*GeoModelKernelUnits::cm<<endmsg;
+      (*m_log) << MSG::INFO <<" Positioning negative Crack with translation "<<ztrans*Gaudi::Units::cm<<endmsg;
 
-      GeoTransform* tfCrackMotherNeg = new GeoTransform(GeoTrf::TranslateZ3D(ztrans*GeoModelKernelUnits::cm)* 
-                                           GeoTrf::RotateZ3D(dbManager->GetEnvDPhi()*GeoModelKernelUnits::deg));
+      GeoTransform* tfCrackMotherNeg = new GeoTransform(GeoTrf::TranslateZ3D(ztrans*Gaudi::Units::cm)* 
+                                           GeoTrf::RotateZ3D(dbManager->GetEnvDPhi()*Gaudi::Units::deg));
 
       GeoNameTag* ntCrackMotherNeg = new GeoNameTag("CrackNeg");
 
@@ -2994,13 +2991,13 @@ void TileAtlasFactory::create(GeoPhysVol *world)
        dbManager->SetCurrentEnvByIndex(EnvCounter);
        int EnvType = dbManager->GetEnvType();
        int NumberOfMod = dbManager->GetEnvNModules();
-       double Zshift = dbManager->GetEnvZShift()*GeoModelKernelUnits::cm;
+       double Zshift = dbManager->GetEnvZShift()*Gaudi::Units::cm;
 
        if(m_log->level()<=MSG::DEBUG)
 	 (*m_log) << MSG::DEBUG 
 		  << " EnvCounter is " << EnvCounter
 		  << " EnvType is " << EnvType
-		  << " Zshift is " << Zshift*(1./GeoModelKernelUnits::cm) << " cm"
+		  << " Zshift is " << Zshift*(1./Gaudi::Units::cm) << " cm"
 		  << endmsg;
 
        // Central barrel 
@@ -3052,13 +3049,13 @@ void TileAtlasFactory::create(GeoPhysVol *world)
     GeoTrf::Transform3D mz = GeoTrf::RotateZ3D(dbManager->GetEnvDPhi());
     GeoTrf::Transform3D my = GeoTrf::RotateY3D(dbManager->GetEnvDTheta());
     GeoTrf::Transform3D mx = GeoTrf::RotateZ3D(dbManager->GetEnvDPsi());
-    GeoTrf::Transform3D vpos = GeoTrf::Translate3D(dbManager->GetEnvDX()*GeoModelKernelUnits::cm,dbManager->GetEnvDY()*GeoModelKernelUnits::cm,dbManager->GetEnvDZ()*GeoModelKernelUnits::cm);
+    GeoTrf::Transform3D vpos = GeoTrf::Translate3D(dbManager->GetEnvDX()*Gaudi::Units::cm,dbManager->GetEnvDY()*Gaudi::Units::cm,dbManager->GetEnvDZ()*Gaudi::Units::cm);
     GeoTransform* barrelTT = new GeoTransform(GeoTrf::Transform3D(vpos*(mx*(my*(mz)))));
 
     (*m_log) << MSG::INFO << " Global positioning of barrel with rotation ("
              << dbManager->GetEnvDPhi() << "," << dbManager->GetEnvDTheta() << "," << dbManager->GetEnvDPsi() << ")"
              << ") and translation (" << dbManager->GetEnvDX() << "," << dbManager->GetEnvDY() << "," << dbManager->GetEnvDZ()
-             << ") GeoModelKernelUnits::cm" << endmsg;
+             << ") Gaudi::Units::cm" << endmsg;
 
     world->add(barrelTT);
     world->add(pvTileEnvelopeBarrel);
@@ -3074,13 +3071,13 @@ void TileAtlasFactory::create(GeoPhysVol *world)
     GeoTrf::Transform3D mz = GeoTrf::RotateZ3D(dbManager->GetEnvDPhi());
     GeoTrf::Transform3D my = GeoTrf::RotateY3D(dbManager->GetEnvDTheta());
     GeoTrf::Transform3D mx = GeoTrf::RotateZ3D(dbManager->GetEnvDPsi());
-    GeoTrf::Transform3D vpos = GeoTrf::Translate3D(dbManager->GetEnvDX()*GeoModelKernelUnits::cm,dbManager->GetEnvDY()*GeoModelKernelUnits::cm,dbManager->GetEnvDZ()*GeoModelKernelUnits::cm);
+    GeoTrf::Transform3D vpos = GeoTrf::Translate3D(dbManager->GetEnvDX()*Gaudi::Units::cm,dbManager->GetEnvDY()*Gaudi::Units::cm,dbManager->GetEnvDZ()*Gaudi::Units::cm);
     GeoTransform*  posEcTT = new GeoTransform(GeoTrf::Transform3D(vpos*(mx*(my*(mz)))));
 
     (*m_log) << MSG::INFO << " Global positioning of positive ext.barrel with rotation ("
              << dbManager->GetEnvDPhi() << "," << dbManager->GetEnvDTheta() << "," << dbManager->GetEnvDPsi() << ")"
              << ") and translation (" << dbManager->GetEnvDX() << "," << dbManager->GetEnvDY() << "," << dbManager->GetEnvDZ()
-             << ") GeoModelKernelUnits::cm" << endmsg;
+             << ") Gaudi::Units::cm" << endmsg;
 
     world->add(posEcTT);
     world->add(pvTileEnvelopePosEndcap);
@@ -3096,13 +3093,13 @@ void TileAtlasFactory::create(GeoPhysVol *world)
     GeoTrf::Transform3D mz = GeoTrf::RotateZ3D(dbManager->GetEnvDPhi());
     GeoTrf::Transform3D my = GeoTrf::RotateY3D(dbManager->GetEnvDTheta());
     GeoTrf::Transform3D mx = GeoTrf::RotateZ3D(dbManager->GetEnvDPsi());
-    GeoTrf::Transform3D vpos = GeoTrf::Translate3D(dbManager->GetEnvDX()*GeoModelKernelUnits::cm,dbManager->GetEnvDY()*GeoModelKernelUnits::cm,dbManager->GetEnvDZ()*GeoModelKernelUnits::cm);
+    GeoTrf::Transform3D vpos = GeoTrf::Translate3D(dbManager->GetEnvDX()*Gaudi::Units::cm,dbManager->GetEnvDY()*Gaudi::Units::cm,dbManager->GetEnvDZ()*Gaudi::Units::cm);
     GeoTransform* negEcTT = new GeoTransform(GeoTrf::Transform3D(vpos*(mx*(my*(mz)))));
 
     (*m_log) << MSG::INFO << " Global positioning of negative ext.barrel with rotation ("
              << dbManager->GetEnvDPhi() << "," << dbManager->GetEnvDTheta() << "," << dbManager->GetEnvDPsi() << ")"
              << ") and translation (" << dbManager->GetEnvDX() << "," << dbManager->GetEnvDY() << "," << dbManager->GetEnvDZ()
-             << ") GeoModelKernelUnits::cm" << endmsg;
+             << ") Gaudi::Units::cm" << endmsg;
 
     world->add(negEcTT);
     world->add(pvTileEnvelopeNegEndcap);
diff --git a/TileCalorimeter/TileGeoModel/src/TileDetectorFactory.cxx b/TileCalorimeter/TileGeoModel/src/TileDetectorFactory.cxx
index 4764c9b6e2339a87b73cedffaacd888e0beb23fd..9cda8c646078394338a3d30c3a878e75ab87ce97 100755
--- a/TileCalorimeter/TileGeoModel/src/TileDetectorFactory.cxx
+++ b/TileCalorimeter/TileGeoModel/src/TileDetectorFactory.cxx
@@ -22,7 +22,6 @@
 #include "GeoModelKernel/GeoTransform.h"
 #include "GeoModelKernel/GeoSerialIdentifier.h"
 #include "GeoModelKernel/GeoDefinitions.h"
-#include "GeoModelKernel/Units.h"
 
 #include "GeoGenericFunctions/AbsFunction.h"
 #include "GeoGenericFunctions/Variable.h"
@@ -33,6 +32,7 @@
 #include "StoreGate/StoreGateSvc.h"
 
 #include "GaudiKernel/MsgStream.h"
+#include "GaudiKernel/SystemOfUnits.h"
 
 #include <stdexcept>
 #include <iostream>
@@ -107,20 +107,20 @@ void TileDetectorFactory::create(GeoPhysVol *world)
   {
     // Z planes
     dbManager->SetCurrentSection(TileDddbManager::TILE_BARREL);
-    double endCentralBarrel = dbManager->TILBdzmodul()/2.*GeoModelKernelUnits::cm;
+    double endCentralBarrel = dbManager->TILBdzmodul()/2.*Gaudi::Units::cm;
     dbManager->SetCurrentSection(TileDddbManager::TILE_PLUG1);
-    //sb double beginITC1 = (dbManager->TILBzoffset() + dbManager->TILEzshift() - dbManager->TILBdzmodul()/2.)*GeoModelKernelUnits::cm;
+    //sb double beginITC1 = (dbManager->TILBzoffset() + dbManager->TILEzshift() - dbManager->TILBdzmodul()/2.)*Gaudi::Units::cm;
     dbManager->SetCurrentSection(TileDddbManager::TILE_PLUG2);
-    double beginITC2 = (dbManager->TILBzoffset() + dbManager->TILEzshift() - dbManager->TILBdzmodul()/2.)*GeoModelKernelUnits::cm;
+    double beginITC2 = (dbManager->TILBzoffset() + dbManager->TILEzshift() - dbManager->TILBdzmodul()/2.)*Gaudi::Units::cm;
     dbManager->SetCurrentSection(TileDddbManager::TILE_PLUG4);
-    double beginCrack = (dbManager->TILBzoffset() + dbManager->TILEzshift() - dbManager->TILBdzmodul()/2.)*GeoModelKernelUnits::cm;
-    double endCrack = (dbManager->TILBzoffset() + dbManager->TILEzshift() + dbManager->TILBdzmodul()/2.)*GeoModelKernelUnits::cm;
+    double beginCrack = (dbManager->TILBzoffset() + dbManager->TILEzshift() - dbManager->TILBdzmodul()/2.)*Gaudi::Units::cm;
+    double endCrack = (dbManager->TILBzoffset() + dbManager->TILEzshift() + dbManager->TILBdzmodul()/2.)*Gaudi::Units::cm;
     dbManager->SetCurrentSection(TileDddbManager::TILE_EBARREL);
-    double endExtendedBarrel = (dbManager->TILBzoffset() + dbManager->TILEzshift() + dbManager->TILBdzmodul()/2.)*GeoModelKernelUnits::cm;
-    double endTile = dbManager->TILEzmam()*GeoModelKernelUnits::cm;
+    double endExtendedBarrel = (dbManager->TILBzoffset() + dbManager->TILEzshift() + dbManager->TILBdzmodul()/2.)*Gaudi::Units::cm;
+    double endTile = dbManager->TILEzmam()*Gaudi::Units::cm;
 
     dbManager->SetCurrentTifg(1);
-    double endBarrelFinger = endCentralBarrel + dbManager->TIFGdz()*GeoModelKernelUnits::cm;
+    double endBarrelFinger = endCentralBarrel + dbManager->TIFGdz()*Gaudi::Units::cm;
 
     // Offsets
     /* sb
@@ -132,23 +132,23 @@ void TileDetectorFactory::create(GeoPhysVol *world)
 
     // R minimals
     dbManager->SetCurrentSection(TileDddbManager::TILE_BARREL);
-    double rminBarrel = dbManager->TILBrminimal()*GeoModelKernelUnits::cm;
+    double rminBarrel = dbManager->TILBrminimal()*Gaudi::Units::cm;
     dbManager->SetCurrentSection(TileDddbManager::TILE_PLUG1);
-    double rminITC1 = dbManager->TILBrminimal()*GeoModelKernelUnits::cm;
+    double rminITC1 = dbManager->TILBrminimal()*Gaudi::Units::cm;
     dbManager->SetCurrentSection(TileDddbManager::TILE_PLUG2);
-    double rminITC = dbManager->TILBrminimal()*GeoModelKernelUnits::cm;
+    double rminITC = dbManager->TILBrminimal()*Gaudi::Units::cm;
     dbManager->SetCurrentSection(TileDddbManager::TILE_PLUG4);
-    double rminCrack = dbManager->TILBrminimal()*GeoModelKernelUnits::cm;
+    double rminCrack = dbManager->TILBrminimal()*Gaudi::Units::cm;
     dbManager->SetCurrentSection(TileDddbManager::TILE_EBARREL);
-    double rminExtended = dbManager->TILBrminimal()*GeoModelKernelUnits::cm;
-    double rminFinger = dbManager->TILBrmax()*GeoModelKernelUnits::cm;
+    double rminExtended = dbManager->TILBrminimal()*Gaudi::Units::cm;
+    double rminFinger = dbManager->TILBrmax()*Gaudi::Units::cm;
     
     // R maximal
-    double rmaxTotal = dbManager->TILErmam()*GeoModelKernelUnits::cm;
+    double rmaxTotal = dbManager->TILErmam()*Gaudi::Units::cm;
     
-    GeoPcon* tileEnvPconeBarrel    = new GeoPcon(0, 360*GeoModelKernelUnits::deg);
-    GeoPcon* tileEnvPconePosEndcap = new GeoPcon(0, 360*GeoModelKernelUnits::deg);
-    GeoPcon* tileEnvPconeNegEndcap = new GeoPcon(0, 360*GeoModelKernelUnits::deg);
+    GeoPcon* tileEnvPconeBarrel    = new GeoPcon(0, 360*Gaudi::Units::deg);
+    GeoPcon* tileEnvPconePosEndcap = new GeoPcon(0, 360*Gaudi::Units::deg);
+    GeoPcon* tileEnvPconeNegEndcap = new GeoPcon(0, 360*Gaudi::Units::deg);
 
     // Negative Endcap
     tileEnvPconeNegEndcap->addPlane(-endTile,rminFinger,rmaxTotal);
@@ -209,17 +209,17 @@ void TileDetectorFactory::create(GeoPhysVol *world)
     dbManager->SetCurrentTifg(1);
 
     // Z planes
-    double endCentralBarrel = dbManager->TILBdzmodul()/2.*GeoModelKernelUnits::cm;
-    double endEnvelope = endCentralBarrel + dbManager->TIFGdz()*GeoModelKernelUnits::cm;
+    double endCentralBarrel = dbManager->TILBdzmodul()/2.*Gaudi::Units::cm;
+    double endEnvelope = endCentralBarrel + dbManager->TIFGdz()*Gaudi::Units::cm;
 
     // R minimals
-    double rminBarrel = dbManager->TILBrminimal()*GeoModelKernelUnits::cm;
-    double rminFinger = dbManager->TILBrmax()*GeoModelKernelUnits::cm;
+    double rminBarrel = dbManager->TILBrminimal()*Gaudi::Units::cm;
+    double rminFinger = dbManager->TILBrmax()*Gaudi::Units::cm;
     
     // R maximal
-    double rmaxTotal = dbManager->TILErmam()*GeoModelKernelUnits::cm;
+    double rmaxTotal = dbManager->TILErmam()*Gaudi::Units::cm;
     
-    GeoPcon* tileEnvPconeBarrel = new GeoPcon(0, 360*GeoModelKernelUnits::deg);
+    GeoPcon* tileEnvPconeBarrel = new GeoPcon(0, 360*Gaudi::Units::deg);
     tileEnvPconeBarrel->addPlane(-endEnvelope,rminFinger,rmaxTotal);
     tileEnvPconeBarrel->addPlane(-endCentralBarrel,rminFinger,rmaxTotal);
     tileEnvPconeBarrel->addPlane(-endCentralBarrel,rminBarrel,rmaxTotal);
@@ -237,7 +237,7 @@ void TileDetectorFactory::create(GeoPhysVol *world)
   double deltaPhi = 360./dbManager->TILEnmodul();
 
   Variable varInd;
-  GENFUNCTION phiInd = deltaPhi*(varInd+0.5)*GeoModelKernelUnits::deg;
+  GENFUNCTION phiInd = deltaPhi*(varInd+0.5)*Gaudi::Units::deg;
 
   //------------------------------- B A R R E L --------------------------------------
   // Tube - barrel mother
@@ -245,18 +245,18 @@ void TileDetectorFactory::create(GeoPhysVol *world)
   if(dbManager->SetCurrentSection(TileDddbManager::TILE_BARREL))
   {
 
-    GeoTube* barrelMother = new GeoTube(dbManager->TILBrminimal()*GeoModelKernelUnits::cm,
-					dbManager->TILErmam()*GeoModelKernelUnits::cm,
-					dbManager->TILBdzmodul()/2.*GeoModelKernelUnits::cm);
+    GeoTube* barrelMother = new GeoTube(dbManager->TILBrminimal()*Gaudi::Units::cm,
+					dbManager->TILErmam()*Gaudi::Units::cm,
+					dbManager->TILBdzmodul()/2.*Gaudi::Units::cm);
 
     GeoLogVol* lvBarrelMother = new GeoLogVol("Barrel",barrelMother,matAir);
     GeoFullPhysVol* pvBarrelMother = new GeoFullPhysVol(lvBarrelMother);
 
     // Trd - module mother
-    thicknessWedgeMother = dbManager->TILBdzmodul() * GeoModelKernelUnits::cm;
-    heightWedgeMother = (dbManager->TILBrmaximal() - dbManager->TILBrminimal()) * GeoModelKernelUnits::cm;
-    dy1WedgeMother = dbManager->TILBrminimal() * tan(deltaPhi/2.*GeoModelKernelUnits::deg) * GeoModelKernelUnits::cm;
-    dy2WedgeMother = dbManager->TILBrmaximal() * tan(deltaPhi/2.*GeoModelKernelUnits::deg) * GeoModelKernelUnits::cm;
+    thicknessWedgeMother = dbManager->TILBdzmodul() * Gaudi::Units::cm;
+    heightWedgeMother = (dbManager->TILBrmaximal() - dbManager->TILBrminimal()) * Gaudi::Units::cm;
+    dy1WedgeMother = dbManager->TILBrminimal() * tan(deltaPhi/2.*Gaudi::Units::deg) * Gaudi::Units::cm;
+    dy2WedgeMother = dbManager->TILBrmaximal() * tan(deltaPhi/2.*Gaudi::Units::deg) * Gaudi::Units::cm;
 
     dzGlue = (dbManager->TILBdzmodul() - dbManager->TILBdzend1() - dbManager->TILBdzend2() - (dbManager->TILBnperiod()*2.*(dbManager->TILBdzmast() + dbManager->TILBdzspac()) - dbManager->TILBdzmast()))/(2.*(2.*dbManager->TILBnperiod() - 1));
 
@@ -282,9 +282,9 @@ void TileDetectorFactory::create(GeoPhysVol *world)
   {
     phi = j*deltaPhi;
 
-    GeoTransform* zrotateMod = new GeoTransform(GeoTrf::RotateZ3D(phi*GeoModelKernelUnits::deg));
+    GeoTransform* zrotateMod = new GeoTransform(GeoTrf::RotateZ3D(phi*Gaudi::Units::deg));
     GeoTransform* xtransMod = new GeoTransform(GeoTrf::TranslateX3D((dbManager->TILBrmaximal() + dbManager->TILBrminimal())/2. * cm));
-    GeoTransform* yrotateMod = new GeoTransform(GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg));
+    GeoTransform* yrotateMod = new GeoTransform(GeoTrf::RotateY3D(90*Gaudi::Units::deg));
 
     pvBarrelMother->add(zrotateMod);
     pvBarrelMother->add(xtransMod);
@@ -294,7 +294,7 @@ void TileDetectorFactory::create(GeoPhysVol *world)
 */
 
     // --- Using the parameterization -----
-    TRANSFUNCTION xfBarrelModuleMother = Pow(GeoTrf::RotateZ3D(1.0),phiInd)*GeoTrf::TranslateX3D((dbManager->TILBrmaximal()+dbManager->TILBrminimal())/2.*GeoModelKernelUnits::cm)*GeoTrf::RotateX3D(180*GeoModelKernelUnits::deg)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg);
+    TRANSFUNCTION xfBarrelModuleMother = Pow(GeoTrf::RotateZ3D(1.0),phiInd)*GeoTrf::TranslateX3D((dbManager->TILBrmaximal()+dbManager->TILBrminimal())/2.*Gaudi::Units::cm)*GeoTrf::RotateX3D(180*Gaudi::Units::deg)*GeoTrf::RotateY3D(90*Gaudi::Units::deg);
     GeoSerialTransformer* stBarrelModuleMother = new GeoSerialTransformer(pvBarrelModuleMother,
 									  &xfBarrelModuleMother,
 									  dbManager->TILEnmodul());
@@ -314,7 +314,7 @@ void TileDetectorFactory::create(GeoPhysVol *world)
   {
     dbManager->SetCurrentEnvByType(1);
     nModules=dbManager->GetEnvNModules();
-    zShift=dbManager->GetEnvZShift()*GeoModelKernelUnits::cm;
+    zShift=dbManager->GetEnvZShift()*Gaudi::Units::cm;
 
     sectionBuilder->computeCellDim(m_detectorManager, 
                                    TILE_REGION_CENTRAL,
@@ -369,19 +369,19 @@ void TileDetectorFactory::create(GeoPhysVol *world)
   if(dbManager->SetCurrentSection(TileDddbManager::TILE_EBARREL))
   {
   
-    GeoTube* ebarrelMother = new GeoTube(dbManager->TILBrminimal()*GeoModelKernelUnits::cm,
-					 dbManager->TILErmam()*GeoModelKernelUnits::cm,
-					 dbManager->TILBdzmodul()/2.*GeoModelKernelUnits::cm);
+    GeoTube* ebarrelMother = new GeoTube(dbManager->TILBrminimal()*Gaudi::Units::cm,
+					 dbManager->TILErmam()*Gaudi::Units::cm,
+					 dbManager->TILBdzmodul()/2.*Gaudi::Units::cm);
 
     GeoLogVol* lvEBarrelMother = new GeoLogVol("EBarrel",ebarrelMother,matAir);
     GeoFullPhysVol* pvEBarrelMotherPos = new GeoFullPhysVol(lvEBarrelMother);
     GeoFullPhysVol* pvEBarrelMotherNeg = new GeoFullPhysVol(lvEBarrelMother);
 
     // Trd - module mother
-    thicknessWedgeMother = dbManager->TILBdzmodul() * GeoModelKernelUnits::cm;
-    heightWedgeMother = (dbManager->TILBrmaximal() - dbManager->TILBrminimal()) * GeoModelKernelUnits::cm;
-    dy1WedgeMother = dbManager->TILBrminimal() * tan(deltaPhi/2.*GeoModelKernelUnits::deg) * GeoModelKernelUnits::cm;
-    dy2WedgeMother = dbManager->TILBrmaximal() * tan(deltaPhi/2.*GeoModelKernelUnits::deg) * GeoModelKernelUnits::cm;
+    thicknessWedgeMother = dbManager->TILBdzmodul() * Gaudi::Units::cm;
+    heightWedgeMother = (dbManager->TILBrmaximal() - dbManager->TILBrminimal()) * Gaudi::Units::cm;
+    dy1WedgeMother = dbManager->TILBrminimal() * tan(deltaPhi/2.*Gaudi::Units::deg) * Gaudi::Units::cm;
+    dy2WedgeMother = dbManager->TILBrmaximal() * tan(deltaPhi/2.*Gaudi::Units::deg) * Gaudi::Units::cm;
 
     dzGlue = (dbManager->TILBdzmodul() - dbManager->TILBdzend1() - dbManager->TILBdzend2() - dbManager->TILBnperiod()*2.*(dbManager->TILBdzmast() + dbManager->TILBdzspac()))/(4.*dbManager->TILBnperiod());
     
@@ -403,8 +403,8 @@ void TileDetectorFactory::create(GeoPhysVol *world)
     				deltaPhi);
 
     // --- Position N modules inside mother (positive/negative) -----
-    TRANSFUNCTION xfEBarrelModuleMotherPos = Pow(GeoTrf::RotateZ3D(1.0),phiInd)*GeoTrf::TranslateX3D((dbManager->TILBrmaximal()+dbManager->TILBrminimal())/2.*GeoModelKernelUnits::cm)*GeoTrf::RotateX3D(180*GeoModelKernelUnits::deg)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg);
-    TRANSFUNCTION xfEBarrelModuleMotherNeg = Pow(GeoTrf::RotateZ3D(1.0),phiInd)*GeoTrf::TranslateX3D((dbManager->TILBrmaximal()+dbManager->TILBrminimal())/2.*GeoModelKernelUnits::cm)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg);
+    TRANSFUNCTION xfEBarrelModuleMotherPos = Pow(GeoTrf::RotateZ3D(1.0),phiInd)*GeoTrf::TranslateX3D((dbManager->TILBrmaximal()+dbManager->TILBrminimal())/2.*Gaudi::Units::cm)*GeoTrf::RotateX3D(180*Gaudi::Units::deg)*GeoTrf::RotateY3D(90*Gaudi::Units::deg);
+    TRANSFUNCTION xfEBarrelModuleMotherNeg = Pow(GeoTrf::RotateZ3D(1.0),phiInd)*GeoTrf::TranslateX3D((dbManager->TILBrmaximal()+dbManager->TILBrminimal())/2.*Gaudi::Units::cm)*GeoTrf::RotateY3D(90*Gaudi::Units::deg);
 
     GeoSerialTransformer* stEBarrelModuleMotherPos = new GeoSerialTransformer(pvEBarrelModuleMother,
 									      &xfEBarrelModuleMotherPos,
@@ -422,14 +422,14 @@ void TileDetectorFactory::create(GeoPhysVol *world)
     pvEBarrelMotherNeg->add(stEBarrelModuleMotherNeg);
 
 
-    GeoTransform* tfEBarrelMotherPos = new GeoTransform(GeoTrf::TranslateZ3D((dbManager->TILBzoffset()+dbManager->TILEzshift())*GeoModelKernelUnits::cm));
+    GeoTransform* tfEBarrelMotherPos = new GeoTransform(GeoTrf::TranslateZ3D((dbManager->TILBzoffset()+dbManager->TILEzshift())*Gaudi::Units::cm));
     GeoNameTag* ntEBarrelMotherPos = new GeoNameTag("TileEBarrelPos");
     pvTileEnvelopePosEndcap->add(tfEBarrelMotherPos);
     pvTileEnvelopePosEndcap->add(ntEBarrelMotherPos);
     pvTileEnvelopePosEndcap->add(pvEBarrelMotherPos);
 
     
-    GeoTransform* tfEBarrelMotherNeg = new GeoTransform(GeoTrf::TranslateZ3D((-dbManager->TILBzoffset()-dbManager->TILEzshift())*GeoModelKernelUnits::cm));
+    GeoTransform* tfEBarrelMotherNeg = new GeoTransform(GeoTrf::TranslateZ3D((-dbManager->TILBzoffset()-dbManager->TILEzshift())*Gaudi::Units::cm));
     GeoNameTag* ntEBarrelMotherNeg = new GeoNameTag("TileEBarrelNeg");
     pvTileEnvelopeNegEndcap->add(tfEBarrelMotherNeg);
     pvTileEnvelopeNegEndcap->add(ntEBarrelMotherNeg);
@@ -443,10 +443,10 @@ void TileDetectorFactory::create(GeoPhysVol *world)
   {
     dbManager->SetCurrentEnvByType(2);
     nModulesNeg=dbManager->GetEnvNModules();
-    zShiftNeg=dbManager->GetEnvZShift()*GeoModelKernelUnits::cm;
+    zShiftNeg=dbManager->GetEnvZShift()*Gaudi::Units::cm;
     dbManager->SetCurrentEnvByType(3);
     nModulesPos=dbManager->GetEnvNModules();
-    zShiftPos=dbManager->GetEnvZShift()*GeoModelKernelUnits::cm;
+    zShiftPos=dbManager->GetEnvZShift()*Gaudi::Units::cm;
 
     sectionBuilder->computeCellDim(m_detectorManager,
                                    TILE_REGION_EXTENDED,
@@ -456,7 +456,7 @@ void TileDetectorFactory::create(GeoPhysVol *world)
   } else
   {
     nModulesPos=nModulesNeg=dbManager->TILEnmodul();
-    zShiftPos=zShiftNeg=dbManager->TILEzshift()*GeoModelKernelUnits::cm;
+    zShiftPos=zShiftNeg=dbManager->TILEzshift()*Gaudi::Units::cm;
     // do not compute cell volumes for old setups (before DC3), 
     // because cell-size table might be missing in DB
   }
@@ -507,13 +507,13 @@ void TileDetectorFactory::create(GeoPhysVol *world)
 
     dbManager->SetCurrentSection(TileDddbManager::TILE_PLUG1);
 
-    GeoTube* itcWheel1 = new GeoTube(dbManager->TILBrminimal()*GeoModelKernelUnits::cm,
-				     dbManager->TILErmam()*GeoModelKernelUnits::cm,
-				     dbManager->TILBdzmodul()/2.*GeoModelKernelUnits::cm);
+    GeoTube* itcWheel1 = new GeoTube(dbManager->TILBrminimal()*Gaudi::Units::cm,
+				     dbManager->TILErmam()*Gaudi::Units::cm,
+				     dbManager->TILBdzmodul()/2.*Gaudi::Units::cm);
 
-    GeoTube* itcWheel2 = new GeoTube(rMinITC2*GeoModelKernelUnits::cm,rMaxITC2*GeoModelKernelUnits::cm,dzITC2/2.*GeoModelKernelUnits::cm);
-    GeoTrf::Translate3D itcWheel2OffsetPos(0.,0.,(dbManager->TILBdzmodul()-dzITC2)/2*GeoModelKernelUnits::cm);
-    GeoTrf::Translate3D itcWheel2OffsetNeg(0.,0.,(-dbManager->TILBdzmodul()+dzITC2)/2*GeoModelKernelUnits::cm);
+    GeoTube* itcWheel2 = new GeoTube(rMinITC2*Gaudi::Units::cm,rMaxITC2*Gaudi::Units::cm,dzITC2/2.*Gaudi::Units::cm);
+    GeoTrf::Translate3D itcWheel2OffsetPos(0.,0.,(dbManager->TILBdzmodul()-dzITC2)/2*Gaudi::Units::cm);
+    GeoTrf::Translate3D itcWheel2OffsetNeg(0.,0.,(-dbManager->TILBdzmodul()+dzITC2)/2*Gaudi::Units::cm);
 
     const GeoShapeUnion& itcMotherPos = itcWheel1->add(*itcWheel2<<itcWheel2OffsetPos);
     const GeoShapeUnion& itcMotherNeg = itcWheel1->add(*itcWheel2<<itcWheel2OffsetNeg);
@@ -527,10 +527,10 @@ void TileDetectorFactory::create(GeoPhysVol *world)
     // Common mother for ITC1/2 modules
 
     // -- first sub shape
-    thicknessWedgeMother = dbManager->TILBdzmodul() * GeoModelKernelUnits::cm;
-    heightWedgeMother = (dbManager->TILBrmaximal() - dbManager->TILBrminimal()) * GeoModelKernelUnits::cm;
-    dy1WedgeMother = dbManager->TILBrminimal()* tan(deltaPhi/2.*GeoModelKernelUnits::deg) * GeoModelKernelUnits::cm;
-    dy2WedgeMother = dbManager->TILBrmaximal()* tan(deltaPhi/2.*GeoModelKernelUnits::deg) * GeoModelKernelUnits::cm;
+    thicknessWedgeMother = dbManager->TILBdzmodul() * Gaudi::Units::cm;
+    heightWedgeMother = (dbManager->TILBrmaximal() - dbManager->TILBrminimal()) * Gaudi::Units::cm;
+    dy1WedgeMother = dbManager->TILBrminimal()* tan(deltaPhi/2.*Gaudi::Units::deg) * Gaudi::Units::cm;
+    dy2WedgeMother = dbManager->TILBrmaximal()* tan(deltaPhi/2.*Gaudi::Units::deg) * Gaudi::Units::cm;
 
     GeoTrd* itcModuleSub1 = new GeoTrd(thicknessWedgeMother/2.,
 				       thicknessWedgeMother/2.,
@@ -539,10 +539,10 @@ void TileDetectorFactory::create(GeoPhysVol *world)
 				       heightWedgeMother/2.);
 
     // -- second sub shape
-    thicknessWedgeMother = dzITC2 * GeoModelKernelUnits::cm;
-    heightWedgeMother = (rMaxITC2 - rMinITC2) * GeoModelKernelUnits::cm;
-    dy1WedgeMother = rMinITC2* tan(deltaPhi/2.*GeoModelKernelUnits::deg) * GeoModelKernelUnits::cm;
-    dy2WedgeMother = rMaxITC2* tan(deltaPhi/2.*GeoModelKernelUnits::deg) * GeoModelKernelUnits::cm;
+    thicknessWedgeMother = dzITC2 * Gaudi::Units::cm;
+    heightWedgeMother = (rMaxITC2 - rMinITC2) * Gaudi::Units::cm;
+    dy1WedgeMother = rMinITC2* tan(deltaPhi/2.*Gaudi::Units::deg) * Gaudi::Units::cm;
+    dy2WedgeMother = rMaxITC2* tan(deltaPhi/2.*Gaudi::Units::deg) * Gaudi::Units::cm;
 
     GeoTrd* itcModuleSub2 = new GeoTrd(thicknessWedgeMother/2.,
 				       thicknessWedgeMother/2.,
@@ -550,9 +550,9 @@ void TileDetectorFactory::create(GeoPhysVol *world)
 				       dy2WedgeMother,
 				       heightWedgeMother/2.);
 
-    GeoTrf::Translate3D itcModuleSubShift ((dbManager->TILBdzmodul()-dzITC2)/2*GeoModelKernelUnits::cm,
+    GeoTrf::Translate3D itcModuleSubShift ((dbManager->TILBdzmodul()-dzITC2)/2*Gaudi::Units::cm,
 				      0.,
-				      ((rMinITC2+rMaxITC2)-(dbManager->TILBrmaximal()+dbManager->TILBrminimal()))/2.*GeoModelKernelUnits::cm);
+				      ((rMinITC2+rMaxITC2)-(dbManager->TILBrmaximal()+dbManager->TILBrminimal()))/2.*Gaudi::Units::cm);
 
     const GeoShapeUnion& itcModuleMother = itcModuleSub1->add(*itcModuleSub2<<itcModuleSubShift);
 
@@ -565,10 +565,10 @@ void TileDetectorFactory::create(GeoPhysVol *world)
     // 2. Mother for frontplate (since it's short)
     
     //First submother
-    thicknessWedgeMother = dbManager->TILBdzmodul() * GeoModelKernelUnits::cm;
-    heightWedgeMother = (dbManager->TILBrmaximal() - dbManager->TILBrmin()) * GeoModelKernelUnits::cm;
-    dy1WedgeMother = dbManager->TILBrmin() * tan(deltaPhi/2.*GeoModelKernelUnits::deg) * GeoModelKernelUnits::cm;
-    dy2WedgeMother = dbManager->TILBrmaximal() * tan(deltaPhi/2.*GeoModelKernelUnits::deg) * GeoModelKernelUnits::cm;
+    thicknessWedgeMother = dbManager->TILBdzmodul() * Gaudi::Units::cm;
+    heightWedgeMother = (dbManager->TILBrmaximal() - dbManager->TILBrmin()) * Gaudi::Units::cm;
+    dy1WedgeMother = dbManager->TILBrmin() * tan(deltaPhi/2.*Gaudi::Units::deg) * Gaudi::Units::cm;
+    dy2WedgeMother = dbManager->TILBrmaximal() * tan(deltaPhi/2.*Gaudi::Units::deg) * Gaudi::Units::cm;
     
     dzGlue = (dbManager->TILBdzmodul() - dbManager->TILBdzend1() - dbManager->TILBdzend2() - dbManager->TILBnperiod()*2.*(dbManager->TILBdzmast() + dbManager->TILBdzspac()))/(4.*dbManager->TILBnperiod());
     
@@ -579,10 +579,10 @@ void TileDetectorFactory::create(GeoPhysVol *world)
 					heightWedgeMother/2.);
 
     //Second submother
-    thicknessWedgeMother = (dbManager->TILBdzmodul() - dzITC2) * GeoModelKernelUnits::cm;
-    heightWedgeMother = (dbManager->TILBrmin() - dbManager->TILBrminimal()) * GeoModelKernelUnits::cm;
-    dy1WedgeMother = dbManager->TILBrminimal() * tan(deltaPhi/2.*GeoModelKernelUnits::deg) * GeoModelKernelUnits::cm;
-    dy2WedgeMother = dbManager->TILBrmin() * tan(deltaPhi/2.*GeoModelKernelUnits::deg) * GeoModelKernelUnits::cm;
+    thicknessWedgeMother = (dbManager->TILBdzmodul() - dzITC2) * Gaudi::Units::cm;
+    heightWedgeMother = (dbManager->TILBrmin() - dbManager->TILBrminimal()) * Gaudi::Units::cm;
+    dy1WedgeMother = dbManager->TILBrminimal() * tan(deltaPhi/2.*Gaudi::Units::deg) * Gaudi::Units::cm;
+    dy2WedgeMother = dbManager->TILBrmin() * tan(deltaPhi/2.*Gaudi::Units::deg) * Gaudi::Units::cm;
     
     GeoTrd* plug2SubMother = new GeoTrd(thicknessWedgeMother/2.,
 					thicknessWedgeMother/2.,
@@ -590,9 +590,9 @@ void TileDetectorFactory::create(GeoPhysVol *world)
 					dy2WedgeMother,
 					heightWedgeMother/2.);
     
-    GeoTrf::Translate3D plug1SubOffset(-dzITC2*GeoModelKernelUnits::cm/2.,
+    GeoTrf::Translate3D plug1SubOffset(-dzITC2*Gaudi::Units::cm/2.,
 				  0.,
-				  (dbManager->TILBrminimal()-dbManager->TILBrmaximal())*GeoModelKernelUnits::cm/2.);
+				  (dbManager->TILBrminimal()-dbManager->TILBrmaximal())*Gaudi::Units::cm/2.);
     
     const GeoShapeUnion& plug1ModuleMother = plug1SubMother->add(*plug2SubMother<<plug1SubOffset);
     GeoLogVol* lvPlug1ModuleMother = new GeoLogVol("Plug1Module",&plug1ModuleMother,matAir);
@@ -608,7 +608,7 @@ void TileDetectorFactory::create(GeoPhysVol *world)
     
     GeoTransform* tfPlug1ModuleMother = new GeoTransform(GeoTrf::Translate3D(0.,
 									0.,
-									(dbManager->TILBrmin()-dbManager->TILBrminimal())*GeoModelKernelUnits::cm/2.));
+									(dbManager->TILBrmin()-dbManager->TILBrminimal())*Gaudi::Units::cm/2.));
     
     pvITCModuleMother->add(tfPlug1ModuleMother);
     pvITCModuleMother->add(pvPlug1ModuleMother);
@@ -616,10 +616,10 @@ void TileDetectorFactory::create(GeoPhysVol *world)
     //Mother volume for ITC2
     dbManager->SetCurrentSection(TileDddbManager::TILE_PLUG2);
     
-    thicknessWedgeMother = dbManager->TILBdzmodul() * GeoModelKernelUnits::cm;
-    heightWedgeMother = (dbManager->TILBrmaximal() - dbManager->TILBrminimal()) * GeoModelKernelUnits::cm;
-    dy1WedgeMother = dbManager->TILBrminimal() * tan(deltaPhi/2.*GeoModelKernelUnits::deg) * GeoModelKernelUnits::cm;
-    dy2WedgeMother = dbManager->TILBrmaximal() * tan(deltaPhi/2.*GeoModelKernelUnits::deg) * GeoModelKernelUnits::cm;
+    thicknessWedgeMother = dbManager->TILBdzmodul() * Gaudi::Units::cm;
+    heightWedgeMother = (dbManager->TILBrmaximal() - dbManager->TILBrminimal()) * Gaudi::Units::cm;
+    dy1WedgeMother = dbManager->TILBrminimal() * tan(deltaPhi/2.*Gaudi::Units::deg) * Gaudi::Units::cm;
+    dy2WedgeMother = dbManager->TILBrmaximal() * tan(deltaPhi/2.*Gaudi::Units::deg) * Gaudi::Units::cm;
 
     dzGlue = (dbManager->TILBdzmodul() - dbManager->TILBdzend1() - dbManager->TILBdzend2() - ((dbManager->TILBnperiod()-1)*2.*(dbManager->TILBdzmast() + dbManager->TILBdzspac()) + dbManager->TILBdzspac()))/(4.*(dbManager->TILBnperiod() - 1));
     
@@ -648,8 +648,8 @@ void TileDetectorFactory::create(GeoPhysVol *world)
     pvITCModuleMother->add(pvPlug2ModuleMother);
 
     // --- Position N modules inside mother (positive/negative) -----
-    TRANSFUNCTION xfITCModuleMotherPos = Pow(GeoTrf::RotateZ3D(1.0),phiInd)*GeoTrf::TranslateX3D((dbManager->TILBrmaximal()+dbManager->TILBrminimal())/2.*GeoModelKernelUnits::cm)*GeoTrf::RotateX3D(180*GeoModelKernelUnits::deg)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg);
-    TRANSFUNCTION xfITCModuleMotherNeg = Pow(GeoTrf::RotateZ3D(1.0),phiInd)*GeoTrf::TranslateX3D((dbManager->TILBrmaximal()+dbManager->TILBrminimal())/2.*GeoModelKernelUnits::cm)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg);
+    TRANSFUNCTION xfITCModuleMotherPos = Pow(GeoTrf::RotateZ3D(1.0),phiInd)*GeoTrf::TranslateX3D((dbManager->TILBrmaximal()+dbManager->TILBrminimal())/2.*Gaudi::Units::cm)*GeoTrf::RotateX3D(180*Gaudi::Units::deg)*GeoTrf::RotateY3D(90*Gaudi::Units::deg);
+    TRANSFUNCTION xfITCModuleMotherNeg = Pow(GeoTrf::RotateZ3D(1.0),phiInd)*GeoTrf::TranslateX3D((dbManager->TILBrmaximal()+dbManager->TILBrminimal())/2.*Gaudi::Units::cm)*GeoTrf::RotateY3D(90*Gaudi::Units::deg);
 
     GeoSerialTransformer* stITCModuleMotherPos = new GeoSerialTransformer(pvITCModuleMother,
 									  &xfITCModuleMotherPos,
@@ -664,14 +664,14 @@ void TileDetectorFactory::create(GeoPhysVol *world)
     pvITCMotherNeg->add(stITCModuleMotherNeg);
     
     
-    GeoTransform* tfITCMotherPos = new GeoTransform(GeoTrf::TranslateZ3D((dbManager->TILBzoffset()+dbManager->TILEzshift())*GeoModelKernelUnits::cm));
+    GeoTransform* tfITCMotherPos = new GeoTransform(GeoTrf::TranslateZ3D((dbManager->TILBzoffset()+dbManager->TILEzshift())*Gaudi::Units::cm));
     GeoNameTag* ntITCMotherPos = new GeoNameTag("TileITCPos");
     pvTileEnvelopePosEndcap->add(tfITCMotherPos);
     pvTileEnvelopePosEndcap->add(ntITCMotherPos);
     pvTileEnvelopePosEndcap->add(pvITCMotherPos);
 
     
-    GeoTransform* tfITCMotherNeg = new GeoTransform(GeoTrf::TranslateZ3D((-dbManager->TILBzoffset()-dbManager->TILEzshift())*GeoModelKernelUnits::cm));
+    GeoTransform* tfITCMotherNeg = new GeoTransform(GeoTrf::TranslateZ3D((-dbManager->TILBzoffset()-dbManager->TILEzshift())*Gaudi::Units::cm));
     GeoNameTag* ntITCMotherNeg = new GeoNameTag("TileITCNeg");
     pvTileEnvelopeNegEndcap->add(tfITCMotherNeg);
     pvTileEnvelopeNegEndcap->add(ntITCMotherNeg);
@@ -682,19 +682,19 @@ void TileDetectorFactory::create(GeoPhysVol *world)
 
   if(dbManager->SetCurrentSection(TileDddbManager::TILE_PLUG3))
   {
-    GeoTube* gapMother = new GeoTube(dbManager->TILBrminimal()*GeoModelKernelUnits::cm,
-				     dbManager->TILBrmaximal()*GeoModelKernelUnits::cm/cos(deltaPhi/2.*GeoModelKernelUnits::deg),
-				     dbManager->TILBdzmodul()/2.*GeoModelKernelUnits::cm);
+    GeoTube* gapMother = new GeoTube(dbManager->TILBrminimal()*Gaudi::Units::cm,
+				     dbManager->TILBrmaximal()*Gaudi::Units::cm/cos(deltaPhi/2.*Gaudi::Units::deg),
+				     dbManager->TILBdzmodul()/2.*Gaudi::Units::cm);
 
     GeoLogVol* lvGapMother = new GeoLogVol("Gap",gapMother,matAir);
     GeoFullPhysVol* pvGapMotherPos = new GeoFullPhysVol(lvGapMother);
     GeoFullPhysVol* pvGapMotherNeg = new GeoFullPhysVol(lvGapMother);
 
     // Trd - module mother
-    thicknessWedgeMother = dbManager->TILBdzmodul() * GeoModelKernelUnits::cm;
-    heightWedgeMother = (dbManager->TILBrmaximal() - dbManager->TILBrminimal()) * GeoModelKernelUnits::cm;
-    dy1WedgeMother = dbManager->TILBrminimal() * tan(deltaPhi/2.*GeoModelKernelUnits::deg) * GeoModelKernelUnits::cm;
-    dy2WedgeMother = dbManager->TILBrmaximal() * tan(deltaPhi/2.*GeoModelKernelUnits::deg) * GeoModelKernelUnits::cm;
+    thicknessWedgeMother = dbManager->TILBdzmodul() * Gaudi::Units::cm;
+    heightWedgeMother = (dbManager->TILBrmaximal() - dbManager->TILBrminimal()) * Gaudi::Units::cm;
+    dy1WedgeMother = dbManager->TILBrminimal() * tan(deltaPhi/2.*Gaudi::Units::deg) * Gaudi::Units::cm;
+    dy2WedgeMother = dbManager->TILBrmaximal() * tan(deltaPhi/2.*Gaudi::Units::deg) * Gaudi::Units::cm;
 
     dzGlue = 0.;
 
@@ -716,8 +716,8 @@ void TileDetectorFactory::create(GeoPhysVol *world)
     				deltaPhi);
 
     // --- Position N modules inside mother (positive/negative) -----
-    TRANSFUNCTION xfGapModuleMotherPos = Pow(GeoTrf::RotateZ3D(1.0),phiInd)*GeoTrf::TranslateX3D((dbManager->TILBrmaximal()+dbManager->TILBrminimal())/2.*GeoModelKernelUnits::cm)*GeoTrf::RotateX3D(180*GeoModelKernelUnits::deg)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg);
-    TRANSFUNCTION xfGapModuleMotherNeg = Pow(GeoTrf::RotateZ3D(1.0),phiInd)*GeoTrf::TranslateX3D((dbManager->TILBrmaximal()+dbManager->TILBrminimal())/2.*GeoModelKernelUnits::cm)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg);
+    TRANSFUNCTION xfGapModuleMotherPos = Pow(GeoTrf::RotateZ3D(1.0),phiInd)*GeoTrf::TranslateX3D((dbManager->TILBrmaximal()+dbManager->TILBrminimal())/2.*Gaudi::Units::cm)*GeoTrf::RotateX3D(180*Gaudi::Units::deg)*GeoTrf::RotateY3D(90*Gaudi::Units::deg);
+    TRANSFUNCTION xfGapModuleMotherNeg = Pow(GeoTrf::RotateZ3D(1.0),phiInd)*GeoTrf::TranslateX3D((dbManager->TILBrmaximal()+dbManager->TILBrminimal())/2.*Gaudi::Units::cm)*GeoTrf::RotateY3D(90*Gaudi::Units::deg);
     
     GeoSerialTransformer* stGapModuleMotherPos = new GeoSerialTransformer(pvGapModuleMother,
 									  &xfGapModuleMotherPos,
@@ -732,14 +732,14 @@ void TileDetectorFactory::create(GeoPhysVol *world)
     pvGapMotherNeg->add(stGapModuleMotherNeg);
 
     
-    GeoTransform* tfGapMotherPos = new GeoTransform(GeoTrf::TranslateZ3D((dbManager->TILBzoffset()+dbManager->TILEzshift())*GeoModelKernelUnits::cm));
+    GeoTransform* tfGapMotherPos = new GeoTransform(GeoTrf::TranslateZ3D((dbManager->TILBzoffset()+dbManager->TILEzshift())*Gaudi::Units::cm));
     GeoNameTag* ntGapMotherPos = new GeoNameTag("TileGapPos");
     pvTileEnvelopePosEndcap->add(tfGapMotherPos);
     pvTileEnvelopePosEndcap->add(ntGapMotherPos);
     pvTileEnvelopePosEndcap->add(pvGapMotherPos);
     
     
-    GeoTransform* tfGapMotherNeg = new GeoTransform(GeoTrf::TranslateZ3D((-dbManager->TILBzoffset()-dbManager->TILEzshift())*GeoModelKernelUnits::cm));
+    GeoTransform* tfGapMotherNeg = new GeoTransform(GeoTrf::TranslateZ3D((-dbManager->TILBzoffset()-dbManager->TILEzshift())*Gaudi::Units::cm));
     GeoNameTag* ntGapMotherNeg = new GeoNameTag("TileGapNeg");
     pvTileEnvelopeNegEndcap->add(tfGapMotherNeg);
     pvTileEnvelopeNegEndcap->add(ntGapMotherNeg);
@@ -750,10 +750,10 @@ void TileDetectorFactory::create(GeoPhysVol *world)
   {
     dbManager->SetCurrentEnvByType(4);
     nModulesNeg=dbManager->GetEnvNModules();
-    zShiftNeg=dbManager->GetEnvZShift()*GeoModelKernelUnits::cm;
+    zShiftNeg=dbManager->GetEnvZShift()*Gaudi::Units::cm;
     dbManager->SetCurrentEnvByType(5);
     nModulesPos=dbManager->GetEnvNModules();
-    zShiftPos=dbManager->GetEnvZShift()*GeoModelKernelUnits::cm;
+    zShiftPos=dbManager->GetEnvZShift()*Gaudi::Units::cm;
 
     sectionBuilder->computeCellDim(m_detectorManager,
                                    TILE_REGION_GAP,
@@ -763,7 +763,7 @@ void TileDetectorFactory::create(GeoPhysVol *world)
   } else
   {
     nModulesPos=nModulesNeg=dbManager->TILEnmodul();
-    zShiftPos=zShiftNeg=dbManager->TILEzshift()*GeoModelKernelUnits::cm;
+    zShiftPos=zShiftNeg=dbManager->TILEzshift()*Gaudi::Units::cm;
     // do not compute cell volumes for old setups (before DC3), 
     // because cell-size table might be missing in DB
   }
@@ -807,19 +807,19 @@ void TileDetectorFactory::create(GeoPhysVol *world)
   
   if(dbManager->SetCurrentSection(TileDddbManager::TILE_PLUG4))
   {
-    GeoTube* crackMother = new GeoTube(dbManager->TILBrminimal()*GeoModelKernelUnits::cm,
-				       dbManager->TILBrmaximal()*GeoModelKernelUnits::cm/cos(deltaPhi/2.*GeoModelKernelUnits::deg),
-				       dbManager->TILBdzmodul()/2.*GeoModelKernelUnits::cm);
+    GeoTube* crackMother = new GeoTube(dbManager->TILBrminimal()*Gaudi::Units::cm,
+				       dbManager->TILBrmaximal()*Gaudi::Units::cm/cos(deltaPhi/2.*Gaudi::Units::deg),
+				       dbManager->TILBdzmodul()/2.*Gaudi::Units::cm);
     
     GeoLogVol* lvCrackMother = new GeoLogVol("Crack",crackMother,matAir);
     GeoFullPhysVol* pvCrackMotherPos = new GeoFullPhysVol(lvCrackMother);
     GeoFullPhysVol* pvCrackMotherNeg = new GeoFullPhysVol(lvCrackMother);
     
     // Trd - module mother
-    thicknessWedgeMother = dbManager->TILBdzmodul() * GeoModelKernelUnits::cm;
-    heightWedgeMother = (dbManager->TILBrmaximal() - dbManager->TILBrminimal()) * GeoModelKernelUnits::cm;
-    dy1WedgeMother = dbManager->TILBrminimal() * tan(deltaPhi/2.*GeoModelKernelUnits::deg) * GeoModelKernelUnits::cm;
-    dy2WedgeMother = dbManager->TILBrmaximal() * tan(deltaPhi/2.*GeoModelKernelUnits::deg) * GeoModelKernelUnits::cm;
+    thicknessWedgeMother = dbManager->TILBdzmodul() * Gaudi::Units::cm;
+    heightWedgeMother = (dbManager->TILBrmaximal() - dbManager->TILBrminimal()) * Gaudi::Units::cm;
+    dy1WedgeMother = dbManager->TILBrminimal() * tan(deltaPhi/2.*Gaudi::Units::deg) * Gaudi::Units::cm;
+    dy2WedgeMother = dbManager->TILBrmaximal() * tan(deltaPhi/2.*Gaudi::Units::deg) * Gaudi::Units::cm;
     
     dzGlue = 0.;
     
@@ -841,8 +841,8 @@ void TileDetectorFactory::create(GeoPhysVol *world)
     				deltaPhi);
     
     // --- Position N modules inside mother (positive/negative) -----
-    TRANSFUNCTION xfCrackModuleMotherPos = Pow(GeoTrf::RotateZ3D(1.0),phiInd)*GeoTrf::TranslateX3D((dbManager->TILBrmaximal()+dbManager->TILBrminimal())/2.*GeoModelKernelUnits::cm)*GeoTrf::RotateX3D(180*GeoModelKernelUnits::deg)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg);
-    TRANSFUNCTION xfCrackModuleMotherNeg = Pow(GeoTrf::RotateZ3D(1.0),phiInd)*GeoTrf::TranslateX3D((dbManager->TILBrmaximal()+dbManager->TILBrminimal())/2.*GeoModelKernelUnits::cm)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg);
+    TRANSFUNCTION xfCrackModuleMotherPos = Pow(GeoTrf::RotateZ3D(1.0),phiInd)*GeoTrf::TranslateX3D((dbManager->TILBrmaximal()+dbManager->TILBrminimal())/2.*Gaudi::Units::cm)*GeoTrf::RotateX3D(180*Gaudi::Units::deg)*GeoTrf::RotateY3D(90*Gaudi::Units::deg);
+    TRANSFUNCTION xfCrackModuleMotherNeg = Pow(GeoTrf::RotateZ3D(1.0),phiInd)*GeoTrf::TranslateX3D((dbManager->TILBrmaximal()+dbManager->TILBrminimal())/2.*Gaudi::Units::cm)*GeoTrf::RotateY3D(90*Gaudi::Units::deg);
     
     GeoSerialTransformer* stCrackModuleMotherPos = new GeoSerialTransformer(pvCrackModuleMother,
 									    &xfCrackModuleMotherPos,
@@ -857,14 +857,14 @@ void TileDetectorFactory::create(GeoPhysVol *world)
     pvCrackMotherNeg->add(stCrackModuleMotherNeg);
     
     
-    GeoTransform* tfCrackMotherPos = new GeoTransform(GeoTrf::TranslateZ3D((dbManager->TILBzoffset()+dbManager->TILEzshift())*GeoModelKernelUnits::cm));
+    GeoTransform* tfCrackMotherPos = new GeoTransform(GeoTrf::TranslateZ3D((dbManager->TILBzoffset()+dbManager->TILEzshift())*Gaudi::Units::cm));
     GeoNameTag* ntCrackMotherPos = new GeoNameTag("TileCrackPos");
     pvTileEnvelopePosEndcap->add(tfCrackMotherPos);
     pvTileEnvelopePosEndcap->add(ntCrackMotherPos);
     pvTileEnvelopePosEndcap->add(pvCrackMotherPos);
     
     
-    GeoTransform* tfCrackMotherNeg = new GeoTransform(GeoTrf::TranslateZ3D((-dbManager->TILBzoffset()-dbManager->TILEzshift())*GeoModelKernelUnits::cm));
+    GeoTransform* tfCrackMotherNeg = new GeoTransform(GeoTrf::TranslateZ3D((-dbManager->TILBzoffset()-dbManager->TILEzshift())*Gaudi::Units::cm));
     GeoNameTag* ntCrackMotherNeg = new GeoNameTag("TileCrackNeg");
     pvTileEnvelopeNegEndcap->add(tfCrackMotherNeg);
     pvTileEnvelopeNegEndcap->add(ntCrackMotherNeg);
@@ -882,9 +882,9 @@ void TileDetectorFactory::create(GeoPhysVol *world)
 
     zEndSection = dbManager->TILBzoffset() + dbManager->TILBdzmodul()/2.;
 
-    GeoTube* fingerMother = new GeoTube(dbManager->TILBrmax()*GeoModelKernelUnits::cm,
-					dbManager->TILErmam()*GeoModelKernelUnits::cm,
-					dbManager->TIFGdz()/2.*GeoModelKernelUnits::cm);
+    GeoTube* fingerMother = new GeoTube(dbManager->TILBrmax()*Gaudi::Units::cm,
+					dbManager->TILErmam()*Gaudi::Units::cm,
+					dbManager->TIFGdz()/2.*Gaudi::Units::cm);
     
     GeoLogVol* lvFingerMother = new GeoLogVol("Finger",fingerMother,matAir);
     GeoFullPhysVol* pvFingerMotherPos = new GeoFullPhysVol(lvFingerMother);
@@ -892,14 +892,14 @@ void TileDetectorFactory::create(GeoPhysVol *world)
     
     // Trd - one finger mother
     //    if(dbManager->SetCurrentSection(TileDddbManager::TILE_PLUG1))
-    //      thicknessWedgeMother = (dbManager->TILBzoffset() - dbManager->TILBdzmodul()/2. + dbManager->TILEzshift() - zEndSection) * GeoModelKernelUnits::cm;
+    //      thicknessWedgeMother = (dbManager->TILBzoffset() - dbManager->TILBdzmodul()/2. + dbManager->TILEzshift() - zEndSection) * Gaudi::Units::cm;
     //    else
-    thicknessWedgeMother = dbManager->TIFGdz()*GeoModelKernelUnits::cm;
+    thicknessWedgeMother = dbManager->TIFGdz()*Gaudi::Units::cm;
 
     dbManager->SetCurrentSection(TileDddbManager::TILE_BARREL);
-    heightWedgeMother = (dbManager->TILErmax() - dbManager->TILBrmax()) * GeoModelKernelUnits::cm;
-    dy1WedgeMother = dbManager->TILBrmax() * tan(deltaPhi/2.*GeoModelKernelUnits::deg) * GeoModelKernelUnits::cm;
-    dy2WedgeMother = dbManager->TILErmax() * tan(deltaPhi/2.*GeoModelKernelUnits::deg) * GeoModelKernelUnits::cm;
+    heightWedgeMother = (dbManager->TILErmax() - dbManager->TILBrmax()) * Gaudi::Units::cm;
+    dy1WedgeMother = dbManager->TILBrmax() * tan(deltaPhi/2.*Gaudi::Units::deg) * Gaudi::Units::cm;
+    dy2WedgeMother = dbManager->TILErmax() * tan(deltaPhi/2.*Gaudi::Units::deg) * Gaudi::Units::cm;
     
     GeoTrd* fingerModuleMother = new GeoTrd(thicknessWedgeMother/2.,
 					    thicknessWedgeMother/2.,
@@ -917,11 +917,11 @@ void TileDetectorFactory::create(GeoPhysVol *world)
 			       deltaPhi,
 			       m_testbeamGeometry,
 			       ModuleNcp,
-			       thicknessWedgeMother*(1./GeoModelKernelUnits::cm));
+			       thicknessWedgeMother*(1./Gaudi::Units::cm));
     
     // --- Position N modules inside mother (positive/negative) -----
-    TRANSFUNCTION xfFingerModuleMotherPos = Pow(GeoTrf::RotateZ3D(1.0),phiInd)*GeoTrf::TranslateX3D((dbManager->TILErmax()+dbManager->TILBrmax())/2.*GeoModelKernelUnits::cm)*GeoTrf::RotateX3D(180*GeoModelKernelUnits::deg)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg);
-    TRANSFUNCTION xfFingerModuleMotherNeg = Pow(GeoTrf::RotateZ3D(1.0),phiInd)*GeoTrf::TranslateX3D((dbManager->TILErmax()+dbManager->TILBrmax())/2.*GeoModelKernelUnits::cm)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg);
+    TRANSFUNCTION xfFingerModuleMotherPos = Pow(GeoTrf::RotateZ3D(1.0),phiInd)*GeoTrf::TranslateX3D((dbManager->TILErmax()+dbManager->TILBrmax())/2.*Gaudi::Units::cm)*GeoTrf::RotateX3D(180*Gaudi::Units::deg)*GeoTrf::RotateY3D(90*Gaudi::Units::deg);
+    TRANSFUNCTION xfFingerModuleMotherNeg = Pow(GeoTrf::RotateZ3D(1.0),phiInd)*GeoTrf::TranslateX3D((dbManager->TILErmax()+dbManager->TILBrmax())/2.*Gaudi::Units::cm)*GeoTrf::RotateY3D(90*Gaudi::Units::deg);
 
     GeoSerialTransformer* stFingerModuleMotherPos = new GeoSerialTransformer(pvFingerModuleMother,
 									     &xfFingerModuleMotherPos,
@@ -937,14 +937,14 @@ void TileDetectorFactory::create(GeoPhysVol *world)
     pvFingerMotherNeg->add(stFingerModuleMotherNeg);
     
     
-    GeoTransform* tfFingerMotherPos = new GeoTransform(GeoTrf::TranslateZ3D((zEndSection+dbManager->TIFGdz()/2.)*GeoModelKernelUnits::cm));
+    GeoTransform* tfFingerMotherPos = new GeoTransform(GeoTrf::TranslateZ3D((zEndSection+dbManager->TIFGdz()/2.)*Gaudi::Units::cm));
     GeoNameTag* ntFingerMotherPos = new GeoNameTag("TileFingerPos");
     pvTileEnvelopeBarrel->add(tfFingerMotherPos);
     pvTileEnvelopeBarrel->add(ntFingerMotherPos);
     pvTileEnvelopeBarrel->add(pvFingerMotherPos);
 
     
-    GeoTransform* tfFingerMotherNeg = new GeoTransform(GeoTrf::TranslateZ3D((-zEndSection-dbManager->TIFGdz()/2.)*GeoModelKernelUnits::cm));
+    GeoTransform* tfFingerMotherNeg = new GeoTransform(GeoTrf::TranslateZ3D((-zEndSection-dbManager->TIFGdz()/2.)*Gaudi::Units::cm));
     GeoNameTag* ntFingerMotherNeg = new GeoNameTag("TileFingerNeg");
     pvTileEnvelopeBarrel->add(tfFingerMotherNeg);
     pvTileEnvelopeBarrel->add(ntFingerMotherNeg);
@@ -960,19 +960,19 @@ void TileDetectorFactory::create(GeoPhysVol *world)
 
     zEndSection = dbManager->TILBzoffset() + dbManager->TILBdzmodul()/2. + dbManager->TILEzshift();
 
-    GeoTube* efingerMother = new GeoTube(dbManager->TILBrmax()*GeoModelKernelUnits::cm,
-					 dbManager->TILErmam()*GeoModelKernelUnits::cm,
-					 dbManager->TIFGdz()/2.*GeoModelKernelUnits::cm);
+    GeoTube* efingerMother = new GeoTube(dbManager->TILBrmax()*Gaudi::Units::cm,
+					 dbManager->TILErmam()*Gaudi::Units::cm,
+					 dbManager->TIFGdz()/2.*Gaudi::Units::cm);
 
     GeoLogVol* lvEFingerMother = new GeoLogVol("EFinger",efingerMother,matAir);
     GeoFullPhysVol* pvEFingerMotherPos = new GeoFullPhysVol(lvEFingerMother);
     GeoFullPhysVol* pvEFingerMotherNeg = new GeoFullPhysVol(lvEFingerMother);
     
     // Trd - one finger mother
-    thicknessWedgeMother = dbManager->TIFGdz() * GeoModelKernelUnits::cm;
-    heightWedgeMother = (dbManager->TILErmax() - dbManager->TILBrmax()) * GeoModelKernelUnits::cm;
-    dy1WedgeMother = dbManager->TILBrmax() * tan(deltaPhi/2.*GeoModelKernelUnits::deg) * GeoModelKernelUnits::cm;
-    dy2WedgeMother = dbManager->TILErmax() * tan(deltaPhi/2.*GeoModelKernelUnits::deg) * GeoModelKernelUnits::cm;
+    thicknessWedgeMother = dbManager->TIFGdz() * Gaudi::Units::cm;
+    heightWedgeMother = (dbManager->TILErmax() - dbManager->TILBrmax()) * Gaudi::Units::cm;
+    dy1WedgeMother = dbManager->TILBrmax() * tan(deltaPhi/2.*Gaudi::Units::deg) * Gaudi::Units::cm;
+    dy2WedgeMother = dbManager->TILErmax() * tan(deltaPhi/2.*Gaudi::Units::deg) * Gaudi::Units::cm;
     
     GeoTrd* efingerModuleMother = new GeoTrd(thicknessWedgeMother/2.,
 					     thicknessWedgeMother/2.,
@@ -992,8 +992,8 @@ void TileDetectorFactory::create(GeoPhysVol *world)
 			       m_testbeamGeometry);
 
     // --- Position N modules inside mother (positive/negative) -----
-    TRANSFUNCTION xfEFingerModuleMotherPos = Pow(GeoTrf::RotateZ3D(1.0),phiInd)*GeoTrf::TranslateX3D((dbManager->TILErmax()+dbManager->TILBrmax())/2.*GeoModelKernelUnits::cm)*GeoTrf::RotateX3D(180*GeoModelKernelUnits::deg)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg);
-    TRANSFUNCTION xfEFingerModuleMotherNeg = Pow(GeoTrf::RotateZ3D(1.0),phiInd)*GeoTrf::TranslateX3D((dbManager->TILErmax()+dbManager->TILBrmax())/2.*GeoModelKernelUnits::cm)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg);
+    TRANSFUNCTION xfEFingerModuleMotherPos = Pow(GeoTrf::RotateZ3D(1.0),phiInd)*GeoTrf::TranslateX3D((dbManager->TILErmax()+dbManager->TILBrmax())/2.*Gaudi::Units::cm)*GeoTrf::RotateX3D(180*Gaudi::Units::deg)*GeoTrf::RotateY3D(90*Gaudi::Units::deg);
+    TRANSFUNCTION xfEFingerModuleMotherNeg = Pow(GeoTrf::RotateZ3D(1.0),phiInd)*GeoTrf::TranslateX3D((dbManager->TILErmax()+dbManager->TILBrmax())/2.*Gaudi::Units::cm)*GeoTrf::RotateY3D(90*Gaudi::Units::deg);
     
     GeoSerialTransformer* stEFingerModuleMotherPos = new GeoSerialTransformer(pvEFingerModuleMother,
 									      &xfEFingerModuleMotherPos,
@@ -1008,14 +1008,14 @@ void TileDetectorFactory::create(GeoPhysVol *world)
     pvEFingerMotherNeg->add(stEFingerModuleMotherNeg);
     
     
-    GeoTransform* tfEFingerMotherPos = new GeoTransform(GeoTrf::TranslateZ3D((zEndSection+dbManager->TIFGdz()/2.)*GeoModelKernelUnits::cm));
+    GeoTransform* tfEFingerMotherPos = new GeoTransform(GeoTrf::TranslateZ3D((zEndSection+dbManager->TIFGdz()/2.)*Gaudi::Units::cm));
     GeoNameTag* ntEFingerMotherPos = new GeoNameTag("TileEFingerPos");
     pvTileEnvelopePosEndcap->add(tfEFingerMotherPos);
     pvTileEnvelopePosEndcap->add(ntEFingerMotherPos);
     pvTileEnvelopePosEndcap->add(pvEFingerMotherPos);
 
     
-    GeoTransform* tfEFingerMotherNeg = new GeoTransform(GeoTrf::TranslateZ3D((-zEndSection-dbManager->TIFGdz()/2.)*GeoModelKernelUnits::cm));
+    GeoTransform* tfEFingerMotherNeg = new GeoTransform(GeoTrf::TranslateZ3D((-zEndSection-dbManager->TIFGdz()/2.)*Gaudi::Units::cm));
     GeoNameTag* ntEFingerMotherNeg = new GeoNameTag("TileEFingerNeg");
     pvTileEnvelopeNegEndcap->add(tfEFingerMotherNeg);
     pvTileEnvelopeNegEndcap->add(ntEFingerMotherNeg);
@@ -1036,7 +1036,7 @@ void TileDetectorFactory::create(GeoPhysVol *world)
       GeoTrf::Transform3D mz = GeoTrf::RotateZ3D(dbManager->GetEnvDPhi());
       GeoTrf::Transform3D my = GeoTrf::RotateY3D(dbManager->GetEnvDTheta());
       GeoTrf::Transform3D mx = GeoTrf::RotateZ3D(dbManager->GetEnvDPsi());
-      GeoTrf::Transform3D vpos = GeoTrf::Translate3D(dbManager->GetEnvDX()*GeoModelKernelUnits::cm,dbManager->GetEnvDY()*GeoModelKernelUnits::cm,dbManager->GetEnvDZ()*GeoModelKernelUnits::cm);
+      GeoTrf::Transform3D vpos = GeoTrf::Translate3D(dbManager->GetEnvDX()*Gaudi::Units::cm,dbManager->GetEnvDY()*Gaudi::Units::cm,dbManager->GetEnvDZ()*Gaudi::Units::cm);
       GeoTransform* barrelTT = new GeoTransform(GeoTrf::Transform3D(vpos*(mx*(my*(mz)))));
       world->add(barrelTT);
     }
@@ -1056,7 +1056,7 @@ void TileDetectorFactory::create(GeoPhysVol *world)
       GeoTrf::Transform3D mz = GeoTrf::RotateZ3D(dbManager->GetEnvDPhi());
       GeoTrf::Transform3D my = GeoTrf::RotateY3D(dbManager->GetEnvDTheta());
       GeoTrf::Transform3D mx = GeoTrf::RotateZ3D(dbManager->GetEnvDPsi());
-      GeoTrf::Transform3D vpos = GeoTrf::Translate3D(dbManager->GetEnvDX()*GeoModelKernelUnits::cm,dbManager->GetEnvDY()*GeoModelKernelUnits::cm,dbManager->GetEnvDZ()*GeoModelKernelUnits::cm);
+      GeoTrf::Transform3D vpos = GeoTrf::Translate3D(dbManager->GetEnvDX()*Gaudi::Units::cm,dbManager->GetEnvDY()*Gaudi::Units::cm,dbManager->GetEnvDZ()*Gaudi::Units::cm);
       GeoTransform* posEcTT = new GeoTransform(GeoTrf::Transform3D(vpos*(mx*(my*(mz)))));
       world->add(posEcTT);
     }
@@ -1076,7 +1076,7 @@ void TileDetectorFactory::create(GeoPhysVol *world)
       GeoTrf::Transform3D mz = GeoTrf::RotateZ3D(dbManager->GetEnvDPhi());
       GeoTrf::Transform3D my = GeoTrf::RotateY3D(dbManager->GetEnvDTheta());
       GeoTrf::Transform3D mx = GeoTrf::RotateZ3D(dbManager->GetEnvDPsi());
-      GeoTrf::Transform3D vpos = GeoTrf::Translate3D(dbManager->GetEnvDX()*GeoModelKernelUnits::cm,dbManager->GetEnvDY()*GeoModelKernelUnits::cm,dbManager->GetEnvDZ()*GeoModelKernelUnits::cm);
+      GeoTrf::Transform3D vpos = GeoTrf::Translate3D(dbManager->GetEnvDX()*Gaudi::Units::cm,dbManager->GetEnvDY()*Gaudi::Units::cm,dbManager->GetEnvDZ()*Gaudi::Units::cm);
       GeoTransform* negEcTT = new GeoTransform(GeoTrf::Transform3D(vpos*(mx*(my*(mz)))));
       world->add(negEcTT);
     }
diff --git a/TileCalorimeter/TileGeoModel/src/TileGeoSectionBuilder.cxx b/TileCalorimeter/TileGeoModel/src/TileGeoSectionBuilder.cxx
index d88faeba510ce1a9e43d144ce8578d85d8c969a7..623f10df95c3e5b677d01edeb3c4546ce0d54032 100755
--- a/TileCalorimeter/TileGeoModel/src/TileGeoSectionBuilder.cxx
+++ b/TileCalorimeter/TileGeoModel/src/TileGeoSectionBuilder.cxx
@@ -35,6 +35,7 @@
 #include "GeoModelKernel/GeoSerialTransformer.h"
 
 #include "GaudiKernel/MsgStream.h"
+#include "GaudiKernel/SystemOfUnits.h"
 
 #include "boost/io/ios_state.hpp"
 #include <stdexcept>
@@ -86,7 +87,7 @@ void TileGeoSectionBuilder::fillSection(GeoPhysVol*&             mother,
 {
   (*m_log) << MSG::VERBOSE <<" TileGeoSectionBuilder::fillSection ModuleNcp= "<<ModuleNcp<< endmsg;
 
-  double tan_delta_phi_2 = tan(delta_phi/2*GeoModelKernelUnits::deg);
+  double tan_delta_phi_2 = tan(delta_phi/2*Gaudi::Units::deg);
   
   // -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
   // Obtain required materials - Air and Iron
@@ -125,7 +126,7 @@ void TileGeoSectionBuilder::fillSection(GeoPhysVol*&             mother,
       volname = "CutB"; m_dbManager->SetCurrentCuts(volname); 
       PosXcut = m_dbManager->CutsXpos(); 
       PosYcut = m_dbManager->CutsYpos();
-      Rmore   = 0.8*GeoModelKernelUnits::cm;
+      Rmore   = 0.8*Gaudi::Units::cm;
 
       // Inert materials, CutB1
       dX1 = m_dbManager->CutsDX1()+Rmore; 
@@ -167,42 +168,42 @@ void TileGeoSectionBuilder::fillSection(GeoPhysVol*&             mother,
       const GeoShapeUnion& CutA1 = Cut1up->add(*Cut1down<<yPosA);
       CutA = &CutA1;
       
-      Radius = (m_dbManager->TILBrmaximal() + m_dbManager->TILBrminimal())/2 * GeoModelKernelUnits::cm; 
+      Radius = (m_dbManager->TILBrmaximal() + m_dbManager->TILBrminimal())/2 * Gaudi::Units::cm; 
 
-      if (ModuleNcp==35||ModuleNcp==62) { YcorA = 5*GeoModelKernelUnits::cm;   YcorB = 5*GeoModelKernelUnits::cm; lenPla =0.8*GeoModelKernelUnits::cm, Blia = 17.4*GeoModelKernelUnits::cm;}  
-      if (ModuleNcp==36||ModuleNcp==61) { YcorA = 6.5*GeoModelKernelUnits::cm; YcorB = 6*GeoModelKernelUnits::cm; lenPla =1.7*GeoModelKernelUnits::cm; Blia = 16.9*GeoModelKernelUnits::cm;} 
-      if (ModuleNcp==37||ModuleNcp==60) { YcorA = 8*GeoModelKernelUnits::cm;   YcorB = 9*GeoModelKernelUnits::cm; lenPla =2.8*GeoModelKernelUnits::cm; Blia = 16.4*GeoModelKernelUnits::cm;} 
+      if (ModuleNcp==35||ModuleNcp==62) { YcorA = 5*Gaudi::Units::cm;   YcorB = 5*Gaudi::Units::cm; lenPla =0.8*Gaudi::Units::cm, Blia = 17.4*Gaudi::Units::cm;}  
+      if (ModuleNcp==36||ModuleNcp==61) { YcorA = 6.5*Gaudi::Units::cm; YcorB = 6*Gaudi::Units::cm; lenPla =1.7*Gaudi::Units::cm; Blia = 16.9*Gaudi::Units::cm;} 
+      if (ModuleNcp==37||ModuleNcp==60) { YcorA = 8*Gaudi::Units::cm;   YcorB = 9*Gaudi::Units::cm; lenPla =2.8*Gaudi::Units::cm; Blia = 16.4*Gaudi::Units::cm;} 
 
       TransCut2 = GeoTrf::TranslateZ3D(-Radius) 
-	* GeoTrf::RotateX3D((90-phi)*GeoModelKernelUnits::deg) * GeoTrf::RotateY3D(180*GeoModelKernelUnits::deg) 
-	* GeoTrf::Translate3D(0.1*GeoModelKernelUnits::cm,SideFl*17.5*GeoModelKernelUnits::cm,-PosY+YcorA); 
+	* GeoTrf::RotateX3D((90-phi)*Gaudi::Units::deg) * GeoTrf::RotateY3D(180*Gaudi::Units::deg) 
+	* GeoTrf::Translate3D(0.1*Gaudi::Units::cm,SideFl*17.5*Gaudi::Units::cm,-PosY+YcorA); 
 
       // For modules on the side C apply extra transformation
       // which implements ReflectZ(0)
       if(neg) {
 	GeoTrf::Vector3D ptTmp = TransCut2*GeoTrf::Vector3D(0.,0.,0.);
-	TransCut2 = GeoTrf::TranslateX3D(2*ptTmp.x())*GeoTrf::RotateZ3D(180*GeoModelKernelUnits::deg)*TransCut2;
+	TransCut2 = GeoTrf::TranslateX3D(2*ptTmp.x())*GeoTrf::RotateZ3D(180*Gaudi::Units::deg)*TransCut2;
       }
 
       if (ModuleNcp>=60 && ModuleNcp<=62) {   
 	TransCutL = GeoTrf::TranslateZ3D(-Radius) 
-	  * GeoTrf::RotateY3D(180*GeoModelKernelUnits::deg) * GeoTrf::RotateX3D(phi*GeoModelKernelUnits::deg) 
-	  * GeoTrf::Translate3D(-1.4*GeoModelKernelUnits::cm,PosYcut+YcorB,-PosXcut-Blia); 
+	  * GeoTrf::RotateY3D(180*Gaudi::Units::deg) * GeoTrf::RotateX3D(phi*Gaudi::Units::deg) 
+	  * GeoTrf::Translate3D(-1.4*Gaudi::Units::cm,PosYcut+YcorB,-PosXcut-Blia); 
 
 	// ReflectZ for C side
 	if(neg) {
 	  GeoTrf::Vector3D ptTmp = TransCutL*GeoTrf::Vector3D(0.,0.,0.);
-	  TransCutL = GeoTrf::TranslateX3D(2*ptTmp.x())*GeoTrf::RotateZ3D(180*GeoModelKernelUnits::deg)*TransCutL;
+	  TransCutL = GeoTrf::TranslateX3D(2*ptTmp.x())*GeoTrf::RotateZ3D(180*Gaudi::Units::deg)*TransCutL;
 	}
       } else if (ModuleNcp>=35 && ModuleNcp<=37)  { 
 	TransCutR = GeoTrf::TranslateZ3D(-Radius) 
-	  * GeoTrf::RotateY3D(180*GeoModelKernelUnits::deg) * GeoTrf::RotateX3D(phi*GeoModelKernelUnits::deg) 
-	  * GeoTrf::Translate3D(-1.4*GeoModelKernelUnits::cm,PosYcut+YcorB,PosXcut+Blia)  
-	  * GeoTrf::RotateY3D(180*GeoModelKernelUnits::deg); 
+	  * GeoTrf::RotateY3D(180*Gaudi::Units::deg) * GeoTrf::RotateX3D(phi*Gaudi::Units::deg) 
+	  * GeoTrf::Translate3D(-1.4*Gaudi::Units::cm,PosYcut+YcorB,PosXcut+Blia)  
+	  * GeoTrf::RotateY3D(180*Gaudi::Units::deg); 
 	// ReflectZ for C side
 	if(neg) {
 	  GeoTrf::Vector3D ptTmp = TransCutR*GeoTrf::Vector3D(0.,0.,0.);
-	  TransCutR = GeoTrf::TranslateX3D(2*ptTmp.x())*GeoTrf::RotateZ3D(180*GeoModelKernelUnits::deg)*TransCutR;
+	  TransCutR = GeoTrf::TranslateX3D(2*ptTmp.x())*GeoTrf::RotateZ3D(180*Gaudi::Units::deg)*TransCutR;
 	}
       }
       
@@ -219,21 +220,21 @@ void TileGeoSectionBuilder::fillSection(GeoPhysVol*&             mother,
   if (m_dbManager->TILBngirder() > 0)
   {
     // Mother volume for girder
-    thicknessGirderMother = (m_dbManager->TILBdzmodul() - m_dbManager->TILBdzend() - m_dbManager->TILBdzend2())*GeoModelKernelUnits::cm;
+    thicknessGirderMother = (m_dbManager->TILBdzmodul() - m_dbManager->TILBdzend() - m_dbManager->TILBdzend2())*Gaudi::Units::cm;
     // special module with special girder
     if ((Id4 == 7) && (sec_number == 3))
-      thicknessGirderMother = (m_dbManager->TILBdzgir() - m_dbManager->TILBdzend() - m_dbManager->TILBdzend2())*GeoModelKernelUnits::cm;
+      thicknessGirderMother = (m_dbManager->TILBdzgir() - m_dbManager->TILBdzend() - m_dbManager->TILBdzend2())*Gaudi::Units::cm;
 
-    double heightGirderMother = (tile_rmax - m_dbManager->TILBrmax())*GeoModelKernelUnits::cm;
-    double dy1GirderMother = m_dbManager->TILBrmax() * tan_delta_phi_2 * GeoModelKernelUnits::cm;
-    double dy2GirderMother = tile_rmax * tan_delta_phi_2 * GeoModelKernelUnits::cm;
+    double heightGirderMother = (tile_rmax - m_dbManager->TILBrmax())*Gaudi::Units::cm;
+    double dy1GirderMother = m_dbManager->TILBrmax() * tan_delta_phi_2 * Gaudi::Units::cm;
+    double dy2GirderMother = tile_rmax * tan_delta_phi_2 * Gaudi::Units::cm;
     // ps test the TILB DZGIR
     //     std::cout <<"\t\t PS Girder Module = "<<ModuleNcp<< std::endl;
     //     std::cout <<"\t\t PS thicknessGirderMother = "<<thicknessGirderMother<< std::endl;
     //ps account for special ITC modules 14,15,18,19
     if  ((Id4 == 7) && (sec_number == 3))
       {
-	specialModuleZShift = 0.5*GeoModelKernelUnits::cm*(m_dbManager->TILBdzgir() - m_dbManager->TILBdzmodul());
+	specialModuleZShift = 0.5*Gaudi::Units::cm*(m_dbManager->TILBdzgir() - m_dbManager->TILBdzmodul());
       }
     //
     checking("GirderMother", false, 3, 
@@ -252,16 +253,16 @@ void TileGeoSectionBuilder::fillSection(GeoPhysVol*&             mother,
                tile_rmax,
                m_dbManager->TILBrmax(),
                tan_delta_phi_2,
-               thicknessGirderMother*(1./GeoModelKernelUnits::cm));
+               thicknessGirderMother*(1./Gaudi::Units::cm));
 
     GeoTransform* tfGirderMother = 0;
 
     if(sec_number==3)
-      tfGirderMother = new GeoTransform(GeoTrf::Translate3D((m_dbManager->TILBdzend()-m_dbManager->TILBdzend2())*GeoModelKernelUnits::cm/2, 0.,
-						       (m_dbManager->TILBrmax()-m_dbManager->TILBrmin())*GeoModelKernelUnits::cm/2));
+      tfGirderMother = new GeoTransform(GeoTrf::Translate3D((m_dbManager->TILBdzend()-m_dbManager->TILBdzend2())*Gaudi::Units::cm/2, 0.,
+						       (m_dbManager->TILBrmax()-m_dbManager->TILBrmin())*Gaudi::Units::cm/2));
     else
-      tfGirderMother = new GeoTransform(GeoTrf::Translate3D((m_dbManager->TILBdzend()-m_dbManager->TILBdzend2())*GeoModelKernelUnits::cm/2, 0.,
-						       (m_dbManager->TILBrmax()-rminb)*GeoModelKernelUnits::cm/2));
+      tfGirderMother = new GeoTransform(GeoTrf::Translate3D((m_dbManager->TILBdzend()-m_dbManager->TILBdzend2())*Gaudi::Units::cm/2, 0.,
+						       (m_dbManager->TILBrmax()-rminb)*Gaudi::Units::cm/2));
 
     mother->add(tfGirderMother);
     mother->add(pvGirderMother); 
@@ -281,13 +282,13 @@ void TileGeoSectionBuilder::fillSection(GeoPhysVol*&             mother,
     if(sec_number==3)
     {
       //ITC coverplate
-      thicknessFrontPlate = (m_dbManager->TILBdzmodul() - zlen_itc2)*GeoModelKernelUnits::cm;
+      thicknessFrontPlate = (m_dbManager->TILBdzmodul() - zlen_itc2)*Gaudi::Units::cm;
 
       if (thicknessFrontPlate > rless)
        {
-         heightFrontPlate = m_dbManager->TILBdrfront()*GeoModelKernelUnits::cm;
-         dy1FrontPlate = (rminb*tan_delta_phi_2 - m_dbManager->TILBphigap()/2)*GeoModelKernelUnits::cm;
-         dy2FrontPlate = (m_dbManager->TILBrmin()*tan_delta_phi_2 - m_dbManager->TILBphigap()/2)*GeoModelKernelUnits::cm;
+         heightFrontPlate = m_dbManager->TILBdrfront()*Gaudi::Units::cm;
+         dy1FrontPlate = (rminb*tan_delta_phi_2 - m_dbManager->TILBphigap()/2)*Gaudi::Units::cm;
+         dy2FrontPlate = (m_dbManager->TILBrmin()*tan_delta_phi_2 - m_dbManager->TILBphigap()/2)*Gaudi::Units::cm;
 
 	 if(m_log->level()<=MSG::DEBUG)
 	   (*m_log) << MSG::DEBUG <<"   FrontPlateSh dX1,dX2= "<<thicknessFrontPlate/2<<", "<<thicknessFrontPlate/2
@@ -303,8 +304,8 @@ void TileGeoSectionBuilder::fillSection(GeoPhysVol*&             mother,
          GeoLogVol* lvFrontPlateSh = new GeoLogVol("FrontPlateSh",frontPlateSh,matIron);
          GeoPhysVol* pvFrontPlateSh = new GeoPhysVol(lvFrontPlateSh);
          GeoTransform* tfFrontPlateSh = new GeoTransform(GeoTrf::Translate3D(
-                    -m_dbManager->TILBdzmodul()/2*GeoModelKernelUnits::cm+thicknessFrontPlate/2, 0., 
-                    (rminb - tile_rmax)/2*GeoModelKernelUnits::cm)); 
+                    -m_dbManager->TILBdzmodul()/2*Gaudi::Units::cm+thicknessFrontPlate/2, 0., 
+                    (rminb - tile_rmax)/2*Gaudi::Units::cm)); 
 
          mother->add(tfFrontPlateSh);
          mother->add(pvFrontPlateSh);
@@ -327,10 +328,10 @@ void TileGeoSectionBuilder::fillSection(GeoPhysVol*&             mother,
       volname = "CutB"; m_dbManager->SetCurrentCuts(volname); 
       dXCutB = m_dbManager->CutsDX1(); 
       
-      thicknessFrontPlate = (m_dbManager->TILBdzmodul() - m_dbManager->TILBdzend1() - m_dbManager->TILBdzend2())*GeoModelKernelUnits::cm;
-      heightFrontPlate = m_dbManager->TILBdrfront()*GeoModelKernelUnits::cm;
-      dy1FrontPlate = (rminb*tan_delta_phi_2 - m_dbManager->TILBphigap()/2)*GeoModelKernelUnits::cm;
-      dy2FrontPlate = (m_dbManager->TILBrmin()*tan_delta_phi_2 - m_dbManager->TILBphigap()/2)*GeoModelKernelUnits::cm;
+      thicknessFrontPlate = (m_dbManager->TILBdzmodul() - m_dbManager->TILBdzend1() - m_dbManager->TILBdzend2())*Gaudi::Units::cm;
+      heightFrontPlate = m_dbManager->TILBdrfront()*Gaudi::Units::cm;
+      dy1FrontPlate = (rminb*tan_delta_phi_2 - m_dbManager->TILBphigap()/2)*Gaudi::Units::cm;
+      dy2FrontPlate = (m_dbManager->TILBrmin()*tan_delta_phi_2 - m_dbManager->TILBphigap()/2)*Gaudi::Units::cm;
 
       GeoTrd* frontPlate = new GeoTrd(thicknessFrontPlate/2 -(dXCutA+dXCutB),
 				      thicknessFrontPlate/2 -(dXCutA+dXCutB),
@@ -340,7 +341,7 @@ void TileGeoSectionBuilder::fillSection(GeoPhysVol*&             mother,
 
       // Cuting of Plate
       /*
-      GeoTrf::Transform3D  TCu2 = GeoTrf::RotateX3D((90-phi)*GeoModelKernelUnits::deg) * GeoTrf::RotateY3D(180*GeoModelKernelUnits::deg)
+      GeoTrf::Transform3D  TCu2 = GeoTrf::RotateX3D((90-phi)*Gaudi::Units::deg) * GeoTrf::RotateY3D(180*Gaudi::Units::deg)
                            * GeoTrf::Translate3D(thicknessFrontPlate/2-dXCutA,0,0); 
       GeoTransform* TCu = new GeoTransform(TCu2);
 
@@ -351,8 +352,8 @@ void TileGeoSectionBuilder::fillSection(GeoPhysVol*&             mother,
       GeoLogVol* lvFrontPlate = new GeoLogVol("FrontPlate",frontPlate,matIron); 
       GeoPhysVol* pvFrontPlate = new GeoPhysVol(lvFrontPlate); 
       GeoTransform* tfFrontPlate = new GeoTransform(GeoTrf::Translate3D(
-		    (m_dbManager->TILBdzend1() - m_dbManager->TILBdzend2())/2*GeoModelKernelUnits::cm+ dXCutB, 0.,
-                    (m_dbManager->TILBrmin()-m_dbManager->TILBdrfront()/2-(tile_rmax + rminb)/2)*GeoModelKernelUnits::cm));
+		    (m_dbManager->TILBdzend1() - m_dbManager->TILBdzend2())/2*Gaudi::Units::cm+ dXCutB, 0.,
+                    (m_dbManager->TILBrmin()-m_dbManager->TILBdrfront()/2-(tile_rmax + rminb)/2)*Gaudi::Units::cm));
 
       mother->add(tfFrontPlate);
       mother->add(pvFrontPlate);
@@ -364,10 +365,10 @@ void TileGeoSectionBuilder::fillSection(GeoPhysVol*&             mother,
     else
     {
       //Ordinary frontplate
-      thicknessFrontPlate = (m_dbManager->TILBdzmodul() - m_dbManager->TILBdzend1() - m_dbManager->TILBdzend2())*GeoModelKernelUnits::cm;
-      heightFrontPlate = m_dbManager->TILBdrfront()*GeoModelKernelUnits::cm;
-      dy1FrontPlate = (rminb*tan_delta_phi_2 - m_dbManager->TILBphigap()/2)*GeoModelKernelUnits::cm;
-      dy2FrontPlate = (m_dbManager->TILBrmin()*tan_delta_phi_2 - m_dbManager->TILBphigap()/2)*GeoModelKernelUnits::cm;
+      thicknessFrontPlate = (m_dbManager->TILBdzmodul() - m_dbManager->TILBdzend1() - m_dbManager->TILBdzend2())*Gaudi::Units::cm;
+      heightFrontPlate = m_dbManager->TILBdrfront()*Gaudi::Units::cm;
+      dy1FrontPlate = (rminb*tan_delta_phi_2 - m_dbManager->TILBphigap()/2)*Gaudi::Units::cm;
+      dy2FrontPlate = (m_dbManager->TILBrmin()*tan_delta_phi_2 - m_dbManager->TILBphigap()/2)*Gaudi::Units::cm;
 
       GeoTrd* frontPlate = new GeoTrd(thicknessFrontPlate/2,
 				      thicknessFrontPlate/2,
@@ -378,8 +379,8 @@ void TileGeoSectionBuilder::fillSection(GeoPhysVol*&             mother,
       GeoLogVol* lvFrontPlate = new GeoLogVol("FrontPlate",frontPlate,matIron); 
       GeoPhysVol* pvFrontPlate = new GeoPhysVol(lvFrontPlate);
       GeoTransform* tfFrontPlate = new GeoTransform(GeoTrf::Translate3D(
-                    (m_dbManager->TILBdzend1() - m_dbManager->TILBdzend2())/2*GeoModelKernelUnits::cm, 0.,
-                    (m_dbManager->TILBrmin()-m_dbManager->TILBdrfront()/2-(tile_rmax + rminb)/2)*GeoModelKernelUnits::cm));
+                    (m_dbManager->TILBdzend1() - m_dbManager->TILBdzend2())/2*Gaudi::Units::cm, 0.,
+                    (m_dbManager->TILBrmin()-m_dbManager->TILBdrfront()/2-(tile_rmax + rminb)/2)*Gaudi::Units::cm));
 
       mother->add(tfFrontPlate);
       mother->add(pvFrontPlate);
@@ -390,8 +391,8 @@ void TileGeoSectionBuilder::fillSection(GeoPhysVol*&             mother,
   double dy1EndPlate, dy2EndPlate, thicknessEndPlate, heightEndPlate;
 
   //VARIABLES FOR END PLATE HOLE  
-  double heightEPHole = m_dbManager->TILBflangex()*GeoModelKernelUnits::cm;
-  double dyEPHole = m_dbManager->TILBflangex()*GeoModelKernelUnits::cm/2;
+  double heightEPHole = m_dbManager->TILBflangex()*Gaudi::Units::cm;
+  double dyEPHole = m_dbManager->TILBflangex()*Gaudi::Units::cm/2;
 
   // ps . shifts for end plates in cutout regions 
   GeoTrf::Transform3D cutOutTransformation(GeoTrf::Transform3D::Identity()); 
@@ -404,10 +405,10 @@ void TileGeoSectionBuilder::fillSection(GeoPhysVol*&             mother,
     {
  
       //Short endplate
-      dy1EndPlate = rminb * tan_delta_phi_2 * GeoModelKernelUnits::cm;
-      dy2EndPlate = m_dbManager->TILBrmax() * tan_delta_phi_2 * GeoModelKernelUnits::cm;
-      thicknessEndPlate = m_dbManager->TILBdzend1() * GeoModelKernelUnits::cm;
-      heightEndPlate = (m_dbManager->TILBrmax() - rminb) * GeoModelKernelUnits::cm;
+      dy1EndPlate = rminb * tan_delta_phi_2 * Gaudi::Units::cm;
+      dy2EndPlate = m_dbManager->TILBrmax() * tan_delta_phi_2 * Gaudi::Units::cm;
+      thicknessEndPlate = m_dbManager->TILBdzend1() * Gaudi::Units::cm;
+      heightEndPlate = (m_dbManager->TILBrmax() - rminb) * Gaudi::Units::cm;
       //
       // creating standart endplate. It is the same for 
       // both standard mosules and modules with cuts
@@ -442,12 +443,12 @@ void TileGeoSectionBuilder::fillSection(GeoPhysVol*&             mother,
 
 	if ( ( ModuleNcp == 37 ) || ( ModuleNcp == 60 ) )
 	  {
-	    rotationAngle = (180.0 - 25.3125 )* GeoModelKernelUnits::deg ;  // ATLLEMS_0003 0004
-	    shiftCutPlate =  38.7 * GeoModelKernelUnits::mm;
+	    rotationAngle = (180.0 - 25.3125 )* Gaudi::Units::deg ;  // ATLLEMS_0003 0004
+	    shiftCutPlate =  38.7 * Gaudi::Units::mm;
 
 	    cutOutTransformation = 
 	      GeoTrf::Translate3D(0,0, -heightEndPlate/2.) *  
-	      GeoTrf::RotateX3D(  90 * GeoModelKernelUnits::deg ) *
+	      GeoTrf::RotateX3D(  90 * Gaudi::Units::deg ) *
 	      GeoTrf::Translate3D(0.,0., -rotationSign * (dy2EndPlate + shiftCutPlate ) ) *
 	      GeoTrf::RotateX3D( rotationSign * rotationAngle ) ;
 	    
@@ -456,12 +457,12 @@ void TileGeoSectionBuilder::fillSection(GeoPhysVol*&             mother,
 	  }
 	else if ( ( ModuleNcp == 36 ) || ( ModuleNcp == 61 ) )
 	  {
-	    rotationAngle = - ( 116.4832 - 90. )* GeoModelKernelUnits::deg ;  // ATLLEMS_0005 0006
-	    shiftCutPlate =  ( ( m_dbManager->TILBrmax() - rminb )*GeoModelKernelUnits::cm - 1448.4 * GeoModelKernelUnits::mm);
+	    rotationAngle = - ( 116.4832 - 90. )* Gaudi::Units::deg ;  // ATLLEMS_0005 0006
+	    shiftCutPlate =  ( ( m_dbManager->TILBrmax() - rminb )*Gaudi::Units::cm - 1448.4 * Gaudi::Units::mm);
 
 	    cutOutTransformation = 
 	      GeoTrf::Translate3D( 0, 0, -heightEndPlate/2. ) *  
-	      GeoTrf::Translate3D( 0, 0,  - (dy2EndPlate  - shiftCutPlate + 0.5*dy2EndPlate*(1.- std::cos(rotationAngle*GeoModelKernelUnits::rad)))  ) *  
+	      GeoTrf::Translate3D( 0, 0,  - (dy2EndPlate  - shiftCutPlate + 0.5*dy2EndPlate*(1.- std::cos(rotationAngle*Gaudi::Units::rad)))  ) *  
 	      GeoTrf::RotateX3D( rotationSign * rotationAngle ) ;
 
 	    const GeoShape & endPlateShCutted3661 = (endPlateSh->subtract( (*endPlateShCut)<< cutOutTransformation ) ) ;	    
@@ -469,8 +470,8 @@ void TileGeoSectionBuilder::fillSection(GeoPhysVol*&             mother,
 	  }
 	else if ( ( ModuleNcp == 35 ) || ( ModuleNcp == 62 ) )
 	  {
-	    rotationAngle = - ( 104.0625 - 90.0 )* GeoModelKernelUnits::deg ;  // ATLLEMS_0007 0008
-	    shiftCutPlate =  ( ( m_dbManager->TILBrmax() - rminb )*GeoModelKernelUnits::cm - 1534.6 * GeoModelKernelUnits::mm);
+	    rotationAngle = - ( 104.0625 - 90.0 )* Gaudi::Units::deg ;  // ATLLEMS_0007 0008
+	    shiftCutPlate =  ( ( m_dbManager->TILBrmax() - rminb )*Gaudi::Units::cm - 1534.6 * Gaudi::Units::mm);
 	    
 	    cutOutTransformation = 
 	      GeoTrf::Translate3D( 0, 0, -heightEndPlate/2. ) *  
@@ -503,8 +504,8 @@ void TileGeoSectionBuilder::fillSection(GeoPhysVol*&             mother,
 
       tfEndPlateSh = new GeoTransform(GeoTrf::Translate3D(
 						     specialModuleZShift + 
-						     (m_dbManager->TILBdzend1() - m_dbManager->TILBdzmodul())*GeoModelKernelUnits::cm/2, 0.,
-						     (m_dbManager->TILBrmax() - tile_rmax)*GeoModelKernelUnits::cm/2));
+						     (m_dbManager->TILBdzend1() - m_dbManager->TILBdzmodul())*Gaudi::Units::cm/2, 0.,
+						     (m_dbManager->TILBrmax() - tile_rmax)*Gaudi::Units::cm/2));
       tfEndPlateSh->ref();
       
       mother->add(tfEndPlateSh);
@@ -517,10 +518,10 @@ void TileGeoSectionBuilder::fillSection(GeoPhysVol*&             mother,
     else
     {
       //Ordinary endplate
-      dy1EndPlate = rminb * tan_delta_phi_2 * GeoModelKernelUnits::cm;
-      dy2EndPlate = tile_rmax * tan_delta_phi_2 * GeoModelKernelUnits::cm;
-      thicknessEndPlate = m_dbManager->TILBdzend1() * GeoModelKernelUnits::cm;
-      heightEndPlate = (tile_rmax-rminb)*GeoModelKernelUnits::cm; 
+      dy1EndPlate = rminb * tan_delta_phi_2 * Gaudi::Units::cm;
+      dy2EndPlate = tile_rmax * tan_delta_phi_2 * Gaudi::Units::cm;
+      thicknessEndPlate = m_dbManager->TILBdzend1() * Gaudi::Units::cm;
+      heightEndPlate = (tile_rmax-rminb)*Gaudi::Units::cm; 
 
       GeoTrd* endPlate1 = new GeoTrd(thicknessEndPlate/2,
 				     thicknessEndPlate/2,
@@ -543,13 +544,13 @@ void TileGeoSectionBuilder::fillSection(GeoPhysVol*&             mother,
 	GeoLogVol* lvEPHole1 = new GeoLogVol("EPHole1",epHole1,matAir);
 	GeoPhysVol* pvEPHole1 = new GeoPhysVol(lvEPHole1);
 	GeoTransform* tfEPHole1 = new GeoTransform(GeoTrf::Translate3D(0.,0.,
-                                      (m_dbManager->TILBflangey()-(tile_rmax + rminb)/2)*GeoModelKernelUnits::cm));
+                                      (m_dbManager->TILBflangey()-(tile_rmax + rminb)/2)*Gaudi::Units::cm));
 	pvEndPlate1->add(tfEPHole1);
 	pvEndPlate1->add(pvEPHole1);
       }
 
       GeoTransform* tfEndPlate1 = new GeoTransform(GeoTrf::Translate3D(
-                                      (m_dbManager->TILBdzend1() - m_dbManager->TILBdzmodul())*GeoModelKernelUnits::cm/2, 0., 0.));
+                                      (m_dbManager->TILBdzend1() - m_dbManager->TILBdzmodul())*Gaudi::Units::cm/2, 0., 0.));
       mother->add(tfEndPlate1);
       mother->add(pvEndPlate1);  
 
@@ -567,10 +568,10 @@ void TileGeoSectionBuilder::fillSection(GeoPhysVol*&             mother,
       double radShift =lenPla;
       double rminbT=rminb + radShift;
 
-      dy1EndPlate = rminb * tan_delta_phi_2 * GeoModelKernelUnits::cm;
-      dy2EndPlate = tile_rmax * tan_delta_phi_2 * GeoModelKernelUnits::cm;
-      thicknessEndPlate = m_dbManager->TILBdzend2() * GeoModelKernelUnits::cm;
-      heightEndPlate = (tile_rmax-rminb) * GeoModelKernelUnits::cm;
+      dy1EndPlate = rminb * tan_delta_phi_2 * Gaudi::Units::cm;
+      dy2EndPlate = tile_rmax * tan_delta_phi_2 * Gaudi::Units::cm;
+      thicknessEndPlate = m_dbManager->TILBdzend2() * Gaudi::Units::cm;
+      heightEndPlate = (tile_rmax-rminb) * Gaudi::Units::cm;
 
 
       GeoLogVol* lvEndPlate2 = 0;
@@ -581,7 +582,7 @@ void TileGeoSectionBuilder::fillSection(GeoPhysVol*&             mother,
 				     heightEndPlate/2);  
       
       tfEndPlate2 = new GeoTransform(GeoTrf::Translate3D(
-						    (-m_dbManager->TILBdzend2() + m_dbManager->TILBdzmodul())*GeoModelKernelUnits::cm/2, 0., 0.));
+						    (-m_dbManager->TILBdzend2() + m_dbManager->TILBdzmodul())*Gaudi::Units::cm/2, 0., 0.));
       tfEndPlate2->ref();
       
       if (sec_number==2 && ((ModuleNcp>=35 && ModuleNcp<=37)||(ModuleNcp>=60 && ModuleNcp<=62)) ) 
@@ -600,8 +601,8 @@ void TileGeoSectionBuilder::fillSection(GeoPhysVol*&             mother,
 	  
 	  if ( ( ModuleNcp == 37 ) || ( ModuleNcp == 60 ) )
 	    {
-	      rotationAngle = - ( 115.3125 - 90.0 )* GeoModelKernelUnits::deg ;  // ATLLEMS_0011 0012
-	      shiftCutPlate =  ( ( m_dbManager->TILBrmax() - rminb )*GeoModelKernelUnits::cm - 1364.0 * GeoModelKernelUnits::mm);
+	      rotationAngle = - ( 115.3125 - 90.0 )* Gaudi::Units::deg ;  // ATLLEMS_0011 0012
+	      shiftCutPlate =  ( ( m_dbManager->TILBrmax() - rminb )*Gaudi::Units::cm - 1364.0 * Gaudi::Units::mm);
 	      
 	      cutOutTransformation = 
 		GeoTrf::Translate3D( 0, 0, -heightEndPlate/2. ) *  
@@ -613,8 +614,8 @@ void TileGeoSectionBuilder::fillSection(GeoPhysVol*&             mother,
 	    }
 	  else if ( ( ModuleNcp == 36 ) || ( ModuleNcp == 61 ) )
 	    {
-	      rotationAngle = - ( 109.6875 - 90.0 )* GeoModelKernelUnits::deg ;  // ATLLEMS_0009 0010
-	      shiftCutPlate =  ( ( m_dbManager->TILBrmax() - rminb )*GeoModelKernelUnits::cm - 1464.0 * GeoModelKernelUnits::mm);
+	      rotationAngle = - ( 109.6875 - 90.0 )* Gaudi::Units::deg ;  // ATLLEMS_0009 0010
+	      shiftCutPlate =  ( ( m_dbManager->TILBrmax() - rminb )*Gaudi::Units::cm - 1464.0 * Gaudi::Units::mm);
 	      
 	      cutOutTransformation = 
 		GeoTrf::Translate3D( 0, 0, -heightEndPlate/2. ) *  
@@ -626,8 +627,8 @@ void TileGeoSectionBuilder::fillSection(GeoPhysVol*&             mother,
 	    }
 	  else if ( ( ModuleNcp == 35 ) || ( ModuleNcp == 62 ) )
 	    {
-	      rotationAngle = - ( 104.0625 - 90.0 )* GeoModelKernelUnits::deg ;  // ATLLEMS_0009 0010
-	      shiftCutPlate =  ( ( m_dbManager->TILBrmax() - rminb )*GeoModelKernelUnits::cm - ( 1915.0 -385.0 )* GeoModelKernelUnits::mm); // girder is subtracted (no drawing)
+	      rotationAngle = - ( 104.0625 - 90.0 )* Gaudi::Units::deg ;  // ATLLEMS_0009 0010
+	      shiftCutPlate =  ( ( m_dbManager->TILBrmax() - rminb )*Gaudi::Units::cm - ( 1915.0 -385.0 )* Gaudi::Units::mm); // girder is subtracted (no drawing)
 	      
 	      cutOutTransformation = 
 		GeoTrf::Translate3D( 0, 0, -heightEndPlate/2. ) *  
@@ -638,13 +639,13 @@ void TileGeoSectionBuilder::fillSection(GeoPhysVol*&             mother,
 	      lvEndPlate2 = new GeoLogVol("EndPlate2", &(endPlate2Cutted3562) , matIron);
 	    }
 	  
-	  //         dy1EndPlate = rminbT * tan_delta_phi_2 * GeoModelKernelUnits::cm;
-	  //         dy2EndPlate = tile_rmax * tan_delta_phi_2 * GeoModelKernelUnits::cm;
-	  //         thicknessEndPlate = m_dbManager->TILBdzend2() * GeoModelKernelUnits::cm;
-	  //         heightEndPlate = (tile_rmax - rminbT) * GeoModelKernelUnits::cm;
+	  //         dy1EndPlate = rminbT * tan_delta_phi_2 * Gaudi::Units::cm;
+	  //         dy2EndPlate = tile_rmax * tan_delta_phi_2 * Gaudi::Units::cm;
+	  //         thicknessEndPlate = m_dbManager->TILBdzend2() * Gaudi::Units::cm;
+	  //         heightEndPlate = (tile_rmax - rminbT) * Gaudi::Units::cm;
 	  
 	  //         tfEndPlate2 = new GeoTransform(GeoTrf::Translate3D(
-	  //                                       (-m_dbManager->TILBdzend2() + m_dbManager->TILBdzmodul())*GeoModelKernelUnits::cm/2, 0, radShift/2*GeoModelKernelUnits::cm));
+	  //                                       (-m_dbManager->TILBdzend2() + m_dbManager->TILBdzmodul())*Gaudi::Units::cm/2, 0, radShift/2*Gaudi::Units::cm));
 	  
 	}
       else
@@ -657,7 +658,7 @@ void TileGeoSectionBuilder::fillSection(GeoPhysVol*&             mother,
       //Position air hole
       if (m_dbManager->TILBflangex() > 0)
       {
-        dyEPHole = m_dbManager->TILBflangex()*GeoModelKernelUnits::cm/2;
+        dyEPHole = m_dbManager->TILBflangex()*Gaudi::Units::cm/2;
 
 	GeoTrd* epHole2 = new GeoTrd (thicknessEndPlate/2,
 				      thicknessEndPlate/2,
@@ -668,7 +669,7 @@ void TileGeoSectionBuilder::fillSection(GeoPhysVol*&             mother,
 	GeoLogVol* lvEPHole2 = new GeoLogVol("EPHole2",epHole2,matAir);
 	GeoPhysVol* pvEPHole2 = new GeoPhysVol(lvEPHole2);
 	GeoTransform* tfEPHole2 = new GeoTransform(GeoTrf::Translate3D(0.,0.,
-                                      (m_dbManager->TILBflangey()-(tile_rmax + rminbT)/2)*GeoModelKernelUnits::cm));
+                                      (m_dbManager->TILBflangey()-(tile_rmax + rminbT)/2)*Gaudi::Units::cm));
 	pvEndPlate2->add(tfEPHole2);
 	pvEndPlate2->add(pvEPHole2);
       }
@@ -683,10 +684,10 @@ void TileGeoSectionBuilder::fillSection(GeoPhysVol*&             mother,
   } // End Plates
 
   //---------------------------------------------------Absorber--------------------------------------------------------
-  double heightAbsorber = (m_dbManager->TILBrmax() - m_dbManager->TILBrmin())*GeoModelKernelUnits::cm;
-  double thicknessAbsorber = (m_dbManager->TILBdzmodul() - m_dbManager->TILBdzend1() - m_dbManager->TILBdzend2())*GeoModelKernelUnits::cm;
-  double dy1Absorber = (m_dbManager->TILBrmin()*tan_delta_phi_2 - m_dbManager->TILBphigap()/2)*GeoModelKernelUnits::cm;
-  double dy2Absorber = (m_dbManager->TILBrmax()*tan_delta_phi_2 - m_dbManager->TILBphigap()/2)*GeoModelKernelUnits::cm;
+  double heightAbsorber = (m_dbManager->TILBrmax() - m_dbManager->TILBrmin())*Gaudi::Units::cm;
+  double thicknessAbsorber = (m_dbManager->TILBdzmodul() - m_dbManager->TILBdzend1() - m_dbManager->TILBdzend2())*Gaudi::Units::cm;
+  double dy1Absorber = (m_dbManager->TILBrmin()*tan_delta_phi_2 - m_dbManager->TILBphigap()/2)*Gaudi::Units::cm;
+  double dy2Absorber = (m_dbManager->TILBrmax()*tan_delta_phi_2 - m_dbManager->TILBphigap()/2)*Gaudi::Units::cm;
 
   checking("Absorber", true, 3, 
       thicknessAbsorber/2,thicknessAbsorber/2,dy1Absorber,dy2Absorber,heightAbsorber/2);
@@ -707,7 +708,7 @@ void TileGeoSectionBuilder::fillSection(GeoPhysVol*&             mother,
   case 2:
     {
       //Extended barrel - consists of ordinary periods of type 1 only
-      thicknessPeriod = 2.*(m_dbManager->TILBdzmast() + m_dbManager->TILBdzspac() + 2.*dzglue)*GeoModelKernelUnits::cm;
+      thicknessPeriod = 2.*(m_dbManager->TILBdzmast() + m_dbManager->TILBdzspac() + 2.*dzglue)*Gaudi::Units::cm;
 
       // The period number for middle absorber
       nA2 = m_dbManager->TILBnperiod() - (nA1+nA3);
@@ -807,10 +808,10 @@ void TileGeoSectionBuilder::fillSection(GeoPhysVol*&             mother,
       //nrOfPeriods-1 ordinary period and second with one special period of type 2
 
       //First division
-      thicknessPeriod = 2.*(m_dbManager->TILBdzmast() + m_dbManager->TILBdzspac() + 2.*dzglue)*GeoModelKernelUnits::cm;
+      thicknessPeriod = 2.*(m_dbManager->TILBdzmast() + m_dbManager->TILBdzspac() + 2.*dzglue)*Gaudi::Units::cm;
 
       m_barrelPeriodThickness = thicknessPeriod;
-      m_barrelGlue = dzglue*GeoModelKernelUnits::cm;
+      m_barrelGlue = dzglue*Gaudi::Units::cm;
 
       checking("Period 0", false, 4, 
 	       thicknessPeriod/2,thicknessPeriod/2,dy1Absorber,dy2Absorber,heightAbsorber/2);
@@ -825,7 +826,7 @@ void TileGeoSectionBuilder::fillSection(GeoPhysVol*&             mother,
       pvPeriod = new GeoPhysVol(lvPeriod);
 
       fillPeriod(pvPeriod,
-                 thicknessPeriod*(1./GeoModelKernelUnits::cm),
+                 thicknessPeriod*(1./Gaudi::Units::cm),
                  dzglue,
                  tan_delta_phi_2,
                  1); // 1-period type
@@ -859,7 +860,7 @@ void TileGeoSectionBuilder::fillSection(GeoPhysVol*&             mother,
       pvAbsorber->add(pvAbsorberChild);
 
       //Second division
-      thicknessPeriod = (m_dbManager->TILBdzmast() + 2.*m_dbManager->TILBdzspac() + 2.*dzglue)*GeoModelKernelUnits::cm;
+      thicknessPeriod = (m_dbManager->TILBdzmast() + 2.*m_dbManager->TILBdzspac() + 2.*dzglue)*Gaudi::Units::cm;
 
       checking("Period 1", false, 4, 
 	       thicknessPeriod/2,thicknessPeriod/2,dy1Absorber,dy2Absorber,heightAbsorber/2);
@@ -873,7 +874,7 @@ void TileGeoSectionBuilder::fillSection(GeoPhysVol*&             mother,
       pvPeriod = new GeoPhysVol(lvPeriod);
 
       fillPeriod(pvPeriod,
-                 thicknessPeriod*(1./GeoModelKernelUnits::cm),
+                 thicknessPeriod*(1./Gaudi::Units::cm),
                  dzglue,
                  tan_delta_phi_2,
                  2); // 2-period type
@@ -908,7 +909,7 @@ void TileGeoSectionBuilder::fillSection(GeoPhysVol*&             mother,
   case 2:
     {
       //Extended barrel - consists of ordinary periods of type 1 only
-      thicknessPeriod = 2.*(m_dbManager->TILBdzmast() + m_dbManager->TILBdzspac() + 2.*dzglue)*GeoModelKernelUnits::cm;
+      thicknessPeriod = 2.*(m_dbManager->TILBdzmast() + m_dbManager->TILBdzspac() + 2.*dzglue)*Gaudi::Units::cm;
 
       checking("Period 2", false, 4, 
 	       thicknessPeriod/2,thicknessPeriod/2,dy1Absorber,dy2Absorber,heightAbsorber/2);
@@ -924,7 +925,7 @@ void TileGeoSectionBuilder::fillSection(GeoPhysVol*&             mother,
       m_extendedPeriodThickness = thicknessPeriod;
 
       fillPeriod(pvPeriod,
-                 thicknessPeriod*(1./GeoModelKernelUnits::cm),
+                 thicknessPeriod*(1./Gaudi::Units::cm),
                  dzglue,
                  tan_delta_phi_2,
                  1); // 1-period type
@@ -1020,7 +1021,7 @@ void TileGeoSectionBuilder::fillSection(GeoPhysVol*&             mother,
 	  //nrOfPeriods-1 ordinary period of type 1 and second with one special period of type 4
 	  
 	  //First division
-	  thicknessPeriod = 2.*(m_dbManager->TILBdzmast() + m_dbManager->TILBdzspac() + 2.*dzglue)*GeoModelKernelUnits::cm;
+	  thicknessPeriod = 2.*(m_dbManager->TILBdzmast() + m_dbManager->TILBdzspac() + 2.*dzglue)*Gaudi::Units::cm;
 	  
 	  checking("Period 3 (ITC1 special)", true, 4, 
 		   thicknessPeriod/2,thicknessPeriod/2,dy1Absorber,dy2Absorber,heightAbsorber/2);
@@ -1034,7 +1035,7 @@ void TileGeoSectionBuilder::fillSection(GeoPhysVol*&             mother,
 	  pvPeriod = new GeoPhysVol(lvPeriod);
 	  
  	  fillPeriod(pvPeriod,
- 		     thicknessPeriod*(1./GeoModelKernelUnits::cm),
+ 		     thicknessPeriod*(1./Gaudi::Units::cm),
  		     dzglue,
  		     tan_delta_phi_2,
  		     1); // 1-period type
@@ -1069,7 +1070,7 @@ void TileGeoSectionBuilder::fillSection(GeoPhysVol*&             mother,
 	  //
 	  //Second division
 	  //
-	  thicknessPeriod = m_dbManager->TILBdzspac()*GeoModelKernelUnits::cm;
+	  thicknessPeriod = m_dbManager->TILBdzspac()*Gaudi::Units::cm;
 	  
 	  checking("Period 5 (ITC1 special)", true, 4, 
 		   thicknessPeriod/2,thicknessPeriod/2,dy1Absorber,dy2Absorber,heightAbsorber/2);
@@ -1083,7 +1084,7 @@ void TileGeoSectionBuilder::fillSection(GeoPhysVol*&             mother,
 	  pvPeriod = new GeoPhysVol(lvPeriod);
 	  
 	  fillPeriod(pvPeriod,
-		     thicknessPeriod*(1./GeoModelKernelUnits::cm),
+		     thicknessPeriod*(1./Gaudi::Units::cm),
 		     dzglue,
 		     tan_delta_phi_2,
 		     4); // 4-period type
@@ -1116,7 +1117,7 @@ void TileGeoSectionBuilder::fillSection(GeoPhysVol*&             mother,
 	}
       else
 	{
-	  thicknessPeriod = 2.*(m_dbManager->TILBdzmast() + m_dbManager->TILBdzspac() + 2.*dzglue)*GeoModelKernelUnits::cm;
+	  thicknessPeriod = 2.*(m_dbManager->TILBdzmast() + m_dbManager->TILBdzspac() + 2.*dzglue)*Gaudi::Units::cm;
 	  
 	  checking("Period 3", true, 4, 
 		   thicknessPeriod/2,thicknessPeriod/2,dy1Absorber,dy2Absorber,heightAbsorber/2);
@@ -1130,7 +1131,7 @@ void TileGeoSectionBuilder::fillSection(GeoPhysVol*&             mother,
 	  pvPeriod = new GeoPhysVol(lvPeriod);
 	  
 	  fillPeriod(pvPeriod,
-		     thicknessPeriod*(1./GeoModelKernelUnits::cm),
+		     thicknessPeriod*(1./Gaudi::Units::cm),
 		     dzglue,
 		     tan_delta_phi_2,
 		     3); // 3-period type
@@ -1166,7 +1167,7 @@ void TileGeoSectionBuilder::fillSection(GeoPhysVol*&             mother,
       //nrOfPeriods-1 ordinary period of type 1 and second with one special period of type 4
 
       //First division
-      thicknessPeriod = 2.*(m_dbManager->TILBdzmast() + m_dbManager->TILBdzspac() + 2.*dzglue)*GeoModelKernelUnits::cm;
+      thicknessPeriod = 2.*(m_dbManager->TILBdzmast() + m_dbManager->TILBdzspac() + 2.*dzglue)*Gaudi::Units::cm;
 
       checking("Period 4", true, 4, 
 	       thicknessPeriod/2,thicknessPeriod/2,dy1Absorber,dy2Absorber,heightAbsorber/2);
@@ -1180,7 +1181,7 @@ void TileGeoSectionBuilder::fillSection(GeoPhysVol*&             mother,
       pvPeriod = new GeoPhysVol(lvPeriod);
 
       fillPeriod(pvPeriod,
-                 thicknessPeriod*(1./GeoModelKernelUnits::cm),
+                 thicknessPeriod*(1./Gaudi::Units::cm),
                  dzglue,
                  tan_delta_phi_2,
                  1); // 1-period type
@@ -1214,7 +1215,7 @@ void TileGeoSectionBuilder::fillSection(GeoPhysVol*&             mother,
       pvAbsorber->add(pvAbsorberChild);
 
       //Second division
-      thicknessPeriod = m_dbManager->TILBdzspac()*GeoModelKernelUnits::cm;
+      thicknessPeriod = m_dbManager->TILBdzspac()*Gaudi::Units::cm;
 
       checking("Period 5", true, 4, 
 	       thicknessPeriod/2,thicknessPeriod/2,dy1Absorber,dy2Absorber,heightAbsorber/2);
@@ -1228,7 +1229,7 @@ void TileGeoSectionBuilder::fillSection(GeoPhysVol*&             mother,
       pvPeriod = new GeoPhysVol(lvPeriod);
 
       fillPeriod(pvPeriod,
-                 thicknessPeriod*(1./GeoModelKernelUnits::cm),
+                 thicknessPeriod*(1./Gaudi::Units::cm),
                  dzglue,
                  tan_delta_phi_2,
                  4); // 4-period type
@@ -1280,8 +1281,8 @@ void TileGeoSectionBuilder::fillSection(GeoPhysVol*&             mother,
       checking("Period 6", true, 4, 
 	       thicknessPeriod/2,thicknessPeriod/2,dy1Absorber,dy2Absorber,heightAbsorber/2);
 
-      double dy1Period = m_dbManager->TILBflangex()/2.*GeoModelKernelUnits::cm; // correct size from the drawings
-      double dy2Period = m_dbManager->TILBflangey()/2.*GeoModelKernelUnits::cm; // correct size from the drawings
+      double dy1Period = m_dbManager->TILBflangex()/2.*Gaudi::Units::cm; // correct size from the drawings
+      double dy2Period = m_dbManager->TILBflangey()/2.*Gaudi::Units::cm; // correct size from the drawings
       if (dy1Period <= 0.0 || dy2Period <= 0.0 || dy1Period > dy1Absorber || dy2Period > dy2Absorber || dy1Period >= dy2Period ) {
           dy1Period = dy1Absorber;
           dy2Period = dy2Absorber;
@@ -1297,7 +1298,7 @@ void TileGeoSectionBuilder::fillSection(GeoPhysVol*&             mother,
       pvPeriod = new GeoPhysVol(lvPeriod);
 
       fillPeriod(pvPeriod,
-                 thicknessPeriod*(1./GeoModelKernelUnits::cm),
+                 thicknessPeriod*(1./Gaudi::Units::cm),
                  dzglue,
                  tan_delta_phi_2,
                  5, period);
@@ -1325,7 +1326,7 @@ void TileGeoSectionBuilder::fillSection(GeoPhysVol*&             mother,
   if (sec_number==3)
     { 
       // ps specialModuleZShift
-      tfAbsorber = new GeoTransform(GeoTrf::Translate3D( specialModuleZShift + dXAbsorber*GeoModelKernelUnits::cm/2, 0., dZAbsorber*GeoModelKernelUnits::cm/2));
+      tfAbsorber = new GeoTransform(GeoTrf::Translate3D( specialModuleZShift + dXAbsorber*Gaudi::Units::cm/2, 0., dZAbsorber*Gaudi::Units::cm/2));
       mother->add(tfAbsorber);
       mother->add(pvAbsorber);
     }
@@ -1334,8 +1335,8 @@ void TileGeoSectionBuilder::fillSection(GeoPhysVol*&             mother,
       if(m_log->level()<=MSG::DEBUG)
 	(*m_log) << MSG::DEBUG << " _fillsection  Ex.barrel in "<< endmsg;
  
-     tfAbsorber1 = new GeoTransform(GeoTrf::Translate3D(dXAbsorber*GeoModelKernelUnits::cm/2 - PosAbsor1, 0.,
-                                   (dZAbsorber + m_dbManager->TILBrmin() - rminb)*GeoModelKernelUnits::cm/2)); 
+     tfAbsorber1 = new GeoTransform(GeoTrf::Translate3D(dXAbsorber*Gaudi::Units::cm/2 - PosAbsor1, 0.,
+                                   (dZAbsorber + m_dbManager->TILBrmin() - rminb)*Gaudi::Units::cm/2)); 
      mother->add(tfAbsorber1);
      if (m_dbManager->BoolCuts() && ((ModuleNcp>=35 && ModuleNcp<=37) || (ModuleNcp>=60 && ModuleNcp<=62)) ) { 
        mother->add(pvTmp_Absorber1);
@@ -1347,16 +1348,16 @@ void TileGeoSectionBuilder::fillSection(GeoPhysVol*&             mother,
      if(m_log->level()<=MSG::DEBUG)
        (*m_log) << MSG::DEBUG << " _fillsection  ext.barrel pvAbsorber1 Ok"<< endmsg;
 
-     tfAbsorber  = new GeoTransform(GeoTrf::Translate3D(dXAbsorber*GeoModelKernelUnits::cm/2 - PosAbsor2, 0.,
-                                    (dZAbsorber + m_dbManager->TILBrmin() - rminb)*GeoModelKernelUnits::cm/2));  
+     tfAbsorber  = new GeoTransform(GeoTrf::Translate3D(dXAbsorber*Gaudi::Units::cm/2 - PosAbsor2, 0.,
+                                    (dZAbsorber + m_dbManager->TILBrmin() - rminb)*Gaudi::Units::cm/2));  
      mother->add(tfAbsorber);
      mother->add(pvAbsorber);
 
      if(m_log->level()<=MSG::DEBUG)
        (*m_log) << MSG::DEBUG << " _fillsection  ext.barrel pvAbsorber Ok"<< endmsg;
 
-     tfAbsorber3 = new GeoTransform(GeoTrf::Translate3D(dXAbsorber*GeoModelKernelUnits::cm/2 - PosAbsor3, 0.,  
-                                    (dZAbsorber + m_dbManager->TILBrmin() - rminb)*GeoModelKernelUnits::cm/2));                
+     tfAbsorber3 = new GeoTransform(GeoTrf::Translate3D(dXAbsorber*Gaudi::Units::cm/2 - PosAbsor3, 0.,  
+                                    (dZAbsorber + m_dbManager->TILBrmin() - rminb)*Gaudi::Units::cm/2));                
      mother->add(tfAbsorber3);
      if (m_dbManager->BoolCuts() && ((ModuleNcp>=35 && ModuleNcp<=37) || (ModuleNcp>=60 && ModuleNcp<=62)) ) {
        mother->add(pvTmp_Absorber3);
@@ -1370,8 +1371,8 @@ void TileGeoSectionBuilder::fillSection(GeoPhysVol*&             mother,
    }
   else                                           
    { 
-     tfAbsorber = new GeoTransform(GeoTrf::Translate3D(dXAbsorber*GeoModelKernelUnits::cm/2, 0.,
-                                   (dZAbsorber + m_dbManager->TILBrmin() - rminb)*GeoModelKernelUnits::cm/2));
+     tfAbsorber = new GeoTransform(GeoTrf::Translate3D(dXAbsorber*Gaudi::Units::cm/2, 0.,
+                                   (dZAbsorber + m_dbManager->TILBrmin() - rminb)*Gaudi::Units::cm/2));
      mother->add(tfAbsorber);
      mother->add(pvAbsorber);
      if(m_log->level()<=MSG::DEBUG)
@@ -1437,11 +1438,11 @@ void TileGeoSectionBuilder::fillGirder(GeoPhysVol*&             mother,
       dy2GirderElement = (elementRC + elementSizeInR/2) * tan_delta_phi_2;
     }
 
-    girderElement = new GeoTrd(thickness/2*GeoModelKernelUnits::cm,
-			       thickness/2*GeoModelKernelUnits::cm,
-			       dy1GirderElement*GeoModelKernelUnits::cm,
-			       dy2GirderElement*GeoModelKernelUnits::cm,
-			       elementSizeInR/2*GeoModelKernelUnits::cm);
+    girderElement = new GeoTrd(thickness/2*Gaudi::Units::cm,
+			       thickness/2*Gaudi::Units::cm,
+			       dy1GirderElement*Gaudi::Units::cm,
+			       dy2GirderElement*Gaudi::Units::cm,
+			       elementSizeInR/2*Gaudi::Units::cm);
 
     switch(m_dbManager->TIGRmaterial())
     {
@@ -1470,8 +1471,8 @@ void TileGeoSectionBuilder::fillGirder(GeoPhysVol*&             mother,
 
     pvGirderElement = new GeoPhysVol(lvGirderElement);
     tfGirderElement = new GeoTransform(GeoTrf::Translate3D(0.,
-						      elementOffsetInY*GeoModelKernelUnits::cm,
-						      (elementRC-(tilb_rmax + tile_rmax)/2)*GeoModelKernelUnits::cm));
+						      elementOffsetInY*Gaudi::Units::cm,
+						      (elementRC-(tilb_rmax + tile_rmax)/2)*Gaudi::Units::cm));
     mother->add(tfGirderElement);
     mother->add(pvGirderElement);
   }
@@ -1513,7 +1514,7 @@ void TileGeoSectionBuilder::fillFinger(GeoPhysVol*&             mother,
 
   // InDetServices
   if (m_matLArServices == 0)
-   { m_matLArServices = new GeoMaterial("LArServices", 2.5*GeoModelKernelUnits::gram/GeoModelKernelUnits::cm3);
+   { m_matLArServices = new GeoMaterial("LArServices", 2.5*GeoModelKernelUnits::gram/Gaudi::Units::cm3);
      m_matLArServices->add(shieldSteel, 0.20);
      m_matLArServices->add(copper, 0.60);
      m_matLArServices->add(matRubber, 0.10);
@@ -1523,7 +1524,7 @@ void TileGeoSectionBuilder::fillFinger(GeoPhysVol*&             mother,
 
   // m_matIronHalfDens
   if (m_matIronHalfDens == 0)
-   { m_matIronHalfDens = new GeoMaterial("LArIronBox", 4.5*GeoModelKernelUnits::gram/GeoModelKernelUnits::cm3);
+   { m_matIronHalfDens = new GeoMaterial("LArIronBox", 4.5*GeoModelKernelUnits::gram/Gaudi::Units::cm3);
      m_matIronHalfDens->add(shieldSteel, 0.80);
      m_matIronHalfDens->add(matRubber, 0.10);
      m_matIronHalfDens->add(copper, 0.10);
@@ -1574,7 +1575,7 @@ void TileGeoSectionBuilder::fillFinger(GeoPhysVol*&             mother,
 	  (*m_log) << MSG::DEBUG << "TileFinger: AirVolumeSize ="<< AirVolumeSize << endmsg;
 	}
       }
-      if (elementZPozition*2-AirVolumeSize<-0.01) { // compare with zero with 0.1 GeoModelKernelUnits::mm precision
+      if (elementZPozition*2-AirVolumeSize<-0.01) { // compare with zero with 0.1 Gaudi::Units::mm precision
         elementZPozition += AirVolumeShift; // shift all volumes keeping size
       } else { // resize finger cover with shims attached to it
 	if(m_log->level()<=MSG::DEBUG)
@@ -1620,26 +1621,26 @@ void TileGeoSectionBuilder::fillFinger(GeoPhysVol*&             mother,
 
     if(m_dbManager->TICGshape()==1)
     {
-      fingerElementTrd = new GeoTrd(elementDz/2*GeoModelKernelUnits::cm,
-				    elementDz/2*GeoModelKernelUnits::cm,
-				    elementDy1/2*GeoModelKernelUnits::cm,
-				    elementDy2/2*GeoModelKernelUnits::cm,
-				    elementHeight/2*GeoModelKernelUnits::cm);
+      fingerElementTrd = new GeoTrd(elementDz/2*Gaudi::Units::cm,
+				    elementDz/2*Gaudi::Units::cm,
+				    elementDy1/2*Gaudi::Units::cm,
+				    elementDy2/2*Gaudi::Units::cm,
+				    elementHeight/2*Gaudi::Units::cm);
       lvFingerElement = new GeoLogVol(currentName,fingerElementTrd,currentMaterial);
     }
     else if(m_dbManager->TICGshape()==2)
     {
  
-      fingerElementTrap = new GeoTrap(elementDz/2*GeoModelKernelUnits::cm,
+      fingerElementTrap = new GeoTrap(elementDz/2*Gaudi::Units::cm,
 				      0.,
 				      0.,
-				      elementHeight/2*GeoModelKernelUnits::cm,
-				      elementDy2/2*GeoModelKernelUnits::cm,
-				      elementDy1/2*GeoModelKernelUnits::cm,
+				      elementHeight/2*Gaudi::Units::cm,
+				      elementDy2/2*Gaudi::Units::cm,
+				      elementDy1/2*Gaudi::Units::cm,
 				      atan((elementDy1-elementDy2)/(2.*elementHeight)),
-				      elementHeight/2*GeoModelKernelUnits::cm,
-				      elementDy2/2*GeoModelKernelUnits::cm,
-				      elementDy1/2*GeoModelKernelUnits::cm,
+				      elementHeight/2*Gaudi::Units::cm,
+				      elementDy2/2*Gaudi::Units::cm,
+				      elementDy1/2*Gaudi::Units::cm,
 				      atan((elementDy1-elementDy2)/(2.*elementHeight)));
  
       lvFingerElement = new GeoLogVol(currentName,fingerElementTrap,currentMaterial);
@@ -1653,21 +1654,21 @@ void TileGeoSectionBuilder::fillFinger(GeoPhysVol*&             mother,
 
 
     pvFingerElement = new GeoPhysVol(lvFingerElement);
-    tfFingerElement = new GeoTransform(GeoTrf::Translate3D(elementZPozition*GeoModelKernelUnits::cm,
-						      elementOffset*GeoModelKernelUnits::cm,
-						      (elementRC-(tilb_rmax + tile_rmax)/2)*GeoModelKernelUnits::cm));
+    tfFingerElement = new GeoTransform(GeoTrf::Translate3D(elementZPozition*Gaudi::Units::cm,
+						      elementOffset*Gaudi::Units::cm,
+						      (elementRC-(tilb_rmax + tile_rmax)/2)*Gaudi::Units::cm));
 
     mother->add(tfFingerElement);
     if (m_dbManager->TICGshape()==2)
     {
       if(elementOffset<0)
       {
-	ZrotateMod = new GeoTransform(GeoTrf::RotateZ3D(180*GeoModelKernelUnits::deg));
+	ZrotateMod = new GeoTransform(GeoTrf::RotateZ3D(180*Gaudi::Units::deg));
 	mother->add(ZrotateMod); 
       }
 
-      zrotateMod = new GeoTransform(GeoTrf::RotateZ3D(90*GeoModelKernelUnits::deg));
-      yrotateMod = new GeoTransform(GeoTrf::RotateY3D(-90*GeoModelKernelUnits::deg));
+      zrotateMod = new GeoTransform(GeoTrf::RotateZ3D(90*Gaudi::Units::deg));
+      yrotateMod = new GeoTransform(GeoTrf::RotateY3D(-90*Gaudi::Units::deg));
       mother->add(yrotateMod);
       mother->add(zrotateMod);
     }
@@ -1737,17 +1738,17 @@ void TileGeoSectionBuilder::fillFinger(GeoPhysVol*&             mother,
 	     << " LRflag= " << LRflag <<" Neg "<< boolNeg 
 	     << endmsg;
 
-  GeoTransform *rotateY = new GeoTransform(GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg));
-  GeoTransform *rotateZ = new GeoTransform(GeoTrf::RotateZ3D(3*GeoModelKernelUnits::deg));
-  GeoTransform *rotateZm = new GeoTransform(GeoTrf::RotateZ3D(-3*GeoModelKernelUnits::deg));
+  GeoTransform *rotateY = new GeoTransform(GeoTrf::RotateY3D(90*Gaudi::Units::deg));
+  GeoTransform *rotateZ = new GeoTransform(GeoTrf::RotateZ3D(3*Gaudi::Units::deg));
+  GeoTransform *rotateZm = new GeoTransform(GeoTrf::RotateZ3D(-3*Gaudi::Units::deg));
 
   // Left (+phi)
-  fingerCablesL = new GeoBox(dXleft/2*GeoModelKernelUnits::cm, dY/2*GeoModelKernelUnits::cm, dZleft/2*GeoModelKernelUnits::cm);
+  fingerCablesL = new GeoBox(dXleft/2*Gaudi::Units::cm, dY/2*Gaudi::Units::cm, dZleft/2*Gaudi::Units::cm);
   lvFingerCablesL = new GeoLogVol(leftName,fingerCablesL,leftMaterial);
   pvFingerCablesL = new GeoPhysVol(lvFingerCablesL);
 
   // Right (-phi)
-  fingerCablesR = new GeoBox(dXright/2*GeoModelKernelUnits::cm, dY/2*GeoModelKernelUnits::cm, dZright/2*GeoModelKernelUnits::cm);
+  fingerCablesR = new GeoBox(dXright/2*Gaudi::Units::cm, dY/2*Gaudi::Units::cm, dZright/2*Gaudi::Units::cm);
   lvFingerCablesR = new GeoLogVol(rightName,fingerCablesR,rightMaterial);
   pvFingerCablesR = new GeoPhysVol(lvFingerCablesR);
 
@@ -1759,9 +1760,9 @@ void TileGeoSectionBuilder::fillFinger(GeoPhysVol*&             mother,
     { YpoFinger = elementOffset-5.4;  
     }
 
-  tfFingerCables = new GeoTransform(GeoTrf::Translate3D(elementZPozition*GeoModelKernelUnits::cm +0.5*GeoModelKernelUnits::cm -dZsaddleL*GeoModelKernelUnits::cm,
-	                                           YpoFinger*GeoModelKernelUnits::cm,
-				                   (elementRC-(tilb_rmax + tile_rmax)/2)*GeoModelKernelUnits::cm));
+  tfFingerCables = new GeoTransform(GeoTrf::Translate3D(elementZPozition*Gaudi::Units::cm +0.5*Gaudi::Units::cm -dZsaddleL*Gaudi::Units::cm,
+	                                           YpoFinger*Gaudi::Units::cm,
+				                   (elementRC-(tilb_rmax + tile_rmax)/2)*Gaudi::Units::cm));
   mother->add(tfFingerCables);
 
   // inversion for negativ fingers, Left
@@ -1782,9 +1783,9 @@ void TileGeoSectionBuilder::fillFinger(GeoPhysVol*&             mother,
     { YpoFinger = -elementOffset+5.4;
     }
 
-  tfFingerCables = new GeoTransform(GeoTrf::Translate3D(elementZPozition*GeoModelKernelUnits::cm +0.5*GeoModelKernelUnits::cm -dZsaddleR*GeoModelKernelUnits::cm,
-	                                           YpoFinger*GeoModelKernelUnits::cm,
-	                                           (elementRC-(tilb_rmax + tile_rmax)/2)*GeoModelKernelUnits::cm));
+  tfFingerCables = new GeoTransform(GeoTrf::Translate3D(elementZPozition*Gaudi::Units::cm +0.5*Gaudi::Units::cm -dZsaddleR*Gaudi::Units::cm,
+	                                           YpoFinger*Gaudi::Units::cm,
+	                                           (elementRC-(tilb_rmax + tile_rmax)/2)*Gaudi::Units::cm));
   mother->add(tfFingerCables);
 
   // inversion for negativ fingers, Right
@@ -1877,13 +1878,13 @@ void TileGeoSectionBuilder::fillPeriod(GeoPhysVol*&              mother,
   const GeoMaterial* matScin = m_theMaterialManager->getMaterial("tile::Scintillator");
 
   //Cs hole parameters
-  double csHoleR       = 0.45 * GeoModelKernelUnits::cm;
-  double csTubeOuterR  = 0.4  * GeoModelKernelUnits::cm;
-  double csTubeInnerR  = 0.3  * GeoModelKernelUnits::cm;
-  double csTubeOffCorr = 1.35 * GeoModelKernelUnits::cm;
+  double csHoleR       = 0.45 * Gaudi::Units::cm;
+  double csTubeOuterR  = 0.4  * Gaudi::Units::cm;
+  double csTubeInnerR  = 0.3  * Gaudi::Units::cm;
+  double csTubeOffCorr = 1.35 * Gaudi::Units::cm;
 
-  double thicknessMother2 = thickness/2.*GeoModelKernelUnits::cm;
-  double heightMother2    = (m_dbManager->TILBrmax() - m_dbManager->TILBrmin())*GeoModelKernelUnits::cm/2.;
+  double thicknessMother2 = thickness/2.*Gaudi::Units::cm;
+  double heightMother2    = (m_dbManager->TILBrmax() - m_dbManager->TILBrmin())*Gaudi::Units::cm/2.;
 
   const bool removeGlue = (m_glue == 0 || m_glue == 2);
 
@@ -1891,18 +1892,18 @@ void TileGeoSectionBuilder::fillPeriod(GeoPhysVol*&              mother,
   if (dzglue>0.0 && period_type<4 && !removeGlue) {
     const GeoMaterial* matGlue = m_theMaterialManager->getMaterial("tile::Glue");
 
-    double dzglue2 = dzglue/2*GeoModelKernelUnits::cm;
+    double dzglue2 = dzglue/2*Gaudi::Units::cm;
     dzglue2 = floor(dzglue2*1.0e+10)*1.0e-10;
 
     if (m_verbose) {
-      printdouble(" period thickness/2 = ",thickness/2*GeoModelKernelUnits::cm);
-      printdouble("   glue thickness/2 = ",dzglue/2*GeoModelKernelUnits::cm);
+      printdouble(" period thickness/2 = ",thickness/2*Gaudi::Units::cm);
+      printdouble("   glue thickness/2 = ",dzglue/2*Gaudi::Units::cm);
       printdouble("rounded thickness/2 = ",dzglue2);
     }
 
-    double dy1Glue = (m_dbManager->TILBrmin() * tan_delta_phi_2 - m_dbManager->TILBphigap()/2)*GeoModelKernelUnits::cm;
-    double dy2Glue = (m_dbManager->TILBrmax() * tan_delta_phi_2 - m_dbManager->TILBphigap()/2)*GeoModelKernelUnits::cm;
-    double heightGlue2 = (m_dbManager->TILBrmax() - m_dbManager->TILBrmin())*GeoModelKernelUnits::cm/2.;
+    double dy1Glue = (m_dbManager->TILBrmin() * tan_delta_phi_2 - m_dbManager->TILBphigap()/2)*Gaudi::Units::cm;
+    double dy2Glue = (m_dbManager->TILBrmax() * tan_delta_phi_2 - m_dbManager->TILBphigap()/2)*Gaudi::Units::cm;
+    double heightGlue2 = (m_dbManager->TILBrmax() - m_dbManager->TILBrmin())*Gaudi::Units::cm/2.;
 
     checking("Glue 0", false, 4, 
              dzglue2,dzglue2,dy1Glue,dy2Glue,heightGlue2);
@@ -1916,16 +1917,16 @@ void TileGeoSectionBuilder::fillPeriod(GeoPhysVol*&              mother,
       idTag = new GeoIdentifierTag(j-CurrentScin);
       m_dbManager->SetCurrentScin(j);
 
-      double off0 = m_dbManager->SCNTrc()*GeoModelKernelUnits::cm - heightMother2;
-      double off  = m_dbManager->SCNTdr()/2.*GeoModelKernelUnits::cm - csTubeOffCorr;
+      double off0 = m_dbManager->SCNTrc()*Gaudi::Units::cm - heightMother2;
+      double off  = m_dbManager->SCNTdr()/2.*Gaudi::Units::cm - csTubeOffCorr;
 
-      GeoTrf::Transform3D tfHole1 = GeoTrf::Translate3D(0.,0.,(off0-off)) * GeoTrf::RotateY3D(-90*GeoModelKernelUnits::deg);
-      GeoTrf::Transform3D tfHole2 = GeoTrf::Translate3D(0.,0.,(off0+off)) * GeoTrf::RotateY3D(-90*GeoModelKernelUnits::deg);
+      GeoTrf::Transform3D tfHole1 = GeoTrf::Translate3D(0.,0.,(off0-off)) * GeoTrf::RotateY3D(-90*Gaudi::Units::deg);
+      GeoTrf::Transform3D tfHole2 = GeoTrf::Translate3D(0.,0.,(off0+off)) * GeoTrf::RotateY3D(-90*Gaudi::Units::deg);
 
       // air around iron rod, around Cs tube and inside Cs tube
-      GeoShape *air1 = new GeoTubs(csTubeOuterR, csHoleR, thicknessMother2, 0.,360.0 * GeoModelKernelUnits::deg);
-      GeoShape *air2 = new GeoTubs(csTubeOuterR, csHoleR, thicknessMother2, 0.,360.0 * GeoModelKernelUnits::deg);
-      GeoShape *air3 = new GeoTubs(0.,      csTubeInnerR, thicknessMother2, 0.,360.0 * GeoModelKernelUnits::deg);
+      GeoShape *air1 = new GeoTubs(csTubeOuterR, csHoleR, thicknessMother2, 0.,360.0 * Gaudi::Units::deg);
+      GeoShape *air2 = new GeoTubs(csTubeOuterR, csHoleR, thicknessMother2, 0.,360.0 * Gaudi::Units::deg);
+      GeoShape *air3 = new GeoTubs(0.,      csTubeInnerR, thicknessMother2, 0.,360.0 * Gaudi::Units::deg);
 
       GeoLogVol * lvAir1 = new GeoLogVol("CsTubeAir1",air1,matAir);
       GeoLogVol * lvAir2 = new GeoLogVol("CsTubeAir2",air2,matAir);
@@ -1965,26 +1966,26 @@ void TileGeoSectionBuilder::fillPeriod(GeoPhysVol*&              mother,
       if (glue)
       {
         if (m_verbose)
-            printdouble("      glue position = ",(-3.*dzglue/2-m_dbManager->TILBdzmast())*GeoModelKernelUnits::cm);
-	tfGlue = new GeoTransform(GeoTrf::Translate3D((-3.*dzglue/2-m_dbManager->TILBdzmast())*GeoModelKernelUnits::cm,0.,0.));
+            printdouble("      glue position = ",(-3.*dzglue/2-m_dbManager->TILBdzmast())*Gaudi::Units::cm);
+	tfGlue = new GeoTransform(GeoTrf::Translate3D((-3.*dzglue/2-m_dbManager->TILBdzmast())*Gaudi::Units::cm,0.,0.));
 	mother->add(tfGlue);
 	mother->add(pvGlue);
 
         if (m_verbose)
-            printdouble("      glue position = ",-dzglue/2*GeoModelKernelUnits::cm);
-	tfGlue = new GeoTransform(GeoTrf::Translate3D(-dzglue/2*GeoModelKernelUnits::cm,0.,0.));
+            printdouble("      glue position = ",-dzglue/2*Gaudi::Units::cm);
+	tfGlue = new GeoTransform(GeoTrf::Translate3D(-dzglue/2*Gaudi::Units::cm,0.,0.));
 	mother->add(tfGlue);
 	mother->add(pvGlue);
 
         if (m_verbose)
-            printdouble("      glue position = ",(dzglue/2+m_dbManager->TILBdzspac())*GeoModelKernelUnits::cm);
-	tfGlue = new GeoTransform(GeoTrf::Translate3D((dzglue/2+m_dbManager->TILBdzspac())*GeoModelKernelUnits::cm,0.,0.));
+            printdouble("      glue position = ",(dzglue/2+m_dbManager->TILBdzspac())*Gaudi::Units::cm);
+	tfGlue = new GeoTransform(GeoTrf::Translate3D((dzglue/2+m_dbManager->TILBdzspac())*Gaudi::Units::cm,0.,0.));
 	mother->add(tfGlue);
 	mother->add(pvGlue);
 
         if (m_verbose)
-            printdouble("      glue position = ",(thickness-dzglue)/2*GeoModelKernelUnits::cm);
-	tfGlue = new GeoTransform(GeoTrf::Translate3D((thickness-dzglue)/2*GeoModelKernelUnits::cm,0.,0.));
+            printdouble("      glue position = ",(thickness-dzglue)/2*Gaudi::Units::cm);
+	tfGlue = new GeoTransform(GeoTrf::Translate3D((thickness-dzglue)/2*Gaudi::Units::cm,0.,0.));
 	mother->add(tfGlue);
 	mother->add(pvGlue);
       }
@@ -2003,15 +2004,15 @@ void TileGeoSectionBuilder::fillPeriod(GeoPhysVol*&              mother,
         scintiDeltaInPhi = (m_uShape > 0) ? 0.0 : m_dbManager->SCNTdphi();
 
         thicknessWrapper = (m_dbManager->TILBdzspac() <= (scintiThickness + 2*scintiWrapInZ)) ?
-                           (scintiThickness + 2*scintiWrapInZ)*GeoModelKernelUnits::cm: m_dbManager->TILBdzspac()*GeoModelKernelUnits::cm;
+                           (scintiThickness + 2*scintiWrapInZ)*Gaudi::Units::cm: m_dbManager->TILBdzspac()*Gaudi::Units::cm;
         if (m_glue == 2) thicknessWrapper = std::max(thicknessWrapper - m_additionalIronLayer, scintiThickness);
 
         // create wrapper
-        heightWrapper = (scintiHeight + 2*scintiWrapInR)*GeoModelKernelUnits::cm;
+        heightWrapper = (scintiHeight + 2*scintiWrapInR)*Gaudi::Units::cm;
         dy1Wrapper = ((scintiRC - scintiHeight/2 - scintiWrapInR + m_dbManager->TILBrmin()) *
-                     tan_delta_phi_2 - m_dbManager->TILBphigap()/2)*GeoModelKernelUnits::cm;
+                     tan_delta_phi_2 - m_dbManager->TILBphigap()/2)*Gaudi::Units::cm;
         dy2Wrapper = ((scintiRC + scintiHeight/2 + scintiWrapInR + m_dbManager->TILBrmin()) *
-                     tan_delta_phi_2 - m_dbManager->TILBphigap()/2)*GeoModelKernelUnits::cm;
+                     tan_delta_phi_2 - m_dbManager->TILBphigap()/2)*Gaudi::Units::cm;
 
         checking("Wrapper 0", true, 5, 
             thicknessWrapper/2,thicknessWrapper/2,dy1Wrapper,dy2Wrapper,heightWrapper/2);
@@ -2023,28 +2024,28 @@ void TileGeoSectionBuilder::fillPeriod(GeoPhysVol*&              mother,
 			     heightWrapper/2);
 
 	if (m_csTube) {
-          wrapper = makeHoles(wrapper, csHoleR, thicknessWrapper/2, scintiHeight/2.*GeoModelKernelUnits::cm - csTubeOffCorr);
+          wrapper = makeHoles(wrapper, csHoleR, thicknessWrapper/2, scintiHeight/2.*Gaudi::Units::cm - csTubeOffCorr);
         }
 	lvWrapper = new GeoLogVol("Wrapper",wrapper,matAir);
 	pvWrapper = new GeoPhysVol(lvWrapper);
 
         // create scintillator
         dy1Scintillator = ((scintiRC - scintiHeight/2 + m_dbManager->TILBrmin()) *
-                          tan_delta_phi_2 -  m_dbManager->TILBphigap()/2 - scintiDeltaInPhi)*GeoModelKernelUnits::cm;
+                          tan_delta_phi_2 -  m_dbManager->TILBphigap()/2 - scintiDeltaInPhi)*Gaudi::Units::cm;
         dy2Scintillator = ((scintiRC + scintiHeight/2 + m_dbManager->TILBrmin()) *
-                          tan_delta_phi_2 -  m_dbManager->TILBphigap()/2 - scintiDeltaInPhi)*GeoModelKernelUnits::cm;
+                          tan_delta_phi_2 -  m_dbManager->TILBphigap()/2 - scintiDeltaInPhi)*Gaudi::Units::cm;
 
         checking("Scintillator 0", true, 6, 
-                 scintiThickness/2*GeoModelKernelUnits::cm,scintiThickness/2*GeoModelKernelUnits::cm,dy1Scintillator,dy2Scintillator,scintiHeight/2*GeoModelKernelUnits::cm);
+                 scintiThickness/2*Gaudi::Units::cm,scintiThickness/2*Gaudi::Units::cm,dy1Scintillator,dy2Scintillator,scintiHeight/2*Gaudi::Units::cm);
 
-	scintillator = new GeoTrd(scintiThickness/2*GeoModelKernelUnits::cm,
-				  scintiThickness/2*GeoModelKernelUnits::cm,
+	scintillator = new GeoTrd(scintiThickness/2*Gaudi::Units::cm,
+				  scintiThickness/2*Gaudi::Units::cm,
 				  dy1Scintillator,
 				  dy2Scintillator,
-				  scintiHeight/2*GeoModelKernelUnits::cm);
+				  scintiHeight/2*Gaudi::Units::cm);
 
 	if (m_csTube) {
-          scintillator = makeHolesScint(scintillator, csHoleR, scintiThickness/2 * GeoModelKernelUnits::cm, scintiHeight/2.*GeoModelKernelUnits::cm - csTubeOffCorr);
+          scintillator = makeHolesScint(scintillator, csHoleR, scintiThickness/2 * Gaudi::Units::cm, scintiHeight/2.*Gaudi::Units::cm - csTubeOffCorr);
 	}
 	lvScintillator = new GeoLogVol("Scintillator",scintillator,matScin);
 	pvScintillator = new GeoPhysVol(lvScintillator);
@@ -2058,13 +2059,13 @@ void TileGeoSectionBuilder::fillPeriod(GeoPhysVol*&              mother,
         //place wrapper in period
         if (m_verbose) {
           (*m_log) << MSG::VERBOSE <<" X scintiZPos= "<<scintiZPos;
-          printdouble("  ==>  ",(scintiZPos*thickness+m_dbManager->TILBdzspac()/2)*GeoModelKernelUnits::cm);
+          printdouble("  ==>  ",(scintiZPos*thickness+m_dbManager->TILBdzspac()/2)*Gaudi::Units::cm);
           (*m_log) << MSG::VERBOSE <<" Y scintiRC= "<<scintiRC <<endmsg;
         }
         
-	tfWrapper = new GeoTransform(GeoTrf::Translate3D((scintiZPos*thickness+m_dbManager->TILBdzspac()/2)*GeoModelKernelUnits::cm,
+	tfWrapper = new GeoTransform(GeoTrf::Translate3D((scintiZPos*thickness+m_dbManager->TILBdzspac()/2)*Gaudi::Units::cm,
 						    0.,
-						    (scintiRC-(m_dbManager->TILBrmax()-m_dbManager->TILBrmin())/2)*GeoModelKernelUnits::cm));
+						    (scintiRC-(m_dbManager->TILBrmax()-m_dbManager->TILBrmin())/2)*Gaudi::Units::cm));
 	mother->add(idTag);
 	mother->add(tfWrapper);
 	mother->add(pvWrapper);
@@ -2079,14 +2080,14 @@ void TileGeoSectionBuilder::fillPeriod(GeoPhysVol*&              mother,
       if (glue)
       {
         if (m_verbose)
-            printdouble("      glue position = ",(dzglue + m_dbManager->TILBdzmast())*GeoModelKernelUnits::cm/2);
-	tfGlue = new GeoTransform(GeoTrf::Translate3D((dzglue + m_dbManager->TILBdzmast())*GeoModelKernelUnits::cm/2,0.,0.));
+            printdouble("      glue position = ",(dzglue + m_dbManager->TILBdzmast())*Gaudi::Units::cm/2);
+	tfGlue = new GeoTransform(GeoTrf::Translate3D((dzglue + m_dbManager->TILBdzmast())*Gaudi::Units::cm/2,0.,0.));
 	mother->add(tfGlue);
 	mother->add(pvGlue);
 
         if (m_verbose)
-            printdouble("      glue position = ",-(dzglue + m_dbManager->TILBdzmast())*GeoModelKernelUnits::cm/2);
-	tfGlue = new GeoTransform(GeoTrf::Translate3D(-(dzglue + m_dbManager->TILBdzmast())*GeoModelKernelUnits::cm/2,0.,0.));
+            printdouble("      glue position = ",-(dzglue + m_dbManager->TILBdzmast())*Gaudi::Units::cm/2);
+	tfGlue = new GeoTransform(GeoTrf::Translate3D(-(dzglue + m_dbManager->TILBdzmast())*Gaudi::Units::cm/2,0.,0.));
 	mother->add(tfGlue);
 	mother->add(pvGlue);
       }
@@ -2105,15 +2106,15 @@ void TileGeoSectionBuilder::fillPeriod(GeoPhysVol*&              mother,
         scintiDeltaInPhi = (m_uShape > 0) ? 0.0 : m_dbManager->SCNTdphi();
 
         thicknessWrapper = (m_dbManager->TILBdzspac() <= (scintiThickness + 2*scintiWrapInZ)) ?
-                           (scintiThickness + 2*scintiWrapInZ)*GeoModelKernelUnits::cm: m_dbManager->TILBdzspac()*GeoModelKernelUnits::cm;
+                           (scintiThickness + 2*scintiWrapInZ)*Gaudi::Units::cm: m_dbManager->TILBdzspac()*Gaudi::Units::cm;
         if (m_glue == 2)   thicknessWrapper = std::max(thicknessWrapper - m_additionalIronLayer, scintiThickness);
 
         // create wrapper
-        heightWrapper = (scintiHeight + 2*scintiWrapInR)*GeoModelKernelUnits::cm;
+        heightWrapper = (scintiHeight + 2*scintiWrapInR)*Gaudi::Units::cm;
         dy1Wrapper = ((scintiRC - scintiHeight/2 - scintiWrapInR + m_dbManager->TILBrmin()) *
-                     tan_delta_phi_2 - m_dbManager->TILBphigap()/2)*GeoModelKernelUnits::cm;
+                     tan_delta_phi_2 - m_dbManager->TILBphigap()/2)*Gaudi::Units::cm;
         dy2Wrapper = ((scintiRC + scintiHeight/2 + scintiWrapInR + m_dbManager->TILBrmin()) *
-                     tan_delta_phi_2 - m_dbManager->TILBphigap()/2)*GeoModelKernelUnits::cm;
+                     tan_delta_phi_2 - m_dbManager->TILBphigap()/2)*Gaudi::Units::cm;
 
         checking("Wrapper 1", true, 5, 
             thicknessWrapper/2,thicknessWrapper/2,dy1Wrapper,dy2Wrapper,heightWrapper/2);
@@ -2125,28 +2126,28 @@ void TileGeoSectionBuilder::fillPeriod(GeoPhysVol*&              mother,
 			     heightWrapper/2);
 
 	if (m_csTube) {
-          wrapper = makeHoles(wrapper, csHoleR, thicknessWrapper/2, scintiHeight/2.*GeoModelKernelUnits::cm - csTubeOffCorr);
+          wrapper = makeHoles(wrapper, csHoleR, thicknessWrapper/2, scintiHeight/2.*Gaudi::Units::cm - csTubeOffCorr);
         }
 	lvWrapper = new GeoLogVol("Wrapper",wrapper,matAir);
 	pvWrapper = new GeoPhysVol(lvWrapper);
 
         // create scintillator
         dy1Scintillator = ((scintiRC - scintiHeight/2 + m_dbManager->TILBrmin()) *
-                          tan_delta_phi_2 -  m_dbManager->TILBphigap()/2 - scintiDeltaInPhi)*GeoModelKernelUnits::cm;
+                          tan_delta_phi_2 -  m_dbManager->TILBphigap()/2 - scintiDeltaInPhi)*Gaudi::Units::cm;
         dy2Scintillator = ((scintiRC + scintiHeight/2 + m_dbManager->TILBrmin()) *
-                          tan_delta_phi_2 -  m_dbManager->TILBphigap()/2 - scintiDeltaInPhi)*GeoModelKernelUnits::cm;
+                          tan_delta_phi_2 -  m_dbManager->TILBphigap()/2 - scintiDeltaInPhi)*Gaudi::Units::cm;
 
         checking("Scintillator 1", true, 6, 
-                 scintiThickness/2*GeoModelKernelUnits::cm,scintiThickness/2*GeoModelKernelUnits::cm,dy1Scintillator,dy2Scintillator,scintiHeight/2*GeoModelKernelUnits::cm);
+                 scintiThickness/2*Gaudi::Units::cm,scintiThickness/2*Gaudi::Units::cm,dy1Scintillator,dy2Scintillator,scintiHeight/2*Gaudi::Units::cm);
 
-	scintillator = new GeoTrd(scintiThickness/2*GeoModelKernelUnits::cm,
-				  scintiThickness/2*GeoModelKernelUnits::cm,
+	scintillator = new GeoTrd(scintiThickness/2*Gaudi::Units::cm,
+				  scintiThickness/2*Gaudi::Units::cm,
 				  dy1Scintillator,
 				  dy2Scintillator,
-				  scintiHeight/2*GeoModelKernelUnits::cm);
+				  scintiHeight/2*Gaudi::Units::cm);
 
 	if (m_csTube) {
-          scintillator = makeHolesScint(scintillator, csHoleR, scintiThickness/2 * GeoModelKernelUnits::cm, scintiHeight/2.*GeoModelKernelUnits::cm - csTubeOffCorr);
+          scintillator = makeHolesScint(scintillator, csHoleR, scintiThickness/2 * Gaudi::Units::cm, scintiHeight/2.*Gaudi::Units::cm - csTubeOffCorr);
 	}
 	lvScintillator = new GeoLogVol("Scintillator",scintillator,matScin);
 	pvScintillator = new GeoPhysVol(lvScintillator);
@@ -2160,13 +2161,13 @@ void TileGeoSectionBuilder::fillPeriod(GeoPhysVol*&              mother,
         //place wrapper in period
         if (m_verbose) {
           (*m_log) << MSG::VERBOSE <<" X scintiZPos= "<<scintiZPos; 
-          printdouble("  ==>  ",(2*scintiZPos+0.5)*(thickness-m_dbManager->TILBdzspac())*GeoModelKernelUnits::cm);
+          printdouble("  ==>  ",(2*scintiZPos+0.5)*(thickness-m_dbManager->TILBdzspac())*Gaudi::Units::cm);
           (*m_log) << MSG::VERBOSE <<" Y scintiRC= "<<scintiRC <<endmsg;
         }
         
-	tfWrapper = new GeoTransform(GeoTrf::Translate3D((2*scintiZPos+0.5)*(thickness-m_dbManager->TILBdzspac())*GeoModelKernelUnits::cm,
+	tfWrapper = new GeoTransform(GeoTrf::Translate3D((2*scintiZPos+0.5)*(thickness-m_dbManager->TILBdzspac())*Gaudi::Units::cm,
 						    0.,
-						    (scintiRC-(m_dbManager->TILBrmax()-m_dbManager->TILBrmin())/2)*GeoModelKernelUnits::cm));
+						    (scintiRC-(m_dbManager->TILBrmax()-m_dbManager->TILBrmin())/2)*Gaudi::Units::cm));
 	mother->add(idTag);
 	mother->add(tfWrapper);
 	mother->add(pvWrapper);
@@ -2181,26 +2182,26 @@ void TileGeoSectionBuilder::fillPeriod(GeoPhysVol*&              mother,
       if (glue)
       {
         if (m_verbose)
-            printdouble("      glue position = ",(-thickness + dzglue)*GeoModelKernelUnits::cm/2);
-	tfGlue = new GeoTransform(GeoTrf::Translate3D((-thickness + dzglue)*GeoModelKernelUnits::cm/2,0.,0.));
+            printdouble("      glue position = ",(-thickness + dzglue)*Gaudi::Units::cm/2);
+	tfGlue = new GeoTransform(GeoTrf::Translate3D((-thickness + dzglue)*Gaudi::Units::cm/2,0.,0.));
 	mother->add(tfGlue);
 	mother->add(pvGlue);
 
         if (m_verbose)
-            printdouble("      glue position = ",((-thickness + 3*dzglue)+m_dbManager->TILBdzmast())/2*GeoModelKernelUnits::cm);
-	tfGlue = new GeoTransform(GeoTrf::Translate3D(((-thickness + 3*dzglue)+m_dbManager->TILBdzmast())/2*GeoModelKernelUnits::cm,0.,0.));
+            printdouble("      glue position = ",((-thickness + 3*dzglue)+m_dbManager->TILBdzmast())/2*Gaudi::Units::cm);
+	tfGlue = new GeoTransform(GeoTrf::Translate3D(((-thickness + 3*dzglue)+m_dbManager->TILBdzmast())/2*Gaudi::Units::cm,0.,0.));
 	mother->add(tfGlue);
 	mother->add(pvGlue);
 
         if (m_verbose)
-            printdouble("      glue position = ",dzglue/2*GeoModelKernelUnits::cm);
-	tfGlue = new GeoTransform(GeoTrf::Translate3D(dzglue/2*GeoModelKernelUnits::cm,0.,0.));
+            printdouble("      glue position = ",dzglue/2*Gaudi::Units::cm);
+	tfGlue = new GeoTransform(GeoTrf::Translate3D(dzglue/2*Gaudi::Units::cm,0.,0.));
 	mother->add(tfGlue);
 	mother->add(pvGlue);
 
         if (m_verbose)
-            printdouble("      glue position = ",(3.*dzglue/2 + m_dbManager->TILBdzmast())*GeoModelKernelUnits::cm);
-	tfGlue = new GeoTransform(GeoTrf::Translate3D((3.*dzglue/2 + m_dbManager->TILBdzmast())*GeoModelKernelUnits::cm,0.,0.));
+            printdouble("      glue position = ",(3.*dzglue/2 + m_dbManager->TILBdzmast())*Gaudi::Units::cm);
+	tfGlue = new GeoTransform(GeoTrf::Translate3D((3.*dzglue/2 + m_dbManager->TILBdzmast())*Gaudi::Units::cm,0.,0.));
 	mother->add(tfGlue);
 	mother->add(pvGlue);
       }
@@ -2219,16 +2220,16 @@ void TileGeoSectionBuilder::fillPeriod(GeoPhysVol*&              mother,
         scintiDeltaInPhi = (m_uShape > 0) ? 0. : m_dbManager->SCNTdphi();
 
         thicknessWrapper = (m_dbManager->TILBdzspac() <= (scintiThickness + 2*scintiWrapInZ)) ?
-                           (scintiThickness + 2*scintiWrapInZ)*GeoModelKernelUnits::cm: m_dbManager->TILBdzspac()*GeoModelKernelUnits::cm;
+                           (scintiThickness + 2*scintiWrapInZ)*Gaudi::Units::cm: m_dbManager->TILBdzspac()*Gaudi::Units::cm;
         if (m_glue == 2)   thicknessWrapper = std::max(thicknessWrapper - m_additionalIronLayer, scintiThickness);
 
         // create wrapper
-        heightWrapper = (scintiHeight + 2*scintiWrapInR)*GeoModelKernelUnits::cm;
+        heightWrapper = (scintiHeight + 2*scintiWrapInR)*Gaudi::Units::cm;
 
         dy1Wrapper = ((scintiRC - scintiHeight/2 - scintiWrapInR + m_dbManager->TILBrmin()) *
-                     tan_delta_phi_2 - m_dbManager->TILBphigap()/2)*GeoModelKernelUnits::cm;
+                     tan_delta_phi_2 - m_dbManager->TILBphigap()/2)*Gaudi::Units::cm;
         dy2Wrapper = ((scintiRC + scintiHeight/2 + scintiWrapInR + m_dbManager->TILBrmin()) *
-                     tan_delta_phi_2 - m_dbManager->TILBphigap()/2)*GeoModelKernelUnits::cm;
+                     tan_delta_phi_2 - m_dbManager->TILBphigap()/2)*Gaudi::Units::cm;
 
         checking("Wrapper 2", true, 5, 
             thicknessWrapper/2,thicknessWrapper/2,dy1Wrapper,dy2Wrapper,heightWrapper/2);
@@ -2240,28 +2241,28 @@ void TileGeoSectionBuilder::fillPeriod(GeoPhysVol*&              mother,
 			     heightWrapper/2);
 
 	if (m_csTube) {
-          wrapper = makeHoles(wrapper, csHoleR, thicknessWrapper/2, scintiHeight/2.*GeoModelKernelUnits::cm - csTubeOffCorr);
+          wrapper = makeHoles(wrapper, csHoleR, thicknessWrapper/2, scintiHeight/2.*Gaudi::Units::cm - csTubeOffCorr);
         }
 	lvWrapper = new GeoLogVol("Wrapper",wrapper,matAir);
 	pvWrapper = new GeoPhysVol(lvWrapper);
 
         // create scintillator
         dy1Scintillator = ((scintiRC - scintiHeight/2 + m_dbManager->TILBrmin()) *
-                          tan_delta_phi_2 -  m_dbManager->TILBphigap()/2 - scintiDeltaInPhi)*GeoModelKernelUnits::cm;
+                          tan_delta_phi_2 -  m_dbManager->TILBphigap()/2 - scintiDeltaInPhi)*Gaudi::Units::cm;
         dy2Scintillator = ((scintiRC + scintiHeight/2 + m_dbManager->TILBrmin()) *
-                          tan_delta_phi_2 -  m_dbManager->TILBphigap()/2 - scintiDeltaInPhi)*GeoModelKernelUnits::cm;
+                          tan_delta_phi_2 -  m_dbManager->TILBphigap()/2 - scintiDeltaInPhi)*Gaudi::Units::cm;
 
         checking("Scintillator 2", true, 6, 
-                 scintiThickness/2*GeoModelKernelUnits::cm,scintiThickness/2*GeoModelKernelUnits::cm,dy1Scintillator,dy2Scintillator,scintiHeight/2*GeoModelKernelUnits::cm);
+                 scintiThickness/2*Gaudi::Units::cm,scintiThickness/2*Gaudi::Units::cm,dy1Scintillator,dy2Scintillator,scintiHeight/2*Gaudi::Units::cm);
 
-	scintillator = new GeoTrd(scintiThickness/2*GeoModelKernelUnits::cm,
-				  scintiThickness/2*GeoModelKernelUnits::cm,
+	scintillator = new GeoTrd(scintiThickness/2*Gaudi::Units::cm,
+				  scintiThickness/2*Gaudi::Units::cm,
 				  dy1Scintillator,
 				  dy2Scintillator,
-				  scintiHeight/2*GeoModelKernelUnits::cm);
+				  scintiHeight/2*Gaudi::Units::cm);
 
 	if (m_csTube) {
-          scintillator = makeHolesScint(scintillator, csHoleR, scintiThickness/2 * GeoModelKernelUnits::cm, scintiHeight/2.*GeoModelKernelUnits::cm - csTubeOffCorr);
+          scintillator = makeHolesScint(scintillator, csHoleR, scintiThickness/2 * Gaudi::Units::cm, scintiHeight/2.*Gaudi::Units::cm - csTubeOffCorr);
 	}
 	lvScintillator = new GeoLogVol("Scintillator",scintillator,matScin);
 	pvScintillator = new GeoPhysVol(lvScintillator);
@@ -2275,13 +2276,13 @@ void TileGeoSectionBuilder::fillPeriod(GeoPhysVol*&              mother,
         //place wrapper in period
         if (m_verbose) {
           (*m_log) << MSG::VERBOSE <<" X scintiZPos= "<<scintiZPos; 
-          printdouble("  ==>  ",(scintiZPos*thickness-m_dbManager->TILBdzspac()/2)*GeoModelKernelUnits::cm);
+          printdouble("  ==>  ",(scintiZPos*thickness-m_dbManager->TILBdzspac()/2)*Gaudi::Units::cm);
           (*m_log) << MSG::VERBOSE <<" Y scintiRC= "<<scintiRC <<endmsg;
         }
       
-	tfWrapper = new GeoTransform(GeoTrf::Translate3D((scintiZPos*thickness-m_dbManager->TILBdzspac()/2)*GeoModelKernelUnits::cm,
+	tfWrapper = new GeoTransform(GeoTrf::Translate3D((scintiZPos*thickness-m_dbManager->TILBdzspac()/2)*Gaudi::Units::cm,
 						    0.,
-						    (scintiRC-(m_dbManager->TILBrmax()-m_dbManager->TILBrmin())/2)*GeoModelKernelUnits::cm));
+						    (scintiRC-(m_dbManager->TILBrmax()-m_dbManager->TILBrmin())/2)*Gaudi::Units::cm));
 	mother->add(idTag);
 	mother->add(tfWrapper);
 	mother->add(pvWrapper);
@@ -2305,18 +2306,18 @@ void TileGeoSectionBuilder::fillPeriod(GeoPhysVol*&              mother,
         scintiDeltaInPhi = (m_uShape > 0) ? 0.0 : m_dbManager->SCNTdphi();
 
         thicknessWrapper = (m_dbManager->TILBdzspac() <= (scintiThickness + 2*scintiWrapInZ)) ?
-                           (scintiThickness + 2*scintiWrapInZ)*GeoModelKernelUnits::cm: m_dbManager->TILBdzspac()*GeoModelKernelUnits::cm;
+                           (scintiThickness + 2*scintiWrapInZ)*Gaudi::Units::cm: m_dbManager->TILBdzspac()*Gaudi::Units::cm;
         if (m_glue == 2)   thicknessWrapper = std::max(thicknessWrapper - m_additionalIronLayer, scintiThickness);
 
 	if(scintiZPos<0)
 	{
 	  idTag = new GeoIdentifierTag(j-CurrentScin);
 	  // create wrapper
-	  heightWrapper = (scintiHeight + 2*scintiWrapInR)*GeoModelKernelUnits::cm;
+	  heightWrapper = (scintiHeight + 2*scintiWrapInR)*Gaudi::Units::cm;
 	  dy1Wrapper = ((scintiRC - scintiHeight/2 - scintiWrapInR + m_dbManager->TILBrmin()) *
-                       tan_delta_phi_2 - m_dbManager->TILBphigap()/2)*GeoModelKernelUnits::cm;
+                       tan_delta_phi_2 - m_dbManager->TILBphigap()/2)*Gaudi::Units::cm;
 	  dy2Wrapper = ((scintiRC + scintiHeight/2 + scintiWrapInR + m_dbManager->TILBrmin()) *
-                       tan_delta_phi_2 - m_dbManager->TILBphigap()/2)*GeoModelKernelUnits::cm;
+                       tan_delta_phi_2 - m_dbManager->TILBphigap()/2)*Gaudi::Units::cm;
 	  
           checking("Wrapper 3", true, 5, 
               thicknessWrapper/2,thicknessWrapper/2,dy1Wrapper,dy2Wrapper,heightWrapper/2);
@@ -2328,28 +2329,28 @@ void TileGeoSectionBuilder::fillPeriod(GeoPhysVol*&              mother,
 			       heightWrapper/2);
 
           if (m_csTube) {
-            wrapper = makeHoles(wrapper, csHoleR, thicknessWrapper/2, scintiHeight/2.*GeoModelKernelUnits::cm - csTubeOffCorr);
+            wrapper = makeHoles(wrapper, csHoleR, thicknessWrapper/2, scintiHeight/2.*Gaudi::Units::cm - csTubeOffCorr);
           }
 	  lvWrapper = new GeoLogVol("Wrapper",wrapper,matAir);
 	  pvWrapper = new GeoPhysVol(lvWrapper);
 
 	  // create scintillator
 	  dy1Scintillator = ((scintiRC - scintiHeight/2 + m_dbManager->TILBrmin()) *
-                            tan_delta_phi_2 -  m_dbManager->TILBphigap()/2 - scintiDeltaInPhi)*GeoModelKernelUnits::cm;
+                            tan_delta_phi_2 -  m_dbManager->TILBphigap()/2 - scintiDeltaInPhi)*Gaudi::Units::cm;
 	  dy2Scintillator = ((scintiRC + scintiHeight/2 + m_dbManager->TILBrmin()) *
-                            tan_delta_phi_2 -  m_dbManager->TILBphigap()/2 - scintiDeltaInPhi)*GeoModelKernelUnits::cm;
+                            tan_delta_phi_2 -  m_dbManager->TILBphigap()/2 - scintiDeltaInPhi)*Gaudi::Units::cm;
 	  
           checking("Scintillator 3", true, 6, 
-                   scintiThickness/2*GeoModelKernelUnits::cm,scintiThickness/2*GeoModelKernelUnits::cm,dy1Scintillator,dy2Scintillator,scintiHeight/2*GeoModelKernelUnits::cm);
+                   scintiThickness/2*Gaudi::Units::cm,scintiThickness/2*Gaudi::Units::cm,dy1Scintillator,dy2Scintillator,scintiHeight/2*Gaudi::Units::cm);
 
-	  scintillator = new GeoTrd(scintiThickness/2*GeoModelKernelUnits::cm,
-				    scintiThickness/2*GeoModelKernelUnits::cm,
+	  scintillator = new GeoTrd(scintiThickness/2*Gaudi::Units::cm,
+				    scintiThickness/2*Gaudi::Units::cm,
 				    dy1Scintillator,
 				    dy2Scintillator,
-				    scintiHeight/2*GeoModelKernelUnits::cm);
+				    scintiHeight/2*Gaudi::Units::cm);
 
           if (m_csTube) {
-            scintillator = makeHolesScint(scintillator, csHoleR, scintiThickness/2 * GeoModelKernelUnits::cm, scintiHeight/2.*GeoModelKernelUnits::cm - csTubeOffCorr);
+            scintillator = makeHolesScint(scintillator, csHoleR, scintiThickness/2 * Gaudi::Units::cm, scintiHeight/2.*Gaudi::Units::cm - csTubeOffCorr);
           }
 	  lvScintillator = new GeoLogVol("Scintillator",scintillator,matScin);
 	  pvScintillator = new GeoPhysVol(lvScintillator);
@@ -2368,7 +2369,7 @@ void TileGeoSectionBuilder::fillPeriod(GeoPhysVol*&              mother,
           
 	  tfWrapper = new GeoTransform(GeoTrf::Translate3D(0.,
 						      0.,
-						      (scintiRC-(m_dbManager->TILBrmax()-m_dbManager->TILBrmin())/2)*GeoModelKernelUnits::cm));
+						      (scintiRC-(m_dbManager->TILBrmax()-m_dbManager->TILBrmin())/2)*Gaudi::Units::cm));
 	  mother->add(idTag);
 	  mother->add(tfWrapper);
 	  mother->add(pvWrapper);
@@ -2401,13 +2402,13 @@ void TileGeoSectionBuilder::fillPeriod(GeoPhysVol*&              mother,
         scintiDeltaInPhi = m_dbManager->SCNTdphi(); // don't need to check m_uShape for single scintillator
 
         // create wrapper
-        heightWrapper = (scintiHeight + 2*scintiWrapInR)*GeoModelKernelUnits::cm;
-        thicknessWrapper = (scintiThickness + 2*scintiWrapInZ)*GeoModelKernelUnits::cm;
+        heightWrapper = (scintiHeight + 2*scintiWrapInR)*Gaudi::Units::cm;
+        thicknessWrapper = (scintiThickness + 2*scintiWrapInZ)*Gaudi::Units::cm;
         if (m_glue == 2)   thicknessWrapper = std::max(thicknessWrapper - m_additionalIronLayer, scintiThickness);
 
-        double thicknessEnvelope = (m_dbManager->TILBdzmodul()*GeoModelKernelUnits::cm - thicknessWrapper); // along phi thickness is twice bigger than along Z 
-        dy1Wrapper = dy1Period - thicknessEnvelope + ((scintiRC - scintiHeight/2. - scintiWrapInR)*tanphi)*GeoModelKernelUnits::cm;
-        dy2Wrapper = dy1Period - thicknessEnvelope + ((scintiRC + scintiHeight/2. + scintiWrapInR)*tanphi)*GeoModelKernelUnits::cm;
+        double thicknessEnvelope = (m_dbManager->TILBdzmodul()*Gaudi::Units::cm - thicknessWrapper); // along phi thickness is twice bigger than along Z 
+        dy1Wrapper = dy1Period - thicknessEnvelope + ((scintiRC - scintiHeight/2. - scintiWrapInR)*tanphi)*Gaudi::Units::cm;
+        dy2Wrapper = dy1Period - thicknessEnvelope + ((scintiRC + scintiHeight/2. + scintiWrapInR)*tanphi)*Gaudi::Units::cm;
 
         if(m_log->level()<=MSG::DEBUG)
             (*m_log) << MSG::DEBUG <<"Envelope thickness is " << thicknessEnvelope <<endmsg;
@@ -2423,17 +2424,17 @@ void TileGeoSectionBuilder::fillPeriod(GeoPhysVol*&              mother,
 	pvWrapper = new GeoPhysVol(lvWrapper);
 
         // create scintillator
-        dy1Scintillator = dy1Period - thicknessEnvelope + ((scintiRC - scintiHeight/2.)*tanphi - scintiDeltaInPhi)*GeoModelKernelUnits::cm;
-        dy2Scintillator = dy1Period - thicknessEnvelope + ((scintiRC + scintiHeight/2.)*tanphi - scintiDeltaInPhi)*GeoModelKernelUnits::cm;
+        dy1Scintillator = dy1Period - thicknessEnvelope + ((scintiRC - scintiHeight/2.)*tanphi - scintiDeltaInPhi)*Gaudi::Units::cm;
+        dy2Scintillator = dy1Period - thicknessEnvelope + ((scintiRC + scintiHeight/2.)*tanphi - scintiDeltaInPhi)*Gaudi::Units::cm;
 
         checking("Scintillator 4", true, 6, 
-            scintiThickness/2*GeoModelKernelUnits::cm,scintiThickness/2*GeoModelKernelUnits::cm,dy1Scintillator,dy2Scintillator,scintiHeight/2*GeoModelKernelUnits::cm);
+            scintiThickness/2*Gaudi::Units::cm,scintiThickness/2*Gaudi::Units::cm,dy1Scintillator,dy2Scintillator,scintiHeight/2*Gaudi::Units::cm);
 
-	scintillator = new GeoTrd(scintiThickness/2*GeoModelKernelUnits::cm,
-				  scintiThickness/2*GeoModelKernelUnits::cm,
+	scintillator = new GeoTrd(scintiThickness/2*Gaudi::Units::cm,
+				  scintiThickness/2*Gaudi::Units::cm,
 				  dy1Scintillator,
 				  dy2Scintillator,
-				  scintiHeight/2*GeoModelKernelUnits::cm);
+				  scintiHeight/2*Gaudi::Units::cm);
 	lvScintillator = new GeoLogVol("Scintillator",scintillator,matScin);
 	pvScintillator = new GeoPhysVol(lvScintillator);
 
@@ -2451,7 +2452,7 @@ void TileGeoSectionBuilder::fillPeriod(GeoPhysVol*&              mother,
         
 	tfWrapper = new GeoTransform(GeoTrf::Translate3D(0.,
 						    0.,
-						    (scintiRC-(m_dbManager->TILBrmax()-m_dbManager->TILBrmin())/2)*GeoModelKernelUnits::cm));
+						    (scintiRC-(m_dbManager->TILBrmax()-m_dbManager->TILBrmin())/2)*Gaudi::Units::cm));
 	mother->add(idTag);
 	mother->add(tfWrapper);
 	mother->add(pvWrapper);
@@ -2538,16 +2539,16 @@ void TileGeoSectionBuilder::fillDescriptor(TileDetDescriptor*&   descriptor,
   float drGap[] = {450., 380., 313., 341., 478., 362.};
 
   if (addPlates) {
-    rBarrel[0] -= 10*GeoModelKernelUnits::mm/2;
-    rBarrel[2] += 40*GeoModelKernelUnits::mm/2;
-    drBarrel[0] += 10*GeoModelKernelUnits::mm;
-    drBarrel[2] += 40*GeoModelKernelUnits::mm;
-    rExtended[0] -= 10*GeoModelKernelUnits::mm/2;
-    rExtended[2] += 40*GeoModelKernelUnits::mm/2;
-    drExtended[0] += 10*GeoModelKernelUnits::mm;
-    drExtended[2] += 40*GeoModelKernelUnits::mm;
-    rGap[1] += 40*GeoModelKernelUnits::mm/2;
-    drGap[1] += 40*GeoModelKernelUnits::mm;
+    rBarrel[0] -= 10*Gaudi::Units::mm/2;
+    rBarrel[2] += 40*Gaudi::Units::mm/2;
+    drBarrel[0] += 10*Gaudi::Units::mm;
+    drBarrel[2] += 40*Gaudi::Units::mm;
+    rExtended[0] -= 10*Gaudi::Units::mm/2;
+    rExtended[2] += 40*Gaudi::Units::mm/2;
+    drExtended[0] += 10*Gaudi::Units::mm;
+    drExtended[2] += 40*Gaudi::Units::mm;
+    rGap[1] += 40*Gaudi::Units::mm/2;
+    drGap[1] += 40*Gaudi::Units::mm;
   }
     
   int indHardcoded = 0;
@@ -2800,10 +2801,10 @@ void TileGeoSectionBuilder::computeCellDim(TileDetDescrManager*& manager,
       dzPeriod = m_extendedPeriodThickness;
     }
 
-    rMin = m_dbManager->TILBrmin() *GeoModelKernelUnits::cm;
-    if (addPlates) rMin -= m_dbManager->TILBdrfront() *GeoModelKernelUnits::cm;
+    rMin = m_dbManager->TILBrmin() *Gaudi::Units::cm;
+    if (addPlates) rMin -= m_dbManager->TILBdrfront() *Gaudi::Units::cm;
     CurrentScin = 100*m_dbManager->TILBsection() + 1;
-    //dzMaster = m_dbManager->TILBdzmast()*GeoModelKernelUnits::cm;
+    //dzMaster = m_dbManager->TILBdzmast()*Gaudi::Units::cm;
 
     /** Initialize rMin, rMax vectors  - once per region
         Initial values for zMin - leftmost edge
@@ -2815,13 +2816,13 @@ void TileGeoSectionBuilder::computeCellDim(TileDetDescrManager*& manager,
 
       if ( (j == CurrentScin + m_dbManager->TILBnscin() - 1) && addPlates ) {
         // use end of the master as end of last cell 
-        rMax = m_dbManager->TILBrmax()*GeoModelKernelUnits::cm; 
+        rMax = m_dbManager->TILBrmax()*Gaudi::Units::cm; 
       } else {
         double tileSize=m_dbManager->SCNTdr();
         if (m_dbManager->SCNTdrw() > 0)
           // round to integer for all tiles except gap scin 
           tileSize=round(tileSize); 
-        rMax = (m_dbManager->TILBrmin() + m_dbManager->SCNTrc() + tileSize/2)*GeoModelKernelUnits::cm;
+        rMax = (m_dbManager->TILBrmin() + m_dbManager->SCNTrc() + tileSize/2)*Gaudi::Units::cm;
       }
 
       rmins.push_back(rMin);
@@ -2829,19 +2830,19 @@ void TileGeoSectionBuilder::computeCellDim(TileDetDescrManager*& manager,
       rMin = rMax;
 
       if(detector == TILE_REGION_CENTRAL) {
-	zmins.push_back((-m_dbManager->TILBdzmast()/2 - m_barrelGlue*(1./GeoModelKernelUnits::cm) 
-                         -(m_dbManager->TILBdzmodul()/2-m_dbManager->TILBdzend1()))*GeoModelKernelUnits::cm);
-        zEnd1Lim = (-m_dbManager->TILBdzmodul()/2+m_dbManager->TILBdzend1())*GeoModelKernelUnits::cm;
-        zEnd2Lim = ( m_dbManager->TILBdzmodul()/2-m_dbManager->TILBdzend2())*GeoModelKernelUnits::cm;
-        zEnd1 = (-m_dbManager->TILBdzmodul()/2)*GeoModelKernelUnits::cm;
-        zEnd2 = ( m_dbManager->TILBdzmodul()/2)*GeoModelKernelUnits::cm;
+	zmins.push_back((-m_dbManager->TILBdzmast()/2 - m_barrelGlue*(1./Gaudi::Units::cm) 
+                         -(m_dbManager->TILBdzmodul()/2-m_dbManager->TILBdzend1()))*Gaudi::Units::cm);
+        zEnd1Lim = (-m_dbManager->TILBdzmodul()/2+m_dbManager->TILBdzend1())*Gaudi::Units::cm;
+        zEnd2Lim = ( m_dbManager->TILBdzmodul()/2-m_dbManager->TILBdzend2())*Gaudi::Units::cm;
+        zEnd1 = (-m_dbManager->TILBdzmodul()/2)*Gaudi::Units::cm;
+        zEnd2 = ( m_dbManager->TILBdzmodul()/2)*Gaudi::Units::cm;
       }
       else {
-	zmins.push_back((m_dbManager->TILBzoffset() - m_dbManager->TILBdzmodul()/2 + m_dbManager->TILBdzend1())*GeoModelKernelUnits::cm);
-        zEnd1Lim = (m_dbManager->TILBzoffset() - m_dbManager->TILBdzmodul()/2+m_dbManager->TILBdzend1()+0.001)*GeoModelKernelUnits::cm;
-        zEnd2Lim = (m_dbManager->TILBzoffset() + m_dbManager->TILBdzmodul()/2-m_dbManager->TILBdzend2()-0.001)*GeoModelKernelUnits::cm;
-        zEnd1 = (m_dbManager->TILBzoffset() - m_dbManager->TILBdzmodul()/2)*GeoModelKernelUnits::cm;
-        zEnd2 = (m_dbManager->TILBzoffset() + m_dbManager->TILBdzmodul()/2)*GeoModelKernelUnits::cm;
+	zmins.push_back((m_dbManager->TILBzoffset() - m_dbManager->TILBdzmodul()/2 + m_dbManager->TILBdzend1())*Gaudi::Units::cm);
+        zEnd1Lim = (m_dbManager->TILBzoffset() - m_dbManager->TILBdzmodul()/2+m_dbManager->TILBdzend1()+0.001)*Gaudi::Units::cm;
+        zEnd2Lim = (m_dbManager->TILBzoffset() + m_dbManager->TILBdzmodul()/2-m_dbManager->TILBdzend2()-0.001)*Gaudi::Units::cm;
+        zEnd1 = (m_dbManager->TILBzoffset() - m_dbManager->TILBdzmodul()/2)*Gaudi::Units::cm;
+        zEnd2 = (m_dbManager->TILBzoffset() + m_dbManager->TILBdzmodul()/2)*Gaudi::Units::cm;
       }
       
       zmaxs.push_back(0.);
@@ -3006,7 +3007,7 @@ void TileGeoSectionBuilder::computeCellDim(TileDetDescrManager*& manager,
                         << cellDim->getRMax(jj) << " "
                         << cellDim->getZMin(jj) << " "
                         << cellDim->getZMax(jj) << "\n";
-            std::cout << " >> Cell Volume is " << cellDim->getVolume()*(1./GeoModelKernelUnits::cm3) << " cm^3\n";
+            std::cout << " >> Cell Volume is " << cellDim->getVolume()*(1./Gaudi::Units::cm3) << " cm^3\n";
 
             if(detector != TILE_REGION_CENTRAL)
             {
@@ -3016,7 +3017,7 @@ void TileGeoSectionBuilder::computeCellDim(TileDetDescrManager*& manager,
                           << cellDimNeg->getRMax(jj) << " "
                           << cellDimNeg->getZMin(jj) << " "
                           << cellDimNeg->getZMax(jj) << "\n";
-              std::cout << " >> CellNeg Volume is " << cellDimNeg->getVolume()*(1./GeoModelKernelUnits::cm3) << " cm^3\n";
+              std::cout << " >> CellNeg Volume is " << cellDimNeg->getVolume()*(1./Gaudi::Units::cm3) << " cm^3\n";
             }
           }
 	  /* ------------------------------------------------------------------------------------------------ */	  
@@ -3052,8 +3053,8 @@ void TileGeoSectionBuilder::computeCellDim(TileDetDescrManager*& manager,
         m_dbManager->SetNextTiclInDet();
       }
 
-      rMin = m_dbManager->TILBrmin()*GeoModelKernelUnits::cm;
-      if (addPlates) rMin -= m_dbManager->TILBdrfront() *GeoModelKernelUnits::cm;
+      rMin = m_dbManager->TILBrmin()*Gaudi::Units::cm;
+      if (addPlates) rMin -= m_dbManager->TILBdrfront() *Gaudi::Units::cm;
       CurrentScin = 100*m_dbManager->TILBsection() + 1;
 
       for (unsigned int j = CurrentScin; j < (CurrentScin + m_dbManager->TILBnscin()); j++)
@@ -3062,33 +3063,33 @@ void TileGeoSectionBuilder::computeCellDim(TileDetDescrManager*& manager,
 
         if ( (j == CurrentScin + m_dbManager->TILBnscin() - 1)  && addPlates ) {
           /** use end of the master as end of last cell */
-          rMax = m_dbManager->TILBrmax()*GeoModelKernelUnits::cm; 
+          rMax = m_dbManager->TILBrmax()*Gaudi::Units::cm; 
           /** subtract from C10 thickness of D4 front plate  */
           if (addPlates && sec)
-            rMax -= m_dbManager->TILBdrfront()*GeoModelKernelUnits::cm;
+            rMax -= m_dbManager->TILBdrfront()*Gaudi::Units::cm;
         } else {
           double tileSize=m_dbManager->SCNTdr();
           if (m_dbManager->SCNTdrw() > 0)
             /** round to integer for all tiles except gap scin */
             tileSize=round(tileSize); 
-          rMax = (m_dbManager->TILBrmin() + m_dbManager->SCNTrc() + tileSize/2)*GeoModelKernelUnits::cm;
+          rMax = (m_dbManager->TILBrmin() + m_dbManager->SCNTrc() + tileSize/2)*Gaudi::Units::cm;
         }
 
         rmins.push_back(rMin);
         rmaxs.push_back(rMax);
         rMin = rMax;
         
-        zEnd1Lim = (m_dbManager->TILBzoffset() - m_dbManager->TILBdzmodul()/2+m_dbManager->TILBdzend1()+0.001)*GeoModelKernelUnits::cm;
-        zEnd2Lim = (m_dbManager->TILBzoffset() + m_dbManager->TILBdzmodul()/2-m_dbManager->TILBdzend2()-0.001)*GeoModelKernelUnits::cm;
-        zEnd1 = (m_dbManager->TILBzoffset() - m_dbManager->TILBdzmodul()/2)*GeoModelKernelUnits::cm;
-        zEnd2 = (m_dbManager->TILBzoffset() + m_dbManager->TILBdzmodul()/2)*GeoModelKernelUnits::cm;
+        zEnd1Lim = (m_dbManager->TILBzoffset() - m_dbManager->TILBdzmodul()/2+m_dbManager->TILBdzend1()+0.001)*Gaudi::Units::cm;
+        zEnd2Lim = (m_dbManager->TILBzoffset() + m_dbManager->TILBdzmodul()/2-m_dbManager->TILBdzend2()-0.001)*Gaudi::Units::cm;
+        zEnd1 = (m_dbManager->TILBzoffset() - m_dbManager->TILBdzmodul()/2)*Gaudi::Units::cm;
+        zEnd2 = (m_dbManager->TILBzoffset() + m_dbManager->TILBdzmodul()/2)*Gaudi::Units::cm;
 
         if ( addPlates ) {
-          zmins.push_back((m_dbManager->TILBzoffset() - m_dbManager->TILBdzmodul()/2)*GeoModelKernelUnits::cm);
-          zmaxs.push_back((m_dbManager->TILBzoffset() + m_dbManager->TILBdzmodul()/2)*GeoModelKernelUnits::cm);
+          zmins.push_back((m_dbManager->TILBzoffset() - m_dbManager->TILBdzmodul()/2)*Gaudi::Units::cm);
+          zmaxs.push_back((m_dbManager->TILBzoffset() + m_dbManager->TILBdzmodul()/2)*Gaudi::Units::cm);
         } else {
-          zmins.push_back((m_dbManager->TILBzoffset() - m_dbManager->TILBdzmodul()/2 + m_dbManager->TILBdzend1())*GeoModelKernelUnits::cm);
-          zmaxs.push_back((m_dbManager->TILBzoffset() + m_dbManager->TILBdzmodul()/2 - m_dbManager->TILBdzend2())*GeoModelKernelUnits::cm);
+          zmins.push_back((m_dbManager->TILBzoffset() - m_dbManager->TILBdzmodul()/2 + m_dbManager->TILBdzend1())*Gaudi::Units::cm);
+          zmaxs.push_back((m_dbManager->TILBzoffset() + m_dbManager->TILBdzmodul()/2 - m_dbManager->TILBdzend2())*Gaudi::Units::cm);
         }
       }
 
@@ -3138,7 +3139,7 @@ void TileGeoSectionBuilder::computeCellDim(TileDetDescrManager*& manager,
                     << cellDim->getRMax(jj) << " "
                     << cellDim->getZMin(jj) << " "
                     << cellDim->getZMax(jj) << "\n";
-        std::cout<< " >> Cell Volume is " << cellDim->getVolume()*(1./GeoModelKernelUnits::cm3) << " cm^3\n";
+        std::cout<< " >> Cell Volume is " << cellDim->getVolume()*(1./Gaudi::Units::cm3) << " cm^3\n";
     
         std::cout << " >> CellDimNeg contains " << cellDimNeg->getNRows() << " rows\n";
         for(unsigned int jj=0; jj<cellDimNeg->getNRows(); jj++)
@@ -3146,7 +3147,7 @@ void TileGeoSectionBuilder::computeCellDim(TileDetDescrManager*& manager,
                     << cellDimNeg->getRMax(jj) << " "
                     << cellDimNeg->getZMin(jj) << " "
                     << cellDimNeg->getZMax(jj) << "\n";
-        std::cout << " >> CellNeg Volume is " << cellDimNeg->getVolume()*(1./GeoModelKernelUnits::cm3) << " cm^3\n";
+        std::cout << " >> CellNeg Volume is " << cellDimNeg->getVolume()*(1./Gaudi::Units::cm3) << " cm^3\n";
       }
 /* -------------------------------------------- */
     }
@@ -3169,20 +3170,20 @@ void TileGeoSectionBuilder::computeCellDim(TileDetDescrManager*& manager,
 	CurrentScin = 100*m_dbManager->TILBsection()+1;
       }
 
-      rMin = m_dbManager->TILBrmin()*GeoModelKernelUnits::cm;
+      rMin = m_dbManager->TILBrmin()*Gaudi::Units::cm;
 
       // Initialize rMin, rMax, zMin, zMax vectors
       for (unsigned int j = CurrentScin; j < (CurrentScin + m_dbManager->TILBnscin()); j++)
       {
 	m_dbManager->SetCurrentScin(j);
-	rMax = rMin + m_dbManager->SCNTdr()*GeoModelKernelUnits::cm;
+	rMax = rMin + m_dbManager->SCNTdr()*Gaudi::Units::cm;
 	
 	rmins.push_back(rMin);
 	rmaxs.push_back(rMax);
 	rMin = rMax;
 	
-	zmins.push_back((m_dbManager->TILBzoffset() - m_dbManager->TILBdzmodul()/2)*GeoModelKernelUnits::cm);
-	zmaxs.push_back((m_dbManager->TILBzoffset() + m_dbManager->TILBdzmodul()/2)*GeoModelKernelUnits::cm);
+	zmins.push_back((m_dbManager->TILBzoffset() - m_dbManager->TILBdzmodul()/2)*Gaudi::Units::cm);
+	zmaxs.push_back((m_dbManager->TILBzoffset() + m_dbManager->TILBdzmodul()/2)*Gaudi::Units::cm);
       }
 
       // Iterate through scintillators and create corresponding TileCellDim objects (+/-)
@@ -3230,7 +3231,7 @@ void TileGeoSectionBuilder::computeCellDim(TileDetDescrManager*& manager,
                       << cellDim->getRMax(jj) << " "
                       << cellDim->getZMin(jj) << " "
                       << cellDim->getZMax(jj) << "\n";
-          std::cout << " >> Cell Volume is " << cellDim->getVolume()*(1./GeoModelKernelUnits::cm3) << " cm^3\n";
+          std::cout << " >> Cell Volume is " << cellDim->getVolume()*(1./Gaudi::Units::cm3) << " cm^3\n";
     
           std::cout << " >> CellDimNeg contains " << cellDimNeg->getNRows() << " rows\n";
           for(unsigned int jj=0; jj<cellDimNeg->getNRows(); jj++)
@@ -3238,7 +3239,7 @@ void TileGeoSectionBuilder::computeCellDim(TileDetDescrManager*& manager,
                       << cellDimNeg->getRMax(jj) << " "
                       << cellDimNeg->getZMin(jj) << " "
                       << cellDimNeg->getZMax(jj) << "\n";
-          std::cout << " >> CellNeg Volume is " << cellDimNeg->getVolume()*(1./GeoModelKernelUnits::cm3) << " cm^3\n";
+          std::cout << " >> CellNeg Volume is " << cellDimNeg->getVolume()*(1./Gaudi::Units::cm3) << " cm^3\n";
         }
 /* -------------------------------------------- */
       }
@@ -3280,10 +3281,10 @@ void TileGeoSectionBuilder::calculateZ(int detector,
   // first - find position in ideal world before Z-shift and misalignment
   if (detector == TILE_REGION_CENTRAL) {
     // need to split one cylinder in pos/neg halves
-    float zmin=m_dbManager->TILBzoffset()/2 * GeoModelKernelUnits::cm ;
-    float zmax=zmin+m_dbManager->TILBdzmodul()/2 * GeoModelKernelUnits::cm ;
+    float zmin=m_dbManager->TILBzoffset()/2 * Gaudi::Units::cm ;
+    float zmax=zmin+m_dbManager->TILBdzmodul()/2 * Gaudi::Units::cm ;
     if (sample==3) { // fix for D0 cell 
-      float D0size = 560.58/307*40 * GeoModelKernelUnits::cm; // size of D0 along Z in GeoModelKernelUnits::cm
+      float D0size = 560.58/307*40 * Gaudi::Units::cm; // size of D0 along Z in Gaudi::Units::cm
                                   // FIXME:: should be taken from DB
       if (side>0) // positive
         zmin = - D0size/2;
@@ -3293,13 +3294,13 @@ void TileGeoSectionBuilder::calculateZ(int detector,
     zcenter = (zmin+zmax)/2;
     dz = (zmax-zmin);
   } else if (detector == TILE_REGION_GAP && (sample > 9) ){
-    zcenter=m_dbManager->TILBzoffset() * GeoModelKernelUnits::cm ;
+    zcenter=m_dbManager->TILBzoffset() * Gaudi::Units::cm ;
     m_dbManager->SetCurrentScin(100*m_dbManager->TILBsection() + 1 );
-    dz =  m_dbManager->SCNTdt()*GeoModelKernelUnits::cm;
+    dz =  m_dbManager->SCNTdt()*Gaudi::Units::cm;
   }
   else {
-    zcenter=m_dbManager->TILBzoffset() * GeoModelKernelUnits::cm ;
-    dz=m_dbManager->TILBdzmodul() * GeoModelKernelUnits::cm ;
+    zcenter=m_dbManager->TILBzoffset() * Gaudi::Units::cm ;
+    dz=m_dbManager->TILBdzmodul() * Gaudi::Units::cm ;
   }
 
   // apply zshift from ideal pseudo-projective eta (which includes alignment also!)
@@ -3425,18 +3426,18 @@ void TileGeoSectionBuilder::printdouble(const char * name, double val)
 }
 
 const GeoShape * TileGeoSectionBuilder::makeHolesScint(const GeoShape * mother, double R, double H2, double off, double off0) {
-    GeoShape *hole = new GeoTubs(0., R, H2, 0., 360.0 * GeoModelKernelUnits::deg);
+    GeoShape *hole = new GeoTubs(0., R, H2, 0., 360.0 * Gaudi::Units::deg);
     const  GeoShapeUnion& scintUnion = hole->add( *hole << GeoTrf::Translate3D((off0-off*2.0),0.,0.));
-    GeoTrf::Transform3D tfHole = GeoTrf::Translate3D(0.,0.,(off0-off)) * GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg);
+    GeoTrf::Transform3D tfHole = GeoTrf::Translate3D(0.,0.,(off0-off)) * GeoTrf::RotateY3D(90*Gaudi::Units::deg);
     const GeoShape & motherWithHoles = (mother->subtract(scintUnion<<tfHole));
     return &motherWithHoles;
 }
 
 const GeoShape * TileGeoSectionBuilder::makeHoles(const GeoShape * mother, double R, double H2, double off, double off0) {
-  GeoShape *hole1 = new GeoTubs(0., R, H2, 0., 360.0 * GeoModelKernelUnits::deg);
-  GeoShape *hole2 = new GeoTubs(0., R, H2, 0., 360.0 * GeoModelKernelUnits::deg);
-  GeoTrf::Transform3D tfHole1 = GeoTrf::Translate3D(0.,0.,(off0-off)) * GeoTrf::RotateY3D(-90*GeoModelKernelUnits::deg);
-  GeoTrf::Transform3D tfHole2 = GeoTrf::Translate3D(0.,0.,(off0+off)) * GeoTrf::RotateY3D(-90*GeoModelKernelUnits::deg);
+  GeoShape *hole1 = new GeoTubs(0., R, H2, 0., 360.0 * Gaudi::Units::deg);
+  GeoShape *hole2 = new GeoTubs(0., R, H2, 0., 360.0 * Gaudi::Units::deg);
+  GeoTrf::Transform3D tfHole1 = GeoTrf::Translate3D(0.,0.,(off0-off)) * GeoTrf::RotateY3D(-90*Gaudi::Units::deg);
+  GeoTrf::Transform3D tfHole2 = GeoTrf::Translate3D(0.,0.,(off0+off)) * GeoTrf::RotateY3D(-90*Gaudi::Units::deg);
   const GeoShape & motherWithHoles = (mother->subtract((*hole1)<<tfHole1).subtract((*hole2)<<tfHole2));
   return &motherWithHoles;
 }
diff --git a/TileCalorimeter/TileGeoModel/src/TileTBFactory.cxx b/TileCalorimeter/TileGeoModel/src/TileTBFactory.cxx
index 8a25b3f8affb8cbd23d091f5e00fa37bb55114fa..99656aa2021975c52e7a25762f0e3f560a870bdc 100755
--- a/TileCalorimeter/TileGeoModel/src/TileTBFactory.cxx
+++ b/TileCalorimeter/TileGeoModel/src/TileTBFactory.cxx
@@ -20,7 +20,6 @@
 #include "GeoModelKernel/GeoShapeUnion.h"
 #include "GeoModelKernel/GeoShapeShift.h"
 #include "GeoModelKernel/GeoDefinitions.h"
-#include "GeoModelKernel/Units.h"
 
 #include "GeoGenericFunctions/AbsFunction.h"
 #include "GeoGenericFunctions/Variable.h"
@@ -33,6 +32,7 @@
 #include "StoreGate/StoreGateSvc.h"
 
 #include "GaudiKernel/MsgStream.h"
+#include "GaudiKernel/SystemOfUnits.h"
 
 #include <stdexcept>
 #include <iostream>
@@ -181,11 +181,11 @@ void TileTBFactory::create(GeoPhysVol *world)
   //int EnvNumLayer = 64;
   //dbManager->SetCurrentSection(TileDddbManager::TILE_BARREL);
   //double deltaPhi = 360./dbManager->TILEnmodul();
-  GeoTubs* tileTBEnv = new GeoTubs(RInMin * GeoModelKernelUnits::cm,
-				   ROutMax * GeoModelKernelUnits::cm,
-				   tileTBEnvThickness/2.0 * GeoModelKernelUnits::cm,
-				   PhiMin*GeoModelKernelUnits::deg,
-				   (PhiMax - PhiMin)*GeoModelKernelUnits::deg);
+  GeoTubs* tileTBEnv = new GeoTubs(RInMin * Gaudi::Units::cm,
+				   ROutMax * Gaudi::Units::cm,
+				   tileTBEnvThickness/2.0 * Gaudi::Units::cm,
+				   PhiMin*Gaudi::Units::deg,
+				   (PhiMax - PhiMin)*Gaudi::Units::deg);
   
   (*m_log) << MSG::DEBUG << "TileTB envelope parameters: " 
       << " length=" << tileTBEnvThickness << " cm"
@@ -213,19 +213,19 @@ void TileTBFactory::create(GeoPhysVol *world)
     //----------------------- BUILDING ENVELOPES------------------------
     
     // It may be usful on the way of universalization
-    //    GeoTubs* GeneralMother = new GeoTubs((dbManager->GetEnvRin()) * GeoModelKernelUnits::cm,
-    //					 (dbManager->GetEnvRout()) * GeoModelKernelUnits::cm,
-    //				 (dbManager->GetEnvZLength())/2.0 * GeoModelKernelUnits::cm,
-    //				 0.0 * deltaPhi * GeoModelKernelUnits::deg,
-    //				 (NumberOfMod)*deltaPhi*GeoModelKernelUnits::deg);
+    //    GeoTubs* GeneralMother = new GeoTubs((dbManager->GetEnvRin()) * Gaudi::Units::cm,
+    //					 (dbManager->GetEnvRout()) * Gaudi::Units::cm,
+    //				 (dbManager->GetEnvZLength())/2.0 * Gaudi::Units::cm,
+    //				 0.0 * deltaPhi * Gaudi::Units::deg,
+    //				 (NumberOfMod)*deltaPhi*Gaudi::Units::deg);
   
     if(EnvType == 1) {
 
-      GeoTubs* GeneralMother = new GeoTubs((dbManager->GetEnvRin()) * GeoModelKernelUnits::cm,
-					   (dbManager->GetEnvRout()) * GeoModelKernelUnits::cm,
-					   (dbManager->GetEnvZLength() - 2 * BFingerLength)/2.0 * GeoModelKernelUnits::cm,
-					   0.0 * GeoModelKernelUnits::deg,
-					   NumberOfMod*deltaPhi*GeoModelKernelUnits::deg);
+      GeoTubs* GeneralMother = new GeoTubs((dbManager->GetEnvRin()) * Gaudi::Units::cm,
+					   (dbManager->GetEnvRout()) * Gaudi::Units::cm,
+					   (dbManager->GetEnvZLength() - 2 * BFingerLength)/2.0 * Gaudi::Units::cm,
+					   0.0 * Gaudi::Units::deg,
+					   NumberOfMod*deltaPhi*Gaudi::Units::deg);
 
       GeoTubs* barrelMother = GeneralMother;      
       GeoLogVol* lvBarrelMother = new GeoLogVol("Barrel",barrelMother,matAir);
@@ -241,11 +241,11 @@ void TileTBFactory::create(GeoPhysVol *world)
       //Envelopes for two barrel fingers
       dbManager->SetCurrentTifg(2);  //use small size for barrel finger !
 
-      GeoTubs* fingerMother = new GeoTubs(FingerRmin*GeoModelKernelUnits::cm,
-      					  dbManager->GetEnvRout()*GeoModelKernelUnits::cm,
-      					  BFingerLength/2.*GeoModelKernelUnits::cm,
-      					  0.0 * GeoModelKernelUnits::deg,
-      					  NumberOfMod*deltaPhi*GeoModelKernelUnits::deg);
+      GeoTubs* fingerMother = new GeoTubs(FingerRmin*Gaudi::Units::cm,
+      					  dbManager->GetEnvRout()*Gaudi::Units::cm,
+      					  BFingerLength/2.*Gaudi::Units::cm,
+      					  0.0 * Gaudi::Units::deg,
+      					  NumberOfMod*deltaPhi*Gaudi::Units::deg);
 
       GeoLogVol* lvFingerMother = new GeoLogVol("Finger",fingerMother,matAir);
       pvFingerMotherPos = new GeoFullPhysVol(lvFingerMother);
@@ -260,11 +260,11 @@ void TileTBFactory::create(GeoPhysVol *world)
     }
     
     if(EnvType == 3) {   
-      GeoTubs* GeneralMother = new GeoTubs((dbManager->GetEnvRin()) * GeoModelKernelUnits::cm,
-					   (dbManager->GetEnvRout()) * GeoModelKernelUnits::cm,
-					   (dbManager->GetEnvZLength() - EBFingerLength)/2.0 * GeoModelKernelUnits::cm,
-					   0.0 * GeoModelKernelUnits::deg,
-					   NumberOfMod*deltaPhi*GeoModelKernelUnits::deg);
+      GeoTubs* GeneralMother = new GeoTubs((dbManager->GetEnvRin()) * Gaudi::Units::cm,
+					   (dbManager->GetEnvRout()) * Gaudi::Units::cm,
+					   (dbManager->GetEnvZLength() - EBFingerLength)/2.0 * Gaudi::Units::cm,
+					   0.0 * Gaudi::Units::deg,
+					   NumberOfMod*deltaPhi*Gaudi::Units::deg);
 
       GeoTubs* ebarrelMotherPos = GeneralMother;
       GeoLogVol* lvEBarrelMotherPos = new GeoLogVol("EBarrel",ebarrelMotherPos,matAir);
@@ -278,11 +278,11 @@ void TileTBFactory::create(GeoPhysVol *world)
           << endmsg;
 
       //Envelope for finger separately
-      GeoTubs* fingerMother = new GeoTubs(FingerRmin*GeoModelKernelUnits::cm,
-					  dbManager->GetEnvRout()*GeoModelKernelUnits::cm,
-					  EBFingerLength/2.*GeoModelKernelUnits::cm,
-					  0.0 * GeoModelKernelUnits::deg,
-					  NumberOfMod*deltaPhi*GeoModelKernelUnits::deg);
+      GeoTubs* fingerMother = new GeoTubs(FingerRmin*Gaudi::Units::cm,
+					  dbManager->GetEnvRout()*Gaudi::Units::cm,
+					  EBFingerLength/2.*Gaudi::Units::cm,
+					  0.0 * Gaudi::Units::deg,
+					  NumberOfMod*deltaPhi*Gaudi::Units::deg);
 
       GeoLogVol* lvEFingerMother = new GeoLogVol("EFinger",fingerMother,matAir);
       pvEFingerMotherPos = new GeoFullPhysVol(lvEFingerMother);
@@ -296,11 +296,11 @@ void TileTBFactory::create(GeoPhysVol *world)
     }
     
     if(EnvType == 2) {    
-      GeoTubs* GeneralMother = new GeoTubs((dbManager->GetEnvRin()) * GeoModelKernelUnits::cm,
-					   (dbManager->GetEnvRout()) * GeoModelKernelUnits::cm,
-					   (dbManager->GetEnvZLength() - EBFingerLength)/2.0 * GeoModelKernelUnits::cm,
-					   0.0 * GeoModelKernelUnits::deg,
-					   NumberOfMod*deltaPhi*GeoModelKernelUnits::deg);
+      GeoTubs* GeneralMother = new GeoTubs((dbManager->GetEnvRin()) * Gaudi::Units::cm,
+					   (dbManager->GetEnvRout()) * Gaudi::Units::cm,
+					   (dbManager->GetEnvZLength() - EBFingerLength)/2.0 * Gaudi::Units::cm,
+					   0.0 * Gaudi::Units::deg,
+					   NumberOfMod*deltaPhi*Gaudi::Units::deg);
       GeoTubs* ebarrelMotherNeg = GeneralMother;
       GeoLogVol* lvEBarrelMotherNeg = new GeoLogVol("EBarrel",ebarrelMotherNeg,matAir);  
       pvEBarrelMotherNeg = new GeoFullPhysVol(lvEBarrelMotherNeg);
@@ -313,11 +313,11 @@ void TileTBFactory::create(GeoPhysVol *world)
           << endmsg;
 
       //Envelope for finger separately
-      GeoTubs* fingerMother = new GeoTubs(FingerRmin*GeoModelKernelUnits::cm,
-					  dbManager->GetEnvRout()*GeoModelKernelUnits::cm,
-					  EBFingerLength/2.*GeoModelKernelUnits::cm,
-					  0.0 * GeoModelKernelUnits::deg,
-					  NumberOfMod*deltaPhi*GeoModelKernelUnits::deg);
+      GeoTubs* fingerMother = new GeoTubs(FingerRmin*Gaudi::Units::cm,
+					  dbManager->GetEnvRout()*Gaudi::Units::cm,
+					  EBFingerLength/2.*Gaudi::Units::cm,
+					  0.0 * Gaudi::Units::deg,
+					  NumberOfMod*deltaPhi*Gaudi::Units::deg);
       
       GeoLogVol* lvEFingerMother = new GeoLogVol("EFinger",fingerMother,matAir);
       pvEFingerMotherNeg = new GeoFullPhysVol(lvEFingerMother);
@@ -331,11 +331,11 @@ void TileTBFactory::create(GeoPhysVol *world)
     }
     
     if(EnvType == 5) {
-      GeoTubs* GeneralMother = new GeoTubs((dbManager->GetEnvRin()) * GeoModelKernelUnits::cm,
-					   (dbManager->GetEnvRout()) * GeoModelKernelUnits::cm,
-					   (dbManager->GetEnvZLength())/2.0 * GeoModelKernelUnits::cm,
-					   0.0 * GeoModelKernelUnits::deg,
-					   NumberOfMod*deltaPhi*GeoModelKernelUnits::deg);
+      GeoTubs* GeneralMother = new GeoTubs((dbManager->GetEnvRin()) * Gaudi::Units::cm,
+					   (dbManager->GetEnvRout()) * Gaudi::Units::cm,
+					   (dbManager->GetEnvZLength())/2.0 * Gaudi::Units::cm,
+					   0.0 * Gaudi::Units::deg,
+					   NumberOfMod*deltaPhi*Gaudi::Units::deg);
       
       GeoTubs* itcMother = GeneralMother;
       GeoLogVol* lvITCMother = new GeoLogVol("ITC",itcMother,matAir);
@@ -350,11 +350,11 @@ void TileTBFactory::create(GeoPhysVol *world)
     }
     
     if(EnvType == 4) {
-      GeoTubs* GeneralMother = new GeoTubs((dbManager->GetEnvRin()) * GeoModelKernelUnits::cm,
-					   (dbManager->GetEnvRout()) * GeoModelKernelUnits::cm,
-					   (dbManager->GetEnvZLength())/2.0 * GeoModelKernelUnits::cm,
-					   0.0 * GeoModelKernelUnits::deg,
-					   NumberOfMod*deltaPhi*GeoModelKernelUnits::deg);
+      GeoTubs* GeneralMother = new GeoTubs((dbManager->GetEnvRin()) * Gaudi::Units::cm,
+					   (dbManager->GetEnvRout()) * Gaudi::Units::cm,
+					   (dbManager->GetEnvZLength())/2.0 * Gaudi::Units::cm,
+					   0.0 * Gaudi::Units::deg,
+					   NumberOfMod*deltaPhi*Gaudi::Units::deg);
 
       GeoTubs* itcMotherNeg = GeneralMother;
       GeoLogVol* lvITCMotherNeg = new GeoLogVol("ITC",itcMotherNeg,matAir);
@@ -386,17 +386,17 @@ void TileTBFactory::create(GeoPhysVol *world)
           << endmsg;
           
       Variable varInd;
-      GENFUNCTION phiInd = deltaPhi*(varInd + ModCounter + 0.5) * GeoModelKernelUnits::deg; 
+      GENFUNCTION phiInd = deltaPhi*(varInd + ModCounter + 0.5) * Gaudi::Units::deg; 
 
 
       //------------------- BARREL BLOCKS -------------------------------------
      
       if( EnvType == 1 || EnvType == 0 ) { // normal barrel module or module zero
         dbManager->SetCurrentSectionByNumber(ModType);	  
-        thicknessWedgeMother = dbManager->TILBdzmodul() * GeoModelKernelUnits::cm;
-        heightWedgeMother = (dbManager->TILBrmaximal() - dbManager->TILBrminimal()) * GeoModelKernelUnits::cm;
-        dy1WedgeMother = dbManager->TILBrminimal() * tan(deltaPhi/2.*GeoModelKernelUnits::deg) * GeoModelKernelUnits::cm;
-        dy2WedgeMother = dbManager->TILBrmaximal() * tan(deltaPhi/2.*GeoModelKernelUnits::deg) * GeoModelKernelUnits::cm;
+        thicknessWedgeMother = dbManager->TILBdzmodul() * Gaudi::Units::cm;
+        heightWedgeMother = (dbManager->TILBrmaximal() - dbManager->TILBrminimal()) * Gaudi::Units::cm;
+        dy1WedgeMother = dbManager->TILBrminimal() * tan(deltaPhi/2.*Gaudi::Units::deg) * Gaudi::Units::cm;
+        dy2WedgeMother = dbManager->TILBrmaximal() * tan(deltaPhi/2.*Gaudi::Units::deg) * Gaudi::Units::cm;
        
         dzGlue = (dbManager->TILBdzmodul() - dbManager->TILBdzend1() - dbManager->TILBdzend2() - (dbManager->TILBnperiod()*2.*(dbManager->TILBdzmast() + dbManager->TILBdzspac()) - dbManager->TILBdzmast()))/(2.*(2.*dbManager->TILBnperiod() - 1));
        
@@ -417,7 +417,7 @@ void TileTBFactory::create(GeoPhysVol *world)
                                     dzGlue,
                                     deltaPhi); 
        
-        TRANSFUNCTION xfBarrelModuleMother = Pow(GeoTrf::RotateZ3D(1.0),phiInd)*GeoTrf::TranslateX3D((dbManager->TILBrmaximal()+dbManager->TILBrminimal())/2.*GeoModelKernelUnits::cm)*GeoTrf::RotateX3D(180*GeoModelKernelUnits::deg)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg);
+        TRANSFUNCTION xfBarrelModuleMother = Pow(GeoTrf::RotateZ3D(1.0),phiInd)*GeoTrf::TranslateX3D((dbManager->TILBrmaximal()+dbManager->TILBrminimal())/2.*Gaudi::Units::cm)*GeoTrf::RotateX3D(180*Gaudi::Units::deg)*GeoTrf::RotateY3D(90*Gaudi::Units::deg);
 
         GeoSerialTransformer* stBarrelModuleMother = new GeoSerialTransformer(pvBarrelModuleMother,
                                                                               &xfBarrelModuleMother,
@@ -433,10 +433,10 @@ void TileTBFactory::create(GeoPhysVol *world)
 
         // Trd - one finger mother
 
-        thicknessWedgeMother = dbManager->TIFGdz() * GeoModelKernelUnits::cm;
-        heightWedgeMother = (dbManager->TILErmax() - dbManager->TILBrmax()) * GeoModelKernelUnits::cm;
-        dy1WedgeMother = dbManager->TILBrmax() * tan(deltaPhi/2.*GeoModelKernelUnits::deg) * GeoModelKernelUnits::cm;
-        dy2WedgeMother = dbManager->TILErmax() * tan(deltaPhi/2.*GeoModelKernelUnits::deg) * GeoModelKernelUnits::cm;
+        thicknessWedgeMother = dbManager->TIFGdz() * Gaudi::Units::cm;
+        heightWedgeMother = (dbManager->TILErmax() - dbManager->TILBrmax()) * Gaudi::Units::cm;
+        dy1WedgeMother = dbManager->TILBrmax() * tan(deltaPhi/2.*Gaudi::Units::deg) * Gaudi::Units::cm;
+        dy2WedgeMother = dbManager->TILErmax() * tan(deltaPhi/2.*Gaudi::Units::deg) * Gaudi::Units::cm;
        
         GeoTrd* fingerModuleMother = new GeoTrd(thicknessWedgeMother/2.,
                                                 thicknessWedgeMother/2.,
@@ -454,10 +454,10 @@ void TileTBFactory::create(GeoPhysVol *world)
                                    deltaPhi,
                                    m_testbeamGeometry,
                                    ModuleNcp,
-                                   thicknessWedgeMother*(1./GeoModelKernelUnits::cm));
+                                   thicknessWedgeMother*(1./Gaudi::Units::cm));
        
         // --- Position N modules inside mother (positive/negative) -----
-        TRANSFUNCTION xfFingerModuleMotherPos = Pow(GeoTrf::RotateZ3D(1.0),phiInd)*GeoTrf::TranslateX3D((dbManager->TILErmax()+dbManager->TILBrmax())/2.*GeoModelKernelUnits::cm)*GeoTrf::RotateX3D(180*GeoModelKernelUnits::deg)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg);
+        TRANSFUNCTION xfFingerModuleMotherPos = Pow(GeoTrf::RotateZ3D(1.0),phiInd)*GeoTrf::TranslateX3D((dbManager->TILErmax()+dbManager->TILBrmax())/2.*Gaudi::Units::cm)*GeoTrf::RotateX3D(180*Gaudi::Units::deg)*GeoTrf::RotateY3D(90*Gaudi::Units::deg);
         
         GeoSerialTransformer* stFingerModuleMotherPos = new GeoSerialTransformer(pvFingerModuleMother,
                                                                                  &xfFingerModuleMotherPos,
@@ -465,7 +465,7 @@ void TileTBFactory::create(GeoPhysVol *world)
         pvFingerMotherPos->add(new GeoSerialIdentifier(ModPositionNumber));
         pvFingerMotherPos->add(stFingerModuleMotherPos);
        
-        TRANSFUNCTION xfFingerModuleMotherNeg = Pow(GeoTrf::RotateZ3D(1.0),phiInd)*GeoTrf::TranslateX3D((dbManager->TILErmax()+dbManager->TILBrmax())/2.*GeoModelKernelUnits::cm)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg);
+        TRANSFUNCTION xfFingerModuleMotherNeg = Pow(GeoTrf::RotateZ3D(1.0),phiInd)*GeoTrf::TranslateX3D((dbManager->TILErmax()+dbManager->TILBrmax())/2.*Gaudi::Units::cm)*GeoTrf::RotateY3D(90*Gaudi::Units::deg);
 
         GeoSerialTransformer* stFingerModuleMotherNeg = new GeoSerialTransformer(pvFingerModuleMother,
                                                                                  &xfFingerModuleMotherNeg,
@@ -480,10 +480,10 @@ void TileTBFactory::create(GeoPhysVol *world)
       if((ModType == 2)&&(EnvType == 3)){
         dbManager->SetCurrentSectionByNumber(ModType);
         // Trd - module mother 
-        thicknessWedgeMother = dbManager->TILBdzmodul() * GeoModelKernelUnits::cm;
-        heightWedgeMother = (dbManager->TILBrmaximal() - dbManager->TILBrminimal()) * GeoModelKernelUnits::cm;
-        dy1WedgeMother = dbManager->TILBrminimal() * tan(deltaPhi/2.*GeoModelKernelUnits::deg) * GeoModelKernelUnits::cm;
-        dy2WedgeMother = dbManager->TILBrmaximal() * tan(deltaPhi/2.*GeoModelKernelUnits::deg) * GeoModelKernelUnits::cm;
+        thicknessWedgeMother = dbManager->TILBdzmodul() * Gaudi::Units::cm;
+        heightWedgeMother = (dbManager->TILBrmaximal() - dbManager->TILBrminimal()) * Gaudi::Units::cm;
+        dy1WedgeMother = dbManager->TILBrminimal() * tan(deltaPhi/2.*Gaudi::Units::deg) * Gaudi::Units::cm;
+        dy2WedgeMother = dbManager->TILBrmaximal() * tan(deltaPhi/2.*Gaudi::Units::deg) * Gaudi::Units::cm;
         
         dzGlue = (dbManager->TILBdzmodul() - dbManager->TILBdzend1() - dbManager->TILBdzend2() - dbManager->TILBnperiod()*2.*(dbManager->TILBdzmast() + dbManager->TILBdzspac()))/(4.*dbManager->TILBnperiod());
         
@@ -504,7 +504,7 @@ void TileTBFactory::create(GeoPhysVol *world)
                                     dzGlue,
                                     deltaPhi);
              
-        TRANSFUNCTION xfEBarrelModuleMotherPos = Pow(GeoTrf::RotateZ3D(1.0),phiInd)*GeoTrf::TranslateX3D((dbManager->TILBrmaximal()+dbManager->TILBrminimal())/2.*GeoModelKernelUnits::cm)*GeoTrf::RotateX3D(180*GeoModelKernelUnits::deg)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg);
+        TRANSFUNCTION xfEBarrelModuleMotherPos = Pow(GeoTrf::RotateZ3D(1.0),phiInd)*GeoTrf::TranslateX3D((dbManager->TILBrmaximal()+dbManager->TILBrminimal())/2.*Gaudi::Units::cm)*GeoTrf::RotateX3D(180*Gaudi::Units::deg)*GeoTrf::RotateY3D(90*Gaudi::Units::deg);
         
         GeoSerialTransformer* stEBarrelModuleMotherPos = new GeoSerialTransformer(pvEBarrelModuleMotherPos,
                                                                                   &xfEBarrelModuleMotherPos,
@@ -518,10 +518,10 @@ void TileTBFactory::create(GeoPhysVol *world)
         dbManager->SetCurrentTifg(2);  //barrel efinger (small)
         
         // Trd - one finger mother
-        thicknessWedgeMother = dbManager->TIFGdz() * GeoModelKernelUnits::cm;
-        heightWedgeMother = (dbManager->TILErmax() - dbManager->TILBrmax()) * GeoModelKernelUnits::cm;
-        dy1WedgeMother = dbManager->TILBrmax() * tan(deltaPhi/2.*GeoModelKernelUnits::deg) * GeoModelKernelUnits::cm;
-        dy2WedgeMother = dbManager->TILErmax() * tan(deltaPhi/2.*GeoModelKernelUnits::deg) * GeoModelKernelUnits::cm;
+        thicknessWedgeMother = dbManager->TIFGdz() * Gaudi::Units::cm;
+        heightWedgeMother = (dbManager->TILErmax() - dbManager->TILBrmax()) * Gaudi::Units::cm;
+        dy1WedgeMother = dbManager->TILBrmax() * tan(deltaPhi/2.*Gaudi::Units::deg) * Gaudi::Units::cm;
+        dy2WedgeMother = dbManager->TILErmax() * tan(deltaPhi/2.*Gaudi::Units::deg) * Gaudi::Units::cm;
         
         GeoTrd* efingerModuleMother = new GeoTrd(thicknessWedgeMother/2.,
                                                  thicknessWedgeMother/2.,
@@ -542,7 +542,7 @@ void TileTBFactory::create(GeoPhysVol *world)
         
         // --- Position N modules inside mother (positive/negative) -----
   
-        TRANSFUNCTION xfEFingerModuleMotherPos = Pow(GeoTrf::RotateZ3D(1.0),phiInd)*GeoTrf::TranslateX3D((dbManager->TILErmax()+dbManager->TILBrmax())/2.*GeoModelKernelUnits::cm)*GeoTrf::RotateX3D(180*GeoModelKernelUnits::deg)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg);
+        TRANSFUNCTION xfEFingerModuleMotherPos = Pow(GeoTrf::RotateZ3D(1.0),phiInd)*GeoTrf::TranslateX3D((dbManager->TILErmax()+dbManager->TILBrmax())/2.*Gaudi::Units::cm)*GeoTrf::RotateX3D(180*Gaudi::Units::deg)*GeoTrf::RotateY3D(90*Gaudi::Units::deg);
         
         GeoSerialTransformer* stEFingerModuleMotherPos = new GeoSerialTransformer(pvEFingerModuleMother,
                                                                                   &xfEFingerModuleMotherPos,
@@ -557,10 +557,10 @@ void TileTBFactory::create(GeoPhysVol *world)
       if((ModType == 2)&&(EnvType == 2)){
         dbManager->SetCurrentSectionByNumber(ModType);
         // Trd - module mother 
-        thicknessWedgeMother = dbManager->TILBdzmodul() * GeoModelKernelUnits::cm;
-        heightWedgeMother = (dbManager->TILBrmaximal() - dbManager->TILBrminimal()) * GeoModelKernelUnits::cm;
-        dy1WedgeMother = dbManager->TILBrminimal() * tan(deltaPhi/2.*GeoModelKernelUnits::deg) * GeoModelKernelUnits::cm;
-        dy2WedgeMother = dbManager->TILBrmaximal() * tan(deltaPhi/2.*GeoModelKernelUnits::deg) * GeoModelKernelUnits::cm;
+        thicknessWedgeMother = dbManager->TILBdzmodul() * Gaudi::Units::cm;
+        heightWedgeMother = (dbManager->TILBrmaximal() - dbManager->TILBrminimal()) * Gaudi::Units::cm;
+        dy1WedgeMother = dbManager->TILBrminimal() * tan(deltaPhi/2.*Gaudi::Units::deg) * Gaudi::Units::cm;
+        dy2WedgeMother = dbManager->TILBrmaximal() * tan(deltaPhi/2.*Gaudi::Units::deg) * Gaudi::Units::cm;
         
         dzGlue = (dbManager->TILBdzmodul() - dbManager->TILBdzend1() - dbManager->TILBdzend2() - dbManager->TILBnperiod()*2.*(dbManager->TILBdzmast() + dbManager->TILBdzspac()))/(4.*dbManager->TILBnperiod());
   
@@ -581,7 +581,7 @@ void TileTBFactory::create(GeoPhysVol *world)
                                     dzGlue,
                                     deltaPhi);
       
-        TRANSFUNCTION xfEBarrelModuleMotherNeg = Pow(GeoTrf::RotateZ3D(1.0),phiInd)*GeoTrf::TranslateX3D((dbManager->TILBrmaximal()+dbManager->TILBrminimal())/2.*GeoModelKernelUnits::cm)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg);
+        TRANSFUNCTION xfEBarrelModuleMotherNeg = Pow(GeoTrf::RotateZ3D(1.0),phiInd)*GeoTrf::TranslateX3D((dbManager->TILBrmaximal()+dbManager->TILBrminimal())/2.*Gaudi::Units::cm)*GeoTrf::RotateY3D(90*Gaudi::Units::deg);
 
         GeoSerialTransformer* stEBarrelModuleMotherNeg = new GeoSerialTransformer(pvEBarrelModuleMotherNeg,
                                                                                   &xfEBarrelModuleMotherNeg,
@@ -596,10 +596,10 @@ void TileTBFactory::create(GeoPhysVol *world)
         
         //zEndSection = extOffset + dbManager->TILBdzmodul()/2. + dbManager->TILEzshift();
         // Trd - one finger mother
-        thicknessWedgeMother = dbManager->TIFGdz() * GeoModelKernelUnits::cm;
-        heightWedgeMother = (dbManager->TILErmax() - dbManager->TILBrmax()) * GeoModelKernelUnits::cm;
-        dy1WedgeMother = dbManager->TILBrmax() * tan(deltaPhi/2.*GeoModelKernelUnits::deg) * GeoModelKernelUnits::cm;
-        dy2WedgeMother = dbManager->TILErmax() * tan(deltaPhi/2.*GeoModelKernelUnits::deg) * GeoModelKernelUnits::cm;
+        thicknessWedgeMother = dbManager->TIFGdz() * Gaudi::Units::cm;
+        heightWedgeMother = (dbManager->TILErmax() - dbManager->TILBrmax()) * Gaudi::Units::cm;
+        dy1WedgeMother = dbManager->TILBrmax() * tan(deltaPhi/2.*Gaudi::Units::deg) * Gaudi::Units::cm;
+        dy2WedgeMother = dbManager->TILErmax() * tan(deltaPhi/2.*Gaudi::Units::deg) * Gaudi::Units::cm;
         
         GeoTrd* efingerModuleMother = new GeoTrd(thicknessWedgeMother/2.,
                                                  thicknessWedgeMother/2.,
@@ -618,7 +618,7 @@ void TileTBFactory::create(GeoPhysVol *world)
                                    deltaPhi,
                                    m_testbeamGeometry);
           
-        TRANSFUNCTION xfEFingerModuleMotherNeg = Pow(GeoTrf::RotateZ3D(1.0),phiInd)*GeoTrf::TranslateX3D((dbManager->TILErmax()+dbManager->TILBrmax())/2.*GeoModelKernelUnits::cm)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg);
+        TRANSFUNCTION xfEFingerModuleMotherNeg = Pow(GeoTrf::RotateZ3D(1.0),phiInd)*GeoTrf::TranslateX3D((dbManager->TILErmax()+dbManager->TILBrmax())/2.*Gaudi::Units::cm)*GeoTrf::RotateY3D(90*Gaudi::Units::deg);
 
         GeoSerialTransformer* stEFingerModuleMotherNeg = new GeoSerialTransformer(pvEFingerModuleMother,
                                                                                   &xfEFingerModuleMotherNeg,
@@ -638,10 +638,10 @@ void TileTBFactory::create(GeoPhysVol *world)
         dbManager->SetCurrentSection(TileDddbManager::TILE_PLUG1);
         
         // Common mother for ITC1/2 modules
-        thicknessWedgeMother = dbManager->TILBdzmodul() * GeoModelKernelUnits::cm;
-        heightWedgeMother = (dbManager->TILBrmaximal() - rMinITC) * GeoModelKernelUnits::cm;
-        dy1WedgeMother = rMinITC * tan(deltaPhi/2.*GeoModelKernelUnits::deg) * GeoModelKernelUnits::cm;
-        dy2WedgeMother = dbManager->TILBrmaximal() * tan(deltaPhi/2.*GeoModelKernelUnits::deg) * GeoModelKernelUnits::cm;
+        thicknessWedgeMother = dbManager->TILBdzmodul() * Gaudi::Units::cm;
+        heightWedgeMother = (dbManager->TILBrmaximal() - rMinITC) * Gaudi::Units::cm;
+        dy1WedgeMother = rMinITC * tan(deltaPhi/2.*Gaudi::Units::deg) * Gaudi::Units::cm;
+        dy2WedgeMother = dbManager->TILBrmaximal() * tan(deltaPhi/2.*Gaudi::Units::deg) * Gaudi::Units::cm;
         
         GeoTrd* itcModuleMotherPos = new GeoTrd(thicknessWedgeMother/2.,
                                                 thicknessWedgeMother/2.,
@@ -658,10 +658,10 @@ void TileTBFactory::create(GeoPhysVol *world)
         // 2. Mother for frontplate (since it's short)
         
         //First submother
-        thicknessWedgeMother = dbManager->TILBdzmodul() * GeoModelKernelUnits::cm;
-        heightWedgeMother = (dbManager->TILBrmaximal() - dbManager->TILBrmin()) * GeoModelKernelUnits::cm;
-        dy1WedgeMother = dbManager->TILBrmin() * tan(deltaPhi/2.*GeoModelKernelUnits::deg) * GeoModelKernelUnits::cm;
-        dy2WedgeMother = dbManager->TILBrmaximal() * tan(deltaPhi/2.*GeoModelKernelUnits::deg) * GeoModelKernelUnits::cm;
+        thicknessWedgeMother = dbManager->TILBdzmodul() * Gaudi::Units::cm;
+        heightWedgeMother = (dbManager->TILBrmaximal() - dbManager->TILBrmin()) * Gaudi::Units::cm;
+        dy1WedgeMother = dbManager->TILBrmin() * tan(deltaPhi/2.*Gaudi::Units::deg) * Gaudi::Units::cm;
+        dy2WedgeMother = dbManager->TILBrmaximal() * tan(deltaPhi/2.*Gaudi::Units::deg) * Gaudi::Units::cm;
         
         dzGlue = (dbManager->TILBdzmodul() - dbManager->TILBdzend1() - dbManager->TILBdzend2() - dbManager->TILBnperiod()*2.*(dbManager->TILBdzmast() + dbManager->TILBdzspac()))/(4.*dbManager->TILBnperiod());
         
@@ -672,19 +672,19 @@ void TileTBFactory::create(GeoPhysVol *world)
                                             heightWedgeMother/2.);
         
         //Second submother
-        thicknessWedgeMother = (dbManager->TILBdzmodul() - dzITC2) * GeoModelKernelUnits::cm;
-        heightWedgeMother = (dbManager->TILBrmin() - dbManager->TILBrminimal()) * GeoModelKernelUnits::cm;
-        dy1WedgeMother = dbManager->TILBrminimal() * tan(deltaPhi/2.*GeoModelKernelUnits::deg) * GeoModelKernelUnits::cm;
-        dy2WedgeMother = dbManager->TILBrmin() * tan(deltaPhi/2.*GeoModelKernelUnits::deg) * GeoModelKernelUnits::cm;
+        thicknessWedgeMother = (dbManager->TILBdzmodul() - dzITC2) * Gaudi::Units::cm;
+        heightWedgeMother = (dbManager->TILBrmin() - dbManager->TILBrminimal()) * Gaudi::Units::cm;
+        dy1WedgeMother = dbManager->TILBrminimal() * tan(deltaPhi/2.*Gaudi::Units::deg) * Gaudi::Units::cm;
+        dy2WedgeMother = dbManager->TILBrmin() * tan(deltaPhi/2.*Gaudi::Units::deg) * Gaudi::Units::cm;
         GeoTrd* plug2SubMother = new GeoTrd(thicknessWedgeMother/2.,
                                             thicknessWedgeMother/2.,
                                             dy1WedgeMother,
                                             dy2WedgeMother,
                                             heightWedgeMother/2.);
         
-        GeoTrf::Translate3D plug1SubOffset(-dzITC2*GeoModelKernelUnits::cm/2.,
+        GeoTrf::Translate3D plug1SubOffset(-dzITC2*Gaudi::Units::cm/2.,
                                       0.,
-                                      (dbManager->TILBrminimal()-dbManager->TILBrmaximal())*GeoModelKernelUnits::cm/2.);
+                                      (dbManager->TILBrminimal()-dbManager->TILBrmaximal())*Gaudi::Units::cm/2.);
         
         const GeoShapeUnion& plug1ModuleMother = plug1SubMother->add(*plug2SubMother<<plug1SubOffset);
         GeoLogVol* lvPlug1ModuleMother = new GeoLogVol("Plug1Module",&plug1ModuleMother,matAir);
@@ -701,7 +701,7 @@ void TileTBFactory::create(GeoPhysVol *world)
         
         GeoTransform* tfPlug1ModuleMother = new GeoTransform(GeoTrf::Translate3D(0.,
                                                                             0.,
-                                                                            (dbManager->TILBrmin()-rMinITC)*GeoModelKernelUnits::cm/2.));
+                                                                            (dbManager->TILBrmin()-rMinITC)*Gaudi::Units::cm/2.));
         
         
         pvITCModuleMotherPos->add(tfPlug1ModuleMother);
@@ -709,10 +709,10 @@ void TileTBFactory::create(GeoPhysVol *world)
         	 
         //Mother volume for ITC2
         dbManager->SetCurrentSection(TileDddbManager::TILE_PLUG2);
-        thicknessWedgeMother = dbManager->TILBdzmodul() * GeoModelKernelUnits::cm;
-        heightWedgeMother = (dbManager->TILBrmaximal() - dbManager->TILBrminimal()) * GeoModelKernelUnits::cm;
-        dy1WedgeMother = dbManager->TILBrminimal() * tan(deltaPhi/2.*GeoModelKernelUnits::deg) * GeoModelKernelUnits::cm;
-        dy2WedgeMother = dbManager->TILBrmaximal() * tan(deltaPhi/2.*GeoModelKernelUnits::deg) * GeoModelKernelUnits::cm;
+        thicknessWedgeMother = dbManager->TILBdzmodul() * Gaudi::Units::cm;
+        heightWedgeMother = (dbManager->TILBrmaximal() - dbManager->TILBrminimal()) * Gaudi::Units::cm;
+        dy1WedgeMother = dbManager->TILBrminimal() * tan(deltaPhi/2.*Gaudi::Units::deg) * Gaudi::Units::cm;
+        dy2WedgeMother = dbManager->TILBrmaximal() * tan(deltaPhi/2.*Gaudi::Units::deg) * Gaudi::Units::cm;
         dzGlue = (dbManager->TILBdzmodul() - dbManager->TILBdzend1() - dbManager->TILBdzend2() - ((dbManager->TILBnperiod()-1)*2.*(dbManager->TILBdzmast() + dbManager->TILBdzspac()) + dbManager->TILBdzspac()))/(4.*(dbManager->TILBnperiod() - 1));
         
         GeoTrd* plug2ModuleMother = new GeoTrd(thicknessWedgeMother/2.,
@@ -734,13 +734,13 @@ void TileTBFactory::create(GeoPhysVol *world)
         
         
         dbManager->SetCurrentSection(TileDddbManager::TILE_PLUG1);
-        GeoTransform* tfPlug2ModuleMother = new GeoTransform(GeoTrf::Translate3D((dbManager->TILBdzmodul() - dzITC2)*GeoModelKernelUnits::cm/2.,
+        GeoTransform* tfPlug2ModuleMother = new GeoTransform(GeoTrf::Translate3D((dbManager->TILBdzmodul() - dzITC2)*Gaudi::Units::cm/2.,
                                                                             0.,
-                                                                            (dbManager->TILBrmin() - dbManager->TILBrmaximal())*GeoModelKernelUnits::cm/2.));
+                                                                            (dbManager->TILBrmin() - dbManager->TILBrmaximal())*Gaudi::Units::cm/2.));
         pvITCModuleMotherPos->add(tfPlug2ModuleMother);
         pvITCModuleMotherPos->add(pvPlug2ModuleMother);
         
-        TRANSFUNCTION xfITCModuleMotherPos = Pow(GeoTrf::RotateZ3D(1.0),phiInd)*GeoTrf::TranslateX3D((dbManager->TILBrmaximal()+rMinITC)/2.*GeoModelKernelUnits::cm)*GeoTrf::RotateX3D(180*GeoModelKernelUnits::deg)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg);
+        TRANSFUNCTION xfITCModuleMotherPos = Pow(GeoTrf::RotateZ3D(1.0),phiInd)*GeoTrf::TranslateX3D((dbManager->TILBrmaximal()+rMinITC)/2.*Gaudi::Units::cm)*GeoTrf::RotateX3D(180*Gaudi::Units::deg)*GeoTrf::RotateY3D(90*Gaudi::Units::deg);
         
         GeoSerialTransformer* stITCModuleMotherPos = new GeoSerialTransformer(pvITCModuleMotherPos,
                                                                               &xfITCModuleMotherPos,
@@ -760,10 +760,10 @@ void TileTBFactory::create(GeoPhysVol *world)
         dbManager->SetCurrentSection(TileDddbManager::TILE_PLUG1);
           
         // Common mother for ITC1/2 modules
-        thicknessWedgeMother = dbManager->TILBdzmodul() * GeoModelKernelUnits::cm;
-        heightWedgeMother = (dbManager->TILBrmaximal() - rMinITC) * GeoModelKernelUnits::cm;
-        dy1WedgeMother = rMinITC * tan(deltaPhi/2.*GeoModelKernelUnits::deg) * GeoModelKernelUnits::cm;
-        dy2WedgeMother = dbManager->TILBrmaximal() * tan(deltaPhi/2.*GeoModelKernelUnits::deg) * GeoModelKernelUnits::cm;
+        thicknessWedgeMother = dbManager->TILBdzmodul() * Gaudi::Units::cm;
+        heightWedgeMother = (dbManager->TILBrmaximal() - rMinITC) * Gaudi::Units::cm;
+        dy1WedgeMother = rMinITC * tan(deltaPhi/2.*Gaudi::Units::deg) * Gaudi::Units::cm;
+        dy2WedgeMother = dbManager->TILBrmaximal() * tan(deltaPhi/2.*Gaudi::Units::deg) * Gaudi::Units::cm;
           
         GeoTrd* itcModuleMotherNeg = new GeoTrd(thicknessWedgeMother/2.,
                                                 thicknessWedgeMother/2.,
@@ -780,10 +780,10 @@ void TileTBFactory::create(GeoPhysVol *world)
         // 2. Mother for frontplate (since it's short)
           
         //First submother
-        thicknessWedgeMother = dbManager->TILBdzmodul() * GeoModelKernelUnits::cm;
-        heightWedgeMother = (dbManager->TILBrmaximal() - dbManager->TILBrmin()) * GeoModelKernelUnits::cm;
-        dy1WedgeMother = dbManager->TILBrmin() * tan(deltaPhi/2.*GeoModelKernelUnits::deg) * GeoModelKernelUnits::cm;
-        dy2WedgeMother = dbManager->TILBrmaximal() * tan(deltaPhi/2.*GeoModelKernelUnits::deg) * GeoModelKernelUnits::cm;
+        thicknessWedgeMother = dbManager->TILBdzmodul() * Gaudi::Units::cm;
+        heightWedgeMother = (dbManager->TILBrmaximal() - dbManager->TILBrmin()) * Gaudi::Units::cm;
+        dy1WedgeMother = dbManager->TILBrmin() * tan(deltaPhi/2.*Gaudi::Units::deg) * Gaudi::Units::cm;
+        dy2WedgeMother = dbManager->TILBrmaximal() * tan(deltaPhi/2.*Gaudi::Units::deg) * Gaudi::Units::cm;
           
         dzGlue = (dbManager->TILBdzmodul() - dbManager->TILBdzend1() - dbManager->TILBdzend2() - dbManager->TILBnperiod()*2.*(dbManager->TILBdzmast() + dbManager->TILBdzspac()))/(4.*dbManager->TILBnperiod());
           
@@ -794,19 +794,19 @@ void TileTBFactory::create(GeoPhysVol *world)
                                             heightWedgeMother/2.);
           
         //Second submother
-        thicknessWedgeMother = (dbManager->TILBdzmodul() - dzITC2) * GeoModelKernelUnits::cm;
-        heightWedgeMother = (dbManager->TILBrmin() - dbManager->TILBrminimal()) * GeoModelKernelUnits::cm;
-        dy1WedgeMother = dbManager->TILBrminimal() * tan(deltaPhi/2.*GeoModelKernelUnits::deg) * GeoModelKernelUnits::cm;
-        dy2WedgeMother = dbManager->TILBrmin() * tan(deltaPhi/2.*GeoModelKernelUnits::deg) * GeoModelKernelUnits::cm;
+        thicknessWedgeMother = (dbManager->TILBdzmodul() - dzITC2) * Gaudi::Units::cm;
+        heightWedgeMother = (dbManager->TILBrmin() - dbManager->TILBrminimal()) * Gaudi::Units::cm;
+        dy1WedgeMother = dbManager->TILBrminimal() * tan(deltaPhi/2.*Gaudi::Units::deg) * Gaudi::Units::cm;
+        dy2WedgeMother = dbManager->TILBrmin() * tan(deltaPhi/2.*Gaudi::Units::deg) * Gaudi::Units::cm;
         GeoTrd* plug2SubMother = new GeoTrd(thicknessWedgeMother/2.,
                                             thicknessWedgeMother/2.,
                                             dy1WedgeMother,
                                             dy2WedgeMother,
                                             heightWedgeMother/2.);
           
-        GeoTrf::Translate3D plug1SubOffset(-dzITC2*GeoModelKernelUnits::cm/2.,
+        GeoTrf::Translate3D plug1SubOffset(-dzITC2*Gaudi::Units::cm/2.,
                                       0.,
-                                      (dbManager->TILBrminimal()-dbManager->TILBrmaximal())*GeoModelKernelUnits::cm/2.);
+                                      (dbManager->TILBrminimal()-dbManager->TILBrmaximal())*Gaudi::Units::cm/2.);
           
         const GeoShapeUnion& plug1ModuleMother = plug1SubMother->add(*plug2SubMother<<plug1SubOffset);
         GeoLogVol* lvPlug1ModuleMother = new GeoLogVol("Plug1Module",&plug1ModuleMother,matAir);
@@ -824,7 +824,7 @@ void TileTBFactory::create(GeoPhysVol *world)
         
         GeoTransform* tfPlug1ModuleMother = new GeoTransform(GeoTrf::Translate3D(0.,
                                                                             0.,
-                                                                            (dbManager->TILBrmin()-rMinITC)*GeoModelKernelUnits::cm/2.));
+                                                                            (dbManager->TILBrmin()-rMinITC)*Gaudi::Units::cm/2.));
           
           
         pvITCModuleMotherNeg->add(tfPlug1ModuleMother);
@@ -832,10 +832,10 @@ void TileTBFactory::create(GeoPhysVol *world)
           	 
         //Mother volume for ITC2
         dbManager->SetCurrentSection(TileDddbManager::TILE_PLUG2);
-        thicknessWedgeMother = dbManager->TILBdzmodul() * GeoModelKernelUnits::cm;
-        heightWedgeMother = (dbManager->TILBrmaximal() - dbManager->TILBrminimal()) * GeoModelKernelUnits::cm;
-        dy1WedgeMother = dbManager->TILBrminimal() * tan(deltaPhi/2.*GeoModelKernelUnits::deg) * GeoModelKernelUnits::cm;
-        dy2WedgeMother = dbManager->TILBrmaximal() * tan(deltaPhi/2.*GeoModelKernelUnits::deg) * GeoModelKernelUnits::cm;
+        thicknessWedgeMother = dbManager->TILBdzmodul() * Gaudi::Units::cm;
+        heightWedgeMother = (dbManager->TILBrmaximal() - dbManager->TILBrminimal()) * Gaudi::Units::cm;
+        dy1WedgeMother = dbManager->TILBrminimal() * tan(deltaPhi/2.*Gaudi::Units::deg) * Gaudi::Units::cm;
+        dy2WedgeMother = dbManager->TILBrmaximal() * tan(deltaPhi/2.*Gaudi::Units::deg) * Gaudi::Units::cm;
         dzGlue = (dbManager->TILBdzmodul() - dbManager->TILBdzend1() - dbManager->TILBdzend2() - ((dbManager->TILBnperiod()-1)*2.*(dbManager->TILBdzmast() + dbManager->TILBdzspac()) + dbManager->TILBdzspac()))/(4.*(dbManager->TILBnperiod() - 1));
           
         GeoTrd* plug2ModuleMother = new GeoTrd(thicknessWedgeMother/2.,
@@ -857,13 +857,13 @@ void TileTBFactory::create(GeoPhysVol *world)
         
           
         dbManager->SetCurrentSection(TileDddbManager::TILE_PLUG1);
-        GeoTransform* tfPlug2ModuleMother = new GeoTransform(GeoTrf::Translate3D((dbManager->TILBdzmodul() - dzITC2)*GeoModelKernelUnits::cm/2.,
+        GeoTransform* tfPlug2ModuleMother = new GeoTransform(GeoTrf::Translate3D((dbManager->TILBdzmodul() - dzITC2)*Gaudi::Units::cm/2.,
                                                                             0.,
-                                                                            (dbManager->TILBrmin() - dbManager->TILBrmaximal())*GeoModelKernelUnits::cm/2.));
+                                                                            (dbManager->TILBrmin() - dbManager->TILBrmaximal())*Gaudi::Units::cm/2.));
         pvITCModuleMotherNeg->add(tfPlug2ModuleMother);
         pvITCModuleMotherNeg->add(pvPlug2ModuleMother);
           
-        TRANSFUNCTION xfITCModuleMotherNeg = Pow(GeoTrf::RotateZ3D(1.0),phiInd)*GeoTrf::TranslateX3D((dbManager->TILBrmaximal()+rMinITC)/2.*GeoModelKernelUnits::cm)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::deg);
+        TRANSFUNCTION xfITCModuleMotherNeg = Pow(GeoTrf::RotateZ3D(1.0),phiInd)*GeoTrf::TranslateX3D((dbManager->TILBrmaximal()+rMinITC)/2.*Gaudi::Units::cm)*GeoTrf::RotateY3D(90*Gaudi::Units::deg);
           
         GeoSerialTransformer* stITCModuleMotherNeg = new GeoSerialTransformer(pvITCModuleMotherNeg,
                                                                               &xfITCModuleMotherNeg,
@@ -890,7 +890,7 @@ void TileTBFactory::create(GeoPhysVol *world)
       else {
         ztrans = 0;
       }
-      tfBarrelMother = new GeoTransform(GeoTrf::TranslateZ3D(ztrans*GeoModelKernelUnits::cm) * GeoTrf::RotateZ3D((dbManager->GetEnvDPhi())*GeoModelKernelUnits::deg));
+      tfBarrelMother = new GeoTransform(GeoTrf::TranslateZ3D(ztrans*Gaudi::Units::cm) * GeoTrf::RotateZ3D((dbManager->GetEnvDPhi())*Gaudi::Units::deg));
       (*m_log) << MSG::DEBUG << "Positioning barrel with translation " << ztrans << " cm" << endmsg;
       GeoNameTag* ntBarrelModuleMother = new GeoNameTag("Barrel"); 
 
@@ -912,7 +912,7 @@ void TileTBFactory::create(GeoPhysVol *world)
       else {
         ztrans = 0;
       }
-      tfFingerMotherPos = new GeoTransform(GeoTrf::TranslateZ3D(ztrans*GeoModelKernelUnits::cm) * GeoTrf::RotateZ3D((dbManager->GetEnvDPhi())*GeoModelKernelUnits::deg));
+      tfFingerMotherPos = new GeoTransform(GeoTrf::TranslateZ3D(ztrans*Gaudi::Units::cm) * GeoTrf::RotateZ3D((dbManager->GetEnvDPhi())*Gaudi::Units::deg));
       (*m_log) << MSG::DEBUG << "Positioning positive barrel finger with translation " << ztrans
           << " cm and rotation " << dbManager->GetEnvDPhi() << " deg " << endmsg;
       GeoNameTag* ntFingerMotherPos = new GeoNameTag("TileFingerPos");
@@ -934,7 +934,7 @@ void TileTBFactory::create(GeoPhysVol *world)
       else {
         ztrans = 0;
       }
-      tfFingerMotherNeg = new GeoTransform(GeoTrf::TranslateZ3D(ztrans*GeoModelKernelUnits::cm) * GeoTrf::RotateZ3D((dbManager->GetEnvDPhi())*GeoModelKernelUnits::deg));
+      tfFingerMotherNeg = new GeoTransform(GeoTrf::TranslateZ3D(ztrans*Gaudi::Units::cm) * GeoTrf::RotateZ3D((dbManager->GetEnvDPhi())*Gaudi::Units::deg));
       (*m_log) << MSG::DEBUG << "Positioning negative barrel finger with translation " << ztrans 
           << " cm and rotation " << dbManager->GetEnvDPhi() << " deg " << endmsg;
       GeoNameTag* ntFingerMotherNeg = new GeoNameTag("TileFingerNeg");
@@ -947,7 +947,7 @@ void TileTBFactory::create(GeoPhysVol *world)
 
     if(EnvType == 3) { // positive ext.barrel is always at positive boundary, after finger
       ztrans = (tileTBEnvThickness/2. - dbManager->GetEnvZLength()/2. - EBFingerLength/2.);
-      GeoTransform* tfEBarrelMotherPos = new GeoTransform(GeoTrf::TranslateZ3D(ztrans*GeoModelKernelUnits::cm) * GeoTrf::RotateZ3D(dbManager->GetEnvDPhi() * GeoModelKernelUnits::deg));
+      GeoTransform* tfEBarrelMotherPos = new GeoTransform(GeoTrf::TranslateZ3D(ztrans*Gaudi::Units::cm) * GeoTrf::RotateZ3D(dbManager->GetEnvDPhi() * Gaudi::Units::deg));
       (*m_log) << MSG::DEBUG << "Positioning positive ext.barrel with translation " << ztrans
           << " cm and rotation " << dbManager->GetEnvDPhi() << " deg " << endmsg;
       
@@ -957,7 +957,7 @@ void TileTBFactory::create(GeoPhysVol *world)
       pvTileTBEnv->add(pvEBarrelMotherPos);
       
       ztrans = (tileTBEnvThickness/2. - EBFingerLength/2.);
-      GeoTransform* tfEFingerMotherPos = new GeoTransform(GeoTrf::TranslateZ3D(ztrans*GeoModelKernelUnits::cm) * GeoTrf::RotateZ3D(dbManager->GetEnvDPhi() * GeoModelKernelUnits::deg));
+      GeoTransform* tfEFingerMotherPos = new GeoTransform(GeoTrf::TranslateZ3D(ztrans*Gaudi::Units::cm) * GeoTrf::RotateZ3D(dbManager->GetEnvDPhi() * Gaudi::Units::deg));
       (*m_log) << MSG::DEBUG << "Positioning positive ext.barrel finger with translation " << ztrans
           << " cm and rotation " << dbManager->GetEnvDPhi() << " deg " << endmsg;
 
@@ -970,7 +970,7 @@ void TileTBFactory::create(GeoPhysVol *world)
    
     if(EnvType == 2) { // negative ext.barrel is always at negative boundary, after finger
       ztrans = (-tileTBEnvThickness/2. + dbManager->GetEnvZLength()/2. + EBFingerLength/2.);
-      GeoTransform* tfEBarrelMotherNeg = new GeoTransform(GeoTrf::TranslateZ3D(ztrans*GeoModelKernelUnits::cm) * GeoTrf::RotateZ3D(dbManager->GetEnvDPhi() * GeoModelKernelUnits::deg));
+      GeoTransform* tfEBarrelMotherNeg = new GeoTransform(GeoTrf::TranslateZ3D(ztrans*Gaudi::Units::cm) * GeoTrf::RotateZ3D(dbManager->GetEnvDPhi() * Gaudi::Units::deg));
       (*m_log) << MSG::DEBUG << "Positioning negative ext.barrel with translation " << ztrans
           << " cm and rotation " << dbManager->GetEnvDPhi() << " deg " << endmsg;
       
@@ -980,7 +980,7 @@ void TileTBFactory::create(GeoPhysVol *world)
       pvTileTBEnv->add(pvEBarrelMotherNeg);
       
       ztrans = (-tileTBEnvThickness/2. + EBFingerLength/2.);
-      GeoTransform* tfEFingerMotherNeg = new GeoTransform(GeoTrf::TranslateZ3D(ztrans*GeoModelKernelUnits::cm) * GeoTrf::RotateZ3D(dbManager->GetEnvDPhi() * GeoModelKernelUnits::deg));
+      GeoTransform* tfEFingerMotherNeg = new GeoTransform(GeoTrf::TranslateZ3D(ztrans*Gaudi::Units::cm) * GeoTrf::RotateZ3D(dbManager->GetEnvDPhi() * Gaudi::Units::deg));
       (*m_log) << MSG::DEBUG << "Positioning negative ext.barrel finger with translation " << ztrans
           << " cm and rotation " << dbManager->GetEnvDPhi() << " deg " << endmsg;
 
@@ -993,7 +993,7 @@ void TileTBFactory::create(GeoPhysVol *world)
 
     if(EnvType == 5) { // positive ITC attached to positive ext.barrel
       ztrans = (tileTBEnvThickness/2. - ZLengthEBarrelPos - dbManager->GetEnvZLength()/2.);
-      GeoTransform* tfITCMotherPos = new GeoTransform(GeoTrf::TranslateZ3D(ztrans*GeoModelKernelUnits::cm) * GeoTrf::RotateZ3D(dbManager->GetEnvDPhi() * GeoModelKernelUnits::deg));
+      GeoTransform* tfITCMotherPos = new GeoTransform(GeoTrf::TranslateZ3D(ztrans*Gaudi::Units::cm) * GeoTrf::RotateZ3D(dbManager->GetEnvDPhi() * Gaudi::Units::deg));
       (*m_log) << MSG::DEBUG << "Positioning positive ITC with translation " << ztrans
           << " cm and rotation " << dbManager->GetEnvDPhi() << " deg " << endmsg;
 
@@ -1005,7 +1005,7 @@ void TileTBFactory::create(GeoPhysVol *world)
 
     if(EnvType == 4) { // negative ITC attached to negative ext.barrel
       ztrans = (-tileTBEnvThickness/2. + ZLengthEBarrelNeg + dbManager->GetEnvZLength()/2.);
-      GeoTransform* tfITCMotherNeg = new GeoTransform(GeoTrf::TranslateZ3D(ztrans*GeoModelKernelUnits::cm) * GeoTrf::RotateZ3D(dbManager->GetEnvDPhi() * GeoModelKernelUnits::deg));
+      GeoTransform* tfITCMotherNeg = new GeoTransform(GeoTrf::TranslateZ3D(ztrans*Gaudi::Units::cm) * GeoTrf::RotateZ3D(dbManager->GetEnvDPhi() * Gaudi::Units::deg));
       (*m_log) << MSG::DEBUG << "Positioning negative ITC with translation " << ztrans
           << " cm and rotation " << dbManager->GetEnvDPhi() << " deg " << endmsg;
 
@@ -1026,12 +1026,12 @@ void TileTBFactory::create(GeoPhysVol *world)
     dbManager->SetCurrentEnvByIndex(EnvCounter);
     int EnvType = dbManager->GetEnvType();
     int NumberOfMod = dbManager->GetEnvNModules();
-    float Zshift = dbManager->GetEnvZShift() * GeoModelKernelUnits::cm;
+    float Zshift = dbManager->GetEnvZShift() * Gaudi::Units::cm;
     (*m_log) << MSG::DEBUG 
         << "EnvCounter is " << EnvCounter
         << " EnvType is " << EnvType
         << " Nmodules is " << NumberOfMod
-        << " Zshift is " << Zshift*(1./GeoModelKernelUnits::cm) << " cm"
+        << " Zshift is " << Zshift*(1./Gaudi::Units::cm) << " cm"
         << endmsg;
 
     if(EnvType == 1 || EnvType == 0) { // central barrel
diff --git a/TileCalorimeter/TileMonitoring/TileMonitoring/TileMBTSMonTool.h b/TileCalorimeter/TileMonitoring/TileMonitoring/TileMBTSMonTool.h
index a8a0156470a5dbf923f1e8d998699d6eb4789faa..8759aee7812f9cefb7247c7df8f1e5d0f8bfec5e 100644
--- a/TileCalorimeter/TileMonitoring/TileMonitoring/TileMBTSMonTool.h
+++ b/TileCalorimeter/TileMonitoring/TileMonitoring/TileMBTSMonTool.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 // ********************************************************************
@@ -16,6 +16,8 @@
 
 #include "TileMonitoring/TileFatherMonTool.h"
 #include "TileEvent/TileDQstatus.h"
+#include "TileEvent/TileContainer.h"
+#include "TileEvent/TileDigitsContainer.h"
 #include "StoreGate/ReadHandleKey.h"
 
 class CTP_RDO;
@@ -113,10 +115,10 @@ class TileMBTSMonTool: public TileFatherMonTool {
     ServiceHandle<TrigConf::ILVL1ConfigSvc> m_lvl1ConfigSvc;
 
     // container names
-    std::string m_TileDigitsContainerID;
-    std::string m_MBTSCellContainerID;
-    std::string m_TileDSPRawChannelContainerID;
-    std::string m_TileBeamElemContainerID;
+    SG::ReadHandleKey<TileDigitsContainer> m_TileDigitsContainerID
+    { this, "TileDigitsContainerName", "TileDigitsCnt", "" };
+    SG::ReadHandleKey<TileCellContainer>   m_MBTSCellContainerID
+    { this, "MBTSContainerName", "MBTSContainer", "" };
 
     int m_numEvents; // event counter
     bool m_isOnline;
diff --git a/TileCalorimeter/TileMonitoring/src/TileMBTSMonTool.cxx b/TileCalorimeter/TileMonitoring/src/TileMBTSMonTool.cxx
index 5834051e207336543a3c22f59957b018b1b6ddda..a5a4917ddc784a0c8b1967180818c7e1d4a859ee 100644
--- a/TileCalorimeter/TileMonitoring/src/TileMBTSMonTool.cxx
+++ b/TileCalorimeter/TileMonitoring/src/TileMBTSMonTool.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 // ********************************************************************//
@@ -94,10 +94,6 @@ TileMBTSMonTool::TileMBTSMonTool(	const std::string & type, const std::string &
 {
   declareInterface<IMonitorToolBase>(this);
   declareProperty("LVL1ConfigSvc", m_lvl1ConfigSvc, "LVL1 Config Service");
-  declareProperty("MBTSContainerName", m_MBTSCellContainerID = "MBTSContainer");
-  declareProperty("TileDigitsContainerName", m_TileDigitsContainerID = "TileDigitsCnt");
-  declareProperty("TileDSPRawChannelContainerName", m_TileDSPRawChannelContainerID = "TileRawChannelCnt");
-  declareProperty("TileBeamElemContainerName", m_TileBeamElemContainerID = "TileBeamElemCnt");
   declareProperty("readTrigger", m_readTrigger = true); // Switch for CTP config
   declareProperty("doOnline", m_isOnline = false); // Switch for online running
   declareProperty("UseTrigger", m_useTrigger = true); // Switch for using trigger information
@@ -164,6 +160,8 @@ StatusCode TileMBTSMonTool:: initialize(){
     }
   }
 	
+  CHECK( m_TileDigitsContainerID.initialize() );
+  CHECK( m_MBTSCellContainerID.initialize() );
   CHECK( m_DQstatusKey.initialize() );
 
   return StatusCode::SUCCESS;
@@ -525,6 +523,7 @@ StatusCode TileMBTSMonTool::bookHistograms() {
 StatusCode TileMBTSMonTool::fillHistograms() {
 
   ATH_MSG_DEBUG( "in fillHistograms()" );
+  const EventContext& ctx = Gaudi::Hive::currentContext();
 
   memset(m_hasEnergyHit, false, sizeof(m_hasEnergyHit));
   memset(m_hasPIT, false, sizeof(m_hasPIT));
@@ -724,8 +723,8 @@ StatusCode TileMBTSMonTool::fillHistograms() {
   // CELL LEVEL INFORMATION
   //==============================================================================
   //Retrieve MBTS container collection from SG
-  const TileCellContainer* theMBTScontainer;
-  CHECK(evtStore()->retrieve(theMBTScontainer, m_MBTSCellContainerID));
+  SG::ReadHandle<TileCellContainer> theMBTScontainer
+    (m_MBTSCellContainerID, ctx);
   ATH_MSG_VERBOSE( "Retrieval of MBTS container " << m_MBTSCellContainerID << " succeeded" );
 
   double energy[32], time[32];
@@ -860,9 +859,8 @@ StatusCode TileMBTSMonTool::fillHistograms() {
   //=======================================================================
 
   //Retrieve TileDigits container collection from SG
-  const TileDigitsContainer* theDigitsContainer;
-  CHECK(evtStore()->retrieve(theDigitsContainer, m_TileDigitsContainerID));
-  ATH_MSG_VERBOSE("Retrieval of Tile Digits container " << m_TileDigitsContainerID << " succeeded");
+  SG::ReadHandle<TileDigitsContainer> theDigitsContainer
+    (m_TileDigitsContainerID, ctx);
 
   // Create instance of TileDQstatus used to check for readout errors in Tile
   const TileDQstatus * theDQstatus = SG::makeHandle (m_DQstatusKey).get();
diff --git a/TileCalorimeter/TileRec/TileRec/TileAANtuple.h b/TileCalorimeter/TileRec/TileRec/TileAANtuple.h
index f7137b19065be776d42a7a874d4a7b212dc3b1ee..2ff03321e47bc62c4d593c9e9aa4f6621f5646ce 100755
--- a/TileCalorimeter/TileRec/TileRec/TileAANtuple.h
+++ b/TileCalorimeter/TileRec/TileRec/TileAANtuple.h
@@ -46,6 +46,8 @@
 #include "TileConditions/TileCablingService.h"
 #include "TileIdentifier/TileRawChannelUnit.h"
 #include "TileEvent/TileLaserObject.h"
+#include "TileEvent/TileMuonReceiverContainer.h"
+#include "TileEvent/TileRawChannelContainer.h"
 #include "TileEvent/TileDQstatus.h"
 #include "TileEvent/TileBeamElemContainer.h"
 #include "TileConditions/ITileDCSTool.h"
@@ -97,7 +99,8 @@ class TileAANtuple : public AthAlgorithm {
     virtual ~TileAANtuple();
 
     //Gaudi Hooks
-    StatusCode ntuple_initialize(const TileDQstatus& DQstatus);
+    StatusCode ntuple_initialize(const EventContext& ctx,
+                                 const TileDQstatus& DQstatus);
     StatusCode ntuple_clear();
     StatusCode initialize();
     StatusCode execute();
@@ -105,34 +108,37 @@ class TileAANtuple : public AthAlgorithm {
 
   private:
 
-    StatusCode storeRawChannels(std::string cntID
+    StatusCode storeRawChannels(const EventContext& ctx
+                                 , const SG::ReadHandleKey<TileRawChannelContainer>& containerKey
 		  	        , float ene[N_ROS2][N_MODULES][N_CHANS]
 			        , float time[N_ROS2][N_MODULES][N_CHANS]
 			        , float chi2[N_ROS2][N_MODULES][N_CHANS]
 			        , float ped[N_ROS2][N_MODULES][N_CHANS]
 			        , bool fillAll);
                                
-    StatusCode storeMFRawChannels(std::string cntID
+    StatusCode storeMFRawChannels(const EventContext& ctx
+                                  , const SG::ReadHandleKey<TileRawChannelContainer>& containerKey
                                   , float ene[N_ROS2][N_MODULES][N_CHANS][N_SAMPLES]
                                   , float time[N_ROS2][N_MODULES][N_CHANS][N_SAMPLES]
                                   , float chi2[N_ROS2][N_MODULES][N_CHANS]
                                   , float ped[N_ROS2][N_MODULES][N_CHANS]
                                   , bool fillAll);
 
-    StatusCode storeDigits(std::string cntID
+    StatusCode storeDigits(const EventContext& ctx
+                           , const SG::ReadHandleKey<TileDigitsContainer>& containerKey
 			   , short sample[N_ROS2][N_MODULES][N_CHANS][N_SAMPLES]
 			   , short gain[N_ROS2][N_MODULES][N_CHANS]
 		  	   , bool fillAll);
 
-    StatusCode storeTMDBDecision();
-    StatusCode storeTMDBDigits();
-    StatusCode storeTMDBRawChannel();
+    StatusCode storeTMDBDecision(const EventContext& ctx);
+    StatusCode storeTMDBDigits(const EventContext& ctx);
+    StatusCode storeTMDBRawChannel(const EventContext& ctxx);
 
     StatusCode storeBeamElements(const TileDQstatus& DQstatus);
-    StatusCode storeLaser();
+    StatusCode storeLaser(const EventContext& ctx);
     StatusCode storeDCS();
 
-    StatusCode initNTuple(void);
+    StatusCode initNTuple(const EventContext& ctx);
 
     void fillCellMap(TTree* ntuplePtr);
 
@@ -326,21 +332,22 @@ class TileAANtuple : public AthAlgorithm {
     int m_nBadTotal;
 
     // jobOptions parameters - container names
-    std::string m_digitsContainer;
-    std::string m_fltDigitsContainer;
+    SG::ReadHandleKey<TileDigitsContainer> m_digitsContainerKey;
+    SG::ReadHandleKey<TileDigitsContainer> m_fltDigitsContainerKey;
     SG::ReadHandleKey<TileBeamElemContainer> m_beamElemContainerKey;
-    std::string m_rawChannelContainer;
-    std::string m_fitRawChannelContainer;
-    std::string m_fitcRawChannelContainer;
-    std::string m_optRawChannelContainer;
-    std::string m_qieRawChannelContainer;
-    std::string m_dspRawChannelContainer;
-    std::string m_mfRawChannelContainer;
-    std::string m_of1RawChannelContainer;
-    std::string m_laserObject;
-    std::string m_tileMuRcvRawChannelContainer; // TMDB
-    std::string m_tileMuRcvDigitsContainer; // TMDB
-    std::string m_tileMuRcvContainer; // TMDB
+    SG::ReadHandleKey<TileRawChannelContainer> m_rawChannelContainerKey;
+    SG::ReadHandleKey<TileRawChannelContainer> m_fitRawChannelContainerKey;
+    SG::ReadHandleKey<TileRawChannelContainer> m_fitcRawChannelContainerKey;
+    SG::ReadHandleKey<TileRawChannelContainer> m_optRawChannelContainerKey;
+    SG::ReadHandleKey<TileRawChannelContainer> m_qieRawChannelContainerKey;
+    SG::ReadHandleKey<TileRawChannelContainer> m_dspRawChannelContainerKey;
+    SG::ReadHandleKey<TileRawChannelContainer> m_mfRawChannelContainerKey;
+    SG::ReadHandleKey<TileRawChannelContainer> m_of1RawChannelContainerKey;
+    SG::ReadHandleKey<TileLaserObject> m_laserObjectKey;
+    SG::ReadHandleKey<TileRawChannelContainer> m_tileMuRcvRawChannelContainerKey; // TMDB
+    SG::ReadHandleKey<TileDigitsContainer> m_tileMuRcvDigitsContainerKey; // TMDB
+    SG::ReadHandleKey<TileMuonReceiverContainer> m_tileMuRcvContainerKey; // TMDB
+    SG::ReadHandleKey<TileL2Container> m_l2CntKey;
 
    // other jobOptions parameters
     bool m_calibrateEnergy; //!< convert energy to new units or use amplitude from RawChannel directly
diff --git a/TileCalorimeter/TileRec/src/TileAANtuple.cxx b/TileCalorimeter/TileRec/src/TileAANtuple.cxx
index 01043fa1d94f6c6af53fdf7f18d70d4ea6d27207..0791bef639279b81fe356b864a16fa4aeb10f90d 100755
--- a/TileCalorimeter/TileRec/src/TileAANtuple.cxx
+++ b/TileCalorimeter/TileRec/src/TileAANtuple.cxx
@@ -203,21 +203,22 @@ TileAANtuple::TileAANtuple(std::string name, ISvcLocator* pSvcLocator)
 , m_bad()
 {
   declareProperty("TileCondToolEmscale", m_tileToolEmscale);
-  declareProperty("TileDigitsContainer", m_digitsContainer = "TileDigitsCnt");
-  declareProperty("TileDigitsContainerFlt", m_fltDigitsContainer = "" /* "TileDigitsFlt" */);
+  declareProperty("TileDigitsContainer", m_digitsContainerKey = "TileDigitsCnt");
+  declareProperty("TileDigitsContainerFlt", m_fltDigitsContainerKey = "" /* "TileDigitsFlt" */);
   declareProperty("TileBeamElemContainer", m_beamElemContainerKey = "TileBeamElemCnt");
-  declareProperty("TileRawChannelContainer", m_rawChannelContainer = "TileRawChannelCnt");
-  declareProperty("TileRawChannelContainerFit", m_fitRawChannelContainer = "");      //
-  declareProperty("TileRawChannelContainerFitCool", m_fitcRawChannelContainer = ""); // don't create
-  declareProperty("TileRawChannelContainerOpt", m_optRawChannelContainer = "");      // by default
-  declareProperty("TileRawChannelContainerQIE", m_qieRawChannelContainer = "");      // processed QIE data
-  declareProperty("TileRawChannelContainerOF1", m_of1RawChannelContainer = "");      //
-  declareProperty("TileRawChannelContainerDsp", m_dspRawChannelContainer = "");      //
-  declareProperty("TileRawChannelContainerMF", m_mfRawChannelContainer = "");      //
-  declareProperty("TileMuRcvRawChannelContainer", m_tileMuRcvRawChannelContainer = "MuRcvRawChCnt");// TMDB
-  declareProperty("TileMuRcvDigitsContainer", m_tileMuRcvDigitsContainer = "MuRcvDigitsCnt");// TMDB
-  declareProperty("TileMuRcvContainer", m_tileMuRcvContainer = "TileMuRcvCnt");// TMDB
-  declareProperty("TileLaserObject", m_laserObject = "" /* "TileLaserObj" */);       //
+  declareProperty("TileRawChannelContainer", m_rawChannelContainerKey = "TileRawChannelCnt");
+  declareProperty("TileRawChannelContainerFit", m_fitRawChannelContainerKey = "");      //
+  declareProperty("TileRawChannelContainerFitCool", m_fitcRawChannelContainerKey = ""); // don't create
+  declareProperty("TileRawChannelContainerOpt", m_optRawChannelContainerKey = "");      // by default
+  declareProperty("TileRawChannelContainerQIE", m_qieRawChannelContainerKey = "");      // processed QIE data
+  declareProperty("TileRawChannelContainerOF1", m_of1RawChannelContainerKey = "");      //
+  declareProperty("TileRawChannelContainerDsp", m_dspRawChannelContainerKey = "");      //
+  declareProperty("TileRawChannelContainerMF", m_mfRawChannelContainerKey = "");      //
+  declareProperty("TileMuRcvRawChannelContainer", m_tileMuRcvRawChannelContainerKey = "MuRcvRawChCnt");// TMDB
+  declareProperty("TileMuRcvDigitsContainer", m_tileMuRcvDigitsContainerKey = "MuRcvDigitsCnt");// TMDB
+  declareProperty("TileMuRcvContainer", m_tileMuRcvContainerKey = "TileMuRcvCnt");// TMDB
+  declareProperty("TileLaserObject", m_laserObjectKey = "" /* "TileLaserObj" */);       //
+  declareProperty("TileL2Cnt", m_l2CntKey = "TileL2Cnt");
   declareProperty("CalibrateEnergy", m_calibrateEnergy = true);
   declareProperty("UseDspUnits", m_useDspUnits = false);
   declareProperty("OfflineUnits", m_finalUnit = TileRawChannelUnit::MegaElectronVolts);
@@ -305,15 +306,35 @@ StatusCode TileAANtuple::initialize() {
 
   ATH_CHECK( m_DQstatusKey.initialize() );
 
+  if (m_dspRawChannelContainerKey.empty() && m_bsInput) {
+    m_dspRawChannelContainerKey = "TileRawChannelCnt"; // try DSP container name to read DQ status
+  }
+
   ATH_CHECK( m_beamElemContainerKey.initialize(m_bsInput) );
+  ATH_CHECK( m_digitsContainerKey.initialize(SG::AllowEmpty) );
+  ATH_CHECK( m_fltDigitsContainerKey.initialize(SG::AllowEmpty) );
+  ATH_CHECK( m_laserObjectKey.initialize(SG::AllowEmpty) );
+  ATH_CHECK( m_tileMuRcvContainerKey.initialize(SG::AllowEmpty) );
+  ATH_CHECK( m_tileMuRcvDigitsContainerKey.initialize(SG::AllowEmpty) );
+  ATH_CHECK( m_tileMuRcvRawChannelContainerKey.initialize(SG::AllowEmpty) );
+  ATH_CHECK( m_mfRawChannelContainerKey.initialize(SG::AllowEmpty) );
+  ATH_CHECK( m_rawChannelContainerKey.initialize(SG::AllowEmpty) );
+  ATH_CHECK( m_fitRawChannelContainerKey.initialize(SG::AllowEmpty) );
+  ATH_CHECK( m_fitcRawChannelContainerKey.initialize(SG::AllowEmpty) );
+  ATH_CHECK( m_optRawChannelContainerKey.initialize(SG::AllowEmpty) );
+  ATH_CHECK( m_qieRawChannelContainerKey.initialize(SG::AllowEmpty) );
+  ATH_CHECK( m_dspRawChannelContainerKey.initialize(SG::AllowEmpty) );
+  ATH_CHECK( m_of1RawChannelContainerKey.initialize(SG::AllowEmpty) );
+  ATH_CHECK( m_l2CntKey.initialize(m_compareMode) );
   
   ATH_MSG_INFO( "initialization completed" ) ;
   return StatusCode::SUCCESS;
 }
 
 
-StatusCode TileAANtuple::ntuple_initialize(const TileDQstatus& DQstatus) {
-  
+StatusCode TileAANtuple::ntuple_initialize(const EventContext& ctx,
+                                           const TileDQstatus& DQstatus)
+{
   if (m_bsInput) {
     ServiceHandle<IConversionSvc> cnvSvc("ByteStreamCnvSvc", "");
     if (cnvSvc.retrieve().isFailure()) {
@@ -367,7 +388,7 @@ StatusCode TileAANtuple::ntuple_initialize(const TileDQstatus& DQstatus) {
   
   ATH_CHECK( m_thistSvc.retrieve() );
   
-  if(initNTuple().isFailure()) {
+  if(initNTuple(ctx).isFailure()) {
     ATH_MSG_ERROR( " Error during ntuple initialization" );
   }
   
@@ -381,7 +402,7 @@ StatusCode TileAANtuple::execute() {
   const TileDQstatus* DQstatus = SG::makeHandle (m_DQstatusKey, ctx).get();
 
   if (m_evtNr < 0) {
-    if (ntuple_initialize(*DQstatus).isFailure()) {
+    if (ntuple_initialize(ctx, *DQstatus).isFailure()) {
       ATH_MSG_ERROR( "ntuple_initialize failed" );
     }
   }
@@ -402,30 +423,30 @@ StatusCode TileAANtuple::execute() {
   }
   
   //store Laser Object
-  if (m_laserObject.size() > 0) {
-    empty &= storeLaser().isFailure();
+  if (!m_laserObjectKey.empty()) {
+    empty &= storeLaser(ctx).isFailure();
   }
   
   // store TileDigits
-  empty &= storeDigits(m_fltDigitsContainer,m_sampleFlt,m_gainFlt,false).isFailure();
-  empty &= storeDigits(m_digitsContainer,   m_sample,   m_gain,   true ).isFailure();
+  empty &= storeDigits(ctx, m_fltDigitsContainerKey,m_sampleFlt,m_gainFlt,false).isFailure();
+  empty &= storeDigits(ctx, m_digitsContainerKey,   m_sample,   m_gain,   true ).isFailure();
   
   // store TileRawChannels
   // start from DSP channels - so we can find out what is the DSP units
-  empty &= storeRawChannels(m_dspRawChannelContainer,  m_eDsp,  m_tDsp,  m_chi2Dsp, m_pedDsp, true ).isFailure();
-  empty &= storeRawChannels(m_rawChannelContainer,     m_ene,   m_time,  m_chi2,    m_ped,    false).isFailure();
-  empty &= storeMFRawChannels(m_mfRawChannelContainer, m_eMF,   m_tMF,   m_chi2MF,  m_pedMF,  false).isFailure();
-  empty &= storeRawChannels(m_fitRawChannelContainer,  m_eFit,  m_tFit,  m_chi2Fit, m_pedFit, false).isFailure();
-  empty &= storeRawChannels(m_fitcRawChannelContainer, m_eFitc, m_tFitc, m_chi2Fitc,m_pedFitc,false).isFailure();
-  empty &= storeRawChannels(m_optRawChannelContainer,  m_eOpt,  m_tOpt,  m_chi2Opt, m_pedOpt, false).isFailure();
-  empty &= storeRawChannels(m_qieRawChannelContainer,  m_eQIE,  m_tQIE,  m_chi2QIE, m_pedQIE, false).isFailure();
-  empty &= storeRawChannels(m_of1RawChannelContainer,  m_eOF1,  m_tOF1,  m_chi2OF1, m_pedOF1, false).isFailure();
+  empty &= storeRawChannels(ctx, m_dspRawChannelContainerKey,  m_eDsp,  m_tDsp,  m_chi2Dsp, m_pedDsp, true ).isFailure();
+  empty &= storeRawChannels(ctx, m_rawChannelContainerKey,     m_ene,   m_time,  m_chi2,    m_ped,    false).isFailure();
+  empty &= storeMFRawChannels(ctx, m_mfRawChannelContainerKey, m_eMF,   m_tMF,   m_chi2MF,  m_pedMF,  false).isFailure();
+  empty &= storeRawChannels(ctx, m_fitRawChannelContainerKey,  m_eFit,  m_tFit,  m_chi2Fit, m_pedFit, false).isFailure();
+  empty &= storeRawChannels(ctx, m_fitcRawChannelContainerKey, m_eFitc, m_tFitc, m_chi2Fitc,m_pedFitc,false).isFailure();
+  empty &= storeRawChannels(ctx, m_optRawChannelContainerKey,  m_eOpt,  m_tOpt,  m_chi2Opt, m_pedOpt, false).isFailure();
+  empty &= storeRawChannels(ctx, m_qieRawChannelContainerKey,  m_eQIE,  m_tQIE,  m_chi2QIE, m_pedQIE, false).isFailure();
+  empty &= storeRawChannels(ctx, m_of1RawChannelContainerKey,  m_eOF1,  m_tOF1,  m_chi2OF1, m_pedOF1, false).isFailure();
   
   // store TMDB data
   //
-  empty &= storeTMDBDecision().isFailure();
-  empty &= storeTMDBDigits().isFailure();
-  empty &= storeTMDBRawChannel().isFailure();
+  empty &= storeTMDBDecision(ctx).isFailure();
+  empty &= storeTMDBDigits(ctx).isFailure();
+  empty &= storeTMDBRawChannel(ctx).isFailure();
 
   if (m_beamCnv) {
     SG::makeHandle (m_beamElemContainerKey, ctx).get();
@@ -442,23 +463,17 @@ StatusCode TileAANtuple::execute() {
   }
   m_lumiBlock = -1; // placeholder
   
-  // new way to set run/event/lumi block
-  // Retrieve eventInfo from StoreGate
-  const xAOD::EventInfo* eventInfo(0);
-  if (evtStore()->retrieve(eventInfo).isSuccess()){
+  //Get run and event numbers
+  m_run = ctx.eventID().run_number();
+  m_evt = ctx.eventID().event_number();
     
-    //Get run and event numbers
-    m_run = eventInfo->runNumber();
-    m_evt = eventInfo->eventNumber();
-    
-    if ( eventInfo->lumiBlock() ){
-      m_lumiBlock = eventInfo->lumiBlock();
-    }
+  if ( ctx.eventID().lumi_block() ){
+    m_lumiBlock = ctx.eventID().lumi_block();
+  }
     
-    //Get timestamp of the event
-    if (eventInfo->timeStamp() > 0) {
-      m_evTime = eventInfo->timeStamp();
-    }
+  //Get timestamp of the event
+  if (ctx.eventID().time_stamp() > 0) {
+    m_evTime = ctx.eventID().time_stamp();
   }
   
   if (m_evTime>0) {
@@ -530,12 +545,11 @@ StatusCode TileAANtuple::execute() {
 //
 // Here the LASER object is opened and corresponding variable are stored
 //
-StatusCode TileAANtuple::storeLaser() {
+StatusCode TileAANtuple::storeLaser (const EventContext& ctx) {
   
   ATH_MSG_DEBUG("TileAANtuple::storeLaser()");
   
-  const TileLaserObject* laserObj;
-  ATH_CHECK( evtStore()->retrieve(laserObj, m_laserObject) );
+  const TileLaserObject* laserObj = SG::makeHandle(m_laserObjectKey, ctx).get();
   
   m_las_BCID = laserObj->getBCID();
   
@@ -693,25 +707,22 @@ StatusCode TileAANtuple::storeBeamElements(const TileDQstatus& DQstatus) {
  /// Fill ntuple with data from TRC.
  */
 StatusCode
-TileAANtuple::storeRawChannels(std::string containerId
+TileAANtuple::storeRawChannels(const EventContext& ctx
+                               , const SG::ReadHandleKey<TileRawChannelContainer>& containerKey
                                , float ene[N_ROS2][N_MODULES][N_CHANS]
                                , float time[N_ROS2][N_MODULES][N_CHANS]
                                , float chi2[N_ROS2][N_MODULES][N_CHANS]
                                , float ped[N_ROS2][N_MODULES][N_CHANS]
                                , bool fillAll)
 {
-  if (containerId.size() == 0) {// empty name, nothing to do
-    if (fillAll && m_bsInput) {
-      containerId = "TileRawChannelCnt"; // try DSP container name to read DQ status
-    } else {
-      return StatusCode::FAILURE;
-    }
+  if (containerKey.empty()) {// empty name, nothing to do
+    return StatusCode::FAILURE;
   }
   
   // get named container
-  const TileRawChannelContainer* rcCnt;
-  ATH_CHECK( evtStore()->retrieve(rcCnt, containerId) );
-  ATH_MSG_VERBOSE( "Conteiner ID " << containerId );
+  const TileRawChannelContainer* rcCnt =
+    SG::makeHandle (containerKey, ctx).get();
+  ATH_MSG_VERBOSE( "Container ID " << containerKey.key() );
   
   TileRawChannelUnit::UNIT rChUnit = rcCnt->get_unit();
   ATH_MSG_VERBOSE( "RawChannel unit is " << rChUnit );
@@ -761,7 +772,7 @@ TileAANtuple::storeRawChannels(std::string containerId
     int rosL = rosI;
     int rosH = rosI + N_ROS;
     
-    ATH_MSG_VERBOSE( "TRC ("<< containerId
+    ATH_MSG_VERBOSE( "TRC ("<< containerKey.key()
                     <<") Event# "<< m_evtNr
                     << " Frag id 0x" << MSG::hex << fragId << MSG::dec
                     << " ROS " << ROS
@@ -878,8 +889,7 @@ TileAANtuple::storeRawChannels(std::string containerId
   
   if (m_compareMode && dspCont) {
     
-    const TileL2Container* l2Cnt;
-    ATH_CHECK( evtStore()->retrieve(l2Cnt, "TileL2Cnt") );
+    const TileL2Container* l2Cnt = SG::makeHandle(m_l2CntKey, ctx).get();
     
     TileL2Container::const_iterator it = l2Cnt->begin();
     TileL2Container::const_iterator end= l2Cnt->end();
@@ -895,24 +905,21 @@ TileAANtuple::storeRawChannels(std::string containerId
 }
 
 StatusCode
-TileAANtuple::storeMFRawChannels(std::string containerId
+TileAANtuple::storeMFRawChannels(const EventContext& ctx
+                                 , const SG::ReadHandleKey<TileRawChannelContainer>& containerKey
                                  , float ene[N_ROS2][N_MODULES][N_CHANS][N_SAMPLES]
                                  , float time[N_ROS2][N_MODULES][N_CHANS][N_SAMPLES]
                                  , float chi2[N_ROS2][N_MODULES][N_CHANS]
                                  , float ped[N_ROS2][N_MODULES][N_CHANS]
                                  , bool fillAll)
 {
-  if (containerId.size() == 0) {// empty name, nothing to do
-    if (fillAll && m_bsInput) {
-      containerId = "TileRawChannelCnt"; // try DSP container name to read DQ status
-    } else {
-      return StatusCode::FAILURE;
-    }
+  if (containerKey.empty()) {// empty name, nothing to do
+    return StatusCode::FAILURE;
   }
   
   // get named container
-  const TileRawChannelContainer* rcCnt;
-  ATH_CHECK( evtStore()->retrieve(rcCnt, containerId) );
+  const TileRawChannelContainer* rcCnt = \
+    SG::makeHandle (containerKey, ctx).get();
   
   TileRawChannelUnit::UNIT rChUnit = rcCnt->get_unit();
   ATH_MSG_VERBOSE( "RawChannel unit is " << rChUnit );
@@ -962,7 +969,7 @@ TileAANtuple::storeMFRawChannels(std::string containerId
     int rosL = rosI;
     int rosH = rosI + N_ROS;
     
-    ATH_MSG_VERBOSE( "TRC ("<< containerId
+    ATH_MSG_VERBOSE( "TRC ("<< containerKey.key()
                     <<") Event# "<< m_evtNr
                     << " Frag id 0x" << MSG::hex << fragId << MSG::dec
                     << " ROS " << ROS
@@ -1082,8 +1089,7 @@ TileAANtuple::storeMFRawChannels(std::string containerId
   
   if (m_compareMode && dspCont) {
     
-    const TileL2Container* l2Cnt;
-    ATH_CHECK( evtStore()->retrieve(l2Cnt, "TileL2Cnt") );
+    const TileL2Container* l2Cnt = SG::makeHandle(m_l2CntKey, ctx).get();
     
     TileL2Container::const_iterator it = l2Cnt->begin();
     TileL2Container::const_iterator end= l2Cnt->end();
@@ -1104,17 +1110,18 @@ TileAANtuple::storeMFRawChannels(std::string containerId
  /// Return true if the collection is empty
  */
 StatusCode
-TileAANtuple::storeDigits(std::string containerId
+TileAANtuple::storeDigits(const EventContext& ctx
+                          , const SG::ReadHandleKey<TileDigitsContainer>& containerKey
                           , short a_sample[N_ROS2][N_MODULES][N_CHANS][N_SAMPLES]
                           , short a_gain[N_ROS2][N_MODULES][N_CHANS]
                           , bool fillAll)
 {
-  if (containerId.size() == 0) // empty name, nothing to do
+  if (containerKey.empty()) // empty name, nothing to do
     return StatusCode::FAILURE;
   
   // Read Digits from TES
-  const TileDigitsContainer* digitsCnt;
-  ATH_CHECK( evtStore()->retrieve(digitsCnt, containerId) );
+  const TileDigitsContainer* digitsCnt =
+    SG::makeHandle (containerKey, ctx).get();
   
   bool emptyColl = true;
   
@@ -1282,18 +1289,18 @@ TileAANtuple::storeDigits(std::string containerId
   else return StatusCode::SUCCESS;
 }
 
-StatusCode TileAANtuple::storeTMDBDecision() {
+StatusCode TileAANtuple::storeTMDBDecision(const EventContext& ctx) {
 
   const char * part[4] = {"LBA","LBC","EBA","EBC"};
 
   // Read Decision from TES
   //
-  if (m_tileMuRcvContainer.size()>0){
+  if (!m_tileMuRcvContainerKey.empty()){
 
-    ATH_MSG_VERBOSE( "reading TMDB decision from " << m_tileMuRcvContainer ); 
+    ATH_MSG_VERBOSE( "reading TMDB decision from " << m_tileMuRcvContainerKey.key() ); 
 
-    const TileMuonReceiverContainer *decisionCnt;
-    ATH_CHECK( evtStore()->retrieve(decisionCnt, m_tileMuRcvContainer) );
+    const TileMuonReceiverContainer *decisionCnt =
+      SG::makeHandle (m_tileMuRcvContainerKey, ctx).get();
   
     TileMuonReceiverContainer::const_iterator it = decisionCnt->begin();
     TileMuonReceiverContainer::const_iterator itLast = decisionCnt->end();
@@ -1338,18 +1345,18 @@ StatusCode TileAANtuple::storeTMDBDecision() {
   return StatusCode::SUCCESS;
 }
  
-StatusCode TileAANtuple::storeTMDBDigits() {
+StatusCode TileAANtuple::storeTMDBDigits(const EventContext& ctx) {
 
   const char * part[4] = {"LBA","LBC","EBA","EBC"};
 
   // Read Digits from TES
   //
-  if (m_tileMuRcvDigitsContainer.size()>0){
+  if (!m_tileMuRcvDigitsContainerKey.empty()){
 
-    ATH_MSG_VERBOSE( "reading TMDB digits from " << m_tileMuRcvDigitsContainer ); 
+    ATH_MSG_VERBOSE( "reading TMDB digits from " << m_tileMuRcvDigitsContainerKey.key() ); 
 
-    const TileDigitsContainer* digitsCnt;
-    ATH_CHECK( evtStore()->retrieve(digitsCnt, m_tileMuRcvDigitsContainer) );
+    const TileDigitsContainer* digitsCnt =
+      SG::makeHandle (m_tileMuRcvDigitsContainerKey, ctx).get();
   
     TileDigitsContainer::const_iterator itColl1 = (*digitsCnt).begin();
     TileDigitsContainer::const_iterator itCollEnd1 = (*digitsCnt).end();
@@ -1410,18 +1417,18 @@ StatusCode TileAANtuple::storeTMDBDigits() {
   return StatusCode::SUCCESS;
 }
 
-StatusCode TileAANtuple::storeTMDBRawChannel() {
+StatusCode TileAANtuple::storeTMDBRawChannel(const EventContext& ctx) {
 
   const char * part[4] = {"LBA","LBC","EBA","EBC"};
 
   // Read Raw Channels from TDS
   //
-  if (m_tileMuRcvRawChannelContainer.size()>0){
+  if (!m_tileMuRcvRawChannelContainerKey.empty()){
 
-    ATH_MSG_VERBOSE( "reading TMDB energies from " << m_tileMuRcvRawChannelContainer ); 
+    ATH_MSG_VERBOSE( "reading TMDB energies from " << m_tileMuRcvRawChannelContainerKey.key() ); 
 
-    const TileRawChannelContainer* rcCnt;
-    ATH_CHECK( evtStore()->retrieve(rcCnt, m_tileMuRcvRawChannelContainer) );
+    const TileRawChannelContainer* rcCnt =
+      SG::makeHandle (m_tileMuRcvRawChannelContainerKey, ctx).get();
 
     TileRawChannelContainer::const_iterator itColl2 = (*rcCnt).begin();
     TileRawChannelContainer::const_iterator itCollEnd2 = (*rcCnt).end();
@@ -1484,7 +1491,7 @@ TileAANtuple::ntuple_clear() {
 }
 
 StatusCode
-TileAANtuple::initNTuple(void) {
+TileAANtuple::initNTuple(const EventContext& ctx) {
   //Aux Ntuple creation
   
   if (m_ntupleID.size() > 0) {
@@ -1507,9 +1514,9 @@ TileAANtuple::initNTuple(void) {
     
     TRIGGER_addBranch();
     CISPAR_addBranch();
-    if (m_laserObject.size() > 0) {
-      const TileLaserObject* laserObj;
-      ATH_CHECK( evtStore()->retrieve(laserObj, m_laserObject) );
+    if (!m_laserObjectKey.empty()) {
+      const TileLaserObject* laserObj =
+        SG::makeHandle(m_laserObjectKey, ctx).get();
       m_las_version = laserObj->getVersion();
       LASER_addBranch();
     }
@@ -1733,7 +1740,7 @@ void TileAANtuple::CISPAR_clearBranch(void) {
  */
 void TileAANtuple::LASER_addBranch(void) {
   
-  if (m_laserObject.size() > 0) {
+  if (!m_laserObjectKey.empty()) {
     
     const char* gainnames[2]  = {"LG","HG"};
     const char* channames[16] = {"Diode0","Diode1","Diode2","Diode3","Diode4","Diode5","Diode6","Diode7",
@@ -2006,7 +2013,7 @@ void TileAANtuple::LASER_addBranch(void) {
  */
 void TileAANtuple::LASER_clearBranch(void) {
   
-  if (m_laserObject.size() > 0) {
+  if (!m_laserObjectKey.empty()) {
     
     m_las_BCID = 0;
     
@@ -2079,35 +2086,35 @@ void TileAANtuple::DIGI_addBranch(void)
     
     std::string f_suf(suf[i]);
     
-    if (m_fltDigitsContainer.size() == 0 && m_digitsContainer.size() == 0
-        && (m_rawChannelContainer.size() > 0
-            || m_fitRawChannelContainer.size() > 0
-            || m_fitcRawChannelContainer.size() > 0
-            || m_optRawChannelContainer.size() > 0
-            || m_qieRawChannelContainer.size() > 0
-            || m_dspRawChannelContainer.size() > 0
-            || m_mfRawChannelContainer.size() > 0
-            || m_of1RawChannelContainer.size() > 0
-            || m_bsInput) ) {
+    if (m_fltDigitsContainerKey.empty() && m_digitsContainerKey.empty()
+        && (!m_rawChannelContainerKey.empty()
+            || !m_fitRawChannelContainerKey.empty()
+            || !m_fitcRawChannelContainerKey.empty()
+            || !m_optRawChannelContainerKey.empty()
+            || !m_qieRawChannelContainerKey.empty()
+            || !m_dspRawChannelContainerKey.empty()
+            || !m_mfRawChannelContainerKey.empty()
+            || !m_of1RawChannelContainerKey.empty()
+            || !m_bsInput) ) {
           
           m_ntuplePtr->Branch(NAME2("gain",f_suf),            m_gain[ir],          NAME3("gain",         f_suf,"[4][64][48]/S"));    // short
           
         } else {
           
-          if (m_fltDigitsContainer.size() > 0) {
-            if (m_digitsContainer.size() > 0) { // should use different names for two containers
+          if (!m_fltDigitsContainerKey.empty()) {
+            if (!m_digitsContainerKey.empty()) { // should use different names for two containers
               
               m_ntuplePtr->Branch(NAME2("sampleFlt",f_suf),   m_sampleFlt[ir],     NAME3("sampleFlt",    f_suf,"[4][64][48][7]/S")); // short
               m_ntuplePtr->Branch(NAME2("gainFlt",f_suf),     m_gainFlt[ir],       NAME3("gainFlt",      f_suf,"[4][64][48]/S"));    // short
             } else {
               m_ntuplePtr->Branch(NAME2("sample",f_suf),      m_sampleFlt[ir],     NAME3("sampleFlt",    f_suf,"[4][64][48][7]/S")); // short
-              if (m_rawChannelContainer.size() > 0
-                  || m_fitRawChannelContainer.size() > 0
-                  || m_fitcRawChannelContainer.size() > 0
-                  || m_optRawChannelContainer.size() > 0
-                  || m_qieRawChannelContainer.size() > 0
-                  || m_of1RawChannelContainer.size() > 0
-                  || m_dspRawChannelContainer.size() > 0
+              if (!m_rawChannelContainerKey.empty()
+                  || !m_fitRawChannelContainerKey.empty()
+                  || !m_fitcRawChannelContainerKey.empty()
+                  || !m_optRawChannelContainerKey.empty()
+                  || !m_qieRawChannelContainerKey.empty()
+                  || !m_of1RawChannelContainerKey.empty()
+                  || !m_dspRawChannelContainerKey.empty()
                   || m_bsInput) {
                 
                 m_ntuplePtr->Branch(NAME2("gain",f_suf),      m_gain[ir],          NAME3("gain",         f_suf,"[4][64][48]/S"));    // short
@@ -2117,7 +2124,7 @@ void TileAANtuple::DIGI_addBranch(void)
             }
           }
           
-          if (m_digitsContainer.size() > 0) {
+          if (!m_digitsContainerKey.empty()) {
             m_ntuplePtr->Branch(NAME2("sample",f_suf),          m_sample[ir],        NAME3("sample",       f_suf,"[4][64][48][7]/S")); // short
             m_ntuplePtr->Branch(NAME2("gain",f_suf),            m_gain[ir],          NAME3("gain",         f_suf,"[4][64][48]/S"));    // short
             
@@ -2143,56 +2150,56 @@ void TileAANtuple::DIGI_addBranch(void)
           }
         }
     
-    if (m_rawChannelContainer.size() > 0) {
+    if (!m_rawChannelContainerKey.empty()) {
       m_ntuplePtr->Branch(NAME2("ene",f_suf),     m_ene[ir],          NAME3("ene",f_suf,"[4][64][48]/F")); // float
       m_ntuplePtr->Branch(NAME2("time",f_suf),    m_time[ir],        NAME3("time",f_suf,"[4][64][48]/F")); // float
       m_ntuplePtr->Branch(NAME2("ped",f_suf),     m_ped[ir],          NAME3("ped",f_suf,"[4][64][48]/F")); // float
       m_ntuplePtr->Branch(NAME2("chi2",f_suf),    m_chi2[ir],        NAME3("chi2",f_suf,"[4][64][48]/F")); // float
     }
     
-    if (m_fitRawChannelContainer.size() > 0) {
+    if (!m_fitRawChannelContainerKey.empty()) {
       m_ntuplePtr->Branch(NAME2("eFit",f_suf),    m_eFit[ir],        NAME3("eFit",f_suf,"[4][64][48]/F")); // float
       m_ntuplePtr->Branch(NAME2("tFit",f_suf),    m_tFit[ir],        NAME3("tFit",f_suf,"[4][64][48]/F")); // float
       m_ntuplePtr->Branch(NAME2("pedFit",f_suf),  m_pedFit[ir],    NAME3("pedFit",f_suf,"[4][64][48]/F")); // float
       m_ntuplePtr->Branch(NAME2("chi2Fit",f_suf), m_chi2Fit[ir],  NAME3("chi2Fit",f_suf,"[4][64][48]/F")); // float
     }
     
-    if (m_fitcRawChannelContainer.size() > 0) {
+    if (!m_fitcRawChannelContainerKey.empty()) {
       m_ntuplePtr->Branch(NAME2("eFitc",f_suf),   m_eFitc[ir],      NAME3("eFitc",f_suf,"[4][64][48]/F")); // float
       m_ntuplePtr->Branch(NAME2("tFitc",f_suf),   m_tFitc[ir],      NAME3("tFitc",f_suf,"[4][64][48]/F")); // float
       m_ntuplePtr->Branch(NAME2("pedFitc",f_suf), m_pedFitc[ir],  NAME3("pedFitc",f_suf,"[4][64][48]/F")); // float
       m_ntuplePtr->Branch(NAME2("chi2Fitc",f_suf),m_chi2Fitc[ir],NAME3("chi2Fitc",f_suf,"[4][64][48]/F")); // float
     }
     
-    if (m_optRawChannelContainer.size() > 0) {
+    if (!m_optRawChannelContainerKey.empty()) {
       m_ntuplePtr->Branch(NAME2("eOpt",f_suf),    m_eOpt[ir],        NAME3("eOpt",f_suf,"[4][64][48]/F")); // float
       m_ntuplePtr->Branch(NAME2("tOpt",f_suf),    m_tOpt[ir],        NAME3("tOpt",f_suf,"[4][64][48]/F")); // float
       m_ntuplePtr->Branch(NAME2("pedOpt",f_suf),  m_pedOpt[ir],    NAME3("pedOpt",f_suf,"[4][64][48]/F")); // float
       m_ntuplePtr->Branch(NAME2("chi2Opt",f_suf), m_chi2Opt[ir],  NAME3("chi2Opt",f_suf,"[4][64][48]/F")); // float
     }
     
-    if (m_qieRawChannelContainer.size() > 0) {
+    if (!m_qieRawChannelContainerKey.empty()) {
       m_ntuplePtr->Branch(NAME2("eQIE",f_suf),    m_eQIE[ir],        NAME3("eQIE",f_suf,"[4][64][48]/F")); // float
       m_ntuplePtr->Branch(NAME2("tQIE",f_suf),    m_tQIE[ir],        NAME3("tQIE",f_suf,"[4][64][48]/F")); // float
       m_ntuplePtr->Branch(NAME2("pedQIE",f_suf),  m_pedQIE[ir],    NAME3("pedQIE",f_suf,"[4][64][48]/F")); // float
       m_ntuplePtr->Branch(NAME2("chi2QIE",f_suf), m_chi2QIE[ir],  NAME3("chi2QIE",f_suf,"[4][64][48]/F")); // float
     }
 
-    if (m_of1RawChannelContainer.size() > 0) {
+    if (!m_of1RawChannelContainerKey.empty()) {
       m_ntuplePtr->Branch(NAME2("eOF1",f_suf),    m_eOF1[ir],        NAME3("eOF1",f_suf,"[4][64][48]/F")); // float
       m_ntuplePtr->Branch(NAME2("tOF1",f_suf),    m_tOF1[ir],        NAME3("tOF1",f_suf,"[4][64][48]/F")); // float
       m_ntuplePtr->Branch(NAME2("pedOF1",f_suf),  m_pedOF1[ir],    NAME3("pedOF1",f_suf,"[4][64][48]/F")); // float
       m_ntuplePtr->Branch(NAME2("chi2OF1",f_suf), m_chi2OF1[ir],  NAME3("chi2OF1",f_suf,"[4][64][48]/F")); // float
     }
     
-    if (m_dspRawChannelContainer.size() > 0) {
+    if (!m_dspRawChannelContainerKey.empty()) {
       m_ntuplePtr->Branch(NAME2("eDsp",f_suf),    m_eDsp[ir],        NAME3("eDsp",f_suf,"[4][64][48]/F")); // float
       m_ntuplePtr->Branch(NAME2("tDsp",f_suf),    m_tDsp[ir],        NAME3("tDsp",f_suf,"[4][64][48]/F")); // float
       m_ntuplePtr->Branch(NAME2("pedDsp",f_suf),  m_pedDsp[ir],    NAME3("pedDsp",f_suf,"[4][64][48]/F")); // float
       m_ntuplePtr->Branch(NAME2("chi2Dsp",f_suf), m_chi2Dsp[ir],  NAME3("chi2Dsp",f_suf,"[4][64][48]/F")); // float
     }
     
-    if (m_mfRawChannelContainer.size() > 0) {
+    if (!m_mfRawChannelContainerKey.empty()) {
       m_ntuplePtr->Branch(NAME2("eMF",f_suf),    m_eMF[ir],        NAME3("eMF",f_suf,"[4][64][48][7]/F")); // float
       m_ntuplePtr->Branch(NAME2("tMF",f_suf),    m_tMF[ir],        NAME3("tMF",f_suf,"[4][64][48][7]/F")); // float
       m_ntuplePtr->Branch(NAME2("chi2MF",f_suf), m_chi2MF[ir],     NAME3("chi2MF",f_suf,"[4][64][48]/F")); // float
@@ -2243,12 +2250,12 @@ void TileAANtuple::DIGI_clearBranch(void) {
   
   CLEAR3(m_gain, size);
   
-  if (m_fltDigitsContainer.size() > 0) {
+  if (!m_fltDigitsContainerKey.empty()) {
     CLEAR3(m_sampleFlt, size);
     CLEAR3(m_gainFlt, size);
   }
   
-  if (m_digitsContainer.size() > 0) {
+  if (!m_digitsContainerKey.empty()) {
     CLEAR3(m_sample, size);
     
     if (m_bsInput) {
@@ -2271,28 +2278,28 @@ void TileAANtuple::DIGI_clearBranch(void) {
     
   }
   
-  if (m_rawChannelContainer.size() > 0) {
+  if (!m_rawChannelContainerKey.empty()) {
     CLEAR2(m_ene, size);
     CLEAR2(m_time, size);
     CLEAR2(m_ped, size);
     CLEAR2(m_chi2, size);
   }
   
-  if (m_fitRawChannelContainer.size() > 0) {
+  if (!m_fitRawChannelContainerKey.empty()) {
     CLEAR2(m_eFit, size);
     CLEAR2(m_tFit, size);
     CLEAR2(m_pedFit, size);
     CLEAR2(m_chi2Fit, size);
   }
   
-  if (m_fitcRawChannelContainer.size() > 0) {
+  if (!m_fitcRawChannelContainerKey.empty()) {
     CLEAR2(m_eFitc, size);
     CLEAR2(m_tFitc, size);
     CLEAR2(m_pedFitc, size);
     CLEAR2(m_chi2Fitc, size);
   }
   
-  if (m_optRawChannelContainer.size() > 0) {
+  if (!m_optRawChannelContainerKey.empty()) {
     CLEAR2(m_eOpt, size);
     CLEAR2(m_tOpt, size);
     CLEAR2(m_pedOpt, size);
@@ -2300,28 +2307,28 @@ void TileAANtuple::DIGI_clearBranch(void) {
   }
   
 
-  if (m_qieRawChannelContainer.size() > 0) {
+  if (!m_qieRawChannelContainerKey.empty()) {
     CLEAR2(m_eQIE, size);
     CLEAR2(m_tQIE, size);
     CLEAR2(m_pedQIE, size);
     CLEAR2(m_chi2QIE, size);
   }
 
-  if (m_of1RawChannelContainer.size() > 0) {
+  if (!m_of1RawChannelContainerKey.empty()) {
     CLEAR2(m_eOF1, size);
     CLEAR2(m_tOF1, size);
     CLEAR2(m_pedOF1, size);
     CLEAR2(m_chi2OF1, size);
   }
   
-  if (m_dspRawChannelContainer.size() > 0) {
+  if (!m_dspRawChannelContainerKey.empty()) {
     CLEAR2(m_eDsp, size);
     CLEAR2(m_tDsp, size);
     CLEAR2(m_pedDsp, size);
     CLEAR2(m_chi2Dsp, size);
   }
   
-  if (m_mfRawChannelContainer.size() > 0) {
+  if (!m_mfRawChannelContainerKey.empty()) {
     CLEAR2(m_eMF, size);
     CLEAR2(m_tMF, size);
     CLEAR2(m_chi2MF, size);
@@ -2354,15 +2361,15 @@ void TileAANtuple::DIGI_clearBranch(void) {
 void TileAANtuple::TMDB_addBranch(void)
 {
 
-  if (m_tileMuRcvRawChannelContainer.size()>0) {
+  if (!m_tileMuRcvRawChannelContainerKey.empty()) {
     m_ntuplePtr->Branch("eTMDB", m_eTMDB, "eTMDB[4][64][8]/F");  // float m_eTMDB[N_ROS][N_MODULES][N_TMDBCHANS]
   }
 
-  if (m_tileMuRcvDigitsContainer.size()>0) {
+  if (!m_tileMuRcvDigitsContainerKey.empty()) {
     m_ntuplePtr->Branch("sampleTMDB", m_sampleTMDB, "sampleTMDB[4][64][8][7]/b"); // unsigned char m_sampleTMDB[N_ROS][N_MODULES][N_TMDBCHANS][N_SAMPLES]
   }
 
-  if (m_tileMuRcvContainer.size()>0) {
+  if (!m_tileMuRcvContainerKey.empty()) {
     m_ntuplePtr->Branch("decisionTMDB", m_decisionTMDB, "decisionTMDB[4][64][4]/b"); // unsigned char m_decisionTMDB[N_ROS][N_MODULES][N_TMDBDECISIONS]
   }
 
@@ -2370,9 +2377,9 @@ void TileAANtuple::TMDB_addBranch(void)
 
 void TileAANtuple::TMDB_clearBranch(void)
 {
-  if (m_tileMuRcvRawChannelContainer.size()>0) CLEAR(m_eTMDB);
-  if (m_tileMuRcvDigitsContainer.size()>0) CLEAR(m_sampleTMDB);
-  if (m_tileMuRcvContainer.size()>0) CLEAR(m_decisionTMDB);
+  if (!m_tileMuRcvRawChannelContainerKey.empty()) CLEAR(m_eTMDB);
+  if (!m_tileMuRcvDigitsContainerKey.empty()) CLEAR(m_sampleTMDB);
+  if (!m_tileMuRcvContainerKey.empty()) CLEAR(m_decisionTMDB);
 }
 
 /*/////////////////////////////////////////////////////////////////////////////
diff --git a/TileCalorimeter/TileRecUtils/TileRecUtils/TileCellBuilder.h b/TileCalorimeter/TileRecUtils/TileRecUtils/TileCellBuilder.h
index 06b97d359411690e12823ae930657ce326007457..f029d48326862dff8bb3c21ca09433b18df5ba4b 100644
--- a/TileCalorimeter/TileRecUtils/TileRecUtils/TileCellBuilder.h
+++ b/TileCalorimeter/TileRecUtils/TileRecUtils/TileCellBuilder.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TILERECUTILS_TILECELLBUILDER_H
@@ -77,12 +77,12 @@ class TileDQstatus;
  */
 class TileDrawerEvtStatus {
   public:
-    int nChannels;
-    int nMaskedChannels;
-    int nBadQuality;
-    int nOverflow;
-    int nUnderflow;
-    int nSomeSignal;
+    int nChannels = 0;
+    int nMaskedChannels = 0;
+    int nBadQuality = 0;
+    int nOverflow = 0;
+    int nUnderflow = 0;
+    int nSomeSignal = 0;
 };
 
 /**
@@ -102,48 +102,33 @@ class TileDrawerRunStatus {
  @brief This class creates Cells from RawChannels and stores them in a container
  
  */
-class TileCellBuilder: public AthAlgTool, virtual public ICaloCellMakerTool {
-    friend class DoubleVectorIterator;
+class TileCellBuilder
+  : public extends<AthAlgTool, ICaloCellMakerTool>
+{
   public:
     TileCellBuilder(const std::string& type, const std::string& name, const IInterface* parent); //!< Contructor
 
     virtual ~TileCellBuilder(); //!< Destructor
 
-    virtual StatusCode initialize();                     //!< initialize mehtod
+    virtual StatusCode initialize() override;
 
-    void reset(bool fullSizeCont, bool printReset = true); //!< Method to reset the options of the TileCellContainer
-
-    /**
-     This method sets the type and unit for the TileRAwChannels. It
-     might be called from TileROD_Decoder
-     otherwise it isn't needed - type and unit are available from 
-     TileRawChannelContainer itself (see TileCellBuilder::process() below)
-     */
-    void set_type_and_unit(TileFragHash::TYPE type = TileFragHash::Default
-        , TileRawChannelUnit::UNIT unit = TileRawChannelUnit::ADCcounts);
-
-    virtual StatusCode finalize(); //!< finalize method
+    virtual StatusCode finalize() override;
 
-    virtual StatusCode process(CaloCellContainer* theCellContainer); // method to process all raw channels and store them in container
+    /// method to process all raw channels and store them in container
+    virtual StatusCode process(CaloCellContainer* theCellContainer) override;
 
-    template<class ITERATOR, class COLLECTION>
-    void build(const EventContext& ctx,
-               const ITERATOR & begin, const ITERATOR & end, COLLECTION * coll); //!< method to process raw channels from a given vector and store them in collection
-
-    /** method to check if channels are good or bad. Puts zero if both channels are bad
-     or recovers from single-channel failure. It returns true if cell was changed, false otherwise
-     */
-    bool maskBadChannel(TileCell* pCell, HWIdentifier hwid);
-    bool maskBadChannels(TileCell* pCell);
+    void reset(bool fullSizeCont, bool printReset = true); //!< Method to reset the options of the TileCellContainer
 
     //AlgTool InterfaceID
     static const InterfaceID& interfaceID();
-    //static const InterfaceID& interfaceID() { return ICaloCellMakerTool; };
 
-  protected:
+private:
     // FIXME: Get rid of this abomination.
     friend class TileHid2RESrcID;
 
+    /// status of every drawer
+    typedef TileDrawerEvtStatus TileDrawerEvtStatusArray[5][64];
+
     // properties
     SG::ReadHandleKey<TileRawChannelContainer> m_rawChannelContainerKey{this, "TileRawChannelContainer", 
                                                                         "TileRawChannelCnt", 
@@ -153,8 +138,11 @@ class TileCellBuilder: public AthAlgTool, virtual public ICaloCellMakerTool {
                                                                            "TileRawChannelCnt", 
                                                                            "Input Tile DSP raw channel container key"};
 
-    SG::ReadHandleKey<xAOD::EventInfo> m_eventInfoKey{this, "EventInfo",
-                                                      "EventInfo", "Input Event info key"};
+    SG::ReadHandleKey<xAOD::EventInfo> m_eventInfoKey{this, "EventInfo", 
+                                                      "EventInfo", 
+                                                      "EventInfo key"};
+
+
 
     SG::ReadHandleKey<TileDQstatus> m_DQstatusKey{this, "TileDQstatus", 
                                                   "TileDQstatus", 
@@ -205,7 +193,6 @@ class TileCellBuilder: public AthAlgTool, virtual public ICaloCellMakerTool {
     const TileTBID* m_tileTBID; //!< Pointer to TileTBID
     const TileHWID* m_tileHWID; //!< Pointer to TileHWID
     const TileCablingService* m_cabling; //!< TileCabling instance
-    const TileDQstatus* m_DQstatus;
 
     ToolHandle<ITileBadChanTool> m_tileBadChanTool{this,
         "TileBadChanTool", "TileBadChanTool", "Tile bad channel tool"};
@@ -224,63 +211,104 @@ class TileCellBuilder: public AthAlgTool, virtual public ICaloCellMakerTool {
     const TileDetDescrManager* m_tileMgr; //!< Pointer to TileDetDescrManager
     const MbtsDetDescrManager* m_mbtsMgr; //!< Pointer to MbtsDetDescrManager
 
-    std::vector<TileCell*> m_allCells;  //!< vector to of pointers to TielCells
-    std::unique_ptr<TileCellContainer> m_MBTSCells;     //!< Pointer to MBTS cell container
-    std::unique_ptr<TileCellContainer> m_E4prCells;     //!< Pointer to E4'  cell container
-
-    TileFragHash::TYPE m_RChType;        //!< Type of TileRawChannels (Fit, OF2, etc.)
-    TileRawChannelUnit::UNIT m_RChUnit;  //!< Unit for TileRawChannels (ADC, pCb, etc.)
     //unsigned int m_bsflags;              //!< other flags stored in TileRawChannelContainer
-    float m_maxTimeCorr;                 //!< max possible time when time correction is applied
 
-    TileDrawerEvtStatus m_drawerEvtStatus[5][64]; //!< status of every drawer in every event
-    TileDrawerRunStatus m_drawerRunStatus[5][64]; //!< overall status of drawer in whole run
-    int m_eventErrorCounter[4]; //!< number of events with no errors(0), warnings(1), error(2), total(3)
+    // These were accumulated, but never actually used.
+    // They also spoil reentrancy, so leave them commented-out for now.
+    // If this information is needed in the future, these can be changed
+    // to use atomics.
+    //TileDrawerRunStatus m_drawerRunStatus[5][64]; //!< overall status of drawer in whole run
+    //int m_eventErrorCounter[4]; //!< number of events with no errors(0), warnings(1), error(2), total(3)
 
     std::vector<CaloAffectedRegionInfo> m_affectedRegionInfo_global;
     std::vector<CaloAffectedRegionInfo> m_affectedRegionInfo_current_run;
 
+   
+    struct VecParams
+    {
+      // Type of TileRawChannels (Fit, OF2, etc.)
+      TileFragHash::TYPE m_RChType;      
+ 
+      // Unit for TileRawChannels (ADC, pCb, etc.)
+      TileRawChannelUnit::UNIT m_RChUnit;
+
+      // max possible time when time correction is applied
+      float m_maxTimeCorr = 75.0;
+
+      // If true, amplitude is corrected by parabolic function (needed for OF without iterations)
+      bool m_correctAmplitude; 
+
+      // should time be corrected (deltat added from CondDB)
+      bool m_correctTime;          
+
+      // If true, assume OF2 method for amplitude correction, otherwise - OF1
+      bool m_of2;
+    };
+ 
+    /// < method to process raw channels from a given vector and store them in collection
+    template<class ITERATOR, class COLLECTION>
+    void build (const EventContext& ctx,
+                TileDrawerEvtStatusArray& drawerEvtStatus,
+                VecParams& params,
+                const ITERATOR & begin,
+                const ITERATOR & end,
+                COLLECTION* coll,
+                TileCellContainer* MBTSCells,
+                TileCellContainer* E4prCells) const;
+
+    /** method to check if channels are good or bad. Puts zero if both channels are bad
+     or recovers from single-channel failure. It returns true if cell was changed, false otherwise
+     */
+    bool maskBadChannel (TileDrawerEvtStatusArray& drawerEvtStatus,
+                         const TileDQstatus* DQstatus,
+                         TileCell* pCell, HWIdentifier hwid) const;
+    bool maskBadChannels (TileDrawerEvtStatusArray& drawerEvtStatus,
+                          const TileDQstatus* DQstatus,
+                          TileCell* pCell) const;
+
     void correctCell(TileCell* pCell, int correction, int pmt, int gain, float ener, float time,
-        unsigned char iqual, unsigned char qbit, int ch_type); //!< Compute calibrated energy, time, etc. for TileCell and adjust it.
+        unsigned char iqual, unsigned char qbit, int ch_type) const; //!< Compute calibrated energy, time, etc. for TileCell and adjust it.
 
-    unsigned char iquality(float qual)  {//!< method to compute the cell quality
+    unsigned char iquality(float qual) const {//!< method to compute the cell quality
          return std::min(255, abs((int) qual));
     } // keep quality within 8 bits make it "unsigned char"
 
-    unsigned char qbits(int ros, int drawer, bool count_over, bool good_time, bool good_ener,
-        bool overflow, bool underflow, bool good_overflowfit); //!< method to compute the cell quality bits
+
+    /// method to compute the cell quality bits
+    unsigned char qbits (TileDrawerEvtStatusArray& drawerEvtStatus,
+                         TileFragHash::TYPE RChType,
+                         int ros, int drawer,
+                         bool count_over, bool good_time, bool good_ener,
+                         bool overflow, bool underflow,
+                         bool good_overflowfit) const;
 
     bool isChanDCSgood (int ros, int drawer, int channel) const;
 
     template<typename T, typename V>
     class DoubleVectorIterator {
+        VecParams& m_params;
         T* m_first;
-        TileFragHash::TYPE m_typ1;
-        TileRawChannelUnit::UNIT m_uni1;
-        float m_cut1;
-        bool m_amp1;
-        bool m_tim1;
-        bool m_of21;
+        const VecParams& m_params1;
         T* m_second;
-        TileFragHash::TYPE m_typ2;
-        TileRawChannelUnit::UNIT m_uni2;
-        float m_cut2;
-        bool m_amp2;
-        bool m_tim2;
-        bool m_of22;
-        TileCellBuilder* m_ptr;
+        const VecParams& m_params2;
         int m_pos;
         typedef typename T::iterator itr_type;
         itr_type m_itr;
 
       public:
 
-        DoubleVectorIterator(T* f, TileFragHash::TYPE y1, TileRawChannelUnit::UNIT u1, float c1, bool a1, bool t1, bool o1
-                           , T* s, TileFragHash::TYPE y2, TileRawChannelUnit::UNIT u2, float c2, bool a2, bool t2, bool o2
-                           , TileCellBuilder* b, int p)
-            : m_first(f), m_typ1(y1), m_uni1(u1), m_cut1(c1), m_amp1(a1), m_tim1(t1), m_of21(o1)
-            , m_second(s), m_typ2(y2), m_uni2(u2), m_cut2(c2), m_amp2(a2), m_tim2(t2), m_of22(o2)
-            , m_ptr(b), m_pos(p) {
+        DoubleVectorIterator(VecParams& params,
+                             T* f,
+                             const VecParams& params1,
+                             T* s,
+                             const VecParams& params2,
+                             int p)
+          : m_params(params),
+            m_first(f),
+              m_params1(params1),
+              m_second(s),
+              m_params2(params2),
+              m_pos(p) {
 
           if (m_first->begin() != m_first->end() && m_pos < 1) {
             m_pos = 0;
@@ -289,12 +317,7 @@ class TileCellBuilder: public AthAlgTool, virtual public ICaloCellMakerTool {
             m_pos = 1;
             m_itr = m_second->begin();
             // set parameters for second vector
-            m_ptr->m_RChType = m_typ2;
-            m_ptr->m_RChUnit = m_uni2;
-            m_ptr->m_maxTimeCorr = m_cut2;
-            m_ptr->m_correctAmplitude = m_amp2;
-            m_ptr->m_correctTime = m_tim2;
-            m_ptr->m_of2 = m_of22;
+            m_params = m_params2;
           } else {
             m_pos = 2;
             m_itr = m_second->end();
@@ -321,33 +344,18 @@ class TileCellBuilder: public AthAlgTool, virtual public ICaloCellMakerTool {
               m_itr = m_second->begin();
               m_pos = 1;
               // set parameters for second vector
-              m_ptr->m_RChType = m_typ2;
-              m_ptr->m_RChUnit = m_uni2;
-              m_ptr->m_maxTimeCorr = m_cut2;
-              m_ptr->m_correctAmplitude = m_amp2;
-              m_ptr->m_correctTime = m_tim2;
-              m_ptr->m_of2 = m_of22;
+              m_params = m_params2;
               if (m_itr != m_second->end()) break;
               m_pos = 2;
               // recover parameters for first vector
-              m_ptr->m_RChType = m_typ1;
-              m_ptr->m_RChUnit = m_uni1;
-              m_ptr->m_maxTimeCorr = m_cut1;
-              m_ptr->m_correctAmplitude = m_amp1;
-              m_ptr->m_correctTime = m_tim1;
-              m_ptr->m_of2 = m_of21;
+              m_params = m_params1;
               break;
             case 1:
               if (m_itr != m_second->end()) ++m_itr;
               if (m_itr != m_second->end()) break;
               m_pos = 2;
               // recover parameters for first vector
-              m_ptr->m_RChType = m_typ1;
-              m_ptr->m_RChUnit = m_uni1;
-              m_ptr->m_maxTimeCorr = m_cut1;
-              m_ptr->m_correctAmplitude = m_amp1;
-              m_ptr->m_correctTime = m_tim1;
-              m_ptr->m_of2 = m_of21;
+              m_params = m_params1;
               break;
             default:
               break;
diff --git a/TileCalorimeter/TileRecUtils/TileRecUtils/TileCellBuilderFromHit.h b/TileCalorimeter/TileRecUtils/TileRecUtils/TileCellBuilderFromHit.h
index 1c2c238c180a34e3a3e506eead28d04324bce74d..e0b653a6ac19c0c514eedaf4f90e162a0d8e36b0 100644
--- a/TileCalorimeter/TileRecUtils/TileRecUtils/TileCellBuilderFromHit.h
+++ b/TileCalorimeter/TileRecUtils/TileRecUtils/TileCellBuilderFromHit.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TILERECUTILS_TILECELLBUILDERFROMHIT_H
@@ -74,41 +74,38 @@ class IAtRndmGenSvc;
  @brief This class creates Cells from RawChannels and stores them in a container
  
  */
-class TileCellBuilderFromHit: public AthAlgTool, virtual public ICaloCellMakerTool {
+class TileCellBuilderFromHit
+  : public extends<AthAlgTool, ICaloCellMakerTool>
+{
   public:
     TileCellBuilderFromHit(const std::string& type, const std::string& name, const IInterface* parent); //!< Contructor
 
     virtual ~TileCellBuilderFromHit(); //!< Destructor
 
-    virtual StatusCode initialize();                     //!< initialize mehtod
+    virtual StatusCode initialize() override;
 
-    virtual StatusCode finalize(); //!< finalize method
+    virtual StatusCode finalize() override;
 
-    virtual StatusCode process(CaloCellContainer* theCellContainer); // method to process all raw channels and store them in container
-
-    template<class ITERATOR, class COLLECTION>
-    void build(const ITERATOR & begin, const ITERATOR & end, COLLECTION * coll); //!< method to process raw channels from a given vector and store them in collection
-
-    /** method to check if channels are good or bad. Puts zero if both channels are bad
-     or recovers from single-channel failure. It returns true if cell was changed, false otherwise
-     */
-    bool maskBadChannel(TileCell* pCell);
-    bool maskBadChannels(TileCell* pCell, bool single_PMT_C10, bool Ecell);
+    /// method to process all raw channels and store them in container
+    virtual StatusCode process(CaloCellContainer* theCellContainer) override;
 
     //AlgTool InterfaceID
     static const InterfaceID& interfaceID();
     //static const InterfaceID& interfaceID() { return ICaloCellMakerTool; };
 
   private:
+    /// status of every drawer
+    typedef TileDrawerEvtStatus TileDrawerEvtStatusArray[5][64];
 
-    // properties
     // properties
     SG::ReadHandleKey<TileHitContainer> m_hitContainerKey{this, "TileHitContainer", 
                                                           "TileHitCnt", 
                                                           "Input Tile hit container key"};
 
-    SG::ReadHandleKey<xAOD::EventInfo> m_eventInfoKey{this, "EventInfo",
-                                                      "EventInfo", "Input Event info key"};
+    SG::ReadHandleKey<xAOD::EventInfo> m_eventInfoKey{this, "EventInfo", 
+                                                      "EventInfo", 
+                                                      "EventInfo key"};
+
 
     SG::WriteHandleKey<TileCellContainer> m_MBTSContainerKey{this, "MBTSContainer", 
                                                              "MBTSContainer", 
@@ -152,31 +149,47 @@ class TileCellBuilderFromHit: public AthAlgTool, virtual public ICaloCellMakerTo
     const TileDetDescrManager* m_tileMgr; //!< Pointer to TileDetDescrManager
     const MbtsDetDescrManager* m_mbtsMgr; //!< Pointer to MbtsDetDescrManager
 
-    std::vector<TileCell*> m_allCells;  //!< vector to of pointers to TielCells
-    std::vector<TileCell*> m_MBTSVec;   //!< vector to of pointers to MBTS cells
-    std::vector<TileCell*> m_E4prVec;   //!< vector to of pointers to E4' cells
-    std::unique_ptr<TileCellContainer> m_MBTSCells;     //!< Pointer to MBTS cell container
-    std::unique_ptr<TileCellContainer> m_E4prCells;     //!< Pointer to E4'  cell container
-
     TileFragHash::TYPE m_RChType;        //!< Type of TileRawChannels (Fit, OF2, etc.)
     //unsigned int m_bsflags;              //!< other flags stored in TileRawChannelContainer
 
-    TileDrawerEvtStatus m_drawerEvtStatus[5][64]; //!< status of every drawer in every event
-    TileDrawerRunStatus m_drawerRunStatus[5][64]; //!< overall status of drawer in whole run
-    int m_eventErrorCounter[4]; //!< number of events with no errors(0), warnings(1), error(2), total(3)
+    // These were accumulated, but never actually used.
+    // They also spoil reentrancy, so leave them commented-out for now.
+    // If this information is needed in the future, these can be changed
+    // to use atomics.
+    ///TileDrawerRunStatus m_drawerRunStatus[5][64]; //!< overall status of drawer in whole run
+    //int m_eventErrorCounter[4]; //!< number of events with no errors(0), warnings(1), error(2), total(3)
 
     std::vector<CaloAffectedRegionInfo> m_affectedRegionInfo_global;
     std::vector<CaloAffectedRegionInfo> m_affectedRegionInfo_current_run;
 
+    //!< method to process raw channels from a given vector and store them in collection
+    template<class ITERATOR, class COLLECTION>
+    void build(TileDrawerEvtStatusArray& drawerEvtStatus,
+               const ITERATOR & begin,
+               const ITERATOR & end,
+               COLLECTION * coll,
+               TileCellContainer* MBTSCells,
+               TileCellContainer* E4prCells) const;
+               
+
+    /** method to check if channels are good or bad. Puts zero if both channels are bad
+     or recovers from single-channel failure. It returns true if cell was changed, false otherwise
+     */
+    bool maskBadChannel (TileDrawerEvtStatusArray& drawerEvtStatus,
+                         TileCell* pCell) const;
+    bool maskBadChannels (TileDrawerEvtStatusArray& drawerEvtStatus,
+                          TileCell* pCell, bool single_PMT_C10, bool Ecell) const;
+
     void correctCell(TileCell* pCell, int correction, int pmt, int gain, float ener, float time,
-        unsigned char iqual, unsigned char qbit); //!< Compute calibrated energy, time, etc. for TileCell and adjust it.
+        unsigned char iqual, unsigned char qbit) const; //!< Compute calibrated energy, time, etc. for TileCell and adjust it.
 
-    unsigned char iquality(float qual)  {//!< method to compute the cell quality
+    unsigned char iquality(float qual) const  {//!< method to compute the cell quality
          return std::min(255, abs((int) qual));
     } // keep quality within 8 bits make it "unsigned char"
 
-    unsigned char qbits(int ros, int drawer, bool count_over, bool good_time, bool good_ener,
-        bool overflow, bool underflow, bool good_overflowfit); //!< method to compute the cell quality bits
+    unsigned char qbits(TileDrawerEvtStatusArray& drawerEvtStatus,
+                        int ros, int drawer, bool count_over, bool good_time, bool good_ener,
+        bool overflow, bool underflow, bool good_overflowfit) const; //!< method to compute the cell quality bits
 
     int m_RUN2;
     int m_E1_TOWER;
diff --git a/TileCalorimeter/TileRecUtils/share/TileCellBuilderFromHit_test.py b/TileCalorimeter/TileRecUtils/share/TileCellBuilderFromHit_test.py
index ec8476d086edd9939ac28aabba0591ee7ec84bd4..86f1227a3c06575bf46f77e4b9388289f2433151 100644
--- a/TileCalorimeter/TileRecUtils/share/TileCellBuilderFromHit_test.py
+++ b/TileCalorimeter/TileRecUtils/share/TileCellBuilderFromHit_test.py
@@ -429,6 +429,9 @@ ToolSvc += maketool ('tool1', bct1)
 ToolSvc += maketool ('tool2', bct2, maskBadChannels = True)
 ToolSvc += maketool ('tool3', bct1, noise = 0.1)
 
+from xAODEventInfoCnv.xAODEventInfoCnvConf import xAODMaker__EventInfoCnvAlg
+topSequence += xAODMaker__EventInfoCnvAlg (DoBeginRun = False)
+
 testalg1 = TestAlg ('testalg1')
 topSequence += testalg1
 
diff --git a/TileCalorimeter/TileRecUtils/share/TileCellBuilderFromHit_test.ref b/TileCalorimeter/TileRecUtils/share/TileCellBuilderFromHit_test.ref
index 0ebec00bd14222552dc1c5f4f6d49efbe95fd7ca..3dc63ae8fc878ea6a966bd824f22a50c337d6286 100644
--- a/TileCalorimeter/TileRecUtils/share/TileCellBuilderFromHit_test.ref
+++ b/TileCalorimeter/TileRecUtils/share/TileCellBuilderFromHit_test.ref
@@ -1,14 +1,14 @@
-Mon Dec 17 02:35:03 CET 2018
+Mon Jan 14 15:46:49 EST 2019
 Preloading tcmalloc_minimal.so
 Py:Athena            INFO including file "AthenaCommon/Preparation.py"
-Py:Athena            INFO using release [AthenaWorkDir-22.0.1] [x86_64-slc6-gcc62-dbg] [atlas-work3/d6d3116653c] -- built on [2018-12-16T1848]
+Py:Athena            INFO using release [WorkDir-22.0.1] [x86_64-slc6-gcc8-opt] [master-mt/7f37c8e33ff] -- built on [2019-01-11T2041]
 Py:Athena            INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
 Py:Athena            INFO executing ROOT6Setup
 Py:Athena            INFO including file "AthenaCommon/Execution.py"
 Py:Athena            INFO including file "TileRecUtils/TileCellBuilderFromHit_test.py"
-[?1034hSetGeometryVersion.py obtained major release version 22
+SetGeometryVersion.py obtained major release version 22
 Py:Athena            INFO including file "IdDictDetDescrCnv/IdDictDetDescrCnv_joboptions.py"
-Py:ConfigurableDb    INFO Read module info for 5459 configurables from 51 genConfDb files
+Py:ConfigurableDb    INFO Read module info for 5435 configurables from 52 genConfDb files
 Py:ConfigurableDb    INFO No duplicates have been found: that's good !
 EventInfoMgtInit: Got release version  Athena-22.0.1
 Py:IOVDbSvc.CondDB    INFO Setting up conditions DB access to instance OFLP200
@@ -28,7 +28,7 @@ ApplicationMgr       INFO Updating Gaudi::PluginService::SetDebug(level) to leve
 ApplicationMgr    SUCCESS 
 ====================================================================================================================================
                                                    Welcome to ApplicationMgr (GaudiCoreSvc v30r5)
-                                          running on lxplus073.cern.ch on Mon Dec 17 02:35:26 2018
+                                          running on spar0101.usatlas.bnl.gov on Mon Jan 14 15:47:18 2019
 ====================================================================================================================================
 ApplicationMgr       INFO Successfully loaded modules : AthenaServices
 ApplicationMgr       INFO Application Manager Configured successfully
@@ -36,7 +36,7 @@ ApplicationMgr       INFO Updating Gaudi::PluginService::SetDebug(level) to leve
 StatusCodeSvc        INFO initialize
 AthDictLoaderSvc     INFO in initialize...
 AthDictLoaderSvc     INFO acquired Dso-registry
-ClassIDSvc           INFO  getRegistryEntries: read 6864 CLIDRegistry entries for module ALL
+ClassIDSvc           INFO  getRegistryEntries: read 7343 CLIDRegistry entries for module ALL
 CoreDumpSvc          INFO install f-a-t-a-l handler... (flag = -1)
 CoreDumpSvc          INFO Handling signals: 11(Segmentation fault) 7(Bus error) 4(Illegal instruction) 8(Floating point exception) 
 MetaDataSvc          INFO Initializing MetaDataSvc - package version AthenaServices-00-00-00
@@ -44,9 +44,9 @@ AthenaPoolCnvSvc     INFO Initializing AthenaPoolCnvSvc - package version Athena
 PoolSvc              INFO io_register[PoolSvc](xmlcatalog_file:PoolFileCatalog.xml) [ok]
 PoolSvc              INFO Set connectionsvc retry/timeout/IDLE timeout to  'ConnectionRetrialPeriod':300/ 'ConnectionRetrialTimeOut':3600/ 'ConnectionTimeOut':5 seconds with connection cleanup disabled
 PoolSvc              INFO Frontier compression level set to 5
-DBReplicaSvc         INFO Frontier server at (serverurl=http://atlasfrontier-local.cern.ch:8000/atlr)(serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://lcgft-atlas.gridpp.rl.ac.uk:3128/frontierATLAS)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://ca-proxy.cern.ch:3128)(proxyurl=http://ca-proxy-meyrin.cern.ch:3128)(proxyurl=http://ca-proxy-wigner.cern.ch:3128)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
-DBReplicaSvc         INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2018-12-15T2259/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/dbreplica.config
-DBReplicaSvc         INFO Total of 10 servers found for host lxplus073.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
+DBReplicaSvc         INFO Frontier server at (serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://lcgft-atlas.gridpp.rl.ac.uk:3128/frontierATLAS)(serverurl=http://frontier-atlas.lcg.triumf.ca:3128/ATLAS_frontier)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
+DBReplicaSvc         INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-07T2353/Athena/22.0.1/InstallArea/x86_64-slc6-gcc8-opt/share/dbreplica.config
+DBReplicaSvc         INFO Total of 1 servers found for host spar0101.usatlas.bnl.gov [ATLF ]
 PoolSvc              INFO Successfully setup replica sorting algorithm
 PoolSvc              INFO Setting up APR FileCatalog and Streams
 PoolSvc           WARNING Unable to locate catalog for prfile:poolcond/PoolCat_oflcond.xml check your ATLAS_POOLCOND_PATH and DATAPATH variables
@@ -83,7 +83,7 @@ IOVDbSvc             INFO Added taginfo remove for /TILE/OFL02/STATUS/ADC
 IOVDbSvc             INFO Added taginfo remove for /TILE/OFL02/TIME/CHANNELOFFSET/PHY
 IOVDbSvc             INFO Added taginfo remove for /TILE/ONL01/STATUS/ADC
 IOVDbSvc             INFO Added taginfo remove for /LAR/LArCellPositionShift
-ClassIDSvc           INFO  getRegistryEntries: read 1919 CLIDRegistry entries for module ALL
+ClassIDSvc           INFO  getRegistryEntries: read 1595 CLIDRegistry entries for module ALL
 ClassIDSvc           INFO  getRegistryEntries: read 17 CLIDRegistry entries for module ALL
 DetDescrCnvSvc       INFO  initializing 
 DetDescrCnvSvc       INFO Found DetectorStore service
@@ -137,7 +137,7 @@ BarrelConstruction   INFO   Use sagging in geometry  ? 0
   multi-layered version of absorbers activated, mlabs == 1
 ================================================
 EventPersistenc...   INFO Added successfully Conversion service:DetDescrCnvSvc
-ClassIDSvc           INFO  getRegistryEntries: read 2398 CLIDRegistry entries for module ALL
+ClassIDSvc           INFO  getRegistryEntries: read 2389 CLIDRegistry entries for module ALL
 CaloIDHelper_ID...   INFO in createObj: creating a TileTBID helper object in the detector store
 IdDictDetDescrCnv    INFO in initialize
 IdDictDetDescrCnv    INFO in createObj: creating a IdDictManager object in the detector store
@@ -176,7 +176,7 @@ TileDddbManager      INFO n_tileSwitches = 1
 ClassIDSvc           INFO  getRegistryEntries: read 213 CLIDRegistry entries for module ALL
 CaloIDHelper_ID...   INFO in createObj: creating a TileID helper object in the detector store
 AtlasDetectorID      INFO initialize_from_dictionary - OK
-TileNeighbour        INFO Reading file  /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc62-dbg/x86_64-slc6-gcc62-dbg/share/TileNeighbour_reduced.txt
+TileNeighbour        INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-07T2353/Athena/22.0.1/InstallArea/x86_64-slc6-gcc8-opt/share/TileNeighbour_reduced.txt
 TileHWIDDetDesc...   INFO in createObj: creating a TileHWID helper object in the detector store
 TileHWID             INFO initialize_from_dictionary 
 AtlasDetectorID      INFO initialize_from_dictionary - OK
@@ -188,9 +188,9 @@ CaloIDHelper_ID...   INFO in createObj: creating a LArHEC_ID helper object in th
 AtlasDetectorID      INFO initialize_from_dictionary - OK
 CaloIDHelper_ID...   INFO in createObj: creating a LArFCAL_ID helper object in the detector store
 AtlasDetectorID      INFO initialize_from_dictionary - OK
-LArFCAL_Base_ID      INFO Reading file /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc62-dbg/x86_64-slc6-gcc62-dbg/share/FCal2DNeighbors-April2011.txt
-LArFCAL_Base_ID      INFO Reading file /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc62-dbg/x86_64-slc6-gcc62-dbg/share/FCal3DNeighborsNext-April2011.txt
-LArFCAL_Base_ID      INFO Reading file /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc62-dbg/x86_64-slc6-gcc62-dbg/share/FCal3DNeighborsPrev-April2011.txt
+LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-07T2353/Athena/22.0.1/InstallArea/x86_64-slc6-gcc8-opt/share/FCal2DNeighbors-April2011.txt
+LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-07T2353/Athena/22.0.1/InstallArea/x86_64-slc6-gcc8-opt/share/FCal3DNeighborsNext-April2011.txt
+LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-07T2353/Athena/22.0.1/InstallArea/x86_64-slc6-gcc8-opt/share/FCal3DNeighborsPrev-April2011.txt
 CaloIDHelper_ID...   INFO in createObj: creating a LArMiniFCAL_ID helper object in the detector store
 AtlasDetectorID      INFO initialize_from_dictionary - OK
 LArMiniFCAL_ID       INFO  initialize_from_dict - LArCalorimeter dictionary does NOT contain miniFCAL description. Unable to initialize LArMiniFCAL_ID.
@@ -217,11 +217,11 @@ TileInfoLoader       INFO Sampling fraction for E2 cells 1/107
 TileInfoLoader       INFO Sampling fraction for E3 cells 1/97
 TileInfoLoader       INFO Sampling fraction for E4 cells 1/75
 TileInfoLoader       INFO Sampling fraction for E4' cells 1/75
-TileInfoLoader       INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2018-12-15T2259/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/pulsehi_physics.dat
-TileInfoLoader       INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2018-12-15T2259/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/pulselo_physics.dat
-TileInfoLoader       INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2018-12-15T2259/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/pulse_adder_tower_physics.dat
-TileInfoLoader       INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2018-12-15T2259/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/pulse_adder_muonRcv_physics.dat
-TileInfoLoader       INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2018-12-15T2259/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/pulse_adder_muon_physics.dat
+TileInfoLoader       INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-07T2353/Athena/22.0.1/InstallArea/x86_64-slc6-gcc8-opt/share/pulsehi_physics.dat
+TileInfoLoader       INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-07T2353/Athena/22.0.1/InstallArea/x86_64-slc6-gcc8-opt/share/pulselo_physics.dat
+TileInfoLoader       INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-07T2353/Athena/22.0.1/InstallArea/x86_64-slc6-gcc8-opt/share/pulse_adder_tower_physics.dat
+TileInfoLoader       INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-07T2353/Athena/22.0.1/InstallArea/x86_64-slc6-gcc8-opt/share/pulse_adder_muonRcv_physics.dat
+TileInfoLoader       INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-07T2353/Athena/22.0.1/InstallArea/x86_64-slc6-gcc8-opt/share/pulse_adder_muon_physics.dat
 CaloIDHelper_ID...   INFO in createObj: creating a CaloLVL1_ID helper object in the detector store
 CaloLVL1_ID          INFO initialize_from_dictionary
 AtlasDetectorID      INFO initialize_from_dictionary - OK
@@ -276,9 +276,17 @@ TileSampleNoise...   INFO Creating TileCondProxyCool(TileSampleNoiseCondAlg.Tile
 TileTimingCondA...   INFO Creating TileCondProxyCool(TileTimingCondAlg.TileCondProxyCool_AdcOffset) for folder: "/TILE/OFL02/TIME/CHANNELOFFSET/PHY"
 tilecellbuilder...   INFO ProxyOnlBch and ProxyOflBch will be used for bad channel status
 tilecellbuilder...   INFO ProxyOnlBch and ProxyOflBch will be used for bad channel status
+ClassIDSvc           INFO  getRegistryEntries: read 504 CLIDRegistry entries for module ALL
+xAODMaker::Even...   INFO Initializing - Package version: xAODEventInfoCnv-00-00-00
+xAODMaker::Even...   INFO Initializing - Package version: xAODEventInfoCnv-00-00-00
+xAODMaker::Even...WARNING Beam conditions service not available
+xAODMaker::Even...WARNING Will not fill beam spot information into xAOD::EventInfo
+xAODMaker::Even...   INFO Luminosity information not available
+xAODMaker::Even...   INFO Will take information from the EventInfo object
+ClassIDSvc           INFO  getRegistryEntries: read 319 CLIDRegistry entries for module ALL
 PyComponentMgr       INFO Initializing PyComponentMgr...
 testalg1             INFO Initializing testalg1...
-ClassIDSvc           INFO  getRegistryEntries: read 5265 CLIDRegistry entries for module ALL
+ClassIDSvc           INFO  getRegistryEntries: read 4849 CLIDRegistry entries for module ALL
 ToolSvc.tool1        INFO Storing MBTS cells in MBTSContainer
 ToolSvc.tool1        INFO Noise Sigma 0 MeV is selected!
 AtRndmGenSvc         INFO Initializing AtRndmGenSvc - package version RngComps-00-00-00
@@ -287,7 +295,6 @@ AtRndmGenSvc         INFO will be reseeded for every event
 AtRndmGenSvc      WARNING  INITIALISING Tile_DigitsMaker stream with DEFAULT seeds 3591  2309736
 ToolSvc.tool1        INFO max time thr  25 ns
 ToolSvc.tool1        INFO min time thr  -25 ns
-ToolSvc.tool1        INFO size of temp vector set to 5184
 ToolSvc.tool1        INFO taking hits from 'TileHitCnt'
 ToolSvc.tool1        INFO Storing E4'  cells in E4prContainer
 ToolSvc.tool1        INFO TileCellBuilderFromHit initialization completed
@@ -296,7 +303,6 @@ ToolSvc.tool2        INFO Storing MBTS cells in MBTSContainer
 ToolSvc.tool2        INFO Noise Sigma 0 MeV is selected!
 ToolSvc.tool2        INFO max time thr  25 ns
 ToolSvc.tool2        INFO min time thr  -25 ns
-ToolSvc.tool2        INFO size of temp vector set to 5184
 ToolSvc.tool2        INFO taking hits from 'TileHitCnt'
 ToolSvc.tool2        INFO Storing E4'  cells in E4prContainer
 ToolSvc.tool2        INFO TileCellBuilderFromHit initialization completed
@@ -304,7 +310,6 @@ ToolSvc.tool3        INFO Storing MBTS cells in MBTSContainer
 ToolSvc.tool3        INFO Noise Sigma 0.1 MeV is selected!
 ToolSvc.tool3        INFO max time thr  25 ns
 ToolSvc.tool3        INFO min time thr  -25 ns
-ToolSvc.tool3        INFO size of temp vector set to 5184
 ToolSvc.tool3        INFO taking hits from 'TileHitCnt'
 ToolSvc.tool3        INFO Storing E4'  cells in E4prContainer
 ToolSvc.tool3        INFO TileCellBuilderFromHit initialization completed
@@ -349,18 +354,19 @@ CaloIDHelper_ID...   INFO in createObj: creating a LArHEC_SuperCell_ID helper ob
 AtlasDetectorID      INFO initialize_from_dictionary - OK
 CaloIDHelper_ID...   INFO in createObj: creating a LArFCAL_SuperCell_ID helper object in the detector store
 AtlasDetectorID      INFO initialize_from_dictionary - OK
-LArFCAL_Base_ID      INFO Reading file /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc62-dbg/x86_64-slc6-gcc62-dbg/share/FCalSuperCells2DNeighborsNew-April2014.txt
-LArFCAL_Base_ID      INFO Reading file /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc62-dbg/x86_64-slc6-gcc62-dbg/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
-LArFCAL_Base_ID      INFO Reading file /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc62-dbg/x86_64-slc6-gcc62-dbg/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
+LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-07T2353/Athena/22.0.1/InstallArea/x86_64-slc6-gcc8-opt/share/FCalSuperCells2DNeighborsNew-April2014.txt
+LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-07T2353/Athena/22.0.1/InstallArea/x86_64-slc6-gcc8-opt/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
+LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-07T2353/Athena/22.0.1/InstallArea/x86_64-slc6-gcc8-opt/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
 CaloIDHelper_ID...   INFO in createObj: creating a Tile_SuperCell_ID helper object in the detector store
 AtlasDetectorID      INFO initialize_from_dictionary - OK
-TileNeighbour        INFO Reading file  /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc62-dbg/x86_64-slc6-gcc62-dbg/share/TileSuperCellNeighbour.txt
+TileNeighbour        INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-07T2353/Athena/22.0.1/InstallArea/x86_64-slc6-gcc8-opt/share/TileSuperCellNeighbour.txt
 AtlasDetectorID      INFO initialize_from_dictionary - OK
 CaloIdMgrDetDes...   INFO  Finished 
 CaloIdMgrDetDes...   INFO Initializing CaloIdMgr from values in CaloIdMgrDetDescrCnv 
 Domain[ROOT_All]     INFO ->  Access   DbDatabase   READ      [ROOT_All] 8667C6F2-1559-DE11-A611-000423D9A21A
 Domain[ROOT_All]     INFO                           /cvmfs/atlas-condb.cern.ch/repo/conditions/cond08/cond08_mc.000003.gen.COND/cond08_mc.000003.gen.COND._0064.pool.root
 RootDatabase.open    INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond08/cond08_mc.000003.gen.COND/cond08_mc.000003.gen.COND._0064.pool.root File version:52200
+xAODMaker::Even...WARNING Algorithm::BeginRun is deprecated. Use Start instead
 AthenaEventLoopMgr   INFO   ===>>>  start processing event #1, run #1 0 events processed so far  <<<===
 IOVDbSvc             INFO Opening COOL connection for COOLOFL_TILE/OFLP200
 IOVDbFolder          INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to TileOfl02CalibCes-SIM-06 for folder /TILE/OFL02/CALIB/CES
@@ -383,8 +389,8 @@ TileBadChannels...   INFO TileBchStatus::isNoisy() is defined by: Large HF noise
 TileBadChannels...   INFO TileBchStatus::isNoGainL1() is defined by: ADC dead; No PMT connected; No HV; Channel masked for LV1 (unspecified); LV1 channel no gain; LV1 channel noisy; Channel disabled for LV1; 
 TileBadChannels...   INFO TileBchStatus::isBadTiming() is defined by: Bad timing; Online bad timing; 
 TileBadChannels...   INFO No drawer trips probabilities found in DB
-tilecellbuilder...   INFO Creating TileCondProxyFile(tilecellbuilder_bct1Cond.tilecellbuilder_bct1_onl) for ASCII file name: "/cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2018-12-15T2259/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/TileNoBad.oflBch"
-tilecellbuilder...   INFO Creating TileCondProxyFile(tilecellbuilder_bct1Cond.tilecellbuilder_bct1_ofl) for ASCII file name: "/cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2018-12-15T2259/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/TileNoBad.oflBch"
+tilecellbuilder...   INFO Creating TileCondProxyFile(tilecellbuilder_bct1Cond.tilecellbuilder_bct1_onl) for ASCII file name: "/cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-07T2353/Athena/22.0.1/InstallArea/x86_64-slc6-gcc8-opt/share/TileNoBad.oflBch"
+tilecellbuilder...   INFO Creating TileCondProxyFile(tilecellbuilder_bct1Cond.tilecellbuilder_bct1_ofl) for ASCII file name: "/cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-07T2353/Athena/22.0.1/InstallArea/x86_64-slc6-gcc8-opt/share/TileNoBad.oflBch"
 tilecellbuilder...   INFO No TileBchStatus::isBad() definition found in DB, using defaults
 tilecellbuilder...   INFO No TileBchStatus::isNoisy() definition found in DB, using defaults
 tilecellbuilder...   INFO No TileBchStatus::isNoGainL1() definition found in DB, using defaults
@@ -394,8 +400,8 @@ tilecellbuilder...   INFO TileBchStatus::isNoisy() is defined by: Large HF noise
 tilecellbuilder...   INFO TileBchStatus::isNoGainL1() is defined by: ADC dead; No PMT connected; No HV; Channel masked for LV1 (unspecified); LV1 channel no gain; LV1 channel noisy; Channel disabled for LV1; 
 tilecellbuilder...   INFO TileBchStatus::isBadTiming() is defined by: Bad timing; Online bad timing; 
 tilecellbuilder...   INFO No drawer trips probabilities found in DB
-tilecellbuilder...   INFO Creating TileCondProxyFile(tilecellbuilder_bct2Cond.tilecellbuilder_bct2_onl) for ASCII file name: "/cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2018-12-15T2259/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/TileNoBad.oflBch"
-tilecellbuilder...   INFO Creating TileCondProxyFile(tilecellbuilder_bct2Cond.tilecellbuilder_bct2_ofl) for ASCII file name: "/afs/cern.ch/work/s/ssnyder/builds/atlas-work3/build-x86_64-slc6-gcc62-dbg/TileCalorimeter/TileRecUtils/unitTestRun/tilecellbuilder_bct2.bch"
+tilecellbuilder...   INFO Creating TileCondProxyFile(tilecellbuilder_bct2Cond.tilecellbuilder_bct2_onl) for ASCII file name: "/cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-07T2353/Athena/22.0.1/InstallArea/x86_64-slc6-gcc8-opt/share/TileNoBad.oflBch"
+tilecellbuilder...   INFO Creating TileCondProxyFile(tilecellbuilder_bct2Cond.tilecellbuilder_bct2_ofl) for ASCII file name: "/gpfs/mnt/atlasgpfs01/usatlas/data/snyder/atlas-master-mt/build-x86_64-slc6-gcc8-opt/TileCalorimeter/TileRecUtils/unitTestRun/tilecellbuilder_bct2.bch"
 tilecellbuilder...   INFO No TileBchStatus::isBad() definition found in DB, using defaults
 tilecellbuilder...   INFO No TileBchStatus::isNoisy() definition found in DB, using defaults
 tilecellbuilder...   INFO No TileBchStatus::isNoGainL1() definition found in DB, using defaults
@@ -406,12 +412,6 @@ tilecellbuilder...   INFO TileBchStatus::isNoGainL1() is defined by: ADC dead; N
 tilecellbuilder...   INFO TileBchStatus::isBadTiming() is defined by: Bad timing; Online bad timing; 
 tilecellbuilder...   INFO No drawer trips probabilities found in DB
 ClassIDSvc           INFO  getRegistryEntries: read 650 CLIDRegistry entries for module ALL
-IncrementalExecutor::executeFunction: symbol '_ZNK7TileHitcvNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEv' unresolved while linking function '__cxx_global_var_initcling_module_5164_'!
-You are probably missing the definition of TileHit::operator std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >() const
-Maybe you need to load the corresponding shared library?
-IncrementalExecutor::executeFunction: symbol '_ZNK7TileHitcvNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEv' unresolved while linking function '__cxx_global_var_initcling_module_5179_'!
-You are probably missing the definition of TileHit::operator std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >() const
-Maybe you need to load the corresponding shared library?
 ClassIDSvc           INFO  getRegistryEntries: read 194 CLIDRegistry entries for module ALL
 ClassIDSvc           INFO  getRegistryEntries: read 8 CLIDRegistry entries for module ALL
 AtRndmGenSvc         INFO  Stream =  Tile_DigitsMaker, Seed1 =  288581169, Seed2 = 758068585
@@ -437,23 +437,23 @@ IncidentProcAlg2     INFO Finalize
 AtRndmGenSvc         INFO  FINALISING 
 PyComponentMgr       INFO Finalizing PyComponentMgr...
 IdDictDetDescrCnv    INFO in finalize
-IOVDbFolder          INFO Folder /LAR/Align (PoolRef) db-read 1/1 objs/chan/bytes 1/1/170 ((     3.13 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/CES (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/103344 ((     1.60 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/CIS/FIT/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/80 ((     1.00 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/CIS/FIT/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/80 ((     1.00 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/EMS (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/92 ((     0.99 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/LAS/FIBER (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/940 ((     0.94 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/LAS/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/72 ((     0.97 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/LAS/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/76 ((     0.78 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/NOISE/SAMPLE (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/641476 ((     1.62 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/STATUS/ADC (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/97884 ((     0.55 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/TIME/CHANNELOFFSET/PHY (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/96 ((     0.58 ))s
-IOVDbFolder          INFO Folder /TILE/ONL01/STATUS/ADC (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/76 ((     0.07 ))s
-IOVDbFolder          INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 1/1 objs/chan/bytes 1/1/195 ((     1.08 ))s
-IOVDbSvc             INFO  bytes in ((     14.30 ))s
+IOVDbFolder          INFO Folder /LAR/Align (PoolRef) db-read 1/1 objs/chan/bytes 1/1/170 ((     1.84 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/CES (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/103344 ((     2.10 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/CIS/FIT/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/80 ((     1.83 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/CIS/FIT/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/80 ((     1.83 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/EMS (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/92 ((     1.48 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/LAS/FIBER (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/940 ((     1.65 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/LAS/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/72 ((     1.65 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/LAS/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/76 ((     1.65 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/NOISE/SAMPLE (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/641476 ((     2.60 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/STATUS/ADC (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/97884 ((     1.48 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/TIME/CHANNELOFFSET/PHY (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/96 ((     1.65 ))s
+IOVDbFolder          INFO Folder /TILE/ONL01/STATUS/ADC (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/76 ((     0.09 ))s
+IOVDbFolder          INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 1/1 objs/chan/bytes 1/1/195 ((     1.11 ))s
+IOVDbSvc             INFO  bytes in ((     20.96 ))s
 IOVDbSvc             INFO Connection sqlite://;schema=mycool.db;dbname=OFLP200 : nConnect: 0 nFolders: 0 ReadTime: ((     0.00 ))s
-IOVDbSvc             INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 2 nFolders: 2 ReadTime: ((     4.21 ))s
-IOVDbSvc             INFO Connection COOLOFL_TILE/OFLP200 : nConnect: 2 nFolders: 11 ReadTime: ((    10.10 ))s
+IOVDbSvc             INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 2 nFolders: 2 ReadTime: ((     2.95 ))s
+IOVDbSvc             INFO Connection COOLOFL_TILE/OFLP200 : nConnect: 2 nFolders: 11 ReadTime: ((    18.01 ))s
 TileInfoLoader       INFO TileInfoLoader::finalize()
 AthDictLoaderSvc     INFO in finalize...
 ToolSvc              INFO Removing all tools created by ToolSvc
@@ -463,9 +463,9 @@ ToolSvc.tool1        INFO Finalizing
 *****Chrono*****     INFO ****************************************************************************************************
 *****Chrono*****     INFO  The Final CPU consumption ( Chrono ) Table (ordered)
 *****Chrono*****     INFO ****************************************************************************************************
-cObjR_ALL            INFO Time User   : Tot= 0.86  [s] Ave/Min/Max= 0.43(+- 0.41)/ 0.02/ 0.84  [s] #=  2
-cObj_ALL             INFO Time User   : Tot= 1.11  [s] Ave/Min/Max=0.0854(+-0.251)/    0/ 0.94  [s] #= 13
-ChronoStatSvc        INFO Time User   : Tot= 66.1  [s]                                             #=  1
+cObjR_ALL            INFO Time User   : Tot= 0.55  [s] Ave/Min/Max=0.275(+-0.265)/ 0.01/ 0.54  [s] #=  2
+cObj_ALL             INFO Time User   : Tot= 0.66  [s] Ave/Min/Max=0.0508(+-0.152)/    0/ 0.57  [s] #= 13
+ChronoStatSvc        INFO Time User   : Tot= 43.7  [s]                                             #=  1
 *****Chrono*****     INFO ****************************************************************************************************
 ChronoStatSvc.f...   INFO  Service finalized successfully 
 ApplicationMgr       INFO Application Manager Finalized successfully
diff --git a/TileCalorimeter/TileRecUtils/share/TileCellBuilder_test.ref b/TileCalorimeter/TileRecUtils/share/TileCellBuilder_test.ref
index 7d40749d01d57edc736f33eba05efbf02be1ef67..60fbec87eb51cb3711a6e6ce9f7c4f6f48278e44 100644
--- a/TileCalorimeter/TileRecUtils/share/TileCellBuilder_test.ref
+++ b/TileCalorimeter/TileRecUtils/share/TileCellBuilder_test.ref
@@ -1,16 +1,15 @@
-Thu Jan  3 16:18:39 CET 2019
-Preloading tcmalloc_minimal.so
+Thu Jan 10 12:55:28 EST 2019
 Py:Athena            INFO including file "AthenaCommon/Preparation.py"
-Py:Athena            INFO using release [WorkDir-22.0.1] [x86_64-slc6-gcc62-opt] [atlas-work3g/be87ec46e65] -- built on [2019-01-03T1609]
+Py:Athena            INFO using release [?-21.0.0] [i686-slc5-gcc43-dbg] [?/?] -- built on [?]
 Py:Athena            INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
 Py:Athena            INFO executing ROOT6Setup
 Py:Athena            INFO including file "AthenaCommon/Execution.py"
 Py:Athena            INFO including file "TileRecUtils/TileCellBuilder_test.py"
-[?1034hSetGeometryVersion.py obtained major release version 22
+SetGeometryVersion.py obtained major release version 21
 Py:Athena            INFO including file "IdDictDetDescrCnv/IdDictDetDescrCnv_joboptions.py"
-Py:ConfigurableDb    INFO Read module info for 5435 configurables from 6 genConfDb files
+Py:ConfigurableDb    INFO Read module info for 3089 configurables from 2 genConfDb files
 Py:ConfigurableDb    INFO No duplicates have been found: that's good !
-EventInfoMgtInit: Got release version  Athena-22.0.1
+EventInfoMgtInit: Got release version  sss-rel_0
 Py:IOVDbSvc.CondDB    INFO Setting up conditions DB access to instance OFLP200
 Py:Athena            INFO including file "TileConditions/TileConditions_jobOptions.py"
 Py:TileInfoConf.     INFO Adding TileCablingSvc to ServiceMgr
@@ -23,12 +22,13 @@ Py:TileInfoConf.     INFO Changing default TileCondToolNoiseSample configuration
 Py:TileInfoConf.     INFO Changing default TileCondToolTiming configuration to COOL source
 Py:TileConditions_jobOptions.py    INFO Adjusting TileInfo to return cell noise for Opt.Filter without iterations
 Py:Athena            INFO including file "AthenaCommon/runbatch.py"
+# setting LC_ALL to "C"
 ApplicationMgr       INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
 ApplicationMgr       INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
 ApplicationMgr    SUCCESS 
 ====================================================================================================================================
-                                                   Welcome to ApplicationMgr (GaudiCoreSvc v30r5)
-                                          running on lxplus064.cern.ch on Thu Jan  3 16:18:56 2019
+                                                   Welcome to ApplicationMgr (GaudiCoreSvc v27r1p99)
+                                          running on karma on Thu Jan 10 12:55:33 2019
 ====================================================================================================================================
 ApplicationMgr       INFO Successfully loaded modules : AthenaServices
 ApplicationMgr       INFO Application Manager Configured successfully
@@ -36,7 +36,7 @@ ApplicationMgr       INFO Updating Gaudi::PluginService::SetDebug(level) to leve
 StatusCodeSvc        INFO initialize
 AthDictLoaderSvc     INFO in initialize...
 AthDictLoaderSvc     INFO acquired Dso-registry
-ClassIDSvc           INFO  getRegistryEntries: read 6912 CLIDRegistry entries for module ALL
+ClassIDSvc           INFO  getRegistryEntries: read 7303 CLIDRegistry entries for module ALL
 CoreDumpSvc          INFO install f-a-t-a-l handler... (flag = -1)
 CoreDumpSvc          INFO Handling signals: 11(Segmentation fault) 7(Bus error) 4(Illegal instruction) 8(Floating point exception) 
 MetaDataSvc          INFO Initializing MetaDataSvc - package version AthenaServices-00-00-00
@@ -44,21 +44,20 @@ AthenaPoolCnvSvc     INFO Initializing AthenaPoolCnvSvc - package version Athena
 PoolSvc              INFO io_register[PoolSvc](xmlcatalog_file:PoolFileCatalog.xml) [ok]
 PoolSvc              INFO Set connectionsvc retry/timeout/IDLE timeout to  'ConnectionRetrialPeriod':300/ 'ConnectionRetrialTimeOut':3600/ 'ConnectionTimeOut':5 seconds with connection cleanup disabled
 PoolSvc              INFO Frontier compression level set to 5
-DBReplicaSvc         INFO Frontier server at (serverurl=http://atlasfrontier-local.cern.ch:8000/atlr)(serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://lcgft-atlas.gridpp.rl.ac.uk:3128/frontierATLAS)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://ca-proxy.cern.ch:3128)(proxyurl=http://ca-proxy-meyrin.cern.ch:3128)(proxyurl=http://ca-proxy-wigner.cern.ch:3128)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
-DBReplicaSvc         INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-02T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/dbreplica.config
-DBReplicaSvc         INFO Total of 10 servers found for host lxplus064.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
+DBReplicaSvc         INFO Read replica configuration from /home/sss/atlas/rootaccess/build/share/dbreplica.config
+DBReplicaSvc         INFO No specific match for domain found - use default fallback
+DBReplicaSvc         INFO Total of 1 servers found for host karma [atlas_dd ]
 PoolSvc              INFO Successfully setup replica sorting algorithm
 PoolSvc              INFO Setting up APR FileCatalog and Streams
-PoolSvc           WARNING Unable to locate catalog for prfile:poolcond/PoolCat_oflcond.xml check your ATLAS_POOLCOND_PATH and DATAPATH variables
-PoolSvc           WARNING Unable to locate catalog for apcfile:poolcond/PoolCat_oflcond.xml check your ATLAS_POOLCOND_PATH and DATAPATH variables
-PoolSvc              INFO Resolved path (via ATLAS_POOLCOND_PATH) is /cvmfs/atlas-condb.cern.ch/repo/conditions/poolcond/PoolFileCatalog.xml
+PoolSvc              INFO Resolved path (via DATAPATH) is /home/sss/atlas/DBRelease/current/poolcond/PoolCat_oflcond.xml
+PoolSvc              INFO Resolved path (via DATAPATH) is /home/sss/atlas/DBRelease/current/poolcond/PoolCat_oflcond.xml
+PoolSvc           WARNING Unable to locate catalog for apcfile:poolcond/PoolFileCatalog.xml check your ATLAS_POOLCOND_PATH and DATAPATH variables
 PoolSvc              INFO POOL WriteCatalog is xmlcatalog_file:PoolFileCatalog.xml
 DbSession            INFO     Open     DbSession    
 Domain[ROOT_All]     INFO >   Access   DbDomain     READ      [ROOT_All] 
 MetaDataSvc          INFO Found MetaDataTools = PublicToolHandleArray([])
 IOVDbSvc             INFO Opened read transaction for POOL PersistencySvc
 IOVDbSvc             INFO Only 5 POOL conditions files will be open at once
-IOVDbSvc             INFO Cache alignment will be done in 3 slices
 IOVDbSvc             INFO Global tag: OFLCOND-RUN12-SDR-35 set from joboptions
 IOVDbFolder          INFO Read from meta data only for folder /TagInfo
 IOVDbSvc             INFO Initialised with 3 connections and 14 folders
@@ -83,7 +82,7 @@ IOVDbSvc             INFO Added taginfo remove for /TILE/OFL02/STATUS/ADC
 IOVDbSvc             INFO Added taginfo remove for /TILE/OFL02/TIME/CHANNELOFFSET/PHY
 IOVDbSvc             INFO Added taginfo remove for /TILE/ONL01/STATUS/ADC
 IOVDbSvc             INFO Added taginfo remove for /LAR/LArCellPositionShift
-ClassIDSvc           INFO  getRegistryEntries: read 1871 CLIDRegistry entries for module ALL
+ClassIDSvc           INFO  getRegistryEntries: read 1590 CLIDRegistry entries for module ALL
 ClassIDSvc           INFO  getRegistryEntries: read 17 CLIDRegistry entries for module ALL
 DetDescrCnvSvc       INFO  initializing 
 DetDescrCnvSvc       INFO Found DetectorStore service
@@ -137,7 +136,7 @@ BarrelConstruction   INFO   Use sagging in geometry  ? 0
   multi-layered version of absorbers activated, mlabs == 1
 ================================================
 EventPersistenc...   INFO Added successfully Conversion service:DetDescrCnvSvc
-ClassIDSvc           INFO  getRegistryEntries: read 2398 CLIDRegistry entries for module ALL
+ClassIDSvc           INFO  getRegistryEntries: read 2389 CLIDRegistry entries for module ALL
 CaloIDHelper_ID...   INFO in createObj: creating a TileTBID helper object in the detector store
 IdDictDetDescrCnv    INFO in initialize
 IdDictDetDescrCnv    INFO in createObj: creating a IdDictManager object in the detector store
@@ -176,7 +175,7 @@ TileDddbManager      INFO n_tileSwitches = 1
 ClassIDSvc           INFO  getRegistryEntries: read 213 CLIDRegistry entries for module ALL
 CaloIDHelper_ID...   INFO in createObj: creating a TileID helper object in the detector store
 AtlasDetectorID      INFO initialize_from_dictionary - OK
-TileNeighbour        INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-02T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/TileNeighbour_reduced.txt
+TileNeighbour        INFO Reading file  /home/sss/atlas/rootaccess/build/share/TileNeighbour_reduced.txt
 TileHWIDDetDesc...   INFO in createObj: creating a TileHWID helper object in the detector store
 TileHWID             INFO initialize_from_dictionary 
 AtlasDetectorID      INFO initialize_from_dictionary - OK
@@ -188,9 +187,9 @@ CaloIDHelper_ID...   INFO in createObj: creating a LArHEC_ID helper object in th
 AtlasDetectorID      INFO initialize_from_dictionary - OK
 CaloIDHelper_ID...   INFO in createObj: creating a LArFCAL_ID helper object in the detector store
 AtlasDetectorID      INFO initialize_from_dictionary - OK
-LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-02T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/FCal2DNeighbors-April2011.txt
-LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-02T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/FCal3DNeighborsNext-April2011.txt
-LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-02T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/FCal3DNeighborsPrev-April2011.txt
+LArFCAL_Base_ID      INFO Reading file /home/sss/atlas/rootaccess/build/share/FCal2DNeighbors-April2011.txt
+LArFCAL_Base_ID      INFO Reading file /home/sss/atlas/rootaccess/build/share/FCal3DNeighborsNext-April2011.txt
+LArFCAL_Base_ID      INFO Reading file /home/sss/atlas/rootaccess/build/share/FCal3DNeighborsPrev-April2011.txt
 CaloIDHelper_ID...   INFO in createObj: creating a LArMiniFCAL_ID helper object in the detector store
 AtlasDetectorID      INFO initialize_from_dictionary - OK
 LArMiniFCAL_ID       INFO  initialize_from_dict - LArCalorimeter dictionary does NOT contain miniFCAL description. Unable to initialize LArMiniFCAL_ID.
@@ -217,11 +216,11 @@ TileInfoLoader       INFO Sampling fraction for E2 cells 1/107
 TileInfoLoader       INFO Sampling fraction for E3 cells 1/97
 TileInfoLoader       INFO Sampling fraction for E4 cells 1/75
 TileInfoLoader       INFO Sampling fraction for E4' cells 1/75
-TileInfoLoader       INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-02T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/pulsehi_physics.dat
-TileInfoLoader       INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-02T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/pulselo_physics.dat
-TileInfoLoader       INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-02T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/pulse_adder_tower_physics.dat
-TileInfoLoader       INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-02T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/pulse_adder_muonRcv_physics.dat
-TileInfoLoader       INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-02T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/pulse_adder_muon_physics.dat
+TileInfoLoader       INFO Reading file  /home/sss/atlas/rootaccess/build/share/pulsehi_physics.dat
+TileInfoLoader       INFO Reading file  /home/sss/atlas/rootaccess/build/share/pulselo_physics.dat
+TileInfoLoader       INFO Reading file  /home/sss/atlas/rootaccess/build/share/pulse_adder_tower_physics.dat
+TileInfoLoader       INFO Reading file  /home/sss/atlas/rootaccess/build/share/pulse_adder_muonRcv_physics.dat
+TileInfoLoader       INFO Reading file  /home/sss/atlas/rootaccess/build/share/pulse_adder_muon_physics.dat
 CaloIDHelper_ID...   INFO in createObj: creating a CaloLVL1_ID helper object in the detector store
 CaloLVL1_ID          INFO initialize_from_dictionary
 AtlasDetectorID      INFO initialize_from_dictionary - OK
@@ -276,8 +275,8 @@ TileSampleNoise...   INFO Creating TileCondProxyCool(TileSampleNoiseCondAlg.Tile
 TileTimingCondA...   INFO Creating TileCondProxyCool(TileTimingCondAlg.TileCondProxyCool_AdcOffset) for folder: "/TILE/OFL02/TIME/CHANNELOFFSET/PHY"
 tilecellbuilder...   INFO ProxyOnlBch and ProxyOflBch will be used for bad channel status
 tilecellbuilder...   INFO ProxyOnlBch and ProxyOflBch will be used for bad channel status
-ClassIDSvc           INFO  getRegistryEntries: read 504 CLIDRegistry entries for module ALL
-ClassIDSvc           INFO  getRegistryEntries: read 4846 CLIDRegistry entries for module ALL
+ClassIDSvc           INFO  getRegistryEntries: read 1435 CLIDRegistry entries for module ALL
+ClassIDSvc           INFO  getRegistryEntries: read 7021 CLIDRegistry entries for module ALL
 xAODMaker::Even...   INFO Initializing - Package version: xAODEventInfoCnv-00-00-00
 xAODMaker::Even...   INFO Initializing - Package version: xAODEventInfoCnv-00-00-00
 xAODMaker::Even...WARNING Beam conditions service not available
@@ -287,22 +286,19 @@ xAODMaker::Even...   INFO Will take information from the EventInfo object
 PyComponentMgr       INFO Initializing PyComponentMgr...
 prepalg1             INFO Initializing prepalg1...
 testalg1             INFO Initializing testalg1...
-ClassIDSvc           INFO  getRegistryEntries: read 389 CLIDRegistry entries for module ALL
+ClassIDSvc           INFO  getRegistryEntries: read 314 CLIDRegistry entries for module ALL
 ToolSvc.tool1        INFO Storing MBTS cells in MBTSContainer
 ToolSvc.tool1        INFO none of thresholds set, all RawChannels will be converted to Cells
-ToolSvc.tool1        INFO size of temp vector set to 5184
 ToolSvc.tool1        INFO taking RawChannels from 'TileRawChannelCnt'
 ToolSvc.tool1        INFO Storing E4'  cells in E4prContainer
 ToolSvc.tool1        INFO TileCellBuilder initialization completed
 ToolSvc.tool2        INFO Storing MBTS cells in MBTSContainer
 ToolSvc.tool2        INFO none of thresholds set, all RawChannels will be converted to Cells
-ToolSvc.tool2        INFO size of temp vector set to 5184
 ToolSvc.tool2        INFO taking RawChannels from 'TileRawChannelCnt'
 ToolSvc.tool2        INFO Storing E4'  cells in E4prContainer
 ToolSvc.tool2        INFO TileCellBuilder initialization completed
 ToolSvc.tool5        INFO Storing MBTS cells in MBTSContainer
 ToolSvc.tool5        INFO none of thresholds set, all RawChannels will be converted to Cells
-ToolSvc.tool5        INFO size of temp vector set to 5184
 ToolSvc.tool5        INFO taking RawChannels from 'TileRawChannelCnt'
 ToolSvc.tool5        INFO Storing E4'  cells in E4prContainer
 ToolSvc.tool5        INFO TileCellBuilder initialization completed
@@ -313,39 +309,33 @@ ToolSvc.tool6        INFO max time thr  100000 ns
 ToolSvc.tool6        INFO min time thr  -100000 ns
 ToolSvc.tool6        INFO max qual thr  100000
 ToolSvc.tool6        INFO min qual thr  -100000
-ToolSvc.tool6        INFO size of temp vector set to 5184
 ToolSvc.tool6        INFO taking RawChannels from 'TileRawChannelCnt'
 ToolSvc.tool6        INFO Storing E4'  cells in E4prContainer
 ToolSvc.tool6        INFO TileCellBuilder initialization completed
 ToolSvc.tool7        INFO Storing MBTS cells in MBTSContainer
 ToolSvc.tool7        INFO none of thresholds set, all RawChannels will be converted to Cells
-ToolSvc.tool7        INFO size of temp vector set to 5184
 ToolSvc.tool7        INFO taking RawChannels from 'TileRawChannelCnt'
 ToolSvc.tool7        INFO Storing E4'  cells in E4prContainer
 ToolSvc.tool7        INFO TileCellBuilder initialization completed
 ToolSvc.tool8        INFO Storing MBTS cells in MBTSContainer
 ToolSvc.tool8.n...   INFO Initializing...
 ToolSvc.tool8        INFO none of thresholds set, all RawChannels will be converted to Cells
-ToolSvc.tool8        INFO size of temp vector set to 5184
 ToolSvc.tool8        INFO taking RawChannels from 'TileRawChannelCnt'
 ToolSvc.tool8        INFO Storing E4'  cells in E4prContainer
 ToolSvc.tool8        INFO TileCellBuilder initialization completed
 ToolSvc.tool9        INFO Storing MBTS cells in MBTSContainer
 ToolSvc.tool9        INFO none of thresholds set, all RawChannels will be converted to Cells
-ToolSvc.tool9        INFO size of temp vector set to 5184
 ToolSvc.tool9        INFO taking RawChannels from 'TileRawChannelCnt'
 ToolSvc.tool9        INFO Storing E4'  cells in E4prContainer
 ToolSvc.tool9        INFO TileCellBuilder initialization completed
 ToolSvc.tool10       INFO Storing MBTS cells in MBTSContainer
 ToolSvc.tool10       INFO none of thresholds set, all RawChannels will be converted to Cells
-ToolSvc.tool10       INFO size of temp vector set to 5184
 ToolSvc.tool10       INFO taking RawChannels from 'TileRawChannelCnt'
 ToolSvc.tool10       INFO Storing E4'  cells in E4prContainer
 ToolSvc.tool10       INFO TileCellBuilder initialization completed
 ToolSvc.tool11       INFO Storing MBTS cells in MBTSContainer
 ToolSvc.tool11....   INFO Initializing...
 ToolSvc.tool11       INFO none of thresholds set, all RawChannels will be converted to Cells
-ToolSvc.tool11       INFO size of temp vector set to 5184
 ToolSvc.tool11       INFO taking RawChannels from 'TileRawChannelCnt'
 ToolSvc.tool11       INFO Storing E4'  cells in E4prContainer
 ToolSvc.tool11       INFO TileCellBuilder initialization completed
@@ -372,8 +362,8 @@ IOVDbFolder          INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to LARAlign-IOVD
 IOVDbFolder          INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to LArCellPositionShift-ideal for folder /LAR/LArCellPositionShift
 IOVDbSvc             INFO Disconnecting from COOLOFL_LAR/OFLP200
 Domain[ROOT_All]     INFO ->  Access   DbDatabase   READ      [ROOT_All] EACFEBD4-9BD2-E211-848A-02163E006B20
-Domain[ROOT_All]     INFO                           /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000057.gen.COND/cond09_mc.000057.gen.COND._0001.pool.root
-RootDatabase.open    INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000057.gen.COND/cond09_mc.000057.gen.COND._0001.pool.root File version:52200
+Domain[ROOT_All]     INFO                           /home/sss/atlas/DBRelease/current/poolcond/cond09_mc.000057.gen.COND/cond09_mc.000057.gen.COND._0001.pool.root
+RootDatabase.open    INFO /home/sss/atlas/DBRelease/current/poolcond/cond09_mc.000057.gen.COND/cond09_mc.000057.gen.COND._0001.pool.root File version:52200
 CaloMgrDetDescrCnv   INFO in createObj: creating a Calo Detector Manager object in the detector store
 CaloIdMgrDetDes...   INFO in createObj: creating a CaloDescrManager object in the detector store
 ClassIDSvc           INFO  getRegistryEntries: read 193 CLIDRegistry entries for module ALL
@@ -390,18 +380,18 @@ CaloIDHelper_ID...   INFO in createObj: creating a LArHEC_SuperCell_ID helper ob
 AtlasDetectorID      INFO initialize_from_dictionary - OK
 CaloIDHelper_ID...   INFO in createObj: creating a LArFCAL_SuperCell_ID helper object in the detector store
 AtlasDetectorID      INFO initialize_from_dictionary - OK
-LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-02T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/FCalSuperCells2DNeighborsNew-April2014.txt
-LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-02T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
-LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-02T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
+LArFCAL_Base_ID      INFO Reading file /home/sss/atlas/rootaccess/build/share/FCalSuperCells2DNeighborsNew-April2014.txt
+LArFCAL_Base_ID      INFO Reading file /home/sss/atlas/rootaccess/build/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
+LArFCAL_Base_ID      INFO Reading file /home/sss/atlas/rootaccess/build/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
 CaloIDHelper_ID...   INFO in createObj: creating a Tile_SuperCell_ID helper object in the detector store
 AtlasDetectorID      INFO initialize_from_dictionary - OK
-TileNeighbour        INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-02T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/TileSuperCellNeighbour.txt
+TileNeighbour        INFO Reading file  /home/sss/atlas/rootaccess/build/share/TileSuperCellNeighbour.txt
 AtlasDetectorID      INFO initialize_from_dictionary - OK
 CaloIdMgrDetDes...   INFO  Finished 
 CaloIdMgrDetDes...   INFO Initializing CaloIdMgr from values in CaloIdMgrDetDescrCnv 
 Domain[ROOT_All]     INFO ->  Access   DbDatabase   READ      [ROOT_All] 8667C6F2-1559-DE11-A611-000423D9A21A
-Domain[ROOT_All]     INFO                           /cvmfs/atlas-condb.cern.ch/repo/conditions/cond08/cond08_mc.000003.gen.COND/cond08_mc.000003.gen.COND._0064.pool.root
-RootDatabase.open    INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond08/cond08_mc.000003.gen.COND/cond08_mc.000003.gen.COND._0064.pool.root File version:52200
+Domain[ROOT_All]     INFO                           /home/sss/atlas/DBRelease/current/poolcond/cond08_mc.000003.gen.COND/cond08_mc.000003.gen.COND._0064.pool.root
+RootDatabase.open    INFO /home/sss/atlas/DBRelease/current/poolcond/cond08_mc.000003.gen.COND/cond08_mc.000003.gen.COND._0064.pool.root File version:52200
 xAODMaker::Even...WARNING Algorithm::BeginRun is deprecated. Use Start instead
 AthenaEventLoopMgr   INFO   ===>>>  start processing event #1, run #1 0 events processed so far  <<<===
 IOVDbSvc             INFO Opening COOL connection for COOLOFL_TILE/OFLP200
@@ -425,8 +415,8 @@ TileBadChannels...   INFO TileBchStatus::isNoisy() is defined by: Large HF noise
 TileBadChannels...   INFO TileBchStatus::isNoGainL1() is defined by: ADC dead; No PMT connected; No HV; Channel masked for LV1 (unspecified); LV1 channel no gain; LV1 channel noisy; Channel disabled for LV1; 
 TileBadChannels...   INFO TileBchStatus::isBadTiming() is defined by: Bad timing; Online bad timing; 
 TileBadChannels...   INFO No drawer trips probabilities found in DB
-tilecellbuilder...   INFO Creating TileCondProxyFile(tilecellbuilder_bct1Cond.tilecellbuilder_bct1_onl) for ASCII file name: "/cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-02T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/TileNoBad.oflBch"
-tilecellbuilder...   INFO Creating TileCondProxyFile(tilecellbuilder_bct1Cond.tilecellbuilder_bct1_ofl) for ASCII file name: "/cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-02T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/TileNoBad.oflBch"
+tilecellbuilder...   INFO Creating TileCondProxyFile(tilecellbuilder_bct1Cond.tilecellbuilder_bct1_onl) for ASCII file name: "/home/sss/atlas/rootaccess/build/share/TileNoBad.oflBch"
+tilecellbuilder...   INFO Creating TileCondProxyFile(tilecellbuilder_bct1Cond.tilecellbuilder_bct1_ofl) for ASCII file name: "/home/sss/atlas/rootaccess/build/share/TileNoBad.oflBch"
 tilecellbuilder...   INFO No TileBchStatus::isBad() definition found in DB, using defaults
 tilecellbuilder...   INFO No TileBchStatus::isNoisy() definition found in DB, using defaults
 tilecellbuilder...   INFO No TileBchStatus::isNoGainL1() definition found in DB, using defaults
@@ -436,8 +426,8 @@ tilecellbuilder...   INFO TileBchStatus::isNoisy() is defined by: Large HF noise
 tilecellbuilder...   INFO TileBchStatus::isNoGainL1() is defined by: ADC dead; No PMT connected; No HV; Channel masked for LV1 (unspecified); LV1 channel no gain; LV1 channel noisy; Channel disabled for LV1; 
 tilecellbuilder...   INFO TileBchStatus::isBadTiming() is defined by: Bad timing; Online bad timing; 
 tilecellbuilder...   INFO No drawer trips probabilities found in DB
-tilecellbuilder...   INFO Creating TileCondProxyFile(tilecellbuilder_bct2Cond.tilecellbuilder_bct2_onl) for ASCII file name: "/cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-02T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/TileNoBad.oflBch"
-tilecellbuilder...   INFO Creating TileCondProxyFile(tilecellbuilder_bct2Cond.tilecellbuilder_bct2_ofl) for ASCII file name: "/afs/cern.ch/work/s/ssnyder/builds/atlas-work3g/build-x86_64-slc6-gcc62-opt/TileCalorimeter/TileRecUtils/unitTestRun/tilecellbuilder_bct2.bch"
+tilecellbuilder...   INFO Creating TileCondProxyFile(tilecellbuilder_bct2Cond.tilecellbuilder_bct2_onl) for ASCII file name: "/home/sss/atlas/rootaccess/build/share/TileNoBad.oflBch"
+tilecellbuilder...   INFO Creating TileCondProxyFile(tilecellbuilder_bct2Cond.tilecellbuilder_bct2_ofl) for ASCII file name: "/home/sss/nobackup/atlas/build/../tests/tilecellbuilder_bct2.bch"
 tilecellbuilder...   INFO No TileBchStatus::isBad() definition found in DB, using defaults
 tilecellbuilder...   INFO No TileBchStatus::isNoisy() definition found in DB, using defaults
 tilecellbuilder...   INFO No TileBchStatus::isNoGainL1() definition found in DB, using defaults
@@ -447,10 +437,9 @@ tilecellbuilder...   INFO TileBchStatus::isNoisy() is defined by: Large HF noise
 tilecellbuilder...   INFO TileBchStatus::isNoGainL1() is defined by: ADC dead; No PMT connected; No HV; Channel masked for LV1 (unspecified); LV1 channel no gain; LV1 channel noisy; Channel disabled for LV1; 
 tilecellbuilder...   INFO TileBchStatus::isBadTiming() is defined by: Bad timing; Online bad timing; 
 tilecellbuilder...   INFO No drawer trips probabilities found in DB
-ClassIDSvc           INFO  getRegistryEntries: read 650 CLIDRegistry entries for module ALL
+ClassIDSvc           INFO  getRegistryEntries: read 654 CLIDRegistry entries for module ALL
 ClassIDSvc           INFO  getRegistryEntries: read 187 CLIDRegistry entries for module ALL
 ClassIDSvc           INFO  getRegistryEntries: read 8 CLIDRegistry entries for module ALL
-ClassIDSvc           INFO  getRegistryEntries: read 37 CLIDRegistry entries for module ALL
 AthenaEventLoopMgr   INFO   ===>>>  done processing event #1, run #1 1 events processed so far  <<<===
 AthenaEventLoopMgr   INFO   ===>>>  start processing event #2, run #1 1 events processed so far  <<<===
 ClassIDSvc           INFO  getRegistryEntries: read 15 CLIDRegistry entries for module ALL
@@ -477,9 +466,9 @@ AthenaEventLoopMgr   INFO   ===>>>  start processing event #12, run #1 11 events
 AthenaEventLoopMgr   INFO   ===>>>  done processing event #12, run #1 12 events processed so far  <<<===
 TileInfoLoader       INFO Handling EndRun incident
 TileInfoLoader       INFO Removed TileInfo object from detector store.
-/cvmfs/atlas-co...   INFO Database being retired...
+/home/sss/atlas...   INFO Database being retired...
 Domain[ROOT_All]     INFO ->  Deaccess DbDatabase   READ      [ROOT_All] EACFEBD4-9BD2-E211-848A-02163E006B20
-/cvmfs/atlas-co...   INFO Database being retired...
+/home/sss/atlas...   INFO Database being retired...
 Domain[ROOT_All]     INFO ->  Deaccess DbDatabase   READ      [ROOT_All] 8667C6F2-1559-DE11-A611-000423D9A21A
 Domain[ROOT_All]     INFO >   Deaccess DbDomain     READ      [ROOT_All] 
 ApplicationMgr       INFO Application Manager Stopped successfully
@@ -490,23 +479,23 @@ testalg1             INFO Finalizing testalg1...
 IncidentProcAlg2     INFO Finalize
 PyComponentMgr       INFO Finalizing PyComponentMgr...
 IdDictDetDescrCnv    INFO in finalize
-IOVDbFolder          INFO Folder /LAR/Align (PoolRef) db-read 1/1 objs/chan/bytes 1/1/170 ((     0.18 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/CES (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/103344 ((     0.16 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/CIS/FIT/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/80 ((     0.05 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/CIS/FIT/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/80 ((     0.04 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/EMS (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/92 ((     0.03 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/LAS/FIBER (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/940 ((     0.04 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/LAS/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/72 ((     0.03 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/LAS/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/76 ((     0.04 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/NOISE/SAMPLE (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/641476 ((     0.13 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/STATUS/ADC (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/97884 ((     0.83 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/TIME/CHANNELOFFSET/PHY (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/96 ((     0.59 ))s
-IOVDbFolder          INFO Folder /TILE/ONL01/STATUS/ADC (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/76 ((     0.06 ))s
-IOVDbFolder          INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 1/1 objs/chan/bytes 1/1/195 ((     0.03 ))s
-IOVDbSvc             INFO  bytes in ((      2.21 ))s
+IOVDbFolder          INFO Folder /LAR/Align (PoolRef) db-read 1/1 objs/chan/bytes 1/1/170 ((     0.09 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/CES (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/103344 ((     0.11 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/CIS/FIT/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/80 ((     0.01 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/CIS/FIT/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/80 ((     0.01 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/EMS (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/92 ((     0.01 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/LAS/FIBER (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/940 ((     0.01 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/LAS/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/72 ((     0.01 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/LAS/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/76 ((     0.01 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/NOISE/SAMPLE (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/641476 ((     0.01 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/STATUS/ADC (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/97884 ((     0.01 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/TIME/CHANNELOFFSET/PHY (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/96 ((     0.01 ))s
+IOVDbFolder          INFO Folder /TILE/ONL01/STATUS/ADC (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/76 ((     0.00 ))s
+IOVDbFolder          INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 1/1 objs/chan/bytes 1/1/195 ((     0.00 ))s
+IOVDbSvc             INFO  bytes in ((      0.26 ))s
 IOVDbSvc             INFO Connection sqlite://;schema=mycool.db;dbname=OFLP200 : nConnect: 0 nFolders: 0 ReadTime: ((     0.00 ))s
-IOVDbSvc             INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 2 nFolders: 2 ReadTime: ((     0.21 ))s
-IOVDbSvc             INFO Connection COOLOFL_TILE/OFLP200 : nConnect: 2 nFolders: 11 ReadTime: ((     2.00 ))s
+IOVDbSvc             INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 2 nFolders: 2 ReadTime: ((     0.09 ))s
+IOVDbSvc             INFO Connection COOLOFL_TILE/OFLP200 : nConnect: 2 nFolders: 11 ReadTime: ((     0.17 ))s
 TileInfoLoader       INFO TileInfoLoader::finalize()
 AthDictLoaderSvc     INFO in finalize...
 ToolSvc              INFO Removing all tools created by ToolSvc
@@ -522,9 +511,9 @@ ToolSvc.tool1        INFO Finalizing
 *****Chrono*****     INFO ****************************************************************************************************
 *****Chrono*****     INFO  The Final CPU consumption ( Chrono ) Table (ordered)
 *****Chrono*****     INFO ****************************************************************************************************
-cObjR_ALL            INFO Time User   : Tot=  470 [ms] Ave/Min/Max=  235(+-  235)/    0/  470 [ms] #=  2
-cObj_ALL             INFO Time User   : Tot= 0.57  [s] Ave/Min/Max=0.0438(+-0.136)/    0/ 0.51  [s] #= 13
-ChronoStatSvc        INFO Time User   : Tot= 46.6  [s]                                             #=  1
+cObjR_ALL            INFO Time User   : Tot=  340 [ms] Ave/Min/Max=  170(+-  160)/   10/  330 [ms] #=  2
+cObj_ALL             INFO Time User   : Tot=  420 [ms] Ave/Min/Max= 32.3(+- 95.9)/    0/  360 [ms] #= 13
+ChronoStatSvc        INFO Time User   : Tot= 34.2  [s]                                             #=  1
 *****Chrono*****     INFO ****************************************************************************************************
 ChronoStatSvc.f...   INFO  Service finalized successfully 
 ApplicationMgr       INFO Application Manager Finalized successfully
diff --git a/TileCalorimeter/TileRecUtils/share/TileDQstatusAlg_test.ref b/TileCalorimeter/TileRecUtils/share/TileDQstatusAlg_test.ref
index e2100d1b72008f9524b4a80d16be1b104aa29d67..3fc8d93852d28aafddb99181db9a6a86db80e23a 100644
--- a/TileCalorimeter/TileRecUtils/share/TileDQstatusAlg_test.ref
+++ b/TileCalorimeter/TileRecUtils/share/TileDQstatusAlg_test.ref
@@ -1,14 +1,14 @@
-Mon Dec 17 02:29:02 CET 2018
+Sat Jan 26 19:47:02 CET 2019
 Preloading tcmalloc_minimal.so
 Py:Athena            INFO including file "AthenaCommon/Preparation.py"
-Py:Athena            INFO using release [AthenaWorkDir-22.0.1] [x86_64-slc6-gcc62-dbg] [atlas-work3/d6d3116653c] -- built on [2018-12-16T1848]
+Py:Athena            INFO using release [WorkDir-22.0.1] [x86_64-slc6-gcc8-opt] [atlas-work3/5e0c78d866] -- built on [2019-01-26T1705]
 Py:Athena            INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
 Py:Athena            INFO executing ROOT6Setup
 Py:Athena            INFO including file "AthenaCommon/Execution.py"
 Py:Athena            INFO including file "TileRecUtils/TileDQstatusAlg_test.py"
 [?1034hSetGeometryVersion.py obtained major release version 22
 Py:Athena            INFO including file "IdDictDetDescrCnv/IdDictDetDescrCnv_joboptions.py"
-Py:ConfigurableDb    INFO Read module info for 5459 configurables from 51 genConfDb files
+Py:ConfigurableDb    INFO Read module info for 5455 configurables from 76 genConfDb files
 Py:ConfigurableDb    INFO No duplicates have been found: that's good !
 EventInfoMgtInit: Got release version  Athena-22.0.1
 Py:IOVDbSvc.CondDB    INFO Setting up conditions DB access to instance OFLP200
@@ -28,7 +28,7 @@ ApplicationMgr       INFO Updating Gaudi::PluginService::SetDebug(level) to leve
 ApplicationMgr    SUCCESS 
 ====================================================================================================================================
                                                    Welcome to ApplicationMgr (GaudiCoreSvc v30r5)
-                                          running on lxplus073.cern.ch on Mon Dec 17 02:29:22 2018
+                                          running on lxplus063.cern.ch on Sat Jan 26 19:47:29 2019
 ====================================================================================================================================
 ApplicationMgr       INFO Successfully loaded modules : AthenaServices
 ApplicationMgr       INFO Application Manager Configured successfully
@@ -36,7 +36,7 @@ ApplicationMgr       INFO Updating Gaudi::PluginService::SetDebug(level) to leve
 StatusCodeSvc        INFO initialize
 AthDictLoaderSvc     INFO in initialize...
 AthDictLoaderSvc     INFO acquired Dso-registry
-ClassIDSvc           INFO  getRegistryEntries: read 6864 CLIDRegistry entries for module ALL
+ClassIDSvc           INFO  getRegistryEntries: read 6914 CLIDRegistry entries for module ALL
 CoreDumpSvc          INFO install f-a-t-a-l handler... (flag = -1)
 CoreDumpSvc          INFO Handling signals: 11(Segmentation fault) 7(Bus error) 4(Illegal instruction) 8(Floating point exception) 
 MetaDataSvc          INFO Initializing MetaDataSvc - package version AthenaServices-00-00-00
@@ -45,8 +45,8 @@ PoolSvc              INFO io_register[PoolSvc](xmlcatalog_file:PoolFileCatalog.x
 PoolSvc              INFO Set connectionsvc retry/timeout/IDLE timeout to  'ConnectionRetrialPeriod':300/ 'ConnectionRetrialTimeOut':3600/ 'ConnectionTimeOut':5 seconds with connection cleanup disabled
 PoolSvc              INFO Frontier compression level set to 5
 DBReplicaSvc         INFO Frontier server at (serverurl=http://atlasfrontier-local.cern.ch:8000/atlr)(serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://lcgft-atlas.gridpp.rl.ac.uk:3128/frontierATLAS)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://ca-proxy.cern.ch:3128)(proxyurl=http://ca-proxy-meyrin.cern.ch:3128)(proxyurl=http://ca-proxy-wigner.cern.ch:3128)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
-DBReplicaSvc         INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2018-12-15T2259/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/dbreplica.config
-DBReplicaSvc         INFO Total of 10 servers found for host lxplus073.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
+DBReplicaSvc         INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2352/Athena/22.0.1/InstallArea/x86_64-slc6-gcc8-opt/share/dbreplica.config
+DBReplicaSvc         INFO Total of 10 servers found for host lxplus063.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
 PoolSvc              INFO Successfully setup replica sorting algorithm
 PoolSvc              INFO Setting up APR FileCatalog and Streams
 PoolSvc           WARNING Unable to locate catalog for prfile:poolcond/PoolCat_oflcond.xml check your ATLAS_POOLCOND_PATH and DATAPATH variables
@@ -83,7 +83,7 @@ IOVDbSvc             INFO Added taginfo remove for /TILE/OFL02/STATUS/ADC
 IOVDbSvc             INFO Added taginfo remove for /TILE/OFL02/TIME/CHANNELOFFSET/PHY
 IOVDbSvc             INFO Added taginfo remove for /TILE/ONL01/STATUS/ADC
 IOVDbSvc             INFO Added taginfo remove for /LAR/LArCellPositionShift
-ClassIDSvc           INFO  getRegistryEntries: read 1919 CLIDRegistry entries for module ALL
+ClassIDSvc           INFO  getRegistryEntries: read 1876 CLIDRegistry entries for module ALL
 ClassIDSvc           INFO  getRegistryEntries: read 17 CLIDRegistry entries for module ALL
 DetDescrCnvSvc       INFO  initializing 
 DetDescrCnvSvc       INFO Found DetectorStore service
@@ -172,7 +172,7 @@ EndcapDMConstru...   INFO Start building EC electronics geometry
   multi-layered version of absorbers activated, mlabs == 1
 ================================================
 EndcapDMConstru...   INFO Start building EC electronics geometry
-GeoModelSvc          INFO GeoModelSvc.LArDetectorToolNV	 SZ= 28576Kb 	 Time = 1.56S
+GeoModelSvc          INFO GeoModelSvc.LArDetectorToolNV	 SZ= 23968Kb 	 Time = 0.86S
 GeoModelSvc.Til...   INFO  Entering TileDetectorTool::create()
 TileDddbManager      INFO m_tag = ATLAS-R2-2016-01-00-01
 TileDddbManager      INFO n_tiglob = 5
@@ -184,7 +184,7 @@ TileDddbManager      INFO n_tileSwitches = 1
 ClassIDSvc           INFO  getRegistryEntries: read 213 CLIDRegistry entries for module ALL
 CaloIDHelper_ID...   INFO in createObj: creating a TileID helper object in the detector store
 AtlasDetectorID      INFO initialize_from_dictionary - OK
-TileNeighbour        INFO Reading file  /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc62-dbg/x86_64-slc6-gcc62-dbg/share/TileNeighbour_reduced.txt
+TileNeighbour        INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2352/Athena/22.0.1/InstallArea/x86_64-slc6-gcc8-opt/share/TileNeighbour_reduced.txt
 TileHWIDDetDesc...   INFO in createObj: creating a TileHWID helper object in the detector store
 TileHWID             INFO initialize_from_dictionary 
 AtlasDetectorID      INFO initialize_from_dictionary - OK
@@ -196,9 +196,9 @@ CaloIDHelper_ID...   INFO in createObj: creating a LArHEC_ID helper object in th
 AtlasDetectorID      INFO initialize_from_dictionary - OK
 CaloIDHelper_ID...   INFO in createObj: creating a LArFCAL_ID helper object in the detector store
 AtlasDetectorID      INFO initialize_from_dictionary - OK
-LArFCAL_Base_ID      INFO Reading file /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc62-dbg/x86_64-slc6-gcc62-dbg/share/FCal2DNeighbors-April2011.txt
-LArFCAL_Base_ID      INFO Reading file /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc62-dbg/x86_64-slc6-gcc62-dbg/share/FCal3DNeighborsNext-April2011.txt
-LArFCAL_Base_ID      INFO Reading file /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc62-dbg/x86_64-slc6-gcc62-dbg/share/FCal3DNeighborsPrev-April2011.txt
+LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2352/Athena/22.0.1/InstallArea/x86_64-slc6-gcc8-opt/share/FCal2DNeighbors-April2011.txt
+LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2352/Athena/22.0.1/InstallArea/x86_64-slc6-gcc8-opt/share/FCal3DNeighborsNext-April2011.txt
+LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2352/Athena/22.0.1/InstallArea/x86_64-slc6-gcc8-opt/share/FCal3DNeighborsPrev-April2011.txt
 CaloIDHelper_ID...   INFO in createObj: creating a LArMiniFCAL_ID helper object in the detector store
 AtlasDetectorID      INFO initialize_from_dictionary - OK
 LArMiniFCAL_ID       INFO  initialize_from_dict - LArCalorimeter dictionary does NOT contain miniFCAL description. Unable to initialize LArMiniFCAL_ID.
@@ -229,11 +229,11 @@ GeoModelSvc.Til...   INFO                                    PLUG2  Rmin= 2981 R
 GeoModelSvc.Til...   INFO  Positioning negative ITC with translation -3405
 GeoModelSvc.Til...   INFO  Positioning negative Gap with translation -3552
 GeoModelSvc.Til...   INFO  Positioning negative Crack with translation -3536
-GeoModelSvc.Til...   INFO  Global positioning of barrel with rotation (0,0,0)) and translation (0,0,0) GeoModelKernelUnits::cm
-GeoModelSvc.Til...   INFO  Global positioning of positive ext.barrel with rotation (0,0,0)) and translation (0,0,0) GeoModelKernelUnits::cm
-GeoModelSvc.Til...   INFO  Global positioning of negative ext.barrel with rotation (0,0,0)) and translation (0,0,1) GeoModelKernelUnits::cm
+GeoModelSvc.Til...   INFO  Global positioning of barrel with rotation (0,0,0)) and translation (0,0,0) Gaudi::Units::cm
+GeoModelSvc.Til...   INFO  Global positioning of positive ext.barrel with rotation (0,0,0)) and translation (0,0,0) Gaudi::Units::cm
+GeoModelSvc.Til...   INFO  Global positioning of negative ext.barrel with rotation (0,0,0)) and translation (0,0,1) Gaudi::Units::cm
 TileDetDescrMan...   INFO Entering create_elements()
-GeoModelSvc          INFO GeoModelSvc.TileDetectorTool	 SZ= 5196Kb 	 Time = 1.62S
+GeoModelSvc          INFO GeoModelSvc.TileDetectorTool	 SZ= 3576Kb 	 Time = 0.21S
 ClassIDSvc           INFO  getRegistryEntries: read 65 CLIDRegistry entries for module ALL
 TileInfoLoader       INFO Initializing....TileInfoLoader
 TileInfoLoader       INFO New ATLAS geometry detected: ATLAS-R2-2016-01-00-01 (010001) version 10001
@@ -255,11 +255,11 @@ TileInfoLoader       INFO Sampling fraction for E2 cells 1/107
 TileInfoLoader       INFO Sampling fraction for E3 cells 1/97
 TileInfoLoader       INFO Sampling fraction for E4 cells 1/75
 TileInfoLoader       INFO Sampling fraction for E4' cells 1/75
-TileInfoLoader       INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2018-12-15T2259/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/pulsehi_physics.dat
-TileInfoLoader       INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2018-12-15T2259/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/pulselo_physics.dat
-TileInfoLoader       INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2018-12-15T2259/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/pulse_adder_tower_physics.dat
-TileInfoLoader       INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2018-12-15T2259/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/pulse_adder_muonRcv_physics.dat
-TileInfoLoader       INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2018-12-15T2259/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/pulse_adder_muon_physics.dat
+TileInfoLoader       INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2352/Athena/22.0.1/InstallArea/x86_64-slc6-gcc8-opt/share/pulsehi_physics.dat
+TileInfoLoader       INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2352/Athena/22.0.1/InstallArea/x86_64-slc6-gcc8-opt/share/pulselo_physics.dat
+TileInfoLoader       INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2352/Athena/22.0.1/InstallArea/x86_64-slc6-gcc8-opt/share/pulse_adder_tower_physics.dat
+TileInfoLoader       INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2352/Athena/22.0.1/InstallArea/x86_64-slc6-gcc8-opt/share/pulse_adder_muonRcv_physics.dat
+TileInfoLoader       INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2352/Athena/22.0.1/InstallArea/x86_64-slc6-gcc8-opt/share/pulse_adder_muon_physics.dat
 CaloIDHelper_ID...   INFO in createObj: creating a CaloLVL1_ID helper object in the detector store
 CaloLVL1_ID          INFO initialize_from_dictionary
 AtlasDetectorID      INFO initialize_from_dictionary - OK
@@ -312,7 +312,7 @@ TileEMScaleCond...   INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCond
 TileEMScaleCond...   INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCondProxyCool_OnlEms) for folder: "/TILE/OFL02/CALIB/EMS"
 TileSampleNoise...   INFO Creating TileCondProxyCool(TileSampleNoiseCondAlg.TileCondProxyCool_NoiseSample) for folder: "/TILE/OFL02/NOISE/SAMPLE"
 TileTimingCondA...   INFO Creating TileCondProxyCool(TileTimingCondAlg.TileCondProxyCool_AdcOffset) for folder: "/TILE/OFL02/TIME/CHANNELOFFSET/PHY"
-ClassIDSvc           INFO  getRegistryEntries: read 4876 CLIDRegistry entries for module ALL
+ClassIDSvc           INFO  getRegistryEntries: read 4754 CLIDRegistry entries for module ALL
 PyComponentMgr       INFO Initializing PyComponentMgr...
 record1              INFO Initializing record1...
 check1               INFO Initializing check1...
@@ -358,12 +358,12 @@ CaloIDHelper_ID...   INFO in createObj: creating a LArHEC_SuperCell_ID helper ob
 AtlasDetectorID      INFO initialize_from_dictionary - OK
 CaloIDHelper_ID...   INFO in createObj: creating a LArFCAL_SuperCell_ID helper object in the detector store
 AtlasDetectorID      INFO initialize_from_dictionary - OK
-LArFCAL_Base_ID      INFO Reading file /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc62-dbg/x86_64-slc6-gcc62-dbg/share/FCalSuperCells2DNeighborsNew-April2014.txt
-LArFCAL_Base_ID      INFO Reading file /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc62-dbg/x86_64-slc6-gcc62-dbg/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
-LArFCAL_Base_ID      INFO Reading file /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc62-dbg/x86_64-slc6-gcc62-dbg/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
+LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2352/Athena/22.0.1/InstallArea/x86_64-slc6-gcc8-opt/share/FCalSuperCells2DNeighborsNew-April2014.txt
+LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2352/Athena/22.0.1/InstallArea/x86_64-slc6-gcc8-opt/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
+LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2352/Athena/22.0.1/InstallArea/x86_64-slc6-gcc8-opt/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
 CaloIDHelper_ID...   INFO in createObj: creating a Tile_SuperCell_ID helper object in the detector store
 AtlasDetectorID      INFO initialize_from_dictionary - OK
-TileNeighbour        INFO Reading file  /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc62-dbg/x86_64-slc6-gcc62-dbg/share/TileSuperCellNeighbour.txt
+TileNeighbour        INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2352/Athena/22.0.1/InstallArea/x86_64-slc6-gcc8-opt/share/TileSuperCellNeighbour.txt
 AtlasDetectorID      INFO initialize_from_dictionary - OK
 CaloIdMgrDetDes...   INFO  Finished 
 CaloIdMgrDetDes...   INFO Initializing CaloIdMgr from values in CaloIdMgrDetDescrCnv 
@@ -392,7 +392,7 @@ TileBadChannels...   INFO TileBchStatus::isNoisy() is defined by: Large HF noise
 TileBadChannels...   INFO TileBchStatus::isNoGainL1() is defined by: ADC dead; No PMT connected; No HV; Channel masked for LV1 (unspecified); LV1 channel no gain; LV1 channel noisy; Channel disabled for LV1; 
 TileBadChannels...   INFO TileBchStatus::isBadTiming() is defined by: Bad timing; Online bad timing; 
 TileBadChannels...   INFO No drawer trips probabilities found in DB
-ClassIDSvc           INFO  getRegistryEntries: read 650 CLIDRegistry entries for module ALL
+ClassIDSvc           INFO  getRegistryEntries: read 670 CLIDRegistry entries for module ALL
 ClassIDSvc           INFO  getRegistryEntries: read 196 CLIDRegistry entries for module ALL
 ClassIDSvc           INFO  getRegistryEntries: read 3 CLIDRegistry entries for module ALL
 AthenaEventLoopMgr   INFO   ===>>>  done processing event #1, run #1 1 events processed so far  <<<===
@@ -413,32 +413,32 @@ check1               INFO Finalizing check1...
 IncidentProcAlg2     INFO Finalize
 PyComponentMgr       INFO Finalizing PyComponentMgr...
 IdDictDetDescrCnv    INFO in finalize
-IOVDbFolder          INFO Folder /LAR/Align (PoolRef) db-read 1/1 objs/chan/bytes 1/1/170 ((     0.95 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/CES (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/103344 ((     1.31 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/CIS/FIT/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/80 ((     1.02 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/CIS/FIT/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/80 ((     0.99 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/EMS (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/92 ((     0.57 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/LAS/FIBER (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/940 ((     0.63 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/LAS/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/72 ((     0.58 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/LAS/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/76 ((     0.56 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/NOISE/SAMPLE (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/641476 ((     0.81 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/STATUS/ADC (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/97884 ((     0.05 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/TIME/CHANNELOFFSET/PHY (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/96 ((     0.05 ))s
-IOVDbFolder          INFO Folder /TILE/ONL01/STATUS/ADC (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/76 ((     0.01 ))s
-IOVDbFolder          INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 1/1 objs/chan/bytes 1/1/195 ((     0.51 ))s
-IOVDbSvc             INFO  bytes in ((      8.05 ))s
+IOVDbFolder          INFO Folder /LAR/Align (PoolRef) db-read 1/1 objs/chan/bytes 1/1/340 ((     1.13 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/CES (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/104132 ((     1.27 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/CIS/FIT/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/108 ((     0.87 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/CIS/FIT/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/108 ((     1.00 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/EMS (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/116 ((     0.93 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/LAS/FIBER (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/964 ((     0.84 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/LAS/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/96 ((     3.08 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/LAS/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/104 ((     0.78 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/NOISE/SAMPLE (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/643800 ((     1.01 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/STATUS/ADC (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/97908 ((     0.03 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/TIME/CHANNELOFFSET/PHY (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/120 ((     0.04 ))s
+IOVDbFolder          INFO Folder /TILE/ONL01/STATUS/ADC (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/100 ((     0.00 ))s
+IOVDbFolder          INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 1/1 objs/chan/bytes 1/1/390 ((     0.68 ))s
+IOVDbSvc             INFO  bytes in ((     11.66 ))s
 IOVDbSvc             INFO Connection sqlite://;schema=mycool.db;dbname=OFLP200 : nConnect: 0 nFolders: 0 ReadTime: ((     0.00 ))s
-IOVDbSvc             INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 2 nFolders: 2 ReadTime: ((     1.46 ))s
-IOVDbSvc             INFO Connection COOLOFL_TILE/OFLP200 : nConnect: 2 nFolders: 11 ReadTime: ((     6.59 ))s
+IOVDbSvc             INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 2 nFolders: 2 ReadTime: ((     1.81 ))s
+IOVDbSvc             INFO Connection COOLOFL_TILE/OFLP200 : nConnect: 2 nFolders: 11 ReadTime: ((     9.85 ))s
 TileInfoLoader       INFO TileInfoLoader::finalize()
 AthDictLoaderSvc     INFO in finalize...
 ToolSvc              INFO Removing all tools created by ToolSvc
 *****Chrono*****     INFO ****************************************************************************************************
 *****Chrono*****     INFO  The Final CPU consumption ( Chrono ) Table (ordered)
 *****Chrono*****     INFO ****************************************************************************************************
-cObjR_ALL            INFO Time User   : Tot= 0.76  [s] Ave/Min/Max= 0.38(+- 0.36)/ 0.02/ 0.74  [s] #=  2
-cObj_ALL             INFO Time User   : Tot=    1  [s] Ave/Min/Max=0.0769(+-0.224)/    0/ 0.84  [s] #= 13
-ChronoStatSvc        INFO Time User   : Tot= 63.9  [s]                                             #=  1
+cObjR_ALL            INFO Time User   : Tot= 0.51  [s] Ave/Min/Max=0.255(+-0.245)/ 0.01/  0.5  [s] #=  2
+cObj_ALL             INFO Time User   : Tot= 0.61  [s] Ave/Min/Max=0.0469(+-0.144)/    0/ 0.54  [s] #= 13
+ChronoStatSvc        INFO Time User   : Tot= 37.1  [s]                                             #=  1
 *****Chrono*****     INFO ****************************************************************************************************
 ChronoStatSvc.f...   INFO  Service finalized successfully 
 ApplicationMgr       INFO Application Manager Finalized successfully
diff --git a/TileCalorimeter/TileRecUtils/share/TileDQstatusTool_test.ref b/TileCalorimeter/TileRecUtils/share/TileDQstatusTool_test.ref
index 6918313d4c6995895ae79fff35a36ee37960d230..ea1b58932da5f9609fcb086de4089829ad584157 100644
--- a/TileCalorimeter/TileRecUtils/share/TileDQstatusTool_test.ref
+++ b/TileCalorimeter/TileRecUtils/share/TileDQstatusTool_test.ref
@@ -1,14 +1,14 @@
-Mon Dec 17 02:46:42 CET 2018
+Sat Jan 26 19:39:33 CET 2019
 Preloading tcmalloc_minimal.so
 Py:Athena            INFO including file "AthenaCommon/Preparation.py"
-Py:Athena            INFO using release [AthenaWorkDir-22.0.1] [x86_64-slc6-gcc62-dbg] [atlas-work3/d6d3116653c] -- built on [2018-12-16T1848]
+Py:Athena            INFO using release [WorkDir-22.0.1] [x86_64-slc6-gcc8-opt] [atlas-work3/5e0c78d866] -- built on [2019-01-26T1705]
 Py:Athena            INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
 Py:Athena            INFO executing ROOT6Setup
 Py:Athena            INFO including file "AthenaCommon/Execution.py"
 Py:Athena            INFO including file "TileRecUtils/TileDQstatusTool_test.py"
 [?1034hSetGeometryVersion.py obtained major release version 22
 Py:Athena            INFO including file "IdDictDetDescrCnv/IdDictDetDescrCnv_joboptions.py"
-Py:ConfigurableDb    INFO Read module info for 5459 configurables from 51 genConfDb files
+Py:ConfigurableDb    INFO Read module info for 5455 configurables from 76 genConfDb files
 Py:ConfigurableDb    INFO No duplicates have been found: that's good !
 EventInfoMgtInit: Got release version  Athena-22.0.1
 Py:IOVDbSvc.CondDB    INFO Setting up conditions DB access to instance OFLP200
@@ -28,7 +28,7 @@ ApplicationMgr       INFO Updating Gaudi::PluginService::SetDebug(level) to leve
 ApplicationMgr    SUCCESS 
 ====================================================================================================================================
                                                    Welcome to ApplicationMgr (GaudiCoreSvc v30r5)
-                                          running on lxplus073.cern.ch on Mon Dec 17 02:47:02 2018
+                                          running on lxplus063.cern.ch on Sat Jan 26 19:39:57 2019
 ====================================================================================================================================
 ApplicationMgr       INFO Successfully loaded modules : AthenaServices
 ApplicationMgr       INFO Application Manager Configured successfully
@@ -36,7 +36,7 @@ ApplicationMgr       INFO Updating Gaudi::PluginService::SetDebug(level) to leve
 StatusCodeSvc        INFO initialize
 AthDictLoaderSvc     INFO in initialize...
 AthDictLoaderSvc     INFO acquired Dso-registry
-ClassIDSvc           INFO  getRegistryEntries: read 6864 CLIDRegistry entries for module ALL
+ClassIDSvc           INFO  getRegistryEntries: read 6914 CLIDRegistry entries for module ALL
 CoreDumpSvc          INFO install f-a-t-a-l handler... (flag = -1)
 CoreDumpSvc          INFO Handling signals: 11(Segmentation fault) 7(Bus error) 4(Illegal instruction) 8(Floating point exception) 
 MetaDataSvc          INFO Initializing MetaDataSvc - package version AthenaServices-00-00-00
@@ -45,8 +45,8 @@ PoolSvc              INFO io_register[PoolSvc](xmlcatalog_file:PoolFileCatalog.x
 PoolSvc              INFO Set connectionsvc retry/timeout/IDLE timeout to  'ConnectionRetrialPeriod':300/ 'ConnectionRetrialTimeOut':3600/ 'ConnectionTimeOut':5 seconds with connection cleanup disabled
 PoolSvc              INFO Frontier compression level set to 5
 DBReplicaSvc         INFO Frontier server at (serverurl=http://atlasfrontier-local.cern.ch:8000/atlr)(serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://lcgft-atlas.gridpp.rl.ac.uk:3128/frontierATLAS)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://ca-proxy.cern.ch:3128)(proxyurl=http://ca-proxy-meyrin.cern.ch:3128)(proxyurl=http://ca-proxy-wigner.cern.ch:3128)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
-DBReplicaSvc         INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2018-12-15T2259/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/dbreplica.config
-DBReplicaSvc         INFO Total of 10 servers found for host lxplus073.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
+DBReplicaSvc         INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2352/Athena/22.0.1/InstallArea/x86_64-slc6-gcc8-opt/share/dbreplica.config
+DBReplicaSvc         INFO Total of 10 servers found for host lxplus063.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
 PoolSvc              INFO Successfully setup replica sorting algorithm
 PoolSvc              INFO Setting up APR FileCatalog and Streams
 PoolSvc           WARNING Unable to locate catalog for prfile:poolcond/PoolCat_oflcond.xml check your ATLAS_POOLCOND_PATH and DATAPATH variables
@@ -83,7 +83,7 @@ IOVDbSvc             INFO Added taginfo remove for /TILE/OFL02/STATUS/ADC
 IOVDbSvc             INFO Added taginfo remove for /TILE/OFL02/TIME/CHANNELOFFSET/PHY
 IOVDbSvc             INFO Added taginfo remove for /TILE/ONL01/STATUS/ADC
 IOVDbSvc             INFO Added taginfo remove for /LAR/LArCellPositionShift
-ClassIDSvc           INFO  getRegistryEntries: read 1919 CLIDRegistry entries for module ALL
+ClassIDSvc           INFO  getRegistryEntries: read 1876 CLIDRegistry entries for module ALL
 ClassIDSvc           INFO  getRegistryEntries: read 17 CLIDRegistry entries for module ALL
 DetDescrCnvSvc       INFO  initializing 
 DetDescrCnvSvc       INFO Found DetectorStore service
@@ -172,7 +172,7 @@ EndcapDMConstru...   INFO Start building EC electronics geometry
   multi-layered version of absorbers activated, mlabs == 1
 ================================================
 EndcapDMConstru...   INFO Start building EC electronics geometry
-GeoModelSvc          INFO GeoModelSvc.LArDetectorToolNV	 SZ= 28576Kb 	 Time = 1.51S
+GeoModelSvc          INFO GeoModelSvc.LArDetectorToolNV	 SZ= 23968Kb 	 Time = 0.6S
 GeoModelSvc.Til...   INFO  Entering TileDetectorTool::create()
 TileDddbManager      INFO m_tag = ATLAS-R2-2016-01-00-01
 TileDddbManager      INFO n_tiglob = 5
@@ -184,7 +184,7 @@ TileDddbManager      INFO n_tileSwitches = 1
 ClassIDSvc           INFO  getRegistryEntries: read 213 CLIDRegistry entries for module ALL
 CaloIDHelper_ID...   INFO in createObj: creating a TileID helper object in the detector store
 AtlasDetectorID      INFO initialize_from_dictionary - OK
-TileNeighbour        INFO Reading file  /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc62-dbg/x86_64-slc6-gcc62-dbg/share/TileNeighbour_reduced.txt
+TileNeighbour        INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2352/Athena/22.0.1/InstallArea/x86_64-slc6-gcc8-opt/share/TileNeighbour_reduced.txt
 TileHWIDDetDesc...   INFO in createObj: creating a TileHWID helper object in the detector store
 TileHWID             INFO initialize_from_dictionary 
 AtlasDetectorID      INFO initialize_from_dictionary - OK
@@ -196,9 +196,9 @@ CaloIDHelper_ID...   INFO in createObj: creating a LArHEC_ID helper object in th
 AtlasDetectorID      INFO initialize_from_dictionary - OK
 CaloIDHelper_ID...   INFO in createObj: creating a LArFCAL_ID helper object in the detector store
 AtlasDetectorID      INFO initialize_from_dictionary - OK
-LArFCAL_Base_ID      INFO Reading file /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc62-dbg/x86_64-slc6-gcc62-dbg/share/FCal2DNeighbors-April2011.txt
-LArFCAL_Base_ID      INFO Reading file /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc62-dbg/x86_64-slc6-gcc62-dbg/share/FCal3DNeighborsNext-April2011.txt
-LArFCAL_Base_ID      INFO Reading file /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc62-dbg/x86_64-slc6-gcc62-dbg/share/FCal3DNeighborsPrev-April2011.txt
+LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2352/Athena/22.0.1/InstallArea/x86_64-slc6-gcc8-opt/share/FCal2DNeighbors-April2011.txt
+LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2352/Athena/22.0.1/InstallArea/x86_64-slc6-gcc8-opt/share/FCal3DNeighborsNext-April2011.txt
+LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2352/Athena/22.0.1/InstallArea/x86_64-slc6-gcc8-opt/share/FCal3DNeighborsPrev-April2011.txt
 CaloIDHelper_ID...   INFO in createObj: creating a LArMiniFCAL_ID helper object in the detector store
 AtlasDetectorID      INFO initialize_from_dictionary - OK
 LArMiniFCAL_ID       INFO  initialize_from_dict - LArCalorimeter dictionary does NOT contain miniFCAL description. Unable to initialize LArMiniFCAL_ID.
@@ -229,11 +229,11 @@ GeoModelSvc.Til...   INFO                                    PLUG2  Rmin= 2981 R
 GeoModelSvc.Til...   INFO  Positioning negative ITC with translation -3405
 GeoModelSvc.Til...   INFO  Positioning negative Gap with translation -3552
 GeoModelSvc.Til...   INFO  Positioning negative Crack with translation -3536
-GeoModelSvc.Til...   INFO  Global positioning of barrel with rotation (0,0,0)) and translation (0,0,0) GeoModelKernelUnits::cm
-GeoModelSvc.Til...   INFO  Global positioning of positive ext.barrel with rotation (0,0,0)) and translation (0,0,0) GeoModelKernelUnits::cm
-GeoModelSvc.Til...   INFO  Global positioning of negative ext.barrel with rotation (0,0,0)) and translation (0,0,1) GeoModelKernelUnits::cm
+GeoModelSvc.Til...   INFO  Global positioning of barrel with rotation (0,0,0)) and translation (0,0,0) Gaudi::Units::cm
+GeoModelSvc.Til...   INFO  Global positioning of positive ext.barrel with rotation (0,0,0)) and translation (0,0,0) Gaudi::Units::cm
+GeoModelSvc.Til...   INFO  Global positioning of negative ext.barrel with rotation (0,0,0)) and translation (0,0,1) Gaudi::Units::cm
 TileDetDescrMan...   INFO Entering create_elements()
-GeoModelSvc          INFO GeoModelSvc.TileDetectorTool	 SZ= 5196Kb 	 Time = 1.68S
+GeoModelSvc          INFO GeoModelSvc.TileDetectorTool	 SZ= 3576Kb 	 Time = 0.23S
 ClassIDSvc           INFO  getRegistryEntries: read 65 CLIDRegistry entries for module ALL
 TileInfoLoader       INFO Initializing....TileInfoLoader
 TileInfoLoader       INFO New ATLAS geometry detected: ATLAS-R2-2016-01-00-01 (010001) version 10001
@@ -255,11 +255,11 @@ TileInfoLoader       INFO Sampling fraction for E2 cells 1/107
 TileInfoLoader       INFO Sampling fraction for E3 cells 1/97
 TileInfoLoader       INFO Sampling fraction for E4 cells 1/75
 TileInfoLoader       INFO Sampling fraction for E4' cells 1/75
-TileInfoLoader       INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2018-12-15T2259/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/pulsehi_physics.dat
-TileInfoLoader       INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2018-12-15T2259/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/pulselo_physics.dat
-TileInfoLoader       INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2018-12-15T2259/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/pulse_adder_tower_physics.dat
-TileInfoLoader       INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2018-12-15T2259/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/pulse_adder_muonRcv_physics.dat
-TileInfoLoader       INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2018-12-15T2259/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/pulse_adder_muon_physics.dat
+TileInfoLoader       INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2352/Athena/22.0.1/InstallArea/x86_64-slc6-gcc8-opt/share/pulsehi_physics.dat
+TileInfoLoader       INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2352/Athena/22.0.1/InstallArea/x86_64-slc6-gcc8-opt/share/pulselo_physics.dat
+TileInfoLoader       INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2352/Athena/22.0.1/InstallArea/x86_64-slc6-gcc8-opt/share/pulse_adder_tower_physics.dat
+TileInfoLoader       INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2352/Athena/22.0.1/InstallArea/x86_64-slc6-gcc8-opt/share/pulse_adder_muonRcv_physics.dat
+TileInfoLoader       INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2352/Athena/22.0.1/InstallArea/x86_64-slc6-gcc8-opt/share/pulse_adder_muon_physics.dat
 CaloIDHelper_ID...   INFO in createObj: creating a CaloLVL1_ID helper object in the detector store
 CaloLVL1_ID          INFO initialize_from_dictionary
 AtlasDetectorID      INFO initialize_from_dictionary - OK
@@ -314,7 +314,7 @@ TileSampleNoise...   INFO Creating TileCondProxyCool(TileSampleNoiseCondAlg.Tile
 TileTimingCondA...   INFO Creating TileCondProxyCool(TileTimingCondAlg.TileCondProxyCool_AdcOffset) for folder: "/TILE/OFL02/TIME/CHANNELOFFSET/PHY"
 PyComponentMgr       INFO Initializing PyComponentMgr...
 test1                INFO Initializing test1...
-ClassIDSvc           INFO  getRegistryEntries: read 5660 CLIDRegistry entries for module ALL
+ClassIDSvc           INFO  getRegistryEntries: read 5500 CLIDRegistry entries for module ALL
 HistogramPersis...WARNING Histograms saving not required.
 ApplicationMgr       INFO Application Manager Initialized successfully
 CondInputLoader      INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/TILE/OFL02/CALIB/CES'
@@ -356,12 +356,12 @@ CaloIDHelper_ID...   INFO in createObj: creating a LArHEC_SuperCell_ID helper ob
 AtlasDetectorID      INFO initialize_from_dictionary - OK
 CaloIDHelper_ID...   INFO in createObj: creating a LArFCAL_SuperCell_ID helper object in the detector store
 AtlasDetectorID      INFO initialize_from_dictionary - OK
-LArFCAL_Base_ID      INFO Reading file /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc62-dbg/x86_64-slc6-gcc62-dbg/share/FCalSuperCells2DNeighborsNew-April2014.txt
-LArFCAL_Base_ID      INFO Reading file /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc62-dbg/x86_64-slc6-gcc62-dbg/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
-LArFCAL_Base_ID      INFO Reading file /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc62-dbg/x86_64-slc6-gcc62-dbg/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
+LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2352/Athena/22.0.1/InstallArea/x86_64-slc6-gcc8-opt/share/FCalSuperCells2DNeighborsNew-April2014.txt
+LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2352/Athena/22.0.1/InstallArea/x86_64-slc6-gcc8-opt/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
+LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2352/Athena/22.0.1/InstallArea/x86_64-slc6-gcc8-opt/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
 CaloIDHelper_ID...   INFO in createObj: creating a Tile_SuperCell_ID helper object in the detector store
 AtlasDetectorID      INFO initialize_from_dictionary - OK
-TileNeighbour        INFO Reading file  /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-slc6-gcc62-dbg/x86_64-slc6-gcc62-dbg/share/TileSuperCellNeighbour.txt
+TileNeighbour        INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2352/Athena/22.0.1/InstallArea/x86_64-slc6-gcc8-opt/share/TileSuperCellNeighbour.txt
 AtlasDetectorID      INFO initialize_from_dictionary - OK
 CaloIdMgrDetDes...   INFO  Finished 
 CaloIdMgrDetDes...   INFO Initializing CaloIdMgr from values in CaloIdMgrDetDescrCnv 
@@ -391,8 +391,8 @@ TileBadChannels...   INFO TileBchStatus::isNoGainL1() is defined by: ADC dead; N
 TileBadChannels...   INFO TileBchStatus::isBadTiming() is defined by: Bad timing; Online bad timing; 
 TileBadChannels...   INFO No drawer trips probabilities found in DB
 *** Starting test1
-ClassIDSvc           INFO  getRegistryEntries: read 650 CLIDRegistry entries for module ALL
-ClassIDSvc           INFO  getRegistryEntries: read 154 CLIDRegistry entries for module ALL
+ClassIDSvc           INFO  getRegistryEntries: read 670 CLIDRegistry entries for module ALL
+ClassIDSvc           INFO  getRegistryEntries: read 177 CLIDRegistry entries for module ALL
 *** Starting test2
 *** Starting test3
 *** Starting test4
@@ -416,32 +416,32 @@ test1                INFO Finalizing test1...
 IncidentProcAlg2     INFO Finalize
 PyComponentMgr       INFO Finalizing PyComponentMgr...
 IdDictDetDescrCnv    INFO in finalize
-IOVDbFolder          INFO Folder /LAR/Align (PoolRef) db-read 1/1 objs/chan/bytes 1/1/170 ((     0.07 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/CES (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/103344 ((     0.07 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/CIS/FIT/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/80 ((     0.05 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/CIS/FIT/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/80 ((     0.04 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/EMS (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/92 ((     0.05 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/LAS/FIBER (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/940 ((     0.04 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/LAS/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/72 ((     0.05 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/LAS/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/76 ((     0.04 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/NOISE/SAMPLE (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/641476 ((     0.07 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/STATUS/ADC (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/97884 ((     0.05 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/TIME/CHANNELOFFSET/PHY (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/96 ((     0.05 ))s
-IOVDbFolder          INFO Folder /TILE/ONL01/STATUS/ADC (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/76 ((     0.02 ))s
-IOVDbFolder          INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 1/1 objs/chan/bytes 1/1/195 ((     0.02 ))s
-IOVDbSvc             INFO  bytes in ((      0.62 ))s
+IOVDbFolder          INFO Folder /LAR/Align (PoolRef) db-read 1/1 objs/chan/bytes 1/1/340 ((     4.29 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/CES (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/104132 ((     0.94 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/CIS/FIT/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/108 ((     0.78 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/CIS/FIT/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/108 ((     0.71 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/EMS (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/116 ((     1.31 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/LAS/FIBER (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/964 ((     0.76 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/LAS/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/96 ((     0.57 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/LAS/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/104 ((     0.60 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/NOISE/SAMPLE (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/643800 ((     0.84 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/STATUS/ADC (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/97908 ((     1.66 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/TIME/CHANNELOFFSET/PHY (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/120 ((     1.33 ))s
+IOVDbFolder          INFO Folder /TILE/ONL01/STATUS/ADC (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/100 ((     0.08 ))s
+IOVDbFolder          INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 1/1 objs/chan/bytes 1/1/390 ((     0.58 ))s
+IOVDbSvc             INFO  bytes in ((     14.44 ))s
 IOVDbSvc             INFO Connection sqlite://;schema=mycool.db;dbname=OFLP200 : nConnect: 0 nFolders: 0 ReadTime: ((     0.00 ))s
-IOVDbSvc             INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 2 nFolders: 2 ReadTime: ((     0.09 ))s
-IOVDbSvc             INFO Connection COOLOFL_TILE/OFLP200 : nConnect: 2 nFolders: 11 ReadTime: ((     0.53 ))s
+IOVDbSvc             INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 2 nFolders: 2 ReadTime: ((     4.87 ))s
+IOVDbSvc             INFO Connection COOLOFL_TILE/OFLP200 : nConnect: 2 nFolders: 11 ReadTime: ((     9.58 ))s
 TileInfoLoader       INFO TileInfoLoader::finalize()
 AthDictLoaderSvc     INFO in finalize...
 ToolSvc              INFO Removing all tools created by ToolSvc
 *****Chrono*****     INFO ****************************************************************************************************
 *****Chrono*****     INFO  The Final CPU consumption ( Chrono ) Table (ordered)
 *****Chrono*****     INFO ****************************************************************************************************
-cObjR_ALL            INFO Time User   : Tot= 0.66  [s] Ave/Min/Max= 0.33(+- 0.31)/ 0.02/ 0.64  [s] #=  2
-cObj_ALL             INFO Time User   : Tot= 0.92  [s] Ave/Min/Max=0.0708(+-0.198)/    0/ 0.74  [s] #= 13
-ChronoStatSvc        INFO Time User   : Tot= 69.1  [s]                                             #=  1
+cObjR_ALL            INFO Time User   : Tot=  460 [ms] Ave/Min/Max=  230(+-  230)/    0/  460 [ms] #=  2
+cObj_ALL             INFO Time User   : Tot= 0.56  [s] Ave/Min/Max=0.0431(+- 0.13)/    0/ 0.49  [s] #= 13
+ChronoStatSvc        INFO Time User   : Tot= 40.9  [s]                                             #=  1
 *****Chrono*****     INFO ****************************************************************************************************
 ChronoStatSvc.f...   INFO  Service finalized successfully 
 ApplicationMgr       INFO Application Manager Finalized successfully
diff --git a/TileCalorimeter/TileRecUtils/share/TileRawChannelBuilder_test.ref b/TileCalorimeter/TileRecUtils/share/TileRawChannelBuilder_test.ref
index 43a1b469be9d552aa346e861a50df2fdc0da933c..2e03a591379fe29e499ea0f6424ed885d208030a 100644
--- a/TileCalorimeter/TileRecUtils/share/TileRawChannelBuilder_test.ref
+++ b/TileCalorimeter/TileRecUtils/share/TileRawChannelBuilder_test.ref
@@ -1,14 +1,14 @@
-Thu Jan  3 16:25:19 CET 2019
+Sat Jan 26 19:47:02 CET 2019
 Preloading tcmalloc_minimal.so
 Py:Athena            INFO including file "AthenaCommon/Preparation.py"
-Py:Athena            INFO using release [WorkDir-22.0.1] [x86_64-slc6-gcc62-opt] [atlas-work3g/be87ec46e65] -- built on [2019-01-03T1609]
+Py:Athena            INFO using release [WorkDir-22.0.1] [x86_64-slc6-gcc8-opt] [atlas-work3/5e0c78d866] -- built on [2019-01-26T1705]
 Py:Athena            INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
 Py:Athena            INFO executing ROOT6Setup
 Py:Athena            INFO including file "AthenaCommon/Execution.py"
 Py:Athena            INFO including file "TileRecUtils/TileRawChannelBuilder_test.py"
 [?1034hSetGeometryVersion.py obtained major release version 22
 Py:Athena            INFO including file "IdDictDetDescrCnv/IdDictDetDescrCnv_joboptions.py"
-Py:ConfigurableDb    INFO Read module info for 5435 configurables from 6 genConfDb files
+Py:ConfigurableDb    INFO Read module info for 5455 configurables from 76 genConfDb files
 Py:ConfigurableDb    INFO No duplicates have been found: that's good !
 EventInfoMgtInit: Got release version  Athena-22.0.1
 Py:IOVDbSvc.CondDB    INFO Setting up conditions DB access to instance OFLP200
@@ -28,7 +28,7 @@ ApplicationMgr       INFO Updating Gaudi::PluginService::SetDebug(level) to leve
 ApplicationMgr    SUCCESS 
 ====================================================================================================================================
                                                    Welcome to ApplicationMgr (GaudiCoreSvc v30r5)
-                                          running on lxplus064.cern.ch on Thu Jan  3 16:25:37 2019
+                                          running on lxplus063.cern.ch on Sat Jan 26 19:47:29 2019
 ====================================================================================================================================
 ApplicationMgr       INFO Successfully loaded modules : AthenaServices
 ApplicationMgr       INFO Application Manager Configured successfully
@@ -36,7 +36,7 @@ ApplicationMgr       INFO Updating Gaudi::PluginService::SetDebug(level) to leve
 StatusCodeSvc        INFO initialize
 AthDictLoaderSvc     INFO in initialize...
 AthDictLoaderSvc     INFO acquired Dso-registry
-ClassIDSvc           INFO  getRegistryEntries: read 6912 CLIDRegistry entries for module ALL
+ClassIDSvc           INFO  getRegistryEntries: read 6914 CLIDRegistry entries for module ALL
 CoreDumpSvc          INFO install f-a-t-a-l handler... (flag = -1)
 CoreDumpSvc          INFO Handling signals: 11(Segmentation fault) 7(Bus error) 4(Illegal instruction) 8(Floating point exception) 
 MetaDataSvc          INFO Initializing MetaDataSvc - package version AthenaServices-00-00-00
@@ -45,8 +45,8 @@ PoolSvc              INFO io_register[PoolSvc](xmlcatalog_file:PoolFileCatalog.x
 PoolSvc              INFO Set connectionsvc retry/timeout/IDLE timeout to  'ConnectionRetrialPeriod':300/ 'ConnectionRetrialTimeOut':3600/ 'ConnectionTimeOut':5 seconds with connection cleanup disabled
 PoolSvc              INFO Frontier compression level set to 5
 DBReplicaSvc         INFO Frontier server at (serverurl=http://atlasfrontier-local.cern.ch:8000/atlr)(serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://lcgft-atlas.gridpp.rl.ac.uk:3128/frontierATLAS)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://ca-proxy.cern.ch:3128)(proxyurl=http://ca-proxy-meyrin.cern.ch:3128)(proxyurl=http://ca-proxy-wigner.cern.ch:3128)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
-DBReplicaSvc         INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-02T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/dbreplica.config
-DBReplicaSvc         INFO Total of 10 servers found for host lxplus064.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
+DBReplicaSvc         INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2352/Athena/22.0.1/InstallArea/x86_64-slc6-gcc8-opt/share/dbreplica.config
+DBReplicaSvc         INFO Total of 10 servers found for host lxplus063.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
 PoolSvc              INFO Successfully setup replica sorting algorithm
 PoolSvc              INFO Setting up APR FileCatalog and Streams
 PoolSvc           WARNING Unable to locate catalog for prfile:poolcond/PoolCat_oflcond.xml check your ATLAS_POOLCOND_PATH and DATAPATH variables
@@ -83,7 +83,7 @@ IOVDbSvc             INFO Added taginfo remove for /TILE/OFL02/STATUS/ADC
 IOVDbSvc             INFO Added taginfo remove for /TILE/OFL02/TIME/CHANNELOFFSET/PHY
 IOVDbSvc             INFO Added taginfo remove for /TILE/ONL01/STATUS/ADC
 IOVDbSvc             INFO Added taginfo remove for /LAR/LArCellPositionShift
-ClassIDSvc           INFO  getRegistryEntries: read 1871 CLIDRegistry entries for module ALL
+ClassIDSvc           INFO  getRegistryEntries: read 1876 CLIDRegistry entries for module ALL
 ClassIDSvc           INFO  getRegistryEntries: read 17 CLIDRegistry entries for module ALL
 DetDescrCnvSvc       INFO  initializing 
 DetDescrCnvSvc       INFO Found DetectorStore service
@@ -172,7 +172,7 @@ EndcapDMConstru...   INFO Start building EC electronics geometry
   multi-layered version of absorbers activated, mlabs == 1
 ================================================
 EndcapDMConstru...   INFO Start building EC electronics geometry
-GeoModelSvc          INFO GeoModelSvc.LArDetectorToolNV	 SZ= 22940Kb 	 Time = 0.66S
+GeoModelSvc          INFO GeoModelSvc.LArDetectorToolNV	 SZ= 22944Kb 	 Time = 0.55S
 GeoModelSvc.Til...   INFO  Entering TileDetectorTool::create()
 TileDddbManager      INFO m_tag = ATLAS-R2-2016-01-00-01
 TileDddbManager      INFO n_tiglob = 5
@@ -184,7 +184,7 @@ TileDddbManager      INFO n_tileSwitches = 1
 ClassIDSvc           INFO  getRegistryEntries: read 213 CLIDRegistry entries for module ALL
 CaloIDHelper_ID...   INFO in createObj: creating a TileID helper object in the detector store
 AtlasDetectorID      INFO initialize_from_dictionary - OK
-TileNeighbour        INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-02T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/TileNeighbour_reduced.txt
+TileNeighbour        INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2352/Athena/22.0.1/InstallArea/x86_64-slc6-gcc8-opt/share/TileNeighbour_reduced.txt
 TileHWIDDetDesc...   INFO in createObj: creating a TileHWID helper object in the detector store
 TileHWID             INFO initialize_from_dictionary 
 AtlasDetectorID      INFO initialize_from_dictionary - OK
@@ -196,9 +196,9 @@ CaloIDHelper_ID...   INFO in createObj: creating a LArHEC_ID helper object in th
 AtlasDetectorID      INFO initialize_from_dictionary - OK
 CaloIDHelper_ID...   INFO in createObj: creating a LArFCAL_ID helper object in the detector store
 AtlasDetectorID      INFO initialize_from_dictionary - OK
-LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-02T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/FCal2DNeighbors-April2011.txt
-LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-02T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/FCal3DNeighborsNext-April2011.txt
-LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-02T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/FCal3DNeighborsPrev-April2011.txt
+LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2352/Athena/22.0.1/InstallArea/x86_64-slc6-gcc8-opt/share/FCal2DNeighbors-April2011.txt
+LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2352/Athena/22.0.1/InstallArea/x86_64-slc6-gcc8-opt/share/FCal3DNeighborsNext-April2011.txt
+LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2352/Athena/22.0.1/InstallArea/x86_64-slc6-gcc8-opt/share/FCal3DNeighborsPrev-April2011.txt
 CaloIDHelper_ID...   INFO in createObj: creating a LArMiniFCAL_ID helper object in the detector store
 AtlasDetectorID      INFO initialize_from_dictionary - OK
 LArMiniFCAL_ID       INFO  initialize_from_dict - LArCalorimeter dictionary does NOT contain miniFCAL description. Unable to initialize LArMiniFCAL_ID.
@@ -229,11 +229,11 @@ GeoModelSvc.Til...   INFO                                    PLUG2  Rmin= 2981 R
 GeoModelSvc.Til...   INFO  Positioning negative ITC with translation -3405
 GeoModelSvc.Til...   INFO  Positioning negative Gap with translation -3552
 GeoModelSvc.Til...   INFO  Positioning negative Crack with translation -3536
-GeoModelSvc.Til...   INFO  Global positioning of barrel with rotation (0,0,0)) and translation (0,0,0) GeoModelKernelUnits::cm
-GeoModelSvc.Til...   INFO  Global positioning of positive ext.barrel with rotation (0,0,0)) and translation (0,0,0) GeoModelKernelUnits::cm
-GeoModelSvc.Til...   INFO  Global positioning of negative ext.barrel with rotation (0,0,0)) and translation (0,0,1) GeoModelKernelUnits::cm
+GeoModelSvc.Til...   INFO  Global positioning of barrel with rotation (0,0,0)) and translation (0,0,0) Gaudi::Units::cm
+GeoModelSvc.Til...   INFO  Global positioning of positive ext.barrel with rotation (0,0,0)) and translation (0,0,0) Gaudi::Units::cm
+GeoModelSvc.Til...   INFO  Global positioning of negative ext.barrel with rotation (0,0,0)) and translation (0,0,1) Gaudi::Units::cm
 TileDetDescrMan...   INFO Entering create_elements()
-GeoModelSvc          INFO GeoModelSvc.TileDetectorTool	 SZ= 3568Kb 	 Time = 0.2S
+GeoModelSvc          INFO GeoModelSvc.TileDetectorTool	 SZ= 3576Kb 	 Time = 0.22S
 ClassIDSvc           INFO  getRegistryEntries: read 65 CLIDRegistry entries for module ALL
 TileInfoLoader       INFO Initializing....TileInfoLoader
 TileInfoLoader       INFO New ATLAS geometry detected: ATLAS-R2-2016-01-00-01 (010001) version 10001
@@ -255,11 +255,11 @@ TileInfoLoader       INFO Sampling fraction for E2 cells 1/107
 TileInfoLoader       INFO Sampling fraction for E3 cells 1/97
 TileInfoLoader       INFO Sampling fraction for E4 cells 1/75
 TileInfoLoader       INFO Sampling fraction for E4' cells 1/75
-TileInfoLoader       INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-02T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/pulsehi_physics.dat
-TileInfoLoader       INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-02T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/pulselo_physics.dat
-TileInfoLoader       INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-02T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/pulse_adder_tower_physics.dat
-TileInfoLoader       INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-02T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/pulse_adder_muonRcv_physics.dat
-TileInfoLoader       INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-02T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/pulse_adder_muon_physics.dat
+TileInfoLoader       INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2352/Athena/22.0.1/InstallArea/x86_64-slc6-gcc8-opt/share/pulsehi_physics.dat
+TileInfoLoader       INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2352/Athena/22.0.1/InstallArea/x86_64-slc6-gcc8-opt/share/pulselo_physics.dat
+TileInfoLoader       INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2352/Athena/22.0.1/InstallArea/x86_64-slc6-gcc8-opt/share/pulse_adder_tower_physics.dat
+TileInfoLoader       INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2352/Athena/22.0.1/InstallArea/x86_64-slc6-gcc8-opt/share/pulse_adder_muonRcv_physics.dat
+TileInfoLoader       INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2352/Athena/22.0.1/InstallArea/x86_64-slc6-gcc8-opt/share/pulse_adder_muon_physics.dat
 CaloIDHelper_ID...   INFO in createObj: creating a CaloLVL1_ID helper object in the detector store
 CaloLVL1_ID          INFO initialize_from_dictionary
 AtlasDetectorID      INFO initialize_from_dictionary - OK
@@ -313,7 +313,7 @@ TileEMScaleCond...   INFO Creating TileCondProxyCool(TileEMScaleCondAlg.TileCond
 TileSampleNoise...   INFO Creating TileCondProxyCool(TileSampleNoiseCondAlg.TileCondProxyCool_NoiseSample) for folder: "/TILE/OFL02/NOISE/SAMPLE"
 TileTimingCondA...   INFO Creating TileCondProxyCool(TileTimingCondAlg.TileCondProxyCool_AdcOffset) for folder: "/TILE/OFL02/TIME/CHANNELOFFSET/PHY"
 ClassIDSvc           INFO  getRegistryEntries: read 504 CLIDRegistry entries for module ALL
-ClassIDSvc           INFO  getRegistryEntries: read 4846 CLIDRegistry entries for module ALL
+ClassIDSvc           INFO  getRegistryEntries: read 4754 CLIDRegistry entries for module ALL
 xAODMaker::Even...   INFO Initializing - Package version: xAODEventInfoCnv-00-00-00
 xAODMaker::Even...   INFO Initializing - Package version: xAODEventInfoCnv-00-00-00
 xAODMaker::Even...WARNING Beam conditions service not available
@@ -323,7 +323,7 @@ xAODMaker::Even...   INFO Will take information from the EventInfo object
 PyComponentMgr       INFO Initializing PyComponentMgr...
 prepalg1             INFO Initializing prepalg1...
 testalg1             INFO Initializing testalg1...
-ClassIDSvc           INFO  getRegistryEntries: read 532 CLIDRegistry entries for module ALL
+ClassIDSvc           INFO  getRegistryEntries: read 478 CLIDRegistry entries for module ALL
 ToolSvc.tool1        INFO TileRawChannelBuilder::initialize()
 ToolSvc.tool2        INFO TileRawChannelBuilder::initialize()
 ToolSvc.tool2.n...   INFO Initializing...
@@ -368,12 +368,12 @@ CaloIDHelper_ID...   INFO in createObj: creating a LArHEC_SuperCell_ID helper ob
 AtlasDetectorID      INFO initialize_from_dictionary - OK
 CaloIDHelper_ID...   INFO in createObj: creating a LArFCAL_SuperCell_ID helper object in the detector store
 AtlasDetectorID      INFO initialize_from_dictionary - OK
-LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-02T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/FCalSuperCells2DNeighborsNew-April2014.txt
-LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-02T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
-LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-02T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
+LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2352/Athena/22.0.1/InstallArea/x86_64-slc6-gcc8-opt/share/FCalSuperCells2DNeighborsNew-April2014.txt
+LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2352/Athena/22.0.1/InstallArea/x86_64-slc6-gcc8-opt/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
+LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2352/Athena/22.0.1/InstallArea/x86_64-slc6-gcc8-opt/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
 CaloIDHelper_ID...   INFO in createObj: creating a Tile_SuperCell_ID helper object in the detector store
 AtlasDetectorID      INFO initialize_from_dictionary - OK
-TileNeighbour        INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-02T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/TileSuperCellNeighbour.txt
+TileNeighbour        INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2352/Athena/22.0.1/InstallArea/x86_64-slc6-gcc8-opt/share/TileSuperCellNeighbour.txt
 AtlasDetectorID      INFO initialize_from_dictionary - OK
 CaloIdMgrDetDes...   INFO  Finished 
 CaloIdMgrDetDes...   INFO Initializing CaloIdMgr from values in CaloIdMgrDetDescrCnv 
@@ -403,8 +403,8 @@ TileBadChannels...   INFO TileBchStatus::isNoisy() is defined by: Large HF noise
 TileBadChannels...   INFO TileBchStatus::isNoGainL1() is defined by: ADC dead; No PMT connected; No HV; Channel masked for LV1 (unspecified); LV1 channel no gain; LV1 channel noisy; Channel disabled for LV1; 
 TileBadChannels...   INFO TileBchStatus::isBadTiming() is defined by: Bad timing; Online bad timing; 
 TileBadChannels...   INFO No drawer trips probabilities found in DB
-ClassIDSvc           INFO  getRegistryEntries: read 650 CLIDRegistry entries for module ALL
-ClassIDSvc           INFO  getRegistryEntries: read 154 CLIDRegistry entries for module ALL
+ClassIDSvc           INFO  getRegistryEntries: read 670 CLIDRegistry entries for module ALL
+ClassIDSvc           INFO  getRegistryEntries: read 177 CLIDRegistry entries for module ALL
 AthenaEventLoopMgr   INFO   ===>>>  done processing event #1, run #1 1 events processed so far  <<<===
 AthenaEventLoopMgr   INFO   ===>>>  start processing event #2, run #1 1 events processed so far  <<<===
 AthenaEventLoopMgr   INFO   ===>>>  done processing event #2, run #1 2 events processed so far  <<<===
@@ -427,23 +427,23 @@ testalg1             INFO Finalizing testalg1...
 IncidentProcAlg2     INFO Finalize
 PyComponentMgr       INFO Finalizing PyComponentMgr...
 IdDictDetDescrCnv    INFO in finalize
-IOVDbFolder          INFO Folder /LAR/Align (PoolRef) db-read 1/1 objs/chan/bytes 1/1/170 ((     0.04 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/CES (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/103344 ((     0.03 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/CIS/FIT/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/80 ((     0.02 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/CIS/FIT/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/80 ((     0.03 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/EMS (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/92 ((     0.02 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/LAS/FIBER (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/940 ((     0.02 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/LAS/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/72 ((     0.03 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/LAS/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/76 ((     0.02 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/NOISE/SAMPLE (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/641476 ((     0.13 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/STATUS/ADC (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/97884 ((     0.79 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/TIME/CHANNELOFFSET/PHY (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/96 ((     0.88 ))s
-IOVDbFolder          INFO Folder /TILE/ONL01/STATUS/ADC (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/76 ((     0.06 ))s
-IOVDbFolder          INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 1/1 objs/chan/bytes 1/1/195 ((     0.02 ))s
-IOVDbSvc             INFO  bytes in ((      2.10 ))s
+IOVDbFolder          INFO Folder /LAR/Align (PoolRef) db-read 1/1 objs/chan/bytes 1/1/340 ((     2.86 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/CES (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/104132 ((     2.12 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/CIS/FIT/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/108 ((     0.88 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/CIS/FIT/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/108 ((     0.79 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/EMS (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/116 ((     0.69 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/LAS/FIBER (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/964 ((     0.69 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/LAS/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/96 ((     0.80 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/LAS/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/104 ((     6.88 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/NOISE/SAMPLE (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/643800 ((     0.83 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/STATUS/ADC (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/97908 ((     0.02 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/TIME/CHANNELOFFSET/PHY (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/120 ((     0.02 ))s
+IOVDbFolder          INFO Folder /TILE/ONL01/STATUS/ADC (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/100 ((     0.00 ))s
+IOVDbFolder          INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 1/1 objs/chan/bytes 1/1/390 ((     0.53 ))s
+IOVDbSvc             INFO  bytes in ((     17.12 ))s
 IOVDbSvc             INFO Connection sqlite://;schema=mycool.db;dbname=OFLP200 : nConnect: 0 nFolders: 0 ReadTime: ((     0.00 ))s
-IOVDbSvc             INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 2 nFolders: 2 ReadTime: ((     0.07 ))s
-IOVDbSvc             INFO Connection COOLOFL_TILE/OFLP200 : nConnect: 2 nFolders: 11 ReadTime: ((     2.03 ))s
+IOVDbSvc             INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 2 nFolders: 2 ReadTime: ((     3.38 ))s
+IOVDbSvc             INFO Connection COOLOFL_TILE/OFLP200 : nConnect: 2 nFolders: 11 ReadTime: ((    13.74 ))s
 TileInfoLoader       INFO TileInfoLoader::finalize()
 AthDictLoaderSvc     INFO in finalize...
 ToolSvc              INFO Removing all tools created by ToolSvc
@@ -452,9 +452,9 @@ ToolSvc.tool1        INFO Finalizing
 *****Chrono*****     INFO ****************************************************************************************************
 *****Chrono*****     INFO  The Final CPU consumption ( Chrono ) Table (ordered)
 *****Chrono*****     INFO ****************************************************************************************************
-cObjR_ALL            INFO Time User   : Tot=  430 [ms] Ave/Min/Max=  215(+-  205)/   10/  420 [ms] #=  2
-cObj_ALL             INFO Time User   : Tot= 0.55  [s] Ave/Min/Max=0.0423(+-0.123)/    0/ 0.46  [s] #= 13
-ChronoStatSvc        INFO Time User   : Tot= 46.1  [s]                                             #=  1
+cObjR_ALL            INFO Time User   : Tot=  490 [ms] Ave/Min/Max=  245(+-  235)/   10/  480 [ms] #=  2
+cObj_ALL             INFO Time User   : Tot=  0.6  [s] Ave/Min/Max=0.0462(+-0.138)/    0/ 0.52  [s] #= 13
+ChronoStatSvc        INFO Time User   : Tot= 38.3  [s]                                             #=  1
 *****Chrono*****     INFO ****************************************************************************************************
 ChronoStatSvc.f...   INFO  Service finalized successfully 
 ApplicationMgr       INFO Application Manager Finalized successfully
diff --git a/TileCalorimeter/TileRecUtils/src/TileCellBuilder.cxx b/TileCalorimeter/TileRecUtils/src/TileCellBuilder.cxx
index ce788cf8b64d2344ec6334e60686c59c3010485e..ee8d28b9e08bb5d379cf0fea97ec85c639639cd6 100644
--- a/TileCalorimeter/TileRecUtils/src/TileCellBuilder.cxx
+++ b/TileCalorimeter/TileRecUtils/src/TileCellBuilder.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 /*
  */
@@ -48,7 +48,7 @@ const InterfaceID& TileCellBuilder::interfaceID( ) {
 //Constructor
 TileCellBuilder::TileCellBuilder(const std::string& type, const std::string& name,
     const IInterface* parent)
-  : AthAlgTool(type, name, parent)
+  : base_class(type, name, parent)
   , m_eneForTimeCut(35. * MeV) // keep time only for cells above 70 MeV (more than 35 MeV in at least one PMT to be precise)
   , m_eneForTimeCutMBTS(0.03675) // the same cut for MBTS, but in pC, corresponds to 3 ADC counts or 35 MeV
   , m_qualityCut(254) // cut on overflow in quality (if quality is 255 - assume that channel is bad)
@@ -66,22 +66,16 @@ TileCellBuilder::TileCellBuilder(const std::string& type, const std::string& nam
   , m_tileTBID(0)
   , m_tileHWID(0)
   , m_cabling(0)
-  , m_DQstatus(0)
   , m_tileDCS("TileDCSTool")
   , m_tileMgr(0)
   , m_mbtsMgr(0)
-  , m_RChType(TileFragHash::Default)
-  , m_RChUnit(TileRawChannelUnit::ADCcounts)
-  , m_maxTimeCorr(75.0)
   , m_notUpgradeCabling(true)
   , m_run2(false)
 {
-  declareInterface<ICaloCellMakerTool>( this );
   declareInterface<TileCellBuilder>( this );
 
-  memset(m_drawerEvtStatus, 0, sizeof(m_drawerEvtStatus));
-  memset(m_drawerRunStatus, 0, sizeof(m_drawerRunStatus));
-  memset(m_eventErrorCounter, 0, sizeof(m_eventErrorCounter));
+  //memset(m_drawerRunStatus, 0, sizeof(m_drawerRunStatus));
+  //memset(m_eventErrorCounter, 0, sizeof(m_eventErrorCounter));
 
   // never set energy to zero, but set it to some small number
   // this will help TopoCluster to assign proper weight to the cell if needed
@@ -231,6 +225,7 @@ StatusCode TileCellBuilder::initialize() {
   }
 
   ATH_CHECK( m_dspRawChannelContainerKey.initialize(m_mergeChannels) );
+  ATH_CHECK( m_eventInfoKey.initialize() );
 
   ATH_MSG_INFO( "TileCellBuilder initialization completed" );
 
@@ -262,29 +257,10 @@ void TileCellBuilder::reset(bool /* fullSizeCont */, bool printReset) {
   
   // prepare empty vector for all cell pointers
   m_fullSizeCont = true;
-  m_allCells.resize(m_tileID->cell_hash_max(), 0);
   
-  m_MBTSCells = NULL;
-  m_E4prCells = NULL;
-
-  ATH_MSG_INFO( "size of temp vector set to " << m_allCells.size() );
   ATH_MSG_INFO( "taking RawChannels from '" << m_rawChannelContainerKey.key() << "'" );
 }
 
-void TileCellBuilder::set_type_and_unit(TileFragHash::TYPE type
-    , TileRawChannelUnit::UNIT unit) {
-
-  // this method might be called from TileROD_Decoder
-  // otherwise it's not needed - type and unit are available from 
-  // TileRawChannelContainer itself (see TileCellBuilder::process() below)
-
-  m_RChType = type;
-  m_RChUnit = unit;
-
-  ATH_MSG_INFO( "type of container is '" << m_RChType << "'" );
-  ATH_MSG_INFO( "RawChannel unit [0=ADC, 1=pCb, 2=CspCb, 3=MeV] are '" << m_RChUnit << "'" );
-}
-
 StatusCode TileCellBuilder::finalize() {
 
   ATH_MSG_INFO( "Finalizing" );
@@ -299,9 +275,9 @@ StatusCode TileCellBuilder::process(CaloCellContainer * theCellContainer) {
   //* Get TileRawChannels
   //**
 
-  memset(m_drawerEvtStatus, 0, sizeof(m_drawerEvtStatus));
+  TileDrawerEvtStatusArray drawerEvtStatus;
 
-  SG::ReadHandle<TileRawChannelContainer> rawChannelContainer(m_rawChannelContainerKey);
+  SG::ReadHandle<TileRawChannelContainer> rawChannelContainer(m_rawChannelContainerKey, ctx);
 
   if (!rawChannelContainer.isValid()) {
     ATH_MSG_WARNING( " Could not find container " << m_rawChannelContainerKey.key() );
@@ -311,45 +287,52 @@ StatusCode TileCellBuilder::process(CaloCellContainer * theCellContainer) {
     
     ATH_MSG_DEBUG( "Container " << m_rawChannelContainerKey.key() << " with TileRawChannels found ");
 
-    m_RChType = rawChannelContainer->get_type();
-    m_RChUnit = rawChannelContainer->get_unit();
+
+    VecParams params;
+    params.m_RChType = rawChannelContainer->get_type();
+    params.m_RChUnit = rawChannelContainer->get_unit();
+    params.m_correctAmplitude = m_correctAmplitude;
+    params.m_correctTime = m_correctTime;
+    params.m_of2 = m_of2;
     unsigned int bsflags = rawChannelContainer->get_bsflags();
-    if (m_correctAmplitude || m_correctTime) {
+    if (params.m_correctAmplitude || params.m_correctTime) {
       int DataType = (bsflags & 0x30000000) >> 28;
       if (DataType < 3) { // real data
         bool of2 = ((bsflags & 0x4000000) != 0);
-        if (of2 != m_of2) {
-          m_of2 = of2;
-          ATH_MSG_WARNING( "OF2 flag in data is " << ((m_of2)?"True":"False"));
+        if (of2 != params.m_of2) {
+          params.m_of2 = of2;
+          ATH_MSG_WARNING( "OF2 flag in data is " << ((params.m_of2)?"True":"False"));
         }
-        m_maxTimeCorr = 63.9375; // 64-1/16 ns is hard limit in DSP
-        if (m_correctAmplitude && ((bsflags & 0x3000000) != 0)) {
+        params.m_maxTimeCorr = 63.9375; // 64-1/16 ns is hard limit in DSP
+        if (params.m_correctAmplitude && ((bsflags & 0x3000000) != 0)) {
           ATH_MSG_WARNING( "Using results of Opt filter with interations from DSP, disabling amplitude correction" );
-          m_correctAmplitude = false;
+          params.m_correctAmplitude = false;
         }
-        if (m_correctTime && ((bsflags & 0x3000000) == 0)) {
+        if (params.m_correctTime && ((bsflags & 0x3000000) == 0)) {
           ATH_MSG_WARNING( "Using results of Opt filter without interations from DSP, disabling time correction" );
-          m_correctTime = false;
+          params.m_correctTime = false;
         }
       } else {
-        m_maxTimeCorr = ((bsflags >> 27) & 1) ? 100.0 : 75.0; // 100 or 75 ns is the limit for 9 or 7 samples
-        if (m_correctAmplitude && ((bsflags & 0x6000) != 0)) {
+        params.m_maxTimeCorr = ((bsflags >> 27) & 1) ? 100.0 : 75.0; // 100 or 75 ns is the limit for 9 or 7 samples
+        if (params.m_correctAmplitude && ((bsflags & 0x6000) != 0)) {
           ATH_MSG_WARNING( "Amplitude correction was done already in optimal filter, disabling it here" );
-          m_correctAmplitude = false;
+          params.m_correctAmplitude = false;
         }
-        if (m_correctTime && ((bsflags & 0x9000) != 0)) {
+        if (params.m_correctTime && ((bsflags & 0x9000) != 0)) {
           ATH_MSG_WARNING( "Time correction was done already in optimal filter or best phase is used, disabling it here" );
-          m_correctTime = false;
+          params.m_correctTime = false;
         }
       }
     }
 
+    std::unique_ptr<TileCellContainer> MBTSCells;
     if (!m_MBTSContainerKey.key().empty()) {
-      m_MBTSCells = std::make_unique<TileCellContainer>(SG::VIEW_ELEMENTS);
+      MBTSCells = std::make_unique<TileCellContainer>(SG::VIEW_ELEMENTS);
     }
 
+    std::unique_ptr<TileCellContainer> E4prCells;
     if (!m_E4prContainerKey.key().empty()) {
-      m_E4prCells = std::make_unique<TileCellContainer>(SG::VIEW_ELEMENTS);
+      E4prCells = std::make_unique<TileCellContainer>(SG::VIEW_ELEMENTS);
     }
 
     SelectAllObject<TileRawChannelContainer> selAll(rawChannelContainer.cptr());
@@ -363,7 +346,7 @@ StatusCode TileCellBuilder::process(CaloCellContainer * theCellContainer) {
       ATH_MSG_DEBUG( "Merging " << m_rawChannelContainerKey.key()
                      << " and " << m_dspRawChannelContainerKey.key() );
 
-      SG::ReadHandle<TileRawChannelContainer> dspRawChannelContainer(m_dspRawChannelContainerKey);
+      SG::ReadHandle<TileRawChannelContainer> dspRawChannelContainer(m_dspRawChannelContainerKey, ctx);
 
       if (!dspRawChannelContainer.isValid()) {
         // no DSP channels, build cells from primary container
@@ -392,11 +375,11 @@ StatusCode TileCellBuilder::process(CaloCellContainer * theCellContainer) {
         TileRawChannelUnit::UNIT dspUnit = dspContainer->get_unit();
         unsigned int dspFlags = dspContainer->get_bsflags();
         int DataType = (dspFlags & 0x30000000) >> 28;
-        float dspTimeCut = m_maxTimeCorr;
+        float dspTimeCut = params.m_maxTimeCorr;
         bool dspCorrectAmplitude = false, dspCorrectTime = false, dspOf2 = true;
         if (DataType < 3) { // real data
           dspOf2 = ((dspFlags & 0x4000000) != 0);
-          if (dspOf2 != m_of2) ATH_MSG_DEBUG( "OF2 flag in DSPcontainer is " << ((dspOf2)?"True":"False"));
+          if (dspOf2 != params.m_of2) ATH_MSG_DEBUG( "OF2 flag in DSPcontainer is " << ((dspOf2)?"True":"False"));
           dspTimeCut = 63.9375; // 64-1/16 ns is hard limit in DSP
           dspCorrectAmplitude = ((dspFlags & 0x3000000) == 0);
           dspCorrectTime = ((dspFlags & 0x3000000) != 0);
@@ -463,19 +446,31 @@ StatusCode TileCellBuilder::process(CaloCellContainer * theCellContainer) {
           dspVec.push_back(*dspItr);
         }
 
+        VecParams params1 = params;
+        VecParams params2;
+        params2.m_RChType = dspType;
+        params2.m_RChUnit = dspUnit;
+        params2.m_maxTimeCorr = dspTimeCut;
+        params2.m_correctAmplitude = dspCorrectAmplitude;
+        params2.m_correctTime = dspCorrectTime;
+        params2.m_of2 = dspOf2;
+
         // build here with special iterator over 2 vectors
         DoubleVectorIterator<std::vector<const TileRawChannel *>, const TileRawChannel *> vecBeg(
-            &oflVec, m_RChType, m_RChUnit, m_maxTimeCorr, m_correctAmplitude, m_correctTime, m_of2,
-            &dspVec, dspType, dspUnit, dspTimeCut, dspCorrectAmplitude, dspCorrectTime, dspOf2, this, 0);
+            params,
+            &oflVec, params1,
+            &dspVec, params2, 0);
         DoubleVectorIterator<std::vector<const TileRawChannel *>, const TileRawChannel *> vecEnd(
-            &oflVec, m_RChType, m_RChUnit, m_maxTimeCorr, m_correctAmplitude, m_correctTime, m_of2,
-            &dspVec, dspType, dspUnit, dspTimeCut, dspCorrectAmplitude, dspCorrectTime, dspOf2, this, 2);
+            params,
+            &oflVec, params1,
+            &dspVec, params2, 2);
 
         ATH_MSG_DEBUG("Build raw channels from two vectors:"
                       << " offline vector size = " << oflVec.size()
                       << ", dsp vector size = " << dspVec.size() );
 
-        build(ctx, vecBeg, vecEnd, theCellContainer);
+        build (ctx, drawerEvtStatus, params, vecBeg, vecEnd, theCellContainer,
+               MBTSCells.get(), E4prCells.get());
         begin = end;
       }
 
@@ -503,17 +498,18 @@ StatusCode TileCellBuilder::process(CaloCellContainer * theCellContainer) {
       }
       
       ATH_MSG_DEBUG( " Calling build() method for rawChannels from " << m_rawChannelContainerKey.key() );
-      build(ctx, begin, end, theCellContainer);
+      build (ctx, drawerEvtStatus, params, begin, end, theCellContainer,
+             MBTSCells.get(), E4prCells.get());
     }
     
     if (!m_MBTSContainerKey.key().empty()) {
-      SG::WriteHandle<TileCellContainer> MBTSContainer(m_MBTSContainerKey);
-      ATH_CHECK( MBTSContainer.record(std::move(m_MBTSCells)) );
+      SG::WriteHandle<TileCellContainer> MBTSContainer(m_MBTSContainerKey, ctx);
+      ATH_CHECK( MBTSContainer.record(std::move(MBTSCells)) );
     }
     
     if (!m_E4prContainerKey.key().empty()) {
-      SG::WriteHandle<TileCellContainer> E4prContainer(m_E4prContainerKey);
-      ATH_CHECK( E4prContainer.record(std::move(m_E4prCells)) );
+      SG::WriteHandle<TileCellContainer> E4prContainer(m_E4prContainerKey, ctx);
+      ATH_CHECK( E4prContainer.record(std::move(E4prCells)) );
     }
     
     CaloCell_ID::SUBCALO caloNum = CaloCell_ID::TILE;
@@ -542,8 +538,8 @@ StatusCode TileCellBuilder::process(CaloCellContainer * theCellContainer) {
   int drConsecNum = 0;
 
   for (int p = 1; p < 5; ++p) {
-    TileDrawerEvtStatus * evt = m_drawerEvtStatus[p];
-    TileDrawerRunStatus * run = m_drawerRunStatus[p];
+    TileDrawerEvtStatus * evt = drawerEvtStatus[p];
+    //TileDrawerRunStatus * run = m_drawerRunStatus[p];
     int drAbsent = 0;
     int drMasked = 0;
     int drConsec = 0;
@@ -556,11 +552,11 @@ StatusCode TileCellBuilder::process(CaloCellContainer * theCellContainer) {
       if (evt[d].nChannels == 0) {
         ++drConsec;
         ++drAbsent;
-        ++(run[d].drawerAbsent);
+        //++(run[d].drawerAbsent);
       } else if (evt[d].nMaskedChannels >= evt[d].nChannels) {
         ++drConsec;
         ++drMasked;
-        ++(run[d].drawerMasked);
+        //++(run[d].drawerMasked);
       } else {
         if (drConsec > drConsecMax) {
           drConsecMax = drConsec;
@@ -571,7 +567,7 @@ StatusCode TileCellBuilder::process(CaloCellContainer * theCellContainer) {
         }
         drConsec = 0;
         if (evt[d].nMaskedChannels > 0) {
-          ++(run[d].channelsMasked);
+          //++(run[d].channelsMasked);
         }
         if (evt[d].nBadQuality) ++hasBadQ;
         if (evt[d].nOverflow) ++hasOver;
@@ -613,7 +609,7 @@ StatusCode TileCellBuilder::process(CaloCellContainer * theCellContainer) {
     flag |= fl << (p - 1);
   }
 
-  // number of cosecutively masked modules (if it's > 15 we have error already set)
+  // number of consecutively masked modules (if it's > 15 we have error already set)
   flag |= (std::min(15, drConsecMaxMax) << 16);
 
   if (drConsecMaxMax > 1 && error < xAOD::EventInfo::Warning) {
@@ -632,12 +628,12 @@ StatusCode TileCellBuilder::process(CaloCellContainer * theCellContainer) {
   std::cout<<"partition flag 0x0"<<std::hex<<flag<<std::dec<<" error "<<error<<std::endl;
 #endif
 
-  ++m_eventErrorCounter[error]; // error index is 0 or 1 or 2 here
-  ++m_eventErrorCounter[3]; // count separately total number of events
+  //++m_eventErrorCounter[error]; // error index is 0 or 1 or 2 here
+  //++m_eventErrorCounter[3]; // count separately total number of events
   
 
   // retrieve EventInfo
-  SG::ReadHandle<xAOD::EventInfo> eventInfo(m_eventInfoKey);
+  SG::ReadHandle<xAOD::EventInfo> eventInfo(m_eventInfoKey, ctx);
 
   if (eventInfo.isValid()) {
 
@@ -655,7 +651,8 @@ StatusCode TileCellBuilder::process(CaloCellContainer * theCellContainer) {
       }
     }
 
-  } else {
+  }
+  else {
     ATH_MSG_WARNING( " cannot retrieve EventInfo, will not set Tile information " );
   }
   
@@ -667,7 +664,7 @@ StatusCode TileCellBuilder::process(CaloCellContainer * theCellContainer) {
 
 //************************************************************************
 void TileCellBuilder::correctCell(TileCell* pCell, int correction, int pmt, int gain
-    , float ener, float time, unsigned char iqual, unsigned char qbit, int ch_type) {
+    , float ener, float time, unsigned char iqual, unsigned char qbit, int ch_type) const {
 //************************************************************************
 
 // Merge two pmts in one cell if needed
@@ -696,14 +693,22 @@ void TileCellBuilder::correctCell(TileCell* pCell, int correction, int pmt, int
   }
 }
 
-unsigned char TileCellBuilder::qbits(int ros, int drawer, bool count_over
-    , bool good_time, bool good_ener, bool overflow, bool underflow, bool overfit) {
-
-  ++m_drawerEvtStatus[ros][drawer].nChannels;
+unsigned char TileCellBuilder::qbits (TileDrawerEvtStatusArray& drawerEvtStatus,
+                                      TileFragHash::TYPE RChType,
+                                      int ros,
+                                      int drawer,
+                                      bool count_over,
+                                      bool good_time,
+                                      bool good_ener,
+                                      bool overflow,
+                                      bool underflow,
+                                      bool overfit) const
+{
+  ++drawerEvtStatus[ros][drawer].nChannels;
   // new feature in rel 17.2.7 - count underflows and overflows
   if (count_over) {
-    if (overflow) ++m_drawerEvtStatus[ros][drawer].nOverflow;
-    if (underflow) ++m_drawerEvtStatus[ros][drawer].nUnderflow;
+    if (overflow) ++drawerEvtStatus[ros][drawer].nOverflow;
+    if (underflow) ++drawerEvtStatus[ros][drawer].nUnderflow;
   }
 #ifdef ALLOW_DEBUG_COUT
   if (overflow)  std::cout << "channel with overflow " << ((count_over)?"":"MBTS") << std::endl;
@@ -712,14 +717,14 @@ unsigned char TileCellBuilder::qbits(int ros, int drawer, bool count_over
 #endif
 
   unsigned char qbit = (overfit) ? (TileFragHash::FitFilter & TileCell::MASK_ALGO)
-                                 : (m_RChType & TileCell::MASK_ALGO);
+                                 : (RChType & TileCell::MASK_ALGO);
   if (good_time) qbit |= TileCell::MASK_TIME;
   if (overflow || underflow) qbit |= TileCell::MASK_OVER;
       
   if (good_ener) {
     qbit |= TileCell::MASK_AMPL;
     if (count_over) {
-      ++m_drawerEvtStatus[ros][drawer].nSomeSignal;
+      ++drawerEvtStatus[ros][drawer].nSomeSignal;
     }
   }
 
@@ -727,7 +732,11 @@ unsigned char TileCellBuilder::qbits(int ros, int drawer, bool count_over
 }
 
 // masking for MBTS with single channel
-bool TileCellBuilder::maskBadChannel(TileCell* pCell, HWIdentifier hwid) {
+bool
+TileCellBuilder::maskBadChannel (TileDrawerEvtStatusArray& drawerEvtStatus,
+                                 const TileDQstatus* DQstatus,
+                                 TileCell* pCell, HWIdentifier hwid) const
+{
   int ros = m_tileHWID->ros(hwid);
   int drawer = m_tileHWID->drawer(hwid);
   int chan = m_tileHWID->channel(hwid);
@@ -738,22 +747,22 @@ bool TileCellBuilder::maskBadChannel(TileCell* pCell, HWIdentifier hwid) {
   // check quality first
   bool bad = ((int) pCell->qual1() > m_qualityCut);
   if (bad) {
-    ++m_drawerEvtStatus[ros][drawer].nBadQuality;
+    ++drawerEvtStatus[ros][drawer].nBadQuality;
 
   } else {
     // check bad status in DB
     bad = chStatus.isBad();
 
     // Now checking the DQ status
-    if (!bad && m_notUpgradeCabling) {
-      bad = !(m_DQstatus->isAdcDQgood(ros, drawer, chan, gain)
+    if (!bad && m_notUpgradeCabling && DQstatus) {
+      bad = !(DQstatus->isAdcDQgood(ros, drawer, chan, gain)
             && isChanDCSgood(ros, drawer, chan));
     }
   }
 
   if (bad) {
     // only one channel in this cell and it is bad
-    ++m_drawerEvtStatus[ros][drawer].nMaskedChannels;
+    ++drawerEvtStatus[ros][drawer].nMaskedChannels;
 
     //pCell->setEnergy(m_zeroEnergy,0.0,TileID::LOWGAIN,CaloGain::INVALIDGAIN); // reset energy completely, indicate problem putting low gain
     //pCell->setTime(0.0); // reset time completely
@@ -781,7 +790,10 @@ bool TileCellBuilder::maskBadChannel(TileCell* pCell, HWIdentifier hwid) {
   
 
 // masking for normal cells
-bool TileCellBuilder::maskBadChannels(TileCell* pCell) {
+bool TileCellBuilder::maskBadChannels (TileDrawerEvtStatusArray& drawerEvtStatus,
+                                       const TileDQstatus* DQstatus,
+                                       TileCell* pCell) const
+{
   bool single_PMT_C10 = false;
 
   const CaloDetDescrElement* caloDDE = pCell->caloDDE();
@@ -802,15 +814,15 @@ bool TileCellBuilder::maskBadChannels(TileCell* pCell) {
   // check quality first
   bool bad1 = ((int) pCell->qual1() > m_qualityCut);
   if (bad1) {
-    ++m_drawerEvtStatus[ros1][drawer1].nBadQuality;
+    ++drawerEvtStatus[ros1][drawer1].nBadQuality;
 
   } else {
     // check bad status in DB
     bad1 = (gain1 < 0) || chStatus1.isBad();
 
     // Now checking the DQ status
-    if (!bad1 && m_notUpgradeCabling) {
-      bad1 = !(m_DQstatus->isAdcDQgood(ros1, drawer1, chan1, gain1)
+    if (!bad1 && m_notUpgradeCabling && DQstatus) {
+      bad1 = !(DQstatus->isAdcDQgood(ros1, drawer1, chan1, gain1)
               && isChanDCSgood(ros1, drawer1, chan1));
     }
   }
@@ -820,7 +832,7 @@ bool TileCellBuilder::maskBadChannels(TileCell* pCell) {
 
     if (bad1) {
       // only one channel in this cell and it is bad
-      ++m_drawerEvtStatus[ros1][drawer1].nMaskedChannels;
+      ++drawerEvtStatus[ros1][drawer1].nMaskedChannels;
 
       if (gain1 == CaloGain::INVALIDGAIN) {
         pCell->setEnergy(m_zeroEnergy, 0.0, TileID::LOWGAIN, CaloGain::INVALIDGAIN); // reset energy completely, indicate problem putting low gain
@@ -854,15 +866,15 @@ bool TileCellBuilder::maskBadChannels(TileCell* pCell) {
     // check quality first
     bool bad2 = ((int) pCell->qual2() > m_qualityCut);
     if (bad2) {
-      ++m_drawerEvtStatus[ros2][drawer2].nBadQuality;
+      ++drawerEvtStatus[ros2][drawer2].nBadQuality;
 
     } else {
       // check bad status in DB
       bad2 = (gain2 < 0) || chStatus2.isBad();
 
       // Now checking the DQ status
-      if (!bad2 && m_notUpgradeCabling) {
-        bad2 = !(m_DQstatus->isAdcDQgood(ros2, drawer2, chan2, gain2)
+      if (!bad2 && m_notUpgradeCabling && DQstatus) {
+        bad2 = !(DQstatus->isAdcDQgood(ros2, drawer2, chan2, gain2)
                 && isChanDCSgood(ros2, drawer2, chan2));
       }
     }
@@ -898,7 +910,7 @@ bool TileCellBuilder::maskBadChannels(TileCell* pCell) {
           pCell->setEnergy(pCell->ene2()/2., pCell->ene2()/2., gain2, gain2);
           //bad1 = bad2;
           bad1 = true;
-          --m_drawerEvtStatus[ros1][drawer1].nMaskedChannels; // since it's fake masking, decrease counter by 1 in advance
+          --drawerEvtStatus[ros1][drawer1].nMaskedChannels; // since it's fake masking, decrease counter by 1 in advance
         }
       } else {
         if (m_run2 || !chStatus2.isBad()) {
@@ -911,14 +923,14 @@ bool TileCellBuilder::maskBadChannels(TileCell* pCell) {
           pCell->setEnergy(pCell->ene1()/2., pCell->ene1()/2., gain1, gain1);
           //bad2 = bad1;
           bad2 = true;
-          --m_drawerEvtStatus[ros2][drawer2].nMaskedChannels; // since it's fake masking, decrease counter by 1 in advance
+          --drawerEvtStatus[ros2][drawer2].nMaskedChannels; // since it's fake masking, decrease counter by 1 in advance
         }
       }
     }
     if (bad1 && bad2) {
       // both channels are bad
-      ++m_drawerEvtStatus[ros1][drawer1].nMaskedChannels;
-      ++m_drawerEvtStatus[ros2][drawer2].nMaskedChannels;
+      ++drawerEvtStatus[ros1][drawer1].nMaskedChannels;
+      ++drawerEvtStatus[ros2][drawer2].nMaskedChannels;
 
       if (gain1 == CaloGain::INVALIDGAIN || gain2 == CaloGain::INVALIDGAIN) {
         if (gain1 == CaloGain::INVALIDGAIN) gain1 = 0; // this is TileID::LOWGAIN; - commented out to make Coverity happy
@@ -935,7 +947,7 @@ bool TileCellBuilder::maskBadChannels(TileCell* pCell) {
 
     } else if (bad1 && !bad2) {
       // first channel is bad
-      ++m_drawerEvtStatus[ros1][drawer1].nMaskedChannels;
+      ++drawerEvtStatus[ros1][drawer1].nMaskedChannels;
 
       float ene2 = pCell->ene2();
       pCell->setEnergy(ene2, ene2, gain2, gain2); // use energy/gain from second pmt for both pmts
@@ -958,7 +970,7 @@ bool TileCellBuilder::maskBadChannels(TileCell* pCell) {
 
     } else if (!bad1 && bad2) {
       // second channel is bad
-      ++m_drawerEvtStatus[ros2][drawer2].nMaskedChannels;
+      ++drawerEvtStatus[ros2][drawer2].nMaskedChannels;
 
       float ene1 = pCell->ene1();
       pCell->setEnergy(ene1, ene1, gain1, gain1);  // use energy/gain from first pmt for both pmts
@@ -1008,11 +1020,19 @@ bool TileCellBuilder::maskBadChannels(TileCell* pCell) {
 
 
 template<class ITERATOR, class COLLECTION>
-void TileCellBuilder::build(const EventContext& ctx,
-                            const ITERATOR & begin, const ITERATOR & end, COLLECTION * coll) {
-
+void TileCellBuilder::build (const EventContext& ctx,
+                             TileDrawerEvtStatusArray& drawerEvtStatus,
+                             VecParams& params,
+                             const ITERATOR & begin,
+                             const ITERATOR & end,
+                             COLLECTION* coll,
+                             TileCellContainer* MBTSCells,
+                             TileCellContainer* E4prCells) const
+{
+  // Now retrieve the TileDQstatus
+  const TileDQstatus* DQstatus = nullptr;
   if(m_notUpgradeCabling) {
-    m_DQstatus = SG::makeHandle (m_DQstatusKey, ctx).get();
+    DQstatus = SG::makeHandle (m_DQstatusKey, ctx).get();
   }
 
   /* zero all counters and sums */
@@ -1034,6 +1054,8 @@ void TileCellBuilder::build(const EventContext& ctx,
   //* existing ones). Add each new TileCell to the output collection
   //**
 
+  std::vector<TileCell*> allCells (m_tileID->cell_hash_max(), nullptr);
+
   for (ITERATOR rawItr = begin; rawItr != end; ++rawItr) {
 
     const TileRawChannel* pChannel = (*rawItr);
@@ -1052,19 +1074,19 @@ void TileCellBuilder::build(const EventContext& ctx,
     float time = pChannel->uncorrTime(); // take uncorrected time (if available)
     float amp = pChannel->amplitude();
 
-    TileRawChannelUnit::UNIT oldUnit = m_RChUnit;
-    if (m_correctAmplitude && time > m_timeMinThresh && time < m_timeMaxThresh) { // parabolic correction
-      if (m_RChUnit > TileRawChannelUnit::OnlineADCcounts) { // convert from online units to ADC counts
+    TileRawChannelUnit::UNIT oldUnit = params.m_RChUnit;
+    if (params.m_correctAmplitude && time > m_timeMinThresh && time < m_timeMaxThresh) { // parabolic correction
+      if (params.m_RChUnit > TileRawChannelUnit::OnlineADCcounts) { // convert from online units to ADC counts
         oldUnit = TileRawChannelUnit::ADCcounts;
-        amp = m_tileToolEmscale->undoOnlCalib(drawerIdx, channel, gain, amp, m_RChUnit);
+        amp = m_tileToolEmscale->undoOnlCalib(drawerIdx, channel, gain, amp, params.m_RChUnit);
         if (amp > m_ampMinThresh) // amp cut in ADC counts
-          amp *= TileRawChannelBuilder::correctAmp(time,m_of2);
-      } else if (m_RChUnit == TileRawChannelUnit::ADCcounts
-                 || m_RChUnit == TileRawChannelUnit::OnlineADCcounts) {
+          amp *= TileRawChannelBuilder::correctAmp(time,params.m_of2);
+      } else if (params.m_RChUnit == TileRawChannelUnit::ADCcounts
+                 || params.m_RChUnit == TileRawChannelUnit::OnlineADCcounts) {
         if (amp > m_ampMinThresh)
-          amp *= TileRawChannelBuilder::correctAmp(time,m_of2);
+          amp *= TileRawChannelBuilder::correctAmp(time,params.m_of2);
       } else {
-        ATH_MSG_ERROR( "Units in raw channel container is " << m_RChUnit );
+        ATH_MSG_ERROR( "Units in raw channel container is " << params.m_RChUnit );
         ATH_MSG_ERROR( "But amplitude correction works only with ADC counts " );
         ATH_MSG_ERROR( "Please, disable CIS calibration in optimal filter " );
       }
@@ -1073,10 +1095,10 @@ void TileCellBuilder::build(const EventContext& ctx,
     float qual = pChannel->quality();
 
     // check that time was really reconstructed
-    bool good_time = (fabs(time) < m_maxTimeCorr);
-    bool non_zero_time = (m_RChType == TileFragHash::OptFilterDspCompressed)
+    bool good_time = (fabs(time) < params.m_maxTimeCorr);
+    bool non_zero_time = (params.m_RChType == TileFragHash::OptFilterDspCompressed)
                           ? ((qual > 2.99 && qual < 4.01))
-                          : ((qual > 0.0 || m_RChType == TileFragHash::OptFilterDsp));
+                          : ((qual > 0.0 || params.m_RChType == TileFragHash::OptFilterDsp));
 
     // new feature in rel 17.2.7 - pedestal keeps information about overflow and underflow
     // if there is an underflow, 10000 is added to pedestal value
@@ -1112,7 +1134,7 @@ void TileCellBuilder::build(const EventContext& ctx,
     }
 
     // apply time correction if needed
-    if (m_correctTime && good_time && non_zero_time)
+    if (params.m_correctTime && good_time && non_zero_time)
       time -= m_tileToolTiming->getSignalPhase(drawerIdx, channel, gain);
     else
       time = pChannel->time();
@@ -1140,7 +1162,7 @@ void TileCellBuilder::build(const EventContext& ctx,
 
     if (index == -3) { // E4' cells
 
-      if (m_E4prCells) { // do something with them only if container exists
+      if (E4prCells) { // do something with them only if the container exists
         ++nE4pr;
 
         // convert ADC counts to MeV. like for normal cells
@@ -1150,7 +1172,8 @@ void TileCellBuilder::build(const EventContext& ctx,
         eE4prTot += ener;
         unsigned char iqual = iquality(qual);
         // for E4' cell qbit use only non_zero_time flag and check that energy is above standatd energy threshold in MeV
-        unsigned char qbit = qbits(ros, drawer, true, non_zero_time, (fabs(ener) > m_eneForTimeCut)
+        unsigned char qbit = qbits(drawerEvtStatus, params.m_RChType,
+                                   ros, drawer, true, non_zero_time, (fabs(ener) > m_eneForTimeCut)
                                    , overflow, underflow, overfit);
         CaloGain::CaloGain cgain = (gain == TileID::HIGHGAIN)
                                    ? CaloGain::TILEONEHIGH
@@ -1183,17 +1206,18 @@ void TileCellBuilder::build(const EventContext& ctx,
             msg(MSG::VERBOSE) << endmsg;
         }
 
-        if (m_maskBadChannels && maskBadChannel(pCell, adc_id))
+        if (m_maskBadChannels && maskBadChannel(drawerEvtStatus, DQstatus,
+                                                pCell, adc_id))
           ATH_MSG_VERBOSE ( "cell with id=" << m_tileTBID->to_string(cell_id)
                              << " bad channel masked, new energy=" << pCell->energy() );
 
-        m_E4prCells->push_back(pCell); // store cell in container
+        E4prCells->push_back(pCell); // store cell in container
 
       }
 
     } else if (index == -2) { // MBTS cells
 
-      if (m_MBTSCells) { // do something with them only if contaier existst
+      if (MBTSCells) { // do something with them only if contaier existst
         ++nMBTS;
 
         // convert ADC counts to pCb and not to MeV
@@ -1203,7 +1227,8 @@ void TileCellBuilder::build(const EventContext& ctx,
         eMBTSTot += ener;
         unsigned char iqual = iquality(qual);
         // for MBTS qbit use AND of good_time and non_zero_time and check that energy is above MBTS energy threshold in pC
-        unsigned char qbit = qbits(ros, drawer, false, (good_time && non_zero_time)
+        unsigned char qbit = qbits(drawerEvtStatus, params.m_RChType,
+                                   ros, drawer, false, (good_time && non_zero_time)
            , (fabs(ener) > m_eneForTimeCutMBTS), overflow, underflow, overfit);
         CaloGain::CaloGain cgain = (gain == TileID::HIGHGAIN)
                                    ? CaloGain::TILEONEHIGH
@@ -1236,11 +1261,12 @@ void TileCellBuilder::build(const EventContext& ctx,
             msg(MSG::VERBOSE) << endmsg;
         }
 
-        if (m_maskBadChannels && maskBadChannel(pCell, adc_id))
+        if (m_maskBadChannels && maskBadChannel(drawerEvtStatus, DQstatus,
+                                                pCell, adc_id))
           ATH_MSG_VERBOSE ( "cell with id=" << m_tileTBID->to_string(cell_id)
                              << " bad channel masked, new energy=" << pCell->energy() );
 
-        m_MBTSCells->push_back(pCell); // store cell in container
+        MBTSCells->push_back(pCell); // store cell in container
 
       }
     } else if (index != -1) { // connected channel
@@ -1252,7 +1278,8 @@ void TileCellBuilder::build(const EventContext& ctx,
 
       unsigned char iqual = iquality(qual);
       // for normal cell qbit use only non_zero_time flag and check that energy is above standatd energy threshold in MeV
-      unsigned char qbit = qbits(ros, drawer, true, non_zero_time, (fabs(ener) > m_eneForTimeCut)
+      unsigned char qbit = qbits(drawerEvtStatus, params.m_RChType,
+                                 ros, drawer, true, non_zero_time, (fabs(ener) > m_eneForTimeCut)
           , overflow, underflow, overfit);
 
 
@@ -1265,7 +1292,7 @@ void TileCellBuilder::build(const EventContext& ctx,
          int index2 = m_tileID->cell_hash(cell_id2);
          TileCell* pCell2 = tileCellsP.nextElementPtr();
          ++nCell;
-         m_allCells[index2] = pCell2;
+         allCells[index2] = pCell2;
          const CaloDetDescrElement* dde2 = m_tileMgr->get_cell_element(index2);
          pCell2->set(dde2, cell_id2);
          pCell2->setEnergy_nonvirt(0, 0, CaloGain::INVALIDGAIN, CaloGain::INVALIDGAIN);
@@ -1281,13 +1308,13 @@ void TileCellBuilder::build(const EventContext& ctx,
 
      }
 
-      TileCell* pCell = m_allCells[index];
+      TileCell* pCell = allCells[index];
       if (pCell) {
         ++nTwo;
         correctCell(pCell, 2, pmt, gain, ener, time, iqual, qbit, 0); // correct & merge 2 PMTs in one cell
       } else {
         ++nCell;
-        m_allCells[index] = pCell = tileCellsP.nextElementPtr();
+        allCells[index] = pCell = tileCellsP.nextElementPtr();
         const CaloDetDescrElement* dde = m_tileMgr->get_cell_element(index);
         pCell->set(dde, cell_id);
         pCell->setEnergy_nonvirt(0, 0, CaloGain::INVALIDGAIN, CaloGain::INVALIDGAIN);
@@ -1320,7 +1347,8 @@ void TileCellBuilder::build(const EventContext& ctx,
       if (msgLvl(MSG::VERBOSE)) {
 
         unsigned char iqual = iquality(qual);
-        unsigned char qbit = qbits(0, drawer, false, non_zero_time, false, overflow, underflow, overfit); //fake ros number here
+        unsigned char qbit = qbits(drawerEvtStatus, params.m_RChType,
+                                   0, drawer, false, non_zero_time, false, overflow, underflow, overfit); //fake ros number here
 
         msg(MSG::VERBOSE) << " channel with adc_id=" << m_tileHWID->to_string(adc_id)
                           << " is not connected" << endmsg;
@@ -1338,7 +1366,7 @@ void TileCellBuilder::build(const EventContext& ctx,
       }
     }
     if (msgLvl(MSG::VERBOSE)) {
-      if ((m_correctTime && good_time && non_zero_time) || pChannel->sizeTime() > 1) {
+      if ((params.m_correctTime && good_time && non_zero_time) || pChannel->sizeTime() > 1) {
         msg(MSG::VERBOSE) << " OF_time = " << pChannel->uncorrTime()
                           << " corr_time = " << time << endmsg;
       }
@@ -1348,14 +1376,14 @@ void TileCellBuilder::build(const EventContext& ctx,
   //**
   // Now store all TileCells
   //**
-  for (unsigned int index = 0; index < m_allCells.size(); ++index) {
+  for (unsigned int index = 0; index < allCells.size(); ++index) {
 
-    TileCell * pCell = m_allCells[index];
+    TileCell * pCell = allCells[index];
 
     if (pCell) {      // cell exists
 
       if (m_maskBadChannels)
-        if (maskBadChannels(pCell))
+        if (maskBadChannels (drawerEvtStatus, DQstatus, pCell))
           ATH_MSG_VERBOSE ( "cell with id=" << m_tileID->to_string(pCell->ID(), -2)
                            << " bad channels masked, new energy=" << pCell->energy() );
 
@@ -1375,7 +1403,7 @@ void TileCellBuilder::build(const EventContext& ctx,
 
       }
 
-      m_allCells[index] = 0;             // clear pointer for next event
+      allCells[index] = 0;             // clear pointer for next event
     } else if (m_fakeCrackCells) { // can be true only for full-size container
 
       pCell = tileCellsP.nextElementPtr();
@@ -1416,10 +1444,10 @@ void TileCellBuilder::build(const EventContext& ctx,
                     << " nFake=" << nFake
                     << " eneTot=" << eCellTot;
 
-    if (m_MBTSCells)
+    if (MBTSCells)
       msg(MSG::DEBUG) << " nMBTS=" << nMBTS
                       << " eMBTS=" << eMBTSTot;
-    if (m_E4prCells)
+    if (E4prCells)
       msg(MSG::DEBUG) << " nE4pr=" << nE4pr
                       << " eE4pr=" << eE4prTot;
 
diff --git a/TileCalorimeter/TileRecUtils/src/TileCellBuilderFromHit.cxx b/TileCalorimeter/TileRecUtils/src/TileCellBuilderFromHit.cxx
index 2d7978825a8b247484520048bfcc369bf79fcd9e..7562651a66d917a82d8481c98d09260af301d427 100644
--- a/TileCalorimeter/TileRecUtils/src/TileCellBuilderFromHit.cxx
+++ b/TileCalorimeter/TileRecUtils/src/TileCellBuilderFromHit.cxx
@@ -70,7 +70,7 @@ const InterfaceID& TileCellBuilderFromHit::interfaceID( ) {
 //Constructor
 TileCellBuilderFromHit::TileCellBuilderFromHit(const std::string& type, const std::string& name,
     const IInterface* parent)
-  : AthAlgTool(type, name, parent)
+  : base_class(type, name, parent)
   , m_infoName("TileInfo")
   , m_eneForTimeCut(35. * MeV) // keep time only for cells above 70 MeV (more than 35 MeV in at least one PMT to be precise)
   , m_eneForTimeCutMBTS(0.03675) // the same cut for MBTS, but in pC, corresponds to 3 ADC counts or 35 MeV
@@ -91,12 +91,10 @@ TileCellBuilderFromHit::TileCellBuilderFromHit(const std::string& type, const st
   , m_mbtsMgr(0)
   , m_RChType(TileFragHash::Default)
 {
-  declareInterface<ICaloCellMakerTool>( this );
   declareInterface<TileCellBuilderFromHit>( this );
 
-  memset(m_drawerEvtStatus, 0, sizeof(m_drawerEvtStatus));
-  memset(m_drawerRunStatus, 0, sizeof(m_drawerRunStatus));
-  memset(m_eventErrorCounter, 0, sizeof(m_eventErrorCounter));
+  //memset(m_drawerRunStatus, 0, sizeof(m_drawerRunStatus));
+  //memset(m_eventErrorCounter, 0, sizeof(m_eventErrorCounter));
 
   // never set energy to zero, but set it to some small number
   // this will help TopoCluster to assign proper weight to the cell if needed
@@ -143,12 +141,10 @@ StatusCode TileCellBuilderFromHit::initialize() {
   // retrieve MBTS and Tile detector manager, TileID helper and TileIfno from det store
   if (m_MBTSContainerKey.key().empty()) {
     m_mbtsMgr = nullptr;
-    m_MBTSVec.resize(0);
   } else {
 
     ATH_CHECK( m_MBTSContainerKey.initialize() );
     ATH_MSG_INFO( "Storing MBTS cells in " << m_MBTSContainerKey.key() );
-    m_MBTSVec.resize(NCELLMBTS);
     
     if (detStore()->retrieve(m_mbtsMgr).isFailure()) {
       ATH_MSG_WARNING( "Unable to retrieve MbtsDetDescrManager from DetectorStore" );
@@ -186,11 +182,8 @@ StatusCode TileCellBuilderFromHit::initialize() {
   ATH_MSG_INFO( "max time thr  " << m_maxTime << " ns" );
   ATH_MSG_INFO( "min time thr  " << m_minTime << " ns" );
   
-  // prepare empty vector for all cell pointers
-  m_allCells.resize(m_tileID->cell_hash_max(), 0);
-  m_E1_TOWER = (m_allCells.size() < 10000) ? 10 : 40;
+  m_E1_TOWER = (m_tileID->cell_hash_max() < 10000) ? 10 : 40;
 
-  ATH_MSG_INFO( "size of temp vector set to " << m_allCells.size() );
   ATH_MSG_INFO( "taking hits from '" << m_hitContainerKey.key() << "'" );
 
   m_cabling = TileCablingService::getInstance();
@@ -199,10 +192,8 @@ StatusCode TileCellBuilderFromHit::initialize() {
   if (m_RUN2 && !m_E4prContainerKey.key().empty()) {
     ATH_CHECK( m_E4prContainerKey.initialize() );
     ATH_MSG_INFO( "Storing E4'  cells in " << m_E4prContainerKey.key() );
-    m_E4prVec.resize(NCELLE4PR);
   } else {
     m_E4prContainerKey = ""; // no E4' container for RUN1
-    m_E4prVec.resize(0);
   }
 
 
@@ -219,14 +210,15 @@ StatusCode TileCellBuilderFromHit::finalize() {
 }
 
 StatusCode TileCellBuilderFromHit::process(CaloCellContainer * theCellContainer) {
+  const EventContext& ctx = Gaudi::Hive::currentContext();
 
   //**
   //* Get TileHits
   //**
 
-  memset(m_drawerEvtStatus, 0, sizeof(m_drawerEvtStatus));
+  TileDrawerEvtStatusArray drawerEvtStatus;
 
-  SG::ReadHandle<TileHitContainer> hitContainer(m_hitContainerKey);
+  SG::ReadHandle<TileHitContainer> hitContainer(m_hitContainerKey, ctx);
 
   if (!hitContainer.isValid()) {
 
@@ -237,12 +229,14 @@ StatusCode TileCellBuilderFromHit::process(CaloCellContainer * theCellContainer)
     
     ATH_MSG_DEBUG( "Container " << m_hitContainerKey.key() << " with TileHits found ");
 
+    std::unique_ptr<TileCellContainer> MBTSCells;
     if (!m_MBTSContainerKey.key().empty()) {
-      m_MBTSCells = std::make_unique<TileCellContainer>(SG::VIEW_ELEMENTS);
+      MBTSCells = std::make_unique<TileCellContainer>(SG::VIEW_ELEMENTS);
     }
 
+    std::unique_ptr<TileCellContainer> E4prCells;
     if (!m_E4prContainerKey.key().empty()) {
-      m_E4prCells = std::make_unique<TileCellContainer>(SG::VIEW_ELEMENTS);
+      E4prCells = std::make_unique<TileCellContainer>(SG::VIEW_ELEMENTS);
     }
     
     SelectAllObject<TileHitContainer> selAll(hitContainer.cptr());
@@ -251,17 +245,18 @@ StatusCode TileCellBuilderFromHit::process(CaloCellContainer * theCellContainer)
 
     if (begin != end) {
       ATH_MSG_DEBUG( " Calling build() method for hits from " << m_hitContainerKey.key() );
-      build(begin, end, theCellContainer);
+      build (drawerEvtStatus, begin, end, theCellContainer,
+             MBTSCells.get(), E4prCells.get());
     }
     
     if (!m_MBTSContainerKey.key().empty()) {
-      SG::WriteHandle<TileCellContainer> MBTSContainer(m_MBTSContainerKey);
-      ATH_CHECK( MBTSContainer.record(std::move(m_MBTSCells)) );
+      SG::WriteHandle<TileCellContainer> MBTSContainer(m_MBTSContainerKey, ctx);
+      ATH_CHECK( MBTSContainer.record(std::move(MBTSCells)) );
     }
     
     if (!m_E4prContainerKey.key().empty()) {
-      SG::WriteHandle<TileCellContainer> E4prContainer(m_E4prContainerKey);
-      ATH_CHECK( E4prContainer.record(std::move(m_E4prCells)) );
+      SG::WriteHandle<TileCellContainer> E4prContainer(m_E4prContainerKey, ctx);
+      ATH_CHECK( E4prContainer.record(std::move(E4prCells)) );
     }
 
     CaloCell_ID::SUBCALO caloNum = CaloCell_ID::TILE;
@@ -293,8 +288,8 @@ StatusCode TileCellBuilderFromHit::process(CaloCellContainer * theCellContainer)
   int drConsecNum = 0;
 
   for (int p = 1; p < 5; ++p) {
-    TileDrawerEvtStatus * evt = m_drawerEvtStatus[p];
-    TileDrawerRunStatus * run = m_drawerRunStatus[p];
+    TileDrawerEvtStatus * evt = drawerEvtStatus[p];
+    //TileDrawerRunStatus * run = m_drawerRunStatus[p];
     int drAbsent = 0;
     int drMasked = 0;
     int drConsec = 0;
@@ -307,11 +302,11 @@ StatusCode TileCellBuilderFromHit::process(CaloCellContainer * theCellContainer)
       if (evt[d].nChannels == 0) {
         ++drConsec;
         ++drAbsent;
-        ++(run[d].drawerAbsent);
+        //++(run[d].drawerAbsent);
       } else if (evt[d].nMaskedChannels >= evt[d].nChannels) {
         ++drConsec;
         ++drMasked;
-        ++(run[d].drawerMasked);
+        //++(run[d].drawerMasked);
       } else {
         if (drConsec > drConsecMax) {
           drConsecMax = drConsec;
@@ -321,9 +316,9 @@ StatusCode TileCellBuilderFromHit::process(CaloCellContainer * theCellContainer)
           }
         }
         drConsec = 0;
-        if (evt[d].nMaskedChannels > 0) {
-          ++(run[d].channelsMasked);
-        }
+        //if (evt[d].nMaskedChannels > 0) {
+        // ++(run[d].channelsMasked);
+        //}
         if (evt[d].nBadQuality) ++hasBadQ;
         if (evt[d].nOverflow) ++hasOver;
         if (evt[d].nUnderflow) ++hasUnder;
@@ -383,11 +378,11 @@ StatusCode TileCellBuilderFromHit::process(CaloCellContainer * theCellContainer)
   std::cout<<"partition flag 0x0"<<std::hex<<flag<<std::dec<<" error "<<error<<std::endl;
 #endif
 
-  ++m_eventErrorCounter[error]; // error index is 0 or 1 or 2 here
-  ++m_eventErrorCounter[3]; // count separately total number of events
+  //++m_eventErrorCounter[error]; // error index is 0 or 1 or 2 here
+  //++m_eventErrorCounter[3]; // count separately total number of events
   
   // retrieve EventInfo
-  SG::ReadHandle<xAOD::EventInfo> eventInfo(m_eventInfoKey);
+  SG::ReadHandle<xAOD::EventInfo> eventInfo(m_eventInfoKey, ctx);
 
   if (eventInfo.isValid()) {
 
@@ -406,6 +401,9 @@ StatusCode TileCellBuilderFromHit::process(CaloCellContainer * theCellContainer)
     }
 
   }
+  else {
+    ATH_MSG_WARNING( " cannot retrieve EventInfo, will not set Tile information " );
+  }
   
   // Execution completed.
   ATH_MSG_DEBUG( "TileCellBuilderFromHit execution completed." );
@@ -415,7 +413,7 @@ StatusCode TileCellBuilderFromHit::process(CaloCellContainer * theCellContainer)
 
 //************************************************************************
 void TileCellBuilderFromHit::correctCell(TileCell* pCell, int correction, int pmt, int gain
-                                         , float ener, float time, unsigned char iqual, unsigned char qbit) {
+                                         , float ener, float time, unsigned char iqual, unsigned char qbit) const {
 //************************************************************************
 
 // Merge two pmts in one cell if needed
@@ -436,14 +434,15 @@ void TileCellBuilderFromHit::correctCell(TileCell* pCell, int correction, int pm
   }
 }
 
-unsigned char TileCellBuilderFromHit::qbits(int ros, int drawer, bool count_over
-    , bool good_time, bool good_ener, bool overflow, bool underflow, bool overfit) {
+unsigned char TileCellBuilderFromHit::qbits(TileDrawerEvtStatusArray& drawerEvtStatus,
+                                            int ros, int drawer, bool count_over
+    , bool good_time, bool good_ener, bool overflow, bool underflow, bool overfit) const {
 
-  ++m_drawerEvtStatus[ros][drawer].nChannels;
+  ++drawerEvtStatus[ros][drawer].nChannels;
   // new feature in rel 17.2.7 - count underflows and overflows
   if (count_over) {
-    if (overflow) ++m_drawerEvtStatus[ros][drawer].nOverflow;
-    if (underflow) ++m_drawerEvtStatus[ros][drawer].nUnderflow;
+    if (overflow) ++drawerEvtStatus[ros][drawer].nOverflow;
+    if (underflow) ++drawerEvtStatus[ros][drawer].nUnderflow;
   }
 #ifdef ALLOW_DEBUG_COUT
   if (overflow)  std::cout << "channel with overflow " << ((count_over)?"":"MBTS") << std::endl;
@@ -459,7 +458,7 @@ unsigned char TileCellBuilderFromHit::qbits(int ros, int drawer, bool count_over
   if (good_ener) {
     qbit |= TileCell::MASK_AMPL;
     if (count_over) {
-      ++m_drawerEvtStatus[ros][drawer].nSomeSignal;
+      ++drawerEvtStatus[ros][drawer].nSomeSignal;
     }
   }
 
@@ -467,8 +466,10 @@ unsigned char TileCellBuilderFromHit::qbits(int ros, int drawer, bool count_over
 }
 
 // masking for MBTS with single channel
-bool TileCellBuilderFromHit::maskBadChannel(TileCell* pCell) {
-
+bool
+TileCellBuilderFromHit::maskBadChannel (TileDrawerEvtStatusArray& drawerEvtStatus,
+                                        TileCell* pCell) const
+{
   Identifier cell_id = pCell->ID();
 
   HWIdentifier channel_id = m_cabling->s2h_channel_id(cell_id);
@@ -483,7 +484,7 @@ bool TileCellBuilderFromHit::maskBadChannel(TileCell* pCell) {
   // check quality first
   bool bad = ((int) pCell->qual1() > m_qualityCut);
   if (bad) {
-    ++m_drawerEvtStatus[ros][drawer].nBadQuality;
+    ++drawerEvtStatus[ros][drawer].nBadQuality;
 
   } else {
     // check bad status in DB
@@ -493,7 +494,7 @@ bool TileCellBuilderFromHit::maskBadChannel(TileCell* pCell) {
 
   if (bad) {
     // only one channel in this cell and it is bad
-    ++m_drawerEvtStatus[ros][drawer].nMaskedChannels;
+    ++drawerEvtStatus[ros][drawer].nMaskedChannels;
 
     //pCell->setEnergy(m_zeroEnergy,0.0,TileID::LOWGAIN,CaloGain::INVALIDGAIN); // reset energy completely, indicate problem putting low gain
     //pCell->setTime(0.0); // reset time completely
@@ -520,7 +521,9 @@ bool TileCellBuilderFromHit::maskBadChannel(TileCell* pCell) {
 }
   
 // masking for normal cells
-bool TileCellBuilderFromHit::maskBadChannels(TileCell* pCell, bool single_PMT_C10, bool Ecell) {
+bool
+TileCellBuilderFromHit::maskBadChannels (TileDrawerEvtStatusArray& drawerEvtStatus,
+                                         TileCell* pCell, bool single_PMT_C10, bool Ecell) const {
 
   const CaloDetDescrElement* caloDDE = pCell->caloDDE();
 
@@ -540,7 +543,7 @@ bool TileCellBuilderFromHit::maskBadChannels(TileCell* pCell, bool single_PMT_C1
   // check quality first
   bool bad1 = ((int) pCell->qual1() > m_qualityCut);
   if (bad1) {
-    ++m_drawerEvtStatus[ros1][drawer1].nBadQuality;
+    ++drawerEvtStatus[ros1][drawer1].nBadQuality;
 
   } else {
     // check bad status in DB
@@ -553,7 +556,7 @@ bool TileCellBuilderFromHit::maskBadChannels(TileCell* pCell, bool single_PMT_C1
 
     if (bad1) {
       // only one channel in this cell and it is bad
-      ++m_drawerEvtStatus[ros1][drawer1].nMaskedChannels;
+      ++drawerEvtStatus[ros1][drawer1].nMaskedChannels;
 
       if (gain1 == CaloGain::INVALIDGAIN) {
         pCell->setEnergy(m_zeroEnergy, 0.0, TileID::LOWGAIN, CaloGain::INVALIDGAIN); // reset energy completely, indicate problem putting low gain
@@ -587,7 +590,7 @@ bool TileCellBuilderFromHit::maskBadChannels(TileCell* pCell, bool single_PMT_C1
     // check quality first
     bool bad2 = ((int) pCell->qual2() > m_qualityCut);
     if (bad2) {
-      ++m_drawerEvtStatus[ros2][drawer2].nBadQuality;
+      ++drawerEvtStatus[ros2][drawer2].nBadQuality;
 
     } else {
       // check bad status in DB
@@ -623,7 +626,7 @@ bool TileCellBuilderFromHit::maskBadChannels(TileCell* pCell, bool single_PMT_C1
           pCell->setEnergy(pCell->ene2()/2., pCell->ene2()/2., gain2, gain2);
           //bad1 = bad2;
           bad1 = true;
-          --m_drawerEvtStatus[ros1][drawer1].nMaskedChannels; // since it's fake masking, decrease counter by 1 in advance
+          --drawerEvtStatus[ros1][drawer1].nMaskedChannels; // since it's fake masking, decrease counter by 1 in advance
         }
       } else {
         if (m_RUN2 || !chStatus2.isBad()) {
@@ -636,14 +639,14 @@ bool TileCellBuilderFromHit::maskBadChannels(TileCell* pCell, bool single_PMT_C1
           pCell->setEnergy(pCell->ene1()/2., pCell->ene1()/2., gain1, gain1);
           //bad2 = bad1;
           bad2 = true;
-          --m_drawerEvtStatus[ros2][drawer2].nMaskedChannels; // since it's fake masking, decrease counter by 1 in advance
+          --drawerEvtStatus[ros2][drawer2].nMaskedChannels; // since it's fake masking, decrease counter by 1 in advance
         }
       }
     }
     if (bad1 && bad2) {
       // both channels are bad
-      ++m_drawerEvtStatus[ros1][drawer1].nMaskedChannels;
-      ++m_drawerEvtStatus[ros2][drawer2].nMaskedChannels;
+      ++drawerEvtStatus[ros1][drawer1].nMaskedChannels;
+      ++drawerEvtStatus[ros2][drawer2].nMaskedChannels;
 
       if (gain1 == CaloGain::INVALIDGAIN || gain2 == CaloGain::INVALIDGAIN) {
         if (gain1 == CaloGain::INVALIDGAIN) gain1 = 0; // this is TileID::LOWGAIN; - commented out to make Coverity happy
@@ -660,7 +663,7 @@ bool TileCellBuilderFromHit::maskBadChannels(TileCell* pCell, bool single_PMT_C1
 
     } else if (bad1 && !bad2) {
       // first channel is bad
-      ++m_drawerEvtStatus[ros1][drawer1].nMaskedChannels;
+      ++drawerEvtStatus[ros1][drawer1].nMaskedChannels;
 
       float ene2 = pCell->ene2();
       pCell->setEnergy(ene2, ene2, gain2, gain2); // use energy/gain from second pmt for both pmts
@@ -683,7 +686,7 @@ bool TileCellBuilderFromHit::maskBadChannels(TileCell* pCell, bool single_PMT_C1
 
     } else if (!bad1 && bad2) {
       // second channel is bad
-      ++m_drawerEvtStatus[ros2][drawer2].nMaskedChannels;
+      ++drawerEvtStatus[ros2][drawer2].nMaskedChannels;
 
       float ene1 = pCell->ene1();
       pCell->setEnergy(ene1, ene1, gain1, gain1);  // use energy/gain from first pmt for both pmts
@@ -733,9 +736,13 @@ bool TileCellBuilderFromHit::maskBadChannels(TileCell* pCell, bool single_PMT_C1
 
 
 template<class ITERATOR, class COLLECTION>
-void TileCellBuilderFromHit::build(const ITERATOR & begin, const ITERATOR & end, COLLECTION * coll) {
-
+void TileCellBuilderFromHit::build(TileDrawerEvtStatusArray& drawerEvtStatus,
+                                   const ITERATOR & begin, const ITERATOR & end, COLLECTION * coll,
+                                   TileCellContainer* MBTSCells,
+                                   TileCellContainer* E4prCells) const
+{
   // disable checks for TileID and remember previous state
+  // FIXME: const violation; MT problem.
   bool do_checks = m_tileID->do_checks();
   m_tileID->set_do_checks(false);
   bool do_checks_tb = m_tileID->do_checks();
@@ -767,6 +774,16 @@ void TileCellBuilderFromHit::build(const ITERATOR & begin, const ITERATOR & end,
   bool overfit = false;
   float ener_min = (m_useNoiseTool) ? 1.0E-30F : 0.0;
 
+  std::vector<TileCell*> allCells (m_tileID->cell_hash_max(), nullptr);
+  std::vector<TileCell*> MBTSVec;   //!< vector to of pointers to MBTS cells
+  if (MBTSCells) {
+    MBTSVec.resize (NCELLMBTS);
+  }
+  std::vector<TileCell*> E4prVec;   //!< vector to of pointers to E4' cells
+  if (E4prCells) {
+    E4prVec.resize (NCELLE4PR);
+  }
+
   for (ITERATOR hitItr = begin; hitItr != end; ++hitItr) {
 
     const TileHit* pHit = (*hitItr);
@@ -857,13 +874,14 @@ void TileCellBuilderFromHit::build(const ITERATOR & begin, const ITERATOR & end,
 
     if (E4pr) { // E4' cells
 
-      if (m_E4prCells) { // do something with them only if contaier existst
+      if (E4prCells) { // do something with them only if contaier existst
         ++nE4pr;
 
         eE4prTot += ener;
         unsigned char iqual = iquality(qual);
         // for E4' cell qbit use only non_zero_time flag and check that energy is above standatd energy threshold in MeV
-        unsigned char qbit = qbits(ros, drawer, true, non_zero_time, (fabs(ener) > m_eneForTimeCut)
+        unsigned char qbit = qbits(drawerEvtStatus,
+                                   ros, drawer, true, non_zero_time, (fabs(ener) > m_eneForTimeCut)
                                    , overflow, underflow, overfit);
         CaloGain::CaloGain cgain = (gain == TileID::HIGHGAIN)
                                    ? CaloGain::TILEONEHIGH
@@ -890,16 +908,16 @@ void TileCellBuilderFromHit::build(const ITERATOR & begin, const ITERATOR & end,
                             << " qbit = 0x" << MSG::hex << (int) qbit << MSG::dec << endmsg;
         }
 
-        if (m_E4prVec[index]) {
+        if (E4prVec[index]) {
           msg(MSG::WARNING) << " double E4' cell_id=" << m_tileTBID->to_string(cell_id)
                             << "  ignoring previous value" << endmsg;
         }
-        m_E4prVec[index] = pCell;
+        E4prVec[index] = pCell;
       }
 
     } else if (MBTS) { // MBTS cells
 
-      if (m_MBTSCells) { // do something with them only if contaier existst
+      if (MBTSCells) { // do something with them only if contaier existst
         ++nMBTS;
 
         // convert energy to pCb
@@ -910,7 +928,8 @@ void TileCellBuilderFromHit::build(const ITERATOR & begin, const ITERATOR & end,
         eMBTSTot += ener;
         unsigned char iqual = iquality(qual);
         // for MBTS qbit use AND of good_time and non_zero_time and check that energy is above MBTS energy threshold in pC
-        unsigned char qbit = qbits(ros, drawer, false, (good_time && non_zero_time)
+        unsigned char qbit = qbits(drawerEvtStatus,
+                                   ros, drawer, false, (good_time && non_zero_time)
            , (fabs(ener) > m_eneForTimeCutMBTS), overflow, underflow, overfit);
         CaloGain::CaloGain cgain = (gain == TileID::HIGHGAIN)
                                    ? CaloGain::TILEONEHIGH
@@ -937,11 +956,11 @@ void TileCellBuilderFromHit::build(const ITERATOR & begin, const ITERATOR & end,
                             << " qbit = 0x" << MSG::hex << (int) qbit << MSG::dec << endmsg;
         }
 
-        if (m_MBTSVec[index]) {
+        if (MBTSVec[index]) {
           msg(MSG::WARNING) << " double MBTS cell_id=" << m_tileTBID->to_string(cell_id)
                             << "  ignoring previous value" << endmsg;
         }
-        m_MBTSVec[index] = pCell;
+        MBTSVec[index] = pCell;
       }
     } else {
 
@@ -949,7 +968,8 @@ void TileCellBuilderFromHit::build(const ITERATOR & begin, const ITERATOR & end,
 
       unsigned char iqual = iquality(qual);
       // for normal cell qbit use only non_zero_time flag and check that energy is above standard energy threshold in MeV
-      unsigned char qbit = qbits(ros, drawer, true, non_zero_time, (fabs(ener) > m_eneForTimeCut)
+     unsigned char qbit = qbits(drawerEvtStatus,
+                                ros, drawer, true, non_zero_time, (fabs(ener) > m_eneForTimeCut)
           , overflow, underflow, overfit);
 
       if (E1_CELL && m_RUN2) {
@@ -960,7 +980,7 @@ void TileCellBuilderFromHit::build(const ITERATOR & begin, const ITERATOR & end,
           int index2 = m_tileID->cell_hash(cell_id2);
           TileCell* pCell2 = NEWTILECELL();
           ++nCell;
-          m_allCells[index2] = pCell2;
+          allCells[index2] = pCell2;
           const CaloDetDescrElement* dde2 = m_tileMgr->get_cell_element(index2);
           pCell2->set(dde2, cell_id2);
           pCell2->setEnergy_nonvirt(0.0, 0.0, CaloGain::INVALIDGAIN, CaloGain::INVALIDGAIN);
@@ -973,13 +993,13 @@ void TileCellBuilderFromHit::build(const ITERATOR & begin, const ITERATOR & end,
         }
       }
 
-      TileCell* pCell = m_allCells[index];
+      TileCell* pCell = allCells[index];
       if (pCell) {
         ++nTwo;
         correctCell(pCell, 2, pmt, gain, ener, time, iqual, qbit); // correct & merge 2 PMTs in one cell
       } else {
         ++nCell;
-        m_allCells[index] = pCell = NEWTILECELL();
+        allCells[index] = pCell = NEWTILECELL();
         const CaloDetDescrElement* dde = m_tileMgr->get_cell_element(index);
         pCell->set(dde, cell_id);
         pCell->setEnergy_nonvirt(0, 0, CaloGain::INVALIDGAIN, CaloGain::INVALIDGAIN);
@@ -1010,9 +1030,9 @@ void TileCellBuilderFromHit::build(const ITERATOR & begin, const ITERATOR & end,
   //**
   // Now store all TileCells
   //**
-  for (unsigned int index = 0; index < m_allCells.size(); ++index) {
+  for (unsigned int index = 0; index < allCells.size(); ++index) {
 
-    TileCell * pCell = m_allCells[index];
+    TileCell * pCell = allCells[index];
     const CaloDetDescrElement* dde = m_tileMgr->get_cell_element(index);
     if(!dde)
     {
@@ -1038,7 +1058,7 @@ void TileCellBuilderFromHit::build(const ITERATOR & begin, const ITERATOR & end,
         ++nCell;
         if (!single_PMT) ++nTwo;
 
-        m_allCells[index] = pCell = NEWTILECELL();
+        allCells[index] = pCell = NEWTILECELL();
         pCell->set(dde, cell_id);
 
         pCell->setEnergy_nonvirt(ener_min, 0.0, TileID::HIGHGAIN, (Ecell)?3:TileID::HIGHGAIN); // reset energy completely
@@ -1053,7 +1073,7 @@ void TileCellBuilderFromHit::build(const ITERATOR & begin, const ITERATOR & end,
     if (pCell) {      // cell exists
 
       if (m_maskBadChannels)
-        if (maskBadChannels(pCell,single_PMT_C10,Ecell))
+        if (maskBadChannels (drawerEvtStatus, pCell,single_PMT_C10,Ecell))
           ATH_MSG_VERBOSE ( "cell with id=" << m_tileID->to_string(pCell->ID(), -2)
                            << " bad channels masked, new energy=" << pCell->energy() );
 
@@ -1108,26 +1128,26 @@ void TileCellBuilderFromHit::build(const ITERATOR & begin, const ITERATOR & end,
         }
       }
       coll->push_back(pCell); // store cell in container
-      m_allCells[index] = 0; // clear pointer for next event
+      allCells[index] = 0; // clear pointer for next event
     }
   }
 
 
-  if (m_MBTSCells) {
+  if (MBTSCells) {
 
     for (int side = 0; side < NSIDE; ++side) {
       for (int phi = 0; phi < NPHI; ++phi) {
         for (int eta = 0; eta < NETA; ++eta) {
 
           int index=mbts_index(side,phi,eta);
-          TileCell * pCell = m_MBTSVec[index];
+          TileCell * pCell = MBTSVec[index];
 
           bool merged_MBTS = ( eta == 1 && (phi&1) == 1 && m_RUN2); // in RUN2 every second outer MBTS does not exist
 
           if (!pCell && !merged_MBTS) {
 
             ++nMBTS;
-            m_MBTSVec[index] = pCell = NEWTILECELL();
+            MBTSVec[index] = pCell = NEWTILECELL();
 
             Identifier cell_id = m_tileTBID->channel_id((side > 0) ? 1 : -1, phi, eta);
             pCell->set((m_mbtsMgr) ? m_mbtsMgr->get_element(cell_id) : NULL, cell_id);
@@ -1138,29 +1158,29 @@ void TileCellBuilderFromHit::build(const ITERATOR & begin, const ITERATOR & end,
           }
           
           if (pCell) {
-            if (m_maskBadChannels && maskBadChannel(pCell))
+            if (m_maskBadChannels && maskBadChannel (drawerEvtStatus, pCell))
                 ATH_MSG_VERBOSE ( "MBTS cell with id=" << m_tileTBID->to_string(pCell->ID())
                                   << " bad channel masked, new energy=" << pCell->energy() );
 
-            m_MBTSCells->push_back(pCell); // store cell in container
-            m_MBTSVec[index] = 0; // clear pointer for next event
+            MBTSCells->push_back(pCell); // store cell in container
+            MBTSVec[index] = 0; // clear pointer for next event
           }
         }
       }
     }
   }
 
-  if (m_E4prCells) {
+  if (E4prCells) {
 
     for (int phi = 0; phi < E4NPHI; ++phi) {
 
       int index = e4pr_index(phi);
-      TileCell * pCell = m_E4prVec[index];
+      TileCell * pCell = E4prVec[index];
 
       if (!pCell) {
 
         ++nE4pr;
-        m_E4prVec[index] = pCell = NEWTILECELL();
+        E4prVec[index] = pCell = NEWTILECELL();
 
         pCell->set(NULL, m_tileTBID->channel_id(E4SIDE, phi, E4ETA));
         pCell->setEnergy_nonvirt(0.0, 0.0, CaloGain::TILEONEHIGH, CaloGain::INVALIDGAIN); // reset energy completely
@@ -1170,12 +1190,12 @@ void TileCellBuilderFromHit::build(const ITERATOR & begin, const ITERATOR & end,
       }
 
       if (pCell) {
-        if (m_maskBadChannels && maskBadChannel(pCell))
+        if (m_maskBadChannels && maskBadChannel (drawerEvtStatus, pCell))
           ATH_MSG_VERBOSE ( "E4pr cell with id=" << m_tileTBID->to_string(pCell->ID())
                              << " bad channel masked, new energy=" << pCell->energy() );
 
-        m_E4prCells->push_back(pCell); // store cell in container
-        m_E4prVec[index] = 0; // clear pointer for next event
+        E4prCells->push_back(pCell); // store cell in container
+        E4prVec[index] = 0; // clear pointer for next event
       }
     }
   }
@@ -1188,10 +1208,10 @@ void TileCellBuilderFromHit::build(const ITERATOR & begin, const ITERATOR & end,
                     << " nFake=" << nFake
                     << " eneTot=" << eCellTot;
 
-    if (m_MBTSCells)
+    if (MBTSCells)
       msg(MSG::DEBUG) << " nMBTS=" << nMBTS
                       << " eMBTS=" << eMBTSTot;
-    if (m_E4prCells)
+    if (E4prCells)
       msg(MSG::DEBUG) << " nE4pr=" << nE4pr
                       << " eE4pr=" << eE4prTot;
 
diff --git a/TileCalorimeter/TileRecUtils/src/TileRawCorrelatedNoise.cxx b/TileCalorimeter/TileRecUtils/src/TileRawCorrelatedNoise.cxx
index 849a288f9666daa8e9bbb64763668c060c098e4d..6667c817d11b4a2374eda2134da00521691ea78c 100644
--- a/TileCalorimeter/TileRecUtils/src/TileRawCorrelatedNoise.cxx
+++ b/TileCalorimeter/TileRecUtils/src/TileRawCorrelatedNoise.cxx
@@ -5,6 +5,7 @@
 // Tile includes
 #include "TileRecUtils/TileRawCorrelatedNoise.h"
 #include "TileEvent/TileDigits.h"
+#include "TileEvent/TileMutableDigitsContainer.h"
 #include "TileIdentifier/TileHWID.h"
 
 // Atlas includes
@@ -382,8 +383,9 @@ StatusCode TileRawCorrelatedNoise::execute() {
 
   // create new container
   TileDigits* NewDigits[4][64][48];
-  SG::WriteHandle<TileDigitsContainer> outputDigitsContainer(m_outputDigitsContainerKey);
-  ATH_CHECK( outputDigitsContainer.record( std::make_unique<TileDigitsContainer>() ) );
+
+  auto outputDigitsContainer = std::make_unique<TileMutableDigitsContainer>();
+  ATH_CHECK( outputDigitsContainer->status() );
 
   // fill new container
   for (int Ros = 1; Ros < 5; ++Ros) {
@@ -403,6 +405,9 @@ StatusCode TileRawCorrelatedNoise::execute() {
     }
   }
 
+  SG::WriteHandle<TileDigitsContainer> outputDigitsCnt(m_outputDigitsContainerKey);
+  ATH_CHECK( outputDigitsCnt.record(std::move(outputDigitsContainer)) );
+
 
   ATH_MSG_DEBUG( "execute completed successfully" );
 
diff --git a/TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileDigitsContByteStreamCnv.h b/TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileDigitsContByteStreamCnv.h
index 4f104533e8562dac7f103009bf14a0b35eecfd76..3a30d56982a272c60829a163af28f9072145a7fb 100644
--- a/TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileDigitsContByteStreamCnv.h
+++ b/TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileDigitsContByteStreamCnv.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 
@@ -20,7 +20,6 @@ class DataObject;
 class StatusCode;
 class IAddressCreator;
 class IByteStreamEventAccess;
-class ActiveStoreSvc;
 class MsgStream; 
 class TileDigitsContainer; 
 class TileDigitsContByteStreamTool;
@@ -76,9 +75,6 @@ class TileDigitsContByteStreamCnv
     ServiceHandle<IByteStreamEventAccess> m_byteStreamEventAccess;
     ByteStreamCnvSvc* m_byteStreamCnvSvc;
     
-    /** Pointer to StoreGateSvc */
-    ServiceHandle<ActiveStoreSvc> m_activeStore; 
-    
     /** Pointer to IROBDataProviderSvc */
     ServiceHandle<IROBDataProviderSvc> m_robSvc;
     
diff --git a/TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileRawChannelContByteStreamCnv.h b/TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileRawChannelContByteStreamCnv.h
index 809cf89ee65b88212270672df6a9a432f3f0fe33..0aea20c6954f042f30c5f9e595a7d598c9c79e50 100644
--- a/TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileRawChannelContByteStreamCnv.h
+++ b/TileCalorimeter/TileSvc/TileByteStream/TileByteStream/TileRawChannelContByteStreamCnv.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TILEBYTESTREAM_TILERAWCHANNELCONTRAWEVENTCNV_H
@@ -20,7 +20,6 @@ class DataObject;
 class StatusCode;
 class IAddressCreator;
 class IByteStreamEventAccess;
-class ActiveStoreSvc;
 class MsgStream; 
 class TileRawChannelContainer; 
 class TileRawChannelContByteStreamTool ; 
@@ -71,9 +70,6 @@ class TileRawChannelContByteStreamCnv
     ServiceHandle<IByteStreamEventAccess> m_byteStreamEventAccess;
     ByteStreamCnvSvc* m_byteStreamCnvSvc;
     
-    /** Pointer to StoreGateSvc */
-    ServiceHandle<ActiveStoreSvc> m_activeStore; 
-    
     /** Pointer to IROBDataProviderSvc */
     ServiceHandle<IROBDataProviderSvc> m_robSvc;
     
diff --git a/TileCalorimeter/TileSvc/TileByteStream/share/TileBeamElemContByteStreamCnv_test.ref b/TileCalorimeter/TileSvc/TileByteStream/share/TileBeamElemContByteStreamCnv_test.ref
index d8f490c66023cfea759185e8dd8643e052506b4e..f7dc11d9443db14a99535d1cc70c28c0829190fe 100644
--- a/TileCalorimeter/TileSvc/TileByteStream/share/TileBeamElemContByteStreamCnv_test.ref
+++ b/TileCalorimeter/TileSvc/TileByteStream/share/TileBeamElemContByteStreamCnv_test.ref
@@ -1,14 +1,14 @@
-Tue Jan 22 02:18:29 CET 2019
+Sat Jan 26 19:46:28 CET 2019
 Preloading tcmalloc_minimal.so
 Py:Athena            INFO including file "AthenaCommon/Preparation.py"
-Py:Athena            INFO using release [WorkDir-22.0.1] [x86_64-slc6-gcc62-dbg] [atlas-work3/5871b6e8de] -- built on [2019-01-21T2115]
+Py:Athena            INFO using release [WorkDir-22.0.1] [x86_64-slc6-gcc62-opt] [atlas-work3/5e0c78d866] -- built on [2019-01-26T1705]
 Py:Athena            INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
 Py:Athena            INFO executing ROOT6Setup
 Py:Athena            INFO including file "AthenaCommon/Execution.py"
 Py:Athena            INFO including file "TileByteStream/TileBeamElemContByteStreamCnv_test.py"
 [?1034hSetGeometryVersion.py obtained major release version 22
 Py:Athena            INFO including file "IdDictDetDescrCnv/IdDictDetDescrCnv_joboptions.py"
-Py:ConfigurableDb    INFO Read module info for 5456 configurables from 80 genConfDb files
+Py:ConfigurableDb    INFO Read module info for 5456 configurables from 76 genConfDb files
 Py:ConfigurableDb    INFO No duplicates have been found: that's good !
 EventInfoMgtInit: Got release version  Athena-22.0.1
 Py:IOVDbSvc.CondDB    INFO Setting up conditions DB access to instance OFLP200
@@ -34,7 +34,7 @@ ApplicationMgr       INFO Updating Gaudi::PluginService::SetDebug(level) to leve
 ApplicationMgr    SUCCESS 
 ====================================================================================================================================
                                                    Welcome to ApplicationMgr (GaudiCoreSvc v30r5)
-                                          running on lxplus068.cern.ch on Tue Jan 22 02:18:58 2019
+                                          running on lxplus062.cern.ch on Sat Jan 26 19:46:52 2019
 ====================================================================================================================================
 ApplicationMgr       INFO Successfully loaded modules : AthenaServices
 ApplicationMgr       INFO Application Manager Configured successfully
@@ -51,8 +51,8 @@ PoolSvc              INFO io_register[PoolSvc](xmlcatalog_file:PoolFileCatalog.x
 PoolSvc              INFO Set connectionsvc retry/timeout/IDLE timeout to  'ConnectionRetrialPeriod':300/ 'ConnectionRetrialTimeOut':3600/ 'ConnectionTimeOut':5 seconds with connection cleanup disabled
 PoolSvc              INFO Frontier compression level set to 5
 DBReplicaSvc         INFO Frontier server at (serverurl=http://atlasfrontier-local.cern.ch:8000/atlr)(serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://lcgft-atlas.gridpp.rl.ac.uk:3128/frontierATLAS)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://ca-proxy.cern.ch:3128)(proxyurl=http://ca-proxy-meyrin.cern.ch:3128)(proxyurl=http://ca-proxy-wigner.cern.ch:3128)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
-DBReplicaSvc         INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/dbreplica.config
-DBReplicaSvc         INFO Total of 10 servers found for host lxplus068.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
+DBReplicaSvc         INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/dbreplica.config
+DBReplicaSvc         INFO Total of 10 servers found for host lxplus062.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
 PoolSvc              INFO Successfully setup replica sorting algorithm
 PoolSvc              INFO Setting up APR FileCatalog and Streams
 PoolSvc           WARNING Unable to locate catalog for prfile:poolcond/PoolCat_oflcond.xml check your ATLAS_POOLCOND_PATH and DATAPATH variables
@@ -193,7 +193,7 @@ EndcapDMConstru...   INFO Start building EC electronics geometry
   multi-layered version of absorbers activated, mlabs == 1
 ================================================
 EndcapDMConstru...   INFO Start building EC electronics geometry
-GeoModelSvc          INFO GeoModelSvc.LArDetectorToolNV	 SZ= 28576Kb 	 Time = 1.63S
+GeoModelSvc          INFO GeoModelSvc.LArDetectorToolNV	 SZ= 23964Kb 	 Time = 0.65S
 GeoModelSvc.Til...   INFO  Entering TileDetectorTool::create()
 TileDddbManager      INFO m_tag = ATLAS-R2-2016-01-00-01
 TileDddbManager      INFO n_tiglob = 5
@@ -205,7 +205,7 @@ TileDddbManager      INFO n_tileSwitches = 1
 ClassIDSvc           INFO  getRegistryEntries: read 213 CLIDRegistry entries for module ALL
 CaloIDHelper_ID...   INFO in createObj: creating a TileID helper object in the detector store
 AtlasDetectorID      INFO initialize_from_dictionary - OK
-TileNeighbour        INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/TileNeighbour_reduced.txt
+TileNeighbour        INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/TileNeighbour_reduced.txt
 TileHWIDDetDesc...   INFO in createObj: creating a TileHWID helper object in the detector store
 TileHWID             INFO initialize_from_dictionary 
 AtlasDetectorID      INFO initialize_from_dictionary - OK
@@ -217,9 +217,9 @@ CaloIDHelper_ID...   INFO in createObj: creating a LArHEC_ID helper object in th
 AtlasDetectorID      INFO initialize_from_dictionary - OK
 CaloIDHelper_ID...   INFO in createObj: creating a LArFCAL_ID helper object in the detector store
 AtlasDetectorID      INFO initialize_from_dictionary - OK
-LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/FCal2DNeighbors-April2011.txt
-LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/FCal3DNeighborsNext-April2011.txt
-LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/FCal3DNeighborsPrev-April2011.txt
+LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/FCal2DNeighbors-April2011.txt
+LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/FCal3DNeighborsNext-April2011.txt
+LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/FCal3DNeighborsPrev-April2011.txt
 CaloIDHelper_ID...   INFO in createObj: creating a LArMiniFCAL_ID helper object in the detector store
 AtlasDetectorID      INFO initialize_from_dictionary - OK
 LArMiniFCAL_ID       INFO  initialize_from_dict - LArCalorimeter dictionary does NOT contain miniFCAL description. Unable to initialize LArMiniFCAL_ID.
@@ -250,11 +250,11 @@ GeoModelSvc.Til...   INFO                                    PLUG2  Rmin= 2981 R
 GeoModelSvc.Til...   INFO  Positioning negative ITC with translation -3405
 GeoModelSvc.Til...   INFO  Positioning negative Gap with translation -3552
 GeoModelSvc.Til...   INFO  Positioning negative Crack with translation -3536
-GeoModelSvc.Til...   INFO  Global positioning of barrel with rotation (0,0,0)) and translation (0,0,0) GeoModelKernelUnits::cm
-GeoModelSvc.Til...   INFO  Global positioning of positive ext.barrel with rotation (0,0,0)) and translation (0,0,0) GeoModelKernelUnits::cm
-GeoModelSvc.Til...   INFO  Global positioning of negative ext.barrel with rotation (0,0,0)) and translation (0,0,1) GeoModelKernelUnits::cm
+GeoModelSvc.Til...   INFO  Global positioning of barrel with rotation (0,0,0)) and translation (0,0,0) Gaudi::Units::cm
+GeoModelSvc.Til...   INFO  Global positioning of positive ext.barrel with rotation (0,0,0)) and translation (0,0,0) Gaudi::Units::cm
+GeoModelSvc.Til...   INFO  Global positioning of negative ext.barrel with rotation (0,0,0)) and translation (0,0,1) Gaudi::Units::cm
 TileDetDescrMan...   INFO Entering create_elements()
-GeoModelSvc          INFO GeoModelSvc.TileDetectorTool	 SZ= 4172Kb 	 Time = 1.75S
+GeoModelSvc          INFO GeoModelSvc.TileDetectorTool	 SZ= 3568Kb 	 Time = 0.25S
 ClassIDSvc           INFO  getRegistryEntries: read 65 CLIDRegistry entries for module ALL
 TileInfoLoader       INFO Initializing....TileInfoLoader
 TileInfoLoader       INFO New ATLAS geometry detected: ATLAS-R2-2016-01-00-01 (010001) version 10001
@@ -276,11 +276,11 @@ TileInfoLoader       INFO Sampling fraction for E2 cells 1/107
 TileInfoLoader       INFO Sampling fraction for E3 cells 1/97
 TileInfoLoader       INFO Sampling fraction for E4 cells 1/75
 TileInfoLoader       INFO Sampling fraction for E4' cells 1/75
-TileInfoLoader       INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/pulsehi_physics.dat
-TileInfoLoader       INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/pulselo_physics.dat
-TileInfoLoader       INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/pulse_adder_tower_physics.dat
-TileInfoLoader       INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/pulse_adder_muonRcv_physics.dat
-TileInfoLoader       INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/pulse_adder_muon_physics.dat
+TileInfoLoader       INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/pulsehi_physics.dat
+TileInfoLoader       INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/pulselo_physics.dat
+TileInfoLoader       INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/pulse_adder_tower_physics.dat
+TileInfoLoader       INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/pulse_adder_muonRcv_physics.dat
+TileInfoLoader       INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/pulse_adder_muon_physics.dat
 CaloIDHelper_ID...   INFO in createObj: creating a CaloLVL1_ID helper object in the detector store
 CaloLVL1_ID          INFO initialize_from_dictionary
 AtlasDetectorID      INFO initialize_from_dictionary - OK
@@ -388,12 +388,12 @@ CaloIDHelper_ID...   INFO in createObj: creating a LArHEC_SuperCell_ID helper ob
 AtlasDetectorID      INFO initialize_from_dictionary - OK
 CaloIDHelper_ID...   INFO in createObj: creating a LArFCAL_SuperCell_ID helper object in the detector store
 AtlasDetectorID      INFO initialize_from_dictionary - OK
-LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/FCalSuperCells2DNeighborsNew-April2014.txt
-LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
-LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
+LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/FCalSuperCells2DNeighborsNew-April2014.txt
+LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
+LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
 CaloIDHelper_ID...   INFO in createObj: creating a Tile_SuperCell_ID helper object in the detector store
 AtlasDetectorID      INFO initialize_from_dictionary - OK
-TileNeighbour        INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/TileSuperCellNeighbour.txt
+TileNeighbour        INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/TileSuperCellNeighbour.txt
 AtlasDetectorID      INFO initialize_from_dictionary - OK
 CaloIdMgrDetDes...   INFO  Finished 
 CaloIdMgrDetDes...   INFO Initializing CaloIdMgr from values in CaloIdMgrDetDescrCnv 
@@ -422,7 +422,7 @@ TileBadChannels...   INFO TileBchStatus::isNoisy() is defined by: Large HF noise
 TileBadChannels...   INFO TileBchStatus::isNoGainL1() is defined by: ADC dead; No PMT connected; No HV; Channel masked for LV1 (unspecified); LV1 channel no gain; LV1 channel noisy; Channel disabled for LV1; 
 TileBadChannels...   INFO TileBchStatus::isBadTiming() is defined by: Bad timing; Online bad timing; 
 TileBadChannels...   INFO No drawer trips probabilities found in DB
-ClassIDSvc           INFO  getRegistryEntries: read 2407 CLIDRegistry entries for module ALL
+ClassIDSvc           INFO  getRegistryEntries: read 2427 CLIDRegistry entries for module ALL
 ClassIDSvc           INFO  getRegistryEntries: read 89 CLIDRegistry entries for module ALL
 ToolSvc.TileROD...   INFO TileL2Builder initialization completed
 AthenaEventLoopMgr   INFO   ===>>>  done processing event #1129572, run #204073 1 events processed so far  <<<===
@@ -640,23 +640,23 @@ IncidentProcAlg2     INFO Finalize
 EventInfoByteSt...   INFO finalize 
 PyComponentMgr       INFO Finalizing PyComponentMgr...
 IdDictDetDescrCnv    INFO in finalize
-IOVDbFolder          INFO Folder /LAR/Align (PoolRef) db-read 1/1 objs/chan/bytes 1/1/340 ((     0.47 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/CES (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/104132 ((     0.62 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/CIS/FIT/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/108 ((     0.51 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/CIS/FIT/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/108 ((     0.51 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/EMS (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/116 ((     0.42 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/LAS/FIBER (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/964 ((     0.47 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/LAS/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/96 ((     0.50 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/LAS/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/104 ((     0.49 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/NOISE/SAMPLE (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/643828 ((     0.59 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/STATUS/ADC (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/93084 ((     0.68 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/TIME/CHANNELOFFSET/PHY (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/120 ((     0.53 ))s
-IOVDbFolder          INFO Folder /TILE/ONL01/STATUS/ADC (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/100 ((     0.06 ))s
-IOVDbFolder          INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 1/1 objs/chan/bytes 1/1/390 ((     0.35 ))s
-IOVDbSvc             INFO  bytes in ((      6.22 ))s
+IOVDbFolder          INFO Folder /LAR/Align (PoolRef) db-read 1/1 objs/chan/bytes 1/1/340 ((     3.69 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/CES (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/104132 ((     0.81 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/CIS/FIT/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/108 ((     1.40 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/CIS/FIT/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/108 ((     0.86 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/EMS (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/116 ((     0.88 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/LAS/FIBER (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/964 ((     0.54 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/LAS/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/96 ((     0.52 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/LAS/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/104 ((     0.54 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/NOISE/SAMPLE (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/643828 ((     3.88 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/STATUS/ADC (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/93084 ((     0.61 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/TIME/CHANNELOFFSET/PHY (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/120 ((     0.83 ))s
+IOVDbFolder          INFO Folder /TILE/ONL01/STATUS/ADC (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/100 ((     0.04 ))s
+IOVDbFolder          INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 1/1 objs/chan/bytes 1/1/390 ((     0.88 ))s
+IOVDbSvc             INFO  bytes in ((     15.48 ))s
 IOVDbSvc             INFO Connection sqlite://;schema=mycool.db;dbname=OFLP200 : nConnect: 0 nFolders: 0 ReadTime: ((     0.00 ))s
-IOVDbSvc             INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 2 nFolders: 2 ReadTime: ((     0.82 ))s
-IOVDbSvc             INFO Connection COOLOFL_TILE/OFLP200 : nConnect: 2 nFolders: 11 ReadTime: ((     5.40 ))s
+IOVDbSvc             INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 2 nFolders: 2 ReadTime: ((     4.58 ))s
+IOVDbSvc             INFO Connection COOLOFL_TILE/OFLP200 : nConnect: 2 nFolders: 11 ReadTime: ((    10.91 ))s
 TileInfoLoader       INFO TileInfoLoader::finalize()
 AthDictLoaderSvc     INFO in finalize...
 ToolSvc              INFO Removing all tools created by ToolSvc
@@ -665,18 +665,18 @@ ToolSvc.TileROD...   INFO Finalizing
 *****Chrono*****     INFO ****************************************************************************************************
 *****Chrono*****     INFO  The Final CPU consumption ( Chrono ) Table (ordered)
 *****Chrono*****     INFO ****************************************************************************************************
-cObjR_ALL            INFO Time User   : Tot= 0.77  [s] Ave/Min/Max=0.385(+-0.365)/ 0.02/ 0.75  [s] #=  2
-cObj_ALL             INFO Time User   : Tot= 0.98  [s] Ave/Min/Max=0.0754(+-0.221)/    0/ 0.83  [s] #= 13
-ChronoStatSvc        INFO Time User   : Tot= 26.5  [s]                                             #=  1
+cObjR_ALL            INFO Time User   : Tot=  450 [ms] Ave/Min/Max=  225(+-  225)/    0/  450 [ms] #=  2
+cObj_ALL             INFO Time User   : Tot= 0.55  [s] Ave/Min/Max=0.0423(+-0.128)/    0/ 0.48  [s] #= 13
+ChronoStatSvc        INFO Time User   : Tot= 10.7  [s]                                             #=  1
 *****Chrono*****     INFO ****************************************************************************************************
 ChronoStatSvc.f...   INFO  Service finalized successfully 
 ApplicationMgr       INFO Application Manager Finalized successfully
 ApplicationMgr       INFO Application Manager Terminated successfully
 Py:Athena            INFO leaving with code 0: "successful run"
-Tue Jan 22 02:19:56 CET 2019
+Sat Jan 26 19:47:37 CET 2019
 Preloading tcmalloc_minimal.so
 Py:Athena            INFO including file "AthenaCommon/Preparation.py"
-Py:Athena            INFO using release [WorkDir-22.0.1] [x86_64-slc6-gcc62-dbg] [atlas-work3/5871b6e8de] -- built on [2019-01-21T2115]
+Py:Athena            INFO using release [WorkDir-22.0.1] [x86_64-slc6-gcc62-opt] [atlas-work3/5e0c78d866] -- built on [2019-01-26T1705]
 Py:Athena            INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
 Py:Athena            INFO executing ROOT6Setup
 Py:Athena            INFO configuring AthenaHive with [4] concurrent threads and [4] concurrent events
@@ -685,7 +685,7 @@ Py:Athena            INFO including file "AthenaCommon/Execution.py"
 Py:Athena            INFO including file "TileByteStream/TileBeamElemContByteStreamCnv_test.py"
 [?1034hSetGeometryVersion.py obtained major release version 22
 Py:Athena            INFO including file "IdDictDetDescrCnv/IdDictDetDescrCnv_joboptions.py"
-Py:ConfigurableDb    INFO Read module info for 5456 configurables from 80 genConfDb files
+Py:ConfigurableDb    INFO Read module info for 5456 configurables from 76 genConfDb files
 Py:ConfigurableDb    INFO No duplicates have been found: that's good !
 EventInfoMgtInit: Got release version  Athena-22.0.1
 Py:IOVDbSvc.CondDB    INFO Setting up conditions DB access to instance OFLP200
@@ -712,7 +712,7 @@ MessageSvc           INFO Activating in a separate thread
 ApplicationMgr    SUCCESS 
 ====================================================================================================================================
                                                    Welcome to ApplicationMgr (GaudiCoreSvc v30r5)
-                                          running on lxplus068.cern.ch on Tue Jan 22 02:20:28 2019
+                                          running on lxplus062.cern.ch on Sat Jan 26 19:48:01 2019
 ====================================================================================================================================
 ApplicationMgr       INFO Successfully loaded modules : AthenaServices
 ApplicationMgr       INFO Application Manager Configured successfully
@@ -728,8 +728,8 @@ PoolSvc                                            INFO io_register[PoolSvc](xml
 PoolSvc                                            INFO Set connectionsvc retry/timeout/IDLE timeout to  'ConnectionRetrialPeriod':300/ 'ConnectionRetrialTimeOut':3600/ 'ConnectionTimeOut':5 seconds with connection cleanup disabled
 PoolSvc                                            INFO Frontier compression level set to 5
 DBReplicaSvc                                       INFO Frontier server at (serverurl=http://atlasfrontier-local.cern.ch:8000/atlr)(serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://lcgft-atlas.gridpp.rl.ac.uk:3128/frontierATLAS)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://ca-proxy.cern.ch:3128)(proxyurl=http://ca-proxy-meyrin.cern.ch:3128)(proxyurl=http://ca-proxy-wigner.cern.ch:3128)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
-DBReplicaSvc                                       INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/dbreplica.config
-DBReplicaSvc                                       INFO Total of 10 servers found for host lxplus068.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
+DBReplicaSvc                                       INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/dbreplica.config
+DBReplicaSvc                                       INFO Total of 10 servers found for host lxplus062.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
 PoolSvc                                            INFO Successfully setup replica sorting algorithm
 PoolSvc                                            INFO Setting up APR FileCatalog and Streams
 PoolSvc                                         WARNING Unable to locate catalog for prfile:poolcond/PoolCat_oflcond.xml check your ATLAS_POOLCOND_PATH and DATAPATH variables
@@ -871,7 +871,7 @@ EndcapDMConstruction                               INFO Start building EC electr
   multi-layered version of absorbers activated, mlabs == 1
 ================================================
 EndcapDMConstruction                               INFO Start building EC electronics geometry
-GeoModelSvc                                        INFO GeoModelSvc.LArDetectorToolNV	 SZ= 28576Kb 	 Time = 1.58S
+GeoModelSvc                                        INFO GeoModelSvc.LArDetectorToolNV	 SZ= 22940Kb 	 Time = 0.69S
 GeoModelSvc.TileDetectorTool                       INFO  Entering TileDetectorTool::create()
 TileDddbManager                                    INFO m_tag = ATLAS-R2-2016-01-00-01
 TileDddbManager                                    INFO n_tiglob = 5
@@ -883,7 +883,7 @@ TileDddbManager                                    INFO n_tileSwitches = 1
 ClassIDSvc                                         INFO  getRegistryEntries: read 213 CLIDRegistry entries for module ALL
 CaloIDHelper_IDDetDescrCnv                         INFO in createObj: creating a TileID helper object in the detector store
 AtlasDetectorID                                    INFO initialize_from_dictionary - OK
-TileNeighbour                                      INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/TileNeighbour_reduced.txt
+TileNeighbour                                      INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/TileNeighbour_reduced.txt
 TileHWIDDetDescrCnv                                INFO in createObj: creating a TileHWID helper object in the detector store
 TileHWID                                           INFO initialize_from_dictionary 
 AtlasDetectorID                                    INFO initialize_from_dictionary - OK
@@ -895,9 +895,9 @@ CaloIDHelper_IDDetDescrCnv                         INFO in createObj: creating a
 AtlasDetectorID                                    INFO initialize_from_dictionary - OK
 CaloIDHelper_IDDetDescrCnv                         INFO in createObj: creating a LArFCAL_ID helper object in the detector store
 AtlasDetectorID                                    INFO initialize_from_dictionary - OK
-LArFCAL_Base_ID                                    INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/FCal2DNeighbors-April2011.txt
-LArFCAL_Base_ID                                    INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/FCal3DNeighborsNext-April2011.txt
-LArFCAL_Base_ID                                    INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/FCal3DNeighborsPrev-April2011.txt
+LArFCAL_Base_ID                                    INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/FCal2DNeighbors-April2011.txt
+LArFCAL_Base_ID                                    INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/FCal3DNeighborsNext-April2011.txt
+LArFCAL_Base_ID                                    INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/FCal3DNeighborsPrev-April2011.txt
 CaloIDHelper_IDDetDescrCnv                         INFO in createObj: creating a LArMiniFCAL_ID helper object in the detector store
 AtlasDetectorID                                    INFO initialize_from_dictionary - OK
 LArMiniFCAL_ID                                     INFO  initialize_from_dict - LArCalorimeter dictionary does NOT contain miniFCAL description. Unable to initialize LArMiniFCAL_ID.
@@ -928,11 +928,11 @@ GeoModelSvc.TileDetectorTool                       INFO
 GeoModelSvc.TileDetectorTool                       INFO  Positioning negative ITC with translation -3405
 GeoModelSvc.TileDetectorTool                       INFO  Positioning negative Gap with translation -3552
 GeoModelSvc.TileDetectorTool                       INFO  Positioning negative Crack with translation -3536
-GeoModelSvc.TileDetectorTool                       INFO  Global positioning of barrel with rotation (0,0,0)) and translation (0,0,0) GeoModelKernelUnits::cm
-GeoModelSvc.TileDetectorTool                       INFO  Global positioning of positive ext.barrel with rotation (0,0,0)) and translation (0,0,0) GeoModelKernelUnits::cm
-GeoModelSvc.TileDetectorTool                       INFO  Global positioning of negative ext.barrel with rotation (0,0,0)) and translation (0,0,1) GeoModelKernelUnits::cm
+GeoModelSvc.TileDetectorTool                       INFO  Global positioning of barrel with rotation (0,0,0)) and translation (0,0,0) Gaudi::Units::cm
+GeoModelSvc.TileDetectorTool                       INFO  Global positioning of positive ext.barrel with rotation (0,0,0)) and translation (0,0,0) Gaudi::Units::cm
+GeoModelSvc.TileDetectorTool                       INFO  Global positioning of negative ext.barrel with rotation (0,0,0)) and translation (0,0,1) Gaudi::Units::cm
 TileDetDescrManager                                INFO Entering create_elements()
-GeoModelSvc                                        INFO GeoModelSvc.TileDetectorTool	 SZ= 4172Kb 	 Time = 1.76S
+GeoModelSvc                                        INFO GeoModelSvc.TileDetectorTool	 SZ= 4592Kb 	 Time = 0.21S
 ClassIDSvc                                         INFO  getRegistryEntries: read 65 CLIDRegistry entries for module ALL
 TileInfoLoader                                     INFO Initializing....TileInfoLoader
 TileInfoLoader                                     INFO New ATLAS geometry detected: ATLAS-R2-2016-01-00-01 (010001) version 10001
@@ -954,11 +954,11 @@ TileInfoLoader                                     INFO Sampling fraction for E2
 TileInfoLoader                                     INFO Sampling fraction for E3 cells 1/97
 TileInfoLoader                                     INFO Sampling fraction for E4 cells 1/75
 TileInfoLoader                                     INFO Sampling fraction for E4' cells 1/75
-TileInfoLoader                                     INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/pulsehi_physics.dat
-TileInfoLoader                                     INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/pulselo_physics.dat
-TileInfoLoader                                     INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/pulse_adder_tower_physics.dat
-TileInfoLoader                                     INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/pulse_adder_muonRcv_physics.dat
-TileInfoLoader                                     INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/pulse_adder_muon_physics.dat
+TileInfoLoader                                     INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/pulsehi_physics.dat
+TileInfoLoader                                     INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/pulselo_physics.dat
+TileInfoLoader                                     INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/pulse_adder_tower_physics.dat
+TileInfoLoader                                     INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/pulse_adder_muonRcv_physics.dat
+TileInfoLoader                                     INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/pulse_adder_muon_physics.dat
 CaloIDHelper_IDDetDescrCnv                         INFO in createObj: creating a CaloLVL1_ID helper object in the detector store
 CaloLVL1_ID                                        INFO initialize_from_dictionary
 AtlasDetectorID                                    INFO initialize_from_dictionary - OK
@@ -1078,12 +1078,12 @@ CaloIDHelper_IDDetDescrCnv              0   0      INFO in createObj: creating a
 AtlasDetectorID                         0   0      INFO initialize_from_dictionary - OK
 CaloIDHelper_IDDetDescrCnv              0   0      INFO in createObj: creating a LArFCAL_SuperCell_ID helper object in the detector store
 AtlasDetectorID                         0   0      INFO initialize_from_dictionary - OK
-LArFCAL_Base_ID                         0   0      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/FCalSuperCells2DNeighborsNew-April2014.txt
-LArFCAL_Base_ID                         0   0      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
-LArFCAL_Base_ID                         0   0      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
+LArFCAL_Base_ID                         0   0      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/FCalSuperCells2DNeighborsNew-April2014.txt
+LArFCAL_Base_ID                         0   0      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
+LArFCAL_Base_ID                         0   0      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
 CaloIDHelper_IDDetDescrCnv              0   0      INFO in createObj: creating a Tile_SuperCell_ID helper object in the detector store
 AtlasDetectorID                         0   0      INFO initialize_from_dictionary - OK
-TileNeighbour                           0   0      INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/TileSuperCellNeighbour.txt
+TileNeighbour                           0   0      INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/TileSuperCellNeighbour.txt
 AtlasDetectorID                         0   0      INFO initialize_from_dictionary - OK
 CaloIdMgrDetDescrCnv                    0   0      INFO  Finished 
 CaloIdMgrDetDescrCnv                    0   0      INFO Initializing CaloIdMgr from values in CaloIdMgrDetDescrCnv 
@@ -1091,7 +1091,7 @@ Domain[ROOT_All]                        0   0      INFO ->  Access   DbDatabase
 Domain[ROOT_All]                        0   0      INFO                           /cvmfs/atlas-condb.cern.ch/repo/conditions/cond08/cond08_mc.000003.gen.COND/cond08_mc.000003.gen.COND._0064.pool.root
 RootDatabase.open                       0   0      INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond08/cond08_mc.000003.gen.COND/cond08_mc.000003.gen.COND._0064.pool.root File version:52200
 AthenaHiveEventLoopMgr                  0   0      INFO   ===>>>  start processing event #1129572, run #204073 on slot 0,  0 events processed so far  <<<===
-ClassIDSvc                              0   0      INFO  getRegistryEntries: read 650 CLIDRegistry entries for module ALL
+ClassIDSvc                              0   0      INFO  getRegistryEntries: read 670 CLIDRegistry entries for module ALL
 ClassIDSvc                              0   0      INFO  getRegistryEntries: read 1757 CLIDRegistry entries for module ALL
 ClassIDSvc                              0   0      INFO  getRegistryEntries: read 89 CLIDRegistry entries for module ALL
 ToolSvc.TileROD_Decoder.TileROD_L2Bui...0   0      INFO TileL2Builder initialization completed
@@ -1294,7 +1294,7 @@ AthenaHiveEventLoopMgr                             INFO   ===>>>  done processin
 AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1148893, run #204073 on slot 0,  98 events processed so far  <<<===
 AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1156938, run #204073 on slot 1,  99 events processed so far  <<<===
 AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1156351, run #204073 on slot 3,  100 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO ---> Loop Finished (seconds): 25.7376
+AthenaHiveEventLoopMgr                             INFO ---> Loop Finished (seconds): 14.0322
 /cvmfs/atlas-condb.cern.ch/repo/condi...           INFO Database being retired...
 Domain[ROOT_All]                                   INFO ->  Deaccess DbDatabase   READ      [ROOT_All] 06C9EAE8-6F5B-E011-BAAA-003048F0E7AC
 /cvmfs/atlas-condb.cern.ch/repo/condi...           INFO Database being retired...
@@ -1312,7 +1312,7 @@ AvalancheSchedulerSvc                              INFO Joining Scheduler thread
 PyComponentMgr                                     INFO Finalizing PyComponentMgr...
 IdDictDetDescrCnv                                  INFO in finalize
 EventDataSvc                                       INFO Finalizing EventDataSvc - package version StoreGate-00-00-00
-IOVDbFolder                                        INFO Folder /LAR/Align (PoolRef) db-read 1/1 objs/chan/bytes 1/1/340 ((     0.56 ))s
+IOVDbFolder                                        INFO Folder /LAR/Align (PoolRef) db-read 1/1 objs/chan/bytes 1/1/340 ((     0.68 ))s
 IOVDbFolder                                        INFO Folder /TILE/OFL02/CALIB/CES (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 ((     0.00 ))s
 IOVDbFolder                                        INFO Folder /TILE/OFL02/CALIB/CIS/FIT/LIN (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 ((     0.00 ))s
 IOVDbFolder                                        INFO Folder /TILE/OFL02/CALIB/CIS/FIT/NLN (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 ((     0.00 ))s
@@ -1324,10 +1324,10 @@ IOVDbFolder                                        INFO Folder /TILE/OFL02/NOISE
 IOVDbFolder                                        INFO Folder /TILE/OFL02/STATUS/ADC (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 ((     0.00 ))s
 IOVDbFolder                                        INFO Folder /TILE/OFL02/TIME/CHANNELOFFSET/PHY (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 ((     0.00 ))s
 IOVDbFolder                                        INFO Folder /TILE/ONL01/STATUS/ADC (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 ((     0.00 ))s
-IOVDbFolder                                        INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 1/1 objs/chan/bytes 1/1/390 ((     0.46 ))s
-IOVDbSvc                                           INFO  bytes in ((      1.02 ))s
+IOVDbFolder                                        INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 1/1 objs/chan/bytes 1/1/390 ((     0.45 ))s
+IOVDbSvc                                           INFO  bytes in ((      1.13 ))s
 IOVDbSvc                                           INFO Connection sqlite://;schema=mycool.db;dbname=OFLP200 : nConnect: 0 nFolders: 0 ReadTime: ((     0.00 ))s
-IOVDbSvc                                           INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 2 nFolders: 2 ReadTime: ((     1.02 ))s
+IOVDbSvc                                           INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 2 nFolders: 2 ReadTime: ((     1.13 ))s
 IOVDbSvc                                           INFO Connection COOLOFL_TILE/OFLP200 : nConnect: 1 nFolders: 11 ReadTime: ((     0.00 ))s
 TileInfoLoader                                     INFO TileInfoLoader::finalize()
 AthDictLoaderSvc                                   INFO in finalize...
@@ -1337,9 +1337,9 @@ ToolSvc.TileROD_Decoder.TileROD_L2Bui...           INFO Finalizing
 *****Chrono*****                                   INFO ****************************************************************************************************
 *****Chrono*****                                   INFO  The Final CPU consumption ( Chrono ) Table (ordered)
 *****Chrono*****                                   INFO ****************************************************************************************************
-cObjR_ALL                                          INFO Time User   : Tot= 0.83  [s] Ave/Min/Max=0.415(+-0.395)/ 0.02/ 0.81  [s] #=  2
-cObj_ALL                                           INFO Time User   : Tot= 1.04  [s] Ave/Min/Max= 0.52(+- 0.37)/ 0.15/ 0.89  [s] #=  2
-ChronoStatSvc                                      INFO Time User   : Tot= 24.7  [s]                                             #=  1
+cObjR_ALL                                          INFO Time User   : Tot= 0.61  [s] Ave/Min/Max=0.305(+-0.295)/ 0.01/  0.6  [s] #=  2
+cObj_ALL                                           INFO Time User   : Tot= 0.76  [s] Ave/Min/Max= 0.38(+- 0.29)/ 0.09/ 0.67  [s] #=  2
+ChronoStatSvc                                      INFO Time User   : Tot= 9.34  [s]                                             #=  1
 *****Chrono*****                                   INFO ****************************************************************************************************
 ChronoStatSvc.finalize()                           INFO  Service finalized successfully 
 ApplicationMgr                                     INFO Application Manager Finalized successfully
diff --git a/TileCalorimeter/TileSvc/TileByteStream/share/TileDigitsContByteStreamCnv_test.py b/TileCalorimeter/TileSvc/TileByteStream/share/TileDigitsContByteStreamCnv_test.py
index f8ae82c3f01695e373a182abe23a5b0344881649..440a51fcc38f1bead5dd3a7ab1773fcd947535a0 100644
--- a/TileCalorimeter/TileSvc/TileByteStream/share/TileDigitsContByteStreamCnv_test.py
+++ b/TileCalorimeter/TileSvc/TileByteStream/share/TileDigitsContByteStreamCnv_test.py
@@ -65,6 +65,7 @@ globalflags.InputFormat.set_Value_and_Lock('bytestream')
 
 svcMgr.ByteStreamAddressProviderSvc.TypeNames += [
     'TileDigitsContainer/TileDigitsCnt',
+    'TileDigitsContainer/MuRcvDigitsCnt',
     ]
 
 include('TileConditions/TileConditions_jobOptions.py')
@@ -92,7 +93,6 @@ topSequence += TileDigitsDumper ('TileDigitsCntDumper',
                                  Prefix = dumpdir + '/')
 topSequence += TileDigitsDumper ('MuRcvDigitsCntDumper',
                                  TileDigitsContainer = 'MuRcvDigitsCnt',
-                                 AltTileDigitsContainer = 'TileDigitsCnt',
                                  Prefix = dumpdir + '/')
 
 
diff --git a/TileCalorimeter/TileSvc/TileByteStream/share/TileDigitsContByteStreamCnv_test.ref b/TileCalorimeter/TileSvc/TileByteStream/share/TileDigitsContByteStreamCnv_test.ref
index e224592ce7f208198e878c18253a63bdc22bd8d5..5fd786c824ae31692ee89ea161ec61c4fa66b1fd 100644
--- a/TileCalorimeter/TileSvc/TileByteStream/share/TileDigitsContByteStreamCnv_test.ref
+++ b/TileCalorimeter/TileSvc/TileByteStream/share/TileDigitsContByteStreamCnv_test.ref
@@ -1,22 +1,21 @@
-Tue Jan 22 03:53:23 CET 2019
+Mon Jan 28 10:12:10 CET 2019
 Preloading tcmalloc_minimal.so
 Py:Athena            INFO including file "AthenaCommon/Preparation.py"
-Py:Athena            INFO using release [WorkDir-22.0.1] [x86_64-slc6-gcc62-dbg] [atlas-work3/5871b6e8de] -- built on [2019-01-21T2115]
+Py:Athena            INFO using release [WorkDir-22.0.1] [x86_64-slc6-gcc62-opt] [master-tile-bytestream-tmdb-refactor/3f1c952aef] -- built on [2019-01-28T1010]
 Py:Athena            INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
 Py:Athena            INFO executing ROOT6Setup
 Py:Athena            INFO including file "AthenaCommon/Execution.py"
 Py:Athena            INFO including file "TileByteStream/TileDigitsContByteStreamCnv_test.py"
-[?1034hSetGeometryVersion.py obtained major release version 22
+SetGeometryVersion.py obtained major release version 22
 Py:Athena            INFO including file "IdDictDetDescrCnv/IdDictDetDescrCnv_joboptions.py"
-Py:ConfigurableDb    INFO Read module info for 5456 configurables from 80 genConfDb files
+Py:ConfigurableDb    INFO Read module info for 5455 configurables from 4 genConfDb files
 Py:ConfigurableDb    INFO No duplicates have been found: that's good !
 EventInfoMgtInit: Got release version  Athena-22.0.1
 Py:IOVDbSvc.CondDB    INFO Setting up conditions DB access to instance OFLP200
 Py:Athena            INFO including file "TileConditions/TileConditions_jobOptions.py"
 Py:TileInfoConf.     INFO Adding TileCablingSvc to ServiceMgr
 Py:inputFilePeeker    INFO Executing   inputFilePeeker.py
-Py:AthFile           INFO loading cache from [athfile-cache.ascii.gz]...
-Py:AthFile           INFO loading cache from [athfile-cache.ascii.gz]... [done]
+Py:AthFile           INFO opening [/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/data12_8TeV.00204073.physics_JetTauEtmiss.merge.RAW._lb0144._SFO-5._0001.1]...
 Py:inputFilePeeker    INFO stream_names not present in input bytestream file. Giving default name 'StreamRAW'
 Py:inputFilePeeker    INFO Successfully filled inputFileSummary from file /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/data12_8TeV.00204073.physics_JetTauEtmiss.merge.RAW._lb0144._SFO-5._0001.1
 Py:inputFilePeeker    INFO Extracted streams ['StreamRAW'] from input file 
@@ -34,7 +33,7 @@ ApplicationMgr       INFO Updating Gaudi::PluginService::SetDebug(level) to leve
 ApplicationMgr    SUCCESS 
 ====================================================================================================================================
                                                    Welcome to ApplicationMgr (GaudiCoreSvc v30r5)
-                                          running on lxplus068.cern.ch on Tue Jan 22 03:53:53 2019
+                                          running on pcatl12 on Mon Jan 28 10:12:24 2019
 ====================================================================================================================================
 ApplicationMgr       INFO Successfully loaded modules : AthenaServices
 ApplicationMgr       INFO Application Manager Configured successfully
@@ -51,8 +50,8 @@ PoolSvc              INFO io_register[PoolSvc](xmlcatalog_file:PoolFileCatalog.x
 PoolSvc              INFO Set connectionsvc retry/timeout/IDLE timeout to  'ConnectionRetrialPeriod':300/ 'ConnectionRetrialTimeOut':3600/ 'ConnectionTimeOut':5 seconds with connection cleanup disabled
 PoolSvc              INFO Frontier compression level set to 5
 DBReplicaSvc         INFO Frontier server at (serverurl=http://atlasfrontier-local.cern.ch:8000/atlr)(serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://lcgft-atlas.gridpp.rl.ac.uk:3128/frontierATLAS)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://ca-proxy.cern.ch:3128)(proxyurl=http://ca-proxy-meyrin.cern.ch:3128)(proxyurl=http://ca-proxy-wigner.cern.ch:3128)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
-DBReplicaSvc         INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/dbreplica.config
-DBReplicaSvc         INFO Total of 10 servers found for host lxplus068.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
+DBReplicaSvc         INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-27T2257/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/dbreplica.config
+DBReplicaSvc         INFO Total of 10 servers found for host pcatl12.dyndns.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
 PoolSvc              INFO Successfully setup replica sorting algorithm
 PoolSvc              INFO Setting up APR FileCatalog and Streams
 PoolSvc           WARNING Unable to locate catalog for prfile:poolcond/PoolCat_oflcond.xml check your ATLAS_POOLCOND_PATH and DATAPATH variables
@@ -86,6 +85,7 @@ ByteStreamAddre...   INFO -- Will fill Store with id =  0
 IOVDbSvc             INFO preLoadAddresses: Removing folder /TagInfo. It should only be in the file meta data and was not found.
 IOVDbSvc             INFO Opening COOL connection for COOLOFL_LAR/OFLP200
 ClassIDSvc           INFO  getRegistryEntries: read 3073 CLIDRegistry entries for module ALL
+ClassIDSvc           INFO  getRegistryEntries: read 792 CLIDRegistry entries for module ALL
 IOVSvc               INFO No IOVSvcTool associated with store "StoreGateSvc"
 IOVSvcTool           INFO IOVRanges will be checked at every Event
 IOVDbSvc             INFO Opening COOL connection for COOLOFL_TILE/OFLP200
@@ -104,7 +104,6 @@ IOVDbSvc             INFO Added taginfo remove for /TILE/OFL02/STATUS/ADC
 IOVDbSvc             INFO Added taginfo remove for /TILE/OFL02/TIME/CHANNELOFFSET/PHY
 IOVDbSvc             INFO Added taginfo remove for /TILE/ONL01/STATUS/ADC
 IOVDbSvc             INFO Added taginfo remove for /LAR/LArCellPositionShift
-ClassIDSvc           INFO  getRegistryEntries: read 792 CLIDRegistry entries for module ALL
 ClassIDSvc           INFO  getRegistryEntries: read 17 CLIDRegistry entries for module ALL
 DetDescrCnvSvc       INFO  initializing 
 DetDescrCnvSvc       INFO Found DetectorStore service
@@ -193,7 +192,7 @@ EndcapDMConstru...   INFO Start building EC electronics geometry
   multi-layered version of absorbers activated, mlabs == 1
 ================================================
 EndcapDMConstru...   INFO Start building EC electronics geometry
-GeoModelSvc          INFO GeoModelSvc.LArDetectorToolNV	 SZ= 28576Kb 	 Time = 1.62S
+GeoModelSvc          INFO GeoModelSvc.LArDetectorToolNV	 SZ= 22940Kb 	 Time = 0.53S
 GeoModelSvc.Til...   INFO  Entering TileDetectorTool::create()
 TileDddbManager      INFO m_tag = ATLAS-R2-2016-01-00-01
 TileDddbManager      INFO n_tiglob = 5
@@ -205,7 +204,7 @@ TileDddbManager      INFO n_tileSwitches = 1
 ClassIDSvc           INFO  getRegistryEntries: read 213 CLIDRegistry entries for module ALL
 CaloIDHelper_ID...   INFO in createObj: creating a TileID helper object in the detector store
 AtlasDetectorID      INFO initialize_from_dictionary - OK
-TileNeighbour        INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/TileNeighbour_reduced.txt
+TileNeighbour        INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-27T2257/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/TileNeighbour_reduced.txt
 TileHWIDDetDesc...   INFO in createObj: creating a TileHWID helper object in the detector store
 TileHWID             INFO initialize_from_dictionary 
 AtlasDetectorID      INFO initialize_from_dictionary - OK
@@ -217,9 +216,9 @@ CaloIDHelper_ID...   INFO in createObj: creating a LArHEC_ID helper object in th
 AtlasDetectorID      INFO initialize_from_dictionary - OK
 CaloIDHelper_ID...   INFO in createObj: creating a LArFCAL_ID helper object in the detector store
 AtlasDetectorID      INFO initialize_from_dictionary - OK
-LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/FCal2DNeighbors-April2011.txt
-LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/FCal3DNeighborsNext-April2011.txt
-LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/FCal3DNeighborsPrev-April2011.txt
+LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-27T2257/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/FCal2DNeighbors-April2011.txt
+LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-27T2257/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/FCal3DNeighborsNext-April2011.txt
+LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-27T2257/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/FCal3DNeighborsPrev-April2011.txt
 CaloIDHelper_ID...   INFO in createObj: creating a LArMiniFCAL_ID helper object in the detector store
 AtlasDetectorID      INFO initialize_from_dictionary - OK
 LArMiniFCAL_ID       INFO  initialize_from_dict - LArCalorimeter dictionary does NOT contain miniFCAL description. Unable to initialize LArMiniFCAL_ID.
@@ -250,11 +249,11 @@ GeoModelSvc.Til...   INFO                                    PLUG2  Rmin= 2981 R
 GeoModelSvc.Til...   INFO  Positioning negative ITC with translation -3405
 GeoModelSvc.Til...   INFO  Positioning negative Gap with translation -3552
 GeoModelSvc.Til...   INFO  Positioning negative Crack with translation -3536
-GeoModelSvc.Til...   INFO  Global positioning of barrel with rotation (0,0,0)) and translation (0,0,0) GeoModelKernelUnits::cm
-GeoModelSvc.Til...   INFO  Global positioning of positive ext.barrel with rotation (0,0,0)) and translation (0,0,0) GeoModelKernelUnits::cm
-GeoModelSvc.Til...   INFO  Global positioning of negative ext.barrel with rotation (0,0,0)) and translation (0,0,1) GeoModelKernelUnits::cm
+GeoModelSvc.Til...   INFO  Global positioning of barrel with rotation (0,0,0)) and translation (0,0,0) Gaudi::Units::cm
+GeoModelSvc.Til...   INFO  Global positioning of positive ext.barrel with rotation (0,0,0)) and translation (0,0,0) Gaudi::Units::cm
+GeoModelSvc.Til...   INFO  Global positioning of negative ext.barrel with rotation (0,0,0)) and translation (0,0,1) Gaudi::Units::cm
 TileDetDescrMan...   INFO Entering create_elements()
-GeoModelSvc          INFO GeoModelSvc.TileDetectorTool	 SZ= 4172Kb 	 Time = 1.7S
+GeoModelSvc          INFO GeoModelSvc.TileDetectorTool	 SZ= 4592Kb 	 Time = 0.16S
 ClassIDSvc           INFO  getRegistryEntries: read 65 CLIDRegistry entries for module ALL
 TileInfoLoader       INFO Initializing....TileInfoLoader
 TileInfoLoader       INFO New ATLAS geometry detected: ATLAS-R2-2016-01-00-01 (010001) version 10001
@@ -276,11 +275,11 @@ TileInfoLoader       INFO Sampling fraction for E2 cells 1/107
 TileInfoLoader       INFO Sampling fraction for E3 cells 1/97
 TileInfoLoader       INFO Sampling fraction for E4 cells 1/75
 TileInfoLoader       INFO Sampling fraction for E4' cells 1/75
-TileInfoLoader       INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/pulsehi_physics.dat
-TileInfoLoader       INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/pulselo_physics.dat
-TileInfoLoader       INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/pulse_adder_tower_physics.dat
-TileInfoLoader       INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/pulse_adder_muonRcv_physics.dat
-TileInfoLoader       INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/pulse_adder_muon_physics.dat
+TileInfoLoader       INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-27T2257/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/pulsehi_physics.dat
+TileInfoLoader       INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-27T2257/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/pulselo_physics.dat
+TileInfoLoader       INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-27T2257/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/pulse_adder_tower_physics.dat
+TileInfoLoader       INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-27T2257/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/pulse_adder_muonRcv_physics.dat
+TileInfoLoader       INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-27T2257/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/pulse_adder_muon_physics.dat
 CaloIDHelper_ID...   INFO in createObj: creating a CaloLVL1_ID helper object in the detector store
 CaloLVL1_ID          INFO initialize_from_dictionary
 AtlasDetectorID      INFO initialize_from_dictionary - OK
@@ -388,12 +387,12 @@ CaloIDHelper_ID...   INFO in createObj: creating a LArHEC_SuperCell_ID helper ob
 AtlasDetectorID      INFO initialize_from_dictionary - OK
 CaloIDHelper_ID...   INFO in createObj: creating a LArFCAL_SuperCell_ID helper object in the detector store
 AtlasDetectorID      INFO initialize_from_dictionary - OK
-LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/FCalSuperCells2DNeighborsNew-April2014.txt
-LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
-LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
+LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-27T2257/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/FCalSuperCells2DNeighborsNew-April2014.txt
+LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-27T2257/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
+LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-27T2257/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
 CaloIDHelper_ID...   INFO in createObj: creating a Tile_SuperCell_ID helper object in the detector store
 AtlasDetectorID      INFO initialize_from_dictionary - OK
-TileNeighbour        INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/TileSuperCellNeighbour.txt
+TileNeighbour        INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-27T2257/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/TileSuperCellNeighbour.txt
 AtlasDetectorID      INFO initialize_from_dictionary - OK
 CaloIdMgrDetDes...   INFO  Finished 
 CaloIdMgrDetDes...   INFO Initializing CaloIdMgr from values in CaloIdMgrDetDescrCnv 
@@ -422,7 +421,7 @@ TileBadChannels...   INFO TileBchStatus::isNoisy() is defined by: Large HF noise
 TileBadChannels...   INFO TileBchStatus::isNoGainL1() is defined by: ADC dead; No PMT connected; No HV; Channel masked for LV1 (unspecified); LV1 channel no gain; LV1 channel noisy; Channel disabled for LV1; 
 TileBadChannels...   INFO TileBchStatus::isBadTiming() is defined by: Bad timing; Online bad timing; 
 TileBadChannels...   INFO No drawer trips probabilities found in DB
-ClassIDSvc           INFO  getRegistryEntries: read 2407 CLIDRegistry entries for module ALL
+ClassIDSvc           INFO  getRegistryEntries: read 2427 CLIDRegistry entries for module ALL
 ClassIDSvc           INFO  getRegistryEntries: read 89 CLIDRegistry entries for module ALL
 ToolSvc.TileROD...   INFO TileL2Builder initialization completed
 ToolSvc.TileDig...   INFO Initializing TileDigitsContByteStreamTool
@@ -641,23 +640,23 @@ IncidentProcAlg2     INFO Finalize
 EventInfoByteSt...   INFO finalize 
 PyComponentMgr       INFO Finalizing PyComponentMgr...
 IdDictDetDescrCnv    INFO in finalize
-IOVDbFolder          INFO Folder /LAR/Align (PoolRef) db-read 1/1 objs/chan/bytes 1/1/340 ((     0.23 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/CES (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/104132 ((     0.69 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/CIS/FIT/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/108 ((     0.05 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/CIS/FIT/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/108 ((     0.05 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/EMS (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/116 ((     0.05 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/LAS/FIBER (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/964 ((     0.06 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/LAS/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/96 ((     0.07 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/LAS/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/104 ((     0.05 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/NOISE/SAMPLE (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/643828 ((     0.14 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/STATUS/ADC (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/93084 ((     0.44 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/TIME/CHANNELOFFSET/PHY (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/120 ((     0.66 ))s
-IOVDbFolder          INFO Folder /TILE/ONL01/STATUS/ADC (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/100 ((     0.04 ))s
-IOVDbFolder          INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 1/1 objs/chan/bytes 1/1/390 ((     0.02 ))s
-IOVDbSvc             INFO  bytes in ((      2.55 ))s
+IOVDbFolder          INFO Folder /LAR/Align (PoolRef) db-read 1/1 objs/chan/bytes 1/1/340 ((     4.44 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/CES (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/104132 ((     1.65 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/CIS/FIT/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/108 ((     1.56 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/CIS/FIT/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/108 ((     1.31 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/EMS (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/116 ((     1.24 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/LAS/FIBER (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/964 ((     1.37 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/LAS/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/96 ((     1.14 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/LAS/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/104 ((     1.34 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/NOISE/SAMPLE (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/643828 ((     1.95 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/STATUS/ADC (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/93084 ((     0.05 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/TIME/CHANNELOFFSET/PHY (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/120 ((     0.07 ))s
+IOVDbFolder          INFO Folder /TILE/ONL01/STATUS/ADC (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/100 ((     0.01 ))s
+IOVDbFolder          INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 1/1 objs/chan/bytes 1/1/390 ((     0.99 ))s
+IOVDbSvc             INFO  bytes in ((     17.12 ))s
 IOVDbSvc             INFO Connection sqlite://;schema=mycool.db;dbname=OFLP200 : nConnect: 0 nFolders: 0 ReadTime: ((     0.00 ))s
-IOVDbSvc             INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 2 nFolders: 2 ReadTime: ((     0.25 ))s
-IOVDbSvc             INFO Connection COOLOFL_TILE/OFLP200 : nConnect: 2 nFolders: 11 ReadTime: ((     2.30 ))s
+IOVDbSvc             INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 2 nFolders: 2 ReadTime: ((     5.42 ))s
+IOVDbSvc             INFO Connection COOLOFL_TILE/OFLP200 : nConnect: 2 nFolders: 11 ReadTime: ((    11.70 ))s
 TileInfoLoader       INFO TileInfoLoader::finalize()
 AthDictLoaderSvc     INFO in finalize...
 ToolSvc              INFO Removing all tools created by ToolSvc
@@ -667,27 +666,27 @@ ToolSvc.TileROD...   INFO Finalizing
 *****Chrono*****     INFO ****************************************************************************************************
 *****Chrono*****     INFO  The Final CPU consumption ( Chrono ) Table (ordered)
 *****Chrono*****     INFO ****************************************************************************************************
-cObjR_ALL            INFO Time User   : Tot= 0.85  [s] Ave/Min/Max=0.425(+-0.395)/ 0.03/ 0.82  [s] #=  2
-cObj_ALL             INFO Time User   : Tot= 1.05  [s] Ave/Min/Max=0.0808(+- 0.24)/    0/  0.9  [s] #= 13
-ChronoStatSvc        INFO Time User   : Tot= 30.1  [s]                                             #=  1
+cObjR_ALL            INFO Time User   : Tot=  310 [ms] Ave/Min/Max=  155(+-  145)/   10/  300 [ms] #=  2
+cObj_ALL             INFO Time User   : Tot=  390 [ms] Ave/Min/Max=   30(+- 90.5)/    0/  340 [ms] #= 13
+ChronoStatSvc        INFO Time User   : Tot= 7.99  [s]                                             #=  1
 *****Chrono*****     INFO ****************************************************************************************************
 ChronoStatSvc.f...   INFO  Service finalized successfully 
 ApplicationMgr       INFO Application Manager Finalized successfully
 ApplicationMgr       INFO Application Manager Terminated successfully
 Py:Athena            INFO leaving with code 0: "successful run"
-Tue Jan 22 03:54:55 CET 2019
+Mon Jan 28 10:12:58 CET 2019
 Preloading tcmalloc_minimal.so
 Py:Athena            INFO including file "AthenaCommon/Preparation.py"
-Py:Athena            INFO using release [WorkDir-22.0.1] [x86_64-slc6-gcc62-dbg] [atlas-work3/5871b6e8de] -- built on [2019-01-21T2115]
+Py:Athena            INFO using release [WorkDir-22.0.1] [x86_64-slc6-gcc62-opt] [master-tile-bytestream-tmdb-refactor/3f1c952aef] -- built on [2019-01-28T1010]
 Py:Athena            INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
 Py:Athena            INFO executing ROOT6Setup
 Py:Athena            INFO configuring AthenaHive with [4] concurrent threads and [4] concurrent events
 Py:AlgScheduler      INFO setting up AvalancheSchedulerSvc/AvalancheSchedulerSvc with 4 threads
 Py:Athena            INFO including file "AthenaCommon/Execution.py"
 Py:Athena            INFO including file "TileByteStream/TileDigitsContByteStreamCnv_test.py"
-[?1034hSetGeometryVersion.py obtained major release version 22
+SetGeometryVersion.py obtained major release version 22
 Py:Athena            INFO including file "IdDictDetDescrCnv/IdDictDetDescrCnv_joboptions.py"
-Py:ConfigurableDb    INFO Read module info for 5456 configurables from 80 genConfDb files
+Py:ConfigurableDb    INFO Read module info for 5455 configurables from 4 genConfDb files
 Py:ConfigurableDb    INFO No duplicates have been found: that's good !
 EventInfoMgtInit: Got release version  Athena-22.0.1
 Py:IOVDbSvc.CondDB    INFO Setting up conditions DB access to instance OFLP200
@@ -714,7 +713,7 @@ MessageSvc           INFO Activating in a separate thread
 ApplicationMgr    SUCCESS 
 ====================================================================================================================================
                                                    Welcome to ApplicationMgr (GaudiCoreSvc v30r5)
-                                          running on lxplus068.cern.ch on Tue Jan 22 03:55:27 2019
+                                          running on pcatl12 on Mon Jan 28 10:13:05 2019
 ====================================================================================================================================
 ApplicationMgr       INFO Successfully loaded modules : AthenaServices
 ApplicationMgr       INFO Application Manager Configured successfully
@@ -730,8 +729,8 @@ PoolSvc                                            INFO io_register[PoolSvc](xml
 PoolSvc                                            INFO Set connectionsvc retry/timeout/IDLE timeout to  'ConnectionRetrialPeriod':300/ 'ConnectionRetrialTimeOut':3600/ 'ConnectionTimeOut':5 seconds with connection cleanup disabled
 PoolSvc                                            INFO Frontier compression level set to 5
 DBReplicaSvc                                       INFO Frontier server at (serverurl=http://atlasfrontier-local.cern.ch:8000/atlr)(serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://lcgft-atlas.gridpp.rl.ac.uk:3128/frontierATLAS)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://ca-proxy.cern.ch:3128)(proxyurl=http://ca-proxy-meyrin.cern.ch:3128)(proxyurl=http://ca-proxy-wigner.cern.ch:3128)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
-DBReplicaSvc                                       INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/dbreplica.config
-DBReplicaSvc                                       INFO Total of 10 servers found for host lxplus068.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
+DBReplicaSvc                                       INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-27T2257/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/dbreplica.config
+DBReplicaSvc                                       INFO Total of 10 servers found for host pcatl12.dyndns.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
 PoolSvc                                            INFO Successfully setup replica sorting algorithm
 PoolSvc                                            INFO Setting up APR FileCatalog and Streams
 PoolSvc                                         WARNING Unable to locate catalog for prfile:poolcond/PoolCat_oflcond.xml check your ATLAS_POOLCOND_PATH and DATAPATH variables
@@ -873,7 +872,7 @@ EndcapDMConstruction                               INFO Start building EC electr
   multi-layered version of absorbers activated, mlabs == 1
 ================================================
 EndcapDMConstruction                               INFO Start building EC electronics geometry
-GeoModelSvc                                        INFO GeoModelSvc.LArDetectorToolNV	 SZ= 28576Kb 	 Time = 1.64S
+GeoModelSvc                                        INFO GeoModelSvc.LArDetectorToolNV	 SZ= 22940Kb 	 Time = 0.49S
 GeoModelSvc.TileDetectorTool                       INFO  Entering TileDetectorTool::create()
 TileDddbManager                                    INFO m_tag = ATLAS-R2-2016-01-00-01
 TileDddbManager                                    INFO n_tiglob = 5
@@ -885,7 +884,7 @@ TileDddbManager                                    INFO n_tileSwitches = 1
 ClassIDSvc                                         INFO  getRegistryEntries: read 213 CLIDRegistry entries for module ALL
 CaloIDHelper_IDDetDescrCnv                         INFO in createObj: creating a TileID helper object in the detector store
 AtlasDetectorID                                    INFO initialize_from_dictionary - OK
-TileNeighbour                                      INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/TileNeighbour_reduced.txt
+TileNeighbour                                      INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-27T2257/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/TileNeighbour_reduced.txt
 TileHWIDDetDescrCnv                                INFO in createObj: creating a TileHWID helper object in the detector store
 TileHWID                                           INFO initialize_from_dictionary 
 AtlasDetectorID                                    INFO initialize_from_dictionary - OK
@@ -897,9 +896,9 @@ CaloIDHelper_IDDetDescrCnv                         INFO in createObj: creating a
 AtlasDetectorID                                    INFO initialize_from_dictionary - OK
 CaloIDHelper_IDDetDescrCnv                         INFO in createObj: creating a LArFCAL_ID helper object in the detector store
 AtlasDetectorID                                    INFO initialize_from_dictionary - OK
-LArFCAL_Base_ID                                    INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/FCal2DNeighbors-April2011.txt
-LArFCAL_Base_ID                                    INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/FCal3DNeighborsNext-April2011.txt
-LArFCAL_Base_ID                                    INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/FCal3DNeighborsPrev-April2011.txt
+LArFCAL_Base_ID                                    INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-27T2257/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/FCal2DNeighbors-April2011.txt
+LArFCAL_Base_ID                                    INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-27T2257/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/FCal3DNeighborsNext-April2011.txt
+LArFCAL_Base_ID                                    INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-27T2257/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/FCal3DNeighborsPrev-April2011.txt
 CaloIDHelper_IDDetDescrCnv                         INFO in createObj: creating a LArMiniFCAL_ID helper object in the detector store
 AtlasDetectorID                                    INFO initialize_from_dictionary - OK
 LArMiniFCAL_ID                                     INFO  initialize_from_dict - LArCalorimeter dictionary does NOT contain miniFCAL description. Unable to initialize LArMiniFCAL_ID.
@@ -930,11 +929,11 @@ GeoModelSvc.TileDetectorTool                       INFO
 GeoModelSvc.TileDetectorTool                       INFO  Positioning negative ITC with translation -3405
 GeoModelSvc.TileDetectorTool                       INFO  Positioning negative Gap with translation -3552
 GeoModelSvc.TileDetectorTool                       INFO  Positioning negative Crack with translation -3536
-GeoModelSvc.TileDetectorTool                       INFO  Global positioning of barrel with rotation (0,0,0)) and translation (0,0,0) GeoModelKernelUnits::cm
-GeoModelSvc.TileDetectorTool                       INFO  Global positioning of positive ext.barrel with rotation (0,0,0)) and translation (0,0,0) GeoModelKernelUnits::cm
-GeoModelSvc.TileDetectorTool                       INFO  Global positioning of negative ext.barrel with rotation (0,0,0)) and translation (0,0,1) GeoModelKernelUnits::cm
+GeoModelSvc.TileDetectorTool                       INFO  Global positioning of barrel with rotation (0,0,0)) and translation (0,0,0) Gaudi::Units::cm
+GeoModelSvc.TileDetectorTool                       INFO  Global positioning of positive ext.barrel with rotation (0,0,0)) and translation (0,0,0) Gaudi::Units::cm
+GeoModelSvc.TileDetectorTool                       INFO  Global positioning of negative ext.barrel with rotation (0,0,0)) and translation (0,0,1) Gaudi::Units::cm
 TileDetDescrManager                                INFO Entering create_elements()
-GeoModelSvc                                        INFO GeoModelSvc.TileDetectorTool	 SZ= 4172Kb 	 Time = 1.86S
+GeoModelSvc                                        INFO GeoModelSvc.TileDetectorTool	 SZ= 3568Kb 	 Time = 0.17S
 ClassIDSvc                                         INFO  getRegistryEntries: read 65 CLIDRegistry entries for module ALL
 TileInfoLoader                                     INFO Initializing....TileInfoLoader
 TileInfoLoader                                     INFO New ATLAS geometry detected: ATLAS-R2-2016-01-00-01 (010001) version 10001
@@ -956,11 +955,11 @@ TileInfoLoader                                     INFO Sampling fraction for E2
 TileInfoLoader                                     INFO Sampling fraction for E3 cells 1/97
 TileInfoLoader                                     INFO Sampling fraction for E4 cells 1/75
 TileInfoLoader                                     INFO Sampling fraction for E4' cells 1/75
-TileInfoLoader                                     INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/pulsehi_physics.dat
-TileInfoLoader                                     INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/pulselo_physics.dat
-TileInfoLoader                                     INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/pulse_adder_tower_physics.dat
-TileInfoLoader                                     INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/pulse_adder_muonRcv_physics.dat
-TileInfoLoader                                     INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/pulse_adder_muon_physics.dat
+TileInfoLoader                                     INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-27T2257/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/pulsehi_physics.dat
+TileInfoLoader                                     INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-27T2257/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/pulselo_physics.dat
+TileInfoLoader                                     INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-27T2257/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/pulse_adder_tower_physics.dat
+TileInfoLoader                                     INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-27T2257/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/pulse_adder_muonRcv_physics.dat
+TileInfoLoader                                     INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-27T2257/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/pulse_adder_muon_physics.dat
 CaloIDHelper_IDDetDescrCnv                         INFO in createObj: creating a CaloLVL1_ID helper object in the detector store
 CaloLVL1_ID                                        INFO initialize_from_dictionary
 AtlasDetectorID                                    INFO initialize_from_dictionary - OK
@@ -1023,7 +1022,6 @@ AvalancheSchedulerSvc                       0      INFO Will attribute the follo
    o  ( 'TileDigitsContainer' , 'StoreGateSvc+MuRcvDigitsCnt' )     required by Algorithm: 
        * MuRcvDigitsCntDumper
    o  ( 'TileDigitsContainer' , 'StoreGateSvc+TileDigitsCnt' )     required by Algorithm: 
-       * MuRcvDigitsCntDumper
        * TileDigitsCntDumper
 PrecedenceSvc                               0      INFO Assembling CF and DF task precedence rules
 PrecedenceRulesGraph                        0      INFO CondSvc found. DF precedence rules will be augmented with 'Conditions'
@@ -1083,12 +1081,12 @@ CaloIDHelper_IDDetDescrCnv              0   0      INFO in createObj: creating a
 AtlasDetectorID                         0   0      INFO initialize_from_dictionary - OK
 CaloIDHelper_IDDetDescrCnv              0   0      INFO in createObj: creating a LArFCAL_SuperCell_ID helper object in the detector store
 AtlasDetectorID                         0   0      INFO initialize_from_dictionary - OK
-LArFCAL_Base_ID                         0   0      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/FCalSuperCells2DNeighborsNew-April2014.txt
-LArFCAL_Base_ID                         0   0      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
-LArFCAL_Base_ID                         0   0      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
+LArFCAL_Base_ID                         0   0      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-27T2257/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/FCalSuperCells2DNeighborsNew-April2014.txt
+LArFCAL_Base_ID                         0   0      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-27T2257/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
+LArFCAL_Base_ID                         0   0      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-27T2257/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
 CaloIDHelper_IDDetDescrCnv              0   0      INFO in createObj: creating a Tile_SuperCell_ID helper object in the detector store
 AtlasDetectorID                         0   0      INFO initialize_from_dictionary - OK
-TileNeighbour                           0   0      INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/TileSuperCellNeighbour.txt
+TileNeighbour                           0   0      INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-27T2257/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/TileSuperCellNeighbour.txt
 AtlasDetectorID                         0   0      INFO initialize_from_dictionary - OK
 CaloIdMgrDetDescrCnv                    0   0      INFO  Finished 
 CaloIdMgrDetDescrCnv                    0   0      INFO Initializing CaloIdMgr from values in CaloIdMgrDetDescrCnv 
@@ -1096,195 +1094,191 @@ Domain[ROOT_All]                        0   0      INFO ->  Access   DbDatabase
 Domain[ROOT_All]                        0   0      INFO                           /cvmfs/atlas-condb.cern.ch/repo/conditions/cond08/cond08_mc.000003.gen.COND/cond08_mc.000003.gen.COND._0064.pool.root
 RootDatabase.open                       0   0      INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond08/cond08_mc.000003.gen.COND/cond08_mc.000003.gen.COND._0064.pool.root File version:52200
 AthenaHiveEventLoopMgr                  0   0      INFO   ===>>>  start processing event #1129572, run #204073 on slot 0,  0 events processed so far  <<<===
-ClassIDSvc                              0   0      INFO  getRegistryEntries: read 650 CLIDRegistry entries for module ALL
-SGInputLoader                           0   0   WARNING unable to find proxy for  ( 'TileDigitsContainer' , 'StoreGateSvc+MuRcvDigitsCnt' ) 
+ClassIDSvc                              0   0      INFO  getRegistryEntries: read 670 CLIDRegistry entries for module ALL
 ClassIDSvc                              0   0      INFO  getRegistryEntries: read 1757 CLIDRegistry entries for module ALL
 ClassIDSvc                              0   0      INFO  getRegistryEntries: read 89 CLIDRegistry entries for module ALL
 ToolSvc.TileROD_Decoder.TileROD_L2Bui...0   0      INFO TileL2Builder initialization completed
 ToolSvc.TileDigitsContByteStreamTool    0   0      INFO Initializing TileDigitsContByteStreamTool
 AthenaHiveEventLoopMgr                  1   1      INFO   ===>>>  start processing event #1129665, run #204073 on slot 1,  0 events processed so far  <<<===
-SGInputLoader                           1   1   WARNING unable to find proxy for  ( 'TileDigitsContainer' , 'StoreGateSvc+MuRcvDigitsCnt' ) 
 AthenaHiveEventLoopMgr                  2   2      INFO   ===>>>  start processing event #1131212, run #204073 on slot 2,  0 events processed so far  <<<===
-SGInputLoader                           2   2   WARNING unable to find proxy for  ( 'TileDigitsContainer' , 'StoreGateSvc+MuRcvDigitsCnt' ) 
 AthenaHiveEventLoopMgr                  3   3      INFO   ===>>>  start processing event #1131086, run #204073 on slot 3,  0 events processed so far  <<<===
-SGInputLoader                           3   3   WARNING unable to find proxy for  ( 'TileDigitsContainer' , 'StoreGateSvc+MuRcvDigitsCnt' ) 
 AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1129665, run #204073 on slot 1,  1 events processed so far  <<<===
 AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1129572, run #204073 on slot 0,  2 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  4   0      INFO   ===>>>  start processing event #1130272, run #204073 on slot 0,  2 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  5   1      INFO   ===>>>  start processing event #1131269, run #204073 on slot 1,  2 events processed so far  <<<===
 AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1131212, run #204073 on slot 2,  3 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  4   0      INFO   ===>>>  start processing event #1130272, run #204073 on slot 0,  3 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  5   1      INFO   ===>>>  start processing event #1131269, run #204073 on slot 1,  3 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  6   2      INFO   ===>>>  start processing event #1130716, run #204073 on slot 2,  3 events processed so far  <<<===
 AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1131086, run #204073 on slot 3,  4 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  6   2      INFO   ===>>>  start processing event #1130716, run #204073 on slot 2,  4 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  7   3      INFO   ===>>>  start processing event #1132019, run #204073 on slot 3,  4 events processed so far  <<<===
 AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1130272, run #204073 on slot 0,  5 events processed so far  <<<===
 AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1131269, run #204073 on slot 1,  6 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  7   0      INFO   ===>>>  start processing event #1132019, run #204073 on slot 0,  6 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  8   1      INFO   ===>>>  start processing event #1132092, run #204073 on slot 1,  6 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  9   3      INFO   ===>>>  start processing event #1130238, run #204073 on slot 3,  6 events processed so far  <<<===
 AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1130716, run #204073 on slot 2,  7 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  8   0      INFO   ===>>>  start processing event #1132092, run #204073 on slot 0,  7 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  9   1      INFO   ===>>>  start processing event #1130238, run #204073 on slot 1,  7 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  10  2      INFO   ===>>>  start processing event #1134553, run #204073 on slot 2,  7 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1132019, run #204073 on slot 3,  8 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1132092, run #204073 on slot 0,  9 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1130238, run #204073 on slot 1,  10 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  11  0      INFO   ===>>>  start processing event #1130999, run #204073 on slot 0,  10 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  12  1      INFO   ===>>>  start processing event #1133461, run #204073 on slot 1,  10 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  13  3      INFO   ===>>>  start processing event #1131152, run #204073 on slot 3,  10 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1134553, run #204073 on slot 2,  11 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1130999, run #204073 on slot 0,  12 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1133461, run #204073 on slot 1,  13 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  14  0      INFO   ===>>>  start processing event #1130142, run #204073 on slot 0,  13 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  15  1      INFO   ===>>>  start processing event #1132770, run #204073 on slot 1,  13 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  16  2      INFO   ===>>>  start processing event #1132365, run #204073 on slot 2,  13 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1131152, run #204073 on slot 3,  14 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1130142, run #204073 on slot 0,  15 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1132770, run #204073 on slot 1,  16 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  17  0      INFO   ===>>>  start processing event #1136791, run #204073 on slot 0,  16 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  18  1      INFO   ===>>>  start processing event #1133781, run #204073 on slot 1,  16 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  19  3      INFO   ===>>>  start processing event #1132067, run #204073 on slot 3,  16 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1132365, run #204073 on slot 2,  17 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1136791, run #204073 on slot 0,  18 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  20  0      INFO   ===>>>  start processing event #1138637, run #204073 on slot 0,  18 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  21  2      INFO   ===>>>  start processing event #1139495, run #204073 on slot 2,  18 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1133781, run #204073 on slot 1,  19 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1132067, run #204073 on slot 3,  20 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  22  1      INFO   ===>>>  start processing event #1140193, run #204073 on slot 1,  20 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  23  3      INFO   ===>>>  start processing event #1142953, run #204073 on slot 3,  20 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1138637, run #204073 on slot 0,  21 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1139495, run #204073 on slot 2,  22 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1140193, run #204073 on slot 1,  23 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  24  0      INFO   ===>>>  start processing event #1139127, run #204073 on slot 0,  23 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  25  1      INFO   ===>>>  start processing event #1141272, run #204073 on slot 1,  23 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  26  2      INFO   ===>>>  start processing event #1137117, run #204073 on slot 2,  23 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1142953, run #204073 on slot 3,  24 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1139127, run #204073 on slot 0,  25 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  27  0      INFO   ===>>>  start processing event #1139599, run #204073 on slot 0,  25 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  28  3      INFO   ===>>>  start processing event #1140314, run #204073 on slot 3,  25 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1141272, run #204073 on slot 1,  26 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  29  1      INFO   ===>>>  start processing event #1133685, run #204073 on slot 1,  26 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1137117, run #204073 on slot 2,  27 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1139599, run #204073 on slot 0,  28 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1140314, run #204073 on slot 3,  29 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  30  0      INFO   ===>>>  start processing event #1143279, run #204073 on slot 0,  29 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  31  2      INFO   ===>>>  start processing event #1137563, run #204073 on slot 2,  29 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  32  3      INFO   ===>>>  start processing event #1139927, run #204073 on slot 3,  29 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1132019, run #204073 on slot 0,  8 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1132092, run #204073 on slot 1,  9 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  10  0      INFO   ===>>>  start processing event #1134553, run #204073 on slot 0,  9 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  11  1      INFO   ===>>>  start processing event #1130999, run #204073 on slot 1,  9 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  12  2      INFO   ===>>>  start processing event #1133461, run #204073 on slot 2,  9 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1130238, run #204073 on slot 3,  10 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1134553, run #204073 on slot 0,  11 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1130999, run #204073 on slot 1,  12 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  13  0      INFO   ===>>>  start processing event #1131152, run #204073 on slot 0,  12 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  14  1      INFO   ===>>>  start processing event #1130142, run #204073 on slot 1,  12 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  15  3      INFO   ===>>>  start processing event #1132770, run #204073 on slot 3,  12 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1133461, run #204073 on slot 2,  13 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1131152, run #204073 on slot 0,  14 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1130142, run #204073 on slot 1,  15 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  16  0      INFO   ===>>>  start processing event #1132365, run #204073 on slot 0,  15 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  17  1      INFO   ===>>>  start processing event #1136791, run #204073 on slot 1,  15 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  18  2      INFO   ===>>>  start processing event #1133781, run #204073 on slot 2,  15 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1132770, run #204073 on slot 3,  16 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1132365, run #204073 on slot 0,  17 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1136791, run #204073 on slot 1,  18 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  19  0      INFO   ===>>>  start processing event #1132067, run #204073 on slot 0,  18 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  20  1      INFO   ===>>>  start processing event #1138637, run #204073 on slot 1,  18 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  21  3      INFO   ===>>>  start processing event #1139495, run #204073 on slot 3,  18 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1133781, run #204073 on slot 2,  19 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1132067, run #204073 on slot 0,  20 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1138637, run #204073 on slot 1,  21 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  22  0      INFO   ===>>>  start processing event #1140193, run #204073 on slot 0,  21 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  23  1      INFO   ===>>>  start processing event #1142953, run #204073 on slot 1,  21 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  24  2      INFO   ===>>>  start processing event #1139127, run #204073 on slot 2,  21 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1139495, run #204073 on slot 3,  22 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1140193, run #204073 on slot 0,  23 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1142953, run #204073 on slot 1,  24 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  25  0      INFO   ===>>>  start processing event #1141272, run #204073 on slot 0,  24 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  26  1      INFO   ===>>>  start processing event #1137117, run #204073 on slot 1,  24 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  27  3      INFO   ===>>>  start processing event #1139599, run #204073 on slot 3,  24 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1139127, run #204073 on slot 2,  25 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1141272, run #204073 on slot 0,  26 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1137117, run #204073 on slot 1,  27 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  28  0      INFO   ===>>>  start processing event #1140314, run #204073 on slot 0,  27 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  29  1      INFO   ===>>>  start processing event #1133685, run #204073 on slot 1,  27 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  30  2      INFO   ===>>>  start processing event #1143279, run #204073 on slot 2,  27 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1139599, run #204073 on slot 3,  28 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1140314, run #204073 on slot 0,  29 events processed so far  <<<===
 AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1133685, run #204073 on slot 1,  30 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1143279, run #204073 on slot 0,  31 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  33  0      INFO   ===>>>  start processing event #1141197, run #204073 on slot 0,  31 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  34  1      INFO   ===>>>  start processing event #1140039, run #204073 on slot 1,  31 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1137563, run #204073 on slot 2,  32 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1139927, run #204073 on slot 3,  33 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  35  2      INFO   ===>>>  start processing event #1142531, run #204073 on slot 2,  33 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  36  3      INFO   ===>>>  start processing event #1139475, run #204073 on slot 3,  33 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1141197, run #204073 on slot 0,  34 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1140039, run #204073 on slot 1,  35 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  37  0      INFO   ===>>>  start processing event #1139958, run #204073 on slot 0,  35 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  38  1      INFO   ===>>>  start processing event #1143765, run #204073 on slot 1,  35 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1142531, run #204073 on slot 2,  36 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1139475, run #204073 on slot 3,  37 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  39  2      INFO   ===>>>  start processing event #1143097, run #204073 on slot 2,  37 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  40  3      INFO   ===>>>  start processing event #1134147, run #204073 on slot 3,  37 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  31  0      INFO   ===>>>  start processing event #1137563, run #204073 on slot 0,  30 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  32  1      INFO   ===>>>  start processing event #1139927, run #204073 on slot 1,  30 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  33  3      INFO   ===>>>  start processing event #1141197, run #204073 on slot 3,  30 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1143279, run #204073 on slot 2,  31 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1137563, run #204073 on slot 0,  32 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1139927, run #204073 on slot 1,  33 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  34  0      INFO   ===>>>  start processing event #1140039, run #204073 on slot 0,  33 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  35  1      INFO   ===>>>  start processing event #1142531, run #204073 on slot 1,  33 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  36  2      INFO   ===>>>  start processing event #1139475, run #204073 on slot 2,  33 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1141197, run #204073 on slot 3,  34 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1140039, run #204073 on slot 0,  35 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1142531, run #204073 on slot 1,  36 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  37  0      INFO   ===>>>  start processing event #1139958, run #204073 on slot 0,  36 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  38  1      INFO   ===>>>  start processing event #1143765, run #204073 on slot 1,  36 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  39  3      INFO   ===>>>  start processing event #1143097, run #204073 on slot 3,  36 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1139475, run #204073 on slot 2,  37 events processed so far  <<<===
 AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1139958, run #204073 on slot 0,  38 events processed so far  <<<===
 AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1143765, run #204073 on slot 1,  39 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  41  0      INFO   ===>>>  start processing event #1137156, run #204073 on slot 0,  39 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  42  1      INFO   ===>>>  start processing event #1136377, run #204073 on slot 1,  39 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1143097, run #204073 on slot 2,  40 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  43  2      INFO   ===>>>  start processing event #1137842, run #204073 on slot 2,  40 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1134147, run #204073 on slot 3,  41 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1137156, run #204073 on slot 0,  42 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1136377, run #204073 on slot 1,  43 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  44  0      INFO   ===>>>  start processing event #1141705, run #204073 on slot 0,  43 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  45  1      INFO   ===>>>  start processing event #1143410, run #204073 on slot 1,  43 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  46  3      INFO   ===>>>  start processing event #1144170, run #204073 on slot 3,  43 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1137842, run #204073 on slot 2,  44 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  47  2      INFO   ===>>>  start processing event #1145987, run #204073 on slot 2,  44 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1141705, run #204073 on slot 0,  45 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1143410, run #204073 on slot 1,  46 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1144170, run #204073 on slot 3,  47 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  48  0      INFO   ===>>>  start processing event #1145633, run #204073 on slot 0,  47 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  49  1      INFO   ===>>>  start processing event #1135005, run #204073 on slot 1,  47 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  50  3      INFO   ===>>>  start processing event #1142167, run #204073 on slot 3,  47 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1145987, run #204073 on slot 2,  48 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1145633, run #204073 on slot 0,  49 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  51  0      INFO   ===>>>  start processing event #1144646, run #204073 on slot 0,  49 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  52  2      INFO   ===>>>  start processing event #1145027, run #204073 on slot 2,  49 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1135005, run #204073 on slot 1,  50 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1142167, run #204073 on slot 3,  51 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  40  0      INFO   ===>>>  start processing event #1134147, run #204073 on slot 0,  39 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  41  1      INFO   ===>>>  start processing event #1137156, run #204073 on slot 1,  39 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  42  2      INFO   ===>>>  start processing event #1136377, run #204073 on slot 2,  39 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1143097, run #204073 on slot 3,  40 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1134147, run #204073 on slot 0,  41 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1137156, run #204073 on slot 1,  42 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  43  0      INFO   ===>>>  start processing event #1137842, run #204073 on slot 0,  42 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  44  1      INFO   ===>>>  start processing event #1141705, run #204073 on slot 1,  42 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  45  3      INFO   ===>>>  start processing event #1143410, run #204073 on slot 3,  42 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1136377, run #204073 on slot 2,  43 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1137842, run #204073 on slot 0,  44 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1141705, run #204073 on slot 1,  45 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  46  0      INFO   ===>>>  start processing event #1144170, run #204073 on slot 0,  45 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  47  1      INFO   ===>>>  start processing event #1145987, run #204073 on slot 1,  45 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  48  2      INFO   ===>>>  start processing event #1145633, run #204073 on slot 2,  45 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1143410, run #204073 on slot 3,  46 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1144170, run #204073 on slot 0,  47 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1145987, run #204073 on slot 1,  48 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  49  0      INFO   ===>>>  start processing event #1135005, run #204073 on slot 0,  48 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  50  1      INFO   ===>>>  start processing event #1142167, run #204073 on slot 1,  48 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  51  3      INFO   ===>>>  start processing event #1144646, run #204073 on slot 3,  48 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1145633, run #204073 on slot 2,  49 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1135005, run #204073 on slot 0,  50 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1142167, run #204073 on slot 1,  51 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  52  0      INFO   ===>>>  start processing event #1145027, run #204073 on slot 0,  51 events processed so far  <<<===
 AthenaHiveEventLoopMgr                  53  1      INFO   ===>>>  start processing event #1144112, run #204073 on slot 1,  51 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  54  3      INFO   ===>>>  start processing event #1138485, run #204073 on slot 3,  51 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1144646, run #204073 on slot 0,  52 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1145027, run #204073 on slot 2,  53 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  55  0      INFO   ===>>>  start processing event #1144565, run #204073 on slot 0,  53 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  56  2      INFO   ===>>>  start processing event #1139498, run #204073 on slot 2,  53 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  54  2      INFO   ===>>>  start processing event #1138485, run #204073 on slot 2,  51 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1144646, run #204073 on slot 3,  52 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1145027, run #204073 on slot 0,  53 events processed so far  <<<===
 AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1144112, run #204073 on slot 1,  54 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1138485, run #204073 on slot 3,  55 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  57  1      INFO   ===>>>  start processing event #1136546, run #204073 on slot 1,  55 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  58  3      INFO   ===>>>  start processing event #1143799, run #204073 on slot 3,  55 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  55  0      INFO   ===>>>  start processing event #1144565, run #204073 on slot 0,  54 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  56  1      INFO   ===>>>  start processing event #1139498, run #204073 on slot 1,  54 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  57  3      INFO   ===>>>  start processing event #1136546, run #204073 on slot 3,  54 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1138485, run #204073 on slot 2,  55 events processed so far  <<<===
 AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1144565, run #204073 on slot 0,  56 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1139498, run #204073 on slot 2,  57 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  59  0      INFO   ===>>>  start processing event #1142877, run #204073 on slot 0,  57 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1139498, run #204073 on slot 1,  57 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  58  0      INFO   ===>>>  start processing event #1143799, run #204073 on slot 0,  57 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  59  1      INFO   ===>>>  start processing event #1142877, run #204073 on slot 1,  57 events processed so far  <<<===
 AthenaHiveEventLoopMgr                  60  2      INFO   ===>>>  start processing event #1149894, run #204073 on slot 2,  57 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1136546, run #204073 on slot 1,  58 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1143799, run #204073 on slot 3,  59 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  61  1      INFO   ===>>>  start processing event #1145364, run #204073 on slot 1,  59 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  62  3      INFO   ===>>>  start processing event #1143770, run #204073 on slot 3,  59 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1142877, run #204073 on slot 0,  60 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1136546, run #204073 on slot 3,  58 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1143799, run #204073 on slot 0,  59 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1142877, run #204073 on slot 1,  60 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  61  0      INFO   ===>>>  start processing event #1145364, run #204073 on slot 0,  60 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  62  1      INFO   ===>>>  start processing event #1143770, run #204073 on slot 1,  60 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  63  3      INFO   ===>>>  start processing event #1148361, run #204073 on slot 3,  60 events processed so far  <<<===
 AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1149894, run #204073 on slot 2,  61 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  63  0      INFO   ===>>>  start processing event #1148361, run #204073 on slot 0,  61 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  64  2      INFO   ===>>>  start processing event #1148167, run #204073 on slot 2,  61 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1145364, run #204073 on slot 1,  62 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1143770, run #204073 on slot 3,  63 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1148361, run #204073 on slot 0,  64 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  65  0      INFO   ===>>>  start processing event #1138948, run #204073 on slot 0,  64 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  66  1      INFO   ===>>>  start processing event #1144808, run #204073 on slot 1,  64 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  67  3      INFO   ===>>>  start processing event #1145832, run #204073 on slot 3,  64 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1148167, run #204073 on slot 2,  65 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1138948, run #204073 on slot 0,  66 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1144808, run #204073 on slot 1,  67 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  68  0      INFO   ===>>>  start processing event #1153100, run #204073 on slot 0,  67 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  69  1      INFO   ===>>>  start processing event #1142524, run #204073 on slot 1,  67 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  70  2      INFO   ===>>>  start processing event #1138294, run #204073 on slot 2,  67 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1145832, run #204073 on slot 3,  68 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1153100, run #204073 on slot 0,  69 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  71  0      INFO   ===>>>  start processing event #1138350, run #204073 on slot 0,  69 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  72  3      INFO   ===>>>  start processing event #1149424, run #204073 on slot 3,  69 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1142524, run #204073 on slot 1,  70 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1138294, run #204073 on slot 2,  71 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1138350, run #204073 on slot 0,  72 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1145364, run #204073 on slot 0,  62 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1143770, run #204073 on slot 1,  63 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  64  0      INFO   ===>>>  start processing event #1148167, run #204073 on slot 0,  63 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  65  1      INFO   ===>>>  start processing event #1138948, run #204073 on slot 1,  63 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  66  2      INFO   ===>>>  start processing event #1144808, run #204073 on slot 2,  63 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1148361, run #204073 on slot 3,  64 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1148167, run #204073 on slot 0,  65 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1138948, run #204073 on slot 1,  66 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  67  0      INFO   ===>>>  start processing event #1145832, run #204073 on slot 0,  66 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  68  1      INFO   ===>>>  start processing event #1153100, run #204073 on slot 1,  66 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  69  3      INFO   ===>>>  start processing event #1142524, run #204073 on slot 3,  66 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1144808, run #204073 on slot 2,  67 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1145832, run #204073 on slot 0,  68 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1153100, run #204073 on slot 1,  69 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  70  0      INFO   ===>>>  start processing event #1138294, run #204073 on slot 0,  69 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  71  1      INFO   ===>>>  start processing event #1138350, run #204073 on slot 1,  69 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  72  2      INFO   ===>>>  start processing event #1149424, run #204073 on slot 2,  69 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1142524, run #204073 on slot 3,  70 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1138294, run #204073 on slot 0,  71 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1138350, run #204073 on slot 1,  72 events processed so far  <<<===
 AthenaHiveEventLoopMgr                  73  0      INFO   ===>>>  start processing event #1151102, run #204073 on slot 0,  72 events processed so far  <<<===
 AthenaHiveEventLoopMgr                  74  1      INFO   ===>>>  start processing event #1152242, run #204073 on slot 1,  72 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  75  2      INFO   ===>>>  start processing event #1148416, run #204073 on slot 2,  72 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1149424, run #204073 on slot 3,  73 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  75  3      INFO   ===>>>  start processing event #1148416, run #204073 on slot 3,  72 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1149424, run #204073 on slot 2,  73 events processed so far  <<<===
 AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1151102, run #204073 on slot 0,  74 events processed so far  <<<===
 AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1152242, run #204073 on slot 1,  75 events processed so far  <<<===
 AthenaHiveEventLoopMgr                  76  0      INFO   ===>>>  start processing event #1142753, run #204073 on slot 0,  75 events processed so far  <<<===
 AthenaHiveEventLoopMgr                  77  1      INFO   ===>>>  start processing event #1149997, run #204073 on slot 1,  75 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  78  3      INFO   ===>>>  start processing event #1151617, run #204073 on slot 3,  75 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1148416, run #204073 on slot 2,  76 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  78  2      INFO   ===>>>  start processing event #1151617, run #204073 on slot 2,  75 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1148416, run #204073 on slot 3,  76 events processed so far  <<<===
 AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1142753, run #204073 on slot 0,  77 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  79  0      INFO   ===>>>  start processing event #1149794, run #204073 on slot 0,  77 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  80  2      INFO   ===>>>  start processing event #1152504, run #204073 on slot 2,  77 events processed so far  <<<===
 AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1149997, run #204073 on slot 1,  78 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1151617, run #204073 on slot 3,  79 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  79  0      INFO   ===>>>  start processing event #1149794, run #204073 on slot 0,  78 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  80  1      INFO   ===>>>  start processing event #1152504, run #204073 on slot 1,  78 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  81  3      INFO   ===>>>  start processing event #1142485, run #204073 on slot 3,  78 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1151617, run #204073 on slot 2,  79 events processed so far  <<<===
 AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1149794, run #204073 on slot 0,  80 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  81  0      INFO   ===>>>  start processing event #1142485, run #204073 on slot 0,  80 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  82  1      INFO   ===>>>  start processing event #1151364, run #204073 on slot 1,  80 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  83  3      INFO   ===>>>  start processing event #1143901, run #204073 on slot 3,  80 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1152504, run #204073 on slot 2,  81 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1142485, run #204073 on slot 0,  82 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  84  0      INFO   ===>>>  start processing event #1153979, run #204073 on slot 0,  82 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  85  2      INFO   ===>>>  start processing event #1150212, run #204073 on slot 2,  82 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1151364, run #204073 on slot 1,  83 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1143901, run #204073 on slot 3,  84 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1153979, run #204073 on slot 0,  85 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  86  0      INFO   ===>>>  start processing event #1152633, run #204073 on slot 0,  85 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  87  1      INFO   ===>>>  start processing event #1155482, run #204073 on slot 1,  85 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  88  3      INFO   ===>>>  start processing event #1150472, run #204073 on slot 3,  85 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1150212, run #204073 on slot 2,  86 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1152633, run #204073 on slot 0,  87 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  89  0      INFO   ===>>>  start processing event #1140275, run #204073 on slot 0,  87 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1152504, run #204073 on slot 1,  81 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  82  0      INFO   ===>>>  start processing event #1151364, run #204073 on slot 0,  81 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  83  1      INFO   ===>>>  start processing event #1143901, run #204073 on slot 1,  81 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  84  2      INFO   ===>>>  start processing event #1153979, run #204073 on slot 2,  81 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1142485, run #204073 on slot 3,  82 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1151364, run #204073 on slot 0,  83 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1143901, run #204073 on slot 1,  84 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  85  0      INFO   ===>>>  start processing event #1150212, run #204073 on slot 0,  84 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  86  1      INFO   ===>>>  start processing event #1152633, run #204073 on slot 1,  84 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  87  3      INFO   ===>>>  start processing event #1155482, run #204073 on slot 3,  84 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1153979, run #204073 on slot 2,  85 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1150212, run #204073 on slot 0,  86 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1152633, run #204073 on slot 1,  87 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  88  0      INFO   ===>>>  start processing event #1150472, run #204073 on slot 0,  87 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  89  1      INFO   ===>>>  start processing event #1140275, run #204073 on slot 1,  87 events processed so far  <<<===
 AthenaHiveEventLoopMgr                  90  2      INFO   ===>>>  start processing event #1145882, run #204073 on slot 2,  87 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1155482, run #204073 on slot 1,  88 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1150472, run #204073 on slot 3,  89 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1140275, run #204073 on slot 0,  90 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1155482, run #204073 on slot 3,  88 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1150472, run #204073 on slot 0,  89 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1140275, run #204073 on slot 1,  90 events processed so far  <<<===
 AthenaHiveEventLoopMgr                  91  0      INFO   ===>>>  start processing event #1151732, run #204073 on slot 0,  90 events processed so far  <<<===
 AthenaHiveEventLoopMgr                  92  1      INFO   ===>>>  start processing event #1137896, run #204073 on slot 1,  90 events processed so far  <<<===
 AthenaHiveEventLoopMgr                  93  3      INFO   ===>>>  start processing event #1156381, run #204073 on slot 3,  90 events processed so far  <<<===
@@ -1304,7 +1298,7 @@ AthenaHiveEventLoopMgr                             INFO   ===>>>  done processin
 AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1148893, run #204073 on slot 0,  98 events processed so far  <<<===
 AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1156938, run #204073 on slot 1,  99 events processed so far  <<<===
 AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1156351, run #204073 on slot 3,  100 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO ---> Loop Finished (seconds): 21.757
+AthenaHiveEventLoopMgr                             INFO ---> Loop Finished (seconds): 6.63342
 /cvmfs/atlas-condb.cern.ch/repo/condi...           INFO Database being retired...
 Domain[ROOT_All]                                   INFO ->  Deaccess DbDatabase   READ      [ROOT_All] 06C9EAE8-6F5B-E011-BAAA-003048F0E7AC
 /cvmfs/atlas-condb.cern.ch/repo/condi...           INFO Database being retired...
@@ -1317,14 +1311,12 @@ Finalizer                                          INFO Finalizing Finalizer...
 Finalize: compared 20 dumps
 CondInputLoader                                    INFO Finalizing CondInputLoader...
 IncidentProcAlg2                                   INFO Finalize
-StoreGateSvc                                    WARNING Called record() on these objects in a MT store
-StoreGateSvc                                    WARNING TileDigitsContainer/MuRcvDigitsCnt [TileDigitsDumper/MuRcvDigitsCntDumper]
 EventInfoByteStreamCnv                             INFO finalize 
 AvalancheSchedulerSvc                              INFO Joining Scheduler thread
 PyComponentMgr                                     INFO Finalizing PyComponentMgr...
 IdDictDetDescrCnv                                  INFO in finalize
 EventDataSvc                                       INFO Finalizing EventDataSvc - package version StoreGate-00-00-00
-IOVDbFolder                                        INFO Folder /LAR/Align (PoolRef) db-read 1/1 objs/chan/bytes 1/1/340 ((     0.16 ))s
+IOVDbFolder                                        INFO Folder /LAR/Align (PoolRef) db-read 1/1 objs/chan/bytes 1/1/340 ((     0.87 ))s
 IOVDbFolder                                        INFO Folder /TILE/OFL02/CALIB/CES (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 ((     0.00 ))s
 IOVDbFolder                                        INFO Folder /TILE/OFL02/CALIB/CIS/FIT/LIN (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 ((     0.00 ))s
 IOVDbFolder                                        INFO Folder /TILE/OFL02/CALIB/CIS/FIT/NLN (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 ((     0.00 ))s
@@ -1336,10 +1328,10 @@ IOVDbFolder                                        INFO Folder /TILE/OFL02/NOISE
 IOVDbFolder                                        INFO Folder /TILE/OFL02/STATUS/ADC (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 ((     0.00 ))s
 IOVDbFolder                                        INFO Folder /TILE/OFL02/TIME/CHANNELOFFSET/PHY (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 ((     0.00 ))s
 IOVDbFolder                                        INFO Folder /TILE/ONL01/STATUS/ADC (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 ((     0.00 ))s
-IOVDbFolder                                        INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 1/1 objs/chan/bytes 1/1/390 ((     0.03 ))s
-IOVDbSvc                                           INFO  bytes in ((      0.19 ))s
+IOVDbFolder                                        INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 1/1 objs/chan/bytes 1/1/390 ((     0.89 ))s
+IOVDbSvc                                           INFO  bytes in ((      1.76 ))s
 IOVDbSvc                                           INFO Connection sqlite://;schema=mycool.db;dbname=OFLP200 : nConnect: 0 nFolders: 0 ReadTime: ((     0.00 ))s
-IOVDbSvc                                           INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 2 nFolders: 2 ReadTime: ((     0.19 ))s
+IOVDbSvc                                           INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 2 nFolders: 2 ReadTime: ((     1.76 ))s
 IOVDbSvc                                           INFO Connection COOLOFL_TILE/OFLP200 : nConnect: 1 nFolders: 11 ReadTime: ((     0.00 ))s
 TileInfoLoader                                     INFO TileInfoLoader::finalize()
 AthDictLoaderSvc                                   INFO in finalize...
@@ -1348,11 +1340,12 @@ ToolSvc.ByteStreamMetadataTool                     INFO in finalize()
 ToolSvc.TileDigitsContByteStreamTool               INFO Finalizing TileDigitsContByteStreamTool successfuly
 ToolSvc.TileROD_Decoder.TileROD_L2Bui...           INFO Finalizing
 *****Chrono*****                                   INFO ****************************************************************************************************
+*****Chrono*****                                   INFO WARNING: MT job; statistics are unreliable
 *****Chrono*****                                   INFO  The Final CPU consumption ( Chrono ) Table (ordered)
 *****Chrono*****                                   INFO ****************************************************************************************************
-cObjR_ALL                                          INFO Time User   : Tot= 0.77  [s] Ave/Min/Max=0.385(+-0.365)/ 0.02/ 0.75  [s] #=  2
-cObj_ALL                                           INFO Time User   : Tot= 0.98  [s] Ave/Min/Max= 0.49(+- 0.35)/ 0.14/ 0.84  [s] #=  2
-ChronoStatSvc                                      INFO Time User   : Tot= 27.7  [s]                                             #=  1
+cObjR_ALL                                          INFO Time User   : Tot=  280 [ms] Ave/Min/Max=  140(+-  130)/   10/  270 [ms] #=  2
+cObj_ALL                                           INFO Time User   : Tot=  360 [ms] Ave/Min/Max=  180(+-  130)/   50/  310 [ms] #=  2
+ChronoStatSvc                                      INFO Time User   : Tot=  6.6  [s]                                             #=  1
 *****Chrono*****                                   INFO ****************************************************************************************************
 ChronoStatSvc.finalize()                           INFO  Service finalized successfully 
 ApplicationMgr                                     INFO Application Manager Finalized successfully
diff --git a/TileCalorimeter/TileSvc/TileByteStream/share/TileL2ContByteStreamCnv_test.ref b/TileCalorimeter/TileSvc/TileByteStream/share/TileL2ContByteStreamCnv_test.ref
index 01702ded0a183d9fba82708057741d04f90c866f..6df5c6c40fe478aa4f14cf6a9f056fb6f6e29448 100644
--- a/TileCalorimeter/TileSvc/TileByteStream/share/TileL2ContByteStreamCnv_test.ref
+++ b/TileCalorimeter/TileSvc/TileByteStream/share/TileL2ContByteStreamCnv_test.ref
@@ -1,14 +1,14 @@
-Tue Jan 22 02:31:43 CET 2019
+Sat Jan 26 19:51:16 CET 2019
 Preloading tcmalloc_minimal.so
 Py:Athena            INFO including file "AthenaCommon/Preparation.py"
-Py:Athena            INFO using release [WorkDir-22.0.1] [x86_64-slc6-gcc62-dbg] [atlas-work3/5871b6e8de] -- built on [2019-01-21T2115]
+Py:Athena            INFO using release [WorkDir-22.0.1] [x86_64-slc6-gcc62-opt] [atlas-work3/5e0c78d866] -- built on [2019-01-26T1705]
 Py:Athena            INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
 Py:Athena            INFO executing ROOT6Setup
 Py:Athena            INFO including file "AthenaCommon/Execution.py"
 Py:Athena            INFO including file "TileByteStream/TileL2ContByteStreamCnv_test.py"
 [?1034hSetGeometryVersion.py obtained major release version 22
 Py:Athena            INFO including file "IdDictDetDescrCnv/IdDictDetDescrCnv_joboptions.py"
-Py:ConfigurableDb    INFO Read module info for 5456 configurables from 80 genConfDb files
+Py:ConfigurableDb    INFO Read module info for 5456 configurables from 76 genConfDb files
 Py:ConfigurableDb    INFO No duplicates have been found: that's good !
 EventInfoMgtInit: Got release version  Athena-22.0.1
 Py:IOVDbSvc.CondDB    INFO Setting up conditions DB access to instance OFLP200
@@ -34,7 +34,7 @@ ApplicationMgr       INFO Updating Gaudi::PluginService::SetDebug(level) to leve
 ApplicationMgr    SUCCESS 
 ====================================================================================================================================
                                                    Welcome to ApplicationMgr (GaudiCoreSvc v30r5)
-                                          running on lxplus068.cern.ch on Tue Jan 22 02:32:17 2019
+                                          running on lxplus062.cern.ch on Sat Jan 26 19:51:38 2019
 ====================================================================================================================================
 ApplicationMgr       INFO Successfully loaded modules : AthenaServices
 ApplicationMgr       INFO Application Manager Configured successfully
@@ -51,8 +51,8 @@ PoolSvc              INFO io_register[PoolSvc](xmlcatalog_file:PoolFileCatalog.x
 PoolSvc              INFO Set connectionsvc retry/timeout/IDLE timeout to  'ConnectionRetrialPeriod':300/ 'ConnectionRetrialTimeOut':3600/ 'ConnectionTimeOut':5 seconds with connection cleanup disabled
 PoolSvc              INFO Frontier compression level set to 5
 DBReplicaSvc         INFO Frontier server at (serverurl=http://atlasfrontier-local.cern.ch:8000/atlr)(serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://lcgft-atlas.gridpp.rl.ac.uk:3128/frontierATLAS)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://ca-proxy.cern.ch:3128)(proxyurl=http://ca-proxy-meyrin.cern.ch:3128)(proxyurl=http://ca-proxy-wigner.cern.ch:3128)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
-DBReplicaSvc         INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/dbreplica.config
-DBReplicaSvc         INFO Total of 10 servers found for host lxplus068.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
+DBReplicaSvc         INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/dbreplica.config
+DBReplicaSvc         INFO Total of 10 servers found for host lxplus062.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
 PoolSvc              INFO Successfully setup replica sorting algorithm
 PoolSvc              INFO Setting up APR FileCatalog and Streams
 PoolSvc           WARNING Unable to locate catalog for prfile:poolcond/PoolCat_oflcond.xml check your ATLAS_POOLCOND_PATH and DATAPATH variables
@@ -193,7 +193,7 @@ EndcapDMConstru...   INFO Start building EC electronics geometry
   multi-layered version of absorbers activated, mlabs == 1
 ================================================
 EndcapDMConstru...   INFO Start building EC electronics geometry
-GeoModelSvc          INFO GeoModelSvc.LArDetectorToolNV	 SZ= 28576Kb 	 Time = 1.68S
+GeoModelSvc          INFO GeoModelSvc.LArDetectorToolNV	 SZ= 23964Kb 	 Time = 0.67S
 GeoModelSvc.Til...   INFO  Entering TileDetectorTool::create()
 TileDddbManager      INFO m_tag = ATLAS-R2-2016-01-00-01
 TileDddbManager      INFO n_tiglob = 5
@@ -205,7 +205,7 @@ TileDddbManager      INFO n_tileSwitches = 1
 ClassIDSvc           INFO  getRegistryEntries: read 213 CLIDRegistry entries for module ALL
 CaloIDHelper_ID...   INFO in createObj: creating a TileID helper object in the detector store
 AtlasDetectorID      INFO initialize_from_dictionary - OK
-TileNeighbour        INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/TileNeighbour_reduced.txt
+TileNeighbour        INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/TileNeighbour_reduced.txt
 TileHWIDDetDesc...   INFO in createObj: creating a TileHWID helper object in the detector store
 TileHWID             INFO initialize_from_dictionary 
 AtlasDetectorID      INFO initialize_from_dictionary - OK
@@ -217,9 +217,9 @@ CaloIDHelper_ID...   INFO in createObj: creating a LArHEC_ID helper object in th
 AtlasDetectorID      INFO initialize_from_dictionary - OK
 CaloIDHelper_ID...   INFO in createObj: creating a LArFCAL_ID helper object in the detector store
 AtlasDetectorID      INFO initialize_from_dictionary - OK
-LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/FCal2DNeighbors-April2011.txt
-LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/FCal3DNeighborsNext-April2011.txt
-LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/FCal3DNeighborsPrev-April2011.txt
+LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/FCal2DNeighbors-April2011.txt
+LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/FCal3DNeighborsNext-April2011.txt
+LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/FCal3DNeighborsPrev-April2011.txt
 CaloIDHelper_ID...   INFO in createObj: creating a LArMiniFCAL_ID helper object in the detector store
 AtlasDetectorID      INFO initialize_from_dictionary - OK
 LArMiniFCAL_ID       INFO  initialize_from_dict - LArCalorimeter dictionary does NOT contain miniFCAL description. Unable to initialize LArMiniFCAL_ID.
@@ -250,11 +250,11 @@ GeoModelSvc.Til...   INFO                                    PLUG2  Rmin= 2981 R
 GeoModelSvc.Til...   INFO  Positioning negative ITC with translation -3405
 GeoModelSvc.Til...   INFO  Positioning negative Gap with translation -3552
 GeoModelSvc.Til...   INFO  Positioning negative Crack with translation -3536
-GeoModelSvc.Til...   INFO  Global positioning of barrel with rotation (0,0,0)) and translation (0,0,0) GeoModelKernelUnits::cm
-GeoModelSvc.Til...   INFO  Global positioning of positive ext.barrel with rotation (0,0,0)) and translation (0,0,0) GeoModelKernelUnits::cm
-GeoModelSvc.Til...   INFO  Global positioning of negative ext.barrel with rotation (0,0,0)) and translation (0,0,1) GeoModelKernelUnits::cm
+GeoModelSvc.Til...   INFO  Global positioning of barrel with rotation (0,0,0)) and translation (0,0,0) Gaudi::Units::cm
+GeoModelSvc.Til...   INFO  Global positioning of positive ext.barrel with rotation (0,0,0)) and translation (0,0,0) Gaudi::Units::cm
+GeoModelSvc.Til...   INFO  Global positioning of negative ext.barrel with rotation (0,0,0)) and translation (0,0,1) Gaudi::Units::cm
 TileDetDescrMan...   INFO Entering create_elements()
-GeoModelSvc          INFO GeoModelSvc.TileDetectorTool	 SZ= 5196Kb 	 Time = 2S
+GeoModelSvc          INFO GeoModelSvc.TileDetectorTool	 SZ= 3568Kb 	 Time = 0.25S
 ClassIDSvc           INFO  getRegistryEntries: read 65 CLIDRegistry entries for module ALL
 TileInfoLoader       INFO Initializing....TileInfoLoader
 TileInfoLoader       INFO New ATLAS geometry detected: ATLAS-R2-2016-01-00-01 (010001) version 10001
@@ -276,11 +276,11 @@ TileInfoLoader       INFO Sampling fraction for E2 cells 1/107
 TileInfoLoader       INFO Sampling fraction for E3 cells 1/97
 TileInfoLoader       INFO Sampling fraction for E4 cells 1/75
 TileInfoLoader       INFO Sampling fraction for E4' cells 1/75
-TileInfoLoader       INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/pulsehi_physics.dat
-TileInfoLoader       INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/pulselo_physics.dat
-TileInfoLoader       INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/pulse_adder_tower_physics.dat
-TileInfoLoader       INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/pulse_adder_muonRcv_physics.dat
-TileInfoLoader       INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/pulse_adder_muon_physics.dat
+TileInfoLoader       INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/pulsehi_physics.dat
+TileInfoLoader       INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/pulselo_physics.dat
+TileInfoLoader       INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/pulse_adder_tower_physics.dat
+TileInfoLoader       INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/pulse_adder_muonRcv_physics.dat
+TileInfoLoader       INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/pulse_adder_muon_physics.dat
 CaloIDHelper_ID...   INFO in createObj: creating a CaloLVL1_ID helper object in the detector store
 CaloLVL1_ID          INFO initialize_from_dictionary
 AtlasDetectorID      INFO initialize_from_dictionary - OK
@@ -388,12 +388,12 @@ CaloIDHelper_ID...   INFO in createObj: creating a LArHEC_SuperCell_ID helper ob
 AtlasDetectorID      INFO initialize_from_dictionary - OK
 CaloIDHelper_ID...   INFO in createObj: creating a LArFCAL_SuperCell_ID helper object in the detector store
 AtlasDetectorID      INFO initialize_from_dictionary - OK
-LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/FCalSuperCells2DNeighborsNew-April2014.txt
-LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
-LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
+LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/FCalSuperCells2DNeighborsNew-April2014.txt
+LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
+LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
 CaloIDHelper_ID...   INFO in createObj: creating a Tile_SuperCell_ID helper object in the detector store
 AtlasDetectorID      INFO initialize_from_dictionary - OK
-TileNeighbour        INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/TileSuperCellNeighbour.txt
+TileNeighbour        INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/TileSuperCellNeighbour.txt
 AtlasDetectorID      INFO initialize_from_dictionary - OK
 CaloIdMgrDetDes...   INFO  Finished 
 CaloIdMgrDetDes...   INFO Initializing CaloIdMgr from values in CaloIdMgrDetDescrCnv 
@@ -422,7 +422,7 @@ TileBadChannels...   INFO TileBchStatus::isNoisy() is defined by: Large HF noise
 TileBadChannels...   INFO TileBchStatus::isNoGainL1() is defined by: ADC dead; No PMT connected; No HV; Channel masked for LV1 (unspecified); LV1 channel no gain; LV1 channel noisy; Channel disabled for LV1; 
 TileBadChannels...   INFO TileBchStatus::isBadTiming() is defined by: Bad timing; Online bad timing; 
 TileBadChannels...   INFO No drawer trips probabilities found in DB
-ClassIDSvc           INFO  getRegistryEntries: read 2407 CLIDRegistry entries for module ALL
+ClassIDSvc           INFO  getRegistryEntries: read 2427 CLIDRegistry entries for module ALL
 ClassIDSvc           INFO  getRegistryEntries: read 89 CLIDRegistry entries for module ALL
 ToolSvc.TileROD...   INFO TileL2Builder initialization completed
 ToolSvc.TileL2C...   INFO Initializing TileL2ContByteStreamTool
@@ -641,23 +641,23 @@ IncidentProcAlg2     INFO Finalize
 EventInfoByteSt...   INFO finalize 
 PyComponentMgr       INFO Finalizing PyComponentMgr...
 IdDictDetDescrCnv    INFO in finalize
-IOVDbFolder          INFO Folder /LAR/Align (PoolRef) db-read 1/1 objs/chan/bytes 1/1/340 ((     0.82 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/CES (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/104132 ((     0.71 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/CIS/FIT/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/108 ((     0.93 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/CIS/FIT/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/108 ((     0.55 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/EMS (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/116 ((     0.64 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/LAS/FIBER (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/964 ((     0.51 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/LAS/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/96 ((     0.53 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/LAS/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/104 ((     0.50 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/NOISE/SAMPLE (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/643828 ((     0.67 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/STATUS/ADC (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/93084 ((     0.73 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/TIME/CHANNELOFFSET/PHY (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/120 ((     0.61 ))s
-IOVDbFolder          INFO Folder /TILE/ONL01/STATUS/ADC (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/100 ((     0.07 ))s
-IOVDbFolder          INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 1/1 objs/chan/bytes 1/1/390 ((     0.61 ))s
-IOVDbSvc             INFO  bytes in ((      7.88 ))s
+IOVDbFolder          INFO Folder /LAR/Align (PoolRef) db-read 1/1 objs/chan/bytes 1/1/340 ((     0.14 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/CES (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/104132 ((     0.21 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/CIS/FIT/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/108 ((     0.05 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/CIS/FIT/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/108 ((     0.05 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/EMS (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/116 ((     0.04 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/LAS/FIBER (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/964 ((     0.15 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/LAS/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/96 ((     0.07 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/LAS/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/104 ((     0.14 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/NOISE/SAMPLE (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/643828 ((     0.16 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/STATUS/ADC (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/93084 ((     0.05 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/TIME/CHANNELOFFSET/PHY (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/120 ((     0.04 ))s
+IOVDbFolder          INFO Folder /TILE/ONL01/STATUS/ADC (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/100 ((     0.00 ))s
+IOVDbFolder          INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 1/1 objs/chan/bytes 1/1/390 ((     0.02 ))s
+IOVDbSvc             INFO  bytes in ((      1.13 ))s
 IOVDbSvc             INFO Connection sqlite://;schema=mycool.db;dbname=OFLP200 : nConnect: 0 nFolders: 0 ReadTime: ((     0.00 ))s
-IOVDbSvc             INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 2 nFolders: 2 ReadTime: ((     1.43 ))s
-IOVDbSvc             INFO Connection COOLOFL_TILE/OFLP200 : nConnect: 2 nFolders: 11 ReadTime: ((     6.44 ))s
+IOVDbSvc             INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 2 nFolders: 2 ReadTime: ((     0.16 ))s
+IOVDbSvc             INFO Connection COOLOFL_TILE/OFLP200 : nConnect: 2 nFolders: 11 ReadTime: ((     0.97 ))s
 TileInfoLoader       INFO TileInfoLoader::finalize()
 AthDictLoaderSvc     INFO in finalize...
 ToolSvc              INFO Removing all tools created by ToolSvc
@@ -666,18 +666,18 @@ ToolSvc.TileROD...   INFO Finalizing
 *****Chrono*****     INFO ****************************************************************************************************
 *****Chrono*****     INFO  The Final CPU consumption ( Chrono ) Table (ordered)
 *****Chrono*****     INFO ****************************************************************************************************
-cObjR_ALL            INFO Time User   : Tot= 0.85  [s] Ave/Min/Max=0.425(+-0.405)/ 0.02/ 0.83  [s] #=  2
-cObj_ALL             INFO Time User   : Tot= 1.08  [s] Ave/Min/Max=0.0831(+-0.241)/    0/  0.9  [s] #= 13
-ChronoStatSvc        INFO Time User   : Tot= 28.5  [s]                                             #=  1
+cObjR_ALL            INFO Time User   : Tot=  490 [ms] Ave/Min/Max=  245(+-  235)/   10/  480 [ms] #=  2
+cObj_ALL             INFO Time User   : Tot= 0.61  [s] Ave/Min/Max=0.0469(+-0.139)/    0/ 0.52  [s] #= 13
+ChronoStatSvc        INFO Time User   : Tot= 11.5  [s]                                             #=  1
 *****Chrono*****     INFO ****************************************************************************************************
 ChronoStatSvc.f...   INFO  Service finalized successfully 
 ApplicationMgr       INFO Application Manager Finalized successfully
 ApplicationMgr       INFO Application Manager Terminated successfully
 Py:Athena            INFO leaving with code 0: "successful run"
-Tue Jan 22 02:33:20 CET 2019
+Sat Jan 26 19:52:03 CET 2019
 Preloading tcmalloc_minimal.so
 Py:Athena            INFO including file "AthenaCommon/Preparation.py"
-Py:Athena            INFO using release [WorkDir-22.0.1] [x86_64-slc6-gcc62-dbg] [atlas-work3/5871b6e8de] -- built on [2019-01-21T2115]
+Py:Athena            INFO using release [WorkDir-22.0.1] [x86_64-slc6-gcc62-opt] [atlas-work3/5e0c78d866] -- built on [2019-01-26T1705]
 Py:Athena            INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
 Py:Athena            INFO executing ROOT6Setup
 Py:Athena            INFO configuring AthenaHive with [4] concurrent threads and [4] concurrent events
@@ -686,7 +686,7 @@ Py:Athena            INFO including file "AthenaCommon/Execution.py"
 Py:Athena            INFO including file "TileByteStream/TileL2ContByteStreamCnv_test.py"
 [?1034hSetGeometryVersion.py obtained major release version 22
 Py:Athena            INFO including file "IdDictDetDescrCnv/IdDictDetDescrCnv_joboptions.py"
-Py:ConfigurableDb    INFO Read module info for 5456 configurables from 80 genConfDb files
+Py:ConfigurableDb    INFO Read module info for 5456 configurables from 76 genConfDb files
 Py:ConfigurableDb    INFO No duplicates have been found: that's good !
 EventInfoMgtInit: Got release version  Athena-22.0.1
 Py:IOVDbSvc.CondDB    INFO Setting up conditions DB access to instance OFLP200
@@ -713,7 +713,7 @@ MessageSvc           INFO Activating in a separate thread
 ApplicationMgr    SUCCESS 
 ====================================================================================================================================
                                                    Welcome to ApplicationMgr (GaudiCoreSvc v30r5)
-                                          running on lxplus068.cern.ch on Tue Jan 22 02:33:46 2019
+                                          running on lxplus062.cern.ch on Sat Jan 26 19:52:18 2019
 ====================================================================================================================================
 ApplicationMgr       INFO Successfully loaded modules : AthenaServices
 ApplicationMgr       INFO Application Manager Configured successfully
@@ -729,8 +729,8 @@ PoolSvc                                            INFO io_register[PoolSvc](xml
 PoolSvc                                            INFO Set connectionsvc retry/timeout/IDLE timeout to  'ConnectionRetrialPeriod':300/ 'ConnectionRetrialTimeOut':3600/ 'ConnectionTimeOut':5 seconds with connection cleanup disabled
 PoolSvc                                            INFO Frontier compression level set to 5
 DBReplicaSvc                                       INFO Frontier server at (serverurl=http://atlasfrontier-local.cern.ch:8000/atlr)(serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://lcgft-atlas.gridpp.rl.ac.uk:3128/frontierATLAS)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://ca-proxy.cern.ch:3128)(proxyurl=http://ca-proxy-meyrin.cern.ch:3128)(proxyurl=http://ca-proxy-wigner.cern.ch:3128)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
-DBReplicaSvc                                       INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/dbreplica.config
-DBReplicaSvc                                       INFO Total of 10 servers found for host lxplus068.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
+DBReplicaSvc                                       INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/dbreplica.config
+DBReplicaSvc                                       INFO Total of 10 servers found for host lxplus062.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
 PoolSvc                                            INFO Successfully setup replica sorting algorithm
 PoolSvc                                            INFO Setting up APR FileCatalog and Streams
 PoolSvc                                         WARNING Unable to locate catalog for prfile:poolcond/PoolCat_oflcond.xml check your ATLAS_POOLCOND_PATH and DATAPATH variables
@@ -872,7 +872,7 @@ EndcapDMConstruction                               INFO Start building EC electr
   multi-layered version of absorbers activated, mlabs == 1
 ================================================
 EndcapDMConstruction                               INFO Start building EC electronics geometry
-GeoModelSvc                                        INFO GeoModelSvc.LArDetectorToolNV	 SZ= 28576Kb 	 Time = 1.67S
+GeoModelSvc                                        INFO GeoModelSvc.LArDetectorToolNV	 SZ= 22940Kb 	 Time = 0.68S
 GeoModelSvc.TileDetectorTool                       INFO  Entering TileDetectorTool::create()
 TileDddbManager                                    INFO m_tag = ATLAS-R2-2016-01-00-01
 TileDddbManager                                    INFO n_tiglob = 5
@@ -884,7 +884,7 @@ TileDddbManager                                    INFO n_tileSwitches = 1
 ClassIDSvc                                         INFO  getRegistryEntries: read 213 CLIDRegistry entries for module ALL
 CaloIDHelper_IDDetDescrCnv                         INFO in createObj: creating a TileID helper object in the detector store
 AtlasDetectorID                                    INFO initialize_from_dictionary - OK
-TileNeighbour                                      INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/TileNeighbour_reduced.txt
+TileNeighbour                                      INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/TileNeighbour_reduced.txt
 TileHWIDDetDescrCnv                                INFO in createObj: creating a TileHWID helper object in the detector store
 TileHWID                                           INFO initialize_from_dictionary 
 AtlasDetectorID                                    INFO initialize_from_dictionary - OK
@@ -896,9 +896,9 @@ CaloIDHelper_IDDetDescrCnv                         INFO in createObj: creating a
 AtlasDetectorID                                    INFO initialize_from_dictionary - OK
 CaloIDHelper_IDDetDescrCnv                         INFO in createObj: creating a LArFCAL_ID helper object in the detector store
 AtlasDetectorID                                    INFO initialize_from_dictionary - OK
-LArFCAL_Base_ID                                    INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/FCal2DNeighbors-April2011.txt
-LArFCAL_Base_ID                                    INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/FCal3DNeighborsNext-April2011.txt
-LArFCAL_Base_ID                                    INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/FCal3DNeighborsPrev-April2011.txt
+LArFCAL_Base_ID                                    INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/FCal2DNeighbors-April2011.txt
+LArFCAL_Base_ID                                    INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/FCal3DNeighborsNext-April2011.txt
+LArFCAL_Base_ID                                    INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/FCal3DNeighborsPrev-April2011.txt
 CaloIDHelper_IDDetDescrCnv                         INFO in createObj: creating a LArMiniFCAL_ID helper object in the detector store
 AtlasDetectorID                                    INFO initialize_from_dictionary - OK
 LArMiniFCAL_ID                                     INFO  initialize_from_dict - LArCalorimeter dictionary does NOT contain miniFCAL description. Unable to initialize LArMiniFCAL_ID.
@@ -929,11 +929,11 @@ GeoModelSvc.TileDetectorTool                       INFO
 GeoModelSvc.TileDetectorTool                       INFO  Positioning negative ITC with translation -3405
 GeoModelSvc.TileDetectorTool                       INFO  Positioning negative Gap with translation -3552
 GeoModelSvc.TileDetectorTool                       INFO  Positioning negative Crack with translation -3536
-GeoModelSvc.TileDetectorTool                       INFO  Global positioning of barrel with rotation (0,0,0)) and translation (0,0,0) GeoModelKernelUnits::cm
-GeoModelSvc.TileDetectorTool                       INFO  Global positioning of positive ext.barrel with rotation (0,0,0)) and translation (0,0,0) GeoModelKernelUnits::cm
-GeoModelSvc.TileDetectorTool                       INFO  Global positioning of negative ext.barrel with rotation (0,0,0)) and translation (0,0,1) GeoModelKernelUnits::cm
+GeoModelSvc.TileDetectorTool                       INFO  Global positioning of barrel with rotation (0,0,0)) and translation (0,0,0) Gaudi::Units::cm
+GeoModelSvc.TileDetectorTool                       INFO  Global positioning of positive ext.barrel with rotation (0,0,0)) and translation (0,0,0) Gaudi::Units::cm
+GeoModelSvc.TileDetectorTool                       INFO  Global positioning of negative ext.barrel with rotation (0,0,0)) and translation (0,0,1) Gaudi::Units::cm
 TileDetDescrManager                                INFO Entering create_elements()
-GeoModelSvc                                        INFO GeoModelSvc.TileDetectorTool	 SZ= 5196Kb 	 Time = 1.77S
+GeoModelSvc                                        INFO GeoModelSvc.TileDetectorTool	 SZ= 4592Kb 	 Time = 0.3S
 ClassIDSvc                                         INFO  getRegistryEntries: read 65 CLIDRegistry entries for module ALL
 TileInfoLoader                                     INFO Initializing....TileInfoLoader
 TileInfoLoader                                     INFO New ATLAS geometry detected: ATLAS-R2-2016-01-00-01 (010001) version 10001
@@ -955,11 +955,11 @@ TileInfoLoader                                     INFO Sampling fraction for E2
 TileInfoLoader                                     INFO Sampling fraction for E3 cells 1/97
 TileInfoLoader                                     INFO Sampling fraction for E4 cells 1/75
 TileInfoLoader                                     INFO Sampling fraction for E4' cells 1/75
-TileInfoLoader                                     INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/pulsehi_physics.dat
-TileInfoLoader                                     INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/pulselo_physics.dat
-TileInfoLoader                                     INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/pulse_adder_tower_physics.dat
-TileInfoLoader                                     INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/pulse_adder_muonRcv_physics.dat
-TileInfoLoader                                     INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/pulse_adder_muon_physics.dat
+TileInfoLoader                                     INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/pulsehi_physics.dat
+TileInfoLoader                                     INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/pulselo_physics.dat
+TileInfoLoader                                     INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/pulse_adder_tower_physics.dat
+TileInfoLoader                                     INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/pulse_adder_muonRcv_physics.dat
+TileInfoLoader                                     INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/pulse_adder_muon_physics.dat
 CaloIDHelper_IDDetDescrCnv                         INFO in createObj: creating a CaloLVL1_ID helper object in the detector store
 CaloLVL1_ID                                        INFO initialize_from_dictionary
 AtlasDetectorID                                    INFO initialize_from_dictionary - OK
@@ -1079,12 +1079,12 @@ CaloIDHelper_IDDetDescrCnv              0   0      INFO in createObj: creating a
 AtlasDetectorID                         0   0      INFO initialize_from_dictionary - OK
 CaloIDHelper_IDDetDescrCnv              0   0      INFO in createObj: creating a LArFCAL_SuperCell_ID helper object in the detector store
 AtlasDetectorID                         0   0      INFO initialize_from_dictionary - OK
-LArFCAL_Base_ID                         0   0      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/FCalSuperCells2DNeighborsNew-April2014.txt
-LArFCAL_Base_ID                         0   0      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
-LArFCAL_Base_ID                         0   0      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
+LArFCAL_Base_ID                         0   0      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/FCalSuperCells2DNeighborsNew-April2014.txt
+LArFCAL_Base_ID                         0   0      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
+LArFCAL_Base_ID                         0   0      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
 CaloIDHelper_IDDetDescrCnv              0   0      INFO in createObj: creating a Tile_SuperCell_ID helper object in the detector store
 AtlasDetectorID                         0   0      INFO initialize_from_dictionary - OK
-TileNeighbour                           0   0      INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/TileSuperCellNeighbour.txt
+TileNeighbour                           0   0      INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/TileSuperCellNeighbour.txt
 AtlasDetectorID                         0   0      INFO initialize_from_dictionary - OK
 CaloIdMgrDetDescrCnv                    0   0      INFO  Finished 
 CaloIdMgrDetDescrCnv                    0   0      INFO Initializing CaloIdMgr from values in CaloIdMgrDetDescrCnv 
@@ -1092,7 +1092,7 @@ Domain[ROOT_All]                        0   0      INFO ->  Access   DbDatabase
 Domain[ROOT_All]                        0   0      INFO                           /cvmfs/atlas-condb.cern.ch/repo/conditions/cond08/cond08_mc.000003.gen.COND/cond08_mc.000003.gen.COND._0064.pool.root
 RootDatabase.open                       0   0      INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond08/cond08_mc.000003.gen.COND/cond08_mc.000003.gen.COND._0064.pool.root File version:52200
 AthenaHiveEventLoopMgr                  0   0      INFO   ===>>>  start processing event #1129572, run #204073 on slot 0,  0 events processed so far  <<<===
-ClassIDSvc                              0   0      INFO  getRegistryEntries: read 650 CLIDRegistry entries for module ALL
+ClassIDSvc                              0   0      INFO  getRegistryEntries: read 670 CLIDRegistry entries for module ALL
 ClassIDSvc                              0   0      INFO  getRegistryEntries: read 1757 CLIDRegistry entries for module ALL
 ClassIDSvc                              0   0      INFO  getRegistryEntries: read 89 CLIDRegistry entries for module ALL
 ToolSvc.TileROD_Decoder.TileROD_L2Bui...0   0      INFO TileL2Builder initialization completed
@@ -1222,81 +1222,81 @@ AthenaHiveEventLoopMgr                  62  1      INFO   ===>>>  start processi
 AthenaHiveEventLoopMgr                  63  3      INFO   ===>>>  start processing event #1148361, run #204073 on slot 3,  60 events processed so far  <<<===
 AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1149894, run #204073 on slot 2,  61 events processed so far  <<<===
 AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1145364, run #204073 on slot 0,  62 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  64  0      INFO   ===>>>  start processing event #1148167, run #204073 on slot 0,  62 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  65  2      INFO   ===>>>  start processing event #1138948, run #204073 on slot 2,  62 events processed so far  <<<===
 AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1143770, run #204073 on slot 1,  63 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  64  0      INFO   ===>>>  start processing event #1148167, run #204073 on slot 0,  63 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  65  1      INFO   ===>>>  start processing event #1138948, run #204073 on slot 1,  63 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  66  2      INFO   ===>>>  start processing event #1144808, run #204073 on slot 2,  63 events processed so far  <<<===
 AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1148361, run #204073 on slot 3,  64 events processed so far  <<<===
 AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1148167, run #204073 on slot 0,  65 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1138948, run #204073 on slot 1,  66 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  67  0      INFO   ===>>>  start processing event #1145832, run #204073 on slot 0,  66 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  68  1      INFO   ===>>>  start processing event #1153100, run #204073 on slot 1,  66 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  69  3      INFO   ===>>>  start processing event #1142524, run #204073 on slot 3,  66 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1144808, run #204073 on slot 2,  67 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1145832, run #204073 on slot 0,  68 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1153100, run #204073 on slot 1,  69 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  70  0      INFO   ===>>>  start processing event #1138294, run #204073 on slot 0,  69 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  71  1      INFO   ===>>>  start processing event #1138350, run #204073 on slot 1,  69 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  72  2      INFO   ===>>>  start processing event #1149424, run #204073 on slot 2,  69 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1142524, run #204073 on slot 3,  70 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1138294, run #204073 on slot 0,  71 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1138350, run #204073 on slot 1,  72 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  73  0      INFO   ===>>>  start processing event #1151102, run #204073 on slot 0,  72 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  74  1      INFO   ===>>>  start processing event #1152242, run #204073 on slot 1,  72 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  75  3      INFO   ===>>>  start processing event #1148416, run #204073 on slot 3,  72 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1149424, run #204073 on slot 2,  73 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1151102, run #204073 on slot 0,  74 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1152242, run #204073 on slot 1,  75 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  76  0      INFO   ===>>>  start processing event #1142753, run #204073 on slot 0,  75 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  77  1      INFO   ===>>>  start processing event #1149997, run #204073 on slot 1,  75 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  78  2      INFO   ===>>>  start processing event #1151617, run #204073 on slot 2,  75 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1148416, run #204073 on slot 3,  76 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1142753, run #204073 on slot 0,  77 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1149997, run #204073 on slot 1,  78 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  79  0      INFO   ===>>>  start processing event #1149794, run #204073 on slot 0,  78 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  80  1      INFO   ===>>>  start processing event #1152504, run #204073 on slot 1,  78 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  81  3      INFO   ===>>>  start processing event #1142485, run #204073 on slot 3,  78 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1151617, run #204073 on slot 2,  79 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1149794, run #204073 on slot 0,  80 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1152504, run #204073 on slot 1,  81 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  82  0      INFO   ===>>>  start processing event #1151364, run #204073 on slot 0,  81 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  83  1      INFO   ===>>>  start processing event #1143901, run #204073 on slot 1,  81 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  84  2      INFO   ===>>>  start processing event #1153979, run #204073 on slot 2,  81 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1142485, run #204073 on slot 3,  82 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1151364, run #204073 on slot 0,  83 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1143901, run #204073 on slot 1,  84 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  85  0      INFO   ===>>>  start processing event #1150212, run #204073 on slot 0,  84 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  86  1      INFO   ===>>>  start processing event #1152633, run #204073 on slot 1,  84 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  87  3      INFO   ===>>>  start processing event #1155482, run #204073 on slot 3,  84 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1153979, run #204073 on slot 2,  85 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1150212, run #204073 on slot 0,  86 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1152633, run #204073 on slot 1,  87 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  88  0      INFO   ===>>>  start processing event #1150472, run #204073 on slot 0,  87 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  89  1      INFO   ===>>>  start processing event #1140275, run #204073 on slot 1,  87 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  90  2      INFO   ===>>>  start processing event #1145882, run #204073 on slot 2,  87 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1155482, run #204073 on slot 3,  88 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1150472, run #204073 on slot 0,  89 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1140275, run #204073 on slot 1,  90 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  91  0      INFO   ===>>>  start processing event #1151732, run #204073 on slot 0,  90 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  92  1      INFO   ===>>>  start processing event #1137896, run #204073 on slot 1,  90 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  93  3      INFO   ===>>>  start processing event #1156381, run #204073 on slot 3,  90 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1145882, run #204073 on slot 2,  91 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1151732, run #204073 on slot 0,  92 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1137896, run #204073 on slot 1,  93 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  94  0      INFO   ===>>>  start processing event #1149161, run #204073 on slot 0,  93 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  95  1      INFO   ===>>>  start processing event #1153794, run #204073 on slot 1,  93 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  96  2      INFO   ===>>>  start processing event #1151312, run #204073 on slot 2,  93 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1156381, run #204073 on slot 3,  94 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1149161, run #204073 on slot 0,  95 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1153794, run #204073 on slot 1,  96 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  97  0      INFO   ===>>>  start processing event #1148893, run #204073 on slot 0,  96 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  98  1      INFO   ===>>>  start processing event #1156938, run #204073 on slot 1,  96 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  99  3      INFO   ===>>>  start processing event #1156351, run #204073 on slot 3,  96 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1151312, run #204073 on slot 2,  97 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1148893, run #204073 on slot 0,  98 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1156938, run #204073 on slot 1,  99 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1156351, run #204073 on slot 3,  100 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO ---> Loop Finished (seconds): 20.2948
+AthenaHiveEventLoopMgr                  66  0      INFO   ===>>>  start processing event #1144808, run #204073 on slot 0,  65 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  67  1      INFO   ===>>>  start processing event #1145832, run #204073 on slot 1,  65 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  68  3      INFO   ===>>>  start processing event #1153100, run #204073 on slot 3,  65 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1138948, run #204073 on slot 2,  66 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1144808, run #204073 on slot 0,  67 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1145832, run #204073 on slot 1,  68 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  69  0      INFO   ===>>>  start processing event #1142524, run #204073 on slot 0,  68 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  70  1      INFO   ===>>>  start processing event #1138294, run #204073 on slot 1,  68 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  71  2      INFO   ===>>>  start processing event #1138350, run #204073 on slot 2,  68 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1153100, run #204073 on slot 3,  69 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1142524, run #204073 on slot 0,  70 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1138294, run #204073 on slot 1,  71 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  72  0      INFO   ===>>>  start processing event #1149424, run #204073 on slot 0,  71 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  73  1      INFO   ===>>>  start processing event #1151102, run #204073 on slot 1,  71 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  74  3      INFO   ===>>>  start processing event #1152242, run #204073 on slot 3,  71 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1138350, run #204073 on slot 2,  72 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1149424, run #204073 on slot 0,  73 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1151102, run #204073 on slot 1,  74 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  75  0      INFO   ===>>>  start processing event #1148416, run #204073 on slot 0,  74 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  76  1      INFO   ===>>>  start processing event #1142753, run #204073 on slot 1,  74 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  77  2      INFO   ===>>>  start processing event #1149997, run #204073 on slot 2,  74 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1152242, run #204073 on slot 3,  75 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1148416, run #204073 on slot 0,  76 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1142753, run #204073 on slot 1,  77 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  78  0      INFO   ===>>>  start processing event #1151617, run #204073 on slot 0,  77 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  79  1      INFO   ===>>>  start processing event #1149794, run #204073 on slot 1,  77 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  80  3      INFO   ===>>>  start processing event #1152504, run #204073 on slot 3,  77 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1149997, run #204073 on slot 2,  78 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1151617, run #204073 on slot 0,  79 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  81  0      INFO   ===>>>  start processing event #1142485, run #204073 on slot 0,  79 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  82  2      INFO   ===>>>  start processing event #1151364, run #204073 on slot 2,  79 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1149794, run #204073 on slot 1,  80 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1152504, run #204073 on slot 3,  81 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1142485, run #204073 on slot 0,  82 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  83  0      INFO   ===>>>  start processing event #1143901, run #204073 on slot 0,  82 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  84  1      INFO   ===>>>  start processing event #1153979, run #204073 on slot 1,  82 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  85  3      INFO   ===>>>  start processing event #1150212, run #204073 on slot 3,  82 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1151364, run #204073 on slot 2,  83 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1143901, run #204073 on slot 0,  84 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1153979, run #204073 on slot 1,  85 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  86  0      INFO   ===>>>  start processing event #1152633, run #204073 on slot 0,  85 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  87  1      INFO   ===>>>  start processing event #1155482, run #204073 on slot 1,  85 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  88  2      INFO   ===>>>  start processing event #1150472, run #204073 on slot 2,  85 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1150212, run #204073 on slot 3,  86 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1152633, run #204073 on slot 0,  87 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1155482, run #204073 on slot 1,  88 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  89  0      INFO   ===>>>  start processing event #1140275, run #204073 on slot 0,  88 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  90  1      INFO   ===>>>  start processing event #1145882, run #204073 on slot 1,  88 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  91  3      INFO   ===>>>  start processing event #1151732, run #204073 on slot 3,  88 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1150472, run #204073 on slot 2,  89 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1140275, run #204073 on slot 0,  90 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1145882, run #204073 on slot 1,  91 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  92  0      INFO   ===>>>  start processing event #1137896, run #204073 on slot 0,  91 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  93  1      INFO   ===>>>  start processing event #1156381, run #204073 on slot 1,  91 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  94  2      INFO   ===>>>  start processing event #1149161, run #204073 on slot 2,  91 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1151732, run #204073 on slot 3,  92 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1137896, run #204073 on slot 0,  93 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1156381, run #204073 on slot 1,  94 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  95  0      INFO   ===>>>  start processing event #1153794, run #204073 on slot 0,  94 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  96  1      INFO   ===>>>  start processing event #1151312, run #204073 on slot 1,  94 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  97  3      INFO   ===>>>  start processing event #1148893, run #204073 on slot 3,  94 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1149161, run #204073 on slot 2,  95 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1153794, run #204073 on slot 0,  96 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1151312, run #204073 on slot 1,  97 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  98  0      INFO   ===>>>  start processing event #1156938, run #204073 on slot 0,  97 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  99  1      INFO   ===>>>  start processing event #1156351, run #204073 on slot 1,  97 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1148893, run #204073 on slot 3,  98 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1156938, run #204073 on slot 0,  99 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1156351, run #204073 on slot 1,  100 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO ---> Loop Finished (seconds): 10.1798
 /cvmfs/atlas-condb.cern.ch/repo/condi...           INFO Database being retired...
 Domain[ROOT_All]                                   INFO ->  Deaccess DbDatabase   READ      [ROOT_All] 06C9EAE8-6F5B-E011-BAAA-003048F0E7AC
 /cvmfs/atlas-condb.cern.ch/repo/condi...           INFO Database being retired...
@@ -1314,7 +1314,7 @@ AvalancheSchedulerSvc                              INFO Joining Scheduler thread
 PyComponentMgr                                     INFO Finalizing PyComponentMgr...
 IdDictDetDescrCnv                                  INFO in finalize
 EventDataSvc                                       INFO Finalizing EventDataSvc - package version StoreGate-00-00-00
-IOVDbFolder                                        INFO Folder /LAR/Align (PoolRef) db-read 1/1 objs/chan/bytes 1/1/340 ((     0.58 ))s
+IOVDbFolder                                        INFO Folder /LAR/Align (PoolRef) db-read 1/1 objs/chan/bytes 1/1/340 ((     0.14 ))s
 IOVDbFolder                                        INFO Folder /TILE/OFL02/CALIB/CES (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 ((     0.00 ))s
 IOVDbFolder                                        INFO Folder /TILE/OFL02/CALIB/CIS/FIT/LIN (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 ((     0.00 ))s
 IOVDbFolder                                        INFO Folder /TILE/OFL02/CALIB/CIS/FIT/NLN (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 ((     0.00 ))s
@@ -1326,10 +1326,10 @@ IOVDbFolder                                        INFO Folder /TILE/OFL02/NOISE
 IOVDbFolder                                        INFO Folder /TILE/OFL02/STATUS/ADC (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 ((     0.00 ))s
 IOVDbFolder                                        INFO Folder /TILE/OFL02/TIME/CHANNELOFFSET/PHY (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 ((     0.00 ))s
 IOVDbFolder                                        INFO Folder /TILE/ONL01/STATUS/ADC (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 ((     0.00 ))s
-IOVDbFolder                                        INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 1/1 objs/chan/bytes 1/1/390 ((     0.38 ))s
-IOVDbSvc                                           INFO  bytes in ((      0.96 ))s
+IOVDbFolder                                        INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 1/1 objs/chan/bytes 1/1/390 ((     0.02 ))s
+IOVDbSvc                                           INFO  bytes in ((      0.16 ))s
 IOVDbSvc                                           INFO Connection sqlite://;schema=mycool.db;dbname=OFLP200 : nConnect: 0 nFolders: 0 ReadTime: ((     0.00 ))s
-IOVDbSvc                                           INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 2 nFolders: 2 ReadTime: ((     0.96 ))s
+IOVDbSvc                                           INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 2 nFolders: 2 ReadTime: ((     0.16 ))s
 IOVDbSvc                                           INFO Connection COOLOFL_TILE/OFLP200 : nConnect: 1 nFolders: 11 ReadTime: ((     0.00 ))s
 TileInfoLoader                                     INFO TileInfoLoader::finalize()
 AthDictLoaderSvc                                   INFO in finalize...
@@ -1339,9 +1339,9 @@ ToolSvc.TileROD_Decoder.TileROD_L2Bui...           INFO Finalizing
 *****Chrono*****                                   INFO ****************************************************************************************************
 *****Chrono*****                                   INFO  The Final CPU consumption ( Chrono ) Table (ordered)
 *****Chrono*****                                   INFO ****************************************************************************************************
-cObjR_ALL                                          INFO Time User   : Tot= 0.86  [s] Ave/Min/Max= 0.43(+-  0.4)/ 0.03/ 0.83  [s] #=  2
-cObj_ALL                                           INFO Time User   : Tot= 1.15  [s] Ave/Min/Max=0.575(+-0.415)/ 0.16/ 0.99  [s] #=  2
-ChronoStatSvc                                      INFO Time User   : Tot= 25.9  [s]                                             #=  1
+cObjR_ALL                                          INFO Time User   : Tot=  490 [ms] Ave/Min/Max=  245(+-  235)/   10/  480 [ms] #=  2
+cObj_ALL                                           INFO Time User   : Tot= 0.61  [s] Ave/Min/Max=0.305(+-0.235)/ 0.07/ 0.54  [s] #=  2
+ChronoStatSvc                                      INFO Time User   : Tot= 10.3  [s]                                             #=  1
 *****Chrono*****                                   INFO ****************************************************************************************************
 ChronoStatSvc.finalize()                           INFO  Service finalized successfully 
 ApplicationMgr                                     INFO Application Manager Finalized successfully
diff --git a/TileCalorimeter/TileSvc/TileByteStream/share/TileLaserObjByteStreamCnv_test.ref b/TileCalorimeter/TileSvc/TileByteStream/share/TileLaserObjByteStreamCnv_test.ref
index d3db850feec19b6f73fa43d6d59a51e0f025c87f..4bdfa41ced06fcdcbdc151985087baeb335edf8c 100644
--- a/TileCalorimeter/TileSvc/TileByteStream/share/TileLaserObjByteStreamCnv_test.ref
+++ b/TileCalorimeter/TileSvc/TileByteStream/share/TileLaserObjByteStreamCnv_test.ref
@@ -1,14 +1,14 @@
-Tue Jan 22 02:34:42 CET 2019
+Sat Jan 26 19:48:39 CET 2019
 Preloading tcmalloc_minimal.so
 Py:Athena            INFO including file "AthenaCommon/Preparation.py"
-Py:Athena            INFO using release [WorkDir-22.0.1] [x86_64-slc6-gcc62-dbg] [atlas-work3/5871b6e8de] -- built on [2019-01-21T2115]
+Py:Athena            INFO using release [WorkDir-22.0.1] [x86_64-slc6-gcc62-opt] [atlas-work3/5e0c78d866] -- built on [2019-01-26T1705]
 Py:Athena            INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
 Py:Athena            INFO executing ROOT6Setup
 Py:Athena            INFO including file "AthenaCommon/Execution.py"
 Py:Athena            INFO including file "TileByteStream/TileLaserObjByteStreamCnv_test.py"
 [?1034hSetGeometryVersion.py obtained major release version 22
 Py:Athena            INFO including file "IdDictDetDescrCnv/IdDictDetDescrCnv_joboptions.py"
-Py:ConfigurableDb    INFO Read module info for 5456 configurables from 80 genConfDb files
+Py:ConfigurableDb    INFO Read module info for 5456 configurables from 76 genConfDb files
 Py:ConfigurableDb    INFO No duplicates have been found: that's good !
 EventInfoMgtInit: Got release version  Athena-22.0.1
 Py:IOVDbSvc.CondDB    INFO Setting up conditions DB access to instance OFLP200
@@ -34,7 +34,7 @@ ApplicationMgr       INFO Updating Gaudi::PluginService::SetDebug(level) to leve
 ApplicationMgr    SUCCESS 
 ====================================================================================================================================
                                                    Welcome to ApplicationMgr (GaudiCoreSvc v30r5)
-                                          running on lxplus068.cern.ch on Tue Jan 22 02:35:16 2019
+                                          running on lxplus062.cern.ch on Sat Jan 26 19:48:59 2019
 ====================================================================================================================================
 ApplicationMgr       INFO Successfully loaded modules : AthenaServices
 ApplicationMgr       INFO Application Manager Configured successfully
@@ -51,8 +51,8 @@ PoolSvc              INFO io_register[PoolSvc](xmlcatalog_file:PoolFileCatalog.x
 PoolSvc              INFO Set connectionsvc retry/timeout/IDLE timeout to  'ConnectionRetrialPeriod':300/ 'ConnectionRetrialTimeOut':3600/ 'ConnectionTimeOut':5 seconds with connection cleanup disabled
 PoolSvc              INFO Frontier compression level set to 5
 DBReplicaSvc         INFO Frontier server at (serverurl=http://atlasfrontier-local.cern.ch:8000/atlr)(serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://lcgft-atlas.gridpp.rl.ac.uk:3128/frontierATLAS)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://ca-proxy.cern.ch:3128)(proxyurl=http://ca-proxy-meyrin.cern.ch:3128)(proxyurl=http://ca-proxy-wigner.cern.ch:3128)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
-DBReplicaSvc         INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/dbreplica.config
-DBReplicaSvc         INFO Total of 10 servers found for host lxplus068.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
+DBReplicaSvc         INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/dbreplica.config
+DBReplicaSvc         INFO Total of 10 servers found for host lxplus062.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
 PoolSvc              INFO Successfully setup replica sorting algorithm
 PoolSvc              INFO Setting up APR FileCatalog and Streams
 PoolSvc           WARNING Unable to locate catalog for prfile:poolcond/PoolCat_oflcond.xml check your ATLAS_POOLCOND_PATH and DATAPATH variables
@@ -192,7 +192,7 @@ EndcapDMConstru...   INFO Start building EC electronics geometry
   multi-layered version of absorbers activated, mlabs == 1
 ================================================
 EndcapDMConstru...   INFO Start building EC electronics geometry
-GeoModelSvc          INFO GeoModelSvc.LArDetectorToolNV	 SZ= 28576Kb 	 Time = 1.68S
+GeoModelSvc          INFO GeoModelSvc.LArDetectorToolNV	 SZ= 22940Kb 	 Time = 0.6S
 GeoModelSvc.Til...   INFO  Entering TileDetectorTool::create()
 TileDddbManager      INFO m_tag = ATLAS-R2-2016-01-00-01
 TileDddbManager      INFO n_tiglob = 5
@@ -204,7 +204,7 @@ TileDddbManager      INFO n_tileSwitches = 1
 ClassIDSvc           INFO  getRegistryEntries: read 213 CLIDRegistry entries for module ALL
 CaloIDHelper_ID...   INFO in createObj: creating a TileID helper object in the detector store
 AtlasDetectorID      INFO initialize_from_dictionary - OK
-TileNeighbour        INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/TileNeighbour_reduced.txt
+TileNeighbour        INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/TileNeighbour_reduced.txt
 TileHWIDDetDesc...   INFO in createObj: creating a TileHWID helper object in the detector store
 TileHWID             INFO initialize_from_dictionary 
 AtlasDetectorID      INFO initialize_from_dictionary - OK
@@ -216,9 +216,9 @@ CaloIDHelper_ID...   INFO in createObj: creating a LArHEC_ID helper object in th
 AtlasDetectorID      INFO initialize_from_dictionary - OK
 CaloIDHelper_ID...   INFO in createObj: creating a LArFCAL_ID helper object in the detector store
 AtlasDetectorID      INFO initialize_from_dictionary - OK
-LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/FCal2DNeighbors-April2011.txt
-LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/FCal3DNeighborsNext-April2011.txt
-LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/FCal3DNeighborsPrev-April2011.txt
+LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/FCal2DNeighbors-April2011.txt
+LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/FCal3DNeighborsNext-April2011.txt
+LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/FCal3DNeighborsPrev-April2011.txt
 CaloIDHelper_ID...   INFO in createObj: creating a LArMiniFCAL_ID helper object in the detector store
 AtlasDetectorID      INFO initialize_from_dictionary - OK
 LArMiniFCAL_ID       INFO  initialize_from_dict - LArCalorimeter dictionary does NOT contain miniFCAL description. Unable to initialize LArMiniFCAL_ID.
@@ -249,11 +249,11 @@ GeoModelSvc.Til...   INFO                                    PLUG2  Rmin= 2981 R
 GeoModelSvc.Til...   INFO  Positioning negative ITC with translation -3405
 GeoModelSvc.Til...   INFO  Positioning negative Gap with translation -3552
 GeoModelSvc.Til...   INFO  Positioning negative Crack with translation -3536
-GeoModelSvc.Til...   INFO  Global positioning of barrel with rotation (0,0,0)) and translation (0,0,0) GeoModelKernelUnits::cm
-GeoModelSvc.Til...   INFO  Global positioning of positive ext.barrel with rotation (0,0,0)) and translation (0,0,0) GeoModelKernelUnits::cm
-GeoModelSvc.Til...   INFO  Global positioning of negative ext.barrel with rotation (0,0,0)) and translation (0,0,1) GeoModelKernelUnits::cm
+GeoModelSvc.Til...   INFO  Global positioning of barrel with rotation (0,0,0)) and translation (0,0,0) Gaudi::Units::cm
+GeoModelSvc.Til...   INFO  Global positioning of positive ext.barrel with rotation (0,0,0)) and translation (0,0,0) Gaudi::Units::cm
+GeoModelSvc.Til...   INFO  Global positioning of negative ext.barrel with rotation (0,0,0)) and translation (0,0,1) Gaudi::Units::cm
 TileDetDescrMan...   INFO Entering create_elements()
-GeoModelSvc          INFO GeoModelSvc.TileDetectorTool	 SZ= 5196Kb 	 Time = 1.84S
+GeoModelSvc          INFO GeoModelSvc.TileDetectorTool	 SZ= 4592Kb 	 Time = 0.25S
 ClassIDSvc           INFO  getRegistryEntries: read 65 CLIDRegistry entries for module ALL
 TileInfoLoader       INFO Initializing....TileInfoLoader
 TileInfoLoader       INFO New ATLAS geometry detected: ATLAS-R2-2016-01-00-01 (010001) version 10001
@@ -275,11 +275,11 @@ TileInfoLoader       INFO Sampling fraction for E2 cells 1/107
 TileInfoLoader       INFO Sampling fraction for E3 cells 1/97
 TileInfoLoader       INFO Sampling fraction for E4 cells 1/75
 TileInfoLoader       INFO Sampling fraction for E4' cells 1/75
-TileInfoLoader       INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/pulsehi_physics.dat
-TileInfoLoader       INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/pulselo_physics.dat
-TileInfoLoader       INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/pulse_adder_tower_physics.dat
-TileInfoLoader       INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/pulse_adder_muonRcv_physics.dat
-TileInfoLoader       INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/pulse_adder_muon_physics.dat
+TileInfoLoader       INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/pulsehi_physics.dat
+TileInfoLoader       INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/pulselo_physics.dat
+TileInfoLoader       INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/pulse_adder_tower_physics.dat
+TileInfoLoader       INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/pulse_adder_muonRcv_physics.dat
+TileInfoLoader       INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/pulse_adder_muon_physics.dat
 CaloIDHelper_ID...   INFO in createObj: creating a CaloLVL1_ID helper object in the detector store
 CaloLVL1_ID          INFO initialize_from_dictionary
 AtlasDetectorID      INFO initialize_from_dictionary - OK
@@ -387,12 +387,12 @@ CaloIDHelper_ID...   INFO in createObj: creating a LArHEC_SuperCell_ID helper ob
 AtlasDetectorID      INFO initialize_from_dictionary - OK
 CaloIDHelper_ID...   INFO in createObj: creating a LArFCAL_SuperCell_ID helper object in the detector store
 AtlasDetectorID      INFO initialize_from_dictionary - OK
-LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/FCalSuperCells2DNeighborsNew-April2014.txt
-LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
-LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
+LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/FCalSuperCells2DNeighborsNew-April2014.txt
+LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
+LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
 CaloIDHelper_ID...   INFO in createObj: creating a Tile_SuperCell_ID helper object in the detector store
 AtlasDetectorID      INFO initialize_from_dictionary - OK
-TileNeighbour        INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/TileSuperCellNeighbour.txt
+TileNeighbour        INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/TileSuperCellNeighbour.txt
 AtlasDetectorID      INFO initialize_from_dictionary - OK
 CaloIdMgrDetDes...   INFO  Finished 
 CaloIdMgrDetDes...   INFO Initializing CaloIdMgr from values in CaloIdMgrDetDescrCnv 
@@ -421,7 +421,7 @@ TileBadChannels...   INFO TileBchStatus::isNoisy() is defined by: Large HF noise
 TileBadChannels...   INFO TileBchStatus::isNoGainL1() is defined by: ADC dead; No PMT connected; No HV; Channel masked for LV1 (unspecified); LV1 channel no gain; LV1 channel noisy; Channel disabled for LV1; 
 TileBadChannels...   INFO TileBchStatus::isBadTiming() is defined by: Bad timing; 
 TileBadChannels...   INFO No drawer trips probabilities found in DB
-ClassIDSvc           INFO  getRegistryEntries: read 2407 CLIDRegistry entries for module ALL
+ClassIDSvc           INFO  getRegistryEntries: read 2427 CLIDRegistry entries for module ALL
 ClassIDSvc           INFO  getRegistryEntries: read 89 CLIDRegistry entries for module ALL
 ToolSvc.TileROD...   INFO TileL2Builder initialization completed
 AthenaEventLoopMgr   INFO   ===>>>  done processing event #18124, run #363899 1 events processed so far  <<<===
@@ -639,23 +639,23 @@ IncidentProcAlg2     INFO Finalize
 EventInfoByteSt...   INFO finalize 
 PyComponentMgr       INFO Finalizing PyComponentMgr...
 IdDictDetDescrCnv    INFO in finalize
-IOVDbFolder          INFO Folder /LAR/Align (PoolRef) db-read 1/1 objs/chan/bytes 1/1/340 ((     0.94 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/CES (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/105700 ((     1.34 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/CIS/FIT/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/108 ((     0.82 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/CIS/FIT/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/108 ((     1.34 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/EMS (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/116 ((     0.79 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/LAS/FIBER (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/964 ((     4.07 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/LAS/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/96 ((     0.66 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/LAS/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/104 ((     0.55 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/NOISE/SAMPLE (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/643860 ((     2.91 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/STATUS/ADC (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/43200 ((     2.02 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/TIME/CHANNELOFFSET/PHY (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/120 ((     1.31 ))s
-IOVDbFolder          INFO Folder /TILE/ONL01/STATUS/ADC (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/100 ((     0.08 ))s
-IOVDbFolder          INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 1/1 objs/chan/bytes 1/1/390 ((     0.39 ))s
-IOVDbSvc             INFO  bytes in ((     17.22 ))s
+IOVDbFolder          INFO Folder /LAR/Align (PoolRef) db-read 1/1 objs/chan/bytes 1/1/340 ((     0.17 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/CES (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/105700 ((     0.15 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/CIS/FIT/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/108 ((     0.03 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/CIS/FIT/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/108 ((     0.03 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/EMS (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/116 ((     0.03 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/LAS/FIBER (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/964 ((     0.03 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/LAS/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/96 ((     0.02 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/LAS/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/104 ((     0.03 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/NOISE/SAMPLE (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/643860 ((     0.04 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/STATUS/ADC (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/43200 ((     0.03 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/TIME/CHANNELOFFSET/PHY (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/120 ((     0.03 ))s
+IOVDbFolder          INFO Folder /TILE/ONL01/STATUS/ADC (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/100 ((     0.01 ))s
+IOVDbFolder          INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 1/1 objs/chan/bytes 1/1/390 ((     0.02 ))s
+IOVDbSvc             INFO  bytes in ((      0.59 ))s
 IOVDbSvc             INFO Connection sqlite://;schema=mycool.db;dbname=OFLP200 : nConnect: 0 nFolders: 0 ReadTime: ((     0.00 ))s
-IOVDbSvc             INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 2 nFolders: 2 ReadTime: ((     1.32 ))s
-IOVDbSvc             INFO Connection COOLOFL_TILE/OFLP200 : nConnect: 2 nFolders: 11 ReadTime: ((    15.90 ))s
+IOVDbSvc             INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 2 nFolders: 2 ReadTime: ((     0.18 ))s
+IOVDbSvc             INFO Connection COOLOFL_TILE/OFLP200 : nConnect: 2 nFolders: 11 ReadTime: ((     0.40 ))s
 TileInfoLoader       INFO TileInfoLoader::finalize()
 AthDictLoaderSvc     INFO in finalize...
 ToolSvc              INFO Removing all tools created by ToolSvc
@@ -664,18 +664,18 @@ ToolSvc.TileROD...   INFO Finalizing
 *****Chrono*****     INFO ****************************************************************************************************
 *****Chrono*****     INFO  The Final CPU consumption ( Chrono ) Table (ordered)
 *****Chrono*****     INFO ****************************************************************************************************
-cObjR_ALL            INFO Time User   : Tot= 0.82  [s] Ave/Min/Max= 0.41(+- 0.38)/ 0.03/ 0.79  [s] #=  2
-cObj_ALL             INFO Time User   : Tot= 1.04  [s] Ave/Min/Max= 0.08(+-0.232)/    0/ 0.87  [s] #= 13
-ChronoStatSvc        INFO Time User   : Tot= 21.9  [s]                                             #=  1
+cObjR_ALL            INFO Time User   : Tot=  430 [ms] Ave/Min/Max=  215(+-  215)/    0/  430 [ms] #=  2
+cObj_ALL             INFO Time User   : Tot= 0.53  [s] Ave/Min/Max=0.0408(+-0.122)/    0/ 0.46  [s] #= 13
+ChronoStatSvc        INFO Time User   : Tot= 5.52  [s]                                             #=  1
 *****Chrono*****     INFO ****************************************************************************************************
 ChronoStatSvc.f...   INFO  Service finalized successfully 
 ApplicationMgr       INFO Application Manager Finalized successfully
 ApplicationMgr       INFO Application Manager Terminated successfully
 Py:Athena            INFO leaving with code 0: "successful run"
-Tue Jan 22 02:36:12 CET 2019
+Sat Jan 26 19:49:12 CET 2019
 Preloading tcmalloc_minimal.so
 Py:Athena            INFO including file "AthenaCommon/Preparation.py"
-Py:Athena            INFO using release [WorkDir-22.0.1] [x86_64-slc6-gcc62-dbg] [atlas-work3/5871b6e8de] -- built on [2019-01-21T2115]
+Py:Athena            INFO using release [WorkDir-22.0.1] [x86_64-slc6-gcc62-opt] [atlas-work3/5e0c78d866] -- built on [2019-01-26T1705]
 Py:Athena            INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
 Py:Athena            INFO executing ROOT6Setup
 Py:Athena            INFO configuring AthenaHive with [4] concurrent threads and [4] concurrent events
@@ -684,7 +684,7 @@ Py:Athena            INFO including file "AthenaCommon/Execution.py"
 Py:Athena            INFO including file "TileByteStream/TileLaserObjByteStreamCnv_test.py"
 [?1034hSetGeometryVersion.py obtained major release version 22
 Py:Athena            INFO including file "IdDictDetDescrCnv/IdDictDetDescrCnv_joboptions.py"
-Py:ConfigurableDb    INFO Read module info for 5456 configurables from 80 genConfDb files
+Py:ConfigurableDb    INFO Read module info for 5456 configurables from 76 genConfDb files
 Py:ConfigurableDb    INFO No duplicates have been found: that's good !
 EventInfoMgtInit: Got release version  Athena-22.0.1
 Py:IOVDbSvc.CondDB    INFO Setting up conditions DB access to instance OFLP200
@@ -711,7 +711,7 @@ MessageSvc           INFO Activating in a separate thread
 ApplicationMgr    SUCCESS 
 ====================================================================================================================================
                                                    Welcome to ApplicationMgr (GaudiCoreSvc v30r5)
-                                          running on lxplus068.cern.ch on Tue Jan 22 02:36:37 2019
+                                          running on lxplus062.cern.ch on Sat Jan 26 19:49:28 2019
 ====================================================================================================================================
 ApplicationMgr       INFO Successfully loaded modules : AthenaServices
 ApplicationMgr       INFO Application Manager Configured successfully
@@ -727,8 +727,8 @@ PoolSvc                                            INFO io_register[PoolSvc](xml
 PoolSvc                                            INFO Set connectionsvc retry/timeout/IDLE timeout to  'ConnectionRetrialPeriod':300/ 'ConnectionRetrialTimeOut':3600/ 'ConnectionTimeOut':5 seconds with connection cleanup disabled
 PoolSvc                                            INFO Frontier compression level set to 5
 DBReplicaSvc                                       INFO Frontier server at (serverurl=http://atlasfrontier-local.cern.ch:8000/atlr)(serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://lcgft-atlas.gridpp.rl.ac.uk:3128/frontierATLAS)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://ca-proxy.cern.ch:3128)(proxyurl=http://ca-proxy-meyrin.cern.ch:3128)(proxyurl=http://ca-proxy-wigner.cern.ch:3128)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
-DBReplicaSvc                                       INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/dbreplica.config
-DBReplicaSvc                                       INFO Total of 10 servers found for host lxplus068.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
+DBReplicaSvc                                       INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/dbreplica.config
+DBReplicaSvc                                       INFO Total of 10 servers found for host lxplus062.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
 PoolSvc                                            INFO Successfully setup replica sorting algorithm
 PoolSvc                                            INFO Setting up APR FileCatalog and Streams
 PoolSvc                                         WARNING Unable to locate catalog for prfile:poolcond/PoolCat_oflcond.xml check your ATLAS_POOLCOND_PATH and DATAPATH variables
@@ -869,7 +869,7 @@ EndcapDMConstruction                               INFO Start building EC electr
   multi-layered version of absorbers activated, mlabs == 1
 ================================================
 EndcapDMConstruction                               INFO Start building EC electronics geometry
-GeoModelSvc                                        INFO GeoModelSvc.LArDetectorToolNV	 SZ= 29600Kb 	 Time = 1.63S
+GeoModelSvc                                        INFO GeoModelSvc.LArDetectorToolNV	 SZ= 21916Kb 	 Time = 0.61S
 GeoModelSvc.TileDetectorTool                       INFO  Entering TileDetectorTool::create()
 TileDddbManager                                    INFO m_tag = ATLAS-R2-2016-01-00-01
 TileDddbManager                                    INFO n_tiglob = 5
@@ -881,7 +881,7 @@ TileDddbManager                                    INFO n_tileSwitches = 1
 ClassIDSvc                                         INFO  getRegistryEntries: read 213 CLIDRegistry entries for module ALL
 CaloIDHelper_IDDetDescrCnv                         INFO in createObj: creating a TileID helper object in the detector store
 AtlasDetectorID                                    INFO initialize_from_dictionary - OK
-TileNeighbour                                      INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/TileNeighbour_reduced.txt
+TileNeighbour                                      INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/TileNeighbour_reduced.txt
 TileHWIDDetDescrCnv                                INFO in createObj: creating a TileHWID helper object in the detector store
 TileHWID                                           INFO initialize_from_dictionary 
 AtlasDetectorID                                    INFO initialize_from_dictionary - OK
@@ -893,9 +893,9 @@ CaloIDHelper_IDDetDescrCnv                         INFO in createObj: creating a
 AtlasDetectorID                                    INFO initialize_from_dictionary - OK
 CaloIDHelper_IDDetDescrCnv                         INFO in createObj: creating a LArFCAL_ID helper object in the detector store
 AtlasDetectorID                                    INFO initialize_from_dictionary - OK
-LArFCAL_Base_ID                                    INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/FCal2DNeighbors-April2011.txt
-LArFCAL_Base_ID                                    INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/FCal3DNeighborsNext-April2011.txt
-LArFCAL_Base_ID                                    INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/FCal3DNeighborsPrev-April2011.txt
+LArFCAL_Base_ID                                    INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/FCal2DNeighbors-April2011.txt
+LArFCAL_Base_ID                                    INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/FCal3DNeighborsNext-April2011.txt
+LArFCAL_Base_ID                                    INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/FCal3DNeighborsPrev-April2011.txt
 CaloIDHelper_IDDetDescrCnv                         INFO in createObj: creating a LArMiniFCAL_ID helper object in the detector store
 AtlasDetectorID                                    INFO initialize_from_dictionary - OK
 LArMiniFCAL_ID                                     INFO  initialize_from_dict - LArCalorimeter dictionary does NOT contain miniFCAL description. Unable to initialize LArMiniFCAL_ID.
@@ -926,11 +926,11 @@ GeoModelSvc.TileDetectorTool                       INFO
 GeoModelSvc.TileDetectorTool                       INFO  Positioning negative ITC with translation -3405
 GeoModelSvc.TileDetectorTool                       INFO  Positioning negative Gap with translation -3552
 GeoModelSvc.TileDetectorTool                       INFO  Positioning negative Crack with translation -3536
-GeoModelSvc.TileDetectorTool                       INFO  Global positioning of barrel with rotation (0,0,0)) and translation (0,0,0) GeoModelKernelUnits::cm
-GeoModelSvc.TileDetectorTool                       INFO  Global positioning of positive ext.barrel with rotation (0,0,0)) and translation (0,0,0) GeoModelKernelUnits::cm
-GeoModelSvc.TileDetectorTool                       INFO  Global positioning of negative ext.barrel with rotation (0,0,0)) and translation (0,0,1) GeoModelKernelUnits::cm
+GeoModelSvc.TileDetectorTool                       INFO  Global positioning of barrel with rotation (0,0,0)) and translation (0,0,0) Gaudi::Units::cm
+GeoModelSvc.TileDetectorTool                       INFO  Global positioning of positive ext.barrel with rotation (0,0,0)) and translation (0,0,0) Gaudi::Units::cm
+GeoModelSvc.TileDetectorTool                       INFO  Global positioning of negative ext.barrel with rotation (0,0,0)) and translation (0,0,1) Gaudi::Units::cm
 TileDetDescrManager                                INFO Entering create_elements()
-GeoModelSvc                                        INFO GeoModelSvc.TileDetectorTool	 SZ= 4172Kb 	 Time = 1.77S
+GeoModelSvc                                        INFO GeoModelSvc.TileDetectorTool	 SZ= 4592Kb 	 Time = 0.22S
 ClassIDSvc                                         INFO  getRegistryEntries: read 65 CLIDRegistry entries for module ALL
 TileInfoLoader                                     INFO Initializing....TileInfoLoader
 TileInfoLoader                                     INFO New ATLAS geometry detected: ATLAS-R2-2016-01-00-01 (010001) version 10001
@@ -952,11 +952,11 @@ TileInfoLoader                                     INFO Sampling fraction for E2
 TileInfoLoader                                     INFO Sampling fraction for E3 cells 1/97
 TileInfoLoader                                     INFO Sampling fraction for E4 cells 1/75
 TileInfoLoader                                     INFO Sampling fraction for E4' cells 1/75
-TileInfoLoader                                     INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/pulsehi_physics.dat
-TileInfoLoader                                     INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/pulselo_physics.dat
-TileInfoLoader                                     INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/pulse_adder_tower_physics.dat
-TileInfoLoader                                     INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/pulse_adder_muonRcv_physics.dat
-TileInfoLoader                                     INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/pulse_adder_muon_physics.dat
+TileInfoLoader                                     INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/pulsehi_physics.dat
+TileInfoLoader                                     INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/pulselo_physics.dat
+TileInfoLoader                                     INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/pulse_adder_tower_physics.dat
+TileInfoLoader                                     INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/pulse_adder_muonRcv_physics.dat
+TileInfoLoader                                     INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/pulse_adder_muon_physics.dat
 CaloIDHelper_IDDetDescrCnv                         INFO in createObj: creating a CaloLVL1_ID helper object in the detector store
 CaloLVL1_ID                                        INFO initialize_from_dictionary
 AtlasDetectorID                                    INFO initialize_from_dictionary - OK
@@ -1076,12 +1076,12 @@ CaloIDHelper_IDDetDescrCnv              0   0      INFO in createObj: creating a
 AtlasDetectorID                         0   0      INFO initialize_from_dictionary - OK
 CaloIDHelper_IDDetDescrCnv              0   0      INFO in createObj: creating a LArFCAL_SuperCell_ID helper object in the detector store
 AtlasDetectorID                         0   0      INFO initialize_from_dictionary - OK
-LArFCAL_Base_ID                         0   0      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/FCalSuperCells2DNeighborsNew-April2014.txt
-LArFCAL_Base_ID                         0   0      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
-LArFCAL_Base_ID                         0   0      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
+LArFCAL_Base_ID                         0   0      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/FCalSuperCells2DNeighborsNew-April2014.txt
+LArFCAL_Base_ID                         0   0      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
+LArFCAL_Base_ID                         0   0      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
 CaloIDHelper_IDDetDescrCnv              0   0      INFO in createObj: creating a Tile_SuperCell_ID helper object in the detector store
 AtlasDetectorID                         0   0      INFO initialize_from_dictionary - OK
-TileNeighbour                           0   0      INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/TileSuperCellNeighbour.txt
+TileNeighbour                           0   0      INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/TileSuperCellNeighbour.txt
 AtlasDetectorID                         0   0      INFO initialize_from_dictionary - OK
 CaloIdMgrDetDescrCnv                    0   0      INFO  Finished 
 CaloIdMgrDetDescrCnv                    0   0      INFO Initializing CaloIdMgr from values in CaloIdMgrDetDescrCnv 
@@ -1092,45 +1092,45 @@ AthenaHiveEventLoopMgr                  0   0      INFO   ===>>>  start processi
 AthenaHiveEventLoopMgr                  1   1      INFO   ===>>>  start processing event #18125, run #363899 on slot 1,  0 events processed so far  <<<===
 AthenaHiveEventLoopMgr                  2   2      INFO   ===>>>  start processing event #18126, run #363899 on slot 2,  0 events processed so far  <<<===
 AthenaHiveEventLoopMgr                  3   3      INFO   ===>>>  start processing event #18127, run #363899 on slot 3,  0 events processed so far  <<<===
-ClassIDSvc                              0   0      INFO  getRegistryEntries: read 650 CLIDRegistry entries for module ALL
-ClassIDSvc                              0   0      INFO  getRegistryEntries: read 1757 CLIDRegistry entries for module ALL
-ClassIDSvc                              0   0      INFO  getRegistryEntries: read 89 CLIDRegistry entries for module ALL
-ToolSvc.TileROD_Decoder.TileROD_L2Bui...0   0      INFO TileL2Builder initialization completed
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18126, run #363899 on slot 2,  1 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  4   2      INFO   ===>>>  start processing event #18128, run #363899 on slot 2,  1 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18125, run #363899 on slot 1,  2 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18124, run #363899 on slot 0,  3 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18127, run #363899 on slot 3,  4 events processed so far  <<<===
+ClassIDSvc                              0   0      INFO  getRegistryEntries: read 670 CLIDRegistry entries for module ALL
+ClassIDSvc                              1   1      INFO  getRegistryEntries: read 1757 CLIDRegistry entries for module ALL
+ClassIDSvc                              1   1      INFO  getRegistryEntries: read 89 CLIDRegistry entries for module ALL
+ToolSvc.TileROD_Decoder.TileROD_L2Bui...1   1      INFO TileL2Builder initialization completed
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18125, run #363899 on slot 1,  1 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  4   1      INFO   ===>>>  start processing event #18128, run #363899 on slot 1,  1 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18124, run #363899 on slot 0,  2 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18127, run #363899 on slot 3,  3 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18126, run #363899 on slot 2,  4 events processed so far  <<<===
 AthenaHiveEventLoopMgr                  5   0      INFO   ===>>>  start processing event #18129, run #363899 on slot 0,  4 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  6   1      INFO   ===>>>  start processing event #18130, run #363899 on slot 1,  4 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  6   2      INFO   ===>>>  start processing event #18130, run #363899 on slot 2,  4 events processed so far  <<<===
 AthenaHiveEventLoopMgr                  7   3      INFO   ===>>>  start processing event #18131, run #363899 on slot 3,  4 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18128, run #363899 on slot 2,  5 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  8   2      INFO   ===>>>  start processing event #18132, run #363899 on slot 2,  5 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18128, run #363899 on slot 1,  5 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  8   1      INFO   ===>>>  start processing event #18132, run #363899 on slot 1,  5 events processed so far  <<<===
 AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18129, run #363899 on slot 0,  6 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18130, run #363899 on slot 1,  7 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  9   0      INFO   ===>>>  start processing event #18133, run #363899 on slot 0,  7 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  10  1      INFO   ===>>>  start processing event #18134, run #363899 on slot 1,  7 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  9   0      INFO   ===>>>  start processing event #18133, run #363899 on slot 0,  6 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18130, run #363899 on slot 2,  7 events processed so far  <<<===
 AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18131, run #363899 on slot 3,  8 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18132, run #363899 on slot 2,  9 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18132, run #363899 on slot 1,  9 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  10  1      INFO   ===>>>  start processing event #18134, run #363899 on slot 1,  9 events processed so far  <<<===
 AthenaHiveEventLoopMgr                  11  2      INFO   ===>>>  start processing event #18135, run #363899 on slot 2,  9 events processed so far  <<<===
 AthenaHiveEventLoopMgr                  12  3      INFO   ===>>>  start processing event #18136, run #363899 on slot 3,  9 events processed so far  <<<===
 AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18133, run #363899 on slot 0,  10 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  13  0      INFO   ===>>>  start processing event #18137, run #363899 on slot 0,  10 events processed so far  <<<===
 AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18134, run #363899 on slot 1,  11 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  13  0      INFO   ===>>>  start processing event #18137, run #363899 on slot 0,  11 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  14  1      INFO   ===>>>  start processing event #18138, run #363899 on slot 1,  11 events processed so far  <<<===
 AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18135, run #363899 on slot 2,  12 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  14  1      INFO   ===>>>  start processing event #18138, run #363899 on slot 1,  12 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  15  2      INFO   ===>>>  start processing event #18139, run #363899 on slot 2,  12 events processed so far  <<<===
 AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18136, run #363899 on slot 3,  13 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  15  2      INFO   ===>>>  start processing event #18139, run #363899 on slot 2,  13 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  16  3      INFO   ===>>>  start processing event #18140, run #363899 on slot 3,  13 events processed so far  <<<===
 AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18137, run #363899 on slot 0,  14 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  16  0      INFO   ===>>>  start processing event #18140, run #363899 on slot 0,  14 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  17  3      INFO   ===>>>  start processing event #18141, run #363899 on slot 3,  14 events processed so far  <<<===
 AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18138, run #363899 on slot 1,  15 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  17  0      INFO   ===>>>  start processing event #18141, run #363899 on slot 0,  15 events processed so far  <<<===
 AthenaHiveEventLoopMgr                  18  1      INFO   ===>>>  start processing event #18142, run #363899 on slot 1,  15 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18140, run #363899 on slot 3,  16 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18139, run #363899 on slot 2,  17 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  19  2      INFO   ===>>>  start processing event #18143, run #363899 on slot 2,  17 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18139, run #363899 on slot 2,  16 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  19  2      INFO   ===>>>  start processing event #18143, run #363899 on slot 2,  16 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18141, run #363899 on slot 3,  17 events processed so far  <<<===
 AthenaHiveEventLoopMgr                  20  3      INFO   ===>>>  start processing event #18144, run #363899 on slot 3,  17 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18141, run #363899 on slot 0,  18 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18140, run #363899 on slot 0,  18 events processed so far  <<<===
 AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18142, run #363899 on slot 1,  19 events processed so far  <<<===
 AthenaHiveEventLoopMgr                  21  0      INFO   ===>>>  start processing event #18145, run #363899 on slot 0,  19 events processed so far  <<<===
 AthenaHiveEventLoopMgr                  22  1      INFO   ===>>>  start processing event #18146, run #363899 on slot 1,  19 events processed so far  <<<===
@@ -1139,160 +1139,160 @@ AthenaHiveEventLoopMgr                             INFO   ===>>>  done processin
 AthenaHiveEventLoopMgr                  23  2      INFO   ===>>>  start processing event #18147, run #363899 on slot 2,  21 events processed so far  <<<===
 AthenaHiveEventLoopMgr                  24  3      INFO   ===>>>  start processing event #18148, run #363899 on slot 3,  21 events processed so far  <<<===
 AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18145, run #363899 on slot 0,  22 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  25  0      INFO   ===>>>  start processing event #18149, run #363899 on slot 0,  22 events processed so far  <<<===
 AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18146, run #363899 on slot 1,  23 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  25  0      INFO   ===>>>  start processing event #18149, run #363899 on slot 0,  23 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  26  1      INFO   ===>>>  start processing event #18150, run #363899 on slot 1,  23 events processed so far  <<<===
 AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18147, run #363899 on slot 2,  24 events processed so far  <<<===
 AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18148, run #363899 on slot 3,  25 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  26  1      INFO   ===>>>  start processing event #18150, run #363899 on slot 1,  25 events processed so far  <<<===
 AthenaHiveEventLoopMgr                  27  2      INFO   ===>>>  start processing event #18151, run #363899 on slot 2,  25 events processed so far  <<<===
 AthenaHiveEventLoopMgr                  28  3      INFO   ===>>>  start processing event #18152, run #363899 on slot 3,  25 events processed so far  <<<===
 AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18149, run #363899 on slot 0,  26 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  29  0      INFO   ===>>>  start processing event #18153, run #363899 on slot 0,  26 events processed so far  <<<===
 AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18150, run #363899 on slot 1,  27 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  29  0      INFO   ===>>>  start processing event #18153, run #363899 on slot 0,  27 events processed so far  <<<===
 AthenaHiveEventLoopMgr                  30  1      INFO   ===>>>  start processing event #18154, run #363899 on slot 1,  27 events processed so far  <<<===
 AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18151, run #363899 on slot 2,  28 events processed so far  <<<===
 AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18152, run #363899 on slot 3,  29 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18153, run #363899 on slot 0,  30 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  31  0      INFO   ===>>>  start processing event #18155, run #363899 on slot 0,  30 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  32  2      INFO   ===>>>  start processing event #18156, run #363899 on slot 2,  30 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  33  3      INFO   ===>>>  start processing event #18157, run #363899 on slot 3,  30 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18154, run #363899 on slot 1,  31 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  31  2      INFO   ===>>>  start processing event #18155, run #363899 on slot 2,  29 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  32  3      INFO   ===>>>  start processing event #18156, run #363899 on slot 3,  29 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18154, run #363899 on slot 1,  30 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18153, run #363899 on slot 0,  31 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  33  0      INFO   ===>>>  start processing event #18157, run #363899 on slot 0,  31 events processed so far  <<<===
 AthenaHiveEventLoopMgr                  34  1      INFO   ===>>>  start processing event #18158, run #363899 on slot 1,  31 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18156, run #363899 on slot 2,  32 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  35  2      INFO   ===>>>  start processing event #18159, run #363899 on slot 2,  32 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18157, run #363899 on slot 3,  33 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18155, run #363899 on slot 0,  34 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18155, run #363899 on slot 2,  32 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18156, run #363899 on slot 3,  33 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  35  2      INFO   ===>>>  start processing event #18159, run #363899 on slot 2,  33 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  36  3      INFO   ===>>>  start processing event #18160, run #363899 on slot 3,  33 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18157, run #363899 on slot 0,  34 events processed so far  <<<===
 AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18158, run #363899 on slot 1,  35 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  36  0      INFO   ===>>>  start processing event #18160, run #363899 on slot 0,  35 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  37  1      INFO   ===>>>  start processing event #18161, run #363899 on slot 1,  35 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  38  3      INFO   ===>>>  start processing event #18162, run #363899 on slot 3,  35 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  37  0      INFO   ===>>>  start processing event #18161, run #363899 on slot 0,  35 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  38  1      INFO   ===>>>  start processing event #18162, run #363899 on slot 1,  35 events processed so far  <<<===
 AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18159, run #363899 on slot 2,  36 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  39  2      INFO   ===>>>  start processing event #18163, run #363899 on slot 2,  36 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18160, run #363899 on slot 0,  37 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18161, run #363899 on slot 1,  38 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  40  0      INFO   ===>>>  start processing event #18164, run #363899 on slot 0,  38 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  41  1      INFO   ===>>>  start processing event #18165, run #363899 on slot 1,  38 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18162, run #363899 on slot 3,  39 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18163, run #363899 on slot 2,  40 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  42  2      INFO   ===>>>  start processing event #18166, run #363899 on slot 2,  40 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  43  3      INFO   ===>>>  start processing event #18167, run #363899 on slot 3,  40 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18164, run #363899 on slot 0,  41 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18165, run #363899 on slot 1,  42 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  44  0      INFO   ===>>>  start processing event #18168, run #363899 on slot 0,  42 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  45  1      INFO   ===>>>  start processing event #18169, run #363899 on slot 1,  42 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18166, run #363899 on slot 2,  43 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18167, run #363899 on slot 3,  44 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  46  2      INFO   ===>>>  start processing event #18170, run #363899 on slot 2,  44 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  47  3      INFO   ===>>>  start processing event #18171, run #363899 on slot 3,  44 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18168, run #363899 on slot 0,  45 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18169, run #363899 on slot 1,  46 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  48  0      INFO   ===>>>  start processing event #18172, run #363899 on slot 0,  46 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  49  1      INFO   ===>>>  start processing event #18173, run #363899 on slot 1,  46 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18170, run #363899 on slot 2,  47 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18171, run #363899 on slot 3,  48 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  50  2      INFO   ===>>>  start processing event #18174, run #363899 on slot 2,  48 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  51  3      INFO   ===>>>  start processing event #18175, run #363899 on slot 3,  48 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18172, run #363899 on slot 0,  49 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18173, run #363899 on slot 1,  50 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  52  0      INFO   ===>>>  start processing event #18176, run #363899 on slot 0,  50 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  53  1      INFO   ===>>>  start processing event #18177, run #363899 on slot 1,  50 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18174, run #363899 on slot 2,  51 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18175, run #363899 on slot 3,  52 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  54  2      INFO   ===>>>  start processing event #18178, run #363899 on slot 2,  52 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  55  3      INFO   ===>>>  start processing event #18179, run #363899 on slot 3,  52 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18176, run #363899 on slot 0,  53 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18177, run #363899 on slot 1,  54 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  56  0      INFO   ===>>>  start processing event #18180, run #363899 on slot 0,  54 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  57  1      INFO   ===>>>  start processing event #18181, run #363899 on slot 1,  54 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18178, run #363899 on slot 2,  55 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18179, run #363899 on slot 3,  56 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  58  2      INFO   ===>>>  start processing event #18182, run #363899 on slot 2,  56 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  59  3      INFO   ===>>>  start processing event #18183, run #363899 on slot 3,  56 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18180, run #363899 on slot 0,  57 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18181, run #363899 on slot 1,  58 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  60  0      INFO   ===>>>  start processing event #18184, run #363899 on slot 0,  58 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  61  1      INFO   ===>>>  start processing event #18185, run #363899 on slot 1,  58 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18182, run #363899 on slot 2,  59 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18183, run #363899 on slot 3,  60 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  62  2      INFO   ===>>>  start processing event #18186, run #363899 on slot 2,  60 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  63  3      INFO   ===>>>  start processing event #18187, run #363899 on slot 3,  60 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18184, run #363899 on slot 0,  61 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18185, run #363899 on slot 1,  62 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  64  0      INFO   ===>>>  start processing event #18188, run #363899 on slot 0,  62 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  65  1      INFO   ===>>>  start processing event #18189, run #363899 on slot 1,  62 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18186, run #363899 on slot 2,  63 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18187, run #363899 on slot 3,  64 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  66  2      INFO   ===>>>  start processing event #18190, run #363899 on slot 2,  64 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  67  3      INFO   ===>>>  start processing event #18191, run #363899 on slot 3,  64 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18188, run #363899 on slot 0,  65 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18189, run #363899 on slot 1,  66 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  68  0      INFO   ===>>>  start processing event #18192, run #363899 on slot 0,  66 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  69  1      INFO   ===>>>  start processing event #18193, run #363899 on slot 1,  66 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18190, run #363899 on slot 2,  67 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18191, run #363899 on slot 3,  68 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  70  2      INFO   ===>>>  start processing event #18194, run #363899 on slot 2,  68 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  71  3      INFO   ===>>>  start processing event #18195, run #363899 on slot 3,  68 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18160, run #363899 on slot 3,  37 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  39  2      INFO   ===>>>  start processing event #18163, run #363899 on slot 2,  37 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  40  3      INFO   ===>>>  start processing event #18164, run #363899 on slot 3,  37 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18161, run #363899 on slot 0,  38 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  41  0      INFO   ===>>>  start processing event #18165, run #363899 on slot 0,  38 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18162, run #363899 on slot 1,  39 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  42  1      INFO   ===>>>  start processing event #18166, run #363899 on slot 1,  39 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18164, run #363899 on slot 3,  40 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18163, run #363899 on slot 2,  41 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  43  2      INFO   ===>>>  start processing event #18167, run #363899 on slot 2,  41 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  44  3      INFO   ===>>>  start processing event #18168, run #363899 on slot 3,  41 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18165, run #363899 on slot 0,  42 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  45  0      INFO   ===>>>  start processing event #18169, run #363899 on slot 0,  42 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18166, run #363899 on slot 1,  43 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  46  1      INFO   ===>>>  start processing event #18170, run #363899 on slot 1,  43 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18167, run #363899 on slot 2,  44 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18168, run #363899 on slot 3,  45 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  47  2      INFO   ===>>>  start processing event #18171, run #363899 on slot 2,  45 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  48  3      INFO   ===>>>  start processing event #18172, run #363899 on slot 3,  45 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18169, run #363899 on slot 0,  46 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18170, run #363899 on slot 1,  47 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  49  0      INFO   ===>>>  start processing event #18173, run #363899 on slot 0,  47 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  50  1      INFO   ===>>>  start processing event #18174, run #363899 on slot 1,  47 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18171, run #363899 on slot 2,  48 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18172, run #363899 on slot 3,  49 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  51  2      INFO   ===>>>  start processing event #18175, run #363899 on slot 2,  49 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  52  3      INFO   ===>>>  start processing event #18176, run #363899 on slot 3,  49 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18173, run #363899 on slot 0,  50 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18174, run #363899 on slot 1,  51 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  53  0      INFO   ===>>>  start processing event #18177, run #363899 on slot 0,  51 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  54  1      INFO   ===>>>  start processing event #18178, run #363899 on slot 1,  51 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18175, run #363899 on slot 2,  52 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18176, run #363899 on slot 3,  53 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  55  2      INFO   ===>>>  start processing event #18179, run #363899 on slot 2,  53 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  56  3      INFO   ===>>>  start processing event #18180, run #363899 on slot 3,  53 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18177, run #363899 on slot 0,  54 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  57  0      INFO   ===>>>  start processing event #18181, run #363899 on slot 0,  54 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18178, run #363899 on slot 1,  55 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18180, run #363899 on slot 3,  56 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18179, run #363899 on slot 2,  57 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  58  1      INFO   ===>>>  start processing event #18182, run #363899 on slot 1,  57 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  59  2      INFO   ===>>>  start processing event #18183, run #363899 on slot 2,  57 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  60  3      INFO   ===>>>  start processing event #18184, run #363899 on slot 3,  57 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18181, run #363899 on slot 0,  58 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  61  0      INFO   ===>>>  start processing event #18185, run #363899 on slot 0,  58 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18182, run #363899 on slot 1,  59 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  62  1      INFO   ===>>>  start processing event #18186, run #363899 on slot 1,  59 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18183, run #363899 on slot 2,  60 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18184, run #363899 on slot 3,  61 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  63  2      INFO   ===>>>  start processing event #18187, run #363899 on slot 2,  61 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  64  3      INFO   ===>>>  start processing event #18188, run #363899 on slot 3,  61 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18185, run #363899 on slot 0,  62 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18186, run #363899 on slot 1,  63 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  65  0      INFO   ===>>>  start processing event #18189, run #363899 on slot 0,  63 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  66  1      INFO   ===>>>  start processing event #18190, run #363899 on slot 1,  63 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18187, run #363899 on slot 2,  64 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  67  2      INFO   ===>>>  start processing event #18191, run #363899 on slot 2,  64 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18188, run #363899 on slot 3,  65 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18189, run #363899 on slot 0,  66 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18190, run #363899 on slot 1,  67 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  68  0      INFO   ===>>>  start processing event #18192, run #363899 on slot 0,  67 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  69  1      INFO   ===>>>  start processing event #18193, run #363899 on slot 1,  67 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  70  3      INFO   ===>>>  start processing event #18194, run #363899 on slot 3,  67 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18191, run #363899 on slot 2,  68 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  71  2      INFO   ===>>>  start processing event #18195, run #363899 on slot 2,  68 events processed so far  <<<===
 AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18192, run #363899 on slot 0,  69 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  72  0      INFO   ===>>>  start processing event #18196, run #363899 on slot 0,  69 events processed so far  <<<===
 AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18193, run #363899 on slot 1,  70 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  72  0      INFO   ===>>>  start processing event #18196, run #363899 on slot 0,  70 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  73  1      INFO   ===>>>  start processing event #18197, run #363899 on slot 1,  70 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18194, run #363899 on slot 2,  71 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18195, run #363899 on slot 3,  72 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  74  2      INFO   ===>>>  start processing event #18198, run #363899 on slot 2,  72 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  75  3      INFO   ===>>>  start processing event #18199, run #363899 on slot 3,  72 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18194, run #363899 on slot 3,  71 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  73  1      INFO   ===>>>  start processing event #18197, run #363899 on slot 1,  71 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  74  3      INFO   ===>>>  start processing event #18198, run #363899 on slot 3,  71 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18195, run #363899 on slot 2,  72 events processed so far  <<<===
 AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18196, run #363899 on slot 0,  73 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  75  0      INFO   ===>>>  start processing event #18199, run #363899 on slot 0,  73 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  76  2      INFO   ===>>>  start processing event #18200, run #363899 on slot 2,  73 events processed so far  <<<===
 AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18197, run #363899 on slot 1,  74 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  76  0      INFO   ===>>>  start processing event #18200, run #363899 on slot 0,  74 events processed so far  <<<===
 AthenaHiveEventLoopMgr                  77  1      INFO   ===>>>  start processing event #18201, run #363899 on slot 1,  74 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18198, run #363899 on slot 2,  75 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18199, run #363899 on slot 3,  76 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  78  2      INFO   ===>>>  start processing event #18202, run #363899 on slot 2,  76 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  79  3      INFO   ===>>>  start processing event #18203, run #363899 on slot 3,  76 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18200, run #363899 on slot 0,  77 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18198, run #363899 on slot 3,  75 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  78  3      INFO   ===>>>  start processing event #18202, run #363899 on slot 3,  75 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18199, run #363899 on slot 0,  76 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18200, run #363899 on slot 2,  77 events processed so far  <<<===
 AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18201, run #363899 on slot 1,  78 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  80  0      INFO   ===>>>  start processing event #18204, run #363899 on slot 0,  78 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  81  1      INFO   ===>>>  start processing event #18205, run #363899 on slot 1,  78 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18202, run #363899 on slot 2,  79 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18203, run #363899 on slot 3,  80 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  82  2      INFO   ===>>>  start processing event #18206, run #363899 on slot 2,  80 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  83  3      INFO   ===>>>  start processing event #18207, run #363899 on slot 3,  80 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18204, run #363899 on slot 0,  81 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18205, run #363899 on slot 1,  82 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  84  0      INFO   ===>>>  start processing event #18208, run #363899 on slot 0,  82 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  85  1      INFO   ===>>>  start processing event #18209, run #363899 on slot 1,  82 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18206, run #363899 on slot 2,  83 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18207, run #363899 on slot 3,  84 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  86  2      INFO   ===>>>  start processing event #18210, run #363899 on slot 2,  84 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  87  3      INFO   ===>>>  start processing event #18211, run #363899 on slot 3,  84 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18208, run #363899 on slot 0,  85 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18209, run #363899 on slot 1,  86 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  79  0      INFO   ===>>>  start processing event #18203, run #363899 on slot 0,  78 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  80  1      INFO   ===>>>  start processing event #18204, run #363899 on slot 1,  78 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  81  2      INFO   ===>>>  start processing event #18205, run #363899 on slot 2,  78 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18202, run #363899 on slot 3,  79 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  82  3      INFO   ===>>>  start processing event #18206, run #363899 on slot 3,  79 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18203, run #363899 on slot 0,  80 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18204, run #363899 on slot 1,  81 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18205, run #363899 on slot 2,  82 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  83  0      INFO   ===>>>  start processing event #18207, run #363899 on slot 0,  82 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  84  1      INFO   ===>>>  start processing event #18208, run #363899 on slot 1,  82 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  85  2      INFO   ===>>>  start processing event #18209, run #363899 on slot 2,  82 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18206, run #363899 on slot 3,  83 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  86  3      INFO   ===>>>  start processing event #18210, run #363899 on slot 3,  83 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18208, run #363899 on slot 1,  84 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  87  1      INFO   ===>>>  start processing event #18211, run #363899 on slot 1,  84 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18207, run #363899 on slot 0,  85 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18210, run #363899 on slot 3,  86 events processed so far  <<<===
 AthenaHiveEventLoopMgr                  88  0      INFO   ===>>>  start processing event #18212, run #363899 on slot 0,  86 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  89  1      INFO   ===>>>  start processing event #18213, run #363899 on slot 1,  86 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18210, run #363899 on slot 2,  87 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18211, run #363899 on slot 3,  88 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  90  2      INFO   ===>>>  start processing event #18214, run #363899 on slot 2,  88 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  91  3      INFO   ===>>>  start processing event #18215, run #363899 on slot 3,  88 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  89  3      INFO   ===>>>  start processing event #18213, run #363899 on slot 3,  86 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18209, run #363899 on slot 2,  87 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18211, run #363899 on slot 1,  88 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  90  1      INFO   ===>>>  start processing event #18214, run #363899 on slot 1,  88 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  91  2      INFO   ===>>>  start processing event #18215, run #363899 on slot 2,  88 events processed so far  <<<===
 AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18212, run #363899 on slot 0,  89 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18213, run #363899 on slot 1,  90 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  92  0      INFO   ===>>>  start processing event #18216, run #363899 on slot 0,  90 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  93  1      INFO   ===>>>  start processing event #18217, run #363899 on slot 1,  90 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18214, run #363899 on slot 2,  91 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18215, run #363899 on slot 3,  92 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  94  2      INFO   ===>>>  start processing event #18218, run #363899 on slot 2,  92 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  95  3      INFO   ===>>>  start processing event #18219, run #363899 on slot 3,  92 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  92  0      INFO   ===>>>  start processing event #18216, run #363899 on slot 0,  89 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18213, run #363899 on slot 3,  90 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  93  3      INFO   ===>>>  start processing event #18217, run #363899 on slot 3,  90 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18214, run #363899 on slot 1,  91 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18215, run #363899 on slot 2,  92 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  94  1      INFO   ===>>>  start processing event #18218, run #363899 on slot 1,  92 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  95  2      INFO   ===>>>  start processing event #18219, run #363899 on slot 2,  92 events processed so far  <<<===
 AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18216, run #363899 on slot 0,  93 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18217, run #363899 on slot 1,  94 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  96  0      INFO   ===>>>  start processing event #18220, run #363899 on slot 0,  94 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  97  1      INFO   ===>>>  start processing event #18221, run #363899 on slot 1,  94 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18218, run #363899 on slot 2,  95 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18219, run #363899 on slot 3,  96 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  98  2      INFO   ===>>>  start processing event #18222, run #363899 on slot 2,  96 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  99  3      INFO   ===>>>  start processing event #18223, run #363899 on slot 3,  96 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  96  0      INFO   ===>>>  start processing event #18220, run #363899 on slot 0,  93 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18217, run #363899 on slot 3,  94 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  97  3      INFO   ===>>>  start processing event #18221, run #363899 on slot 3,  94 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18218, run #363899 on slot 1,  95 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18219, run #363899 on slot 2,  96 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  98  1      INFO   ===>>>  start processing event #18222, run #363899 on slot 1,  96 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  99  2      INFO   ===>>>  start processing event #18223, run #363899 on slot 2,  96 events processed so far  <<<===
 AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18220, run #363899 on slot 0,  97 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18221, run #363899 on slot 1,  98 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18222, run #363899 on slot 2,  99 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18223, run #363899 on slot 3,  100 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO ---> Loop Finished (seconds): 23.6664
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18221, run #363899 on slot 3,  98 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18222, run #363899 on slot 1,  99 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18223, run #363899 on slot 2,  100 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO ---> Loop Finished (seconds): 4.80402
 /cvmfs/atlas-condb.cern.ch/repo/condi...           INFO Database being retired...
 Domain[ROOT_All]                                   INFO ->  Deaccess DbDatabase   READ      [ROOT_All] 06C9EAE8-6F5B-E011-BAAA-003048F0E7AC
 /cvmfs/atlas-condb.cern.ch/repo/condi...           INFO Database being retired...
@@ -1310,7 +1310,7 @@ AvalancheSchedulerSvc                              INFO Joining Scheduler thread
 PyComponentMgr                                     INFO Finalizing PyComponentMgr...
 IdDictDetDescrCnv                                  INFO in finalize
 EventDataSvc                                       INFO Finalizing EventDataSvc - package version StoreGate-00-00-00
-IOVDbFolder                                        INFO Folder /LAR/Align (PoolRef) db-read 1/1 objs/chan/bytes 1/1/340 ((     1.48 ))s
+IOVDbFolder                                        INFO Folder /LAR/Align (PoolRef) db-read 1/1 objs/chan/bytes 1/1/340 ((     0.22 ))s
 IOVDbFolder                                        INFO Folder /TILE/OFL02/CALIB/CES (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 ((     0.00 ))s
 IOVDbFolder                                        INFO Folder /TILE/OFL02/CALIB/CIS/FIT/LIN (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 ((     0.00 ))s
 IOVDbFolder                                        INFO Folder /TILE/OFL02/CALIB/CIS/FIT/NLN (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 ((     0.00 ))s
@@ -1322,10 +1322,10 @@ IOVDbFolder                                        INFO Folder /TILE/OFL02/NOISE
 IOVDbFolder                                        INFO Folder /TILE/OFL02/STATUS/ADC (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 ((     0.00 ))s
 IOVDbFolder                                        INFO Folder /TILE/OFL02/TIME/CHANNELOFFSET/PHY (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 ((     0.00 ))s
 IOVDbFolder                                        INFO Folder /TILE/ONL01/STATUS/ADC (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 ((     0.00 ))s
-IOVDbFolder                                        INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 1/1 objs/chan/bytes 1/1/390 ((     0.36 ))s
-IOVDbSvc                                           INFO  bytes in ((      1.84 ))s
+IOVDbFolder                                        INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 1/1 objs/chan/bytes 1/1/390 ((     0.02 ))s
+IOVDbSvc                                           INFO  bytes in ((      0.24 ))s
 IOVDbSvc                                           INFO Connection sqlite://;schema=mycool.db;dbname=OFLP200 : nConnect: 0 nFolders: 0 ReadTime: ((     0.00 ))s
-IOVDbSvc                                           INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 2 nFolders: 2 ReadTime: ((     1.84 ))s
+IOVDbSvc                                           INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 2 nFolders: 2 ReadTime: ((     0.24 ))s
 IOVDbSvc                                           INFO Connection COOLOFL_TILE/OFLP200 : nConnect: 1 nFolders: 11 ReadTime: ((     0.00 ))s
 TileInfoLoader                                     INFO TileInfoLoader::finalize()
 AthDictLoaderSvc                                   INFO in finalize...
@@ -1335,9 +1335,9 @@ ToolSvc.TileROD_Decoder.TileROD_L2Bui...           INFO Finalizing
 *****Chrono*****                                   INFO ****************************************************************************************************
 *****Chrono*****                                   INFO  The Final CPU consumption ( Chrono ) Table (ordered)
 *****Chrono*****                                   INFO ****************************************************************************************************
-cObjR_ALL                                          INFO Time User   : Tot= 0.84  [s] Ave/Min/Max= 0.42(+-  0.4)/ 0.02/ 0.82  [s] #=  2
-cObj_ALL                                           INFO Time User   : Tot= 1.05  [s] Ave/Min/Max=0.525(+-0.395)/ 0.13/ 0.92  [s] #=  2
-ChronoStatSvc                                      INFO Time User   : Tot= 19.1  [s]                                             #=  1
+cObjR_ALL                                          INFO Time User   : Tot=  450 [ms] Ave/Min/Max=  225(+-  225)/    0/  450 [ms] #=  2
+cObj_ALL                                           INFO Time User   : Tot= 0.57  [s] Ave/Min/Max=0.285(+-0.215)/ 0.07/  0.5  [s] #=  2
+ChronoStatSvc                                      INFO Time User   : Tot= 4.22  [s]                                             #=  1
 *****Chrono*****                                   INFO ****************************************************************************************************
 ChronoStatSvc.finalize()                           INFO  Service finalized successfully 
 ApplicationMgr                                     INFO Application Manager Finalized successfully
diff --git a/TileCalorimeter/TileSvc/TileByteStream/share/TileMuRcvContByteStreamCnv_test.ref b/TileCalorimeter/TileSvc/TileByteStream/share/TileMuRcvContByteStreamCnv_test.ref
index 3bd2d06a70934619f07dca88d8502a6b8957e56b..5bda63d102d727040c561750254583d0afbb247a 100644
--- a/TileCalorimeter/TileSvc/TileByteStream/share/TileMuRcvContByteStreamCnv_test.ref
+++ b/TileCalorimeter/TileSvc/TileByteStream/share/TileMuRcvContByteStreamCnv_test.ref
@@ -1,14 +1,14 @@
-Tue Jan 22 03:44:22 CET 2019
+Sat Jan 26 19:52:46 CET 2019
 Preloading tcmalloc_minimal.so
 Py:Athena            INFO including file "AthenaCommon/Preparation.py"
-Py:Athena            INFO using release [WorkDir-22.0.1] [x86_64-slc6-gcc62-dbg] [atlas-work3/5871b6e8de] -- built on [2019-01-21T2115]
+Py:Athena            INFO using release [WorkDir-22.0.1] [x86_64-slc6-gcc62-opt] [atlas-work3/5e0c78d866] -- built on [2019-01-26T1705]
 Py:Athena            INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
 Py:Athena            INFO executing ROOT6Setup
 Py:Athena            INFO including file "AthenaCommon/Execution.py"
 Py:Athena            INFO including file "TileByteStream/TileMuRcvContByteStreamCnv_test.py"
 [?1034hSetGeometryVersion.py obtained major release version 22
 Py:Athena            INFO including file "IdDictDetDescrCnv/IdDictDetDescrCnv_joboptions.py"
-Py:ConfigurableDb    INFO Read module info for 5456 configurables from 80 genConfDb files
+Py:ConfigurableDb    INFO Read module info for 5456 configurables from 76 genConfDb files
 Py:ConfigurableDb    INFO No duplicates have been found: that's good !
 EventInfoMgtInit: Got release version  Athena-22.0.1
 Py:IOVDbSvc.CondDB    INFO Setting up conditions DB access to instance OFLP200
@@ -34,7 +34,7 @@ ApplicationMgr       INFO Updating Gaudi::PluginService::SetDebug(level) to leve
 ApplicationMgr    SUCCESS 
 ====================================================================================================================================
                                                    Welcome to ApplicationMgr (GaudiCoreSvc v30r5)
-                                          running on lxplus068.cern.ch on Tue Jan 22 03:44:49 2019
+                                          running on lxplus062.cern.ch on Sat Jan 26 19:53:04 2019
 ====================================================================================================================================
 ApplicationMgr       INFO Successfully loaded modules : AthenaServices
 ApplicationMgr       INFO Application Manager Configured successfully
@@ -51,8 +51,8 @@ PoolSvc              INFO io_register[PoolSvc](xmlcatalog_file:PoolFileCatalog.x
 PoolSvc              INFO Set connectionsvc retry/timeout/IDLE timeout to  'ConnectionRetrialPeriod':300/ 'ConnectionRetrialTimeOut':3600/ 'ConnectionTimeOut':5 seconds with connection cleanup disabled
 PoolSvc              INFO Frontier compression level set to 5
 DBReplicaSvc         INFO Frontier server at (serverurl=http://atlasfrontier-local.cern.ch:8000/atlr)(serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://lcgft-atlas.gridpp.rl.ac.uk:3128/frontierATLAS)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://ca-proxy.cern.ch:3128)(proxyurl=http://ca-proxy-meyrin.cern.ch:3128)(proxyurl=http://ca-proxy-wigner.cern.ch:3128)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
-DBReplicaSvc         INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/dbreplica.config
-DBReplicaSvc         INFO Total of 10 servers found for host lxplus068.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
+DBReplicaSvc         INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/dbreplica.config
+DBReplicaSvc         INFO Total of 10 servers found for host lxplus062.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
 PoolSvc              INFO Successfully setup replica sorting algorithm
 PoolSvc              INFO Setting up APR FileCatalog and Streams
 PoolSvc           WARNING Unable to locate catalog for prfile:poolcond/PoolCat_oflcond.xml check your ATLAS_POOLCOND_PATH and DATAPATH variables
@@ -193,7 +193,7 @@ EndcapDMConstru...   INFO Start building EC electronics geometry
   multi-layered version of absorbers activated, mlabs == 1
 ================================================
 EndcapDMConstru...   INFO Start building EC electronics geometry
-GeoModelSvc          INFO GeoModelSvc.LArDetectorToolNV	 SZ= 28576Kb 	 Time = 1.7S
+GeoModelSvc          INFO GeoModelSvc.LArDetectorToolNV	 SZ= 23964Kb 	 Time = 0.64S
 GeoModelSvc.Til...   INFO  Entering TileDetectorTool::create()
 TileDddbManager      INFO m_tag = ATLAS-R2-2016-01-00-01
 TileDddbManager      INFO n_tiglob = 5
@@ -205,7 +205,7 @@ TileDddbManager      INFO n_tileSwitches = 1
 ClassIDSvc           INFO  getRegistryEntries: read 213 CLIDRegistry entries for module ALL
 CaloIDHelper_ID...   INFO in createObj: creating a TileID helper object in the detector store
 AtlasDetectorID      INFO initialize_from_dictionary - OK
-TileNeighbour        INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/TileNeighbour_reduced.txt
+TileNeighbour        INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/TileNeighbour_reduced.txt
 TileHWIDDetDesc...   INFO in createObj: creating a TileHWID helper object in the detector store
 TileHWID             INFO initialize_from_dictionary 
 AtlasDetectorID      INFO initialize_from_dictionary - OK
@@ -217,9 +217,9 @@ CaloIDHelper_ID...   INFO in createObj: creating a LArHEC_ID helper object in th
 AtlasDetectorID      INFO initialize_from_dictionary - OK
 CaloIDHelper_ID...   INFO in createObj: creating a LArFCAL_ID helper object in the detector store
 AtlasDetectorID      INFO initialize_from_dictionary - OK
-LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/FCal2DNeighbors-April2011.txt
-LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/FCal3DNeighborsNext-April2011.txt
-LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/FCal3DNeighborsPrev-April2011.txt
+LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/FCal2DNeighbors-April2011.txt
+LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/FCal3DNeighborsNext-April2011.txt
+LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/FCal3DNeighborsPrev-April2011.txt
 CaloIDHelper_ID...   INFO in createObj: creating a LArMiniFCAL_ID helper object in the detector store
 AtlasDetectorID      INFO initialize_from_dictionary - OK
 LArMiniFCAL_ID       INFO  initialize_from_dict - LArCalorimeter dictionary does NOT contain miniFCAL description. Unable to initialize LArMiniFCAL_ID.
@@ -250,11 +250,11 @@ GeoModelSvc.Til...   INFO                                    PLUG2  Rmin= 2981 R
 GeoModelSvc.Til...   INFO  Positioning negative ITC with translation -3405
 GeoModelSvc.Til...   INFO  Positioning negative Gap with translation -3552
 GeoModelSvc.Til...   INFO  Positioning negative Crack with translation -3536
-GeoModelSvc.Til...   INFO  Global positioning of barrel with rotation (0,0,0)) and translation (0,0,0) GeoModelKernelUnits::cm
-GeoModelSvc.Til...   INFO  Global positioning of positive ext.barrel with rotation (0,0,0)) and translation (0,0,0) GeoModelKernelUnits::cm
-GeoModelSvc.Til...   INFO  Global positioning of negative ext.barrel with rotation (0,0,0)) and translation (0,0,1) GeoModelKernelUnits::cm
+GeoModelSvc.Til...   INFO  Global positioning of barrel with rotation (0,0,0)) and translation (0,0,0) Gaudi::Units::cm
+GeoModelSvc.Til...   INFO  Global positioning of positive ext.barrel with rotation (0,0,0)) and translation (0,0,0) Gaudi::Units::cm
+GeoModelSvc.Til...   INFO  Global positioning of negative ext.barrel with rotation (0,0,0)) and translation (0,0,1) Gaudi::Units::cm
 TileDetDescrMan...   INFO Entering create_elements()
-GeoModelSvc          INFO GeoModelSvc.TileDetectorTool	 SZ= 5196Kb 	 Time = 1.74S
+GeoModelSvc          INFO GeoModelSvc.TileDetectorTool	 SZ= 3568Kb 	 Time = 0.22S
 ClassIDSvc           INFO  getRegistryEntries: read 65 CLIDRegistry entries for module ALL
 TileInfoLoader       INFO Initializing....TileInfoLoader
 TileInfoLoader       INFO New ATLAS geometry detected: ATLAS-R2-2016-01-00-01 (010001) version 10001
@@ -276,11 +276,11 @@ TileInfoLoader       INFO Sampling fraction for E2 cells 1/107
 TileInfoLoader       INFO Sampling fraction for E3 cells 1/97
 TileInfoLoader       INFO Sampling fraction for E4 cells 1/75
 TileInfoLoader       INFO Sampling fraction for E4' cells 1/75
-TileInfoLoader       INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/pulsehi_physics.dat
-TileInfoLoader       INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/pulselo_physics.dat
-TileInfoLoader       INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/pulse_adder_tower_physics.dat
-TileInfoLoader       INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/pulse_adder_muonRcv_physics.dat
-TileInfoLoader       INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/pulse_adder_muon_physics.dat
+TileInfoLoader       INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/pulsehi_physics.dat
+TileInfoLoader       INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/pulselo_physics.dat
+TileInfoLoader       INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/pulse_adder_tower_physics.dat
+TileInfoLoader       INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/pulse_adder_muonRcv_physics.dat
+TileInfoLoader       INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/pulse_adder_muon_physics.dat
 CaloIDHelper_ID...   INFO in createObj: creating a CaloLVL1_ID helper object in the detector store
 CaloLVL1_ID          INFO initialize_from_dictionary
 AtlasDetectorID      INFO initialize_from_dictionary - OK
@@ -388,12 +388,12 @@ CaloIDHelper_ID...   INFO in createObj: creating a LArHEC_SuperCell_ID helper ob
 AtlasDetectorID      INFO initialize_from_dictionary - OK
 CaloIDHelper_ID...   INFO in createObj: creating a LArFCAL_SuperCell_ID helper object in the detector store
 AtlasDetectorID      INFO initialize_from_dictionary - OK
-LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/FCalSuperCells2DNeighborsNew-April2014.txt
-LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
-LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
+LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/FCalSuperCells2DNeighborsNew-April2014.txt
+LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
+LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
 CaloIDHelper_ID...   INFO in createObj: creating a Tile_SuperCell_ID helper object in the detector store
 AtlasDetectorID      INFO initialize_from_dictionary - OK
-TileNeighbour        INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/TileSuperCellNeighbour.txt
+TileNeighbour        INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/TileSuperCellNeighbour.txt
 AtlasDetectorID      INFO initialize_from_dictionary - OK
 CaloIdMgrDetDes...   INFO  Finished 
 CaloIdMgrDetDes...   INFO Initializing CaloIdMgr from values in CaloIdMgrDetDescrCnv 
@@ -422,7 +422,7 @@ TileBadChannels...   INFO TileBchStatus::isNoisy() is defined by: Large HF noise
 TileBadChannels...   INFO TileBchStatus::isNoGainL1() is defined by: ADC dead; No PMT connected; No HV; Channel masked for LV1 (unspecified); LV1 channel no gain; LV1 channel noisy; Channel disabled for LV1; 
 TileBadChannels...   INFO TileBchStatus::isBadTiming() is defined by: Bad timing; 
 TileBadChannels...   INFO No drawer trips probabilities found in DB
-ClassIDSvc           INFO  getRegistryEntries: read 2407 CLIDRegistry entries for module ALL
+ClassIDSvc           INFO  getRegistryEntries: read 2427 CLIDRegistry entries for module ALL
 ClassIDSvc           INFO  getRegistryEntries: read 89 CLIDRegistry entries for module ALL
 ToolSvc.TileROD...   INFO TileL2Builder initialization completed
 ToolSvc.TileMuR...   INFO Initializing TileMuRcvContByteStreamTool
@@ -641,23 +641,23 @@ IncidentProcAlg2     INFO Finalize
 EventInfoByteSt...   INFO finalize 
 PyComponentMgr       INFO Finalizing PyComponentMgr...
 IdDictDetDescrCnv    INFO in finalize
-IOVDbFolder          INFO Folder /LAR/Align (PoolRef) db-read 1/1 objs/chan/bytes 1/1/340 ((     0.14 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/CES (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/105700 ((     0.09 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/CIS/FIT/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/108 ((     0.07 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/CIS/FIT/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/108 ((     0.07 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/EMS (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/116 ((     0.05 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/LAS/FIBER (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/964 ((     0.04 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/LAS/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/96 ((     0.05 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/LAS/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/104 ((     0.05 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/NOISE/SAMPLE (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/643860 ((     0.05 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/STATUS/ADC (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/43200 ((     0.07 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/TIME/CHANNELOFFSET/PHY (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/120 ((     0.05 ))s
-IOVDbFolder          INFO Folder /TILE/ONL01/STATUS/ADC (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/100 ((     0.02 ))s
+IOVDbFolder          INFO Folder /LAR/Align (PoolRef) db-read 1/1 objs/chan/bytes 1/1/340 ((     0.30 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/CES (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/105700 ((     0.48 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/CIS/FIT/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/108 ((     0.02 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/CIS/FIT/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/108 ((     0.02 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/EMS (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/116 ((     0.02 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/LAS/FIBER (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/964 ((     0.03 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/LAS/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/96 ((     0.03 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/LAS/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/104 ((     0.02 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/NOISE/SAMPLE (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/643860 ((     0.03 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/STATUS/ADC (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/43200 ((     0.03 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/TIME/CHANNELOFFSET/PHY (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/120 ((     0.03 ))s
+IOVDbFolder          INFO Folder /TILE/ONL01/STATUS/ADC (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/100 ((     0.00 ))s
 IOVDbFolder          INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 1/1 objs/chan/bytes 1/1/390 ((     0.02 ))s
-IOVDbSvc             INFO  bytes in ((      0.75 ))s
+IOVDbSvc             INFO  bytes in ((      1.04 ))s
 IOVDbSvc             INFO Connection sqlite://;schema=mycool.db;dbname=OFLP200 : nConnect: 0 nFolders: 0 ReadTime: ((     0.00 ))s
-IOVDbSvc             INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 2 nFolders: 2 ReadTime: ((     0.15 ))s
-IOVDbSvc             INFO Connection COOLOFL_TILE/OFLP200 : nConnect: 2 nFolders: 11 ReadTime: ((     0.60 ))s
+IOVDbSvc             INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 2 nFolders: 2 ReadTime: ((     0.32 ))s
+IOVDbSvc             INFO Connection COOLOFL_TILE/OFLP200 : nConnect: 2 nFolders: 11 ReadTime: ((     0.72 ))s
 TileInfoLoader       INFO TileInfoLoader::finalize()
 AthDictLoaderSvc     INFO in finalize...
 ToolSvc              INFO Removing all tools created by ToolSvc
@@ -667,18 +667,18 @@ ToolSvc.TileROD...   INFO Finalizing
 *****Chrono*****     INFO ****************************************************************************************************
 *****Chrono*****     INFO  The Final CPU consumption ( Chrono ) Table (ordered)
 *****Chrono*****     INFO ****************************************************************************************************
-cObjR_ALL            INFO Time User   : Tot= 0.86  [s] Ave/Min/Max= 0.43(+- 0.41)/ 0.02/ 0.84  [s] #=  2
-cObj_ALL             INFO Time User   : Tot= 1.09  [s] Ave/Min/Max=0.0838(+-0.248)/    0/ 0.93  [s] #= 13
-ChronoStatSvc        INFO Time User   : Tot= 22.8  [s]                                             #=  1
+cObjR_ALL            INFO Time User   : Tot=  410 [ms] Ave/Min/Max=  205(+-  205)/    0/  410 [ms] #=  2
+cObj_ALL             INFO Time User   : Tot= 0.52  [s] Ave/Min/Max= 0.04(+- 0.12)/    0/ 0.45  [s] #= 13
+ChronoStatSvc        INFO Time User   : Tot= 5.47  [s]                                             #=  1
 *****Chrono*****     INFO ****************************************************************************************************
 ChronoStatSvc.f...   INFO  Service finalized successfully 
 ApplicationMgr       INFO Application Manager Finalized successfully
 ApplicationMgr       INFO Application Manager Terminated successfully
 Py:Athena            INFO leaving with code 0: "successful run"
-Tue Jan 22 03:45:40 CET 2019
+Sat Jan 26 19:53:19 CET 2019
 Preloading tcmalloc_minimal.so
 Py:Athena            INFO including file "AthenaCommon/Preparation.py"
-Py:Athena            INFO using release [WorkDir-22.0.1] [x86_64-slc6-gcc62-dbg] [atlas-work3/5871b6e8de] -- built on [2019-01-21T2115]
+Py:Athena            INFO using release [WorkDir-22.0.1] [x86_64-slc6-gcc62-opt] [atlas-work3/5e0c78d866] -- built on [2019-01-26T1705]
 Py:Athena            INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
 Py:Athena            INFO executing ROOT6Setup
 Py:Athena            INFO configuring AthenaHive with [4] concurrent threads and [4] concurrent events
@@ -687,7 +687,7 @@ Py:Athena            INFO including file "AthenaCommon/Execution.py"
 Py:Athena            INFO including file "TileByteStream/TileMuRcvContByteStreamCnv_test.py"
 [?1034hSetGeometryVersion.py obtained major release version 22
 Py:Athena            INFO including file "IdDictDetDescrCnv/IdDictDetDescrCnv_joboptions.py"
-Py:ConfigurableDb    INFO Read module info for 5456 configurables from 80 genConfDb files
+Py:ConfigurableDb    INFO Read module info for 5456 configurables from 76 genConfDb files
 Py:ConfigurableDb    INFO No duplicates have been found: that's good !
 EventInfoMgtInit: Got release version  Athena-22.0.1
 Py:IOVDbSvc.CondDB    INFO Setting up conditions DB access to instance OFLP200
@@ -714,7 +714,7 @@ MessageSvc           INFO Activating in a separate thread
 ApplicationMgr    SUCCESS 
 ====================================================================================================================================
                                                    Welcome to ApplicationMgr (GaudiCoreSvc v30r5)
-                                          running on lxplus068.cern.ch on Tue Jan 22 03:46:11 2019
+                                          running on lxplus062.cern.ch on Sat Jan 26 19:53:36 2019
 ====================================================================================================================================
 ApplicationMgr       INFO Successfully loaded modules : AthenaServices
 ApplicationMgr       INFO Application Manager Configured successfully
@@ -730,8 +730,8 @@ PoolSvc                                            INFO io_register[PoolSvc](xml
 PoolSvc                                            INFO Set connectionsvc retry/timeout/IDLE timeout to  'ConnectionRetrialPeriod':300/ 'ConnectionRetrialTimeOut':3600/ 'ConnectionTimeOut':5 seconds with connection cleanup disabled
 PoolSvc                                            INFO Frontier compression level set to 5
 DBReplicaSvc                                       INFO Frontier server at (serverurl=http://atlasfrontier-local.cern.ch:8000/atlr)(serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://lcgft-atlas.gridpp.rl.ac.uk:3128/frontierATLAS)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://ca-proxy.cern.ch:3128)(proxyurl=http://ca-proxy-meyrin.cern.ch:3128)(proxyurl=http://ca-proxy-wigner.cern.ch:3128)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
-DBReplicaSvc                                       INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/dbreplica.config
-DBReplicaSvc                                       INFO Total of 10 servers found for host lxplus068.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
+DBReplicaSvc                                       INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/dbreplica.config
+DBReplicaSvc                                       INFO Total of 10 servers found for host lxplus062.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
 PoolSvc                                            INFO Successfully setup replica sorting algorithm
 PoolSvc                                            INFO Setting up APR FileCatalog and Streams
 PoolSvc                                         WARNING Unable to locate catalog for prfile:poolcond/PoolCat_oflcond.xml check your ATLAS_POOLCOND_PATH and DATAPATH variables
@@ -873,7 +873,7 @@ EndcapDMConstruction                               INFO Start building EC electr
   multi-layered version of absorbers activated, mlabs == 1
 ================================================
 EndcapDMConstruction                               INFO Start building EC electronics geometry
-GeoModelSvc                                        INFO GeoModelSvc.LArDetectorToolNV	 SZ= 28576Kb 	 Time = 1.62S
+GeoModelSvc                                        INFO GeoModelSvc.LArDetectorToolNV	 SZ= 22940Kb 	 Time = 0.61S
 GeoModelSvc.TileDetectorTool                       INFO  Entering TileDetectorTool::create()
 TileDddbManager                                    INFO m_tag = ATLAS-R2-2016-01-00-01
 TileDddbManager                                    INFO n_tiglob = 5
@@ -885,7 +885,7 @@ TileDddbManager                                    INFO n_tileSwitches = 1
 ClassIDSvc                                         INFO  getRegistryEntries: read 213 CLIDRegistry entries for module ALL
 CaloIDHelper_IDDetDescrCnv                         INFO in createObj: creating a TileID helper object in the detector store
 AtlasDetectorID                                    INFO initialize_from_dictionary - OK
-TileNeighbour                                      INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/TileNeighbour_reduced.txt
+TileNeighbour                                      INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/TileNeighbour_reduced.txt
 TileHWIDDetDescrCnv                                INFO in createObj: creating a TileHWID helper object in the detector store
 TileHWID                                           INFO initialize_from_dictionary 
 AtlasDetectorID                                    INFO initialize_from_dictionary - OK
@@ -897,9 +897,9 @@ CaloIDHelper_IDDetDescrCnv                         INFO in createObj: creating a
 AtlasDetectorID                                    INFO initialize_from_dictionary - OK
 CaloIDHelper_IDDetDescrCnv                         INFO in createObj: creating a LArFCAL_ID helper object in the detector store
 AtlasDetectorID                                    INFO initialize_from_dictionary - OK
-LArFCAL_Base_ID                                    INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/FCal2DNeighbors-April2011.txt
-LArFCAL_Base_ID                                    INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/FCal3DNeighborsNext-April2011.txt
-LArFCAL_Base_ID                                    INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/FCal3DNeighborsPrev-April2011.txt
+LArFCAL_Base_ID                                    INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/FCal2DNeighbors-April2011.txt
+LArFCAL_Base_ID                                    INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/FCal3DNeighborsNext-April2011.txt
+LArFCAL_Base_ID                                    INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/FCal3DNeighborsPrev-April2011.txt
 CaloIDHelper_IDDetDescrCnv                         INFO in createObj: creating a LArMiniFCAL_ID helper object in the detector store
 AtlasDetectorID                                    INFO initialize_from_dictionary - OK
 LArMiniFCAL_ID                                     INFO  initialize_from_dict - LArCalorimeter dictionary does NOT contain miniFCAL description. Unable to initialize LArMiniFCAL_ID.
@@ -930,11 +930,11 @@ GeoModelSvc.TileDetectorTool                       INFO
 GeoModelSvc.TileDetectorTool                       INFO  Positioning negative ITC with translation -3405
 GeoModelSvc.TileDetectorTool                       INFO  Positioning negative Gap with translation -3552
 GeoModelSvc.TileDetectorTool                       INFO  Positioning negative Crack with translation -3536
-GeoModelSvc.TileDetectorTool                       INFO  Global positioning of barrel with rotation (0,0,0)) and translation (0,0,0) GeoModelKernelUnits::cm
-GeoModelSvc.TileDetectorTool                       INFO  Global positioning of positive ext.barrel with rotation (0,0,0)) and translation (0,0,0) GeoModelKernelUnits::cm
-GeoModelSvc.TileDetectorTool                       INFO  Global positioning of negative ext.barrel with rotation (0,0,0)) and translation (0,0,1) GeoModelKernelUnits::cm
+GeoModelSvc.TileDetectorTool                       INFO  Global positioning of barrel with rotation (0,0,0)) and translation (0,0,0) Gaudi::Units::cm
+GeoModelSvc.TileDetectorTool                       INFO  Global positioning of positive ext.barrel with rotation (0,0,0)) and translation (0,0,0) Gaudi::Units::cm
+GeoModelSvc.TileDetectorTool                       INFO  Global positioning of negative ext.barrel with rotation (0,0,0)) and translation (0,0,1) Gaudi::Units::cm
 TileDetDescrManager                                INFO Entering create_elements()
-GeoModelSvc                                        INFO GeoModelSvc.TileDetectorTool	 SZ= 5196Kb 	 Time = 1.71S
+GeoModelSvc                                        INFO GeoModelSvc.TileDetectorTool	 SZ= 4592Kb 	 Time = 0.21S
 ClassIDSvc                                         INFO  getRegistryEntries: read 65 CLIDRegistry entries for module ALL
 TileInfoLoader                                     INFO Initializing....TileInfoLoader
 TileInfoLoader                                     INFO New ATLAS geometry detected: ATLAS-R2-2016-01-00-01 (010001) version 10001
@@ -956,11 +956,11 @@ TileInfoLoader                                     INFO Sampling fraction for E2
 TileInfoLoader                                     INFO Sampling fraction for E3 cells 1/97
 TileInfoLoader                                     INFO Sampling fraction for E4 cells 1/75
 TileInfoLoader                                     INFO Sampling fraction for E4' cells 1/75
-TileInfoLoader                                     INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/pulsehi_physics.dat
-TileInfoLoader                                     INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/pulselo_physics.dat
-TileInfoLoader                                     INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/pulse_adder_tower_physics.dat
-TileInfoLoader                                     INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/pulse_adder_muonRcv_physics.dat
-TileInfoLoader                                     INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/pulse_adder_muon_physics.dat
+TileInfoLoader                                     INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/pulsehi_physics.dat
+TileInfoLoader                                     INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/pulselo_physics.dat
+TileInfoLoader                                     INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/pulse_adder_tower_physics.dat
+TileInfoLoader                                     INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/pulse_adder_muonRcv_physics.dat
+TileInfoLoader                                     INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/pulse_adder_muon_physics.dat
 CaloIDHelper_IDDetDescrCnv                         INFO in createObj: creating a CaloLVL1_ID helper object in the detector store
 CaloLVL1_ID                                        INFO initialize_from_dictionary
 AtlasDetectorID                                    INFO initialize_from_dictionary - OK
@@ -1080,12 +1080,12 @@ CaloIDHelper_IDDetDescrCnv              0   0      INFO in createObj: creating a
 AtlasDetectorID                         0   0      INFO initialize_from_dictionary - OK
 CaloIDHelper_IDDetDescrCnv              0   0      INFO in createObj: creating a LArFCAL_SuperCell_ID helper object in the detector store
 AtlasDetectorID                         0   0      INFO initialize_from_dictionary - OK
-LArFCAL_Base_ID                         0   0      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/FCalSuperCells2DNeighborsNew-April2014.txt
-LArFCAL_Base_ID                         0   0      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
-LArFCAL_Base_ID                         0   0      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
+LArFCAL_Base_ID                         0   0      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/FCalSuperCells2DNeighborsNew-April2014.txt
+LArFCAL_Base_ID                         0   0      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
+LArFCAL_Base_ID                         0   0      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
 CaloIDHelper_IDDetDescrCnv              0   0      INFO in createObj: creating a Tile_SuperCell_ID helper object in the detector store
 AtlasDetectorID                         0   0      INFO initialize_from_dictionary - OK
-TileNeighbour                           0   0      INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/TileSuperCellNeighbour.txt
+TileNeighbour                           0   0      INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-25T2258/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/TileSuperCellNeighbour.txt
 AtlasDetectorID                         0   0      INFO initialize_from_dictionary - OK
 CaloIdMgrDetDescrCnv                    0   0      INFO  Finished 
 CaloIdMgrDetDescrCnv                    0   0      INFO Initializing CaloIdMgr from values in CaloIdMgrDetDescrCnv 
@@ -1096,208 +1096,208 @@ AthenaHiveEventLoopMgr                  0   0      INFO   ===>>>  start processi
 AthenaHiveEventLoopMgr                  1   1      INFO   ===>>>  start processing event #18125, run #363899 on slot 1,  0 events processed so far  <<<===
 AthenaHiveEventLoopMgr                  2   2      INFO   ===>>>  start processing event #18126, run #363899 on slot 2,  0 events processed so far  <<<===
 AthenaHiveEventLoopMgr                  3   3      INFO   ===>>>  start processing event #18127, run #363899 on slot 3,  0 events processed so far  <<<===
-ClassIDSvc                              0   0      INFO  getRegistryEntries: read 650 CLIDRegistry entries for module ALL
-ClassIDSvc                              0   0      INFO  getRegistryEntries: read 1757 CLIDRegistry entries for module ALL
-ClassIDSvc                              0   0      INFO  getRegistryEntries: read 89 CLIDRegistry entries for module ALL
-ToolSvc.TileROD_Decoder.TileROD_L2Bui...0   0      INFO TileL2Builder initialization completed
-ToolSvc.TileMuRcvContByteStreamTool     0   0      INFO Initializing TileMuRcvContByteStreamTool
+ClassIDSvc                              1   1      INFO  getRegistryEntries: read 670 CLIDRegistry entries for module ALL
+ClassIDSvc                              1   1      INFO  getRegistryEntries: read 1757 CLIDRegistry entries for module ALL
+ClassIDSvc                              1   1      INFO  getRegistryEntries: read 89 CLIDRegistry entries for module ALL
+ToolSvc.TileROD_Decoder.TileROD_L2Bui...1   1      INFO TileL2Builder initialization completed
+ToolSvc.TileMuRcvContByteStreamTool     1   1      INFO Initializing TileMuRcvContByteStreamTool
 AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18125, run #363899 on slot 1,  1 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18124, run #363899 on slot 0,  2 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18126, run #363899 on slot 2,  3 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  4   0      INFO   ===>>>  start processing event #18128, run #363899 on slot 0,  3 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  5   1      INFO   ===>>>  start processing event #18129, run #363899 on slot 1,  3 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  6   2      INFO   ===>>>  start processing event #18130, run #363899 on slot 2,  3 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  4   1      INFO   ===>>>  start processing event #18128, run #363899 on slot 1,  1 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18126, run #363899 on slot 2,  2 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18124, run #363899 on slot 0,  3 events processed so far  <<<===
 AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18127, run #363899 on slot 3,  4 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  5   0      INFO   ===>>>  start processing event #18129, run #363899 on slot 0,  4 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  6   2      INFO   ===>>>  start processing event #18130, run #363899 on slot 2,  4 events processed so far  <<<===
 AthenaHiveEventLoopMgr                  7   3      INFO   ===>>>  start processing event #18131, run #363899 on slot 3,  4 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18128, run #363899 on slot 0,  5 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  8   0      INFO   ===>>>  start processing event #18132, run #363899 on slot 0,  5 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18130, run #363899 on slot 2,  6 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18129, run #363899 on slot 1,  7 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18128, run #363899 on slot 1,  5 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  8   1      INFO   ===>>>  start processing event #18132, run #363899 on slot 1,  5 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18129, run #363899 on slot 0,  6 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  9   0      INFO   ===>>>  start processing event #18133, run #363899 on slot 0,  6 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18130, run #363899 on slot 2,  7 events processed so far  <<<===
 AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18131, run #363899 on slot 3,  8 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  9   1      INFO   ===>>>  start processing event #18133, run #363899 on slot 1,  8 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  10  2      INFO   ===>>>  start processing event #18134, run #363899 on slot 2,  8 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  11  3      INFO   ===>>>  start processing event #18135, run #363899 on slot 3,  8 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18132, run #363899 on slot 0,  9 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  12  0      INFO   ===>>>  start processing event #18136, run #363899 on slot 0,  9 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18133, run #363899 on slot 1,  10 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  13  1      INFO   ===>>>  start processing event #18137, run #363899 on slot 1,  10 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18134, run #363899 on slot 2,  11 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  14  2      INFO   ===>>>  start processing event #18138, run #363899 on slot 2,  11 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18135, run #363899 on slot 3,  12 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  15  3      INFO   ===>>>  start processing event #18139, run #363899 on slot 3,  12 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18136, run #363899 on slot 0,  13 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18137, run #363899 on slot 1,  14 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  16  0      INFO   ===>>>  start processing event #18140, run #363899 on slot 0,  14 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  17  1      INFO   ===>>>  start processing event #18141, run #363899 on slot 1,  14 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18138, run #363899 on slot 2,  15 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18139, run #363899 on slot 3,  16 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  18  2      INFO   ===>>>  start processing event #18142, run #363899 on slot 2,  16 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  19  3      INFO   ===>>>  start processing event #18143, run #363899 on slot 3,  16 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18140, run #363899 on slot 0,  17 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  20  0      INFO   ===>>>  start processing event #18144, run #363899 on slot 0,  17 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18141, run #363899 on slot 1,  18 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  21  1      INFO   ===>>>  start processing event #18145, run #363899 on slot 1,  18 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18142, run #363899 on slot 2,  19 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18143, run #363899 on slot 3,  20 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  22  2      INFO   ===>>>  start processing event #18146, run #363899 on slot 2,  20 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  23  3      INFO   ===>>>  start processing event #18147, run #363899 on slot 3,  20 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18144, run #363899 on slot 0,  21 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18145, run #363899 on slot 1,  22 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  24  0      INFO   ===>>>  start processing event #18148, run #363899 on slot 0,  22 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  25  1      INFO   ===>>>  start processing event #18149, run #363899 on slot 1,  22 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18146, run #363899 on slot 2,  23 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  26  2      INFO   ===>>>  start processing event #18150, run #363899 on slot 2,  23 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18147, run #363899 on slot 3,  24 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  27  3      INFO   ===>>>  start processing event #18151, run #363899 on slot 3,  24 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18148, run #363899 on slot 0,  25 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18149, run #363899 on slot 1,  26 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  28  0      INFO   ===>>>  start processing event #18152, run #363899 on slot 0,  26 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  29  1      INFO   ===>>>  start processing event #18153, run #363899 on slot 1,  26 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18150, run #363899 on slot 2,  27 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  30  2      INFO   ===>>>  start processing event #18154, run #363899 on slot 2,  27 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18151, run #363899 on slot 3,  28 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18153, run #363899 on slot 1,  29 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18152, run #363899 on slot 0,  30 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  31  0      INFO   ===>>>  start processing event #18155, run #363899 on slot 0,  30 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  32  1      INFO   ===>>>  start processing event #18156, run #363899 on slot 1,  30 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  33  3      INFO   ===>>>  start processing event #18157, run #363899 on slot 3,  30 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18154, run #363899 on slot 2,  31 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  34  2      INFO   ===>>>  start processing event #18158, run #363899 on slot 2,  31 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18155, run #363899 on slot 0,  32 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  35  0      INFO   ===>>>  start processing event #18159, run #363899 on slot 0,  32 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18157, run #363899 on slot 3,  33 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18156, run #363899 on slot 1,  34 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18158, run #363899 on slot 2,  35 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  36  1      INFO   ===>>>  start processing event #18160, run #363899 on slot 1,  35 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  37  2      INFO   ===>>>  start processing event #18161, run #363899 on slot 2,  35 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  38  3      INFO   ===>>>  start processing event #18162, run #363899 on slot 3,  35 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18159, run #363899 on slot 0,  36 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  39  0      INFO   ===>>>  start processing event #18163, run #363899 on slot 0,  36 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18160, run #363899 on slot 1,  37 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  40  1      INFO   ===>>>  start processing event #18164, run #363899 on slot 1,  37 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18161, run #363899 on slot 2,  38 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  41  2      INFO   ===>>>  start processing event #18165, run #363899 on slot 2,  38 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18162, run #363899 on slot 3,  39 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  42  3      INFO   ===>>>  start processing event #18166, run #363899 on slot 3,  39 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18163, run #363899 on slot 0,  40 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  43  0      INFO   ===>>>  start processing event #18167, run #363899 on slot 0,  40 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18164, run #363899 on slot 1,  41 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18165, run #363899 on slot 2,  42 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  44  1      INFO   ===>>>  start processing event #18168, run #363899 on slot 1,  42 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  45  2      INFO   ===>>>  start processing event #18169, run #363899 on slot 2,  42 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18166, run #363899 on slot 3,  43 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18167, run #363899 on slot 0,  44 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  46  0      INFO   ===>>>  start processing event #18170, run #363899 on slot 0,  44 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  47  3      INFO   ===>>>  start processing event #18171, run #363899 on slot 3,  44 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18168, run #363899 on slot 1,  45 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  48  1      INFO   ===>>>  start processing event #18172, run #363899 on slot 1,  45 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18169, run #363899 on slot 2,  46 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  49  2      INFO   ===>>>  start processing event #18173, run #363899 on slot 2,  46 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18170, run #363899 on slot 0,  47 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  50  0      INFO   ===>>>  start processing event #18174, run #363899 on slot 0,  47 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18171, run #363899 on slot 3,  48 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18172, run #363899 on slot 1,  49 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18173, run #363899 on slot 2,  50 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  51  1      INFO   ===>>>  start processing event #18175, run #363899 on slot 1,  50 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  52  2      INFO   ===>>>  start processing event #18176, run #363899 on slot 2,  50 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18132, run #363899 on slot 1,  9 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  10  1      INFO   ===>>>  start processing event #18134, run #363899 on slot 1,  9 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  11  2      INFO   ===>>>  start processing event #18135, run #363899 on slot 2,  9 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  12  3      INFO   ===>>>  start processing event #18136, run #363899 on slot 3,  9 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18133, run #363899 on slot 0,  10 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  13  0      INFO   ===>>>  start processing event #18137, run #363899 on slot 0,  10 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18134, run #363899 on slot 1,  11 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  14  1      INFO   ===>>>  start processing event #18138, run #363899 on slot 1,  11 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18136, run #363899 on slot 3,  12 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18135, run #363899 on slot 2,  13 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  15  2      INFO   ===>>>  start processing event #18139, run #363899 on slot 2,  13 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  16  3      INFO   ===>>>  start processing event #18140, run #363899 on slot 3,  13 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18137, run #363899 on slot 0,  14 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  17  0      INFO   ===>>>  start processing event #18141, run #363899 on slot 0,  14 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18138, run #363899 on slot 1,  15 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  18  1      INFO   ===>>>  start processing event #18142, run #363899 on slot 1,  15 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18139, run #363899 on slot 2,  16 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  19  2      INFO   ===>>>  start processing event #18143, run #363899 on slot 2,  16 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18140, run #363899 on slot 3,  17 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  20  3      INFO   ===>>>  start processing event #18144, run #363899 on slot 3,  17 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18141, run #363899 on slot 0,  18 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18142, run #363899 on slot 1,  19 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  21  0      INFO   ===>>>  start processing event #18145, run #363899 on slot 0,  19 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  22  1      INFO   ===>>>  start processing event #18146, run #363899 on slot 1,  19 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18143, run #363899 on slot 2,  20 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  23  2      INFO   ===>>>  start processing event #18147, run #363899 on slot 2,  20 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18144, run #363899 on slot 3,  21 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  24  3      INFO   ===>>>  start processing event #18148, run #363899 on slot 3,  21 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18145, run #363899 on slot 0,  22 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18146, run #363899 on slot 1,  23 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  25  0      INFO   ===>>>  start processing event #18149, run #363899 on slot 0,  23 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  26  1      INFO   ===>>>  start processing event #18150, run #363899 on slot 1,  23 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18147, run #363899 on slot 2,  24 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18148, run #363899 on slot 3,  25 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  27  2      INFO   ===>>>  start processing event #18151, run #363899 on slot 2,  25 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  28  3      INFO   ===>>>  start processing event #18152, run #363899 on slot 3,  25 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18149, run #363899 on slot 0,  26 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  29  0      INFO   ===>>>  start processing event #18153, run #363899 on slot 0,  26 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18150, run #363899 on slot 1,  27 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  30  1      INFO   ===>>>  start processing event #18154, run #363899 on slot 1,  27 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18151, run #363899 on slot 2,  28 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  31  2      INFO   ===>>>  start processing event #18155, run #363899 on slot 2,  28 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18152, run #363899 on slot 3,  29 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  32  3      INFO   ===>>>  start processing event #18156, run #363899 on slot 3,  29 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18153, run #363899 on slot 0,  30 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  33  0      INFO   ===>>>  start processing event #18157, run #363899 on slot 0,  30 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18154, run #363899 on slot 1,  31 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  34  1      INFO   ===>>>  start processing event #18158, run #363899 on slot 1,  31 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18155, run #363899 on slot 2,  32 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  35  2      INFO   ===>>>  start processing event #18159, run #363899 on slot 2,  32 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18156, run #363899 on slot 3,  33 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  36  3      INFO   ===>>>  start processing event #18160, run #363899 on slot 3,  33 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18157, run #363899 on slot 0,  34 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  37  0      INFO   ===>>>  start processing event #18161, run #363899 on slot 0,  34 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18158, run #363899 on slot 1,  35 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  38  1      INFO   ===>>>  start processing event #18162, run #363899 on slot 1,  35 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18159, run #363899 on slot 2,  36 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  39  2      INFO   ===>>>  start processing event #18163, run #363899 on slot 2,  36 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18160, run #363899 on slot 3,  37 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  40  3      INFO   ===>>>  start processing event #18164, run #363899 on slot 3,  37 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18161, run #363899 on slot 0,  38 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  41  0      INFO   ===>>>  start processing event #18165, run #363899 on slot 0,  38 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18162, run #363899 on slot 1,  39 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  42  1      INFO   ===>>>  start processing event #18166, run #363899 on slot 1,  39 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18163, run #363899 on slot 2,  40 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  43  2      INFO   ===>>>  start processing event #18167, run #363899 on slot 2,  40 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18164, run #363899 on slot 3,  41 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  44  3      INFO   ===>>>  start processing event #18168, run #363899 on slot 3,  41 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18165, run #363899 on slot 0,  42 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  45  0      INFO   ===>>>  start processing event #18169, run #363899 on slot 0,  42 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18166, run #363899 on slot 1,  43 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  46  1      INFO   ===>>>  start processing event #18170, run #363899 on slot 1,  43 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18167, run #363899 on slot 2,  44 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  47  2      INFO   ===>>>  start processing event #18171, run #363899 on slot 2,  44 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18169, run #363899 on slot 0,  45 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  48  0      INFO   ===>>>  start processing event #18172, run #363899 on slot 0,  45 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18168, run #363899 on slot 3,  46 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  49  3      INFO   ===>>>  start processing event #18173, run #363899 on slot 3,  46 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18170, run #363899 on slot 1,  47 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  50  1      INFO   ===>>>  start processing event #18174, run #363899 on slot 1,  47 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18171, run #363899 on slot 2,  48 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  51  2      INFO   ===>>>  start processing event #18175, run #363899 on slot 2,  48 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18172, run #363899 on slot 0,  49 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18173, run #363899 on slot 3,  50 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  52  0      INFO   ===>>>  start processing event #18176, run #363899 on slot 0,  50 events processed so far  <<<===
 AthenaHiveEventLoopMgr                  53  3      INFO   ===>>>  start processing event #18177, run #363899 on slot 3,  50 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18174, run #363899 on slot 0,  51 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  54  0      INFO   ===>>>  start processing event #18178, run #363899 on slot 0,  51 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18175, run #363899 on slot 1,  52 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  55  1      INFO   ===>>>  start processing event #18179, run #363899 on slot 1,  52 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18176, run #363899 on slot 2,  53 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  56  2      INFO   ===>>>  start processing event #18180, run #363899 on slot 2,  53 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18174, run #363899 on slot 1,  51 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18175, run #363899 on slot 2,  52 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  54  1      INFO   ===>>>  start processing event #18178, run #363899 on slot 1,  52 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  55  2      INFO   ===>>>  start processing event #18179, run #363899 on slot 2,  52 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18176, run #363899 on slot 0,  53 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  56  0      INFO   ===>>>  start processing event #18180, run #363899 on slot 0,  53 events processed so far  <<<===
 AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18177, run #363899 on slot 3,  54 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18178, run #363899 on slot 0,  55 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18179, run #363899 on slot 1,  56 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  57  0      INFO   ===>>>  start processing event #18181, run #363899 on slot 0,  56 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  58  1      INFO   ===>>>  start processing event #18182, run #363899 on slot 1,  56 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  59  3      INFO   ===>>>  start processing event #18183, run #363899 on slot 3,  56 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18180, run #363899 on slot 2,  57 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18181, run #363899 on slot 0,  58 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  60  0      INFO   ===>>>  start processing event #18184, run #363899 on slot 0,  58 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  61  2      INFO   ===>>>  start processing event #18185, run #363899 on slot 2,  58 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  57  3      INFO   ===>>>  start processing event #18181, run #363899 on slot 3,  54 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18178, run #363899 on slot 1,  55 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  58  1      INFO   ===>>>  start processing event #18182, run #363899 on slot 1,  55 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18179, run #363899 on slot 2,  56 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  59  2      INFO   ===>>>  start processing event #18183, run #363899 on slot 2,  56 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18180, run #363899 on slot 0,  57 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  60  0      INFO   ===>>>  start processing event #18184, run #363899 on slot 0,  57 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18181, run #363899 on slot 3,  58 events processed so far  <<<===
 AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18182, run #363899 on slot 1,  59 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18183, run #363899 on slot 3,  60 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  62  1      INFO   ===>>>  start processing event #18186, run #363899 on slot 1,  60 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  63  3      INFO   ===>>>  start processing event #18187, run #363899 on slot 3,  60 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  61  1      INFO   ===>>>  start processing event #18185, run #363899 on slot 1,  59 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  62  3      INFO   ===>>>  start processing event #18186, run #363899 on slot 3,  59 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18183, run #363899 on slot 2,  60 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  63  2      INFO   ===>>>  start processing event #18187, run #363899 on slot 2,  60 events processed so far  <<<===
 AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18184, run #363899 on slot 0,  61 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  64  0      INFO   ===>>>  start processing event #18188, run #363899 on slot 0,  61 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18185, run #363899 on slot 2,  62 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  65  2      INFO   ===>>>  start processing event #18189, run #363899 on slot 2,  62 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18186, run #363899 on slot 1,  63 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  66  1      INFO   ===>>>  start processing event #18190, run #363899 on slot 1,  63 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18187, run #363899 on slot 3,  64 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18185, run #363899 on slot 1,  62 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  64  0      INFO   ===>>>  start processing event #18188, run #363899 on slot 0,  62 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  65  1      INFO   ===>>>  start processing event #18189, run #363899 on slot 1,  62 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18186, run #363899 on slot 3,  63 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18187, run #363899 on slot 2,  64 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  66  2      INFO   ===>>>  start processing event #18190, run #363899 on slot 2,  64 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  67  3      INFO   ===>>>  start processing event #18191, run #363899 on slot 3,  64 events processed so far  <<<===
 AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18188, run #363899 on slot 0,  65 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  67  0      INFO   ===>>>  start processing event #18191, run #363899 on slot 0,  65 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  68  3      INFO   ===>>>  start processing event #18192, run #363899 on slot 3,  65 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18189, run #363899 on slot 2,  66 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18190, run #363899 on slot 1,  67 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  69  1      INFO   ===>>>  start processing event #18193, run #363899 on slot 1,  67 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  68  0      INFO   ===>>>  start processing event #18192, run #363899 on slot 0,  65 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18189, run #363899 on slot 1,  66 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  69  1      INFO   ===>>>  start processing event #18193, run #363899 on slot 1,  66 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18190, run #363899 on slot 2,  67 events processed so far  <<<===
 AthenaHiveEventLoopMgr                  70  2      INFO   ===>>>  start processing event #18194, run #363899 on slot 2,  67 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18191, run #363899 on slot 0,  68 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18192, run #363899 on slot 3,  69 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  71  0      INFO   ===>>>  start processing event #18195, run #363899 on slot 0,  69 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  72  3      INFO   ===>>>  start processing event #18196, run #363899 on slot 3,  69 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18191, run #363899 on slot 3,  68 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  71  3      INFO   ===>>>  start processing event #18195, run #363899 on slot 3,  68 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18192, run #363899 on slot 0,  69 events processed so far  <<<===
 AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18193, run #363899 on slot 1,  70 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  72  0      INFO   ===>>>  start processing event #18196, run #363899 on slot 0,  70 events processed so far  <<<===
 AthenaHiveEventLoopMgr                  73  1      INFO   ===>>>  start processing event #18197, run #363899 on slot 1,  70 events processed so far  <<<===
 AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18194, run #363899 on slot 2,  71 events processed so far  <<<===
 AthenaHiveEventLoopMgr                  74  2      INFO   ===>>>  start processing event #18198, run #363899 on slot 2,  71 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18195, run #363899 on slot 0,  72 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18196, run #363899 on slot 3,  73 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  75  0      INFO   ===>>>  start processing event #18199, run #363899 on slot 0,  73 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  76  3      INFO   ===>>>  start processing event #18200, run #363899 on slot 3,  73 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18195, run #363899 on slot 3,  72 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18196, run #363899 on slot 0,  73 events processed so far  <<<===
 AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18197, run #363899 on slot 1,  74 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  77  1      INFO   ===>>>  start processing event #18201, run #363899 on slot 1,  74 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  75  0      INFO   ===>>>  start processing event #18199, run #363899 on slot 0,  74 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  76  1      INFO   ===>>>  start processing event #18200, run #363899 on slot 1,  74 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  77  3      INFO   ===>>>  start processing event #18201, run #363899 on slot 3,  74 events processed so far  <<<===
 AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18198, run #363899 on slot 2,  75 events processed so far  <<<===
 AthenaHiveEventLoopMgr                  78  2      INFO   ===>>>  start processing event #18202, run #363899 on slot 2,  75 events processed so far  <<<===
 AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18199, run #363899 on slot 0,  76 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18200, run #363899 on slot 3,  77 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  79  0      INFO   ===>>>  start processing event #18203, run #363899 on slot 0,  77 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  80  3      INFO   ===>>>  start processing event #18204, run #363899 on slot 3,  77 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18201, run #363899 on slot 1,  78 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  81  1      INFO   ===>>>  start processing event #18205, run #363899 on slot 1,  78 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  79  0      INFO   ===>>>  start processing event #18203, run #363899 on slot 0,  76 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18200, run #363899 on slot 1,  77 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  80  1      INFO   ===>>>  start processing event #18204, run #363899 on slot 1,  77 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18201, run #363899 on slot 3,  78 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  81  3      INFO   ===>>>  start processing event #18205, run #363899 on slot 3,  78 events processed so far  <<<===
 AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18202, run #363899 on slot 2,  79 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  82  2      INFO   ===>>>  start processing event #18206, run #363899 on slot 2,  79 events processed so far  <<<===
 AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18203, run #363899 on slot 0,  80 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  83  0      INFO   ===>>>  start processing event #18207, run #363899 on slot 0,  80 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18204, run #363899 on slot 3,  81 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  84  3      INFO   ===>>>  start processing event #18208, run #363899 on slot 3,  81 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18205, run #363899 on slot 1,  82 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  85  1      INFO   ===>>>  start processing event #18209, run #363899 on slot 1,  82 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18206, run #363899 on slot 2,  83 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18207, run #363899 on slot 0,  84 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  86  0      INFO   ===>>>  start processing event #18210, run #363899 on slot 0,  84 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  87  2      INFO   ===>>>  start processing event #18211, run #363899 on slot 2,  84 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18208, run #363899 on slot 3,  85 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18209, run #363899 on slot 1,  86 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  88  1      INFO   ===>>>  start processing event #18212, run #363899 on slot 1,  86 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18204, run #363899 on slot 1,  81 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  82  0      INFO   ===>>>  start processing event #18206, run #363899 on slot 0,  81 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  83  1      INFO   ===>>>  start processing event #18207, run #363899 on slot 1,  81 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  84  2      INFO   ===>>>  start processing event #18208, run #363899 on slot 2,  81 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18205, run #363899 on slot 3,  82 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  85  3      INFO   ===>>>  start processing event #18209, run #363899 on slot 3,  82 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18206, run #363899 on slot 0,  83 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  86  0      INFO   ===>>>  start processing event #18210, run #363899 on slot 0,  83 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18207, run #363899 on slot 1,  84 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  87  1      INFO   ===>>>  start processing event #18211, run #363899 on slot 1,  84 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18208, run #363899 on slot 2,  85 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18209, run #363899 on slot 3,  86 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  88  2      INFO   ===>>>  start processing event #18212, run #363899 on slot 2,  86 events processed so far  <<<===
 AthenaHiveEventLoopMgr                  89  3      INFO   ===>>>  start processing event #18213, run #363899 on slot 3,  86 events processed so far  <<<===
 AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18210, run #363899 on slot 0,  87 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18211, run #363899 on slot 2,  88 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  90  0      INFO   ===>>>  start processing event #18214, run #363899 on slot 0,  88 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  91  2      INFO   ===>>>  start processing event #18215, run #363899 on slot 2,  88 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18212, run #363899 on slot 1,  89 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  90  0      INFO   ===>>>  start processing event #18214, run #363899 on slot 0,  87 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18211, run #363899 on slot 1,  88 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  91  1      INFO   ===>>>  start processing event #18215, run #363899 on slot 1,  88 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18212, run #363899 on slot 2,  89 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  92  2      INFO   ===>>>  start processing event #18216, run #363899 on slot 2,  89 events processed so far  <<<===
 AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18213, run #363899 on slot 3,  90 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  92  1      INFO   ===>>>  start processing event #18216, run #363899 on slot 1,  90 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  93  3      INFO   ===>>>  start processing event #18217, run #363899 on slot 3,  90 events processed so far  <<<===
 AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18214, run #363899 on slot 0,  91 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18215, run #363899 on slot 2,  92 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  94  0      INFO   ===>>>  start processing event #18218, run #363899 on slot 0,  92 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  95  2      INFO   ===>>>  start processing event #18219, run #363899 on slot 2,  92 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18216, run #363899 on slot 1,  93 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  96  1      INFO   ===>>>  start processing event #18220, run #363899 on slot 1,  93 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18217, run #363899 on slot 3,  94 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  97  3      INFO   ===>>>  start processing event #18221, run #363899 on slot 3,  94 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18218, run #363899 on slot 0,  95 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18219, run #363899 on slot 2,  96 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  98  0      INFO   ===>>>  start processing event #18222, run #363899 on slot 0,  96 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  99  2      INFO   ===>>>  start processing event #18223, run #363899 on slot 2,  96 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18220, run #363899 on slot 1,  97 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18221, run #363899 on slot 3,  98 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18222, run #363899 on slot 0,  99 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18223, run #363899 on slot 2,  100 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO ---> Loop Finished (seconds): 14.4819
+AthenaHiveEventLoopMgr                  93  0      INFO   ===>>>  start processing event #18217, run #363899 on slot 0,  91 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  94  3      INFO   ===>>>  start processing event #18218, run #363899 on slot 3,  91 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18215, run #363899 on slot 1,  92 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  95  1      INFO   ===>>>  start processing event #18219, run #363899 on slot 1,  92 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18216, run #363899 on slot 2,  93 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  96  2      INFO   ===>>>  start processing event #18220, run #363899 on slot 2,  93 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18217, run #363899 on slot 0,  94 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  97  0      INFO   ===>>>  start processing event #18221, run #363899 on slot 0,  94 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18218, run #363899 on slot 3,  95 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  98  3      INFO   ===>>>  start processing event #18222, run #363899 on slot 3,  95 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18219, run #363899 on slot 1,  96 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18220, run #363899 on slot 2,  97 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  99  1      INFO   ===>>>  start processing event #18223, run #363899 on slot 1,  97 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18221, run #363899 on slot 0,  98 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18222, run #363899 on slot 3,  99 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #18223, run #363899 on slot 1,  100 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO ---> Loop Finished (seconds): 2.61152
 /cvmfs/atlas-condb.cern.ch/repo/condi...           INFO Database being retired...
 Domain[ROOT_All]                                   INFO ->  Deaccess DbDatabase   READ      [ROOT_All] 06C9EAE8-6F5B-E011-BAAA-003048F0E7AC
 /cvmfs/atlas-condb.cern.ch/repo/condi...           INFO Database being retired...
@@ -1315,7 +1315,7 @@ AvalancheSchedulerSvc                              INFO Joining Scheduler thread
 PyComponentMgr                                     INFO Finalizing PyComponentMgr...
 IdDictDetDescrCnv                                  INFO in finalize
 EventDataSvc                                       INFO Finalizing EventDataSvc - package version StoreGate-00-00-00
-IOVDbFolder                                        INFO Folder /LAR/Align (PoolRef) db-read 1/1 objs/chan/bytes 1/1/340 ((     0.07 ))s
+IOVDbFolder                                        INFO Folder /LAR/Align (PoolRef) db-read 1/1 objs/chan/bytes 1/1/340 ((     0.16 ))s
 IOVDbFolder                                        INFO Folder /TILE/OFL02/CALIB/CES (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 ((     0.00 ))s
 IOVDbFolder                                        INFO Folder /TILE/OFL02/CALIB/CIS/FIT/LIN (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 ((     0.00 ))s
 IOVDbFolder                                        INFO Folder /TILE/OFL02/CALIB/CIS/FIT/NLN (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 ((     0.00 ))s
@@ -1327,10 +1327,10 @@ IOVDbFolder                                        INFO Folder /TILE/OFL02/NOISE
 IOVDbFolder                                        INFO Folder /TILE/OFL02/STATUS/ADC (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 ((     0.00 ))s
 IOVDbFolder                                        INFO Folder /TILE/OFL02/TIME/CHANNELOFFSET/PHY (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 ((     0.00 ))s
 IOVDbFolder                                        INFO Folder /TILE/ONL01/STATUS/ADC (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 ((     0.00 ))s
-IOVDbFolder                                        INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 1/1 objs/chan/bytes 1/1/390 ((     0.04 ))s
-IOVDbSvc                                           INFO  bytes in ((      0.11 ))s
+IOVDbFolder                                        INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 1/1 objs/chan/bytes 1/1/390 ((     0.01 ))s
+IOVDbSvc                                           INFO  bytes in ((      0.17 ))s
 IOVDbSvc                                           INFO Connection sqlite://;schema=mycool.db;dbname=OFLP200 : nConnect: 0 nFolders: 0 ReadTime: ((     0.00 ))s
-IOVDbSvc                                           INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 2 nFolders: 2 ReadTime: ((     0.11 ))s
+IOVDbSvc                                           INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 2 nFolders: 2 ReadTime: ((     0.17 ))s
 IOVDbSvc                                           INFO Connection COOLOFL_TILE/OFLP200 : nConnect: 1 nFolders: 11 ReadTime: ((     0.00 ))s
 TileInfoLoader                                     INFO TileInfoLoader::finalize()
 AthDictLoaderSvc                                   INFO in finalize...
@@ -1341,9 +1341,9 @@ ToolSvc.TileROD_Decoder.TileROD_L2Bui...           INFO Finalizing
 *****Chrono*****                                   INFO ****************************************************************************************************
 *****Chrono*****                                   INFO  The Final CPU consumption ( Chrono ) Table (ordered)
 *****Chrono*****                                   INFO ****************************************************************************************************
-cObjR_ALL                                          INFO Time User   : Tot= 0.81  [s] Ave/Min/Max=0.405(+-0.385)/ 0.02/ 0.79  [s] #=  2
-cObj_ALL                                           INFO Time User   : Tot= 1.05  [s] Ave/Min/Max=0.525(+-0.365)/ 0.16/ 0.89  [s] #=  2
-ChronoStatSvc                                      INFO Time User   : Tot= 20.5  [s]                                             #=  1
+cObjR_ALL                                          INFO Time User   : Tot=  440 [ms] Ave/Min/Max=  220(+-  220)/    0/  440 [ms] #=  2
+cObj_ALL                                           INFO Time User   : Tot= 0.58  [s] Ave/Min/Max= 0.29(+- 0.21)/ 0.08/  0.5  [s] #=  2
+ChronoStatSvc                                      INFO Time User   : Tot= 3.98  [s]                                             #=  1
 *****Chrono*****                                   INFO ****************************************************************************************************
 ChronoStatSvc.finalize()                           INFO  Service finalized successfully 
 ApplicationMgr                                     INFO Application Manager Finalized successfully
diff --git a/TileCalorimeter/TileSvc/TileByteStream/share/TileRawChannelContByteStreamCnv_test.py b/TileCalorimeter/TileSvc/TileByteStream/share/TileRawChannelContByteStreamCnv_test.py
index de1f86c4a10fbd7c1ded2fd55ec67309be1fdeb2..675bb16659c992eef1ae9cd483fa12ca6583496d 100644
--- a/TileCalorimeter/TileSvc/TileByteStream/share/TileRawChannelContByteStreamCnv_test.py
+++ b/TileCalorimeter/TileSvc/TileByteStream/share/TileRawChannelContByteStreamCnv_test.py
@@ -65,6 +65,7 @@ globalflags.InputFormat.set_Value_and_Lock('bytestream')
 
 svcMgr.ByteStreamAddressProviderSvc.TypeNames += [
     'TileRawChannelContainer/TileRawChannelCnt',
+    'TileRawChannelContainer/MuRcvRawChCnt',
     ]
 
 include('TileConditions/TileConditions_jobOptions.py')
@@ -92,7 +93,6 @@ topSequence += TileRawChannelDumper ('TileRawChannelCntDumper',
                                      Prefix = dumpdir + '/')
 topSequence += TileRawChannelDumper ('MuRcvRawChannelCntDumper',
                                      TileRawChannelContainer = 'MuRcvRawChCnt',
-                                     AltTileRawChannelContainer = 'TileRawChannelCnt',
                                      Prefix = dumpdir + '/')
 
 
diff --git a/TileCalorimeter/TileSvc/TileByteStream/share/TileRawChannelContByteStreamCnv_test.ref b/TileCalorimeter/TileSvc/TileByteStream/share/TileRawChannelContByteStreamCnv_test.ref
index 84fd67399e26ad6e25ac71e7b3c9006b274ba8e2..db4b788c85a8c0407b56998c20b21cd6fa8e5aa7 100644
--- a/TileCalorimeter/TileSvc/TileByteStream/share/TileRawChannelContByteStreamCnv_test.ref
+++ b/TileCalorimeter/TileSvc/TileByteStream/share/TileRawChannelContByteStreamCnv_test.ref
@@ -1,14 +1,14 @@
-Tue Jan 22 03:41:29 CET 2019
+Mon Jan 28 10:13:24 CET 2019
 Preloading tcmalloc_minimal.so
 Py:Athena            INFO including file "AthenaCommon/Preparation.py"
-Py:Athena            INFO using release [WorkDir-22.0.1] [x86_64-slc6-gcc62-dbg] [atlas-work3/5871b6e8de] -- built on [2019-01-21T2115]
+Py:Athena            INFO using release [WorkDir-22.0.1] [x86_64-slc6-gcc62-opt] [master-tile-bytestream-tmdb-refactor/3f1c952aef] -- built on [2019-01-28T1010]
 Py:Athena            INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
 Py:Athena            INFO executing ROOT6Setup
 Py:Athena            INFO including file "AthenaCommon/Execution.py"
 Py:Athena            INFO including file "TileByteStream/TileRawChannelContByteStreamCnv_test.py"
-[?1034hSetGeometryVersion.py obtained major release version 22
+SetGeometryVersion.py obtained major release version 22
 Py:Athena            INFO including file "IdDictDetDescrCnv/IdDictDetDescrCnv_joboptions.py"
-Py:ConfigurableDb    INFO Read module info for 5456 configurables from 80 genConfDb files
+Py:ConfigurableDb    INFO Read module info for 5455 configurables from 4 genConfDb files
 Py:ConfigurableDb    INFO No duplicates have been found: that's good !
 EventInfoMgtInit: Got release version  Athena-22.0.1
 Py:IOVDbSvc.CondDB    INFO Setting up conditions DB access to instance OFLP200
@@ -34,7 +34,7 @@ ApplicationMgr       INFO Updating Gaudi::PluginService::SetDebug(level) to leve
 ApplicationMgr    SUCCESS 
 ====================================================================================================================================
                                                    Welcome to ApplicationMgr (GaudiCoreSvc v30r5)
-                                          running on lxplus068.cern.ch on Tue Jan 22 03:41:59 2019
+                                          running on pcatl12 on Mon Jan 28 10:13:31 2019
 ====================================================================================================================================
 ApplicationMgr       INFO Successfully loaded modules : AthenaServices
 ApplicationMgr       INFO Application Manager Configured successfully
@@ -51,8 +51,8 @@ PoolSvc              INFO io_register[PoolSvc](xmlcatalog_file:PoolFileCatalog.x
 PoolSvc              INFO Set connectionsvc retry/timeout/IDLE timeout to  'ConnectionRetrialPeriod':300/ 'ConnectionRetrialTimeOut':3600/ 'ConnectionTimeOut':5 seconds with connection cleanup disabled
 PoolSvc              INFO Frontier compression level set to 5
 DBReplicaSvc         INFO Frontier server at (serverurl=http://atlasfrontier-local.cern.ch:8000/atlr)(serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://lcgft-atlas.gridpp.rl.ac.uk:3128/frontierATLAS)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://ca-proxy.cern.ch:3128)(proxyurl=http://ca-proxy-meyrin.cern.ch:3128)(proxyurl=http://ca-proxy-wigner.cern.ch:3128)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
-DBReplicaSvc         INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/dbreplica.config
-DBReplicaSvc         INFO Total of 10 servers found for host lxplus068.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
+DBReplicaSvc         INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-27T2257/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/dbreplica.config
+DBReplicaSvc         INFO Total of 10 servers found for host pcatl12.dyndns.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
 PoolSvc              INFO Successfully setup replica sorting algorithm
 PoolSvc              INFO Setting up APR FileCatalog and Streams
 PoolSvc           WARNING Unable to locate catalog for prfile:poolcond/PoolCat_oflcond.xml check your ATLAS_POOLCOND_PATH and DATAPATH variables
@@ -86,6 +86,7 @@ ByteStreamAddre...   INFO -- Will fill Store with id =  0
 IOVDbSvc             INFO preLoadAddresses: Removing folder /TagInfo. It should only be in the file meta data and was not found.
 IOVDbSvc             INFO Opening COOL connection for COOLOFL_LAR/OFLP200
 ClassIDSvc           INFO  getRegistryEntries: read 3073 CLIDRegistry entries for module ALL
+ClassIDSvc           INFO  getRegistryEntries: read 792 CLIDRegistry entries for module ALL
 IOVSvc               INFO No IOVSvcTool associated with store "StoreGateSvc"
 IOVSvcTool           INFO IOVRanges will be checked at every Event
 IOVDbSvc             INFO Opening COOL connection for COOLOFL_TILE/OFLP200
@@ -104,7 +105,6 @@ IOVDbSvc             INFO Added taginfo remove for /TILE/OFL02/STATUS/ADC
 IOVDbSvc             INFO Added taginfo remove for /TILE/OFL02/TIME/CHANNELOFFSET/PHY
 IOVDbSvc             INFO Added taginfo remove for /TILE/ONL01/STATUS/ADC
 IOVDbSvc             INFO Added taginfo remove for /LAR/LArCellPositionShift
-ClassIDSvc           INFO  getRegistryEntries: read 792 CLIDRegistry entries for module ALL
 ClassIDSvc           INFO  getRegistryEntries: read 17 CLIDRegistry entries for module ALL
 DetDescrCnvSvc       INFO  initializing 
 DetDescrCnvSvc       INFO Found DetectorStore service
@@ -193,7 +193,7 @@ EndcapDMConstru...   INFO Start building EC electronics geometry
   multi-layered version of absorbers activated, mlabs == 1
 ================================================
 EndcapDMConstru...   INFO Start building EC electronics geometry
-GeoModelSvc          INFO GeoModelSvc.LArDetectorToolNV	 SZ= 28576Kb 	 Time = 1.57S
+GeoModelSvc          INFO GeoModelSvc.LArDetectorToolNV	 SZ= 22940Kb 	 Time = 0.51S
 GeoModelSvc.Til...   INFO  Entering TileDetectorTool::create()
 TileDddbManager      INFO m_tag = ATLAS-R2-2016-01-00-01
 TileDddbManager      INFO n_tiglob = 5
@@ -205,7 +205,7 @@ TileDddbManager      INFO n_tileSwitches = 1
 ClassIDSvc           INFO  getRegistryEntries: read 213 CLIDRegistry entries for module ALL
 CaloIDHelper_ID...   INFO in createObj: creating a TileID helper object in the detector store
 AtlasDetectorID      INFO initialize_from_dictionary - OK
-TileNeighbour        INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/TileNeighbour_reduced.txt
+TileNeighbour        INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-27T2257/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/TileNeighbour_reduced.txt
 TileHWIDDetDesc...   INFO in createObj: creating a TileHWID helper object in the detector store
 TileHWID             INFO initialize_from_dictionary 
 AtlasDetectorID      INFO initialize_from_dictionary - OK
@@ -217,9 +217,9 @@ CaloIDHelper_ID...   INFO in createObj: creating a LArHEC_ID helper object in th
 AtlasDetectorID      INFO initialize_from_dictionary - OK
 CaloIDHelper_ID...   INFO in createObj: creating a LArFCAL_ID helper object in the detector store
 AtlasDetectorID      INFO initialize_from_dictionary - OK
-LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/FCal2DNeighbors-April2011.txt
-LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/FCal3DNeighborsNext-April2011.txt
-LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/FCal3DNeighborsPrev-April2011.txt
+LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-27T2257/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/FCal2DNeighbors-April2011.txt
+LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-27T2257/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/FCal3DNeighborsNext-April2011.txt
+LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-27T2257/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/FCal3DNeighborsPrev-April2011.txt
 CaloIDHelper_ID...   INFO in createObj: creating a LArMiniFCAL_ID helper object in the detector store
 AtlasDetectorID      INFO initialize_from_dictionary - OK
 LArMiniFCAL_ID       INFO  initialize_from_dict - LArCalorimeter dictionary does NOT contain miniFCAL description. Unable to initialize LArMiniFCAL_ID.
@@ -250,11 +250,11 @@ GeoModelSvc.Til...   INFO                                    PLUG2  Rmin= 2981 R
 GeoModelSvc.Til...   INFO  Positioning negative ITC with translation -3405
 GeoModelSvc.Til...   INFO  Positioning negative Gap with translation -3552
 GeoModelSvc.Til...   INFO  Positioning negative Crack with translation -3536
-GeoModelSvc.Til...   INFO  Global positioning of barrel with rotation (0,0,0)) and translation (0,0,0) GeoModelKernelUnits::cm
-GeoModelSvc.Til...   INFO  Global positioning of positive ext.barrel with rotation (0,0,0)) and translation (0,0,0) GeoModelKernelUnits::cm
-GeoModelSvc.Til...   INFO  Global positioning of negative ext.barrel with rotation (0,0,0)) and translation (0,0,1) GeoModelKernelUnits::cm
+GeoModelSvc.Til...   INFO  Global positioning of barrel with rotation (0,0,0)) and translation (0,0,0) Gaudi::Units::cm
+GeoModelSvc.Til...   INFO  Global positioning of positive ext.barrel with rotation (0,0,0)) and translation (0,0,0) Gaudi::Units::cm
+GeoModelSvc.Til...   INFO  Global positioning of negative ext.barrel with rotation (0,0,0)) and translation (0,0,1) Gaudi::Units::cm
 TileDetDescrMan...   INFO Entering create_elements()
-GeoModelSvc          INFO GeoModelSvc.TileDetectorTool	 SZ= 4172Kb 	 Time = 1.81S
+GeoModelSvc          INFO GeoModelSvc.TileDetectorTool	 SZ= 4592Kb 	 Time = 0.16S
 ClassIDSvc           INFO  getRegistryEntries: read 65 CLIDRegistry entries for module ALL
 TileInfoLoader       INFO Initializing....TileInfoLoader
 TileInfoLoader       INFO New ATLAS geometry detected: ATLAS-R2-2016-01-00-01 (010001) version 10001
@@ -276,11 +276,11 @@ TileInfoLoader       INFO Sampling fraction for E2 cells 1/107
 TileInfoLoader       INFO Sampling fraction for E3 cells 1/97
 TileInfoLoader       INFO Sampling fraction for E4 cells 1/75
 TileInfoLoader       INFO Sampling fraction for E4' cells 1/75
-TileInfoLoader       INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/pulsehi_physics.dat
-TileInfoLoader       INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/pulselo_physics.dat
-TileInfoLoader       INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/pulse_adder_tower_physics.dat
-TileInfoLoader       INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/pulse_adder_muonRcv_physics.dat
-TileInfoLoader       INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/pulse_adder_muon_physics.dat
+TileInfoLoader       INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-27T2257/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/pulsehi_physics.dat
+TileInfoLoader       INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-27T2257/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/pulselo_physics.dat
+TileInfoLoader       INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-27T2257/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/pulse_adder_tower_physics.dat
+TileInfoLoader       INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-27T2257/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/pulse_adder_muonRcv_physics.dat
+TileInfoLoader       INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-27T2257/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/pulse_adder_muon_physics.dat
 CaloIDHelper_ID...   INFO in createObj: creating a CaloLVL1_ID helper object in the detector store
 CaloLVL1_ID          INFO initialize_from_dictionary
 AtlasDetectorID      INFO initialize_from_dictionary - OK
@@ -388,12 +388,12 @@ CaloIDHelper_ID...   INFO in createObj: creating a LArHEC_SuperCell_ID helper ob
 AtlasDetectorID      INFO initialize_from_dictionary - OK
 CaloIDHelper_ID...   INFO in createObj: creating a LArFCAL_SuperCell_ID helper object in the detector store
 AtlasDetectorID      INFO initialize_from_dictionary - OK
-LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/FCalSuperCells2DNeighborsNew-April2014.txt
-LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
-LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
+LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-27T2257/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/FCalSuperCells2DNeighborsNew-April2014.txt
+LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-27T2257/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
+LArFCAL_Base_ID      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-27T2257/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
 CaloIDHelper_ID...   INFO in createObj: creating a Tile_SuperCell_ID helper object in the detector store
 AtlasDetectorID      INFO initialize_from_dictionary - OK
-TileNeighbour        INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/TileSuperCellNeighbour.txt
+TileNeighbour        INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-27T2257/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/TileSuperCellNeighbour.txt
 AtlasDetectorID      INFO initialize_from_dictionary - OK
 CaloIdMgrDetDes...   INFO  Finished 
 CaloIdMgrDetDes...   INFO Initializing CaloIdMgr from values in CaloIdMgrDetDescrCnv 
@@ -422,7 +422,7 @@ TileBadChannels...   INFO TileBchStatus::isNoisy() is defined by: Large HF noise
 TileBadChannels...   INFO TileBchStatus::isNoGainL1() is defined by: ADC dead; No PMT connected; No HV; Channel masked for LV1 (unspecified); LV1 channel no gain; LV1 channel noisy; Channel disabled for LV1; 
 TileBadChannels...   INFO TileBchStatus::isBadTiming() is defined by: Bad timing; Online bad timing; 
 TileBadChannels...   INFO No drawer trips probabilities found in DB
-ClassIDSvc           INFO  getRegistryEntries: read 2407 CLIDRegistry entries for module ALL
+ClassIDSvc           INFO  getRegistryEntries: read 2427 CLIDRegistry entries for module ALL
 ClassIDSvc           INFO  getRegistryEntries: read 89 CLIDRegistry entries for module ALL
 ToolSvc.TileROD...   INFO TileL2Builder initialization completed
 ToolSvc.TileRaw...   INFO Initializing TileRawChannelContByteStreamTool
@@ -641,23 +641,23 @@ IncidentProcAlg2     INFO Finalize
 EventInfoByteSt...   INFO finalize 
 PyComponentMgr       INFO Finalizing PyComponentMgr...
 IdDictDetDescrCnv    INFO in finalize
-IOVDbFolder          INFO Folder /LAR/Align (PoolRef) db-read 1/1 objs/chan/bytes 1/1/340 ((     0.07 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/CES (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/104132 ((     0.16 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/CIS/FIT/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/108 ((     0.10 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/CIS/FIT/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/108 ((     0.10 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/EMS (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/116 ((     0.05 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/LAS/FIBER (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/964 ((     0.06 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/LAS/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/96 ((     0.05 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/LAS/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/104 ((     0.07 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/NOISE/SAMPLE (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/643828 ((     0.18 ))s
+IOVDbFolder          INFO Folder /LAR/Align (PoolRef) db-read 1/1 objs/chan/bytes 1/1/340 ((     1.62 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/CES (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/104132 ((     2.12 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/CIS/FIT/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/108 ((     1.65 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/CIS/FIT/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/108 ((     2.37 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/EMS (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/116 ((     1.31 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/LAS/FIBER (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/964 ((     1.15 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/LAS/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/96 ((     1.04 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/CALIB/LAS/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/104 ((     0.95 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/NOISE/SAMPLE (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/643828 ((     1.38 ))s
 IOVDbFolder          INFO Folder /TILE/OFL02/STATUS/ADC (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/93084 ((     0.06 ))s
-IOVDbFolder          INFO Folder /TILE/OFL02/TIME/CHANNELOFFSET/PHY (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/120 ((     0.10 ))s
+IOVDbFolder          INFO Folder /TILE/OFL02/TIME/CHANNELOFFSET/PHY (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/120 ((     0.05 ))s
 IOVDbFolder          INFO Folder /TILE/ONL01/STATUS/ADC (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/100 ((     0.02 ))s
-IOVDbFolder          INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 1/1 objs/chan/bytes 1/1/390 ((     0.02 ))s
-IOVDbSvc             INFO  bytes in ((      1.03 ))s
+IOVDbFolder          INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 1/1 objs/chan/bytes 1/1/390 ((     1.42 ))s
+IOVDbSvc             INFO  bytes in ((     15.15 ))s
 IOVDbSvc             INFO Connection sqlite://;schema=mycool.db;dbname=OFLP200 : nConnect: 0 nFolders: 0 ReadTime: ((     0.00 ))s
-IOVDbSvc             INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 2 nFolders: 2 ReadTime: ((     0.10 ))s
-IOVDbSvc             INFO Connection COOLOFL_TILE/OFLP200 : nConnect: 2 nFolders: 11 ReadTime: ((     0.93 ))s
+IOVDbSvc             INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 2 nFolders: 2 ReadTime: ((     3.04 ))s
+IOVDbSvc             INFO Connection COOLOFL_TILE/OFLP200 : nConnect: 2 nFolders: 11 ReadTime: ((    12.10 ))s
 TileInfoLoader       INFO TileInfoLoader::finalize()
 AthDictLoaderSvc     INFO in finalize...
 ToolSvc              INFO Removing all tools created by ToolSvc
@@ -667,27 +667,27 @@ ToolSvc.TileROD...   INFO Finalizing
 *****Chrono*****     INFO ****************************************************************************************************
 *****Chrono*****     INFO  The Final CPU consumption ( Chrono ) Table (ordered)
 *****Chrono*****     INFO ****************************************************************************************************
-cObjR_ALL            INFO Time User   : Tot= 0.82  [s] Ave/Min/Max= 0.41(+- 0.39)/ 0.02/  0.8  [s] #=  2
-cObj_ALL             INFO Time User   : Tot= 1.03  [s] Ave/Min/Max=0.0792(+-0.235)/    0/ 0.88  [s] #= 13
-ChronoStatSvc        INFO Time User   : Tot= 41.7  [s]                                             #=  1
+cObjR_ALL            INFO Time User   : Tot=  280 [ms] Ave/Min/Max=  140(+-  130)/   10/  270 [ms] #=  2
+cObj_ALL             INFO Time User   : Tot=  340 [ms] Ave/Min/Max= 26.2(+- 77.3)/    0/  290 [ms] #= 13
+ChronoStatSvc        INFO Time User   : Tot=  8.9  [s]                                             #=  1
 *****Chrono*****     INFO ****************************************************************************************************
 ChronoStatSvc.f...   INFO  Service finalized successfully 
 ApplicationMgr       INFO Application Manager Finalized successfully
 ApplicationMgr       INFO Application Manager Terminated successfully
 Py:Athena            INFO leaving with code 0: "successful run"
-Tue Jan 22 03:43:23 CET 2019
+Mon Jan 28 10:14:05 CET 2019
 Preloading tcmalloc_minimal.so
 Py:Athena            INFO including file "AthenaCommon/Preparation.py"
-Py:Athena            INFO using release [WorkDir-22.0.1] [x86_64-slc6-gcc62-dbg] [atlas-work3/5871b6e8de] -- built on [2019-01-21T2115]
+Py:Athena            INFO using release [WorkDir-22.0.1] [x86_64-slc6-gcc62-opt] [master-tile-bytestream-tmdb-refactor/3f1c952aef] -- built on [2019-01-28T1010]
 Py:Athena            INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
 Py:Athena            INFO executing ROOT6Setup
 Py:Athena            INFO configuring AthenaHive with [4] concurrent threads and [4] concurrent events
 Py:AlgScheduler      INFO setting up AvalancheSchedulerSvc/AvalancheSchedulerSvc with 4 threads
 Py:Athena            INFO including file "AthenaCommon/Execution.py"
 Py:Athena            INFO including file "TileByteStream/TileRawChannelContByteStreamCnv_test.py"
-[?1034hSetGeometryVersion.py obtained major release version 22
+SetGeometryVersion.py obtained major release version 22
 Py:Athena            INFO including file "IdDictDetDescrCnv/IdDictDetDescrCnv_joboptions.py"
-Py:ConfigurableDb    INFO Read module info for 5456 configurables from 80 genConfDb files
+Py:ConfigurableDb    INFO Read module info for 5455 configurables from 4 genConfDb files
 Py:ConfigurableDb    INFO No duplicates have been found: that's good !
 EventInfoMgtInit: Got release version  Athena-22.0.1
 Py:IOVDbSvc.CondDB    INFO Setting up conditions DB access to instance OFLP200
@@ -714,7 +714,7 @@ MessageSvc           INFO Activating in a separate thread
 ApplicationMgr    SUCCESS 
 ====================================================================================================================================
                                                    Welcome to ApplicationMgr (GaudiCoreSvc v30r5)
-                                          running on lxplus068.cern.ch on Tue Jan 22 03:43:53 2019
+                                          running on pcatl12 on Mon Jan 28 10:14:13 2019
 ====================================================================================================================================
 ApplicationMgr       INFO Successfully loaded modules : AthenaServices
 ApplicationMgr       INFO Application Manager Configured successfully
@@ -730,8 +730,8 @@ PoolSvc                                            INFO io_register[PoolSvc](xml
 PoolSvc                                            INFO Set connectionsvc retry/timeout/IDLE timeout to  'ConnectionRetrialPeriod':300/ 'ConnectionRetrialTimeOut':3600/ 'ConnectionTimeOut':5 seconds with connection cleanup disabled
 PoolSvc                                            INFO Frontier compression level set to 5
 DBReplicaSvc                                       INFO Frontier server at (serverurl=http://atlasfrontier-local.cern.ch:8000/atlr)(serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://lcgft-atlas.gridpp.rl.ac.uk:3128/frontierATLAS)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://ca-proxy.cern.ch:3128)(proxyurl=http://ca-proxy-meyrin.cern.ch:3128)(proxyurl=http://ca-proxy-wigner.cern.ch:3128)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
-DBReplicaSvc                                       INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/dbreplica.config
-DBReplicaSvc                                       INFO Total of 10 servers found for host lxplus068.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
+DBReplicaSvc                                       INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-27T2257/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/dbreplica.config
+DBReplicaSvc                                       INFO Total of 10 servers found for host pcatl12.dyndns.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
 PoolSvc                                            INFO Successfully setup replica sorting algorithm
 PoolSvc                                            INFO Setting up APR FileCatalog and Streams
 PoolSvc                                         WARNING Unable to locate catalog for prfile:poolcond/PoolCat_oflcond.xml check your ATLAS_POOLCOND_PATH and DATAPATH variables
@@ -873,7 +873,7 @@ EndcapDMConstruction                               INFO Start building EC electr
   multi-layered version of absorbers activated, mlabs == 1
 ================================================
 EndcapDMConstruction                               INFO Start building EC electronics geometry
-GeoModelSvc                                        INFO GeoModelSvc.LArDetectorToolNV	 SZ= 28576Kb 	 Time = 1.76S
+GeoModelSvc                                        INFO GeoModelSvc.LArDetectorToolNV	 SZ= 22940Kb 	 Time = 0.55S
 GeoModelSvc.TileDetectorTool                       INFO  Entering TileDetectorTool::create()
 TileDddbManager                                    INFO m_tag = ATLAS-R2-2016-01-00-01
 TileDddbManager                                    INFO n_tiglob = 5
@@ -885,7 +885,7 @@ TileDddbManager                                    INFO n_tileSwitches = 1
 ClassIDSvc                                         INFO  getRegistryEntries: read 213 CLIDRegistry entries for module ALL
 CaloIDHelper_IDDetDescrCnv                         INFO in createObj: creating a TileID helper object in the detector store
 AtlasDetectorID                                    INFO initialize_from_dictionary - OK
-TileNeighbour                                      INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/TileNeighbour_reduced.txt
+TileNeighbour                                      INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-27T2257/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/TileNeighbour_reduced.txt
 TileHWIDDetDescrCnv                                INFO in createObj: creating a TileHWID helper object in the detector store
 TileHWID                                           INFO initialize_from_dictionary 
 AtlasDetectorID                                    INFO initialize_from_dictionary - OK
@@ -897,9 +897,9 @@ CaloIDHelper_IDDetDescrCnv                         INFO in createObj: creating a
 AtlasDetectorID                                    INFO initialize_from_dictionary - OK
 CaloIDHelper_IDDetDescrCnv                         INFO in createObj: creating a LArFCAL_ID helper object in the detector store
 AtlasDetectorID                                    INFO initialize_from_dictionary - OK
-LArFCAL_Base_ID                                    INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/FCal2DNeighbors-April2011.txt
-LArFCAL_Base_ID                                    INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/FCal3DNeighborsNext-April2011.txt
-LArFCAL_Base_ID                                    INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/FCal3DNeighborsPrev-April2011.txt
+LArFCAL_Base_ID                                    INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-27T2257/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/FCal2DNeighbors-April2011.txt
+LArFCAL_Base_ID                                    INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-27T2257/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/FCal3DNeighborsNext-April2011.txt
+LArFCAL_Base_ID                                    INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-27T2257/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/FCal3DNeighborsPrev-April2011.txt
 CaloIDHelper_IDDetDescrCnv                         INFO in createObj: creating a LArMiniFCAL_ID helper object in the detector store
 AtlasDetectorID                                    INFO initialize_from_dictionary - OK
 LArMiniFCAL_ID                                     INFO  initialize_from_dict - LArCalorimeter dictionary does NOT contain miniFCAL description. Unable to initialize LArMiniFCAL_ID.
@@ -930,11 +930,11 @@ GeoModelSvc.TileDetectorTool                       INFO
 GeoModelSvc.TileDetectorTool                       INFO  Positioning negative ITC with translation -3405
 GeoModelSvc.TileDetectorTool                       INFO  Positioning negative Gap with translation -3552
 GeoModelSvc.TileDetectorTool                       INFO  Positioning negative Crack with translation -3536
-GeoModelSvc.TileDetectorTool                       INFO  Global positioning of barrel with rotation (0,0,0)) and translation (0,0,0) GeoModelKernelUnits::cm
-GeoModelSvc.TileDetectorTool                       INFO  Global positioning of positive ext.barrel with rotation (0,0,0)) and translation (0,0,0) GeoModelKernelUnits::cm
-GeoModelSvc.TileDetectorTool                       INFO  Global positioning of negative ext.barrel with rotation (0,0,0)) and translation (0,0,1) GeoModelKernelUnits::cm
+GeoModelSvc.TileDetectorTool                       INFO  Global positioning of barrel with rotation (0,0,0)) and translation (0,0,0) Gaudi::Units::cm
+GeoModelSvc.TileDetectorTool                       INFO  Global positioning of positive ext.barrel with rotation (0,0,0)) and translation (0,0,0) Gaudi::Units::cm
+GeoModelSvc.TileDetectorTool                       INFO  Global positioning of negative ext.barrel with rotation (0,0,0)) and translation (0,0,1) Gaudi::Units::cm
 TileDetDescrManager                                INFO Entering create_elements()
-GeoModelSvc                                        INFO GeoModelSvc.TileDetectorTool	 SZ= 4172Kb 	 Time = 1.78S
+GeoModelSvc                                        INFO GeoModelSvc.TileDetectorTool	 SZ= 3568Kb 	 Time = 0.17S
 ClassIDSvc                                         INFO  getRegistryEntries: read 65 CLIDRegistry entries for module ALL
 TileInfoLoader                                     INFO Initializing....TileInfoLoader
 TileInfoLoader                                     INFO New ATLAS geometry detected: ATLAS-R2-2016-01-00-01 (010001) version 10001
@@ -956,11 +956,11 @@ TileInfoLoader                                     INFO Sampling fraction for E2
 TileInfoLoader                                     INFO Sampling fraction for E3 cells 1/97
 TileInfoLoader                                     INFO Sampling fraction for E4 cells 1/75
 TileInfoLoader                                     INFO Sampling fraction for E4' cells 1/75
-TileInfoLoader                                     INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/pulsehi_physics.dat
-TileInfoLoader                                     INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/pulselo_physics.dat
-TileInfoLoader                                     INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/pulse_adder_tower_physics.dat
-TileInfoLoader                                     INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/pulse_adder_muonRcv_physics.dat
-TileInfoLoader                                     INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/pulse_adder_muon_physics.dat
+TileInfoLoader                                     INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-27T2257/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/pulsehi_physics.dat
+TileInfoLoader                                     INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-27T2257/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/pulselo_physics.dat
+TileInfoLoader                                     INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-27T2257/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/pulse_adder_tower_physics.dat
+TileInfoLoader                                     INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-27T2257/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/pulse_adder_muonRcv_physics.dat
+TileInfoLoader                                     INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-27T2257/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/pulse_adder_muon_physics.dat
 CaloIDHelper_IDDetDescrCnv                         INFO in createObj: creating a CaloLVL1_ID helper object in the detector store
 CaloLVL1_ID                                        INFO initialize_from_dictionary
 AtlasDetectorID                                    INFO initialize_from_dictionary - OK
@@ -1023,7 +1023,6 @@ AvalancheSchedulerSvc                       0      INFO Will attribute the follo
    o  ( 'TileRawChannelContainer' , 'StoreGateSvc+MuRcvRawChCnt' )     required by Algorithm: 
        * MuRcvRawChannelCntDumper
    o  ( 'TileRawChannelContainer' , 'StoreGateSvc+TileRawChannelCnt' )     required by Algorithm: 
-       * MuRcvRawChannelCntDumper
        * TileRawChannelCntDumper
 PrecedenceSvc                               0      INFO Assembling CF and DF task precedence rules
 PrecedenceRulesGraph                        0      INFO CondSvc found. DF precedence rules will be augmented with 'Conditions'
@@ -1083,12 +1082,12 @@ CaloIDHelper_IDDetDescrCnv              0   0      INFO in createObj: creating a
 AtlasDetectorID                         0   0      INFO initialize_from_dictionary - OK
 CaloIDHelper_IDDetDescrCnv              0   0      INFO in createObj: creating a LArFCAL_SuperCell_ID helper object in the detector store
 AtlasDetectorID                         0   0      INFO initialize_from_dictionary - OK
-LArFCAL_Base_ID                         0   0      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/FCalSuperCells2DNeighborsNew-April2014.txt
-LArFCAL_Base_ID                         0   0      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
-LArFCAL_Base_ID                         0   0      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
+LArFCAL_Base_ID                         0   0      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-27T2257/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/FCalSuperCells2DNeighborsNew-April2014.txt
+LArFCAL_Base_ID                         0   0      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-27T2257/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
+LArFCAL_Base_ID                         0   0      INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-27T2257/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
 CaloIDHelper_IDDetDescrCnv              0   0      INFO in createObj: creating a Tile_SuperCell_ID helper object in the detector store
 AtlasDetectorID                         0   0      INFO initialize_from_dictionary - OK
-TileNeighbour                           0   0      INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-20T2256/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-dbg/share/TileSuperCellNeighbour.txt
+TileNeighbour                           0   0      INFO Reading file  /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-27T2257/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/TileSuperCellNeighbour.txt
 AtlasDetectorID                         0   0      INFO initialize_from_dictionary - OK
 CaloIdMgrDetDescrCnv                    0   0      INFO  Finished 
 CaloIdMgrDetDescrCnv                    0   0      INFO Initializing CaloIdMgr from values in CaloIdMgrDetDescrCnv 
@@ -1096,18 +1095,14 @@ Domain[ROOT_All]                        0   0      INFO ->  Access   DbDatabase
 Domain[ROOT_All]                        0   0      INFO                           /cvmfs/atlas-condb.cern.ch/repo/conditions/cond08/cond08_mc.000003.gen.COND/cond08_mc.000003.gen.COND._0064.pool.root
 RootDatabase.open                       0   0      INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond08/cond08_mc.000003.gen.COND/cond08_mc.000003.gen.COND._0064.pool.root File version:52200
 AthenaHiveEventLoopMgr                  0   0      INFO   ===>>>  start processing event #1129572, run #204073 on slot 0,  0 events processed so far  <<<===
-ClassIDSvc                              0   0      INFO  getRegistryEntries: read 650 CLIDRegistry entries for module ALL
-SGInputLoader                           0   0   WARNING unable to find proxy for  ( 'TileRawChannelContainer' , 'StoreGateSvc+MuRcvRawChCnt' ) 
+ClassIDSvc                              0   0      INFO  getRegistryEntries: read 670 CLIDRegistry entries for module ALL
 ClassIDSvc                              0   0      INFO  getRegistryEntries: read 1757 CLIDRegistry entries for module ALL
 ClassIDSvc                              0   0      INFO  getRegistryEntries: read 89 CLIDRegistry entries for module ALL
 ToolSvc.TileROD_Decoder.TileROD_L2Bui...0   0      INFO TileL2Builder initialization completed
 ToolSvc.TileRawChannelContByteStreamTool0   0      INFO Initializing TileRawChannelContByteStreamTool
 AthenaHiveEventLoopMgr                  1   1      INFO   ===>>>  start processing event #1129665, run #204073 on slot 1,  0 events processed so far  <<<===
-SGInputLoader                           1   1   WARNING unable to find proxy for  ( 'TileRawChannelContainer' , 'StoreGateSvc+MuRcvRawChCnt' ) 
 AthenaHiveEventLoopMgr                  2   2      INFO   ===>>>  start processing event #1131212, run #204073 on slot 2,  0 events processed so far  <<<===
-SGInputLoader                           2   2   WARNING unable to find proxy for  ( 'TileRawChannelContainer' , 'StoreGateSvc+MuRcvRawChCnt' ) 
 AthenaHiveEventLoopMgr                  3   3      INFO   ===>>>  start processing event #1131086, run #204073 on slot 3,  0 events processed so far  <<<===
-SGInputLoader                           3   3   WARNING unable to find proxy for  ( 'TileRawChannelContainer' , 'StoreGateSvc+MuRcvRawChCnt' ) 
 AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1129572, run #204073 on slot 0,  1 events processed so far  <<<===
 AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1129665, run #204073 on slot 1,  2 events processed so far  <<<===
 AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1131212, run #204073 on slot 2,  3 events processed so far  <<<===
@@ -1115,196 +1110,196 @@ AthenaHiveEventLoopMgr                  4   0      INFO   ===>>>  start processi
 AthenaHiveEventLoopMgr                  5   1      INFO   ===>>>  start processing event #1131269, run #204073 on slot 1,  3 events processed so far  <<<===
 AthenaHiveEventLoopMgr                  6   2      INFO   ===>>>  start processing event #1130716, run #204073 on slot 2,  3 events processed so far  <<<===
 AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1131086, run #204073 on slot 3,  4 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  7   3      INFO   ===>>>  start processing event #1132019, run #204073 on slot 3,  4 events processed so far  <<<===
 AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1130272, run #204073 on slot 0,  5 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  8   0      INFO   ===>>>  start processing event #1132092, run #204073 on slot 0,  5 events processed so far  <<<===
 AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1131269, run #204073 on slot 1,  6 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  9   1      INFO   ===>>>  start processing event #1130238, run #204073 on slot 1,  6 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  7   0      INFO   ===>>>  start processing event #1132019, run #204073 on slot 0,  6 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  8   1      INFO   ===>>>  start processing event #1132092, run #204073 on slot 1,  6 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  9   3      INFO   ===>>>  start processing event #1130238, run #204073 on slot 3,  6 events processed so far  <<<===
 AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1130716, run #204073 on slot 2,  7 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  10  2      INFO   ===>>>  start processing event #1134553, run #204073 on slot 2,  7 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1132019, run #204073 on slot 3,  8 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1132092, run #204073 on slot 0,  9 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  11  0      INFO   ===>>>  start processing event #1130999, run #204073 on slot 0,  9 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  12  3      INFO   ===>>>  start processing event #1133461, run #204073 on slot 3,  9 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1130238, run #204073 on slot 1,  10 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  13  1      INFO   ===>>>  start processing event #1131152, run #204073 on slot 1,  10 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1134553, run #204073 on slot 2,  11 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1130999, run #204073 on slot 0,  12 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  14  0      INFO   ===>>>  start processing event #1130142, run #204073 on slot 0,  12 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  15  2      INFO   ===>>>  start processing event #1132770, run #204073 on slot 2,  12 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1133461, run #204073 on slot 3,  13 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  16  3      INFO   ===>>>  start processing event #1132365, run #204073 on slot 3,  13 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1131152, run #204073 on slot 1,  14 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  17  1      INFO   ===>>>  start processing event #1136791, run #204073 on slot 1,  14 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1130142, run #204073 on slot 0,  15 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  18  0      INFO   ===>>>  start processing event #1133781, run #204073 on slot 0,  15 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1132770, run #204073 on slot 2,  16 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  19  2      INFO   ===>>>  start processing event #1132067, run #204073 on slot 2,  16 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1132365, run #204073 on slot 3,  17 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  20  3      INFO   ===>>>  start processing event #1138637, run #204073 on slot 3,  17 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1132019, run #204073 on slot 0,  8 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1132092, run #204073 on slot 1,  9 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  10  0      INFO   ===>>>  start processing event #1134553, run #204073 on slot 0,  9 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  11  1      INFO   ===>>>  start processing event #1130999, run #204073 on slot 1,  9 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  12  2      INFO   ===>>>  start processing event #1133461, run #204073 on slot 2,  9 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1130238, run #204073 on slot 3,  10 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1134553, run #204073 on slot 0,  11 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1130999, run #204073 on slot 1,  12 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  13  0      INFO   ===>>>  start processing event #1131152, run #204073 on slot 0,  12 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  14  1      INFO   ===>>>  start processing event #1130142, run #204073 on slot 1,  12 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  15  3      INFO   ===>>>  start processing event #1132770, run #204073 on slot 3,  12 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1133461, run #204073 on slot 2,  13 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1131152, run #204073 on slot 0,  14 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1130142, run #204073 on slot 1,  15 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  16  0      INFO   ===>>>  start processing event #1132365, run #204073 on slot 0,  15 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  17  1      INFO   ===>>>  start processing event #1136791, run #204073 on slot 1,  15 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  18  2      INFO   ===>>>  start processing event #1133781, run #204073 on slot 2,  15 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1132770, run #204073 on slot 3,  16 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1132365, run #204073 on slot 0,  17 events processed so far  <<<===
 AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1136791, run #204073 on slot 1,  18 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  21  1      INFO   ===>>>  start processing event #1139495, run #204073 on slot 1,  18 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1133781, run #204073 on slot 0,  19 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  22  0      INFO   ===>>>  start processing event #1140193, run #204073 on slot 0,  19 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1132067, run #204073 on slot 2,  20 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  23  2      INFO   ===>>>  start processing event #1142953, run #204073 on slot 2,  20 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1138637, run #204073 on slot 3,  21 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  24  3      INFO   ===>>>  start processing event #1139127, run #204073 on slot 3,  21 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1140193, run #204073 on slot 0,  22 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  25  0      INFO   ===>>>  start processing event #1141272, run #204073 on slot 0,  22 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1139495, run #204073 on slot 1,  23 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  26  1      INFO   ===>>>  start processing event #1137117, run #204073 on slot 1,  23 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1142953, run #204073 on slot 2,  24 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1139127, run #204073 on slot 3,  25 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  27  2      INFO   ===>>>  start processing event #1139599, run #204073 on slot 2,  25 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  28  3      INFO   ===>>>  start processing event #1140314, run #204073 on slot 3,  25 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  19  0      INFO   ===>>>  start processing event #1132067, run #204073 on slot 0,  18 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  20  1      INFO   ===>>>  start processing event #1138637, run #204073 on slot 1,  18 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  21  3      INFO   ===>>>  start processing event #1139495, run #204073 on slot 3,  18 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1133781, run #204073 on slot 2,  19 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1132067, run #204073 on slot 0,  20 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1138637, run #204073 on slot 1,  21 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  22  0      INFO   ===>>>  start processing event #1140193, run #204073 on slot 0,  21 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  23  1      INFO   ===>>>  start processing event #1142953, run #204073 on slot 1,  21 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  24  2      INFO   ===>>>  start processing event #1139127, run #204073 on slot 2,  21 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1139495, run #204073 on slot 3,  22 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1140193, run #204073 on slot 0,  23 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1142953, run #204073 on slot 1,  24 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  25  0      INFO   ===>>>  start processing event #1141272, run #204073 on slot 0,  24 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  26  1      INFO   ===>>>  start processing event #1137117, run #204073 on slot 1,  24 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  27  3      INFO   ===>>>  start processing event #1139599, run #204073 on slot 3,  24 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1139127, run #204073 on slot 2,  25 events processed so far  <<<===
 AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1141272, run #204073 on slot 0,  26 events processed so far  <<<===
 AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1137117, run #204073 on slot 1,  27 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  29  0      INFO   ===>>>  start processing event #1133685, run #204073 on slot 0,  27 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  30  1      INFO   ===>>>  start processing event #1143279, run #204073 on slot 1,  27 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1139599, run #204073 on slot 2,  28 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  31  2      INFO   ===>>>  start processing event #1137563, run #204073 on slot 2,  28 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1140314, run #204073 on slot 3,  29 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  32  3      INFO   ===>>>  start processing event #1139927, run #204073 on slot 3,  29 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1133685, run #204073 on slot 0,  30 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  33  0      INFO   ===>>>  start processing event #1141197, run #204073 on slot 0,  30 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1143279, run #204073 on slot 1,  31 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  34  1      INFO   ===>>>  start processing event #1140039, run #204073 on slot 1,  31 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1137563, run #204073 on slot 2,  32 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1139927, run #204073 on slot 3,  33 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  35  2      INFO   ===>>>  start processing event #1142531, run #204073 on slot 2,  33 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  36  3      INFO   ===>>>  start processing event #1139475, run #204073 on slot 3,  33 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1141197, run #204073 on slot 0,  34 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  37  0      INFO   ===>>>  start processing event #1139958, run #204073 on slot 0,  34 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1140039, run #204073 on slot 1,  35 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  38  1      INFO   ===>>>  start processing event #1143765, run #204073 on slot 1,  35 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1142531, run #204073 on slot 2,  36 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  39  2      INFO   ===>>>  start processing event #1143097, run #204073 on slot 2,  36 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1139475, run #204073 on slot 3,  37 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  28  0      INFO   ===>>>  start processing event #1140314, run #204073 on slot 0,  27 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  29  1      INFO   ===>>>  start processing event #1133685, run #204073 on slot 1,  27 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  30  2      INFO   ===>>>  start processing event #1143279, run #204073 on slot 2,  27 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1139599, run #204073 on slot 3,  28 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1140314, run #204073 on slot 0,  29 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1133685, run #204073 on slot 1,  30 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  31  0      INFO   ===>>>  start processing event #1137563, run #204073 on slot 0,  30 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  32  1      INFO   ===>>>  start processing event #1139927, run #204073 on slot 1,  30 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  33  3      INFO   ===>>>  start processing event #1141197, run #204073 on slot 3,  30 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1143279, run #204073 on slot 2,  31 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1137563, run #204073 on slot 0,  32 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1139927, run #204073 on slot 1,  33 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  34  0      INFO   ===>>>  start processing event #1140039, run #204073 on slot 0,  33 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  35  1      INFO   ===>>>  start processing event #1142531, run #204073 on slot 1,  33 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  36  2      INFO   ===>>>  start processing event #1139475, run #204073 on slot 2,  33 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1141197, run #204073 on slot 3,  34 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1140039, run #204073 on slot 0,  35 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1142531, run #204073 on slot 1,  36 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  37  0      INFO   ===>>>  start processing event #1139958, run #204073 on slot 0,  36 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  38  1      INFO   ===>>>  start processing event #1143765, run #204073 on slot 1,  36 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  39  3      INFO   ===>>>  start processing event #1143097, run #204073 on slot 3,  36 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1139475, run #204073 on slot 2,  37 events processed so far  <<<===
 AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1139958, run #204073 on slot 0,  38 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  40  0      INFO   ===>>>  start processing event #1134147, run #204073 on slot 0,  38 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  41  3      INFO   ===>>>  start processing event #1137156, run #204073 on slot 3,  38 events processed so far  <<<===
 AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1143765, run #204073 on slot 1,  39 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  42  1      INFO   ===>>>  start processing event #1136377, run #204073 on slot 1,  39 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1143097, run #204073 on slot 2,  40 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  43  2      INFO   ===>>>  start processing event #1137842, run #204073 on slot 2,  40 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  40  0      INFO   ===>>>  start processing event #1134147, run #204073 on slot 0,  39 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  41  1      INFO   ===>>>  start processing event #1137156, run #204073 on slot 1,  39 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  42  2      INFO   ===>>>  start processing event #1136377, run #204073 on slot 2,  39 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1143097, run #204073 on slot 3,  40 events processed so far  <<<===
 AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1134147, run #204073 on slot 0,  41 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  44  0      INFO   ===>>>  start processing event #1141705, run #204073 on slot 0,  41 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1137156, run #204073 on slot 3,  42 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1137156, run #204073 on slot 1,  42 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  43  0      INFO   ===>>>  start processing event #1137842, run #204073 on slot 0,  42 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  44  1      INFO   ===>>>  start processing event #1141705, run #204073 on slot 1,  42 events processed so far  <<<===
 AthenaHiveEventLoopMgr                  45  3      INFO   ===>>>  start processing event #1143410, run #204073 on slot 3,  42 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1136377, run #204073 on slot 1,  43 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  46  1      INFO   ===>>>  start processing event #1144170, run #204073 on slot 1,  43 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1137842, run #204073 on slot 2,  44 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  47  2      INFO   ===>>>  start processing event #1145987, run #204073 on slot 2,  44 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1141705, run #204073 on slot 0,  45 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  48  0      INFO   ===>>>  start processing event #1145633, run #204073 on slot 0,  45 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1136377, run #204073 on slot 2,  43 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1137842, run #204073 on slot 0,  44 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1141705, run #204073 on slot 1,  45 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  46  0      INFO   ===>>>  start processing event #1144170, run #204073 on slot 0,  45 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  47  1      INFO   ===>>>  start processing event #1145987, run #204073 on slot 1,  45 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  48  2      INFO   ===>>>  start processing event #1145633, run #204073 on slot 2,  45 events processed so far  <<<===
 AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1143410, run #204073 on slot 3,  46 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  49  3      INFO   ===>>>  start processing event #1135005, run #204073 on slot 3,  46 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1144170, run #204073 on slot 1,  47 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  50  1      INFO   ===>>>  start processing event #1142167, run #204073 on slot 1,  47 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1145987, run #204073 on slot 2,  48 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1145633, run #204073 on slot 0,  49 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  51  0      INFO   ===>>>  start processing event #1144646, run #204073 on slot 0,  49 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  52  2      INFO   ===>>>  start processing event #1145027, run #204073 on slot 2,  49 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1135005, run #204073 on slot 3,  50 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  53  3      INFO   ===>>>  start processing event #1144112, run #204073 on slot 3,  50 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1144170, run #204073 on slot 0,  47 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1145987, run #204073 on slot 1,  48 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  49  0      INFO   ===>>>  start processing event #1135005, run #204073 on slot 0,  48 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  50  1      INFO   ===>>>  start processing event #1142167, run #204073 on slot 1,  48 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  51  3      INFO   ===>>>  start processing event #1144646, run #204073 on slot 3,  48 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1145633, run #204073 on slot 2,  49 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1135005, run #204073 on slot 0,  50 events processed so far  <<<===
 AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1142167, run #204073 on slot 1,  51 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  54  1      INFO   ===>>>  start processing event #1138485, run #204073 on slot 1,  51 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1144646, run #204073 on slot 0,  52 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  55  0      INFO   ===>>>  start processing event #1144565, run #204073 on slot 0,  52 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1145027, run #204073 on slot 2,  53 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  56  2      INFO   ===>>>  start processing event #1139498, run #204073 on slot 2,  53 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1144112, run #204073 on slot 3,  54 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  52  0      INFO   ===>>>  start processing event #1145027, run #204073 on slot 0,  51 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  53  1      INFO   ===>>>  start processing event #1144112, run #204073 on slot 1,  51 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  54  2      INFO   ===>>>  start processing event #1138485, run #204073 on slot 2,  51 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1144646, run #204073 on slot 3,  52 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1145027, run #204073 on slot 0,  53 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1144112, run #204073 on slot 1,  54 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  55  0      INFO   ===>>>  start processing event #1144565, run #204073 on slot 0,  54 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  56  1      INFO   ===>>>  start processing event #1139498, run #204073 on slot 1,  54 events processed so far  <<<===
 AthenaHiveEventLoopMgr                  57  3      INFO   ===>>>  start processing event #1136546, run #204073 on slot 3,  54 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1138485, run #204073 on slot 1,  55 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  58  1      INFO   ===>>>  start processing event #1143799, run #204073 on slot 1,  55 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1138485, run #204073 on slot 2,  55 events processed so far  <<<===
 AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1144565, run #204073 on slot 0,  56 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  59  0      INFO   ===>>>  start processing event #1142877, run #204073 on slot 0,  56 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1139498, run #204073 on slot 2,  57 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1139498, run #204073 on slot 1,  57 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  58  0      INFO   ===>>>  start processing event #1143799, run #204073 on slot 0,  57 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  59  1      INFO   ===>>>  start processing event #1142877, run #204073 on slot 1,  57 events processed so far  <<<===
 AthenaHiveEventLoopMgr                  60  2      INFO   ===>>>  start processing event #1149894, run #204073 on slot 2,  57 events processed so far  <<<===
 AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1136546, run #204073 on slot 3,  58 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1143799, run #204073 on slot 1,  59 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  61  1      INFO   ===>>>  start processing event #1145364, run #204073 on slot 1,  59 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  62  3      INFO   ===>>>  start processing event #1143770, run #204073 on slot 3,  59 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1142877, run #204073 on slot 0,  60 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  63  0      INFO   ===>>>  start processing event #1148361, run #204073 on slot 0,  60 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1143799, run #204073 on slot 0,  59 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1142877, run #204073 on slot 1,  60 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  61  0      INFO   ===>>>  start processing event #1145364, run #204073 on slot 0,  60 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  62  1      INFO   ===>>>  start processing event #1143770, run #204073 on slot 1,  60 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  63  3      INFO   ===>>>  start processing event #1148361, run #204073 on slot 3,  60 events processed so far  <<<===
 AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1149894, run #204073 on slot 2,  61 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1145364, run #204073 on slot 1,  62 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  64  1      INFO   ===>>>  start processing event #1148167, run #204073 on slot 1,  62 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  65  2      INFO   ===>>>  start processing event #1138948, run #204073 on slot 2,  62 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1143770, run #204073 on slot 3,  63 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  66  3      INFO   ===>>>  start processing event #1144808, run #204073 on slot 3,  63 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1148361, run #204073 on slot 0,  64 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  67  0      INFO   ===>>>  start processing event #1145832, run #204073 on slot 0,  64 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1148167, run #204073 on slot 1,  65 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  68  1      INFO   ===>>>  start processing event #1153100, run #204073 on slot 1,  65 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1138948, run #204073 on slot 2,  66 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  69  2      INFO   ===>>>  start processing event #1142524, run #204073 on slot 2,  66 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1144808, run #204073 on slot 3,  67 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  70  3      INFO   ===>>>  start processing event #1138294, run #204073 on slot 3,  67 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1153100, run #204073 on slot 1,  68 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  71  1      INFO   ===>>>  start processing event #1138350, run #204073 on slot 1,  68 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1145832, run #204073 on slot 0,  69 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  72  0      INFO   ===>>>  start processing event #1149424, run #204073 on slot 0,  69 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1142524, run #204073 on slot 2,  70 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  73  2      INFO   ===>>>  start processing event #1151102, run #204073 on slot 2,  70 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1138294, run #204073 on slot 3,  71 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  74  3      INFO   ===>>>  start processing event #1152242, run #204073 on slot 3,  71 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1145364, run #204073 on slot 0,  62 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1143770, run #204073 on slot 1,  63 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  64  0      INFO   ===>>>  start processing event #1148167, run #204073 on slot 0,  63 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  65  1      INFO   ===>>>  start processing event #1138948, run #204073 on slot 1,  63 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  66  2      INFO   ===>>>  start processing event #1144808, run #204073 on slot 2,  63 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1148361, run #204073 on slot 3,  64 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1148167, run #204073 on slot 0,  65 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1138948, run #204073 on slot 1,  66 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  67  0      INFO   ===>>>  start processing event #1145832, run #204073 on slot 0,  66 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  68  1      INFO   ===>>>  start processing event #1153100, run #204073 on slot 1,  66 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  69  3      INFO   ===>>>  start processing event #1142524, run #204073 on slot 3,  66 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1144808, run #204073 on slot 2,  67 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1145832, run #204073 on slot 0,  68 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1153100, run #204073 on slot 1,  69 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  70  0      INFO   ===>>>  start processing event #1138294, run #204073 on slot 0,  69 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  71  1      INFO   ===>>>  start processing event #1138350, run #204073 on slot 1,  69 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  72  2      INFO   ===>>>  start processing event #1149424, run #204073 on slot 2,  69 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1142524, run #204073 on slot 3,  70 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1138294, run #204073 on slot 0,  71 events processed so far  <<<===
 AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1138350, run #204073 on slot 1,  72 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  75  1      INFO   ===>>>  start processing event #1148416, run #204073 on slot 1,  72 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1149424, run #204073 on slot 0,  73 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  76  0      INFO   ===>>>  start processing event #1142753, run #204073 on slot 0,  73 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1151102, run #204073 on slot 2,  74 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  77  2      INFO   ===>>>  start processing event #1149997, run #204073 on slot 2,  74 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1152242, run #204073 on slot 3,  75 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  78  3      INFO   ===>>>  start processing event #1151617, run #204073 on slot 3,  75 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1148416, run #204073 on slot 1,  76 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  79  1      INFO   ===>>>  start processing event #1149794, run #204073 on slot 1,  76 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  73  0      INFO   ===>>>  start processing event #1151102, run #204073 on slot 0,  72 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  74  1      INFO   ===>>>  start processing event #1152242, run #204073 on slot 1,  72 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  75  3      INFO   ===>>>  start processing event #1148416, run #204073 on slot 3,  72 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1149424, run #204073 on slot 2,  73 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1151102, run #204073 on slot 0,  74 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1152242, run #204073 on slot 1,  75 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  76  0      INFO   ===>>>  start processing event #1142753, run #204073 on slot 0,  75 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  77  1      INFO   ===>>>  start processing event #1149997, run #204073 on slot 1,  75 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  78  2      INFO   ===>>>  start processing event #1151617, run #204073 on slot 2,  75 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1148416, run #204073 on slot 3,  76 events processed so far  <<<===
 AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1142753, run #204073 on slot 0,  77 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1149997, run #204073 on slot 2,  78 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  80  0      INFO   ===>>>  start processing event #1152504, run #204073 on slot 0,  78 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  81  2      INFO   ===>>>  start processing event #1142485, run #204073 on slot 2,  78 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1151617, run #204073 on slot 3,  79 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  82  3      INFO   ===>>>  start processing event #1151364, run #204073 on slot 3,  79 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1149794, run #204073 on slot 1,  80 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  83  1      INFO   ===>>>  start processing event #1143901, run #204073 on slot 1,  80 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1152504, run #204073 on slot 0,  81 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  84  0      INFO   ===>>>  start processing event #1153979, run #204073 on slot 0,  81 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1142485, run #204073 on slot 2,  82 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  85  2      INFO   ===>>>  start processing event #1150212, run #204073 on slot 2,  82 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1151364, run #204073 on slot 3,  83 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  86  3      INFO   ===>>>  start processing event #1152633, run #204073 on slot 3,  83 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1149997, run #204073 on slot 1,  78 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  79  0      INFO   ===>>>  start processing event #1149794, run #204073 on slot 0,  78 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  80  1      INFO   ===>>>  start processing event #1152504, run #204073 on slot 1,  78 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  81  3      INFO   ===>>>  start processing event #1142485, run #204073 on slot 3,  78 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1151617, run #204073 on slot 2,  79 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1149794, run #204073 on slot 0,  80 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1152504, run #204073 on slot 1,  81 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  82  0      INFO   ===>>>  start processing event #1151364, run #204073 on slot 0,  81 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  83  1      INFO   ===>>>  start processing event #1143901, run #204073 on slot 1,  81 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  84  2      INFO   ===>>>  start processing event #1153979, run #204073 on slot 2,  81 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1142485, run #204073 on slot 3,  82 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1151364, run #204073 on slot 0,  83 events processed so far  <<<===
 AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1143901, run #204073 on slot 1,  84 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  87  1      INFO   ===>>>  start processing event #1155482, run #204073 on slot 1,  84 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1153979, run #204073 on slot 0,  85 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  88  0      INFO   ===>>>  start processing event #1150472, run #204073 on slot 0,  85 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1150212, run #204073 on slot 2,  86 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  89  2      INFO   ===>>>  start processing event #1140275, run #204073 on slot 2,  86 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1152633, run #204073 on slot 3,  87 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  90  3      INFO   ===>>>  start processing event #1145882, run #204073 on slot 3,  87 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1155482, run #204073 on slot 1,  88 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  91  1      INFO   ===>>>  start processing event #1151732, run #204073 on slot 1,  88 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  85  0      INFO   ===>>>  start processing event #1150212, run #204073 on slot 0,  84 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  86  1      INFO   ===>>>  start processing event #1152633, run #204073 on slot 1,  84 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  87  3      INFO   ===>>>  start processing event #1155482, run #204073 on slot 3,  84 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1153979, run #204073 on slot 2,  85 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1150212, run #204073 on slot 0,  86 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1152633, run #204073 on slot 1,  87 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  88  0      INFO   ===>>>  start processing event #1150472, run #204073 on slot 0,  87 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  89  1      INFO   ===>>>  start processing event #1140275, run #204073 on slot 1,  87 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  90  2      INFO   ===>>>  start processing event #1145882, run #204073 on slot 2,  87 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1155482, run #204073 on slot 3,  88 events processed so far  <<<===
 AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1150472, run #204073 on slot 0,  89 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  92  0      INFO   ===>>>  start processing event #1137896, run #204073 on slot 0,  89 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1140275, run #204073 on slot 2,  90 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  93  2      INFO   ===>>>  start processing event #1156381, run #204073 on slot 2,  90 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1145882, run #204073 on slot 3,  91 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  94  3      INFO   ===>>>  start processing event #1149161, run #204073 on slot 3,  91 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1151732, run #204073 on slot 1,  92 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1137896, run #204073 on slot 0,  93 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  95  0      INFO   ===>>>  start processing event #1153794, run #204073 on slot 0,  93 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  96  1      INFO   ===>>>  start processing event #1151312, run #204073 on slot 1,  93 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1156381, run #204073 on slot 2,  94 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  97  2      INFO   ===>>>  start processing event #1148893, run #204073 on slot 2,  94 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1149161, run #204073 on slot 3,  95 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  98  3      INFO   ===>>>  start processing event #1156938, run #204073 on slot 3,  95 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1153794, run #204073 on slot 0,  96 events processed so far  <<<===
-AthenaHiveEventLoopMgr                  99  0      INFO   ===>>>  start processing event #1156351, run #204073 on slot 0,  96 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1151312, run #204073 on slot 1,  97 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1148893, run #204073 on slot 2,  98 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1156938, run #204073 on slot 3,  99 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1156351, run #204073 on slot 0,  100 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO ---> Loop Finished (seconds): 27.2973
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1140275, run #204073 on slot 1,  90 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  91  0      INFO   ===>>>  start processing event #1151732, run #204073 on slot 0,  90 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  92  1      INFO   ===>>>  start processing event #1137896, run #204073 on slot 1,  90 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  93  3      INFO   ===>>>  start processing event #1156381, run #204073 on slot 3,  90 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1145882, run #204073 on slot 2,  91 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1151732, run #204073 on slot 0,  92 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1137896, run #204073 on slot 1,  93 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  94  0      INFO   ===>>>  start processing event #1149161, run #204073 on slot 0,  93 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  95  1      INFO   ===>>>  start processing event #1153794, run #204073 on slot 1,  93 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  96  2      INFO   ===>>>  start processing event #1151312, run #204073 on slot 2,  93 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1156381, run #204073 on slot 3,  94 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1149161, run #204073 on slot 0,  95 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1153794, run #204073 on slot 1,  96 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  97  0      INFO   ===>>>  start processing event #1148893, run #204073 on slot 0,  96 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  98  1      INFO   ===>>>  start processing event #1156938, run #204073 on slot 1,  96 events processed so far  <<<===
+AthenaHiveEventLoopMgr                  99  3      INFO   ===>>>  start processing event #1156351, run #204073 on slot 3,  96 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1151312, run #204073 on slot 2,  97 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1148893, run #204073 on slot 0,  98 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1156938, run #204073 on slot 1,  99 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #1156351, run #204073 on slot 3,  100 events processed so far  <<<===
+AthenaHiveEventLoopMgr                             INFO ---> Loop Finished (seconds): 7.06755
 /cvmfs/atlas-condb.cern.ch/repo/condi...           INFO Database being retired...
 Domain[ROOT_All]                                   INFO ->  Deaccess DbDatabase   READ      [ROOT_All] 06C9EAE8-6F5B-E011-BAAA-003048F0E7AC
 /cvmfs/atlas-condb.cern.ch/repo/condi...           INFO Database being retired...
@@ -1317,14 +1312,12 @@ Finalizer                                          INFO Finalizing Finalizer...
 Finalize: compared 20 dumps
 CondInputLoader                                    INFO Finalizing CondInputLoader...
 IncidentProcAlg2                                   INFO Finalize
-StoreGateSvc                                    WARNING Called record() on these objects in a MT store
-StoreGateSvc                                    WARNING TileRawChannelContainer/MuRcvRawChCnt [TileRawChannelDumper/MuRcvRawChannelCntDumper]
 EventInfoByteStreamCnv                             INFO finalize 
 AvalancheSchedulerSvc                              INFO Joining Scheduler thread
 PyComponentMgr                                     INFO Finalizing PyComponentMgr...
 IdDictDetDescrCnv                                  INFO in finalize
 EventDataSvc                                       INFO Finalizing EventDataSvc - package version StoreGate-00-00-00
-IOVDbFolder                                        INFO Folder /LAR/Align (PoolRef) db-read 1/1 objs/chan/bytes 1/1/340 ((     0.14 ))s
+IOVDbFolder                                        INFO Folder /LAR/Align (PoolRef) db-read 1/1 objs/chan/bytes 1/1/340 ((     1.30 ))s
 IOVDbFolder                                        INFO Folder /TILE/OFL02/CALIB/CES (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 ((     0.00 ))s
 IOVDbFolder                                        INFO Folder /TILE/OFL02/CALIB/CIS/FIT/LIN (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 ((     0.00 ))s
 IOVDbFolder                                        INFO Folder /TILE/OFL02/CALIB/CIS/FIT/NLN (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 ((     0.00 ))s
@@ -1336,10 +1329,10 @@ IOVDbFolder                                        INFO Folder /TILE/OFL02/NOISE
 IOVDbFolder                                        INFO Folder /TILE/OFL02/STATUS/ADC (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 ((     0.00 ))s
 IOVDbFolder                                        INFO Folder /TILE/OFL02/TIME/CHANNELOFFSET/PHY (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 ((     0.00 ))s
 IOVDbFolder                                        INFO Folder /TILE/ONL01/STATUS/ADC (AttrListColl) db-read 0/0 objs/chan/bytes 0/277/0 ((     0.00 ))s
-IOVDbFolder                                        INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 1/1 objs/chan/bytes 1/1/390 ((     0.09 ))s
-IOVDbSvc                                           INFO  bytes in ((      0.23 ))s
+IOVDbFolder                                        INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 1/1 objs/chan/bytes 1/1/390 ((     0.90 ))s
+IOVDbSvc                                           INFO  bytes in ((      2.20 ))s
 IOVDbSvc                                           INFO Connection sqlite://;schema=mycool.db;dbname=OFLP200 : nConnect: 0 nFolders: 0 ReadTime: ((     0.00 ))s
-IOVDbSvc                                           INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 2 nFolders: 2 ReadTime: ((     0.23 ))s
+IOVDbSvc                                           INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 2 nFolders: 2 ReadTime: ((     2.20 ))s
 IOVDbSvc                                           INFO Connection COOLOFL_TILE/OFLP200 : nConnect: 1 nFolders: 11 ReadTime: ((     0.00 ))s
 TileInfoLoader                                     INFO TileInfoLoader::finalize()
 AthDictLoaderSvc                                   INFO in finalize...
@@ -1348,11 +1341,12 @@ ToolSvc.ByteStreamMetadataTool                     INFO in finalize()
 ToolSvc.TileRawChannelContByteStreamTool           INFO Finalizing TileRawChannelContByteStreamTool successfuly
 ToolSvc.TileROD_Decoder.TileROD_L2Bui...           INFO Finalizing
 *****Chrono*****                                   INFO ****************************************************************************************************
+*****Chrono*****                                   INFO WARNING: MT job; statistics are unreliable
 *****Chrono*****                                   INFO  The Final CPU consumption ( Chrono ) Table (ordered)
 *****Chrono*****                                   INFO ****************************************************************************************************
-cObjR_ALL                                          INFO Time User   : Tot= 1.05  [s] Ave/Min/Max=0.525(+-0.505)/ 0.02/ 1.03  [s] #=  2
-cObj_ALL                                           INFO Time User   : Tot= 1.33  [s] Ave/Min/Max=0.665(+-0.485)/ 0.18/ 1.15  [s] #=  2
-ChronoStatSvc                                      INFO Time User   : Tot= 40.2  [s]                                             #=  1
+cObjR_ALL                                          INFO Time User   : Tot=  270 [ms] Ave/Min/Max=  135(+-  135)/    0/  270 [ms] #=  2
+cObj_ALL                                           INFO Time User   : Tot=  360 [ms] Ave/Min/Max=  180(+-  130)/   50/  310 [ms] #=  2
+ChronoStatSvc                                      INFO Time User   : Tot= 8.19  [s]                                             #=  1
 *****Chrono*****                                   INFO ****************************************************************************************************
 ChronoStatSvc.finalize()                           INFO  Service finalized successfully 
 ApplicationMgr                                     INFO Application Manager Finalized successfully
diff --git a/TileCalorimeter/TileSvc/TileByteStream/src/TileDigitsContByteStreamCnv.cxx b/TileCalorimeter/TileSvc/TileByteStream/src/TileDigitsContByteStreamCnv.cxx
index 14ffca14625428127ce5386f60f5ec6d97f5a8e0..042981523935eba418722055d22707416de06557 100644
--- a/TileCalorimeter/TileSvc/TileByteStream/src/TileDigitsContByteStreamCnv.cxx
+++ b/TileCalorimeter/TileSvc/TileByteStream/src/TileDigitsContByteStreamCnv.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 // Gaudi includes
@@ -21,7 +21,6 @@
 #include "ByteStreamCnvSvcBase/ROBDataProviderSvc.h"
 #include "ByteStreamData/RawEvent.h" 
 
-#include "StoreGate/ActiveStoreSvc.h"
 #include "StoreGate/StoreClearedIncident.h"
 #include "AthenaKernel/CLASS_DEF.h"
 
@@ -46,7 +45,6 @@ TileDigitsContByteStreamCnv::TileDigitsContByteStreamCnv(ISvcLocator* svcloc)
   , m_tool("TileDigitsContByteStreamTool")
   , m_byteStreamEventAccess("ByteStreamCnvSvc", m_name)
   , m_byteStreamCnvSvc(0)
-  , m_activeStore("ActiveStoreSvc", m_name)
   , m_robSvc("ROBDataProviderSvc", m_name)
   , m_decoder("TileROD_Decoder")
   , m_hid2re(0)
@@ -74,7 +72,6 @@ StatusCode TileDigitsContByteStreamCnv::initialize() {
 
   ATH_CHECK( m_robSvc.retrieve() );
 
-  ATH_CHECK( m_activeStore.retrieve() );
   
   return StatusCode::SUCCESS;
 }
@@ -90,61 +87,58 @@ StatusCode TileDigitsContByteStreamCnv::createObj(IOpaqueAddress* pAddr, DataObj
     return StatusCode::FAILURE;    
   }
 
-  uint32_t newrob = 0x0;
+  const std::string containerName(*(pRE_Addr->par()));
+  bool isTMDB(containerName == "MuRcvDigitsCnt");
 
-  for (int icnt = 0; icnt < 2; ++icnt) {
+  uint32_t newrob = 0x0;
 
-    bool isTMDB(icnt == 1);
 
-    std::vector<uint32_t> robid(1); 
-    robid[0] = 0;
-    std::vector<const ROBDataProviderSvc::ROBF*> robf;
+  std::vector<uint32_t> robid(1);
+  robid[0] = 0;
+  std::vector<const ROBDataProviderSvc::ROBF*> robf;
 
-    TileMutableDigitsContainer* cont = m_queue.get (true);
-    ATH_CHECK( cont->status() );
+  TileMutableDigitsContainer* cont = m_queue.get (true);
+  ATH_CHECK( cont->status() );
     
-    // iterate over all collections in a container and fill them
-    //
-    for (IdentifierHash hash : cont->GetAllCurrentHashes()) {
-      TileDigitsCollection* digitsCollection = cont->indexFindPtr (hash);
-      digitsCollection->clear();
-      TileDigitsCollection::ID collID = digitsCollection->identify();  
+  // iterate over all collections in a container and fill them
+  //
+  for (IdentifierHash hash : cont->GetAllCurrentHashes()) {
+    TileDigitsCollection* digitsCollection = cont->indexFindPtr (hash);
+    digitsCollection->clear();
+    TileDigitsCollection::ID collID = digitsCollection->identify();
       
-      // find ROB
-      if (isTMDB) {
-        newrob = m_hid2re->getRobFromTileMuRcvFragID(collID);
-      } else {
-        newrob = m_hid2re->getRobFromFragID(collID);
-      }
+    // find ROB
+    if (isTMDB) {
+      newrob = m_hid2re->getRobFromTileMuRcvFragID(collID);
+    } else {
+      newrob = m_hid2re->getRobFromFragID(collID);
+    }
 
-      if (newrob != robid[0]) {
-        robid[0] = newrob;
-        robf.clear();
-        m_robSvc->getROBData(robid, robf);
-      }
+    if (newrob != robid[0]) {
+      robid[0] = newrob;
+      robf.clear();
+      m_robSvc->getROBData(robid, robf);
+    }
       
-      if (robf.size() > 0 ) {
-        if (isTMDB) {// reid for TMDB 0x5x010x
-          ATH_MSG_DEBUG(" Decoding TMDB digits in ROD fragment ");
-          m_decoder->fillCollection_TileMuRcv_Digi(robf[0], *digitsCollection);
-        } else {
-          m_decoder->fillCollection(robf[0], *digitsCollection);
-        }
+    if (robf.size() > 0 ) {
+      if (isTMDB) {// reid for TMDB 0x5x010x
+        ATH_MSG_DEBUG(" Decoding TMDB digits in ROD fragment ");
+        m_decoder->fillCollection_TileMuRcv_Digi(robf[0], *digitsCollection);
       } else {
-        digitsCollection->setFragBCID((TileROD_Decoder::NO_ROB)<<16);
+        m_decoder->fillCollection(robf[0], *digitsCollection);
       }
+    } else {
+      digitsCollection->setFragBCID((TileROD_Decoder::NO_ROB)<<16);
     }
 
-    ATH_MSG_DEBUG( "Creating digits container " << *(pRE_Addr->par()) );
 
-    TileDigitsContainer* basecont = cont;
-    if (isTMDB) {
-      ATH_CHECK( m_activeStore->activeStore()->record( basecont, "MuRcvDigitsCnt" ) );
-    } else {
-      pObj = SG::asStorable( basecont ) ;
-    }
   }
 
+  ATH_MSG_DEBUG( "Creating digits container: " << containerName );
+
+  TileDigitsContainer* basecont = cont;
+  pObj = SG::asStorable( basecont ) ;
+
 
   return StatusCode::SUCCESS;  
 }
diff --git a/TileCalorimeter/TileSvc/TileByteStream/src/TileRawChannelContByteStreamCnv.cxx b/TileCalorimeter/TileSvc/TileByteStream/src/TileRawChannelContByteStreamCnv.cxx
index c75ee42be3008a102661f715fdc14dfb9747b9e3..517090ed689b993b0d66a5057306b72c83288ba0 100644
--- a/TileCalorimeter/TileSvc/TileByteStream/src/TileRawChannelContByteStreamCnv.cxx
+++ b/TileCalorimeter/TileSvc/TileByteStream/src/TileRawChannelContByteStreamCnv.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 // Gaudi includes
@@ -20,7 +20,6 @@
 #include "ByteStreamCnvSvcBase/ROBDataProviderSvc.h"
 #include "ByteStreamData/RawEvent.h" 
 
-#include "StoreGate/ActiveStoreSvc.h"
 #include "StoreGate/StoreClearedIncident.h"
 #include "AthenaKernel/CLASS_DEF.h"
 
@@ -42,7 +41,6 @@ TileRawChannelContByteStreamCnv::TileRawChannelContByteStreamCnv(ISvcLocator* sv
   , m_tool("TileRawChannelContByteStreamTool")
   , m_byteStreamEventAccess("ByteStreamCnvSvc", m_name)
   , m_byteStreamCnvSvc(0)
-  , m_activeStore("ActiveStoreSvc", m_name)
   , m_robSvc("ROBDataProviderSvc", m_name)
   , m_decoder("TileROD_Decoder")
   , m_hid2re(0)
@@ -69,8 +67,6 @@ StatusCode TileRawChannelContByteStreamCnv::initialize() {
 
   ATH_CHECK( m_robSvc.retrieve() );
 
-  ATH_CHECK( m_activeStore.retrieve() );
-
   return StatusCode::SUCCESS;
 }
 
@@ -86,67 +82,62 @@ StatusCode TileRawChannelContByteStreamCnv::createObj(IOpaqueAddress* pAddr, Dat
     return StatusCode::FAILURE;    
   }
 
-  uint32_t newrob = 0x0;
+  const std::string containerName(*(pRE_Addr->par()));
+  bool isTMDB(containerName == "MuRcvRawChCnt");
 
-  for (int icnt = 0; icnt < 2; ++icnt) {
+  uint32_t newrob = 0x0;
 
-    bool isTMDB = (icnt == 1);
     
-    std::vector<uint32_t> robid(1); 
-    robid[0] = 0;
-    std::vector<const ROBDataProviderSvc::ROBF*> robf;
+  std::vector<uint32_t> robid(1);
+  robid[0] = 0;
+  std::vector<const ROBDataProviderSvc::ROBF*> robf;
 
-    TileMutableRawChannelContainer* cont = m_queue.get (true);
-    ATH_CHECK( cont->status() );
+  TileMutableRawChannelContainer* cont = m_queue.get (true);
+  ATH_CHECK( cont->status() );
 
-    if (isTMDB) {
-      cont->set_type (TileFragHash::MF);
-    }
-    else {
-      cont->set_type (TileFragHash::OptFilterDsp);
-    }
+  if (isTMDB) {
+    cont->set_type (TileFragHash::MF);
+  } else {
+    cont->set_type (TileFragHash::OptFilterDsp);
+  }
 
-    // iterate over all collections in a container and fill them
-    for (IdentifierHash hash : cont->GetAllCurrentHashes()) {
-      TileRawChannelCollection* rawChannelCollection = cont->indexFindPtr (hash);
-      rawChannelCollection->clear();
-      TileRawChannelCollection::ID collID = rawChannelCollection->identify();  
+  // iterate over all collections in a container and fill them
+  for (IdentifierHash hash : cont->GetAllCurrentHashes()) {
+    TileRawChannelCollection* rawChannelCollection = cont->indexFindPtr (hash);
+    rawChannelCollection->clear();
+    TileRawChannelCollection::ID collID = rawChannelCollection->identify();
 
-      // find ROB
-      if (isTMDB) {
-        newrob = m_hid2re->getRobFromTileMuRcvFragID(collID);
-      } else {
-        newrob = m_hid2re->getRobFromFragID(collID);
-      }
+    // find ROB
+    if (isTMDB) {
+      newrob = m_hid2re->getRobFromTileMuRcvFragID(collID);
+    } else {
+      newrob = m_hid2re->getRobFromFragID(collID);
+    }
 
-      if (newrob != robid[0]) {
-        robid[0] = newrob;
-        robf.clear();
-        m_robSvc->getROBData(robid, robf);
-      }
+    if (newrob != robid[0]) {
+      robid[0] = newrob;
+      robf.clear();
+      m_robSvc->getROBData(robid, robf);
+    }
     
-      // unpack ROB data
-      if (robf.size() > 0 ) {
-        if (isTMDB) {// reid for TMDB 0x5x010x
-	  m_decoder->fillCollection_TileMuRcv_RawChannel(robf[0], *rawChannelCollection);
-        } else {
-          m_decoder->fillCollection(robf[0], *rawChannelCollection, cont);
-        }
+    // unpack ROB data
+    if (robf.size() > 0 ) {
+      if (isTMDB) {// reid for TMDB 0x5x010x
+        m_decoder->fillCollection_TileMuRcv_RawChannel(robf[0], *rawChannelCollection);
       } else {
-        rawChannelCollection->setFragGlobalCRC(TileROD_Decoder::NO_ROB);
+        m_decoder->fillCollection(robf[0], *rawChannelCollection, cont);
       }
-    }
-
-    ATH_MSG_DEBUG( "Creating Container " << *(pRE_Addr->par()) );  
-
-    TileRawChannelContainer* basecont = cont;
-    if (isTMDB) {
-      ATH_CHECK( m_activeStore->activeStore()->record( basecont, "MuRcvRawChCnt" ) );
     } else {
-      pObj = SG::asStorable( basecont );
+      rawChannelCollection->setFragGlobalCRC(TileROD_Decoder::NO_ROB);
     }
   }
 
+  ATH_MSG_DEBUG( "Creating raw channel container: " << containerName );
+
+  TileRawChannelContainer* basecont = cont;
+  pObj = SG::asStorable( basecont );
+
+
   return StatusCode::SUCCESS;  
 }
 
diff --git a/TileCalorimeter/TileTrackingGeometry/src/TileVolumeBuilder.cxx b/TileCalorimeter/TileTrackingGeometry/src/TileVolumeBuilder.cxx
index 17da0de671113224c4b85ffbbdd67ab400def605..52d0e521ea527fb733755ac31c4dcf8ba8b2e3f7 100755
--- a/TileCalorimeter/TileTrackingGeometry/src/TileVolumeBuilder.cxx
+++ b/TileCalorimeter/TileTrackingGeometry/src/TileVolumeBuilder.cxx
@@ -50,11 +50,12 @@
 #include "TrkSurfaces/DiscBounds.h"
 // Gaudi
 #include "GaudiKernel/MsgStream.h"
+#include "GaudiKernel/SystemOfUnits.h"
 // StoreGate
 #include "StoreGate/StoreGateSvc.h"
 #include "CxxUtils/make_unique.h"
 
-using GeoModelKernelUnits::mm;
+using Gaudi::Units::mm;
 using CxxUtils::make_unique;
 
 // constructor
diff --git a/Tools/ChkLib/CMakeLists.txt b/Tools/ChkLib/CMakeLists.txt
deleted file mode 100644
index e254db8245ed728a2de438b4f870d64db578f608..0000000000000000000000000000000000000000
--- a/Tools/ChkLib/CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-################################################################################
-# Package: ChkLib
-################################################################################
-
-# Declare the package name:
-atlas_subdir( ChkLib )
-
-# Component(s) in the package:
-atlas_add_executable( ChkLib
-                      src/ChkLib.cxx )
-
-# Install files from the package:
-atlas_install_runtime( share/*.files share/*.symbols )
-
diff --git a/Tools/ChkLib/doc/README b/Tools/ChkLib/doc/README
deleted file mode 100755
index 7130d08ccfc7fc0b07ce02348462929b4681bed8..0000000000000000000000000000000000000000
--- a/Tools/ChkLib/doc/README
+++ /dev/null
@@ -1,37 +0,0 @@
-
-                 ChkLib - Check for undefined symbols
-
-  Author: Fredrik Akesson (fredrik.akesson@cern.ch)
-  Start:  19.01.2004
-
- --------------------------------------------------------------------------- 
-
- Athena might crash for several reasons. If it crashes with an error message
- complaining about a missing symbol you might check the symbols with ChkLib.
- If the same symbol is not shown as unresolved by the script it is probably
- a 'use' statement missing somewhere. If Athena crashes with a message like
- 'blabla probably not built as a component library' it is more likely that 
- you will find the perpetrator with ChkLib.
-
- If you encounter a number of unresolved symbols in the InstallArea: Don't
- panic. Check if they belong to your package or if they belong to some other
- package of the atlas release. Normally the unresolved symbols from other
- packages can be ignored and are resolved when linking. This program just
- looks into the InstallArea and takes whatever .so files it can find. Not
- more. I do not know if it is worth going through LD_LIBRARY_PATH and to 
- check every library for the missing symbols. I have put the symbols which
- contains certain keywords into the 'Ignore-list' hardcoded into the 
- program. The existing setup works fine for me ...
-
- NOTE: Since the program uses the 'system' call I guess that there might
- be differences for different shells. I am using zsh, and it works.
-
- Comments and remarks are welcome. Have fun saving time hunting down 
- 'not built as a component library' errors.
-
- TODO: - The use of map could be done for ignored and resolved symbols as
-         well. 
-       - Maybe I should introduce a switch if somebody wants to go
-         through the whole LD_LIBRARY_PATH.
-
- ---------------------------------------------------------------------------
diff --git a/Tools/ChkLib/share/chklib_external.files b/Tools/ChkLib/share/chklib_external.files
deleted file mode 100755
index 50831d49c44bdf3a36aec50a29f0215ebc1eaca3..0000000000000000000000000000000000000000
--- a/Tools/ChkLib/share/chklib_external.files
+++ /dev/null
@@ -1,2 +0,0 @@
-/afs/cern.ch/sw/lhcxx/specific/redhat73/gcc-3.2/CLHEP/1.8.2.0/lib/libCLHEP.so
-/usr/local/gcc-alt-3.2/lib/libstdc++.so
diff --git a/Tools/ChkLib/share/chklib_ignore.files b/Tools/ChkLib/share/chklib_ignore.files
deleted file mode 100755
index 175fb3da690cb67c0125e78f82b0058852f125ae..0000000000000000000000000000000000000000
--- a/Tools/ChkLib/share/chklib_ignore.files
+++ /dev/null
@@ -1,13 +0,0 @@
-libGaudiSvc.so
-libgaudimodule.so
-libGaudiGSL.so
-libAtlsim.so
-libHbookCnv.so
-libRootHistCnv.so
-libTBlob.so
-libRootKernel.so
-libRootGateLib.so
-libatlroot.so
-libRootSvcModulesLib.so
-libatlprod.so
-libapythia.so
diff --git a/Tools/ChkLib/share/chklib_ignore.symbols b/Tools/ChkLib/share/chklib_ignore.symbols
deleted file mode 100755
index 5d6ad848a6b45b4e825e14df48033ad118597f0e..0000000000000000000000000000000000000000
--- a/Tools/ChkLib/share/chklib_ignore.symbols
+++ /dev/null
@@ -1,162 +0,0 @@
-GLIBC
-CXXABI
-GCC
-cxxabi
-AlgTool
-HepVector
-HepMatrix
-CBNT
-HepSymMatrix
-_Unwind_
-HepGenMatrix
-DataSvc
-HepRotation
-DataObject
-CLID
-Algorithm
-SimplePropertyRef
-dynamic_cast
-DataProxy
-Genfun
-NullVerifier
-NTuple
-Hep3Vector
-FactoryTable
-StoreGateSvc
-MsgStream
-ActiveStoreSvc
-System
-Property
-Service
-HepPDT
-HepRandum
-HepRotate
-HepDiagMatrix
-HepRandom
-HepRotate3D
-HepRotationX
-HepRotationY
-HepRotationZ
-HepTool
-QApplication
-QBrush
-QColor
-QFrame
-QKeySequence
-QMenuData
-QMessageBox
-QMetaObject
-QMetaObjectCleanUp
-QObject
-QPaintDevice
-QPainter
-QPen
-QPixmap
-QPopupMenu
-QRect
-QString
-QStringData
-QWidget
-XAllocColor
-XBell
-XChangeWindowAttributes
-XClearWindow
-XCloseDisplay
-XCopyArea
-XCopyGC
-XCreateBitmapFromData
-XCreateFontCursor
-XCreateGC
-XCreateImage
-XCreateWindow
-XDefineCursor
-XDestroyWindow
-XDrawArc
-XDrawImageString
-XDrawLine
-XDrawLines
-XDrawPoint
-XDrawPoints
-XDrawRectangle
-XDrawSegments
-XDrawString
-XEventsQueued
-XFillArc
-XFillPolygon
-XFillRectangle
-XFlush
-XFree
-XFreeColors
-XFreeFont
-XFreeFontNames
-XFreeGC
-XFreePixmap
-XGetAtomName
-XGetGCValues
-XGetGeometry
-XGetImage
-XGetInputFocus
-XGetKeyboardControl
-XGetPixel
-XGetSubImage
-XInternAtom
-XListFonts
-XLoadQueryFont
-XLookupString
-XMapWindow
-XMoveWindow
-XNextEvent
-XOpenDisplay
-XPutImage
-XPutPixel
-XQueryColors
-XQueryPointer
-XRaiseWindow
-XResizeWindow
-XServerVendor
-XSetBackground
-XSetClassHint
-XSetClipMask
-XSetClipRectangles
-XSetDashes
-XSetFillStyle
-XSetFont
-XSetForeground
-XSetFunction
-XSetIconName
-XSetInputFocus
-XSetLineAttributes
-XSetNormalHints
-XSetStipple
-XSetTSOrigin
-XSetWMHints
-XSetWMProtocols
-XSetWindowBackground
-XStoreName
-XSync
-XSynchronize
-XTextExtents
-XTextWidth
-XTranslateCoordinates
-XUndefineCursor
-XWarpPointer
-XWindowEvent
-XWriteBitmapFile
-XmCreateCascadeButton
-XmCreatePulldownMenu
-XmCreatePushButton
-XmCreateToggleButton
-XmStringCreateSimple
-XtAddCallback
-XtAppProcessEvent
-XtManageChild
-XtParent
-XtSetValues
-XtUnmanageChild
-pool::
-boost::
-mysql_
-seal::
-std::
-XCreatePixmap
-XCreatePixmapCursor
diff --git a/Tools/ChkLib/src/ChkLib.cxx b/Tools/ChkLib/src/ChkLib.cxx
deleted file mode 100755
index f3d3535ff7600943f7d47a5252a060425d1592f3..0000000000000000000000000000000000000000
--- a/Tools/ChkLib/src/ChkLib.cxx
+++ /dev/null
@@ -1,499 +0,0 @@
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-/* ---------------------------------------------------------------------------
- *                 chklib - Check for undefined symbols
- *
- *  Author: Fredrik Akesson (fredrik.akesson@cern.ch)
- *  Start:  19.01.2004
- *
- *  Changelog
- *
- *  19.04.2004 FA Added ignore lists to run on the release and a flag to 
- *                input a directory where to look for the ignore files.
- *  10.03.2004 FA Commited chklib to cvs as a cmt package
- *  06.02.2004 FA The user can now give a list of external libraries to check
- *                in addition to the ones in the InstallArea. This can get
- *                very nasty when you have to include tons of other files to 
- *                fullfil all dependencies. For the use with athena or any 
- *                other huge package anyway. There can not be any good defaul
- *                list for this since it would have to be version dependent
- *                and would have to be changed continuously. Maybe this can be
- *                automated for athena somehow.
- *  05.02.2004 FA Included the feature of showing in which file a unresolved 
- *                symbol was missing. For this the list of strings of unsresoved
- *                symbols was changed to a map mapping a symbol to a file.
- *                Tried to use hash_map but for some reason I did not manage to
- *                compile with that type.	      
- *  04.02.2004 FA Created a list of files to ignore. This list contains libraries 
- *                whose undefined symbols are hopefully resolved somewhere else.
- *                Ignored symbols and files can now be read in from external
- *                files: chklib_ignore.symbols and chklib_ignore.files. If they
- *                exists the ignored symbols/files are taken from the file and
- *                the default hardcoded ones are ignored. Using hardcoded default 
- *                strings otherwise. Files have to be in the working directory.
- *  04.02.2004 CA Transform the command execution mechanism to fill in a
- *                text string rather than a creating a temporary file.
- *  03.02.2004 FA Introduced C++ style iterators and strings.
- *  03.02.2004 FA Using demangled symbol list. Easier to read.
- *  03.02.2004 FA An if-statement was taken out which was supposed to stop the
- *                program from comparing symbols in a file with its own symbols.
- *                Did not work, I guess ++i, i++ trap. Now it compares its own
- *                symbols. A bit slower, but fast enough. 
- *
- * --------------------------------------------------------------------------- 
- *
- *  Athena might crash for several reasons. If it crashes with an error message
- * complaining about a missing symbol you might check the symbols with ChkLib.
- * If the same symbol is not shown as unresolved by the script it is probably
- * a 'use' statement missing somewhere. If Athena crashes with a message like
- * 'blabla probably not built as a component library' it is more likely that 
- * you will find the perpetrator with ChkLib.
- *
- * If you encounter a number of unresolved symbols in the InstallArea: Don't
- * panic. Check if they belong to your package or if they belong to some other
- * package of the atlas release. Normally the unresolved symbols from other
- * packages can be ignored and are resolved when linking. This program just
- * looks into the InstallArea and takes whatever .so files it can find. Not
- * more. I do not know if it is worth going through LD_LIBRARY_PATH and to 
- * check every library for the missing symbols. I have put the symbols which
- * contains certain keywords into the 'Ignore-list' hardcoded into the 
- * program. The existing setup works fine for me ...
- *
- * NOTE: Since the program uses the 'system' call I guess that there might
- * be differences for different shells. I am using zsh, and it works.
- *
- * Comments and remarks are welcome. Have fun saving time hunting down 
- * 'not built as a component library' errors.
- *
- * TODO: - The use of map could be done for ignored and resolved symbols as
- *         well. 
- *       - Maybe I should introduce a switch if somebody wants to go
- *         through the whole LD_LIBRARY_PATH.
- * --------------------------------------------------------------------------- */
- 
-#include <iostream>
-#include <fstream>
-#include <stdlib.h>
-#include <stdio.h>
-#include <list>
-#include <string>
-#include <sstream>
-#include <map>
-#include <cstring>
-
-using std::strlen;
-using std::strcmp;
-
-/* ------------------------ Declaration of global variables ------------------ */ 
-
-int debug=0;                                      // Even more information 
-int verbose=0;                                    // Switch for output
-int checkpath=0;                                  // Check path for ignore files
-std::string ignorePath;                           // Path to the ignore files
-std::list<std::string> fileNames;                 // Library (*.so) file names
-std::map<std::string,std::string> undefSymbols;
-std::list<std::string> defSymbols;                // List of defined symbols
-std::list<std::string> ignoreSymbols;             // Symbols to ignore
-std::list<std::string> ignoreFiles;               // Files to ignore
-std::list<std::string> externalLibs;              // Check these external libs
-
-typedef std::list<std::string>::iterator listIterator;
-typedef std::map<std::string,std::string>::iterator mapIterator;
-
-/* ---------------------------------- Subroutines ---------------------------- */
-
-/**
- * Execute a shell command and accumulate its output into a string
- */
-static int execute (const std::string& command, std::string& output)
-{
-  output = "";
-
-  FILE* f = popen (command.c_str (), "r"); 
-  
-  if (f != 0) 
-    { 
-      char line[256]; 
-      char* ptr;
-
-      while ((ptr = fgets (line, sizeof (line), f)) != NULL) 
-        {
-          output += ptr;
-        } 
-      pclose (f);
-
-      return (1);
-    }
-
-  return (0);
-}
-
-/**
- * Decode all symbols from the output of one nm -C command.
- * We expect all lines to be formatted as follows
- *
- * nm -C <file> 2>&1 | grep -v 'no symbols' | sed -e 's#^[0-9a-fA-F][0-9a-fA-F]*# #' -e 's#^#>> #'
- *
- * ie:
- *    + error messages are captured and filtered out
- *    + a fixed preamble ">> " is prepended to all output lines 
- *    + symbol addresses are suppressed
- *
- */
-static int ReadSymbols (const std::string& buffer, const std::string& fileName)
-{
-  std::istringstream input (buffer.c_str ());
-
-  while (! input.eof() )
-    {
-      std::string code;
-      std::string symbol = "";
-
-      input >> code;
-
-      if (code == ">>")
-	{
-	  input >> code;
-	}
-      
-      while (! input.eof() )
-	{
-	  std::string w;
-	  input >> w;
-	  if (w == ">>") break;
-	  if (symbol.size () > 0) symbol += " ";
-	  symbol += w;
-	}
-
-      //std::cout << "code=[" << code << "] symbol=[" << symbol << "]" << std::endl;
-
-      if (code == "U")
-	{
-	  undefSymbols[symbol]=fileName;
-	} 
-      else
-	{
-	  defSymbols.push_back(symbol);
-	}
-    }
-  return 0;
-}
-
-/**
- *  Acquire all *.so file names
- */
-int GetFilenames(const std::string& buffer)
-{
-  std::istringstream input (buffer.c_str ());
-  while (! input.eof() )
-  {
-    std::string line;  
-    input >> line;
-    if (line.find ("no matches found") == std::string::npos)
-    {
-      if (line.size () > 3) 
-      {
-	int ignoreFile=0;
-	if (debug) std::cout << "Found file " << line;
-	for (listIterator II=ignoreFiles.begin(); II!=ignoreFiles.end(); II++)
-	{
-	  if (line.compare(*II)==0) 
-	  {
-	    if (debug) std::cout << " (ignored)";
-	    ignoreFile=1;
-	  }
-	}
-	if (ignoreFile==0) fileNames.push_back(line);
-	if (debug) std::cout << std::endl; 
-      }
-    }
-  }
-  return 0;
-}
-
-static void ReadIgnoredSymbols(void)
-{
-  char buffer[300];
-//  std::ifstream infile ("chklib_ignore.symbols");
-  std::string tempName;
-  tempName=ignorePath+"chklib_ignore.symbols";
-  std::cout << " Looking for " << tempName << std::endl;
-  std::ifstream infile (tempName.c_str());
-  if (! infile.is_open())
-  {
-    std::cout << "INFO: No external file for ignored symbols found. Using default." << std::endl;
-    return;
-  }
-  while (! infile.eof() )
-  {
-    infile.getline (buffer,300);
-    if (strlen(buffer)>3) 
-    {
-      ignoreSymbols.push_back(buffer);
-      if (debug) std::cout << "Ignoring symbols containing '" << buffer << "'" << std::endl;
-    }
-  }
-  return;
-}
-
-static void ReadIgnoredFiles(void)
-{
-  char buffer[300];
-//  std::ifstream infile ("chklib_ignore.files");
-  std::string tempName;
-  tempName=ignorePath+"chklib_ignore.files";
-  std::ifstream infile (tempName.c_str());
-  if (! infile.is_open())
-  {
-    std::cout << "INFO: No external file for ignored files found. Using default." << std::endl;
-    return;
-  }
-  while (! infile.eof() )
-  {
-    infile.getline (buffer,300);
-    if (strlen(buffer)>3) 
-    {
-      ignoreFiles.push_back(buffer);
-      if (debug) std::cout << "Ignoring file '" << buffer << "'" << std::endl;
-    }
-  }
-  return;
-}
-
-static void ReadExternalLibraries(void)
-{
-  char buffer[300];
-//  std::ifstream infile ("chklib_external.files");
-  std::string tempName;
-  tempName=ignorePath+"chklib_external.files";
-  std::ifstream infile (tempName.c_str());
-  if (! infile.is_open())
-  {
-    std::cout << "INFO: No external file for additional libraries found. Using default." << std::endl;
-    return;
-  }
-  while (! infile.eof() )
-  {
-    infile.getline (buffer,300);
-    if (strlen(buffer)>3) 
-    {
-      externalLibs.push_back(buffer);
-      if (debug) std::cout << "Using external library  '" << buffer << "'" << std::endl;
-    }
-  }
-  return;
-}
-
-/* ----------------------------- MAIN --------------------------------- */
-
-int main(int argc, char *argv[]) 
-{
-  /* --- Variable declarations --- */
-
-  int nfile;
-  char command[400];
-  undefSymbols.clear();
-  defSymbols.clear();
-  ignoreSymbols.clear();
-  ignoreFiles.clear();
-  externalLibs.clear();
-
-  std::cout << "--------------------- chklib ---------------------" << std::endl ;
-  std::cout << std::endl;
-  std::cout << "Version: 0.8 (05.02.2004)" << std::endl;
-  std::cout << "Author:  Fredrik Akesson" << std::endl;
-  std::cout << "Email:   fredrik.akesson@cern.ch" << std::endl;
-  verbose=0;
-  checkpath=0;
-  if (argc > 1 && argv[1]!=0) 
-    {  
-      if (strcmp(argv[1],"-i")==0) verbose=1;
-      if (strcmp(argv[1],"-u")==0) verbose=2;
-      if (strcmp(argv[1],"-s")==0) verbose=3;
-      if (strcmp(argv[1],"-a")==0) verbose=4;
-      if (strcmp(argv[1],"-v")==0) { verbose=4; debug=1; } 
-      if (strcmp(argv[2],"-f")==0) checkpath=1; 
-    }  
-  if (argc == 0 || argv[1]==0 || verbose==0) 
-    {
-      std::cout << "" << std::endl;
-      std::cout << "Usage:" << std::endl;
-      std::cout << std::endl;
-      std::cout << " -i : Output only ignored symbols" << std::endl;
-      std::cout << " -u : Output only undefined symbols" << std::endl;
-      std::cout << " -s : Output only resolved symbols" << std::endl;
-      std::cout << " -a : Output all symbols" << std::endl;
-      std::cout << " -v : Output even more information" << std::endl;
-      std::cout << std::endl;
-      std::cout << "--------------------------------------------------" << std::endl ;
-      std::cout << std::endl;
-      return -1;
-    }
-  std::cout << std::endl;
-  std::cout << "--------------------------------------------------" << std::endl ;
-  std::cout << std::endl;
-
-  /* Checks if the user has some extern files for symbols and files to
-     be ignored. Otherwise use default lists. */
-
-  if (checkpath==0) 
-  { 
-      ignorePath="";
-  } else
-  {
-      ignorePath=argv[3];
-  }
-  ReadIgnoredSymbols(); // Read symbols to be ignored from file
-  ReadIgnoredFiles();   // 
-  ReadExternalLibraries();
-  std::cout << std::endl;
-  /* Ignore symbols by default containing one of the following strings */  
-
-  if (ignoreSymbols.size()==0) 
-  {
-    ignoreSymbols.push_back("GLIBC");
-    ignoreSymbols.push_back("CXXABI");
-    ignoreSymbols.push_back("GCC");
-    ignoreSymbols.push_back("cxxabi");
-    ignoreSymbols.push_back("_Unwind_");
-    ignoreSymbols.push_back("dynamic_cast");
-    ignoreSymbols.push_back("System");
-    ignoreSymbols.push_back("AlgTool::");
-    ignoreSymbols.push_back("SG::");
-    ignoreSymbols.push_back("StoreGateSvc::");
-    ignoreSymbols.push_back("NTuple::");
-    ignoreSymbols.push_back("Algorithm::");
-    ignoreSymbols.push_back("MsgStream::");
-    ignoreSymbols.push_back("DataObject::");
-    ignoreSymbols.push_back("CBNT_AthenaBase::");
-    ignoreSymbols.push_back("FactoryTable::");
-    ignoreSymbols.push_back("CLIDRegistry::");
-    ignoreSymbols.push_back("ActiveStoreSvc::");
-    ignoreSymbols.push_back("Genfun::");
-    ignoreSymbols.push_back("Hep3Vector::");
-    ignoreSymbols.push_back("HepGenMatrix::");
-    ignoreSymbols.push_back("HepMatrix::");
-    ignoreSymbols.push_back("HepSymMatrix::");
-    ignoreSymbols.push_back("HepVector::");
-    ignoreSymbols.push_back("Service::");
-    ignoreSymbols.push_back("HepRotation::");
-    ignoreSymbols.push_back("SimplePropertyRef");
-    ignoreSymbols.push_back("NullVerifier");
-    ignoreSymbols.push_back("operator");
-    ignoreSymbols.push_back("typeinfo");
-    ignoreSymbols.push_back("vtable");
-  }
-  
-  /* Ignore library files with the following names by default. */  
-
-  if (ignoreFiles.size()==0) 
-  {
-    ignoreFiles.push_back("libGaudiSvc.so");
-  }
-  
-  std::string buffer;
-  
-  execute ("ls -lL *.so | cut -b 57- ", buffer);
-  
-  GetFilenames (buffer);
-  
-  if (externalLibs.size()!=0)
-  {
-    for (listIterator LI=externalLibs.begin(); LI!=externalLibs.end(); LI++)
-    {
-      if ((*LI).size()>3) fileNames.push_back(*LI);
-    }
-  }
-
-  nfile=fileNames.size();
-  if (nfile==0) 
-  {
-    std::cout << "You are probably not starting chklib in your InstallArea/i686-rh73-gcc32-dbg/lib/ directory" << std::endl;
-    exit (1);
-  } 
-  
-  for (listIterator FI=fileNames.begin(); FI!=fileNames.end(); FI++)
-  {
-    const std::string& fileName = *FI;
-    std::string buffer;  
-    sprintf (command, "nm -C %s 2>&1 | grep -v 'no symbols' | sed -e 's#^[0-9a-fA-F][0-9a-fA-F]*# #' -e 's#^#>> #'", fileName.c_str());
-    execute (command, buffer);
-    ReadSymbols (buffer, fileName);
-  }
-  
-  /* Remove duplicates in the symbol lists */
-
-  defSymbols.sort(); defSymbols.unique();
-  
-  std::list<std::string> foundSymbols; foundSymbols.clear();
-  std::list<std::string> missingSymbols; missingSymbols.clear();  
-  std::list<std::string> ignoredSymbols; ignoredSymbols.clear();    
-  std::map<std::string,std::string> tempList(undefSymbols); undefSymbols.clear();
-  
-  /* Compare undefined symbols with the "Ignore" list. If it is in the
-     ignored list, print it if requested and push back to list */ 
-  
-  for (mapIterator UI=tempList.begin(); UI!=tempList.end(); UI++)
-  {
-    int ignoreSymbol=0;
-    for (listIterator II=ignoreSymbols.begin(); II!=ignoreSymbols.end(); II++)
-    {
-      if ((*UI).first.find(*II)!=std::string::npos) 
-      {
-	ignoreSymbol=1;
-	ignoredSymbols.push_back((*UI).first);
-	if (verbose==1 || verbose==4) std::cout << "Ignored symbol " << (*UI).first << std::endl;
-	break;
-      }
-    }
-    if (ignoreSymbol==0) undefSymbols[(*UI).first]=(*UI).second;
-  }  
-  
-  /* Compare undefined symbols with the resolved symbols. If it is found
-     print it as success or failure if requested and push back to the 
-     list accordingly. */ 
-  
-  for (mapIterator UI=undefSymbols.begin(); UI!=undefSymbols.end(); UI++)
-    {
-      int symbolResolved=0;
-      for (listIterator RI=defSymbols.begin(); RI!=defSymbols.end(); RI++)
-	{
-	  if ( (*UI).first.compare(*RI)==0 ) 
-	    {
-	      symbolResolved=1;
-	      foundSymbols.push_back((*UI).first);
-	      if (verbose==3 || verbose==4) std::cout << "Found symbol " << (*UI).first << std::endl;
-	      break;
-	    }
-	}
-      if (symbolResolved==0)
-	{
-	  if (verbose==2 || verbose==4) std::cout << "Missing symbol " << (*UI).first << " in " << (*UI).second << std::endl;
-	  missingSymbols.push_back((*UI).first);
-	}
-    }
-  if (missingSymbols.size()==0) 
-  {
-    std::cout << std::endl;
-    std::cout << "No missing symbols found. This can have the following reasons:" << std::endl;
-    std::cout << std::endl;
-    std::cout << " 1. Everything is OK (Congratulations)." << std::endl;
-    std::cout << " 2. The ignore list is to extensive." << std::endl;
-    std::cout << " 3. The error (if that was the reason to run this tool) is not related to missing symbols." << std::endl;    
-  } 
-  if (foundSymbols.size()==0 && (verbose==3 || verbose==4)) 
-  {
-    std::cout << std::endl;
-    std::cout << "No symbols resolved. This can have the following reasons:" << std::endl;
-    std::cout << std::endl;
-    std::cout << " 1. The ignore list is to extensive." << std::endl;
-    std::cout << " 2. All symbols are resolved within each library. A succes in resolving a symbol" << std::endl;    
-    std::cout << "    is when the symbol is undefined in one library but found in an other." << std::endl;
-  } 
-  return 0;
-}
-
-
-
diff --git a/Tools/PROCTools/python/RunTier0Tests.py b/Tools/PROCTools/python/RunTier0Tests.py
index 6c3318693282e360cab3c80d0d89ac83bf82c163..04dbf6e8797a367bac6910b80905eee0c160c52c 100755
--- a/Tools/PROCTools/python/RunTier0Tests.py
+++ b/Tools/PROCTools/python/RunTier0Tests.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 
 ## RunTier0Tests.py - Brief description of the purpose of this script (Has to be in PROC tools)
 # $Id$
@@ -12,7 +12,7 @@ import time
 import uuid
 import logging
 import glob
-from RunTier0TestsTools import ciRefFileMap
+from PROCTools.RunTier0TestsTools import ciRefFileMap
 
 ### Setup global logging
 logging.basicConfig(level=logging.INFO,
diff --git a/Tools/PROCTools/python/RunTier0TestsTools.py b/Tools/PROCTools/python/RunTier0TestsTools.py
index 324fb145c7d18cc0836da42cd9d59146cc488cd1..225c24dd0b94fa0bf843fb027b3aa61d1cbb478e 100644
--- a/Tools/PROCTools/python/RunTier0TestsTools.py
+++ b/Tools/PROCTools/python/RunTier0TestsTools.py
@@ -24,5 +24,5 @@ ciRefFileMap = {
                 's3126-22.0'           : 'v1',
                 # OverlayTier0Test_required-test
                 'overlay-d1498-21.0'   : 'v1',
-                'overlay-d1498-22.0'   : 'v1',
+                'overlay-d1498-22.0'   : 'v2',
                }
diff --git a/Tools/Tier0ChainTests/test/test_reco_mc16e.sh b/Tools/Tier0ChainTests/test/test_reco_mc16e.sh
new file mode 100755
index 0000000000000000000000000000000000000000..f6ae0bf55b4fcf74dbdc7fe73011d88967ae2c2f
--- /dev/null
+++ b/Tools/Tier0ChainTests/test/test_reco_mc16e.sh
@@ -0,0 +1,19 @@
+#!/bin/sh
+#
+# art-description: RecoTrf
+# art-type: grid
+# art-include: 21.0/Athena
+# art-include: 21.0-TrigMC/Athena
+# art-include: master/Athena
+# art-include: 21.3/Athena
+# art-include: 21.9/Athena
+
+Reco_tf.py --digiSteeringConf 'StandardSignalOnlyTruth' --conditionsTag 'default:OFLCOND-MC16-SDR-25' --valid 'True' --pileupFinalBunch '6' --numberOfHighPtMinBias '0.2595392' --autoConfiguration 'everything' --numberOfLowPtMinBias '99.2404608' --steering 'doRDO_TRIG' --preInclude 'HITtoRDO:Digitization/ForceUseOfPileUpTools.py,SimulationJobOptions/preInlcude.PileUpBunchTrainsMC16c_2017_Config1.py,RunDependentSimData/configLumi_run310000.py' --postInclude 'default:PyJobTransforms/UseFrontier.py' --postExec 'all:CfgMgr.MessageSvc().setError+=["HepMcParticleLink"]' "ESDtoAOD:fixedAttrib=[s if \"CONTAINER_SPLITLEVEL = '99'\" not in s else \"\" for s in svcMgr.AthenaPoolCnvSvc.PoolAttributes];svcMgr.AthenaPoolCnvSvc.PoolAttributes=fixedAttrib" "RDOtoRDOTrigger:conddb.addOverride(\"/CALO/Ofl/Noise/PileUpNoiseLumi\",\"CALOOflNoisePileUpNoiseLumi-mc15-mu30-dt25ns\")" 'ESDtoAOD:CILMergeAOD.removeItem("xAOD::CaloClusterAuxContainer#CaloCalTopoClustersAux.LATERAL.LONGITUDINAL.SECOND_R.SECOND_LAMBDA.CENTER_MAG.CENTER_LAMBDA.FIRST_ENG_DENS.ENG_FRAC_MAX.ISOLATION.ENG_BAD_CELLS.N_BAD_CELLS.BADLARQ_FRAC.ENG_BAD_HV_CELLS.N_BAD_HV_CELLS.ENG_POS.SIGNIFICANCE.CELL_SIGNIFICANCE.CELL_SIG_SAMPLING.AVG_LAR_Q.AVG_TILE_Q.EM_PROBABILITY.PTD.BadChannelList");CILMergeAOD.add("xAOD::CaloClusterAuxContainer#CaloCalTopoClustersAux.N_BAD_CELLS.ENG_BAD_CELLS.BADLARQ_FRAC.AVG_TILE_Q.AVG_LAR_Q.CENTER_MAG.ENG_POS.CENTER_LAMBDA.SECOND_LAMBDA.SECOND_R.ISOLATION.EM_PROBABILITY");StreamAOD.ItemList=CILMergeAOD()' --preExec 'all:rec.Commissioning.set_Value_and_Lock(True);from AthenaCommon.BeamFlags import jobproperties;jobproperties.Beam.numberOfCollisions.set_Value_and_Lock(20.0);from LArROD.LArRODFlags import larRODFlags;larRODFlags.NumberOfCollisions.set_Value_and_Lock(20);larRODFlags.nSamples.set_Value_and_Lock(4);larRODFlags.doOFCPileupOptimization.set_Value_and_Lock(True);larRODFlags.firstSample.set_Value_and_Lock(0);larRODFlags.useHighestGainAutoCorr.set_Value_and_Lock(True); from LArDigitization.LArDigitizationFlags import jobproperties;jobproperties.LArDigitizationFlags.useEmecIwHighGain.set_Value_and_Lock(False)' 'ESDtoAOD:from TriggerJobOpts.TriggerFlags import TriggerFlags;TriggerFlags.AODEDMSet.set_Value_and_Lock("AODSLIM");' --triggerConfig 'RDOtoRDOTrigger=MCRECO:DBF:TRIGGERDBMC:2232,86,278' --geometryVersion 'default:ATLAS-R2-2016-01-00-01' --numberOfCavernBkg '0' --inputHITSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.simul.HITS.e4993_s3091/\* --maxEvents=100 --outputAODFile=myAOD.pool.root --outputRDOFile=myRDO.pool.root --outputESDFile=myESD.pool.root --outputTAGFile=myTAG.root --runNumber=410000 --jobNumber=1 --inputLowPtMinbiasHitsFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/mc16_13TeV.361238.Pythia8EvtGen_A3NNPDF23LO_minbias_inelastic_low.merge.HITS.e4981_s3087_s3089/\* --inputHighPtMinbiasHitsFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/mc16_13TeV.361239.Pythia8EvtGen_A3NNPDF23LO_minbias_inelastic_high.merge.HITS.e4981_s3087_s3089/\*
+
+echo "art-result: $? Reco"
+
+ArtPackage=$1
+ArtJobName=$2
+art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName}
+echo "art-result: $? Diff"
+
diff --git a/Tracking/TrkDetDescr/TrkDetDescrGeoModelCnv/src/GeoShapeConverter.cxx b/Tracking/TrkDetDescr/TrkDetDescrGeoModelCnv/src/GeoShapeConverter.cxx
index 0533d79f2ecba4977cc7ce9fba521d5a5f10ab91..e62ddccfe22e7d82346aff251d29f4795c03d2ef 100755
--- a/Tracking/TrkDetDescr/TrkDetDescrGeoModelCnv/src/GeoShapeConverter.cxx
+++ b/Tracking/TrkDetDescr/TrkDetDescrGeoModelCnv/src/GeoShapeConverter.cxx
@@ -36,7 +36,7 @@
 #include "GeoModelKernel/GeoPara.h"
 #include "GeoModelKernel/GeoVolumeCursor.h"
 #include "GeoModelKernel/GeoDefinitions.h"
-#include "GeoModelKernel/Units.h"
+#include "GaudiKernel/SystemOfUnits.h"
 
 // #define DEBUG
 #ifdef DEBUG
@@ -50,7 +50,7 @@ namespace {
 	//commonly used axes
 	const Amg::Vector3D gXAxis(1.0, 0.0, 0.0), gYAxis(0.0, 1.0, 0.0), gZAxis(0.0, 0.0, 1.0);
 	//commonly used angles, ±90°, 180°
-	const double p90deg(90.0 * GeoModelKernelUnits::deg), m90deg(-90.0 * GeoModelKernelUnits::deg), p180deg(180.0 * GeoModelKernelUnits::deg);
+	const double p90deg(90.0 * Gaudi::Units::deg), m90deg(-90.0 * Gaudi::Units::deg), p180deg(180.0 * Gaudi::Units::deg);
 }
 
 
diff --git a/Tracking/TrkExtrapolation/TrkExStraightLineIntersector/CMakeLists.txt b/Tracking/TrkExtrapolation/TrkExStraightLineIntersector/CMakeLists.txt
index 19840485b2b9283a8490493854098b7ae7a42963..2ccff9b6bfe09287f66d2de61934edf39ac25441 100644
--- a/Tracking/TrkExtrapolation/TrkExStraightLineIntersector/CMakeLists.txt
+++ b/Tracking/TrkExtrapolation/TrkExStraightLineIntersector/CMakeLists.txt
@@ -12,6 +12,7 @@ atlas_depends_on_subdirs( PUBLIC
                           Tracking/TrkExtrapolation/TrkExUtils
                           PRIVATE
                           GaudiKernel
+                          AtlasTest/TestTools
                           Tracking/TrkDetDescr/TrkSurfaces
                           Tracking/TrkEvent/TrkParameters )
 
@@ -28,3 +29,6 @@ atlas_add_component( TrkExStraightLineIntersector
 # Install files from the package:
 atlas_install_headers( TrkExStraightLineIntersector )
 
+atlas_add_test( StraightLineIntersector_test
+                SOURCES test/StraightLineIntersector_test.cxx
+                LINK_LIBRARIES TrkExUtils TestTools GaudiKernel )
diff --git a/Tracking/TrkExtrapolation/TrkExStraightLineIntersector/TrkExStraightLineIntersector/StraightLineIntersector.h b/Tracking/TrkExtrapolation/TrkExStraightLineIntersector/TrkExStraightLineIntersector/StraightLineIntersector.h
index 7ffee9df5b14ff60796229afe94ca42bf6242328..325057f2df8c05735dc903df2ff98fd4fd1cbfe9 100755
--- a/Tracking/TrkExtrapolation/TrkExStraightLineIntersector/TrkExStraightLineIntersector/StraightLineIntersector.h
+++ b/Tracking/TrkExtrapolation/TrkExStraightLineIntersector/TrkExStraightLineIntersector/StraightLineIntersector.h
@@ -1,147 +1,156 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2017, 2019 CERN for the benefit of the ATLAS collaboration
 */
 
-//////////////////////////////////////////////////////////////////////
-// provide straight line intersection to a surface
-// (useful for abstract interfaces in track/segment fitters)
-// (c) ATLAS Tracking software
-//////////////////////////////////////////////////////////////////////
-
-#ifndef TRKEXSTRAIGHTLINEINTERSECTOR_STRAIGHTLINEINTERSECTOR_H
-#define TRKEXSTRAIGHTLINEINTERSECTOR_STRAIGHTLINEINTERSECTOR_H
-
-#include "AthenaBaseComps/AthAlgTool.h"
-#include "TrkExInterfaces/IIntersector.h"
-#include "TrkExUtils/TrackSurfaceIntersection.h"
-
-namespace Trk
-{
-    
-class StraightLineIntersector: public AthAlgTool,
-			       virtual public IIntersector
-{
-    
-public:
-    StraightLineIntersector	(const std::string& type, 
-				 const std::string& name,
-				 const IInterface* parent);
-    ~StraightLineIntersector	(void); 	// destructor
-
-    StatusCode			initialize();
-    StatusCode			finalize();
-
-    /**IIntersector interface method for general Surface type */
-    const TrackSurfaceIntersection*		intersectSurface(const Surface&		surface,
-						 const TrackSurfaceIntersection*	trackTrackSurfaceIntersection,
-						 const double      	qOverP);
-	                                     
-    /**IIntersector interface method for specific Surface type : PerigeeSurface */
-    const TrackSurfaceIntersection*		approachPerigeeSurface(const PerigeeSurface&	surface,
-						       const TrackSurfaceIntersection*	trackTrackSurfaceIntersection,
-						       const double      	/*qOverP*/);
-	
-    /**IIntersector interface method for specific Surface type : StraightLineSurface */
-    const TrackSurfaceIntersection*		approachStraightLineSurface(const StraightLineSurface& surface,
-							    const TrackSurfaceIntersection*	trackTrackSurfaceIntersection,
-							    const double      	/*qOverP*/);
-              
-    /**IIntersector interface method for specific Surface type : CylinderSurface */
-    const TrackSurfaceIntersection*		intersectCylinderSurface (const CylinderSurface& surface,
-							  const TrackSurfaceIntersection*	trackTrackSurfaceIntersection,
-							  const double      	/*qOverP*/);
-
-    /**IIntersector interface method for specific Surface type : DiscSurface */
-    const TrackSurfaceIntersection*		intersectDiscSurface (const DiscSurface&	surface,
-						      const TrackSurfaceIntersection*	trackTrackSurfaceIntersection,
-						      const double      	/*qOverP*/);
-
-    /**IIntersector interface method for specific Surface type : PlaneSurface */
-    const TrackSurfaceIntersection*		intersectPlaneSurface(const PlaneSurface&	surface,
-						      const TrackSurfaceIntersection*	trackTrackSurfaceIntersection,
-						      const double      	/*qOverP*/);
- 
-    /**IIntersector interface method for validity check over a particular extrapolation range */
-    bool			isValid(Amg::Vector3D /*startPosition*/,
-					Amg::Vector3D /*endPosition*/) const
-	{ return true; }
-	
-private:
-
-    // private methods
-    void		distanceToCylinder (const double cylinderRadius);
-    void		distanceToDisc (const double discZ);
-    void		distanceToLine (const Amg::Vector3D&	linePosition,
-					const Amg::Vector3D&	lineDirection);
-    void		distanceToPlane (const Amg::Vector3D&	planePosition,
-					 const Amg::Vector3D&	planeNormal);
-    void		step (void);
-    
-    // current parameters:
-    Amg::Vector3D		m_direction;
-    unsigned			m_intersectionNumber;
-    Amg::Vector3D		m_position;
-    double       		m_stepLength;
-    double			m_transverseLength;
-
-    // counters
-    unsigned long long		m_countExtrapolations;
-    
-};
-
-//<<<<<< INLINE PRIVATE MEMBER FUNCTIONS                                >>>>>>
-
-inline void
-StraightLineIntersector::distanceToCylinder (const double cylinderRadius)
-{
-    double sinThsqinv	= 1./m_direction.perp2();
-    m_stepLength	= (-m_position.x()*m_direction.x() - m_position.y()*m_direction.y()) *
-			  sinThsqinv;
-    double deltaRSq	= (cylinderRadius*cylinderRadius - m_position.perp2())*sinThsqinv +
-			  m_stepLength*m_stepLength;
-    if (deltaRSq > 0.) m_stepLength += sqrt(deltaRSq);
-}
-    
-inline void
-StraightLineIntersector::distanceToDisc (const double discZ)
-{
-    m_stepLength	= (discZ - m_position.z())/m_direction.z();
-}
-
-inline void
-  StraightLineIntersector::distanceToLine (const Amg::Vector3D&	linePosition,
-					   const Amg::Vector3D&	lineDirection)
-{
-    // offset joining track to line is given by
-    //   offset = linePosition + a*lineDirection - trackPosition - b*trackDirection
-    // 
-    // offset is perpendicular to both line and track at solution i.e.
-    //   lineDirection.dot(offset) = 0
-    //   trackDirection.dot(offset) = 0
-    double cosAngle	= lineDirection.dot(m_direction);
-    m_stepLength	= (linePosition - m_position).dot(m_direction - lineDirection*cosAngle) /
-			  (1. - cosAngle*cosAngle);
-}
-    
-inline void
-  StraightLineIntersector::distanceToPlane (const Amg::Vector3D&	planePosition,
-					    const Amg::Vector3D&	planeNormal)
-{
-    // take the normal component of the offset from track position to plane position
-    // this is equal to the normal component of the required distance along the track direction
-    m_stepLength	= planeNormal.dot(planePosition - m_position) /
-			  planeNormal.dot(m_direction);
-}
-
-inline void
-StraightLineIntersector::step (void)
-{
-    m_position		+= m_stepLength*m_direction;
-    m_transverseLength	+= m_stepLength;
-}
-
-    
-} // end of namespace
-
-
-#endif // TRKEXSTRAIGHTLINEINTERSECTOR_STRAIGHTLINEINTERSECTOR_H
+//////////////////////////////////////////////////////////////////////
+// provide straight line intersection to a surface
+// (useful for abstract interfaces in track/segment fitters)
+// (c) ATLAS Tracking software
+//////////////////////////////////////////////////////////////////////
+
+#ifndef TRKEXSTRAIGHTLINEINTERSECTOR_STRAIGHTLINEINTERSECTOR_H
+#define TRKEXSTRAIGHTLINEINTERSECTOR_STRAIGHTLINEINTERSECTOR_H
+
+#include "AthenaBaseComps/AthAlgTool.h"
+#include "TrkExInterfaces/IIntersector.h"
+#include "TrkExUtils/TrackSurfaceIntersection.h"
+#include <atomic>
+
+namespace Trk
+{
+    
+class StraightLineIntersector: public AthAlgTool,
+			       virtual public IIntersector
+{
+    
+public:
+    StraightLineIntersector	(const std::string& type, 
+				 const std::string& name,
+				 const IInterface* parent);
+    ~StraightLineIntersector	(void); 	// destructor
+
+    StatusCode			initialize();
+    StatusCode			finalize();
+
+    /**IIntersector interface method for general Surface type */
+    const TrackSurfaceIntersection*		intersectSurface(const Surface&		surface,
+						 const TrackSurfaceIntersection*	trackTrackSurfaceIntersection,
+						 const double      	qOverP);
+	                                     
+    /**IIntersector interface method for specific Surface type : PerigeeSurface */
+    const TrackSurfaceIntersection*		approachPerigeeSurface(const PerigeeSurface&	surface,
+						       const TrackSurfaceIntersection*	trackTrackSurfaceIntersection,
+						       const double      	/*qOverP*/);
+	
+    /**IIntersector interface method for specific Surface type : StraightLineSurface */
+    const TrackSurfaceIntersection*		approachStraightLineSurface(const StraightLineSurface& surface,
+							    const TrackSurfaceIntersection*	trackTrackSurfaceIntersection,
+							    const double      	/*qOverP*/);
+              
+    /**IIntersector interface method for specific Surface type : CylinderSurface */
+    const TrackSurfaceIntersection*		intersectCylinderSurface (const CylinderSurface& surface,
+							  const TrackSurfaceIntersection*	trackTrackSurfaceIntersection,
+							  const double      	/*qOverP*/);
+
+    /**IIntersector interface method for specific Surface type : DiscSurface */
+    const TrackSurfaceIntersection*		intersectDiscSurface (const DiscSurface&	surface,
+						      const TrackSurfaceIntersection*	trackTrackSurfaceIntersection,
+						      const double      	/*qOverP*/);
+
+    /**IIntersector interface method for specific Surface type : PlaneSurface */
+    const TrackSurfaceIntersection*		intersectPlaneSurface(const PlaneSurface&	surface,
+						      const TrackSurfaceIntersection*	trackTrackSurfaceIntersection,
+						      const double      	/*qOverP*/);
+ 
+    /**IIntersector interface method for validity check over a particular extrapolation range */
+    bool			isValid(Amg::Vector3D /*startPosition*/,
+					Amg::Vector3D /*endPosition*/) const
+	{ return true; }
+	
+private:
+    // private methods
+    double		distanceToCylinder (const TrackSurfaceIntersection& isect,
+                                            const double cylinderRadius) const;
+    double		distanceToDisc (const TrackSurfaceIntersection& isect,
+                                        const double discZ) const;
+    double		distanceToLine (const TrackSurfaceIntersection& isect,
+                                        const Amg::Vector3D&	linePosition,
+					const Amg::Vector3D&	lineDirection) const;
+    double		distanceToPlane (const TrackSurfaceIntersection& isect,
+                                         const Amg::Vector3D&	planePosition,
+					 const Amg::Vector3D&	planeNormal) const;
+    void		step (TrackSurfaceIntersection& isect, double stepLength) const;
+    
+    // counters
+    mutable std::atomic<unsigned long long>		m_countExtrapolations;
+    
+};
+
+//<<<<<< INLINE PRIVATE MEMBER FUNCTIONS                                >>>>>>
+
+inline double
+StraightLineIntersector::distanceToCylinder (const TrackSurfaceIntersection& isect,
+                                             const double cylinderRadius) const
+{
+  const Amg::Vector3D& pos = isect.position();
+  const Amg::Vector3D& dir = isect.direction();
+  double sinThsqinv	= 1./dir.perp2();
+  double stepLength	= (-pos.x()*dir.x() - pos.y()*dir.y()) * sinThsqinv;
+  double deltaRSq	= (cylinderRadius*cylinderRadius - pos.perp2())*sinThsqinv +
+    stepLength*stepLength;
+  if (deltaRSq > 0.) stepLength += sqrt(deltaRSq);
+  return stepLength;
+}
+    
+inline double
+StraightLineIntersector::distanceToDisc (const TrackSurfaceIntersection& isect,
+                                         const double discZ) const
+{
+  const Amg::Vector3D& pos = isect.position();
+  const Amg::Vector3D& dir = isect.direction();
+  return (discZ - pos.z())/dir.z();
+}
+
+inline double
+StraightLineIntersector::distanceToLine (const TrackSurfaceIntersection& isect,
+                                         const Amg::Vector3D&	linePosition,
+                                         const Amg::Vector3D&	lineDirection) const
+{
+  // offset joining track to line is given by
+  //   offset = linePosition + a*lineDirection - trackPosition - b*trackDirection
+  // 
+  // offset is perpendicular to both line and track at solution i.e.
+  //   lineDirection.dot(offset) = 0
+  //   trackDirection.dot(offset) = 0
+  const Amg::Vector3D& pos = isect.position();
+  const Amg::Vector3D& dir = isect.direction();
+  double cosAngle	= lineDirection.dot(dir);
+  return (linePosition - pos).dot(dir - lineDirection*cosAngle) /
+      (1. - cosAngle*cosAngle);
+}
+    
+inline double
+  StraightLineIntersector::distanceToPlane (const TrackSurfaceIntersection& isect,
+                                            const Amg::Vector3D&	planePosition,
+					    const Amg::Vector3D&	planeNormal) const
+{
+  // take the normal component of the offset from track position to plane position
+  // this is equal to the normal component of the required distance along the track direction
+  const Amg::Vector3D& pos = isect.position();
+  const Amg::Vector3D& dir = isect.direction();
+  return planeNormal.dot(planePosition - pos) / planeNormal.dot(dir);
+}
+
+    
+inline void
+StraightLineIntersector::step (TrackSurfaceIntersection& isect, double stepLength) const
+{
+    isect.position()	+= stepLength*isect.direction();
+    isect.pathlength()	+= stepLength;
+}
+
+    
+} // end of namespace
+
+
+#endif // TRKEXSTRAIGHTLINEINTERSECTOR_STRAIGHTLINEINTERSECTOR_H
diff --git a/Tracking/TrkExtrapolation/TrkExStraightLineIntersector/share/StraightLineIntersector_test.ref b/Tracking/TrkExtrapolation/TrkExStraightLineIntersector/share/StraightLineIntersector_test.ref
new file mode 100644
index 0000000000000000000000000000000000000000..f178777ac4fc72cf8f9870e51377fd1f4967bdd0
--- /dev/null
+++ b/Tracking/TrkExtrapolation/TrkExStraightLineIntersector/share/StraightLineIntersector_test.ref
@@ -0,0 +1,18 @@
+StraightLineIntersector_test
+ApplicationMgr    SUCCESS 
+====================================================================================================================================
+                                                   Welcome to ApplicationMgr (GaudiCoreSvc v27r1p99)
+                                          running on karma on Tue Jan 22 09:34:25 2019
+====================================================================================================================================
+ApplicationMgr       INFO Application Manager Configured successfully
+EventLoopMgr      WARNING Unable to locate service "EventSelector" 
+EventLoopMgr      WARNING No events will be processed from external input.
+HistogramPersis...WARNING Histograms saving not required.
+ApplicationMgr       INFO Application Manager Initialized successfully
+ApplicationMgr Ready
+ToolSvc.Trk::St...   INFO StraightLineIntersector::initialize() - package version TrkExStraightLineIntersector-00-00-00
+test_plane
+test_line
+test_cylinder
+test_disc
+test_perigee
diff --git a/Tracking/TrkExtrapolation/TrkExStraightLineIntersector/src/StraightLineIntersector.cxx b/Tracking/TrkExtrapolation/TrkExStraightLineIntersector/src/StraightLineIntersector.cxx
index 083e72ae841e683e324eea7db72a84d04f68dfab..2e19682f3cbc2987ae5824c8494b154107ac5e0b 100755
--- a/Tracking/TrkExtrapolation/TrkExStraightLineIntersector/src/StraightLineIntersector.cxx
+++ b/Tracking/TrkExtrapolation/TrkExStraightLineIntersector/src/StraightLineIntersector.cxx
@@ -1,220 +1,170 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2017, 2019 CERN for the benefit of the ATLAS collaboration
 */
 
-//////////////////////////////////////////////////////////////////////
-// provide straight line intersection to a surface
-// (useful for abstract interfaces in track/segment fitters)
-// (c) ATLAS Tracking software
-//////////////////////////////////////////////////////////////////////
-
-#include <cmath>
-#include "CLHEP/Units/SystemOfUnits.h"
-#include "TrkExStraightLineIntersector/StraightLineIntersector.h"
-#include "TrkExUtils/TrackSurfaceIntersection.h"
-//#include "TrkParameters/Perigee.h"
-#include "TrkParameters/TrackParameters.h"
-#include "TrkSurfaces/CylinderSurface.h"
-#include "TrkSurfaces/DiscSurface.h"
-#include "TrkSurfaces/PerigeeSurface.h"
-#include "TrkSurfaces/PlaneSurface.h"
-#include "TrkSurfaces/StraightLineSurface.h"
-#include "TrkSurfaces/Surface.h"
-
-namespace Trk
-{
-
-StraightLineIntersector::StraightLineIntersector (const std::string&	type,
-						  const std::string&	name, 
-						  const IInterface*	parent)
-    :	AthAlgTool		(type, name, parent),
-	m_intersectionNumber	(0),
-	m_countExtrapolations	(0)
-{
-    declareInterface<Trk::IIntersector>(this);
-}
-
-StraightLineIntersector::~StraightLineIntersector (void)
-{}
- 
-StatusCode
-StraightLineIntersector::initialize()
-{
-    // print name and package version
-    ATH_MSG_INFO( "StraightLineIntersector::initialize()"
-		  << " - package version " << PACKAGE_VERSION );
-
-    // initialize base class
-    if (StatusCode::SUCCESS != AlgTool::initialize()) return StatusCode::FAILURE;
-
-    return StatusCode::SUCCESS;
-}
-
-StatusCode
-StraightLineIntersector::finalize()
-{
-    ATH_MSG_INFO( "finalized after " << m_countExtrapolations << " extrapolations" );
-
-    return StatusCode::SUCCESS;
-}
-
-/**IIntersector interface method for general Surface type */
-const Trk::TrackSurfaceIntersection*
-StraightLineIntersector::intersectSurface(const Surface&	surface,
-					  const TrackSurfaceIntersection*	trackIntersection,
-					  const double      	qOverP)
-{
-    const PlaneSurface* plane			= dynamic_cast<const PlaneSurface*>(&surface);
-    if (plane)		return intersectPlaneSurface(*plane,trackIntersection,qOverP);
-    
-    const StraightLineSurface* straightLine	= dynamic_cast<const StraightLineSurface*>(&surface);
-    if (straightLine)	return approachStraightLineSurface(*straightLine,trackIntersection,qOverP);
-
-    const CylinderSurface* cylinder		= dynamic_cast<const CylinderSurface*>(&surface);
-    if (cylinder)	return intersectCylinderSurface(*cylinder,trackIntersection,qOverP);
-	
-    const DiscSurface* disc			= dynamic_cast<const DiscSurface*>(&surface);
-    if (disc)		return intersectDiscSurface(*disc,trackIntersection,qOverP);
-    
-    const PerigeeSurface* perigee		= dynamic_cast<const PerigeeSurface*>(&surface);
-    if (perigee)	return approachPerigeeSurface(*perigee,trackIntersection,qOverP);
-    
-    ATH_MSG_WARNING( " unrecognized Surface" );
-    return 0;
-}
-                                    
-/**IIntersector interface method for specific Surface type : PerigeeSurface */
-const Trk::TrackSurfaceIntersection*
-StraightLineIntersector::approachPerigeeSurface(const PerigeeSurface&	surface,
-						const TrackSurfaceIntersection*	trackIntersection,
-						const double      	/*qOverP*/)
-{
-    // set member data
-    if (trackIntersection->serialNumber() != m_intersectionNumber)
-    {
-	m_position		= trackIntersection->position();
-	m_direction		= trackIntersection->direction();
-	m_transverseLength	= trackIntersection->pathlength();
-	++m_countExtrapolations;
-    }
-
-    // straight line distance along track to closest approach to line
-    const Amg::Vector3D&	lineDirection = surface.transform().rotation().col(2);
-    distanceToLine (surface.center(),lineDirection);
-    step();
-    
-    const Trk::TrackSurfaceIntersection* intersection	= new TrackSurfaceIntersection(m_position,
-								       m_direction,
-								       m_transverseLength);
-    m_intersectionNumber		= intersection->serialNumber();
-    return intersection;
-}
-	
-/**IIntersector interface method for specific Surface type : StraightLineSurface */
-const Trk::TrackSurfaceIntersection*
-StraightLineIntersector::approachStraightLineSurface(const StraightLineSurface& surface,
-						     const TrackSurfaceIntersection*	trackIntersection,
-						     const double      		/*qOverP*/)
-{
-    // set member data
-    if (trackIntersection->serialNumber() != m_intersectionNumber)
-    {
-	m_position		= trackIntersection->position();
-	m_direction		= trackIntersection->direction();
-	m_transverseLength	= trackIntersection->pathlength();
-	++m_countExtrapolations;
-    }
-
-    // straight line distance along track to closest approach to line
-    const Amg::Vector3D&	lineDirection = surface.transform().rotation().col(2);
-    distanceToLine (surface.center(),lineDirection);
-    step();
-
-    const Trk::TrackSurfaceIntersection* intersection	= new TrackSurfaceIntersection(m_position,
-								       m_direction,
-								       m_transverseLength);
-    m_intersectionNumber		= intersection->serialNumber();
-    return intersection;
-}
-            
-/**IIntersector interface method for specific Surface type : CylinderSurface */
-const Trk::TrackSurfaceIntersection*
-StraightLineIntersector::intersectCylinderSurface (const CylinderSurface&	surface,
-						   const TrackSurfaceIntersection*		trackIntersection,
-						   const double      		/*qOverP*/)
-{
-    // set member data
-    if (trackIntersection->serialNumber() != m_intersectionNumber)
-    {
-	m_position		= trackIntersection->position();
-	m_direction		= trackIntersection->direction();
-	m_transverseLength	= trackIntersection->pathlength();
-	++m_countExtrapolations;
-    }
-
-    // calculate straight line distance along track to intersect with cylinder radius
-    double cylinderRadius = surface.globalReferencePoint().perp();
-    distanceToCylinder(cylinderRadius);
-    step();
-
-    const Trk::TrackSurfaceIntersection* intersection	= new TrackSurfaceIntersection(m_position,
-								       m_direction,
-								       m_transverseLength);
-    m_intersectionNumber		= intersection->serialNumber();
-    return intersection;
-}
-
-/**IIntersector interface method for specific Surface type : DiscSurface */
-const Trk::TrackSurfaceIntersection*
-StraightLineIntersector::intersectDiscSurface (const DiscSurface&	surface,
-					       const TrackSurfaceIntersection*	trackIntersection,
-					       const double      	/*qOverP*/)
-{
-    if (trackIntersection->serialNumber() != m_intersectionNumber)
-    {
-	m_position		= trackIntersection->position();
-	m_direction		= trackIntersection->direction();
-	m_transverseLength	= trackIntersection->pathlength();
-	++m_countExtrapolations;
-    }
-
-    // straight line distance along track to intersect with disc
-    distanceToDisc(surface.center().z());
-    step();
-  
-    const Trk::TrackSurfaceIntersection* intersection	= new TrackSurfaceIntersection(m_position,
-								       m_direction,
-								       m_transverseLength);
-    m_intersectionNumber		= intersection->serialNumber();
-    return intersection;
-}
-
-/**IIntersector interface method for specific Surface type : PlaneSurface */
-const Trk::TrackSurfaceIntersection*
-StraightLineIntersector::intersectPlaneSurface(const PlaneSurface&	surface,
-					       const TrackSurfaceIntersection*	trackIntersection,
-					       const double      	/*qOverP*/)
-{
-    // set member data
-    if (trackIntersection->serialNumber() != m_intersectionNumber)
-    {
-	m_position		= trackIntersection->position();
-	m_direction		= trackIntersection->direction();
-	m_transverseLength	= trackIntersection->pathlength();
-	++m_countExtrapolations;
-    }
-
-    // straight line distance along track to intersect with plane
-    distanceToPlane (surface.center(),surface.normal());
-    step();
-    distanceToPlane(surface.center(),surface.normal());
-
-    const Trk::TrackSurfaceIntersection* intersection	= new TrackSurfaceIntersection(m_position,
-								       m_direction,
-								       m_transverseLength);
-    m_intersectionNumber		= intersection->serialNumber();
-    return intersection;
-}
-
-
-} // end of namespace
+//////////////////////////////////////////////////////////////////////
+// provide straight line intersection to a surface
+// (useful for abstract interfaces in track/segment fitters)
+// (c) ATLAS Tracking software
+//////////////////////////////////////////////////////////////////////
+
+#include <cmath>
+#include "CLHEP/Units/SystemOfUnits.h"
+#include "TrkExStraightLineIntersector/StraightLineIntersector.h"
+#include "TrkExUtils/TrackSurfaceIntersection.h"
+//#include "TrkParameters/Perigee.h"
+#include "TrkParameters/TrackParameters.h"
+#include "TrkSurfaces/CylinderSurface.h"
+#include "TrkSurfaces/DiscSurface.h"
+#include "TrkSurfaces/PerigeeSurface.h"
+#include "TrkSurfaces/PlaneSurface.h"
+#include "TrkSurfaces/StraightLineSurface.h"
+#include "TrkSurfaces/Surface.h"
+
+namespace Trk
+{
+
+StraightLineIntersector::StraightLineIntersector (const std::string&	type,
+						  const std::string&	name, 
+						  const IInterface*	parent)
+    :	AthAlgTool		(type, name, parent),
+	m_countExtrapolations	(0)
+{
+    declareInterface<Trk::IIntersector>(this);
+}
+
+StraightLineIntersector::~StraightLineIntersector (void)
+{}
+ 
+StatusCode
+StraightLineIntersector::initialize()
+{
+    // print name and package version
+    ATH_MSG_INFO( "StraightLineIntersector::initialize()"
+		  << " - package version " << PACKAGE_VERSION );
+
+    // initialize base class
+    if (StatusCode::SUCCESS != AlgTool::initialize()) return StatusCode::FAILURE;
+
+    return StatusCode::SUCCESS;
+}
+
+StatusCode
+StraightLineIntersector::finalize()
+{
+    ATH_MSG_INFO( "finalized after " << m_countExtrapolations << " extrapolations" );
+
+    return StatusCode::SUCCESS;
+}
+
+/**IIntersector interface method for general Surface type */
+const Trk::TrackSurfaceIntersection*
+StraightLineIntersector::intersectSurface(const Surface&	surface,
+					  const TrackSurfaceIntersection*	trackIntersection,
+					  const double      	qOverP)
+{
+    const PlaneSurface* plane			= dynamic_cast<const PlaneSurface*>(&surface);
+    if (plane)		return intersectPlaneSurface(*plane,trackIntersection,qOverP);
+    
+    const StraightLineSurface* straightLine	= dynamic_cast<const StraightLineSurface*>(&surface);
+    if (straightLine)	return approachStraightLineSurface(*straightLine,trackIntersection,qOverP);
+
+    const CylinderSurface* cylinder		= dynamic_cast<const CylinderSurface*>(&surface);
+    if (cylinder)	return intersectCylinderSurface(*cylinder,trackIntersection,qOverP);
+	
+    const DiscSurface* disc			= dynamic_cast<const DiscSurface*>(&surface);
+    if (disc)		return intersectDiscSurface(*disc,trackIntersection,qOverP);
+    
+    const PerigeeSurface* perigee		= dynamic_cast<const PerigeeSurface*>(&surface);
+    if (perigee)	return approachPerigeeSurface(*perigee,trackIntersection,qOverP);
+    
+    ATH_MSG_WARNING( " unrecognized Surface" );
+    return 0;
+}
+                                    
+/**IIntersector interface method for specific Surface type : PerigeeSurface */
+const Trk::TrackSurfaceIntersection*
+StraightLineIntersector::approachPerigeeSurface(const PerigeeSurface&	surface,
+						const TrackSurfaceIntersection*	trackIntersection,
+						const double      	/*qOverP*/)
+{
+  auto isect = std::make_unique<TrackSurfaceIntersection> (*trackIntersection);
+  ++m_countExtrapolations;
+
+  // straight line distance along track to closest approach to line
+  const Amg::Vector3D&	lineDirection = surface.transform().rotation().col(2);
+  double stepLength = distanceToLine (*isect, surface.center(),lineDirection);
+  step(*isect, stepLength);
+    
+  return isect.release();
+}
+	
+/**IIntersector interface method for specific Surface type : StraightLineSurface */
+const Trk::TrackSurfaceIntersection*
+StraightLineIntersector::approachStraightLineSurface(const StraightLineSurface& surface,
+						     const TrackSurfaceIntersection*	trackIntersection,
+						     const double      		/*qOverP*/)
+{
+  auto isect = std::make_unique<TrackSurfaceIntersection> (*trackIntersection);
+  ++m_countExtrapolations;
+
+  // straight line distance along track to closest approach to line
+  const Amg::Vector3D&	lineDirection = surface.transform().rotation().col(2);
+  double stepLength = distanceToLine (*isect, surface.center(),lineDirection);
+  step(*isect, stepLength);
+
+  return isect.release();
+}
+            
+/**IIntersector interface method for specific Surface type : CylinderSurface */
+const Trk::TrackSurfaceIntersection*
+StraightLineIntersector::intersectCylinderSurface (const CylinderSurface&	surface,
+						   const TrackSurfaceIntersection*		trackIntersection,
+						   const double      		/*qOverP*/)
+{
+  auto isect = std::make_unique<TrackSurfaceIntersection> (*trackIntersection);
+  ++m_countExtrapolations;
+  
+  // calculate straight line distance along track to intersect with cylinder radius
+  double cylinderRadius = surface.globalReferencePoint().perp();
+  double stepLength = distanceToCylinder(*isect, cylinderRadius);
+  step(*isect, stepLength);
+
+  return isect.release();
+}
+
+/**IIntersector interface method for specific Surface type : DiscSurface */
+const Trk::TrackSurfaceIntersection*
+StraightLineIntersector::intersectDiscSurface (const DiscSurface&	surface,
+					       const TrackSurfaceIntersection*	trackIntersection,
+					       const double      	/*qOverP*/)
+{
+  auto isect = std::make_unique<TrackSurfaceIntersection> (*trackIntersection);
+  ++m_countExtrapolations;
+
+  // straight line distance along track to intersect with disc
+  double stepLength = distanceToDisc(*isect, surface.center().z());
+  step(*isect, stepLength);
+  
+  return isect.release();
+}
+
+/**IIntersector interface method for specific Surface type : PlaneSurface */
+const Trk::TrackSurfaceIntersection*
+StraightLineIntersector::intersectPlaneSurface(const PlaneSurface&	surface,
+					       const TrackSurfaceIntersection*	trackIntersection,
+					       const double      	/*qOverP*/)
+{
+  auto isect = std::make_unique<TrackSurfaceIntersection> (*trackIntersection);
+  ++m_countExtrapolations;
+
+  // straight line distance along track to intersect with plane
+  double stepLength = distanceToPlane (*isect, surface.center(),surface.normal());
+  step(*isect, stepLength);
+  stepLength = distanceToPlane (*isect, surface.center(),surface.normal());
+
+  return isect.release();
+}
+
+
+} // end of namespace
diff --git a/Tracking/TrkExtrapolation/TrkExStraightLineIntersector/test/StraightLineIntersector_test.cxx b/Tracking/TrkExtrapolation/TrkExStraightLineIntersector/test/StraightLineIntersector_test.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..cd1b87138450899562ca59fa4b4382f24782a53a
--- /dev/null
+++ b/Tracking/TrkExtrapolation/TrkExStraightLineIntersector/test/StraightLineIntersector_test.cxx
@@ -0,0 +1,210 @@
+/*
+ * Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ */
+/**
+ * @file TrkExStraightLineIntersector/test/StraghtLineIntersector_test.cxx
+ * @author scott snyder <snyder@bnl.gov>
+ * @date Jan, 2019
+ * @brief Regression tests for StraightLineIntersector
+ */
+
+#undef NDEBUG
+#include "TrkExInterfaces/IIntersector.h"
+#include "TestTools/initGaudi.h"
+#include "TestTools/FLOATassert.h"
+#include "GaudiKernel/ToolHandle.h"
+#include <iostream>
+#include <cassert>
+#include <cmath>
+
+
+void assertVec3D (const Amg::Vector3D& a, const Amg::Vector3D& b)
+{
+  FLOAT_EQassert (a.x(), b.x());
+  FLOAT_EQassert (a.y(), b.y());
+  FLOAT_EQassert (a.z(), b.z());
+}
+
+
+Amg::Vector3D unit (double x, double y, double z)
+{
+  return Amg::Vector3D (x, y, z).unit();
+}
+
+
+std::unique_ptr<Amg::Transform3D> transf (const Amg::Vector3D& pos,
+                                          const Amg::Vector3D& norm)
+{
+  Trk::CurvilinearUVT c (norm);
+  Amg::RotationMatrix3D curvilinearRotation;
+  curvilinearRotation.col(0) = c.curvU();
+  curvilinearRotation.col(1) = c.curvV();
+  curvilinearRotation.col(2) = c.curvT();
+  auto transf = std::make_unique<Amg::Transform3D>();
+  *transf = curvilinearRotation;
+  transf->pretranslate(pos);
+  return transf;
+}
+
+
+void test_plane (Trk::IIntersector& tool)
+{
+  std::cout << "test_plane\n";
+  Amg::Vector3D pos1 { 0, 0, 100 };
+  Amg::Vector3D norm1 { 0, 1, 1 };
+  Trk::PlaneSurface plane1 (transf (pos1, norm1));
+  Amg::Vector3D pos2 { 0, 0, 200 };
+  Trk::PlaneSurface plane2 (transf (pos2, norm1));
+  
+  Trk::TrackSurfaceIntersection isect0
+    (Amg::Vector3D{0,0,0}, unit(1,1,1), 0);
+
+  std::unique_ptr<const Trk::TrackSurfaceIntersection> isect1
+    (tool.intersectSurface (plane1, &isect0, 1));
+  assertVec3D (isect1->position(), {50, 50, 50});
+  assertVec3D (isect1->direction(), {1/sqrt(3.), 1/sqrt(3.), 1/sqrt(3.)});
+  FLOAT_EQassert (isect1->pathlength(), 50*sqrt(3.));
+
+  std::unique_ptr<const Trk::TrackSurfaceIntersection> isect1a
+    (tool.intersectSurface (plane2, isect1.get(), 1));
+  assertVec3D (isect1a->position(), {100, 100, 100});
+  assertVec3D (isect1a->direction(), {1/sqrt(3.), 1/sqrt(3.), 1/sqrt(3.)});
+  FLOAT_EQassert (isect1a->pathlength(), 100*sqrt(3.));
+
+  Trk::TrackSurfaceIntersection isect2
+    (Amg::Vector3D{0,0,0}, unit(0,0,-1), 0);
+  std::unique_ptr<const Trk::TrackSurfaceIntersection> isect3
+    (tool.intersectSurface (plane1, &isect2, 1));
+  assertVec3D (isect3->position(), {0, 0, 100});
+  assertVec3D (isect3->direction(), {0, 0, -1});
+  FLOAT_EQassert (isect3->pathlength(), -100);
+
+  std::unique_ptr<const Trk::TrackSurfaceIntersection> isect3a
+    (tool.intersectSurface (plane2, isect3.get(), 1));
+  assertVec3D (isect3a->position(), {0, 0, 200});
+  assertVec3D (isect3a->direction(), {0, 0, -1});
+  FLOAT_EQassert (isect3a->pathlength(), -200);
+}
+
+
+void test_line (Trk::IIntersector& tool)
+{
+  std::cout << "test_line\n";
+  Amg::Vector3D pos1 { 0, 0, 100 };
+  Amg::Vector3D norm1 { 0, 1, 0 };
+  Trk::StraightLineSurface line1 (transf (pos1, norm1));
+  Amg::Vector3D pos2 { 0, 0, 200 };
+  Trk::StraightLineSurface line2 (transf (pos2, norm1));
+
+  Trk::TrackSurfaceIntersection isect0
+    (Amg::Vector3D{0,0,0}, unit(1,0,1), 0);
+
+  std::unique_ptr<const Trk::TrackSurfaceIntersection> isect1
+    (tool.intersectSurface (line1, &isect0, 1));
+  assertVec3D (isect1->position(), {50, 0, 50});
+  assertVec3D (isect1->direction(), {1/sqrt(2.), 0, 1/sqrt(2.)});
+  FLOAT_EQassert (isect1->pathlength(), 50*sqrt(2.));
+
+  std::unique_ptr<const Trk::TrackSurfaceIntersection> isect2
+    (tool.intersectSurface (line2, isect1.get(), 1));
+  assertVec3D (isect2->position(), {100, 0, 100});
+  assertVec3D (isect2->direction(), {1/sqrt(2.), 0, 1/sqrt(2.)});
+  FLOAT_EQassert (isect2->pathlength(), 100*sqrt(2.));
+}
+
+
+void test_cylinder (Trk::IIntersector& tool)
+{
+  std::cout << "test_cylinder\n";
+
+  Amg::Vector3D pos1 { 0, 0, 0 };
+  Amg::Vector3D norm1 { 0, 0, 1 };
+  Trk::CylinderSurface cyl1 (transf (pos1, norm1).release(),  50, 100);
+  Trk::CylinderSurface cyl2 (transf (pos1, norm1).release(), 200, 100);
+
+  Trk::TrackSurfaceIntersection isect0
+    (Amg::Vector3D{0,0,0}, unit(1,0,1), 0);
+
+  std::unique_ptr<const Trk::TrackSurfaceIntersection> isect1
+    (tool.intersectSurface (cyl1, &isect0, 1));
+  assertVec3D (isect1->position(), {50, 0, 50});
+  assertVec3D (isect1->direction(), {1/sqrt(2.), 0, 1/sqrt(2.)});
+  FLOAT_EQassert (isect1->pathlength(), 50*sqrt(2.));
+
+  std::unique_ptr<const Trk::TrackSurfaceIntersection> isect2
+    (tool.intersectSurface (cyl2, isect1.get(), 1));
+  assertVec3D (isect2->position(), {200, 0, 200});
+  assertVec3D (isect2->direction(), {1/sqrt(2.), 0, 1/sqrt(2.)});
+  FLOAT_EQassert (isect2->pathlength(), 200*sqrt(2.));
+}
+
+
+void test_disc (Trk::IIntersector& tool)
+{
+  std::cout << "test_disc\n";
+
+  Amg::Vector3D pos1 { 0, 0, 75 };
+  Amg::Vector3D norm1 { 0, 0, 1 };
+  Trk::DiscSurface disc1 (transf (pos1, norm1));
+  Amg::Vector3D pos2 { 0, 0, 200 };
+  Trk::DiscSurface disc2 (transf (pos2, norm1));
+
+  Trk::TrackSurfaceIntersection isect0
+    (Amg::Vector3D{0,0,0}, unit(1,0,1), 0);
+
+  std::unique_ptr<const Trk::TrackSurfaceIntersection> isect1
+    (tool.intersectSurface (disc1, &isect0, 1));
+  assertVec3D (isect1->position(), {75, 0, 75});
+  assertVec3D (isect1->direction(), {1/sqrt(2.), 0, 1/sqrt(2.)});
+  FLOAT_EQassert (isect1->pathlength(), 75*sqrt(2.));
+
+  std::unique_ptr<const Trk::TrackSurfaceIntersection> isect2
+    (tool.intersectSurface (disc2, isect1.get(), 1));
+  assertVec3D (isect2->position(), {200, 0, 200});
+  assertVec3D (isect2->direction(), {1/sqrt(2.), 0, 1/sqrt(2.)});
+  FLOAT_EQassert (isect2->pathlength(), 200*sqrt(2.));
+}
+
+
+void test_perigee (Trk::IIntersector& tool)
+{
+  std::cout << "test_perigee\n";
+
+  Amg::Vector3D pos1 { 0, 0, 80 };
+  Amg::Vector3D norm1 { 0, 1, 0 };
+  Trk::PerigeeSurface perigee1 (transf (pos1, norm1));
+  Amg::Vector3D pos2 { 0, 0, 200 };
+  Trk::PerigeeSurface perigee2 (transf (pos2, norm1));
+
+  Trk::TrackSurfaceIntersection isect0
+    (Amg::Vector3D{0,0,0}, unit(1,0,1), 0);
+
+  std::unique_ptr<const Trk::TrackSurfaceIntersection> isect1
+    (tool.intersectSurface (perigee1, &isect0, 1));
+  assertVec3D (isect1->position(), {40, 0, 40});
+  assertVec3D (isect1->direction(), {1/sqrt(2.), 0, 1/sqrt(2.)});
+  FLOAT_EQassert (isect1->pathlength(), 40*sqrt(2.));
+
+  std::unique_ptr<const Trk::TrackSurfaceIntersection> isect2
+    (tool.intersectSurface (perigee2, isect1.get(), 1));
+  assertVec3D (isect2->position(), {100, 0, 100});
+  assertVec3D (isect2->direction(), {1/sqrt(2.), 0, 1/sqrt(2.)});
+  FLOAT_EQassert (isect2->pathlength(), 100*sqrt(2.));
+}
+
+
+int main()
+{
+  std::cout << "StraightLineIntersector_test\n";
+  ISvcLocator* svcloc = nullptr;
+  Athena_test::initGaudi (svcloc);
+  ToolHandle<Trk::IIntersector> tool ("Trk::StraightLineIntersector");
+  assert( tool.retrieve().isSuccess() );
+
+  test_plane (*tool);
+  test_line (*tool);
+  test_cylinder (*tool);
+  test_disc (*tool);
+  test_perigee (*tool);
+  return 0;
+}
diff --git a/Tracking/TrkExtrapolation/TrkExUtils/TrkExUtils/TrackSurfaceIntersection.h b/Tracking/TrkExtrapolation/TrkExUtils/TrkExUtils/TrackSurfaceIntersection.h
index 87380ac465361ca5b9390f4f5aa460d38f0de031..dc32fd49c057f2ed243a758c788ac2588ee9d4c0 100755
--- a/Tracking/TrkExtrapolation/TrkExUtils/TrkExUtils/TrackSurfaceIntersection.h
+++ b/Tracking/TrkExtrapolation/TrkExUtils/TrkExUtils/TrackSurfaceIntersection.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 ///////////////////////////////////////////////////////////////////
@@ -31,16 +31,22 @@ namespace Trk {
 	  /**Constructor*/
 	  TrackSurfaceIntersection(const Amg::Vector3D& pos, const Amg::Vector3D& dir, double path);
 	  /**Destructor*/
-	  virtual ~TrackSurfaceIntersection();
+	  virtual ~TrackSurfaceIntersection() = default;
+
+          TrackSurfaceIntersection (const TrackSurfaceIntersection& other);
+          TrackSurfaceIntersection& operator= (const TrackSurfaceIntersection& other) = default;
 
 	  /** Method to retrieve the position of the Intersection */
 	  const Amg::Vector3D& position() const;
+	        Amg::Vector3D& position();
         
 	  /** Method to retrieve the direction at the Intersection */
 	  const Amg::Vector3D& direction() const;
+	        Amg::Vector3D& direction();
         
 	  /** Method to retrieve the pathlength propagated till the Intersection */
-	  double pathlength() const;
+	  double  pathlength() const;
+	  double& pathlength();
         
 	  /** Method to retrieve the object serial number (needed for speed optimization) */
 	  unsigned long long serialNumber() const;
@@ -57,12 +63,21 @@ namespace Trk {
   inline const Amg::Vector3D& TrackSurfaceIntersection::position() const
   { return m_position; }
 
+  inline Amg::Vector3D& TrackSurfaceIntersection::position()
+  { return m_position; }
+
   inline const Amg::Vector3D& TrackSurfaceIntersection::direction() const
   { return m_direction; }
 
+  inline Amg::Vector3D& TrackSurfaceIntersection::direction()
+  { return m_direction; }
+
   inline double TrackSurfaceIntersection::pathlength() const
   { return m_pathlength; }
   
+  inline double& TrackSurfaceIntersection::pathlength()
+  { return m_pathlength; }
+  
   inline unsigned long long TrackSurfaceIntersection::serialNumber() const
   { return m_serialNumber; }
 
diff --git a/Tracking/TrkExtrapolation/TrkExUtils/TrkExUtils/TransportJacobian.h b/Tracking/TrkExtrapolation/TrkExUtils/TrkExUtils/TransportJacobian.h
index afa182a5b86d2c209ed52195e393f48dc9306196..5fd345d6263c62e2b626ec477994b2468c787b0e 100755
--- a/Tracking/TrkExtrapolation/TrkExUtils/TrkExUtils/TransportJacobian.h
+++ b/Tracking/TrkExtrapolation/TrkExUtils/TrkExUtils/TransportJacobian.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 ///////////////////////////////////////////////////////////////////
@@ -51,7 +51,7 @@ namespace Trk {
       TransportJacobian(const AmgMatrix(5,5)&);
       
       /** Destructor */
-      ~TransportJacobian(){};
+      ~TransportJacobian() = default;
       
     private:
       
diff --git a/Tracking/TrkExtrapolation/TrkExUtils/src/TrackSurfaceIntersection.cxx b/Tracking/TrkExtrapolation/TrkExUtils/src/TrackSurfaceIntersection.cxx
index 2e5da7898a9bac4a80dab0ade45529633bd55e2e..3640644623b6a962894ec64394ba64fb7f834d46 100755
--- a/Tracking/TrkExtrapolation/TrkExUtils/src/TrackSurfaceIntersection.cxx
+++ b/Tracking/TrkExtrapolation/TrkExUtils/src/TrackSurfaceIntersection.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 ///////////////////////////////////////////////////////////////////
@@ -22,16 +22,20 @@ unsigned long long	Trk::TrackSurfaceIntersection::s_serialNumber = 0;
 Trk::TrackSurfaceIntersection::TrackSurfaceIntersection(const Amg::Vector3D&	pos,
 							const Amg::Vector3D&	dir,
 							double			path)
+  : m_position (pos),
+    m_direction (dir),
+    m_pathlength (path)
 {
     m_serialNumber	= ++s_serialNumber;
-    m_position		= pos;
-    m_direction		= dir;
-    m_pathlength	= path;
 }
 
-// destructor
-Trk::TrackSurfaceIntersection::~TrackSurfaceIntersection()
-{}
+Trk::TrackSurfaceIntersection::TrackSurfaceIntersection(const TrackSurfaceIntersection& other)
+  : m_position (other.m_position),
+    m_direction (other.m_direction),
+    m_pathlength (other.m_pathlength)
+{
+    m_serialNumber	= ++s_serialNumber;
+}
 
 //Overload of << operator for both, MsgStream and std::ostream for debug output
 MsgStream& Trk::operator << ( MsgStream& sl, const Trk::TrackSurfaceIntersection& tsfi)
diff --git a/Tracking/TrkG4Components/TrkG4UserActions/TrkG4UserActions/GeantFollowerHelper.h b/Tracking/TrkG4Components/TrkG4UserActions/TrkG4UserActions/GeantFollowerHelper.h
index 2850eb2dd85ebce93b4db341a3598a2fd80189d9..bfc3e93eac867aef9539060491bf01f5be7bbd14 100644
--- a/Tracking/TrkG4Components/TrkG4UserActions/TrkG4UserActions/GeantFollowerHelper.h
+++ b/Tracking/TrkG4Components/TrkG4UserActions/TrkG4UserActions/GeantFollowerHelper.h
@@ -61,40 +61,45 @@ namespace Trk
       std::string                    m_validationTreeFolder;      //!< stream/folder to for the TTree to be written out
 
       TTree*                         m_validationTree;            //!< Root Validation Tree
-      /** Ntuple variables : initial parameters*/
-      mutable float                  m_t_x;
-      mutable float                  m_t_y;
-      mutable float                  m_t_z;
-      mutable float                  m_t_theta;
-      mutable float                  m_t_eta;
-      mutable float                  m_t_phi;
-      mutable float                  m_t_p;
-      mutable float                  m_t_charge;
-      mutable int                    m_t_pdg;
-      /** Ntuple variables : g4 step parameters */
-      mutable int                    m_g4_steps;
-      mutable float                  m_g4_p[MAXPROBES];
-      mutable float                  m_g4_eta[MAXPROBES];
-      mutable float                  m_g4_theta[MAXPROBES];
-      mutable float                  m_g4_phi[MAXPROBES];
-      mutable float                  m_g4_x[MAXPROBES];
-      mutable float                  m_g4_y[MAXPROBES];
-      mutable float                  m_g4_z[MAXPROBES];
-      mutable float                  m_g4_tX0[MAXPROBES];
-      mutable float                  m_g4_t[MAXPROBES];
-      mutable float                  m_g4_X0[MAXPROBES];
-      /** Ntuple variables : trk follow up parameters */
-      mutable int                    m_trk_status[MAXPROBES];
-      mutable float                  m_trk_p[MAXPROBES];
-      mutable float                  m_trk_eta[MAXPROBES];
-      mutable float                  m_trk_theta[MAXPROBES];
-      mutable float                  m_trk_phi[MAXPROBES];
-      mutable float                  m_trk_x[MAXPROBES];
-      mutable float                  m_trk_y[MAXPROBES];
-      mutable float                  m_trk_z[MAXPROBES];
-      mutable float                  m_trk_lx[MAXPROBES];
-      mutable float                  m_trk_ly[MAXPROBES];
-
+      /** Ntuple variables : initial parameters
+          Split this out into a separate, dynamically-allocated block.
+          Otherwise, the CaloCellNoiseAlg is so large that it violates
+          the ubsan sanity checks. **/
+      struct TreeData {
+          mutable float                  m_t_x {0};
+          mutable float                  m_t_y {0};
+          mutable float                  m_t_z {0};
+          mutable float                  m_t_theta {0};
+          mutable float                  m_t_eta {0};
+          mutable float                  m_t_phi {0};
+          mutable float                  m_t_p {0};
+          mutable float                  m_t_charge {0};
+          mutable int                    m_t_pdg {0};
+          /** Ntuple variables : g4 step parameters */
+          mutable int                    m_g4_steps {0};
+          mutable float                  m_g4_p[MAXPROBES] {0};
+          mutable float                  m_g4_eta[MAXPROBES] {0};
+          mutable float                  m_g4_theta[MAXPROBES] {0};
+          mutable float                  m_g4_phi[MAXPROBES] {0};
+          mutable float                  m_g4_x[MAXPROBES] {0};
+          mutable float                  m_g4_y[MAXPROBES] {0};
+          mutable float                  m_g4_z[MAXPROBES] {0};
+          mutable float                  m_g4_tX0[MAXPROBES] {0};
+          mutable float                  m_g4_t[MAXPROBES] {0};
+          mutable float                  m_g4_X0[MAXPROBES] {0};
+          /** Ntuple variables : trk follow up parameters */
+          mutable int                    m_trk_status[MAXPROBES] {0};
+          mutable float                  m_trk_p[MAXPROBES] {0};
+          mutable float                  m_trk_eta[MAXPROBES] {0};
+          mutable float                  m_trk_theta[MAXPROBES] {0};
+          mutable float                  m_trk_phi[MAXPROBES] {0};
+          mutable float                  m_trk_x[MAXPROBES] {0};
+          mutable float                  m_trk_y[MAXPROBES] {0};
+          mutable float                  m_trk_z[MAXPROBES] {0};
+          mutable float                  m_trk_lx[MAXPROBES] {0};
+          mutable float                  m_trk_ly[MAXPROBES] {0};
+      };
+      std::unique_ptr<TreeData> m_treeData;
   };
 
 }
diff --git a/Tracking/TrkG4Components/TrkG4UserActions/TrkG4UserActions/GeantFollowerMSHelper.h b/Tracking/TrkG4Components/TrkG4UserActions/TrkG4UserActions/GeantFollowerMSHelper.h
index dc03743420b6182eb5a925112a4e37f0af4c5e70..5f3c11e7b93fbd93ff8747783d8ea994ac8cb83c 100644
--- a/Tracking/TrkG4Components/TrkG4UserActions/TrkG4UserActions/GeantFollowerMSHelper.h
+++ b/Tracking/TrkG4Components/TrkG4UserActions/TrkG4UserActions/GeantFollowerMSHelper.h
@@ -90,83 +90,89 @@ namespace Trk
       std::string                    m_validationTreeFolder;      //!< stream/folder to for the TTree to be written out
 
       TTree*                         m_validationTree;            //!< Root Validation Tree
-      mutable float                  m_t_x;
-      mutable float                  m_t_y;
-      mutable float                  m_t_z;
-      mutable float                  m_t_theta;
-      mutable float                  m_t_eta;
-      mutable float                  m_t_phi;
-      mutable float                  m_t_p;
-      mutable float                  m_t_charge;
-      mutable int                    m_t_pdg;
-      mutable float                  m_m_x;
-      mutable float                  m_m_y;
-      mutable float                  m_m_z;
-      mutable float                  m_m_theta;
-      mutable float                  m_m_eta;
-      mutable float                  m_m_phi;
-      mutable float                  m_m_p;
-      mutable float                  m_b_x;
-      mutable float                  m_b_y;
-      mutable float                  m_b_z;
-      mutable float                  m_b_theta;
-      mutable float                  m_b_eta;
-      mutable float                  m_b_phi;
-      mutable float                  m_b_p;
-      mutable float                  m_b_X0;
-      mutable float                  m_b_Eloss;
-      /** Ntuple variables : g4 step parameters */
-      mutable int                    m_g4_steps;
-      mutable float                  m_g4_p[MAXPROBES];
-      mutable float                  m_g4_eta[MAXPROBES];
-      mutable float                  m_g4_theta[MAXPROBES];
-      mutable float                  m_g4_phi[MAXPROBES];
-      mutable float                  m_g4_x[MAXPROBES];
-      mutable float                  m_g4_y[MAXPROBES];
-      mutable float                  m_g4_z[MAXPROBES];
-      mutable float                  m_g4_tX0[MAXPROBES];
-      mutable float                  m_g4_t[MAXPROBES];
-      mutable float                  m_g4_X0[MAXPROBES];
-      /** Ntuple variables : trk follow up parameters */
-      mutable int                    m_trk_status[MAXPROBES];
-      mutable float                  m_trk_p[MAXPROBES];
-      mutable float                  m_trk_eta[MAXPROBES];
-      mutable float                  m_trk_theta[MAXPROBES];
-      mutable float                  m_trk_phi[MAXPROBES];
-      mutable float                  m_trk_x[MAXPROBES];
-      mutable float                  m_trk_y[MAXPROBES];
-      mutable float                  m_trk_z[MAXPROBES];
-      mutable float                  m_trk_lx[MAXPROBES];
-      mutable float                  m_trk_ly[MAXPROBES];
-      mutable float                  m_trk_eloss[MAXPROBES];
-      mutable float                  m_trk_eloss1[MAXPROBES];
-      mutable float                  m_trk_eloss0[MAXPROBES];
-      mutable float                  m_trk_eloss5[MAXPROBES];
-      mutable float                  m_trk_eloss10[MAXPROBES];
-      mutable float                  m_trk_scaleeloss[MAXPROBES];
-      mutable float                  m_trk_scalex0[MAXPROBES];
-      mutable float                  m_trk_x0[MAXPROBES];
-      mutable float                  m_trk_erd0[MAXPROBES];
-      mutable float                  m_trk_erz0[MAXPROBES];
-      mutable float                  m_trk_erphi[MAXPROBES];
-      mutable float                  m_trk_ertheta[MAXPROBES];
-      mutable float                  m_trk_erqoverp[MAXPROBES];
-      /** Scattering centra from Trk */
-      mutable int                    m_trk_scats;
-      mutable int                    m_trk_sstatus[500];
-      mutable float                  m_trk_sx[500];
-      mutable float                  m_trk_sy[500];
-      mutable float                  m_trk_sz[500];
-      mutable float                  m_trk_sx0[500];
-      mutable float                  m_trk_seloss[500];
-      mutable float                  m_trk_smeanIoni[500];
-      mutable float                  m_trk_ssigIoni[500];
-      mutable float                  m_trk_smeanRad[500];
-      mutable float                  m_trk_ssigRad[500];
-      mutable float                  m_trk_ssigTheta[500];
-      mutable float                  m_trk_ssigPhi[500];
-      mutable int                    m_g4_stepsMS;
-
+      /** Ntuple variables : initial parameters
+          Split this out into a separate, dynamically-allocated block.
+          Otherwise, the CaloCellNoiseAlg is so large that it violates
+          the ubsan sanity checks. **/
+      struct TreeData {
+          mutable float                  m_t_x {0};
+          mutable float                  m_t_y {0};
+          mutable float                  m_t_z {0};
+          mutable float                  m_t_theta {0};
+          mutable float                  m_t_eta {0};
+          mutable float                  m_t_phi {0};
+          mutable float                  m_t_p {0};
+          mutable float                  m_t_charge {0};
+          mutable int                    m_t_pdg {0};
+          mutable float                  m_m_x {0};
+          mutable float                  m_m_y {0};
+          mutable float                  m_m_z {0};
+          mutable float                  m_m_theta {0};
+          mutable float                  m_m_eta {0};
+          mutable float                  m_m_phi {0};
+          mutable float                  m_m_p {0};
+          mutable float                  m_b_x {0};
+          mutable float                  m_b_y {0};
+          mutable float                  m_b_z {0};
+          mutable float                  m_b_theta {0};
+          mutable float                  m_b_eta {0};
+          mutable float                  m_b_phi {0};
+          mutable float                  m_b_p {0};
+          mutable float                  m_b_X0 {0};
+          mutable float                  m_b_Eloss {0};
+          /** Ntuple variables : g4 step parameters */
+          mutable int                    m_g4_steps {0};
+          mutable float                  m_g4_p[MAXPROBES] {0};
+          mutable float                  m_g4_eta[MAXPROBES] {0};
+          mutable float                  m_g4_theta[MAXPROBES] {0};
+          mutable float                  m_g4_phi[MAXPROBES] {0};
+          mutable float                  m_g4_x[MAXPROBES] {0};
+          mutable float                  m_g4_y[MAXPROBES] {0};
+          mutable float                  m_g4_z[MAXPROBES] {0};
+          mutable float                  m_g4_tX0[MAXPROBES] {0};
+          mutable float                  m_g4_t[MAXPROBES] {0};
+          mutable float                  m_g4_X0[MAXPROBES] {0};
+          /** Ntuple variables : trk follow up parameters */
+          mutable int                    m_trk_status[MAXPROBES] {0};
+          mutable float                  m_trk_p[MAXPROBES] {0};
+          mutable float                  m_trk_eta[MAXPROBES] {0};
+          mutable float                  m_trk_theta[MAXPROBES] {0};
+          mutable float                  m_trk_phi[MAXPROBES] {0};
+          mutable float                  m_trk_x[MAXPROBES] {0};
+          mutable float                  m_trk_y[MAXPROBES] {0};
+          mutable float                  m_trk_z[MAXPROBES] {0};
+          mutable float                  m_trk_lx[MAXPROBES] {0};
+          mutable float                  m_trk_ly[MAXPROBES] {0};
+          mutable float                  m_trk_eloss[MAXPROBES] {0};
+          mutable float                  m_trk_eloss1[MAXPROBES] {0};
+          mutable float                  m_trk_eloss0[MAXPROBES] {0};
+          mutable float                  m_trk_eloss5[MAXPROBES] {0};
+          mutable float                  m_trk_eloss10[MAXPROBES] {0};
+          mutable float                  m_trk_scaleeloss[MAXPROBES] {0};
+          mutable float                  m_trk_scalex0[MAXPROBES] {0};
+          mutable float                  m_trk_x0[MAXPROBES] {0};
+          mutable float                  m_trk_erd0[MAXPROBES] {0};
+          mutable float                  m_trk_erz0[MAXPROBES] {0};
+          mutable float                  m_trk_erphi[MAXPROBES] {0};
+          mutable float                  m_trk_ertheta[MAXPROBES] {0};
+          mutable float                  m_trk_erqoverp[MAXPROBES] {0};
+          /** Scattering centra from Trk */
+          mutable int                    m_trk_scats {0};
+          mutable int                    m_trk_sstatus[500] {0};
+          mutable float                  m_trk_sx[500] {0};
+          mutable float                  m_trk_sy[500] {0};
+          mutable float                  m_trk_sz[500] {0};
+          mutable float                  m_trk_sx0[500] {0};
+          mutable float                  m_trk_seloss[500] {0};
+          mutable float                  m_trk_smeanIoni[500] {0};
+          mutable float                  m_trk_ssigIoni[500] {0};
+          mutable float                  m_trk_smeanRad[500] {0};
+          mutable float                  m_trk_ssigRad[500] {0};
+          mutable float                  m_trk_ssigTheta[500] {0};
+          mutable float                  m_trk_ssigPhi[500] {0};
+          mutable int                    m_g4_stepsMS {0};
+      };
+      std::unique_ptr<TreeData> m_treeData;
   };
 
 }
diff --git a/Tracking/TrkG4Components/TrkG4UserActions/src/GeantFollowerHelper.cxx b/Tracking/TrkG4Components/TrkG4UserActions/src/GeantFollowerHelper.cxx
index 811beb16287c5dae97d325ce7c34b12b3668433b..54592da4fc3e6ada9f1437d265936816cdc1d441 100644
--- a/Tracking/TrkG4Components/TrkG4UserActions/src/GeantFollowerHelper.cxx
+++ b/Tracking/TrkG4Components/TrkG4UserActions/src/GeantFollowerHelper.cxx
@@ -31,9 +31,7 @@ Trk::GeantFollowerHelper::GeantFollowerHelper(const std::string& t, const std::s
   m_validationTreeName("G4Follower_"+n),
   m_validationTreeDescription("Output of the G4Follower_"),
   m_validationTreeFolder("/val/G4Follower_"+n),
-  m_validationTree(nullptr),
-  m_t_x{}, m_t_y{}, m_t_z{}, m_t_theta{},m_t_eta{},m_t_phi{}, m_t_p{}, m_t_charge{}, m_t_pdg{},
-  m_g4_steps{}
+  m_validationTree(nullptr)
 {
   // properties
   declareProperty("Extrapolator",                   m_extrapolator);
@@ -49,6 +47,8 @@ Trk::GeantFollowerHelper::~GeantFollowerHelper()
 // initialize
 StatusCode Trk::GeantFollowerHelper::initialize()
 {
+  m_treeData = std::make_unique<TreeData>();
+  
   if (m_extrapolator.retrieve().isFailure()){
     ATH_MSG_ERROR("Could not retrieve Extrapolator " << m_extrapolator << " . Abort.");
     return StatusCode::FAILURE;
@@ -57,50 +57,38 @@ StatusCode Trk::GeantFollowerHelper::initialize()
   // create the new Tree
   m_validationTree = new TTree(m_validationTreeName.c_str(), m_validationTreeDescription.c_str());
 
-  m_validationTree->Branch("InitX",        &m_t_x,       "initX/F");
-  m_validationTree->Branch("InitY",        &m_t_y,       "initY/F");
-  m_validationTree->Branch("InitZ",        &m_t_z,       "initZ/F");
-  m_validationTree->Branch("InitTheta",    &m_t_theta,   "initTheta/F");
-  m_validationTree->Branch("InitEta",      &m_t_eta,     "initEta/F");
-  m_validationTree->Branch("InitPhi",      &m_t_phi,     "initPhi/F");
-  m_validationTree->Branch("InitP",        &m_t_p,       "initP/F");
-  m_validationTree->Branch("InitPdg",      &m_t_pdg,     "initPdg/I");
-  m_validationTree->Branch("InitCharge",   &m_t_charge,  "initQ/F");
-
-  m_validationTree->Branch("G4Steps",      &m_g4_steps, "g4steps/I");
-  m_validationTree->Branch("G4StepP",      m_g4_p,      "g4stepP[g4steps]/F");
-  m_validationTree->Branch("G4StepEta",    m_g4_eta,    "g4stepEta[g4steps]/F");
-  m_validationTree->Branch("G4StepTheta",  m_g4_theta,  "g4stepTheta[g4steps]/F");
-  m_validationTree->Branch("G4StepPhi",    m_g4_phi,    "g4stepPhi[g4steps]/F");
-  m_validationTree->Branch("G4StepX",      m_g4_x,      "g4stepX[g4steps]/F");
-  m_validationTree->Branch("G4StepY",      m_g4_y,      "g4stepY[g4steps]/F");
-  m_validationTree->Branch("G4StepZ",      m_g4_z,      "g4stepZ[g4steps]/F");
-  m_validationTree->Branch("G4AccumTX0",   m_g4_tX0,    "g4stepAccTX0[g4steps]/F");
-  m_validationTree->Branch("G4StepT",      m_g4_t,      "g4stepTX[g4steps]/F");
-  m_validationTree->Branch("G4StepX0",     m_g4_X0,     "g4stepX0[g4steps]/F");
-
-  m_validationTree->Branch("TrkStepStatus",m_trk_status, "trkstepStatus[g4steps]/I");
-  m_validationTree->Branch("TrkStepP",     m_trk_p,      "trkstepP[g4steps]/F");
-  m_validationTree->Branch("TrkStepEta",   m_trk_eta,    "trkstepEta[g4steps]/F");
-  m_validationTree->Branch("TrkStepTheta", m_trk_theta,  "trkstepTheta[g4steps]/F");
-  m_validationTree->Branch("TrkStepPhi",   m_trk_phi,    "trkstepPhi[g4steps]/F");
-  m_validationTree->Branch("TrkStepX",     m_trk_x,      "trkstepX[g4steps]/F");
-  m_validationTree->Branch("TrkStepY",     m_trk_y,      "trkstepY[g4steps]/F");
-  m_validationTree->Branch("TrkStepZ",     m_trk_z,      "trkstepZ[g4steps]/F");
-  m_validationTree->Branch("TrkStepLocX",  m_trk_lx,     "trkstepLX[g4steps]/F");
-  m_validationTree->Branch("TrkStepLocY",  m_trk_ly,     "trkstepLY[g4steps]/F");
-
-  // initialize
-  m_t_x        = 0.;
-  m_t_y        = 0.;
-  m_t_z        = 0.;
-  m_t_theta    = 0.;
-  m_t_eta      = 0.;
-  m_t_phi      = 0.;
-  m_t_p        = 0.;
-  m_t_charge   = 0.;
-  m_t_pdg      = 0;
-  m_g4_steps   = 0;
+  m_validationTree->Branch("InitX",        &m_treeData->m_t_x,       "initX/F");
+  m_validationTree->Branch("InitY",        &m_treeData->m_t_y,       "initY/F");
+  m_validationTree->Branch("InitZ",        &m_treeData->m_t_z,       "initZ/F");
+  m_validationTree->Branch("InitTheta",    &m_treeData->m_t_theta,   "initTheta/F");
+  m_validationTree->Branch("InitEta",      &m_treeData->m_t_eta,     "initEta/F");
+  m_validationTree->Branch("InitPhi",      &m_treeData->m_t_phi,     "initPhi/F");
+  m_validationTree->Branch("InitP",        &m_treeData->m_t_p,       "initP/F");
+  m_validationTree->Branch("InitPdg",      &m_treeData->m_t_pdg,     "initPdg/I");
+  m_validationTree->Branch("InitCharge",   &m_treeData->m_t_charge,  "initQ/F");
+
+  m_validationTree->Branch("G4Steps",      &m_treeData->m_g4_steps, "g4steps/I");
+  m_validationTree->Branch("G4StepP",      m_treeData->m_g4_p,      "g4stepP[g4steps]/F");
+  m_validationTree->Branch("G4StepEta",    m_treeData->m_g4_eta,    "g4stepEta[g4steps]/F");
+  m_validationTree->Branch("G4StepTheta",  m_treeData->m_g4_theta,  "g4stepTheta[g4steps]/F");
+  m_validationTree->Branch("G4StepPhi",    m_treeData->m_g4_phi,    "g4stepPhi[g4steps]/F");
+  m_validationTree->Branch("G4StepX",      m_treeData->m_g4_x,      "g4stepX[g4steps]/F");
+  m_validationTree->Branch("G4StepY",      m_treeData->m_g4_y,      "g4stepY[g4steps]/F");
+  m_validationTree->Branch("G4StepZ",      m_treeData->m_g4_z,      "g4stepZ[g4steps]/F");
+  m_validationTree->Branch("G4AccumTX0",   m_treeData->m_g4_tX0,    "g4stepAccTX0[g4steps]/F");
+  m_validationTree->Branch("G4StepT",      m_treeData->m_g4_t,      "g4stepTX[g4steps]/F");
+  m_validationTree->Branch("G4StepX0",     m_treeData->m_g4_X0,     "g4stepX0[g4steps]/F");
+
+  m_validationTree->Branch("TrkStepStatus",m_treeData->m_trk_status, "trkstepStatus[g4steps]/I");
+  m_validationTree->Branch("TrkStepP",     m_treeData->m_trk_p,      "trkstepP[g4steps]/F");
+  m_validationTree->Branch("TrkStepEta",   m_treeData->m_trk_eta,    "trkstepEta[g4steps]/F");
+  m_validationTree->Branch("TrkStepTheta", m_treeData->m_trk_theta,  "trkstepTheta[g4steps]/F");
+  m_validationTree->Branch("TrkStepPhi",   m_treeData->m_trk_phi,    "trkstepPhi[g4steps]/F");
+  m_validationTree->Branch("TrkStepX",     m_treeData->m_trk_x,      "trkstepX[g4steps]/F");
+  m_validationTree->Branch("TrkStepY",     m_treeData->m_trk_y,      "trkstepY[g4steps]/F");
+  m_validationTree->Branch("TrkStepZ",     m_treeData->m_trk_z,      "trkstepZ[g4steps]/F");
+  m_validationTree->Branch("TrkStepLocX",  m_treeData->m_trk_lx,     "trkstepLX[g4steps]/F");
+  m_validationTree->Branch("TrkStepLocY",  m_treeData->m_trk_ly,     "trkstepLY[g4steps]/F");
 
   // now register the Tree
   ITHistSvc* tHistSvc = 0;
@@ -124,16 +112,16 @@ StatusCode Trk::GeantFollowerHelper::finalize()
 
 void Trk::GeantFollowerHelper::beginEvent() const
 {
-  m_t_x        = 0.;
-  m_t_y        = 0.;
-  m_t_z        = 0.;
-  m_t_theta    = 0.;
-  m_t_eta      = 0.;
-  m_t_phi      = 0.;
-  m_t_p        = 0.;
-  m_t_charge   = 0.;
-  m_t_pdg      = 0;
-  m_g4_steps   = 0;
+  m_treeData->m_t_x        = 0.;
+  m_treeData->m_t_y        = 0.;
+  m_treeData->m_t_z        = 0.;
+  m_treeData->m_t_theta    = 0.;
+  m_treeData->m_t_eta      = 0.;
+  m_treeData->m_t_phi      = 0.;
+  m_treeData->m_t_p        = 0.;
+  m_treeData->m_t_charge   = 0.;
+  m_treeData->m_t_pdg      = 0;
+  m_treeData->m_g4_steps   = 0;
   m_tX0Cache   = 0.;
 }
 
@@ -145,37 +133,37 @@ void Trk::GeantFollowerHelper::trackParticle(const G4ThreeVector& pos,
   // construct the initial parameters
   Amg::Vector3D npos(pos.x(),pos.y(),pos.z());
   Amg::Vector3D nmom(mom.x(),mom.y(),mom.z());
-  if (!m_g4_steps){
+  if (!m_treeData->m_g4_steps){
     ATH_MSG_INFO("Initial step ... preparing event cache.");
-    m_t_x        = pos.x();
-    m_t_y        = pos.y();
-    m_t_z        = pos.z();
-    m_t_theta    = mom.theta();
-    m_t_eta      = mom.eta();
-    m_t_phi      = mom.phi();
-    m_t_p        = mom.mag();
-    m_t_charge   = charge;
-    m_t_pdg      = pdg;
-    m_g4_steps   = -1;
+    m_treeData->m_t_x        = pos.x();
+    m_treeData->m_t_y        = pos.y();
+    m_treeData->m_t_z        = pos.z();
+    m_treeData->m_t_theta    = mom.theta();
+    m_treeData->m_t_eta      = mom.eta();
+    m_treeData->m_t_phi      = mom.phi();
+    m_treeData->m_t_p        = mom.mag();
+    m_treeData->m_t_charge   = charge;
+    m_treeData->m_t_pdg      = pdg;
+    m_treeData->m_g4_steps   = -1;
     m_tX0Cache   = 0.;
     m_parameterCache = new Trk::CurvilinearParameters(npos, nmom, charge);
     return;
   }
 
   // jumping over inital step
-  m_g4_steps = (m_g4_steps == -1) ? 0 : m_g4_steps;
+  m_treeData->m_g4_steps = (m_treeData->m_g4_steps == -1) ? 0 : m_treeData->m_g4_steps;
 
   if (!m_parameterCache){
     ATH_MSG_WARNING("No Parameters available. Bailing out.");
     return;
   }
 
-  if ( m_g4_steps >= MAXPROBES) {
+  if ( m_treeData->m_g4_steps >= MAXPROBES) {
     ATH_MSG_WARNING("Maximum number of " << MAXPROBES << " reached, step is ignored.");
     return;
   }
   // parameters of the G4 step point
-  Trk::CurvilinearParameters* g4Parameters = new Trk::CurvilinearParameters(npos, nmom, m_t_charge);
+  Trk::CurvilinearParameters* g4Parameters = new Trk::CurvilinearParameters(npos, nmom, m_treeData->m_t_charge);
   // destination surface
   const Trk::PlaneSurface& destinationSurface = g4Parameters->associatedSurface();
   // extrapolate to the destination surface
@@ -183,29 +171,29 @@ void Trk::GeantFollowerHelper::trackParticle(const G4ThreeVector& pos,
     m_extrapolator->extrapolateDirectly(*m_parameterCache,destinationSurface,Trk::alongMomentum,false) :
     m_extrapolator->extrapolate(*m_parameterCache,destinationSurface,Trk::alongMomentum,false);
   // fill the geant information and the trk information
-  m_g4_p[m_g4_steps]       =  mom.mag();
-  m_g4_eta[m_g4_steps]     =  mom.eta();
-  m_g4_theta[m_g4_steps]   =  mom.theta();
-  m_g4_phi[m_g4_steps]     =  mom.phi();
-  m_g4_x[m_g4_steps]       =  pos.x();
-  m_g4_y[m_g4_steps]       =  pos.y();
-  m_g4_z[m_g4_steps]       =  pos.z();
+  m_treeData->m_g4_p[m_treeData->m_g4_steps]       =  mom.mag();
+  m_treeData->m_g4_eta[m_treeData->m_g4_steps]     =  mom.eta();
+  m_treeData->m_g4_theta[m_treeData->m_g4_steps]   =  mom.theta();
+  m_treeData->m_g4_phi[m_treeData->m_g4_steps]     =  mom.phi();
+  m_treeData->m_g4_x[m_treeData->m_g4_steps]       =  pos.x();
+  m_treeData->m_g4_y[m_treeData->m_g4_steps]       =  pos.y();
+  m_treeData->m_g4_z[m_treeData->m_g4_steps]       =  pos.z();
   float tX0 = X0 > 10e-5 ? t/X0 : 0.;
   m_tX0Cache              += tX0;
-  m_g4_tX0[m_g4_steps]     = m_tX0Cache;
-  m_g4_t[m_g4_steps]       = t;
-  m_g4_X0[m_g4_steps]      = X0;
-
-  m_trk_status[m_g4_steps] = trkParameters ? 1 : 0;
-  m_trk_p[m_g4_steps]      = trkParameters ? trkParameters->momentum().mag()      : 0.;
-  m_trk_eta[m_g4_steps]    = trkParameters ? trkParameters->momentum().eta()      : 0.;
-  m_trk_theta[m_g4_steps]  = trkParameters ? trkParameters->momentum().theta()    : 0.;
-  m_trk_phi[m_g4_steps]    = trkParameters ? trkParameters->momentum().phi()      : 0.;
-  m_trk_x[m_g4_steps]      = trkParameters ? trkParameters->position().x()        : 0.;
-  m_trk_y[m_g4_steps]      = trkParameters ? trkParameters->position().y()        : 0.;
-  m_trk_z[m_g4_steps]      = trkParameters ? trkParameters->position().z()        : 0.;
-  m_trk_lx[m_g4_steps]     = trkParameters ? trkParameters->parameters()[Trk::locX] : 0.;
-  m_trk_ly[m_g4_steps]     = trkParameters ? trkParameters->parameters()[Trk::locY] : 0.;
+  m_treeData->m_g4_tX0[m_treeData->m_g4_steps]     = m_tX0Cache;
+  m_treeData->m_g4_t[m_treeData->m_g4_steps]       = t;
+  m_treeData->m_g4_X0[m_treeData->m_g4_steps]      = X0;
+
+  m_treeData->m_trk_status[m_treeData->m_g4_steps] = trkParameters ? 1 : 0;
+  m_treeData->m_trk_p[m_treeData->m_g4_steps]      = trkParameters ? trkParameters->momentum().mag()      : 0.;
+  m_treeData->m_trk_eta[m_treeData->m_g4_steps]    = trkParameters ? trkParameters->momentum().eta()      : 0.;
+  m_treeData->m_trk_theta[m_treeData->m_g4_steps]  = trkParameters ? trkParameters->momentum().theta()    : 0.;
+  m_treeData->m_trk_phi[m_treeData->m_g4_steps]    = trkParameters ? trkParameters->momentum().phi()      : 0.;
+  m_treeData->m_trk_x[m_treeData->m_g4_steps]      = trkParameters ? trkParameters->position().x()        : 0.;
+  m_treeData->m_trk_y[m_treeData->m_g4_steps]      = trkParameters ? trkParameters->position().y()        : 0.;
+  m_treeData->m_trk_z[m_treeData->m_g4_steps]      = trkParameters ? trkParameters->position().z()        : 0.;
+  m_treeData->m_trk_lx[m_treeData->m_g4_steps]     = trkParameters ? trkParameters->parameters()[Trk::locX] : 0.;
+  m_treeData->m_trk_ly[m_treeData->m_g4_steps]     = trkParameters ? trkParameters->parameters()[Trk::locY] : 0.;
 
   // update the parameters if needed/configured
   if (m_extrapolateIncrementally && trkParameters) {
@@ -214,7 +202,7 @@ void Trk::GeantFollowerHelper::trackParticle(const G4ThreeVector& pos,
   }
   // delete cache and increment
   delete g4Parameters;
-  ++m_g4_steps;
+  ++m_treeData->m_g4_steps;
 }
 
 void Trk::GeantFollowerHelper::endEvent() const
diff --git a/Tracking/TrkG4Components/TrkG4UserActions/src/GeantFollowerMSHelper.cxx b/Tracking/TrkG4Components/TrkG4UserActions/src/GeantFollowerMSHelper.cxx
index 03beb28cebc330b3ce63b25536dc83a7a11d51b9..a41d6cd108771ee3ec202edd6543dccf70a85c62 100644
--- a/Tracking/TrkG4Components/TrkG4UserActions/src/GeantFollowerMSHelper.cxx
+++ b/Tracking/TrkG4Components/TrkG4UserActions/src/GeantFollowerMSHelper.cxx
@@ -41,80 +41,6 @@ Trk::GeantFollowerMSHelper::GeantFollowerMSHelper(const std::string& t, const st
  , m_validationTreeDescription("Output of the G4Follower_")
  , m_validationTreeFolder("/val/G4Follower")
  , m_validationTree(nullptr)
- , m_t_x(0.)
- , m_t_y(0.)
- , m_t_z(0.)
- , m_t_theta(0.)
- , m_t_eta(0.)
- , m_t_phi(0.)
- , m_t_p(0.)
- , m_t_charge(0.)
- , m_t_pdg(0)
- , m_m_x(0.)
- , m_m_y(0.)
- , m_m_z(0.)
- , m_m_theta(0.)
- , m_m_eta(0.)
- , m_m_phi(0.)
- , m_m_p(0.)
- , m_b_x(0.)
- , m_b_y(0.)
- , m_b_z(0.)
- , m_b_theta(0.)
- , m_b_eta(0.)
- , m_b_phi(0.)
- , m_b_p(0.)
- , m_b_X0(0.)
- , m_b_Eloss(0.)
- , m_g4_steps(-1)
- , m_g4_p{0}
- , m_g4_eta{0}
- , m_g4_theta{0}
- , m_g4_phi{0}
- , m_g4_x{0}
- , m_g4_y{0}
- , m_g4_z{0}
- , m_g4_tX0{0}
- , m_g4_t{0}
- , m_g4_X0{0}
- , m_trk_status{0}
- , m_trk_p{0}
- , m_trk_eta{0}
- , m_trk_theta{0}
- , m_trk_phi{0}
- , m_trk_x{0}
- , m_trk_y{0}
- , m_trk_z{0}
- , m_trk_lx{0}
- , m_trk_ly{0}
- , m_trk_eloss{0}
- , m_trk_eloss1{0}
- , m_trk_eloss0{0}
- , m_trk_eloss5{0}
- , m_trk_eloss10{0}
- , m_trk_scaleeloss{0}
- , m_trk_scalex0{0}
- , m_trk_x0{0}
- , m_trk_erd0{0}
- , m_trk_erz0{0}
- , m_trk_erphi{0}
- , m_trk_ertheta{0}
- , m_trk_erqoverp{0}
- , m_trk_scats(0)
- , m_trk_sstatus{0}
- , m_trk_sx{0}
- , m_trk_sy{0}
- , m_trk_sz{0}
- , m_trk_sx0{0}
- , m_trk_seloss{0}
- , m_trk_smeanIoni{0}
- , m_trk_ssigIoni{0}
- , m_trk_smeanRad{0}
- , m_trk_ssigRad{0}
- , m_trk_ssigTheta{0}
- , m_trk_ssigPhi{0}
- , m_g4_stepsMS(-1)
-
 {
    // properties
    declareProperty("Extrapolator",                   m_extrapolator);
@@ -134,7 +60,8 @@ Trk::GeantFollowerMSHelper::~GeantFollowerMSHelper()
 // initialize
 StatusCode Trk::GeantFollowerMSHelper::initialize()
 {
-    
+   m_treeData = std::make_unique<TreeData>();
+
    if (m_extrapolator.retrieve().isFailure()){
        ATH_MSG_ERROR("Could not retrieve Extrapolator " << m_extrapolator << " . Abort.");
        return StatusCode::FAILURE;
@@ -155,118 +82,85 @@ StatusCode Trk::GeantFollowerMSHelper::initialize()
    // create the new Tree
    m_validationTree = new TTree(m_validationTreeName.c_str(), m_validationTreeDescription.c_str());
    
-   m_validationTree->Branch("InitX",        &m_t_x,       "initX/F");
-   m_validationTree->Branch("InitY",        &m_t_y,       "initY/F");
-   m_validationTree->Branch("InitZ",        &m_t_z,       "initZ/F");
-   m_validationTree->Branch("InitTheta",    &m_t_theta,   "initTheta/F");
-   m_validationTree->Branch("InitEta",      &m_t_eta,     "initEta/F");
-   m_validationTree->Branch("InitPhi",      &m_t_phi,     "initPhi/F");
-   m_validationTree->Branch("InitP",        &m_t_p,       "initP/F");
-   m_validationTree->Branch("InitPdg",      &m_t_pdg,     "initPdg/I");
-   m_validationTree->Branch("InitCharge",   &m_t_charge,  "initQ/F");
-
-   m_validationTree->Branch("MEntryX",        &m_m_x,       "mentryX/F");
-   m_validationTree->Branch("MEntryY",        &m_m_y,       "mentryY/F");
-   m_validationTree->Branch("MEntryZ",        &m_m_z,       "mentryZ/F");
-   m_validationTree->Branch("MEntryTheta",    &m_m_theta,   "mentryTheta/F");
-   m_validationTree->Branch("MEntryEta",      &m_m_eta,     "mentryEta/F");
-   m_validationTree->Branch("MEntryPhi",      &m_m_phi,     "mentryPhi/F");
-   m_validationTree->Branch("MEntryP",        &m_m_p,       "mentryP/F");
-
-   m_validationTree->Branch("BackX",        &m_b_x,       "backX/F");
-   m_validationTree->Branch("BackY",        &m_b_y,       "backY/F");
-   m_validationTree->Branch("BackZ",        &m_b_z,       "backZ/F");
-   m_validationTree->Branch("BackTheta",    &m_b_theta,   "backTheta/F");
-   m_validationTree->Branch("BackEta",      &m_b_eta,     "backEta/F");
-   m_validationTree->Branch("BackPhi",      &m_b_phi,     "backPhi/F");
-   m_validationTree->Branch("BackP",        &m_b_p,       "backP/F");
-   m_validationTree->Branch("BackX0",       &m_b_X0,      "backX0/F");
-   m_validationTree->Branch("BackEloss",    &m_b_Eloss,   "backEloss/F");
+   m_validationTree->Branch("InitX",        &m_treeData->m_t_x,       "initX/F");
+   m_validationTree->Branch("InitY",        &m_treeData->m_t_y,       "initY/F");
+   m_validationTree->Branch("InitZ",        &m_treeData->m_t_z,       "initZ/F");
+   m_validationTree->Branch("InitTheta",    &m_treeData->m_t_theta,   "initTheta/F");
+   m_validationTree->Branch("InitEta",      &m_treeData->m_t_eta,     "initEta/F");
+   m_validationTree->Branch("InitPhi",      &m_treeData->m_t_phi,     "initPhi/F");
+   m_validationTree->Branch("InitP",        &m_treeData->m_t_p,       "initP/F");
+   m_validationTree->Branch("InitPdg",      &m_treeData->m_t_pdg,     "initPdg/I");
+   m_validationTree->Branch("InitCharge",   &m_treeData->m_t_charge,  "initQ/F");
+
+   m_validationTree->Branch("MEntryX",        &m_treeData->m_m_x,       "mentryX/F");
+   m_validationTree->Branch("MEntryY",        &m_treeData->m_m_y,       "mentryY/F");
+   m_validationTree->Branch("MEntryZ",        &m_treeData->m_m_z,       "mentryZ/F");
+   m_validationTree->Branch("MEntryTheta",    &m_treeData->m_m_theta,   "mentryTheta/F");
+   m_validationTree->Branch("MEntryEta",      &m_treeData->m_m_eta,     "mentryEta/F");
+   m_validationTree->Branch("MEntryPhi",      &m_treeData->m_m_phi,     "mentryPhi/F");
+   m_validationTree->Branch("MEntryP",        &m_treeData->m_m_p,       "mentryP/F");
+
+   m_validationTree->Branch("BackX",        &m_treeData->m_b_x,       "backX/F");
+   m_validationTree->Branch("BackY",        &m_treeData->m_b_y,       "backY/F");
+   m_validationTree->Branch("BackZ",        &m_treeData->m_b_z,       "backZ/F");
+   m_validationTree->Branch("BackTheta",    &m_treeData->m_b_theta,   "backTheta/F");
+   m_validationTree->Branch("BackEta",      &m_treeData->m_b_eta,     "backEta/F");
+   m_validationTree->Branch("BackPhi",      &m_treeData->m_b_phi,     "backPhi/F");
+   m_validationTree->Branch("BackP",        &m_treeData->m_b_p,       "backP/F");
+   m_validationTree->Branch("BackX0",       &m_treeData->m_b_X0,      "backX0/F");
+   m_validationTree->Branch("BackEloss",    &m_treeData->m_b_Eloss,   "backEloss/F");
  
-   m_validationTree->Branch("G4Steps",      &m_g4_steps, "g4steps/I");
-   m_validationTree->Branch("TrkStepScats", &m_trk_scats, "trkscats/I");
-
-   m_validationTree->Branch("G4StepP",      m_g4_p,      "g4stepP[g4steps]/F");
-   m_validationTree->Branch("G4StepEta",    m_g4_eta,    "g4stepEta[g4steps]/F");
-   m_validationTree->Branch("G4StepTheta",  m_g4_theta,  "g4stepTheta[g4steps]/F");
-   m_validationTree->Branch("G4StepPhi",    m_g4_phi,    "g4stepPhi[g4steps]/F");
-   m_validationTree->Branch("G4StepX",      m_g4_x,      "g4stepX[g4steps]/F");
-   m_validationTree->Branch("G4StepY",      m_g4_y,      "g4stepY[g4steps]/F");
-   m_validationTree->Branch("G4StepZ",      m_g4_z,      "g4stepZ[g4steps]/F");
-   m_validationTree->Branch("G4AccumTX0",   m_g4_tX0,    "g4stepAccTX0[g4steps]/F");
-   m_validationTree->Branch("G4StepT",      m_g4_t,      "g4stepTX[g4steps]/F");
-   m_validationTree->Branch("G4StepX0",     m_g4_X0,     "g4stepX0[g4steps]/F");
+   m_validationTree->Branch("G4Steps",      &m_treeData->m_g4_steps, "g4steps/I");
+   m_validationTree->Branch("TrkStepScats", &m_treeData->m_trk_scats, "trkscats/I");
+
+   m_validationTree->Branch("G4StepP",      m_treeData->m_g4_p,      "g4stepP[g4steps]/F");
+   m_validationTree->Branch("G4StepEta",    m_treeData->m_g4_eta,    "g4stepEta[g4steps]/F");
+   m_validationTree->Branch("G4StepTheta",  m_treeData->m_g4_theta,  "g4stepTheta[g4steps]/F");
+   m_validationTree->Branch("G4StepPhi",    m_treeData->m_g4_phi,    "g4stepPhi[g4steps]/F");
+   m_validationTree->Branch("G4StepX",      m_treeData->m_g4_x,      "g4stepX[g4steps]/F");
+   m_validationTree->Branch("G4StepY",      m_treeData->m_g4_y,      "g4stepY[g4steps]/F");
+   m_validationTree->Branch("G4StepZ",      m_treeData->m_g4_z,      "g4stepZ[g4steps]/F");
+   m_validationTree->Branch("G4AccumTX0",   m_treeData->m_g4_tX0,    "g4stepAccTX0[g4steps]/F");
+   m_validationTree->Branch("G4StepT",      m_treeData->m_g4_t,      "g4stepTX[g4steps]/F");
+   m_validationTree->Branch("G4StepX0",     m_treeData->m_g4_X0,     "g4stepX0[g4steps]/F");
    
-   m_validationTree->Branch("TrkStepStatus",m_trk_status, "trkstepStatus[g4steps]/I");
-   m_validationTree->Branch("TrkStepP",     m_trk_p,      "trkstepP[g4steps]/F");
-   m_validationTree->Branch("TrkStepEta",   m_trk_eta,    "trkstepEta[g4steps]/F");
-   m_validationTree->Branch("TrkStepTheta", m_trk_theta,  "trkstepTheta[g4steps]/F");
-   m_validationTree->Branch("TrkStepPhi",   m_trk_phi,    "trkstepPhi[g4steps]/F");
-   m_validationTree->Branch("TrkStepX",     m_trk_x,      "trkstepX[g4steps]/F");
-   m_validationTree->Branch("TrkStepY",     m_trk_y,      "trkstepY[g4steps]/F");
-   m_validationTree->Branch("TrkStepZ",     m_trk_z,      "trkstepZ[g4steps]/F");
-   m_validationTree->Branch("TrkStepLocX",  m_trk_lx,     "trkstepLX[g4steps]/F");
-   m_validationTree->Branch("TrkStepLocY",  m_trk_ly,     "trkstepLY[g4steps]/F");
-   m_validationTree->Branch("TrkStepEloss", m_trk_eloss,  "trkstepEloss[g4steps]/F");
-   m_validationTree->Branch("TrkStepEloss1", m_trk_eloss1, "trkstepEloss1[g4steps]/F");
-   m_validationTree->Branch("TrkStepEloss0", m_trk_eloss0, "trkstepEloss0[g4steps]/F");
-   m_validationTree->Branch("TrkStepEloss5", m_trk_eloss5, "trkstepEloss5[g4steps]/F");
-   m_validationTree->Branch("TrkStepEloss10", m_trk_eloss10,"trkstepEloss10[g4steps]/F");
-   m_validationTree->Branch("TrkStepScaleEloss",m_trk_scaleeloss, "trkstepScaleEloss[g4steps]/F");
-   m_validationTree->Branch("TrkStepScaleX0",m_trk_scalex0,"trkstepScaleX0[g4steps]/F");
-   m_validationTree->Branch("TrkStepX0",    m_trk_x0,     "trkstepX0[g4steps]/F");
-   m_validationTree->Branch("TrkStepErd0",  m_trk_erd0,   "trkstepErd0[g4steps]/F");
-   m_validationTree->Branch("TrkStepErz0",  m_trk_erz0,   "trkstepErz0[g4steps]/F");
-   m_validationTree->Branch("TrkStepErphi", m_trk_erphi,   "trkstepErphi[g4steps]/F");
-   m_validationTree->Branch("TrkStepErtheta",m_trk_ertheta,"trkstepErtheta[g4steps]/F");
-   m_validationTree->Branch("TrkStepErqoverp",m_trk_erqoverp,"trkstepErqoverp[g4steps]/F");
-   
-   m_validationTree->Branch("TrkStepScatStatus", m_trk_sstatus,"trkscatStatus[trkscats]/I");
-   m_validationTree->Branch("TrkStepScatX",      m_trk_sx,     "trkscatX[trkscats]/F");
-   m_validationTree->Branch("TrkStepScatY",      m_trk_sy,     "trkscatY[trkscats]/F");
-   m_validationTree->Branch("TrkStepScatZ",      m_trk_sz,     "trkscatZ[trkscats]/F");
-   m_validationTree->Branch("TrkStepScatX0",     m_trk_sx0,    "trkscatX0[trkscats]/F");
-   m_validationTree->Branch("TrkStepScatEloss",  m_trk_seloss, "trkscatEloss[trkscats]/F");
-   m_validationTree->Branch("TrkStepScatMeanIoni",m_trk_smeanIoni, "trkscatMeanIoni[trkscats]/F");
-   m_validationTree->Branch("TrkStepScatSigIoni",m_trk_ssigIoni, "trkscatSigIoni[trkscats]/F");
-   m_validationTree->Branch("TrkStepScatMeanRad",m_trk_smeanRad, "trkscatMeanRad[trkscats]/F");
-   m_validationTree->Branch("TrkStepScatSigRad", m_trk_ssigRad, "trkscatSigRad[trkscats]/F");
-   m_validationTree->Branch("TrkStepScatSigTheta", m_trk_ssigTheta, "trkscatSigTheta[trkscats]/F");
-   m_validationTree->Branch("TrkStepScatSigPhi", m_trk_ssigPhi, "trkscatSigPhi[trkscats]/F");
-
-   // initialize
-   //
-   m_t_x        = 0.;    
-   m_t_y        = 0.; 
-   m_t_z        = 0.; 
-   m_t_theta    = 0.; 
-   m_t_eta      = 0.; 
-   m_t_phi      = 0.; 
-   m_t_p        = 0.; 
-   m_t_charge   = 0.; 
-   m_t_pdg      = 0;         
-   m_g4_steps   = -1;
-
-   m_m_x        = 0.;
-   m_m_y        = 0.;
-   m_m_z        = 0.;
-   m_m_theta    = 0.;
-   m_m_eta      = 0.;
-   m_m_phi      = 0.;
-   m_m_p        = 0.;
-
-   m_b_x        = 0.;
-   m_b_y        = 0.;
-   m_b_z        = 0.;
-   m_b_theta    = 0.;
-   m_b_eta      = 0.;
-   m_b_phi      = 0.;
-   m_b_p        = 0.;
-   m_b_X0       = 0.;
-   m_b_Eloss    = 0.;
-
-   m_trk_scats  = 0;
+   m_validationTree->Branch("TrkStepStatus",m_treeData->m_trk_status, "trkstepStatus[g4steps]/I");
+   m_validationTree->Branch("TrkStepP",     m_treeData->m_trk_p,      "trkstepP[g4steps]/F");
+   m_validationTree->Branch("TrkStepEta",   m_treeData->m_trk_eta,    "trkstepEta[g4steps]/F");
+   m_validationTree->Branch("TrkStepTheta", m_treeData->m_trk_theta,  "trkstepTheta[g4steps]/F");
+   m_validationTree->Branch("TrkStepPhi",   m_treeData->m_trk_phi,    "trkstepPhi[g4steps]/F");
+   m_validationTree->Branch("TrkStepX",     m_treeData->m_trk_x,      "trkstepX[g4steps]/F");
+   m_validationTree->Branch("TrkStepY",     m_treeData->m_trk_y,      "trkstepY[g4steps]/F");
+   m_validationTree->Branch("TrkStepZ",     m_treeData->m_trk_z,      "trkstepZ[g4steps]/F");
+   m_validationTree->Branch("TrkStepLocX",  m_treeData->m_trk_lx,     "trkstepLX[g4steps]/F");
+   m_validationTree->Branch("TrkStepLocY",  m_treeData->m_trk_ly,     "trkstepLY[g4steps]/F");
+   m_validationTree->Branch("TrkStepEloss", m_treeData->m_trk_eloss,  "trkstepEloss[g4steps]/F");
+   m_validationTree->Branch("TrkStepEloss1", m_treeData->m_trk_eloss1, "trkstepEloss1[g4steps]/F");
+   m_validationTree->Branch("TrkStepEloss0", m_treeData->m_trk_eloss0, "trkstepEloss0[g4steps]/F");
+   m_validationTree->Branch("TrkStepEloss5", m_treeData->m_trk_eloss5, "trkstepEloss5[g4steps]/F");
+   m_validationTree->Branch("TrkStepEloss10", m_treeData->m_trk_eloss10,"trkstepEloss10[g4steps]/F");
+   m_validationTree->Branch("TrkStepScaleEloss",m_treeData->m_trk_scaleeloss, "trkstepScaleEloss[g4steps]/F");
+   m_validationTree->Branch("TrkStepScaleX0",m_treeData->m_trk_scalex0,"trkstepScaleX0[g4steps]/F");
+   m_validationTree->Branch("TrkStepX0",    m_treeData->m_trk_x0,     "trkstepX0[g4steps]/F");
+   m_validationTree->Branch("TrkStepErd0",  m_treeData->m_trk_erd0,   "trkstepErd0[g4steps]/F");
+   m_validationTree->Branch("TrkStepErz0",  m_treeData->m_trk_erz0,   "trkstepErz0[g4steps]/F");
+   m_validationTree->Branch("TrkStepErphi", m_treeData->m_trk_erphi,   "trkstepErphi[g4steps]/F");
+   m_validationTree->Branch("TrkStepErtheta",m_treeData->m_trk_ertheta,"trkstepErtheta[g4steps]/F");
+   m_validationTree->Branch("TrkStepErqoverp",m_treeData->m_trk_erqoverp,"trkstepErqoverp[g4steps]/F");
    
+   m_validationTree->Branch("TrkStepScatStatus", m_treeData->m_trk_sstatus,"trkscatStatus[trkscats]/I");
+   m_validationTree->Branch("TrkStepScatX",      m_treeData->m_trk_sx,     "trkscatX[trkscats]/F");
+   m_validationTree->Branch("TrkStepScatY",      m_treeData->m_trk_sy,     "trkscatY[trkscats]/F");
+   m_validationTree->Branch("TrkStepScatZ",      m_treeData->m_trk_sz,     "trkscatZ[trkscats]/F");
+   m_validationTree->Branch("TrkStepScatX0",     m_treeData->m_trk_sx0,    "trkscatX0[trkscats]/F");
+   m_validationTree->Branch("TrkStepScatEloss",  m_treeData->m_trk_seloss, "trkscatEloss[trkscats]/F");
+   m_validationTree->Branch("TrkStepScatMeanIoni",m_treeData->m_trk_smeanIoni, "trkscatMeanIoni[trkscats]/F");
+   m_validationTree->Branch("TrkStepScatSigIoni",m_treeData->m_trk_ssigIoni, "trkscatSigIoni[trkscats]/F");
+   m_validationTree->Branch("TrkStepScatMeanRad",m_treeData->m_trk_smeanRad, "trkscatMeanRad[trkscats]/F");
+   m_validationTree->Branch("TrkStepScatSigRad", m_treeData->m_trk_ssigRad, "trkscatSigRad[trkscats]/F");
+   m_validationTree->Branch("TrkStepScatSigTheta", m_treeData->m_trk_ssigTheta, "trkscatSigTheta[trkscats]/F");
+   m_validationTree->Branch("TrkStepScatSigPhi", m_treeData->m_trk_ssigPhi, "trkscatSigPhi[trkscats]/F");
+
    m_crossedMuonEntry = false;
    m_exitLayer = false;   
    // now register the Tree
@@ -294,37 +188,37 @@ StatusCode Trk::GeantFollowerMSHelper::finalize()
 
 void Trk::GeantFollowerMSHelper::beginEvent() const
 {
-    m_t_x        = 0.;    
-    m_t_y        = 0.;
-    m_t_z        = 0.;
-    m_t_theta    = 0.; 
-    m_t_eta      = 0.;
-    m_t_phi      = 0.;
-    m_t_p        = 0.;
-    m_t_charge   = 0.;
-    m_t_pdg      = 0; 
-
-    m_m_x        = 0.;
-    m_m_y        = 0.;
-    m_m_z        = 0.;
-    m_m_theta    = 0.;
-    m_m_eta      = 0.;
-    m_m_phi      = 0.;
-    m_m_p        = 0.;
-
-    m_b_x        = 0.;
-    m_b_y        = 0.;
-    m_b_z        = 0.;
-    m_b_theta    = 0.;
-    m_b_eta      = 0.;
-    m_b_phi      = 0.;
-    m_b_p        = 0.;
-    m_b_X0       = 0.;
-    m_b_Eloss    = 0.;
-
-    m_g4_steps   = -1;
-    m_g4_stepsMS = -1;
-    m_trk_scats  = 0;
+    m_treeData->m_t_x        = 0.;    
+    m_treeData->m_t_y        = 0.;
+    m_treeData->m_t_z        = 0.;
+    m_treeData->m_t_theta    = 0.; 
+    m_treeData->m_t_eta      = 0.;
+    m_treeData->m_t_phi      = 0.;
+    m_treeData->m_t_p        = 0.;
+    m_treeData->m_t_charge   = 0.;
+    m_treeData->m_t_pdg      = 0; 
+
+    m_treeData->m_m_x        = 0.;
+    m_treeData->m_m_y        = 0.;
+    m_treeData->m_m_z        = 0.;
+    m_treeData->m_m_theta    = 0.;
+    m_treeData->m_m_eta      = 0.;
+    m_treeData->m_m_phi      = 0.;
+    m_treeData->m_m_p        = 0.;
+
+    m_treeData->m_b_x        = 0.;
+    m_treeData->m_b_y        = 0.;
+    m_treeData->m_b_z        = 0.;
+    m_treeData->m_b_theta    = 0.;
+    m_treeData->m_b_eta      = 0.;
+    m_treeData->m_b_phi      = 0.;
+    m_treeData->m_b_p        = 0.;
+    m_treeData->m_b_X0       = 0.;
+    m_treeData->m_b_Eloss    = 0.;
+
+    m_treeData->m_g4_steps   = -1;
+    m_treeData->m_g4_stepsMS = -1;
+    m_treeData->m_trk_scats  = 0;
     m_tX0Cache   = 0.;
 
     m_crossedMuonEntry = false;
@@ -351,18 +245,18 @@ void Trk::GeantFollowerMSHelper::trackParticle(const G4ThreeVector& pos, const G
 //    if(m_crossedMuonEntry)  std::cout << " crossed Muon Entry " << std::endl;
 //    if(m_exitLayer)  std::cout << " crossed Exit Layer " << std::endl;
 
-    if (m_g4_steps==-1){
+    if (m_treeData->m_g4_steps==-1){
         ATH_MSG_INFO("Initial step ... preparing event cache.");
-        m_t_x        = npos.x();        
-        m_t_y        = npos.y(); 
-        m_t_z        = npos.z(); 
-        m_t_theta    = nmom.theta(); 
-        m_t_eta      = nmom.eta(); 
-        m_t_phi      = nmom.phi(); 
-        m_t_p        = nmom.mag(); 
-        m_t_charge   = charge; 
-        m_t_pdg      = pdg;         
-        m_g4_steps   = 0;
+        m_treeData->m_t_x        = npos.x();        
+        m_treeData->m_t_y        = npos.y(); 
+        m_treeData->m_t_z        = npos.z(); 
+        m_treeData->m_t_theta    = nmom.theta(); 
+        m_treeData->m_t_eta      = nmom.eta(); 
+        m_treeData->m_t_phi      = nmom.phi(); 
+        m_treeData->m_t_p        = nmom.mag(); 
+        m_treeData->m_t_charge   = charge; 
+        m_treeData->m_t_pdg      = pdg;         
+        m_treeData->m_g4_steps   = 0;
         m_tX0Cache   = 0.;
         // construct the intial parameters
         
@@ -384,15 +278,15 @@ void Trk::GeantFollowerMSHelper::trackParticle(const G4ThreeVector& pos, const G
 //    if(useMuonEntry&&!m_crossedMuonEntry&&(fabs(npos.z())>2744||npos.perp()>1106)) {
 // Muon Entry 
     if(useMuonEntry&&!m_crossedMuonEntry&&(fabs(npos.z())>zMuonEntry||npos.perp()>4254)) {
-        m_m_x        = npos.x();
-        m_m_y        = npos.y();
-        m_m_z        = npos.z();
-        m_m_theta    = nmom.theta();
-        m_m_eta      = nmom.eta();
-        m_m_phi      = nmom.phi();
-        m_m_p        = nmom.mag();
+        m_treeData->m_m_x        = npos.x();
+        m_treeData->m_m_y        = npos.y();
+        m_treeData->m_m_z        = npos.z();
+        m_treeData->m_m_theta    = nmom.theta();
+        m_treeData->m_m_eta      = nmom.eta();
+        m_treeData->m_m_phi      = nmom.phi();
+        m_treeData->m_m_p        = nmom.mag();
 // overwrite everything before ME layer
-        m_g4_stepsMS   = 0;
+        m_treeData->m_g4_stepsMS   = 0;
         // construct the intial parameters
         m_parameterCacheMS = new Trk::CurvilinearParameters(npos, nmom, charge);
         m_parameterCache = new Trk::CurvilinearParameters(npos, nmom, charge);
@@ -401,7 +295,7 @@ void Trk::GeantFollowerMSHelper::trackParticle(const G4ThreeVector& pos, const G
         m_parameterCacheMSCov = new Trk::CurvilinearParameters(npos, nmom, charge, covMatrix);
         ATH_MSG_DEBUG( "m_crossedMuonEntry x " << m_parameterCacheMS->position().x() << " y " << m_parameterCacheMS->position().y() << " z " << m_parameterCacheMS->position().z() );
         m_crossedMuonEntry = true;
-        Trk::CurvilinearParameters* g4Parameters = new Trk::CurvilinearParameters(npos, nmom, m_t_charge);
+        Trk::CurvilinearParameters* g4Parameters = new Trk::CurvilinearParameters(npos, nmom, m_treeData->m_t_charge);
 // Muon Entry
         m_destinationSurface = &(g4Parameters->associatedSurface());
         delete g4Parameters;
@@ -409,14 +303,14 @@ void Trk::GeantFollowerMSHelper::trackParticle(const G4ThreeVector& pos, const G
 
     
     // jumping over inital step
-    m_g4_steps = (m_g4_steps == -1) ? 0 : m_g4_steps;
+    m_treeData->m_g4_steps = (m_treeData->m_g4_steps == -1) ? 0 : m_treeData->m_g4_steps;
     
     if (!m_parameterCache){
         ATH_MSG_WARNING("No Parameters available. Bailing out.");
         return;
     }
     
-    if ( m_g4_steps >= MAXPROBES) {
+    if ( m_treeData->m_g4_steps >= MAXPROBES) {
         ATH_MSG_WARNING("Maximum number of " << MAXPROBES << " reached, step is ignored.");
         return;
     }
@@ -433,9 +327,9 @@ void Trk::GeantFollowerMSHelper::trackParticle(const G4ThreeVector& pos, const G
 // ID envelop
 //      if(fabs(npos.z())>zMuonEntry||npos.perp()>4255) crossedExitLayer = true;
       if(fabs(npos.z())>21800||npos.perp()>12500) crossedExitLayer = true;
-      if(m_crossedMuonEntry&&m_g4_steps>=2&&!crossedExitLayer) return;
-      if(m_g4_steps>2) return;
-      if(m_g4_steps>4) return;
+      if(m_crossedMuonEntry&&m_treeData->m_g4_steps>=2&&!crossedExitLayer) return;
+      if(m_treeData->m_g4_steps>2) return;
+      if(m_treeData->m_g4_steps>4) return;
     }
 
     Trk::EnergyLoss* eloss = new EnergyLoss(0.,0.,0.,0.,0.,0);
@@ -444,14 +338,14 @@ void Trk::GeantFollowerMSHelper::trackParticle(const G4ThreeVector& pos, const G
 // Cache ONLY used for extrapolateM and extrapolate with covariance Matrix
 
     // parameters of the G4 step point
-    Trk::CurvilinearParameters* g4Parameters = new Trk::CurvilinearParameters(npos, nmom, m_t_charge);
+    Trk::CurvilinearParameters* g4Parameters = new Trk::CurvilinearParameters(npos, nmom, m_treeData->m_t_charge);
     // destination surface
     const Trk::PlaneSurface& destinationSurface = g4Parameters->associatedSurface();
     // extrapolate to the destination surface
     const Trk::TrackParameters* trkParameters = m_extrapolateDirectly&&m_crossedMuonEntry ?
         m_extrapolator->extrapolateDirectly(*m_parameterCache,destinationSurface,Trk::alongMomentum,false,Trk::muon) :
         m_extrapolator->extrapolate(*m_parameterCache,destinationSurface,Trk::alongMomentum,false,Trk::muon);
-    if(m_g4_stepsMS==0) {
+    if(m_treeData->m_g4_stepsMS==0) {
         ATH_MSG_DEBUG( " Extrapolate m_parameterCacheCov with covMatrix ");
         extrapolationCache->reset();
         trkParameters = m_extrapolateDirectly&&m_crossedMuonEntry ?
@@ -465,7 +359,7 @@ void Trk::GeantFollowerMSHelper::trackParticle(const G4ThreeVector& pos, const G
     }
     
     //sroe: coverity 31530
-    m_trk_status[m_g4_steps] = trkParameters ? 1 : 0;
+    m_treeData->m_trk_status[m_treeData->m_g4_steps] = trkParameters ? 1 : 0;
 
     if(!trkParameters) {
       delete eloss;
@@ -480,7 +374,7 @@ void Trk::GeantFollowerMSHelper::trackParticle(const G4ThreeVector& pos, const G
 //    if(!m_exitLayer&&(fabs(npos.z())>zMuonEntry||npos.perp()>4255)&&trkParameters) {
     if(!m_exitLayer&&(fabs(npos.z())>21800||npos.perp()>12500)&&trkParameters) {
       ATH_MSG_DEBUG (" exit layer found ");
-      m_trk_status[m_g4_steps] =  1000;
+      m_treeData->m_trk_status[m_treeData->m_g4_steps] =  1000;
 // Get extrapolatio with errors 
       extrapolationCache->reset();
       trkParameters = m_extrapolateDirectly&&m_crossedMuonEntry ?
@@ -506,14 +400,14 @@ void Trk::GeantFollowerMSHelper::trackParticle(const G4ThreeVector& pos, const G
         if(trkParameters_BACK) {
           ATH_MSG_DEBUG (" back extrapolation succeeded ");
           m_exitLayer = true;
-          m_b_p      =  trkParameters_BACK->momentum().mag();
-          m_b_eta    =  trkParameters_BACK->momentum().eta();
-          m_b_theta  =  trkParameters_BACK->momentum().theta();
-          m_b_phi    =  trkParameters_BACK->momentum().phi();
-          m_b_x      =  trkParameters_BACK->position().x();
-          m_b_y      =  trkParameters_BACK->position().y();
-          m_b_z      =  trkParameters_BACK->position().z();
-          if(fabs(m_m_p-m_b_p)>10.) ATH_MSG_DEBUG (" Back extrapolation to Muon Entry finds different momentum  difference MeV " << m_m_p-m_b_p);  
+          m_treeData->m_b_p      =  trkParameters_BACK->momentum().mag();
+          m_treeData->m_b_eta    =  trkParameters_BACK->momentum().eta();
+          m_treeData->m_b_theta  =  trkParameters_BACK->momentum().theta();
+          m_treeData->m_b_phi    =  trkParameters_BACK->momentum().phi();
+          m_treeData->m_b_x      =  trkParameters_BACK->position().x();
+          m_treeData->m_b_y      =  trkParameters_BACK->position().y();
+          m_treeData->m_b_z      =  trkParameters_BACK->position().z();
+          if(fabs(m_treeData->m_m_p-m_treeData->m_b_p)>10.) ATH_MSG_DEBUG (" Back extrapolation to Muon Entry finds different momentum  difference MeV " << m_treeData->m_m_p-m_treeData->m_b_p);  
           delete trkParameters_BACK;
           extrapolationCache->reset();
           const std::vector<const Trk::TrackStateOnSurface*> *matvec_BACK = m_extrapolator->extrapolateM(*trkParameters_FW,*m_destinationSurface,Trk::oppositeMomentum,false,Trk::muon,extrapolationCache);
@@ -528,7 +422,7 @@ void Trk::GeantFollowerMSHelper::trackParticle(const G4ThreeVector& pos, const G
               const Trk::MaterialEffectsBase* matEf = (*it)->materialEffectsOnTrack();
               if( matEf ) {
                 mmat++;
-                if(m_trk_status[m_g4_steps] == 1000) ATH_MSG_DEBUG (" mmat " << mmat << " matEf->thicknessInX0() " << matEf->thicknessInX0() );
+                if(m_treeData->m_trk_status[m_treeData->m_g4_steps] == 1000) ATH_MSG_DEBUG (" mmat " << mmat << " matEf->thicknessInX0() " << matEf->thicknessInX0() );
                 x0 += matEf->thicknessInX0();
                 const Trk::MaterialEffectsOnTrack* matEfs = dynamic_cast<const Trk::MaterialEffectsOnTrack*>(matEf);
                 double eloss0 = 0.;
@@ -547,7 +441,7 @@ void Trk::GeantFollowerMSHelper::trackParticle(const G4ThreeVector& pos, const G
                     sigmaIoni = eLoss->sigmaIoni();
                     meanRad = eLoss->meanRad();
                     sigmaRad = eLoss->sigmaRad();
-                    if(m_trk_status[m_g4_steps] == 1000) ATH_MSG_DEBUG ( " mmat " << mmat << " eLoss->deltaE() "  << eLoss->deltaE() << "  eLoss->length() " << eLoss->length() );
+                    if(m_treeData->m_trk_status[m_treeData->m_g4_steps] == 1000) ATH_MSG_DEBUG ( " mmat " << mmat << " eLoss->deltaE() "  << eLoss->deltaE() << "  eLoss->length() " << eLoss->length() );
                   }
                 }
                 const Trk::ScatteringAngles* scatAng = (matEfs)->scatteringAngles();
@@ -555,29 +449,29 @@ void Trk::GeantFollowerMSHelper::trackParticle(const G4ThreeVector& pos, const G
                    sigmaTheta = scatAng->sigmaDeltaTheta();
                    sigmaPhi = scatAng->sigmaDeltaPhi();
                 }             
-                if ( m_trk_scats < 500) {
+                if ( m_treeData->m_trk_scats < 500) {
 // backwards
-                  if(m_trk_status[m_g4_steps] == 1000) m_trk_sstatus[m_trk_scats] = -1000;
+                  if(m_treeData->m_trk_status[m_treeData->m_g4_steps] == 1000) m_treeData->m_trk_sstatus[m_treeData->m_trk_scats] = -1000;
                   if((*it)->trackParameters()) {
-                    m_trk_sx[m_trk_scats] = (*it)->trackParameters()->position().x();
-                    m_trk_sy[m_trk_scats] = (*it)->trackParameters()->position().y();
-                    m_trk_sz[m_trk_scats] = (*it)->trackParameters()->position().z();
+                    m_treeData->m_trk_sx[m_treeData->m_trk_scats] = (*it)->trackParameters()->position().x();
+                    m_treeData->m_trk_sy[m_treeData->m_trk_scats] = (*it)->trackParameters()->position().y();
+                    m_treeData->m_trk_sz[m_treeData->m_trk_scats] = (*it)->trackParameters()->position().z();
                   }
-                  m_trk_sx0[m_trk_scats] = matEf->thicknessInX0();   
-                  m_trk_seloss[m_trk_scats] = eloss0;   
-                  m_trk_smeanIoni[m_trk_scats] = meanIoni;   
-                  m_trk_ssigIoni[m_trk_scats] = sigmaIoni;   
-                  m_trk_smeanRad[m_trk_scats] = meanRad;   
-                  m_trk_ssigRad[m_trk_scats] = sigmaRad;   
-                  m_trk_ssigTheta[m_trk_scats] = sigmaTheta;   
-                  m_trk_ssigPhi[m_trk_scats] = sigmaPhi;   
-                  m_trk_scats++;
+                  m_treeData->m_trk_sx0[m_treeData->m_trk_scats] = matEf->thicknessInX0();   
+                  m_treeData->m_trk_seloss[m_treeData->m_trk_scats] = eloss0;   
+                  m_treeData->m_trk_smeanIoni[m_treeData->m_trk_scats] = meanIoni;   
+                  m_treeData->m_trk_ssigIoni[m_treeData->m_trk_scats] = sigmaIoni;   
+                  m_treeData->m_trk_smeanRad[m_treeData->m_trk_scats] = meanRad;   
+                  m_treeData->m_trk_ssigRad[m_treeData->m_trk_scats] = sigmaRad;   
+                  m_treeData->m_trk_ssigTheta[m_treeData->m_trk_scats] = sigmaTheta;   
+                  m_treeData->m_trk_ssigPhi[m_treeData->m_trk_scats] = sigmaPhi;   
+                  m_treeData->m_trk_scats++;
                 }
               }
             }
           }
-          m_b_X0         =  x0;
-          m_b_Eloss      =  Eloss;
+          m_treeData->m_b_X0         =  x0;
+          m_treeData->m_b_Eloss      =  Eloss;
           delete matvec_BACK;
          }
         }
@@ -587,10 +481,10 @@ void Trk::GeantFollowerMSHelper::trackParticle(const G4ThreeVector& pos, const G
 
     extrapolationCache->reset();
     const std::vector<const Trk::TrackStateOnSurface*> *matvec = m_extrapolator->extrapolateM(*m_parameterCache,destinationSurface,Trk::alongMomentum,false,Trk::muon,extrapolationCache);
-    if(m_g4_stepsMS==0) matvec = m_extrapolator->extrapolateM(*m_parameterCacheCov,destinationSurface,Trk::alongMomentum,false,Trk::muon,extrapolationCache);
+    if(m_treeData->m_g4_stepsMS==0) matvec = m_extrapolator->extrapolateM(*m_parameterCacheCov,destinationSurface,Trk::alongMomentum,false,Trk::muon,extrapolationCache);
 
-    if(m_g4_stepsMS==0) ATH_MSG_DEBUG(" G4 extrapolateM to Muon Entry " << " X0 " << extrapolationCache->x0tot() << " Eloss deltaE " <<   extrapolationCache->eloss()->deltaE()  << " Eloss sigma " << extrapolationCache->eloss()->sigmaDeltaE() << " meanIoni " << extrapolationCache->eloss()->meanIoni()  << " sigmaIoni " << extrapolationCache->eloss()->sigmaIoni() << " meanRad " <<  extrapolationCache->eloss()->meanRad() << " sigmaRad " << extrapolationCache->eloss()->sigmaRad());
-//    if(m_trk_status[m_g4_steps] == 1000) matvec = m_extrapolator->extrapolateM(*m_parameterCache,destinationSurface,Trk::alongMomentum,false,Trk::muon);
+    if(m_treeData->m_g4_stepsMS==0) ATH_MSG_DEBUG(" G4 extrapolateM to Muon Entry " << " X0 " << extrapolationCache->x0tot() << " Eloss deltaE " <<   extrapolationCache->eloss()->deltaE()  << " Eloss sigma " << extrapolationCache->eloss()->sigmaDeltaE() << " meanIoni " << extrapolationCache->eloss()->meanIoni()  << " sigmaIoni " << extrapolationCache->eloss()->sigmaIoni() << " meanRad " <<  extrapolationCache->eloss()->meanRad() << " sigmaRad " << extrapolationCache->eloss()->sigmaRad());
+//    if(m_treeData->m_trk_status[m_treeData->m_g4_steps] == 1000) matvec = m_extrapolator->extrapolateM(*m_parameterCache,destinationSurface,Trk::alongMomentum,false,Trk::muon);
 
 //      modifyTSOSvector(const std::vector<const Trk::TrackStateOnSurface*> matvec, double scaleX0, double scaleEloss, bool reposition, bool aggregate, bool updateEloss, double caloEnergy, double caloEnergyError, double pCaloEntry, double momentumError, double & Eloss_tot);
     double Elosst = 0.;
@@ -616,15 +510,15 @@ void Trk::GeantFollowerMSHelper::trackParticle(const G4ThreeVector& pos, const G
 //
 // Muon sytem
 //   
-      m_elossupdator->getX0ElossScales(0, m_m_eta, m_m_phi, X0Scale, ElossScale );
+      m_elossupdator->getX0ElossScales(0, m_treeData->m_m_eta, m_treeData->m_m_phi, X0Scale, ElossScale );
       ATH_MSG_DEBUG ( " muonSystem scales X0 " << X0Scale << " ElossScale " << ElossScale);
       
-      const std::vector<const Trk::TrackStateOnSurface*>  matvecNew1 = modifyTSOSvector(*matvec, X0Scale , 1., true, true, true, 0., 0., m_m_p, 0., Eloss1);
-      const std::vector<const Trk::TrackStateOnSurface*>  matvecNew0 = modifyTSOSvector(*matvec, X0Scale , ElossScale, true, true, true, 0., 0., m_m_p, 0., Eloss0);
+      const std::vector<const Trk::TrackStateOnSurface*>  matvecNew1 = modifyTSOSvector(*matvec, X0Scale , 1., true, true, true, 0., 0., m_treeData->m_m_p, 0., Eloss1);
+      const std::vector<const Trk::TrackStateOnSurface*>  matvecNew0 = modifyTSOSvector(*matvec, X0Scale , ElossScale, true, true, true, 0., 0., m_treeData->m_m_p, 0., Eloss0);
       ATH_MSG_DEBUG ( " muon system modify with 5 percent ");
-      const std::vector<const Trk::TrackStateOnSurface*>  matvecNew5 = modifyTSOSvector(*matvec, X0Scale , ElossScale, true, true, true, 0., 0., m_m_p, 0.05*m_m_p, Eloss5);
+      const std::vector<const Trk::TrackStateOnSurface*>  matvecNew5 = modifyTSOSvector(*matvec, X0Scale , ElossScale, true, true, true, 0., 0., m_treeData->m_m_p, 0.05*m_treeData->m_m_p, Eloss5);
       ATH_MSG_DEBUG ( " muon system modify with 10 percent ");
-      const std::vector<const Trk::TrackStateOnSurface*>  matvecNew10 = modifyTSOSvector(*matvec, X0Scale , ElossScale, true, true, true, 0., 0., m_m_p, 0.10*m_m_p, Eloss10);
+      const std::vector<const Trk::TrackStateOnSurface*>  matvecNew10 = modifyTSOSvector(*matvec, X0Scale , ElossScale, true, true, true, 0., 0., m_treeData->m_m_p, 0.10*m_treeData->m_m_p, Eloss10);
 
 //      if(&matvecNew0!=0)  delete &matvecNew0;
 //      if(&matvecNew5!=0)  delete &matvecNew5;
@@ -634,24 +528,24 @@ void Trk::GeantFollowerMSHelper::trackParticle(const G4ThreeVector& pos, const G
 //
 // Calorimeter  sytem
 //    
-      double phiCaloExit = atan2(m_m_y,m_m_x); 
-      m_elossupdator->getX0ElossScales(1, m_t_eta, phiCaloExit , X0Scale, ElossScale );
+      double phiCaloExit = atan2(m_treeData->m_m_y,m_treeData->m_m_x); 
+      m_elossupdator->getX0ElossScales(1, m_treeData->m_t_eta, phiCaloExit , X0Scale, ElossScale );
       ATH_MSG_DEBUG ( " calorimeter scales X0 " << X0Scale << " ElossScale " << ElossScale);
-      const std::vector<const Trk::TrackStateOnSurface*>  matvecNew1 = modifyTSOSvector(*matvec, X0Scale , 1., true, true, true, 0., 0., m_m_p, 0., Eloss1);
-      const std::vector<const Trk::TrackStateOnSurface*>  matvecNew0 = modifyTSOSvector(*matvec, X0Scale , ElossScale, true, true, true, 0., 0., m_t_p, 0., Eloss0);
+      const std::vector<const Trk::TrackStateOnSurface*>  matvecNew1 = modifyTSOSvector(*matvec, X0Scale , 1., true, true, true, 0., 0., m_treeData->m_m_p, 0., Eloss1);
+      const std::vector<const Trk::TrackStateOnSurface*>  matvecNew0 = modifyTSOSvector(*matvec, X0Scale , ElossScale, true, true, true, 0., 0., m_treeData->m_t_p, 0., Eloss0);
       if(fabs(Eloss1)>0) ATH_MSG_DEBUG ( " **** Cross Check calorimeter with Eloss Scale1 " <<  Eloss1 << " Eloss0 " << Eloss0 << " ratio " << Eloss0/Eloss1 );
 
       ATH_MSG_DEBUG ( " calorimeter modify with 5 percent ");
-      const std::vector<const Trk::TrackStateOnSurface*>  matvecNew5 = modifyTSOSvector(*matvec, X0Scale , ElossScale, true, true, true, 0., 0., m_t_p, 0.05*m_m_p, Eloss5);
+      const std::vector<const Trk::TrackStateOnSurface*>  matvecNew5 = modifyTSOSvector(*matvec, X0Scale , ElossScale, true, true, true, 0., 0., m_treeData->m_t_p, 0.05*m_treeData->m_m_p, Eloss5);
       ATH_MSG_DEBUG ( " calorimeter modify with 10 percent ");
-      const std::vector<const Trk::TrackStateOnSurface*>  matvecNew10 = modifyTSOSvector(*matvec, X0Scale , ElossScale, true, true, true, 0., 0., m_t_p, 0.10*m_m_p, Eloss10);
+      const std::vector<const Trk::TrackStateOnSurface*>  matvecNew10 = modifyTSOSvector(*matvec, X0Scale , ElossScale, true, true, true, 0., 0., m_treeData->m_t_p, 0.10*m_treeData->m_m_p, Eloss10);
 
 //      if(&matvecNew0!=0)  delete &matvecNew0;
 //      if(&matvecNew5!=0)  delete &matvecNew5;
 //      if(&matvecNew10!=0) delete &matvecNew10;
     }
 
-    ATH_MSG_DEBUG ( " status " << m_trk_status[m_g4_steps] << "Eloss1 " << Eloss1 << " Eloss0 " << Eloss0 << " Eloss5 " << Eloss5 << " Eloss10 " << Eloss10 );
+    ATH_MSG_DEBUG ( " status " << m_treeData->m_trk_status[m_treeData->m_g4_steps] << "Eloss1 " << Eloss1 << " Eloss0 " << Eloss0 << " Eloss5 " << Eloss5 << " Eloss10 " << Eloss10 );
 
 
     double Eloss = 0.;
@@ -666,7 +560,7 @@ void Trk::GeantFollowerMSHelper::trackParticle(const G4ThreeVector& pos, const G
           const Trk::MaterialEffectsBase* matEf = (*it)->materialEffectsOnTrack();
           if( matEf ) {
              mmat++;
-             if(m_trk_status[m_g4_steps] == 1000) ATH_MSG_DEBUG (" mmat " << mmat << " matEf->thicknessInX0() " << matEf->thicknessInX0() );
+             if(m_treeData->m_trk_status[m_treeData->m_g4_steps] == 1000) ATH_MSG_DEBUG (" mmat " << mmat << " matEf->thicknessInX0() " << matEf->thicknessInX0() );
              x0 += matEf->thicknessInX0();
              const Trk::MaterialEffectsOnTrack* matEfs = dynamic_cast<const Trk::MaterialEffectsOnTrack*>(matEf);
              double eloss0 = 0.;
@@ -685,8 +579,8 @@ void Trk::GeantFollowerMSHelper::trackParticle(const G4ThreeVector& pos, const G
                     sigmaIoni = eLoss->sigmaIoni();
                     meanRad = eLoss->meanRad();
                     sigmaRad = eLoss->sigmaRad();
-                    ATH_MSG_DEBUG ( "m_g4_stepsMS " << m_g4_stepsMS <<" mmat " << mmat << " X0 " << matEf->thicknessInX0() << " eLoss->deltaE() "  << eLoss->deltaE() << " meanIoni " << meanIoni << " Total Eloss " << Eloss << "  eLoss->length() " << eLoss->length() );
-//                    if(m_trk_status[m_g4_steps] == 1000) ATH_MSG_DEBUG ( " mmat " << mmat << " eLoss->deltaE() "  << eLoss->deltaE() );
+                    ATH_MSG_DEBUG ( "m_treeData->m_g4_stepsMS " << m_treeData->m_g4_stepsMS <<" mmat " << mmat << " X0 " << matEf->thicknessInX0() << " eLoss->deltaE() "  << eLoss->deltaE() << " meanIoni " << meanIoni << " Total Eloss " << Eloss << "  eLoss->length() " << eLoss->length() );
+//                    if(m_treeData->m_trk_status[m_treeData->m_g4_steps] == 1000) ATH_MSG_DEBUG ( " mmat " << mmat << " eLoss->deltaE() "  << eLoss->deltaE() );
                   } 
              } 
              //sroe: coverity 31532
@@ -695,29 +589,29 @@ void Trk::GeantFollowerMSHelper::trackParticle(const G4ThreeVector& pos, const G
              if(scatAng) {
                 sigmaTheta = scatAng->sigmaDeltaTheta();
                 sigmaPhi = scatAng->sigmaDeltaPhi();
-                ATH_MSG_DEBUG ( "m_g4_stepsMS " << m_g4_stepsMS <<" mmat " << mmat << " sigmaTheta " << sigmaTheta << " sigmaPhi " << sigmaPhi );
+                ATH_MSG_DEBUG ( "m_treeData->m_g4_stepsMS " << m_treeData->m_g4_stepsMS <<" mmat " << mmat << " sigmaTheta " << sigmaTheta << " sigmaPhi " << sigmaPhi );
              }             
 
-             if ( m_trk_scats < 500) {
-               if( m_g4_stepsMS==0 || m_trk_status[m_g4_steps]==1000 )  {
+             if ( m_treeData->m_trk_scats < 500) {
+               if( m_treeData->m_g4_stepsMS==0 || m_treeData->m_trk_status[m_treeData->m_g4_steps]==1000 )  {
 // forwards
-                 if(m_g4_stepsMS==0) m_trk_sstatus[m_trk_scats] = 10;
-                 if(m_trk_status[m_g4_steps]==1000) m_trk_sstatus[m_trk_scats] = 1000;
+                 if(m_treeData->m_g4_stepsMS==0) m_treeData->m_trk_sstatus[m_treeData->m_trk_scats] = 10;
+                 if(m_treeData->m_trk_status[m_treeData->m_g4_steps]==1000) m_treeData->m_trk_sstatus[m_treeData->m_trk_scats] = 1000;
                  if((*it)->trackParameters()) {
-                   m_trk_sx[m_trk_scats] = (*it)->trackParameters()->position().x();
-                   m_trk_sy[m_trk_scats] = (*it)->trackParameters()->position().y();
-                   m_trk_sz[m_trk_scats] = (*it)->trackParameters()->position().z();
+                   m_treeData->m_trk_sx[m_treeData->m_trk_scats] = (*it)->trackParameters()->position().x();
+                   m_treeData->m_trk_sy[m_treeData->m_trk_scats] = (*it)->trackParameters()->position().y();
+                   m_treeData->m_trk_sz[m_treeData->m_trk_scats] = (*it)->trackParameters()->position().z();
                  }
-                 m_trk_sx0[m_trk_scats] = matEf->thicknessInX0();   
-                 m_trk_seloss[m_trk_scats] = eloss0;   
-                 m_trk_smeanIoni[m_trk_scats] = meanIoni;   
+                 m_treeData->m_trk_sx0[m_treeData->m_trk_scats] = matEf->thicknessInX0();   
+                 m_treeData->m_trk_seloss[m_treeData->m_trk_scats] = eloss0;   
+                 m_treeData->m_trk_smeanIoni[m_treeData->m_trk_scats] = meanIoni;   
 //                 std::cout << "  eloss0 " <<  eloss0 << " meanIoni " << meanIoni << std::endl;
-                 m_trk_ssigIoni[m_trk_scats] = sigmaIoni;   
-                 m_trk_smeanRad[m_trk_scats] = meanRad;   
-                 m_trk_ssigRad[m_trk_scats] = sigmaRad;   
-                 m_trk_ssigTheta[m_trk_scats] = sigmaTheta;   
-                 m_trk_ssigPhi[m_trk_scats] = sigmaPhi;   
-                 m_trk_scats++;
+                 m_treeData->m_trk_ssigIoni[m_treeData->m_trk_scats] = sigmaIoni;   
+                 m_treeData->m_trk_smeanRad[m_treeData->m_trk_scats] = meanRad;   
+                 m_treeData->m_trk_ssigRad[m_treeData->m_trk_scats] = sigmaRad;   
+                 m_treeData->m_trk_ssigTheta[m_treeData->m_trk_scats] = sigmaTheta;   
+                 m_treeData->m_trk_ssigPhi[m_treeData->m_trk_scats] = sigmaPhi;   
+                 m_treeData->m_trk_scats++;
                }
              }  
           }
@@ -725,38 +619,38 @@ void Trk::GeantFollowerMSHelper::trackParticle(const G4ThreeVector& pos, const G
         delete matvec;
     }
 
-    ATH_MSG_DEBUG ("  m_g4_steps " << m_g4_steps << " Radius " << npos.perp() << " z " << npos.z() << " size matvec " << " total X0 " << x0 << " total Eloss " << Eloss );
-//    std::cout << "  m_g4_steps " << m_g4_steps << " Radius " << npos.perp() << " z " << npos.z() << " size matvec " << " total X0 " << x0 << " total Eloss " << Eloss << std::endl;
+    ATH_MSG_DEBUG ("  m_treeData->m_g4_steps " << m_treeData->m_g4_steps << " Radius " << npos.perp() << " z " << npos.z() << " size matvec " << " total X0 " << x0 << " total Eloss " << Eloss );
+//    std::cout << "  m_treeData->m_g4_steps " << m_treeData->m_g4_steps << " Radius " << npos.perp() << " z " << npos.z() << " size matvec " << " total X0 " << x0 << " total Eloss " << Eloss << std::endl;
     // fill the geant information and the trk information
-    m_g4_p[m_g4_steps]       =  nmom.mag(); 
-    m_g4_eta[m_g4_steps]     =  nmom.eta();   
-    m_g4_theta[m_g4_steps]   =  nmom.theta();
-    m_g4_phi[m_g4_steps]     =  nmom.phi();
-    m_g4_x[m_g4_steps]       =  npos.x();
-    m_g4_y[m_g4_steps]       =  npos.y();
-    m_g4_z[m_g4_steps]       =  npos.z();
-    m_g4_tX0[m_g4_steps]     = m_tX0Cache;
-    m_g4_t[m_g4_steps]       = t;
-    m_g4_X0[m_g4_steps]      = X0;
+    m_treeData->m_g4_p[m_treeData->m_g4_steps]       =  nmom.mag(); 
+    m_treeData->m_g4_eta[m_treeData->m_g4_steps]     =  nmom.eta();   
+    m_treeData->m_g4_theta[m_treeData->m_g4_steps]   =  nmom.theta();
+    m_treeData->m_g4_phi[m_treeData->m_g4_steps]     =  nmom.phi();
+    m_treeData->m_g4_x[m_treeData->m_g4_steps]       =  npos.x();
+    m_treeData->m_g4_y[m_treeData->m_g4_steps]       =  npos.y();
+    m_treeData->m_g4_z[m_treeData->m_g4_steps]       =  npos.z();
+    m_treeData->m_g4_tX0[m_treeData->m_g4_steps]     = m_tX0Cache;
+    m_treeData->m_g4_t[m_treeData->m_g4_steps]       = t;
+    m_treeData->m_g4_X0[m_treeData->m_g4_steps]      = X0;
     
-    m_trk_p[m_g4_steps]      = trkParameters ? trkParameters->momentum().mag()      : 0.;
-    m_trk_eta[m_g4_steps]    = trkParameters ? trkParameters->momentum().eta()      : 0.;
-    m_trk_theta[m_g4_steps]  = trkParameters ? trkParameters->momentum().theta()    : 0.;
-    m_trk_phi[m_g4_steps]    = trkParameters ? trkParameters->momentum().phi()      : 0.;
-    m_trk_x[m_g4_steps]      = trkParameters ? trkParameters->position().x()        : 0.;
-    m_trk_y[m_g4_steps]      = trkParameters ? trkParameters->position().y()        : 0.;
-    m_trk_z[m_g4_steps]      = trkParameters ? trkParameters->position().z()        : 0.;
-    m_trk_lx[m_g4_steps]     = trkParameters ? trkParameters->parameters()[Trk::locX] : 0.;
-    m_trk_ly[m_g4_steps]     = trkParameters ? trkParameters->parameters()[Trk::locY] : 0.;
-    m_trk_eloss[m_g4_steps]  = Eloss;
-    m_trk_eloss0[m_g4_steps] = Eloss0;
-    m_trk_eloss1[m_g4_steps] = Eloss1;
-    m_trk_eloss5[m_g4_steps] = Eloss5;
-    m_trk_eloss10[m_g4_steps]= Eloss10;
-    m_trk_scaleeloss[m_g4_steps]= ElossScale;
-    m_trk_scalex0[m_g4_steps]   = X0Scale;
-    m_trk_x0[m_g4_steps]     = x0;
-    if(m_g4_stepsMS==0)  m_trk_status[m_g4_steps] =  10;
+    m_treeData->m_trk_p[m_treeData->m_g4_steps]      = trkParameters ? trkParameters->momentum().mag()      : 0.;
+    m_treeData->m_trk_eta[m_treeData->m_g4_steps]    = trkParameters ? trkParameters->momentum().eta()      : 0.;
+    m_treeData->m_trk_theta[m_treeData->m_g4_steps]  = trkParameters ? trkParameters->momentum().theta()    : 0.;
+    m_treeData->m_trk_phi[m_treeData->m_g4_steps]    = trkParameters ? trkParameters->momentum().phi()      : 0.;
+    m_treeData->m_trk_x[m_treeData->m_g4_steps]      = trkParameters ? trkParameters->position().x()        : 0.;
+    m_treeData->m_trk_y[m_treeData->m_g4_steps]      = trkParameters ? trkParameters->position().y()        : 0.;
+    m_treeData->m_trk_z[m_treeData->m_g4_steps]      = trkParameters ? trkParameters->position().z()        : 0.;
+    m_treeData->m_trk_lx[m_treeData->m_g4_steps]     = trkParameters ? trkParameters->parameters()[Trk::locX] : 0.;
+    m_treeData->m_trk_ly[m_treeData->m_g4_steps]     = trkParameters ? trkParameters->parameters()[Trk::locY] : 0.;
+    m_treeData->m_trk_eloss[m_treeData->m_g4_steps]  = Eloss;
+    m_treeData->m_trk_eloss0[m_treeData->m_g4_steps] = Eloss0;
+    m_treeData->m_trk_eloss1[m_treeData->m_g4_steps] = Eloss1;
+    m_treeData->m_trk_eloss5[m_treeData->m_g4_steps] = Eloss5;
+    m_treeData->m_trk_eloss10[m_treeData->m_g4_steps]= Eloss10;
+    m_treeData->m_trk_scaleeloss[m_treeData->m_g4_steps]= ElossScale;
+    m_treeData->m_trk_scalex0[m_treeData->m_g4_steps]   = X0Scale;
+    m_treeData->m_trk_x0[m_treeData->m_g4_steps]     = x0;
+    if(m_treeData->m_g4_stepsMS==0)  m_treeData->m_trk_status[m_treeData->m_g4_steps] =  10;
 
     double errord0 = 0.;
     double errorz0 = 0.;
@@ -769,25 +663,25 @@ void Trk::GeantFollowerMSHelper::trackParticle(const G4ThreeVector& pos, const G
       errorphi = (*trkParameters->covariance())(Trk::phi,Trk::phi);
       errortheta = (*trkParameters->covariance())(Trk::theta,Trk::theta);
       errorqoverp = (*trkParameters->covariance())(Trk::qOverP,Trk::qOverP);
-      ATH_MSG_DEBUG (" Covariance found for m_trk_status "  << m_trk_status[m_g4_steps]);
-      if( m_trk_status[m_g4_steps] == 10 ||  m_trk_status[m_g4_steps] == 1000 ) {
+      ATH_MSG_DEBUG (" Covariance found for m_treeData->m_trk_status "  << m_treeData->m_trk_status[m_treeData->m_g4_steps]);
+      if( m_treeData->m_trk_status[m_treeData->m_g4_steps] == 10 ||  m_treeData->m_trk_status[m_treeData->m_g4_steps] == 1000 ) {
         double x00 = errortheta*1000000.;
 // assume beta = 1 for check
-        double sigPhi = sqrt(x0)*13.6*(1+0.038*log(x00))/m_trk_p[m_g4_steps]/sin(m_trk_theta[m_g4_steps]);
+        double sigPhi = sqrt(x0)*13.6*(1+0.038*log(x00))/m_treeData->m_trk_p[m_treeData->m_g4_steps]/sin(m_treeData->m_trk_theta[m_treeData->m_g4_steps]);
         double ratio = sqrt(errorphi)/sigPhi;
-       std::cout << " m_trk_x " << m_trk_x[m_g4_steps] << "  m_trk_y " << m_trk_y[m_g4_steps] << " m_trk_z " << m_trk_z[m_g4_steps] << " cov 33 " << errortheta*1000000. << " cov22 " <<  errorphi*1000000000. << " ratio error in phi " << ratio << std::endl; 
+       std::cout << " m_treeData->m_trk_x " << m_treeData->m_trk_x[m_treeData->m_g4_steps] << "  m_treeData->m_trk_y " << m_treeData->m_trk_y[m_treeData->m_g4_steps] << " m_treeData->m_trk_z " << m_treeData->m_trk_z[m_treeData->m_g4_steps] << " cov 33 " << errortheta*1000000. << " cov22 " <<  errorphi*1000000000. << " ratio error in phi " << ratio << std::endl; 
        std::cout << " "  << std::endl;
       }
     }
 
-    m_trk_erd0[m_g4_steps]  = sqrt(errord0); 
-    m_trk_erz0[m_g4_steps]  = sqrt(errorz0); 
-    m_trk_erphi[m_g4_steps]  = sqrt(errorphi); 
-    m_trk_ertheta[m_g4_steps]  = sqrt(errortheta); 
-    m_trk_erqoverp[m_g4_steps]  = sqrt(errorqoverp); 
+    m_treeData->m_trk_erd0[m_treeData->m_g4_steps]  = sqrt(errord0); 
+    m_treeData->m_trk_erz0[m_treeData->m_g4_steps]  = sqrt(errorz0); 
+    m_treeData->m_trk_erphi[m_treeData->m_g4_steps]  = sqrt(errorphi); 
+    m_treeData->m_trk_ertheta[m_treeData->m_g4_steps]  = sqrt(errortheta); 
+    m_treeData->m_trk_erqoverp[m_treeData->m_g4_steps]  = sqrt(errorqoverp); 
 
 // reset X0 at Muon Entry  
-    if(m_g4_stepsMS==0)  m_tX0Cache   = 0.;
+    if(m_treeData->m_g4_stepsMS==0)  m_tX0Cache   = 0.;
     // update the parameters if needed/configured
     if (m_extrapolateIncrementally && trkParameters) {
         delete m_parameterCache;
@@ -804,8 +698,8 @@ void Trk::GeantFollowerMSHelper::trackParticle(const G4ThreeVector& pos, const G
     delete extrapolationCache;
     delete g4Parameters;
     delete trkParameters;
-    ++m_g4_steps;
-    if(m_g4_stepsMS!=-1)  ++m_g4_stepsMS; 
+    ++m_treeData->m_g4_steps;
+    if(m_treeData->m_g4_stepsMS!=-1)  ++m_treeData->m_g4_stepsMS; 
 }
 const std::vector<const Trk::TrackStateOnSurface*> Trk::GeantFollowerMSHelper::modifyTSOSvector(const std::vector<const Trk::TrackStateOnSurface*> matvec, double scaleX0, double scaleEloss, bool reposition, bool aggregate, bool updateEloss, double caloEnergy, double caloEnergyError, double pCaloEntry, double momentumError, double & Eloss_tot) const
 {
diff --git a/Trigger/TrigAlgorithms/TrigDetCalib/src/TrigSubDetListWriter.h b/Trigger/TrigAlgorithms/TrigDetCalib/src/TrigSubDetListWriter.h
index d96d7054c1ab846976b0a02500eaeed27562cee7..84308850a98e1f224514d7e3b5f335e544c52583 100755
--- a/Trigger/TrigAlgorithms/TrigDetCalib/src/TrigSubDetListWriter.h
+++ b/Trigger/TrigAlgorithms/TrigDetCalib/src/TrigSubDetListWriter.h
@@ -25,21 +25,12 @@
 #include <vector>
 #include <string>
 
-///#include "TrigInterfaces/FexAlgo.h"
 #include "TrigInterfaces/AllTEAlgo.h"
 #include "IRegionSelector/RegSelEnums.h"
 #include "GaudiKernel/ITHistSvc.h"
 
 #include "eformat/SourceIdentifier.h"
 
-// Event Incident to get EventInfo
-#include "GaudiKernel/IIncidentSvc.h"
-#include "GaudiKernel/IIncidentListener.h"
-#include "GaudiKernel/Incident.h"
-#include "EventInfo/EventInfo.h"
-#include "EventInfo/EventID.h"
-#include "EventInfo/EventIncident.h"
-
 #include "TH1I.h"
 
 class IRegSelSvc;
diff --git a/Trigger/TrigAlgorithms/TrigL2MuonSA/python/TrigL2MuonSAMonitoring.py b/Trigger/TrigAlgorithms/TrigL2MuonSA/python/TrigL2MuonSAMonitoring.py
index 7df5b551dda0ee0a77528acbd77abd9764e8bef8..5b76c02108e33645056e93886df256d3bcc4a437 100755
--- a/Trigger/TrigAlgorithms/TrigL2MuonSA/python/TrigL2MuonSAMonitoring.py
+++ b/Trigger/TrigAlgorithms/TrigL2MuonSA/python/TrigL2MuonSAMonitoring.py
@@ -1,7 +1,6 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 
 
-from TrigMonitorBase.TrigGenericMonitoringToolConfig import defineHistogram, TrigGenericMonitoringToolConfig
 from AthenaMonitoring.GenericMonitoringTool import GenericMonitoringTool, defineHistogram
 
 class TrigL2MuonSAMonitoring(GenericMonitoringTool):
@@ -9,30 +8,33 @@ class TrigL2MuonSAMonitoring(GenericMonitoringTool):
         super(TrigL2MuonSAMonitoring, self).__init__( name )
     
         self.HistPath = name
-        self.Histograms = [ defineHistogram('InnMdtHits',    type='TH1F', title="Hit multiplicity in the INNER road; MDT hits", xbins=50, xmin=-0.5, xmax=50.5),
-                            defineHistogram('MidMdtHits',    type='TH1F', title="Hit multiplicity in the MIDDLE road; MDT hits", xbins=50, xmin=-0.5, xmax=50.5),
-                            defineHistogram('OutMdtHits',    type='TH1F', title="Hit multiplicity in the OUTER road; MDT hits", xbins=50, xmin=-0.5, xmax=50.5), 
-                            defineHistogram('FitResiduals',  type='TH1F', title="Fit Residual; Residuals (cm)", xbins=400, xmin=-0.4, xmax=0.4), 
-                            defineHistogram('Efficiency',    type='TH1F', title="Track finding efficiency", xbins=2, xmin=-0.5, xmax=1.5),
-                            defineHistogram('Address',       type='TH1F', title="S_address;S_address", xbins=5, xmin=-1.5, xmax=3.5 ),
-                            defineHistogram('AbsPt',         type='TH1F', title="absolute P_{T};P_{T} (GeV)", xbins=100, xmin=0, xmax=100 ),
-                            defineHistogram('TrackPt',       type='TH1F', title="P_{T};P_{T} (GeV)", xbins=100, xmin=-100, xmax=100 ),
-                            defineHistogram('AbsPt, SagInv', type='TH2F', title="1/s as a function of P_{T}; P_{T} (GeV); 1/s (cm^{-1})", xbins=50, xmin=0, xmax=100, ybins=15, ymin=0, ymax=3 ),
-                            defineHistogram('Sagitta',       type='TH1F', title="Reconstructed Sagitta; Sagitta (cm)", xbins=100, xmin=-10., xmax=10.),
-                            defineHistogram('ResInner',      type='TH1F', title="Residual from Trigger track in INNER Station; Residuals (cm)", xbins=100, xmin=-10., xmax=10. ),
-                            defineHistogram('ResMiddle',     type='TH1F', title="Residual from Trigger track in MIDDLE Station; Residuals (cm)", xbins=100, xmin=-10., xmax=10. ),
-                            defineHistogram('ResOuter',      type='TH1F', title="Residual from Trigger track in OUTER Station; Residuals (cm)", xbins=100, xmin=-10., xmax=10. ),
-                            defineHistogram('TrackEta, TrackPhi',         type='TH2F', title="Distribution of reconstructed LVL2 tracks; Eta; Phi", xbins=108, xmin=-2.7, xmax=2.7, ybins=96, ymin=-3.1416, ymax=3.1416 ),
-                            defineHistogram('FailedRoIEta, FailedRoIPhi', type='TH2F', title="Location of LVL2 track failure; Eta; Phi", xbins=108, xmin=-2.7, xmax=2.7, ybins=96, ymin=-3.1416, ymax=3.1416 ),
-                            defineHistogram('TIME_Total',                 type='TH1F', title="Total processing time (us)", xbins=100, xmin=0, xmax=100000 ),
-                            defineHistogram('TIME_Data_Preparator',       type='TH1F', title="Data preparator time (us)", xbins=100, xmin=0, xmax=50000 ), 
-                            defineHistogram('TIME_Pattern_Finder',        type='TH1F', title="Pattern finder time (us)", xbins=100, xmin=0, xmax=5000 ), 
-                            defineHistogram('TIME_Station_Fitter',        type='TH1F', title="Station fitter time (us)", xbins=100, xmin=0, xmax=5000 ), 
-                            defineHistogram('TIME_Track_Fitter',          type='TH1F', title="Track fitter time (us)", xbins=100, xmin=0, xmax=300 ),
-                            defineHistogram('TIME_Track_Extrapolator',    type='TH1F', title="Track extrapolator time (us)", xbins=100, xmin=0, xmax=300 ),
-                            defineHistogram('TIME_Calibration_Streamer',  type='TH1F', title="Calibration streamer time (us)", xbins=100, xmin=0, xmax=50000 ),
-                            defineHistogram('InvalidRpcRoINumber',        type='TH1F', title="RoI Number of Invalid RPC RoI; RoI Number", xbins=150, xmin=-0.5, xmax=150.5) ]
+        self.Histograms = [ defineHistogram('InnMdtHits',    type='TH1F', path='EXPERT', title="Hit multiplicity in the INNER road; MDT hits", xbins=50, xmin=-0.5, xmax=50.5),
+                            defineHistogram('MidMdtHits',    type='TH1F', path='EXPERT', title="Hit multiplicity in the MIDDLE road; MDT hits", xbins=50, xmin=-0.5, xmax=50.5),
+                            defineHistogram('OutMdtHits',    type='TH1F', path='EXPERT', title="Hit multiplicity in the OUTER road; MDT hits", xbins=50, xmin=-0.5, xmax=50.5),
+                            defineHistogram('FitResiduals',  type='TH1F', path='EXPERT', title="Fit Residual; Residuals (cm)", xbins=400, xmin=-0.4, xmax=0.4),
+                            defineHistogram('Efficiency',    type='TH1F', path='EXPERT', title="Track finding efficiency", xbins=2, xmin=-0.5, xmax=1.5),
+                            defineHistogram('Address',       type='TH1F', path='EXPERT', title="S_address;S_address", xbins=5, xmin=-1.5, xmax=3.5 ),
+                            defineHistogram('AbsPt',         type='TH1F', path='EXPERT', title="absolute P_{T};P_{T} (GeV)", xbins=100, xmin=0, xmax=100 ),
+                            defineHistogram('TrackPt',       type='TH1F', path='EXPERT', title="P_{T};P_{T} (GeV)", xbins=100, xmin=-100, xmax=100 ),
+                            defineHistogram('AbsPt, SagInv', type='TH2F', path='EXPERT', title="1/s as a function of P_{T}; P_{T} (GeV); 1/s (cm^{-1})", xbins=50, xmin=0, xmax=100, ybins=15, ymin=0, ymax=3 ),
+                            defineHistogram('Sagitta',       type='TH1F', path='EXPERT', title="Reconstructed Sagitta; Sagitta (cm)", xbins=100, xmin=-10., xmax=10.),
+                            defineHistogram('ResInner',      type='TH1F', path='EXPERT', title="Residual from Trigger track in INNER Station; Residuals (cm)", xbins=100, xmin=-10., xmax=10. ),
+                            defineHistogram('ResMiddle',     type='TH1F', path='EXPERT', title="Residual from Trigger track in MIDDLE Station; Residuals (cm)", xbins=100, xmin=-10., xmax=10. ),
+                            defineHistogram('ResOuter',      type='TH1F', path='EXPERT', title="Residual from Trigger track in OUTER Station; Residuals (cm)", xbins=100, xmin=-10., xmax=10. ),
+                            defineHistogram('TrackEta, TrackPhi',         type='TH2F', path='EXPERT', title="Distribution of reconstructed LVL2 tracks; Eta; Phi", xbins=108, xmin=-2.7, xmax=2.7, ybins=96, ymin=-3.1416, ymax=3.1416 ),
+                            defineHistogram('FailedRoIEta, FailedRoIPhi', type='TH2F', path='EXPERT', title="Location of LVL2 track failure; Eta; Phi", xbins=108, xmin=-2.7, xmax=2.7, ybins=96, ymin=-3.1416, ymax=3.1416 ),
+                            defineHistogram('TIME_Total',                 type='TH1F', path='EXPERT', title="Total processing time (us)", xbins=100, xmin=0, xmax=100000 ),
+                            defineHistogram('TIME_Data_Preparator',       type='TH1F', path='EXPERT', title="Data preparator time (us)", xbins=100, xmin=0, xmax=50000 ),
+                            defineHistogram('TIME_Pattern_Finder',        type='TH1F', path='EXPERT', title="Pattern finder time (us)", xbins=100, xmin=0, xmax=5000 ),
+                            defineHistogram('TIME_Station_Fitter',        type='TH1F', path='EXPERT', title="Station fitter time (us)", xbins=100, xmin=0, xmax=5000 ),
+                            defineHistogram('TIME_Track_Fitter',          type='TH1F', path='EXPERT', title="Track fitter time (us)", xbins=100, xmin=0, xmax=300 ),
+                            defineHistogram('TIME_Track_Extrapolator',    type='TH1F', path='EXPERT', title="Track extrapolator time (us)", xbins=100, xmin=0, xmax=300 ),
+                            defineHistogram('TIME_Calibration_Streamer',  type='TH1F', path='EXPERT', title="Calibration streamer time (us)", xbins=100, xmin=0, xmax=50000 ),
+                            defineHistogram('InvalidRpcRoINumber',        type='TH1F', path='EXPERT', title="RoI Number of Invalid RPC RoI; RoI Number", xbins=150, xmin=-0.5, xmax=150.5) ]
     
+
+
+from TrigMonitorBase.TrigGenericMonitoringToolConfig import defineHistogram, TrigGenericMonitoringToolConfig
 	
 class TrigL2MuonSAValidationMonitoring(TrigGenericMonitoringToolConfig):
     def __init__ (self, name="TrigL2MuonSAValidationMonitoring"):
diff --git a/Trigger/TrigAlgorithms/TrigT2CaloCommon/share/testDataAccessService.py b/Trigger/TrigAlgorithms/TrigT2CaloCommon/share/testDataAccessService.py
index 627586b16f6a89ef0ad5dccb74387ae5d3f2b1f2..c32240a15d213249cd77cefa84b16edba5365f6b 100644
--- a/Trigger/TrigAlgorithms/TrigT2CaloCommon/share/testDataAccessService.py
+++ b/Trigger/TrigAlgorithms/TrigT2CaloCommon/share/testDataAccessService.py
@@ -1,5 +1,5 @@
 #
-#  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+#  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 #
 
 include("TrigUpgradeTest/testHLT_MT.py")
@@ -24,10 +24,10 @@ if TriggerFlags.doCalo:
      from TrigT2CaloCommon.TrigT2CaloCommonConf import TrigCaloDataAccessSvc#, TestCaloDataAccess
      import math
      mon = GenericMonitoringTool("CaloDataAccessSvcMon")
-     mon.Histograms += [defineHistogram( "TIME_locking_LAr_RoI", title="Time spent in unlocking the LAr collection", xbins=100, xmin=0, xmax=100 ),
-                      defineHistogram( "roiROBs_LAr", title="Number of ROBs unpacked in RoI requests", xbins=20, xmin=0, xmax=20 ),
-                      defineHistogram( "TIME_locking_LAr_FullDet", title="Time spent in unlocking the LAr collection", xbins=100, xmin=0, xmax=100 ),
-                      defineHistogram( "roiEta_LAr,roiPhi_LAr", type="TH2F", title="Geometric usage", xbins=50, xmin=-5, xmax=5, ybins=64, ymin=-math.pi, ymax=math.pi )]
+     mon.Histograms += [defineHistogram( "TIME_locking_LAr_RoI", path="EXPERT", title="Time spent in unlocking the LAr collection", xbins=100, xmin=0, xmax=100 ),
+                      defineHistogram( "roiROBs_LAr", path="EXPERT", title="Number of ROBs unpacked in RoI requests", xbins=20, xmin=0, xmax=20 ),
+                      defineHistogram( "TIME_locking_LAr_FullDet", path="EXPERT", title="Time spent in unlocking the LAr collection", xbins=100, xmin=0, xmax=100 ),
+                      defineHistogram( "roiEta_LAr,roiPhi_LAr", type="TH2F", path="EXPERT", title="Geometric usage", xbins=50, xmin=-5, xmax=5, ybins=64, ymin=-math.pi, ymax=math.pi )]
     
      svcMgr += TrigCaloDataAccessSvc()
      svcMgr.TrigCaloDataAccessSvc.OutputLevel=ERROR
diff --git a/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/Root/EfficiencyTool.cxx b/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/Root/EfficiencyTool.cxx
index 9c089e3231cd46dd753e1616ff3019af586b12b0..073cef0276a1524ce30569e4a3048f1111ecd69a 100644
--- a/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/Root/EfficiencyTool.cxx
+++ b/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/Root/EfficiencyTool.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 /**********************************************************************
@@ -153,7 +153,8 @@ bool EfficiencyTool::analyseIsEM(const xAOD::Electron *eg, const std::string pid
     return failisem;
 }
 
-void EfficiencyTool::fillInefficiency(const std::string& pid, const std::string dir,const xAOD::Electron *selEF,const xAOD::Photon *selPh,const xAOD::CaloCluster *clus,const xAOD::TrackParticle *trk)
+void EfficiencyTool::fillInefficiency(const std::string& pid, const std::string dir,const xAOD::Electron *selEF,const xAOD::Photon *selPh,const xAOD::CaloCluster *clus,const xAOD::TrackParticle *trk,
+                                      const asg::AcceptData& acceptData)
 {
     cd(dir);
     ATH_MSG_DEBUG("REGTEST::Inefficiency");
@@ -192,23 +193,23 @@ void EfficiencyTool::fillInefficiency(const std::string& pid, const std::string
     float lastbin = hist1(ineff)->GetNbinsX() - 0.5;
     float sumbin = lastbin - 1;
 
-    if (!getAccept().getCutResult("L2Calo")) {
+    if (!acceptData.getCutResult("L2Calo")) {
         hist1(ineff)->Fill(0.5, 1);
         hist1(ineff)->Fill(sumbin, 1);
     }
-    else if (!getAccept().getCutResult("L2")) {
+    else if (!acceptData.getCutResult("L2")) {
         hist1(ineff)->Fill(1.5, 1);
         hist1(ineff)->Fill(sumbin, 1);
     }
-    else if (!getAccept().getCutResult("EFCalo")) {
+    else if (!acceptData.getCutResult("EFCalo")) {
         hist1(ineff)->Fill(2.5, 1);
         hist1(ineff)->Fill(sumbin, 1);
     }
-    // else if (!getAccept().getCutResult("EFTrack")) {
+    // else if (!acceptData.getCutResult("EFTrack")) {
     //     hist1(ineff)->Fill(3.5, 1);
     //     hist1(ineff)->Fill(13.5, 1);
     // }
-    else if (!getAccept().getCutResult("HLT")) {
+    else if (!acceptData.getCutResult("HLT")) {
         if (reco.test(0)) {
             if (boost::contains(pid, "LH")) failbits = analyseIsEMLH(selEF, pid);
             else failbits = analyseIsEM(selEF, pid);
@@ -297,7 +298,8 @@ void EfficiencyTool::fillInefficiency(const std::string& pid, const std::string
 }
 
 void EfficiencyTool::inefficiency(const std::string& pid, const std::string basePath,const float etthr, 
-                                  std::pair< const xAOD::Egamma*,const HLT::TriggerElement*> pairObj)
+                                  std::pair< const xAOD::Egamma*,const HLT::TriggerElement*> pairObj,
+                                  const asg::AcceptData& acceptData)
 {
     ATH_MSG_DEBUG("INEFF::Start Inefficiency Analysis ======================= " << basePath);
     cd(basePath);
@@ -327,17 +329,17 @@ void EfficiencyTool::inefficiency(const std::string& pid, const std::string base
     const std::string ineff = "Ineff" + pidword;
 
     // Ensure L1 passes and offline passes et cut
-    if(getAccept().getCutResult("L1Calo") && et > etthr) {
+    if(acceptData.getCutResult("L1Calo") && et > etthr) {
         ATH_MSG_DEBUG("INEFF::Passed L1 and offline et");
-        hist1("eff_triggerstep")->Fill("L2Calo",getAccept().getCutResult("L2Calo"));
-        hist1("eff_triggerstep")->Fill("L2",getAccept().getCutResult("L2"));
-        hist1("eff_triggerstep")->Fill("EFCalo",getAccept().getCutResult("EFCalo"));
-        hist1("eff_triggerstep")->Fill("EFTrack",getAccept().getCutResult("EFTrack"));
-        hist1("eff_triggerstep")->Fill("HLT",getAccept().getCutResult("HLT"));
+        hist1("eff_triggerstep")->Fill("L2Calo",acceptData.getCutResult("L2Calo"));
+        hist1("eff_triggerstep")->Fill("L2",acceptData.getCutResult("L2"));
+        hist1("eff_triggerstep")->Fill("EFCalo",acceptData.getCutResult("EFCalo"));
+        hist1("eff_triggerstep")->Fill("EFTrack",acceptData.getCutResult("EFTrack"));
+        hist1("eff_triggerstep")->Fill("HLT",acceptData.getCutResult("HLT"));
 
         // Fill efficiency plot for HLT trigger steps
-        if(!getAccept().getCutResult("HLT")/* || !getAccept().getCutResult("EFTrack")*/ || !getAccept().getCutResult("EFCalo") || 
-           !getAccept().getCutResult("L2") || !getAccept().getCutResult("L2Calo")) {
+        if(!acceptData.getCutResult("HLT")/* || !acceptData.getCutResult("EFTrack")*/ || !acceptData.getCutResult("EFCalo") || 
+           !acceptData.getCutResult("L2") || !acceptData.getCutResult("L2Calo")) {
             ATH_MSG_DEBUG("INEFF::Retrieve features for EF containers only ");
             ATH_MSG_DEBUG("INEFF::Retrieve EF Electron");
             const auto* EFEl = getFeature<xAOD::ElectronContainer>(feat);
@@ -356,7 +358,7 @@ void EfficiencyTool::inefficiency(const std::string& pid, const std::string base
             selPh = closestObject<xAOD::Photon,xAOD::PhotonContainer>(pairObj, dRmax, false);
             selClus = closestObject<xAOD::CaloCluster,xAOD::CaloClusterContainer>(pairObj, dRmax, false,"TrigEFCaloCalibFex");
             selTrk = closestObject<xAOD::TrackParticle,xAOD::TrackParticleContainer>(pairObj, dRmax, false, "InDetTrigTrackingxAODCnv_Electron_IDTrig");
-            fillInefficiency(pid, basePath, selEF, selPh, selClus, selTrk);
+            fillInefficiency(pid, basePath, selEF, selPh, selClus, selTrk, acceptData);
             if (EFClus == nullptr){
                 hist1("eff_hltreco")->Fill("ClusterCont", 0);
                 hist1("eff_hltreco")->Fill("Cluster", 0);
@@ -578,11 +580,12 @@ StatusCode EfficiencyTool::toolExecute(const std::string basePath,const TrigInfo
           
           // ialg = 0 is decision from TDT tool (Efficency dir) [default]
           // ialg = 1 is decision from emulator tool (Emulation dir)
+          asg::AcceptData acceptData (&getAccept());
           if(ialg==0){
-            setAccept(pairObj.second,info); //Sets the trigger accepts
+            acceptData = setAccept(pairObj.second,info); //Sets the trigger accepts
           }else{// ialg==1
             ATH_MSG_DEBUG("Fill efficiency from Emulation tool");
-            setAccept(emulation()->executeTool(pairObj.second, info.trigName));
+            acceptData = emulation()->executeTool(pairObj.second, info.trigName);
           }
 
           if (pairObj.second!=nullptr) {
@@ -590,30 +593,30 @@ StatusCode EfficiencyTool::toolExecute(const std::string basePath,const TrigInfo
               if(!info.trigL1){
                   if(pairObj.first->type()==xAOD::Type::Electron){
                       if(pairObj.first->auxdecor<bool>(pidword)){
-                          inefficiency(pid,dir+"/"+algname+"/HLT",etthr,pairObj);
+                        inefficiency(pid,dir+"/"+algname+"/HLT",etthr,pairObj, acceptData);
                       }
                   }
               }
           } // Features
 
           if(info.trigL1)
-              this->fillEfficiency(dir+"/"+algname+"/L1Calo",getAccept().getCutResult("L1Calo"),etthr,pidword,pairObj.first);
+              this->fillEfficiency(dir+"/"+algname+"/L1Calo",acceptData.getCutResult("L1Calo"),etthr,pidword,pairObj.first);
           else {
-              this->fillEfficiency(dir+"/"+algname+"/HLT",getAccept().getCutResult("HLT"),etthr,pidword,pairObj.first);
-              this->fillEfficiency(dir+"/"+algname+"/L2Calo",getAccept().getCutResult("L2Calo"),etthr,pidword,pairObj.first,m_detailedHists); 
-              this->fillEfficiency(dir+"/"+algname+"/L2",getAccept().getCutResult("L2"),etthr,pidword,pairObj.first,m_detailedHists);
-              this->fillEfficiency(dir+"/"+algname+"/EFCalo",getAccept().getCutResult("EFCalo"),etthr,pidword,pairObj.first,m_detailedHists);
-              this->fillEfficiency(dir+"/"+algname+"/L1Calo",getAccept().getCutResult("L1Calo"),etthr,pidword,pairObj.first);
+              this->fillEfficiency(dir+"/"+algname+"/HLT",acceptData.getCutResult("HLT"),etthr,pidword,pairObj.first);
+              this->fillEfficiency(dir+"/"+algname+"/L2Calo",acceptData.getCutResult("L2Calo"),etthr,pidword,pairObj.first,m_detailedHists); 
+              this->fillEfficiency(dir+"/"+algname+"/L2",acceptData.getCutResult("L2"),etthr,pidword,pairObj.first,m_detailedHists);
+              this->fillEfficiency(dir+"/"+algname+"/EFCalo",acceptData.getCutResult("EFCalo"),etthr,pidword,pairObj.first,m_detailedHists);
+              this->fillEfficiency(dir+"/"+algname+"/L1Calo",acceptData.getCutResult("L1Calo"),etthr,pidword,pairObj.first);
               if(m_detailedHists){
                   for(const auto pid : m_isemname) {
-                      this->fillEfficiency(dir+"/"+algname+"/HLT/"+pid,getAccept().getCutResult("HLT"),etthr,"is"+pid,pairObj.first);
+                      this->fillEfficiency(dir+"/"+algname+"/HLT/"+pid,acceptData.getCutResult("HLT"),etthr,"is"+pid,pairObj.first);
                       if( pairObj.first->auxdecor<bool>("Isolated") ) fillEfficiency(dir+"/"+algname+"/HLT/"+pid+"Iso",
-                          getAccept().getCutResult("HLT"),etthr,"is"+pid,pairObj.first);
+                          acceptData.getCutResult("HLT"),etthr,"is"+pid,pairObj.first);
                   }
                   for(const auto pid : m_lhname) {
-                      this->fillEfficiency(dir+"/"+algname+"/HLT/"+pid,getAccept().getCutResult("HLT"),etthr,"is"+pid,pairObj.first);
+                      this->fillEfficiency(dir+"/"+algname+"/HLT/"+pid,acceptData.getCutResult("HLT"),etthr,"is"+pid,pairObj.first);
                       if( pairObj.first->auxdecor<bool>("Isolated") ) fillEfficiency(dir+"/"+algname+"/HLT/"+pid+"Iso",
-                          getAccept().getCutResult("HLT"),etthr,"is"+pid,pairObj.first);
+                          acceptData.getCutResult("HLT"),etthr,"is"+pid,pairObj.first);
                   }
               }
               ATH_MSG_DEBUG("Complete efficiency");
diff --git a/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/Root/TrigEgammaAnalysisBaseTool.cxx b/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/Root/TrigEgammaAnalysisBaseTool.cxx
index 1d7145df0c8220c53e37a7ac3b59479cc698f2e2..fcd2a4aee400191fe2a3e27520bf5c87ecf1eac5 100644
--- a/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/Root/TrigEgammaAnalysisBaseTool.cxx
+++ b/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/Root/TrigEgammaAnalysisBaseTool.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 /**********************************************************************
@@ -555,9 +555,10 @@ bool TrigEgammaAnalysisBaseTool::isPrescaled(const std::string trigger){
     return false; // Not prescaled, use event
 }
 
-void TrigEgammaAnalysisBaseTool::setAccept(const HLT::TriggerElement *te,const TrigInfo info){
+asg::AcceptData
+TrigEgammaAnalysisBaseTool::setAccept(const HLT::TriggerElement *te,const TrigInfo info){
     ATH_MSG_DEBUG("setAccept");
-    m_accept.clear();
+    asg::AcceptData acceptData (&m_accept);
     bool passedL1Calo=false;
     bool passedL2Calo=false;
     bool passedEFCalo=false;
@@ -599,12 +600,12 @@ void TrigEgammaAnalysisBaseTool::setAccept(const HLT::TriggerElement *te,const T
         }
     }
 
-    m_accept.setCutResult("L1Calo",passedL1Calo);
-    m_accept.setCutResult("L2Calo",passedL2Calo);
-    m_accept.setCutResult("L2",passedL2);
-    m_accept.setCutResult("EFCalo",passedEFCalo);
-    m_accept.setCutResult("EFTrack",passedEFTrk);
-    m_accept.setCutResult("HLT",passedEF);
+    acceptData.setCutResult("L1Calo",passedL1Calo);
+    acceptData.setCutResult("L2Calo",passedL2Calo);
+    acceptData.setCutResult("L2",passedL2);
+    acceptData.setCutResult("EFCalo",passedEFCalo);
+    acceptData.setCutResult("EFTrack",passedEFTrk);
+    acceptData.setCutResult("HLT",passedEF);
     ATH_MSG_DEBUG("Accept results:");
     ATH_MSG_DEBUG("L1: "<< passedL1Calo);
     ATH_MSG_DEBUG("L2Calo: " << passedL2Calo);
@@ -612,6 +613,7 @@ void TrigEgammaAnalysisBaseTool::setAccept(const HLT::TriggerElement *te,const T
     ATH_MSG_DEBUG("EFCalo: "<< passedEFCalo);
     ATH_MSG_DEBUG("HLT: "<<passedEF);
 
+    return acceptData;
 }
 
 float TrigEgammaAnalysisBaseTool::dR(const float eta1, const float phi1, const float eta2, const float phi2){
diff --git a/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/Root/TrigEgammaNavNtuple.cxx b/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/Root/TrigEgammaNavNtuple.cxx
index 001ab83e4c404074dd9e53ccde2d52332edbef67..a15b46ae14857468d84e882fb5460bfc613c8087 100755
--- a/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/Root/TrigEgammaNavNtuple.cxx
+++ b/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/Root/TrigEgammaNavNtuple.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 
@@ -316,12 +316,12 @@ bool TrigEgammaNavNtuple::executeTrigItemDump(){
         }// loop over calo cluster
       }
 
-      setAccept(feat,info);
-      m_trig_L1_accept       = getAccept().getCutResult("L1Calo"); 
-      m_trig_L2_calo_accept  = getAccept().getCutResult("L2Calo"); 
-      m_trig_L2_el_accept    = getAccept().getCutResult("L2"); 
-      m_trig_EF_calo_accept  = getAccept().getCutResult("EFCalo");  
-      m_trig_EF_el_accept    = getAccept().getCutResult("HLT");  
+      asg::AcceptData acceptData = setAccept(feat,info);
+      m_trig_L1_accept       = acceptData.getCutResult("L1Calo"); 
+      m_trig_L2_calo_accept  = acceptData.getCutResult("L2Calo"); 
+      m_trig_L2_el_accept    = acceptData.getCutResult("L2"); 
+      m_trig_EF_calo_accept  = acceptData.getCutResult("EFCalo");  
+      m_trig_EF_el_accept    = acceptData.getCutResult("HLT");  
       
       ATH_MSG_DEBUG("L1Calo: "  << int(m_trig_L1_accept)); 
       ATH_MSG_DEBUG("L2Calo: "  << int(m_trig_L2_calo_accept));
diff --git a/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/Root/TrigEgammaNavTPAnalysisTool.cxx b/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/Root/TrigEgammaNavTPAnalysisTool.cxx
index 50d2e171e12308a6136d1e1b502a70ef613545e6..57a1a2058f76f9e7f9fbca8b03424a9ad15f0f9e 100644
--- a/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/Root/TrigEgammaNavTPAnalysisTool.cxx
+++ b/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/Root/TrigEgammaNavTPAnalysisTool.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 
@@ -183,30 +183,30 @@ StatusCode TrigEgammaNavTPAnalysisTool::childExecute()
             if(et < info.trigThrHLT-5.0) continue; 
             if(!offEl->auxdecor<bool>(info.trigPidDecorator)) continue; 
             const HLT::TriggerElement* feat = m_pairObj[i].second;
-            setAccept(feat,info); //Sets the trigger accepts
+            asg::AcceptData acceptData = setAccept(feat,info); //Sets the trigger accepts
             cd(m_dir+"/Expert/Event");
             if(et > info.trigThrHLT + 1.0)
                 hist1(m_anatype+"_nProbes")->Fill(cprobeTrigger,1);
             if ( feat ) {
                 if(et > info.trigThrHLT + 1.0){
-                    hist1(m_anatype+"_EffL1")->Fill(cprobeTrigger,getAccept().getCutResult("L1Calo"));
-                    hist1(m_anatype+"_EffL2Calo")->Fill(cprobeTrigger,getAccept().getCutResult("L2Calo"));
-                    hist1(m_anatype+"_EffL2")->Fill(cprobeTrigger,getAccept().getCutResult("L2"));
-                    hist1(m_anatype+"_EffEFCalo")->Fill(cprobeTrigger,getAccept().getCutResult("EFCalo"));
-                    hist1(m_anatype+"_EffHLT")->Fill(cprobeTrigger,getAccept().getCutResult("HLT"));
-                    if( getAccept().getCutResult("L1Calo")){
+                    hist1(m_anatype+"_EffL1")->Fill(cprobeTrigger,acceptData.getCutResult("L1Calo"));
+                    hist1(m_anatype+"_EffL2Calo")->Fill(cprobeTrigger,acceptData.getCutResult("L2Calo"));
+                    hist1(m_anatype+"_EffL2")->Fill(cprobeTrigger,acceptData.getCutResult("L2"));
+                    hist1(m_anatype+"_EffEFCalo")->Fill(cprobeTrigger,acceptData.getCutResult("EFCalo"));
+                    hist1(m_anatype+"_EffHLT")->Fill(cprobeTrigger,acceptData.getCutResult("HLT"));
+                    if( acceptData.getCutResult("L1Calo")){
                         hist1(m_anatype+"_nProbesL1")->Fill(cprobeTrigger,1);
                     }
-                    if( getAccept().getCutResult("L2Calo") ){
+                    if( acceptData.getCutResult("L2Calo") ){
                         hist1(m_anatype+"_nProbesL2Calo")->Fill(cprobeTrigger,1);
                     }
-                    if( getAccept().getCutResult("L2") ){
+                    if( acceptData.getCutResult("L2") ){
                         hist1(m_anatype+"_nProbesL2")->Fill(cprobeTrigger,1);
                     }
-                    if( getAccept().getCutResult("EFCalo") ){
+                    if( acceptData.getCutResult("EFCalo") ){
                         hist1(m_anatype+"_nProbesEFCalo")->Fill(cprobeTrigger,1);
                     }
-                    if( getAccept().getCutResult("HLT") ){
+                    if( acceptData.getCutResult("HLT") ){
                         hist1(m_anatype+"_nProbesHLT")->Fill(cprobeTrigger,1);
                     }
                 }
diff --git a/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/Root/TrigEgammaNavTPNtuple.cxx b/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/Root/TrigEgammaNavTPNtuple.cxx
index 62484f0cc05dbe118cb2a2b27b97b48ee06069dd..680e786f42f35dbe1fe6acb46eb52ff672b9c156 100755
--- a/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/Root/TrigEgammaNavTPNtuple.cxx
+++ b/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/Root/TrigEgammaNavTPNtuple.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 /**********************************************************************
@@ -243,12 +243,12 @@ bool TrigEgammaNavTPNtuple::executeProbesItemDump(){
         }
 
 
-        setAccept(feat,info);
-        m_trig_L1_accept       = getAccept().getCutResult("L1Calo"); 
-        m_trig_L2_calo_accept  = getAccept().getCutResult("L2Calo"); 
-        m_trig_L2_el_accept    = getAccept().getCutResult("L2"); 
-        m_trig_EF_calo_accept  = getAccept().getCutResult("EFCalo");  
-        m_trig_EF_el_accept    = getAccept().getCutResult("HLT");   
+        asg::AcceptData acceptData = setAccept(feat,info);
+        m_trig_L1_accept       = acceptData.getCutResult("L1Calo"); 
+        m_trig_L2_calo_accept  = acceptData.getCutResult("L2Calo"); 
+        m_trig_L2_el_accept    = acceptData.getCutResult("L2"); 
+        m_trig_EF_calo_accept  = acceptData.getCutResult("EFCalo");  
+        m_trig_EF_el_accept    = acceptData.getCutResult("HLT");   
 
         ATH_MSG_DEBUG("L1Calo: "  << int(m_trig_L1_accept)); 
         ATH_MSG_DEBUG("L2Calo: "  << int(m_trig_L2_calo_accept));
diff --git a/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/TrigEgammaAnalysisTools/EfficiencyTool.h b/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/TrigEgammaAnalysisTools/EfficiencyTool.h
index 43d14419293930651cf5ddf2a9d49c2b671fd475..14a3a4a0c26c98acc634be5afb811a78fbb40af0 100644
--- a/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/TrigEgammaAnalysisTools/EfficiencyTool.h
+++ b/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/TrigEgammaAnalysisTools/EfficiencyTool.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef EfficiencyTool_H
@@ -30,8 +30,10 @@ private:
 
 protected:
   void fillEfficiency(const std::string,bool,const float,const std::string,const xAOD::Egamma *,bool fill2D=true);
-  void inefficiency(const std::string&,const std::string,const float,std::pair< const xAOD::Egamma*,const HLT::TriggerElement*> pairObj);
-  void fillInefficiency(const std::string&,const std::string,const xAOD::Electron *,const xAOD::Photon *,const xAOD::CaloCluster *,const xAOD::TrackParticle *); 
+  void inefficiency(const std::string&,const std::string,const float,std::pair< const xAOD::Egamma*,const HLT::TriggerElement*> pairObj,
+                    const asg::AcceptData& acceptData);
+  void fillInefficiency(const std::string&,const std::string,const xAOD::Electron *,const xAOD::Photon *,const xAOD::CaloCluster *,const xAOD::TrackParticle *,
+                        const asg::AcceptData& acceptData); 
   bool analyseIsEM(const xAOD::Electron *,const std::string);
   bool analyseIsEMLH(const xAOD::Electron *,const std::string/*,const std::bitset<4>*/);
    /*! Include more detailed histograms */
diff --git a/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/TrigEgammaAnalysisTools/TrigEgammaAnalysisBaseTool.h b/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/TrigEgammaAnalysisTools/TrigEgammaAnalysisBaseTool.h
index c6abee3996dcb9a0944429f2fe67012a49859706..5a67bcefb1e402147f282fcb5b5e86b363879c60 100644
--- a/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/TrigEgammaAnalysisTools/TrigEgammaAnalysisBaseTool.h
+++ b/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/TrigEgammaAnalysisTools/TrigEgammaAnalysisBaseTool.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TrigEgammaAnalysisBaseTool_H
@@ -7,7 +7,8 @@
 
 #include "TrigEgammaAnalysisTools/ITrigEgammaAnalysisBaseTool.h"
 #include "AsgTools/AsgTool.h"
-#include "PATCore/TAccept.h"
+#include "PATCore/AcceptInfo.h"
+#include "PATCore/AcceptData.h"
 #include "TrigDecisionTool/TrigDecisionTool.h"
 #include "TrigEgammaMatchingTool/ITrigEgammaMatchingTool.h"
 #include "TrigEgammaAnalysisTools/ITrigEgammaPlotTool.h"
@@ -49,12 +50,12 @@ ASG_TOOL_CLASS(TrigEgammaAnalysisBaseTool, ITrigEgammaAnalysisBaseTool)
 public:
 
   TrigEgammaAnalysisBaseTool( const std::string& myname);
-  ~TrigEgammaAnalysisBaseTool() {};
+  virtual ~TrigEgammaAnalysisBaseTool() {};
 
-  StatusCode initialize();
-  StatusCode book();
-  StatusCode execute();
-  StatusCode finalize();
+  virtual StatusCode initialize() override;
+  virtual StatusCode book() override;
+  virtual StatusCode execute() override;
+  virtual StatusCode finalize() override;
   template<class T, class B> std::unique_ptr<xAOD::TrigPassBits> createBits(const T* CONT, const B* BITS);
   template<class T> std::unique_ptr<xAOD::TrigPassBits> getBits(const HLT::TriggerElement* te,const T* CONT);
   template<class T> const T* getFeature(const HLT::TriggerElement* te,const std::string key="");
@@ -62,14 +63,14 @@ public:
   template <class T1, class T2> const T1* closestObject(const std::pair<const xAOD::Egamma *, const HLT::TriggerElement *>, 
                                                         float &, bool usePassbits=true,const std::string key="");
   // Interface class methods needed to pass information to additional tools or to set common tools
-  void setParent(IHLTMonTool *parent){ m_parent = parent;};
-  void setPlotTool(ToolHandle<ITrigEgammaPlotTool> tool){m_plot=tool;}
-  void setDetail(bool detail){m_detailedHists=detail;}
-  void setTP(bool tp){m_tp=tp;}
-  void setEmulation(bool doEmu){m_doEmulation=doEmu;}
-  void setEmulationTool(ToolHandle<Trig::ITrigEgammaEmulationTool> tool){m_emulationTool=tool;}
-  void setPVertex(const float onvertex, const float ngoodvertex){m_nPVertex = onvertex; m_nGoodVertex = ngoodvertex;}
-  void setAvgMu(const float onlmu, const float offmu){m_onlmu=onlmu; m_offmu=offmu;} //For tools called by tools
+  virtual void setParent(IHLTMonTool *parent) override { m_parent = parent;};
+  virtual void setPlotTool(ToolHandle<ITrigEgammaPlotTool> tool) override {m_plot=tool;}
+  virtual void setDetail(bool detail) override {m_detailedHists=detail;}
+  virtual void setTP(bool tp) override {m_tp=tp;}
+  virtual void setEmulation(bool doEmu) override {m_doEmulation=doEmu;}
+  virtual void setEmulationTool(ToolHandle<Trig::ITrigEgammaEmulationTool> tool) override {m_emulationTool=tool;}
+  virtual void setPVertex(const float onvertex, const float ngoodvertex) override {m_nPVertex = onvertex; m_nGoodVertex = ngoodvertex;}
+  virtual void setAvgMu(const float onlmu, const float offmu) override {m_onlmu=onlmu; m_offmu=offmu;} //For tools called by tools
 
   // Set current MonGroup
   void cd(const std::string &dir);
@@ -100,8 +101,8 @@ private:
   std::map<std::string,TrigInfo> m_trigInfo;
   /*! Include more detailed histograms */
   bool m_detailedHists;
-  /*! TAccept to store TrigDecision */
-  Root::TAccept m_accept;
+  /*! AcceptInfo to store TrigDecision */
+  asg::AcceptInfo m_accept;
   /*! Helper strings for trigger level analysis */
   static const std::vector<std::string> m_trigLevel;
   static const std::map<std::string,std::string> m_trigLvlMap;
@@ -189,10 +190,9 @@ protected:
   bool getTP() const {return m_tp;}
   bool getEmulation() const {return m_doEmulation;}
 
-  // TAccept
-  Root::TAccept getAccept(){return m_accept;}
-  void setAccept(Root::TAccept accept){m_accept=accept;}
-  void setAccept(const HLT::TriggerElement *,const TrigInfo);
+  // AcceptInfo/Data
+  const asg::AcceptInfo& getAccept() const {return m_accept;}
+  asg::AcceptData setAccept(const HLT::TriggerElement *,const TrigInfo);
   
   //Class Members
   // Athena services
diff --git a/Trigger/TrigAnalysis/TrigEgammaEmulationTool/Root/TrigEgammaEmulationTool.cxx b/Trigger/TrigAnalysis/TrigEgammaEmulationTool/Root/TrigEgammaEmulationTool.cxx
index 89b578b6434c8f370c442bf8e3061ef54f449871..ada6347b3556178df4f2b44ec4bdc834c078a58c 100644
--- a/Trigger/TrigAnalysis/TrigEgammaEmulationTool/Root/TrigEgammaEmulationTool.cxx
+++ b/Trigger/TrigAnalysis/TrigEgammaEmulationTool/Root/TrigEgammaEmulationTool.cxx
@@ -153,7 +153,7 @@ StatusCode TrigEgammaEmulationTool::initialize() {
     }
    
     ATH_MSG_INFO("Initialising accept...");
-    //add cuts into TAccept
+    //add cuts into AcceptInfo
     m_accept.addCut("L1Calo"  , "Trigger L1Calo step"     );
     m_accept.addCut("L2Calo"  , "Trigger L2Calo step"     );
     m_accept.addCut("L2"      , "Trigger L2Electron step" );
@@ -289,10 +289,10 @@ bool TrigEgammaEmulationTool::EventWiseContainer(){
 }
 //!==========================================================================
 //! Emulation from Trigger Element
-const Root::TAccept& TrigEgammaEmulationTool::executeTool(const HLT::TriggerElement *te_external, const std::string &trigger) {
+asg::AcceptData TrigEgammaEmulationTool::executeTool(const HLT::TriggerElement *te_external, const std::string &trigger) {
 
   ATH_MSG_DEBUG("TrigEgammaEmulationTool::executeTool(te, trigger)");
-  m_accept.clear(); 
+  asg::AcceptData acceptData (&m_accept);
   
   if(m_trigInfo.count(trigger) != 0){
 
@@ -311,7 +311,7 @@ const Root::TAccept& TrigEgammaEmulationTool::executeTool(const HLT::TriggerElem
       const auto* l1 = getFeature<xAOD::EmTauRoI>(te_external);
       if(!l1){
         ATH_MSG_WARNING("Can not retrieve the support element because the current TE does not has xAOD::EmTauRoI object!");
-        return m_accept;
+        return acceptData;
       }
       // This object is not fully completed, try to found other.
       for (const auto &fctrigger : m_supportingTrigList){
@@ -347,7 +347,7 @@ const Root::TAccept& TrigEgammaEmulationTool::executeTool(const HLT::TriggerElem
         ATH_MSG_WARNING("This Trigger Element does not have all features needed by the emulation tool. The external match is " <<
                      " not possible! Maybe the support trigger list not attend all requirements."); 
         setTEMatched(nullptr);
-        return m_accept;
+        return acceptData;
       }
     }
 
@@ -369,47 +369,47 @@ const Root::TAccept& TrigEgammaEmulationTool::executeTool(const HLT::TriggerElem
 
     //Level 1
     m_l1Selector->emulation( l1, passedL1Calo , info);
-    m_accept.setCutResult("L1Calo", passedL1Calo);
+    acceptData.setCutResult("L1Calo", passedL1Calo);
 
     if( (passedL1Calo ) && !info.isL1 ){
 
       m_l2Selector->emulation( emCluster, passedL2Calo , info);
-      m_accept.setCutResult("L2Calo", passedL2Calo);
+      acceptData.setCutResult("L2Calo", passedL2Calo);
 
       if(passedL2Calo ){
         if(info.perf){//bypass L2 Electron/Photon Level
           passedL2=true;
-          m_accept.setCutResult("L2", passedL2);
+          acceptData.setCutResult("L2", passedL2);
         }else{
           if (info.type == "electron") {
             if(m_doL2ElectronFex)
               m_l2Selector->emulation( trigElCont, passedL2, info);
             else
               passedL2=true;
-            m_accept.setCutResult("L2", passedL2);
+            acceptData.setCutResult("L2", passedL2);
           }
           else if (info.type == "photon") {
             //m_l2Selector->emulation( trigPhCont, passedL2, trigger);
             //m_efPhotonSelector->emulation( phCont, passedEF, trigger);
             passedL2=true;
-            m_accept.setCutResult("L2", passedL2);
+            acceptData.setCutResult("L2", passedL2);
           }
         }//bypass L2
 
         if (passedL2){
           m_efCaloSelector->emulation( elCont, passedEFCalo, info);
-          m_accept.setCutResult("EFCalo", passedEFCalo);
+          acceptData.setCutResult("EFCalo", passedEFCalo);
           
           if(passedEFCalo){
             passedEFTrack=true;
-            m_accept.setCutResult("EFTrack"    , passedEFTrack);
+            acceptData.setCutResult("EFTrack"    , passedEFTrack);
 
             if(passedEFTrack){
               if(!emulationHLT(elCont, passedHLT, info)){
-                m_accept.clear();
-                return m_accept;
+                acceptData.clear();
+                return acceptData;
               }else{
-                m_accept.setCutResult("HLT"    , passedHLT);
+                acceptData.setCutResult("HLT"    , passedHLT);
               }
             }//EFTrack
           }//EFCalo 
@@ -420,13 +420,13 @@ const Root::TAccept& TrigEgammaEmulationTool::executeTool(const HLT::TriggerElem
     ATH_MSG_WARNING("Can not emulate " << trigger << ". This chain must be added into trigList before the creation.");
   }
 
-  return m_accept;
+  return acceptData;
 }
 //!==========================================================================
 //! Emulation from xAOD containers not using TDT tools
-const Root::TAccept& TrigEgammaEmulationTool::executeTool(const std::string &trigger) {
+asg::AcceptData TrigEgammaEmulationTool::executeTool(const std::string &trigger) {
   clearDecorations();
-  m_accept.clear();
+  asg::AcceptData acceptData (&m_accept);
   
   if( m_trigInfo.count(trigger) != 0){
     Trig::Info info     = getTrigInfo(trigger);
@@ -448,7 +448,7 @@ const Root::TAccept& TrigEgammaEmulationTool::executeTool(const std::string &tri
       bit++;
     }
     if(bitL1Accept.count()>0)  passedL1Calo=true;
-    m_accept.setCutResult("L1Calo", passedL1Calo);
+    acceptData.setCutResult("L1Calo", passedL1Calo);
 
     if(passedL1Calo  && !info.isL1){
       bit=0; pass=false;
@@ -460,44 +460,44 @@ const Root::TAccept& TrigEgammaEmulationTool::executeTool(const std::string &tri
       }
   
       if(bitL2CaloAccept.count()>0)  passedL2Calo=true;
-      m_accept.setCutResult("L2Calo", passedL2Calo);
+      acceptData.setCutResult("L2Calo", passedL2Calo);
       
       if(passedL2Calo) {
         if(info.perf){//bypass L2 Electron/Photon Level
           passedL2=true;
-          m_accept.setCutResult("L2", passedL2);
+          acceptData.setCutResult("L2", passedL2);
         }else{
           if (info.type == "electron") {
             if(m_doL2ElectronFex)
               m_l2Selector->emulation(m_trigElectrons, passedL2, info);
             else
               passedL2=true;
-            m_accept.setCutResult("L2", passedL2);
+            acceptData.setCutResult("L2", passedL2);
           }
           else if (info.type == "photon") {
             //m_l2Selector->emulation( trigPhCont, passedL2, trigger);
             //m_efPhotonSelector->emulation( phCont, passedEF, trigger);
             passedL2=true;
-            m_accept.setCutResult("L2", passedL2);
+            acceptData.setCutResult("L2", passedL2);
           }
         }//bypass L2
 
         if (passedL2){
 
           m_efCaloSelector->emulation(m_onlElectrons, passedEFCalo, info);
-          m_accept.setCutResult("EFCalo", passedEFCalo);
+          acceptData.setCutResult("EFCalo", passedEFCalo);
           
           if(passedEFCalo){
             //TODO: running the EF track step
             passedEFTrack=true;
-            m_accept.setCutResult("EFTrack", passedEFTrack);
+            acceptData.setCutResult("EFTrack", passedEFTrack);
             
             if(passedEFTrack){
               if(!emulationHLT(m_onlElectrons, passedHLT, info)){
-                m_accept.clear();
-                return m_accept;
+                acceptData.clear();
+                return acceptData;
               }else{
-                m_accept.setCutResult("HLT"    , passedHLT);
+                acceptData.setCutResult("HLT"    , passedHLT);
               }
             }//EFTrack
 
@@ -508,27 +508,25 @@ const Root::TAccept& TrigEgammaEmulationTool::executeTool(const std::string &tri
   }else{
     ATH_MSG_WARNING("Can not emulate. Trigger not configurated");
   }
-  return m_accept;
+  return acceptData;
 }
 
 
 //!==========================================================================
 bool TrigEgammaEmulationTool::isPassed(const std::string &trigger) {
-  m_accept.clear();
-  m_accept = executeTool(trigger);
+  asg::AcceptData acceptData = executeTool(trigger);
   ATH_MSG_DEBUG("Trigger = "<< trigger );
-  ATH_MSG_DEBUG("isPassed()::L1Calo = " << m_accept.getCutResult("L1"));
-  ATH_MSG_DEBUG("isPassed()::L2Calo = " << m_accept.getCutResult("L2Calo"));
-  ATH_MSG_DEBUG("isPassed()::L2     = " << m_accept.getCutResult("L2"));
-  ATH_MSG_DEBUG("isPassed()::EFCalo = " << m_accept.getCutResult("EFCalo"));
-  ATH_MSG_DEBUG("isPassed()::EFTrack= " << m_accept.getCutResult("EFTrack"));
-  ATH_MSG_DEBUG("isPassed()::HLT    = " << m_accept.getCutResult("HLT"));
-  return m_accept.getCutResult("HLT");
+  ATH_MSG_DEBUG("isPassed()::L1Calo = " << acceptData.getCutResult("L1"));
+  ATH_MSG_DEBUG("isPassed()::L2Calo = " << acceptData.getCutResult("L2Calo"));
+  ATH_MSG_DEBUG("isPassed()::L2     = " << acceptData.getCutResult("L2"));
+  ATH_MSG_DEBUG("isPassed()::EFCalo = " << acceptData.getCutResult("EFCalo"));
+  ATH_MSG_DEBUG("isPassed()::EFTrack= " << acceptData.getCutResult("EFTrack"));
+  ATH_MSG_DEBUG("isPassed()::HLT    = " << acceptData.getCutResult("HLT"));
+  return acceptData.getCutResult("HLT");
 }
 
 //!==========================================================================
 bool TrigEgammaEmulationTool::isPassed(const std::string &trigger, const std::string &fctrigger) {
-  m_accept.clear();
   const HLT::TriggerElement *finalFC = NULL;
   auto fc = m_trigdec->features(fctrigger, TrigDefs::alsoDeactivateTEs);
   auto vec = fc.get<xAOD::ElectronContainer>();
@@ -539,14 +537,14 @@ bool TrigEgammaEmulationTool::isPassed(const std::string &trigger, const std::st
     bit++;
     finalFC = feat.te();
     if (!finalFC) continue;
-    m_accept = executeTool(finalFC, trigger);
-    if(m_accept.getCutResult("HLT"))  bitAccept.set(bit-1,true);
-    ATH_MSG_DEBUG("isPassed()::L1Calo = " << m_accept.getCutResult("L1"));
-    ATH_MSG_DEBUG("isPassed()::L2Calo = " << m_accept.getCutResult("L2Calo"));
-    ATH_MSG_DEBUG("isPassed()::L2     = " << m_accept.getCutResult("L2"));
-    ATH_MSG_DEBUG("isPassed()::EFCalo = " << m_accept.getCutResult("EFCalo"));
-    ATH_MSG_DEBUG("isPassed()::EFTrack= " << m_accept.getCutResult("EFTrack"));
-    ATH_MSG_DEBUG("isPassed()::HLT    = " << m_accept.getCutResult("HLT")); 
+    asg::AcceptData acceptData = executeTool(finalFC, trigger);
+    if(acceptData.getCutResult("HLT"))  bitAccept.set(bit-1,true);
+    ATH_MSG_DEBUG("isPassed()::L1Calo = " << acceptData.getCutResult("L1"));
+    ATH_MSG_DEBUG("isPassed()::L2Calo = " << acceptData.getCutResult("L2Calo"));
+    ATH_MSG_DEBUG("isPassed()::L2     = " << acceptData.getCutResult("L2"));
+    ATH_MSG_DEBUG("isPassed()::EFCalo = " << acceptData.getCutResult("EFCalo"));
+    ATH_MSG_DEBUG("isPassed()::EFTrack= " << acceptData.getCutResult("EFTrack"));
+    ATH_MSG_DEBUG("isPassed()::HLT    = " << acceptData.getCutResult("HLT")); 
   }
   bool pass=false;
   if(bitAccept.count()>0)  pass=true;
diff --git a/Trigger/TrigAnalysis/TrigEgammaEmulationTool/TrigEgammaEmulationTool/ITrigEgammaEmulationTool.h b/Trigger/TrigAnalysis/TrigEgammaEmulationTool/TrigEgammaEmulationTool/ITrigEgammaEmulationTool.h
index a77d0fc14f145bdd2ff87db88adca6f9b7df9380..33c6287e062bec11a0f3e97247c4ab78ec2a554d 100644
--- a/Trigger/TrigAnalysis/TrigEgammaEmulationTool/TrigEgammaEmulationTool/ITrigEgammaEmulationTool.h
+++ b/Trigger/TrigAnalysis/TrigEgammaEmulationTool/TrigEgammaEmulationTool/ITrigEgammaEmulationTool.h
@@ -26,7 +26,8 @@
 #include "xAODCaloEvent/CaloClusterAuxContainer.h"
 #include "xAODTrigger/EmTauRoIContainer.h"
 #include "TrigDecisionTool/TrigDecisionTool.h"
-#include "PATCore/TAccept.h"
+#include "PATCore/AcceptInfo.h"
+#include "PATCore/AcceptData.h"
 #include <vector>
 #include <map>
 
@@ -42,11 +43,11 @@ namespace Trig{
 
             virtual bool EventWiseContainer()=0;
 
-            virtual const Root::TAccept& executeTool( const HLT::TriggerElement *, const std::string & )=0;
-            virtual const Root::TAccept& executeTool( const std::string & )=0;
+            virtual asg::AcceptData executeTool( const HLT::TriggerElement *, const std::string & )=0;
+            virtual asg::AcceptData executeTool( const std::string & )=0;
             virtual bool isPassed(const std::string&)=0;
             virtual bool isPassed(const std::string&, const std::string&)=0;
-            virtual const Root::TAccept& getAccept()=0;
+            virtual const asg::AcceptInfo& getAccept() const =0;
             /* Experimental methods */
             virtual void ExperimentalAndExpertMethods()=0;
             virtual void match( const xAOD::Egamma *, const HLT::TriggerElement *&)=0;
diff --git a/Trigger/TrigAnalysis/TrigEgammaEmulationTool/TrigEgammaEmulationTool/ITrigEgammaSelectorBaseTool.h b/Trigger/TrigAnalysis/TrigEgammaEmulationTool/TrigEgammaEmulationTool/ITrigEgammaSelectorBaseTool.h
index d2b196d82e320fa137372320d0378eed73721013..295ede74a2fcdd7205db4b64f6a834379eb67b95 100644
--- a/Trigger/TrigAnalysis/TrigEgammaEmulationTool/TrigEgammaEmulationTool/ITrigEgammaSelectorBaseTool.h
+++ b/Trigger/TrigAnalysis/TrigEgammaEmulationTool/TrigEgammaEmulationTool/ITrigEgammaSelectorBaseTool.h
@@ -7,7 +7,6 @@
 #define ITrigEgammaSelectorBaseTool_H_
 
 #include "AsgTools/IAsgTool.h"
-#include "PATCore/TAccept.h"
 #include "TrigDecisionTool/TrigDecisionTool.h"
 
 //xAOD include(s)
diff --git a/Trigger/TrigAnalysis/TrigEgammaEmulationTool/TrigEgammaEmulationTool/TrigEgammaEmulationTool.h b/Trigger/TrigAnalysis/TrigEgammaEmulationTool/TrigEgammaEmulationTool/TrigEgammaEmulationTool.h
index 9ffb70e1451d24a3862be5d71c11bbd54812c921..5b7432c13378be3ff9ae00acbd20b04c6ad9995d 100644
--- a/Trigger/TrigAnalysis/TrigEgammaEmulationTool/TrigEgammaEmulationTool/TrigEgammaEmulationTool.h
+++ b/Trigger/TrigAnalysis/TrigEgammaEmulationTool/TrigEgammaEmulationTool/TrigEgammaEmulationTool.h
@@ -9,7 +9,8 @@
 #include "TrigEgammaEmulationTool/ITrigEgammaEmulationTool.h"
 #include "TrigEgammaEmulationTool/ITrigEgammaSelectorBaseTool.h"
 #include "AsgTools/AsgTool.h"
-#include "PATCore/TAccept.h"
+#include "PATCore/AcceptInfo.h"
+#include "PATCore/AcceptData.h"
 #include "AthContainers/AuxElement.h"
 #include "TrigDecisionTool/TrigDecisionTool.h"
 #include "TrigEgammaMatchingTool/ITrigEgammaMatchingTool.h"
@@ -39,27 +40,27 @@ class TrigEgammaEmulationTool
 
     //****************************************************************************** 
     TrigEgammaEmulationTool(const std::string& myname);
-    ~TrigEgammaEmulationTool() {};
+    virtual ~TrigEgammaEmulationTool() {};
 
-    StatusCode initialize();
-    StatusCode execute();
-    StatusCode finalize();
+    virtual StatusCode initialize() override;
+    virtual StatusCode execute() override;
+    virtual StatusCode finalize() override;
 
     //execute all emulators
-    const Root::TAccept& executeTool( const std::string &);
-    const Root::TAccept& executeTool( const HLT::TriggerElement *, const std::string &);
-    const Root::TAccept& getAccept(){return m_accept;}
+    virtual asg::AcceptData executeTool( const std::string &) override;
+    virtual asg::AcceptData executeTool( const HLT::TriggerElement *, const std::string &) override;
+    virtual const asg::AcceptInfo& getAccept() const override {return m_accept;}
     
-    bool EventWiseContainer();
-    bool isPassed(const std::string&);
-    bool isPassed(const std::string&, const std::string&);
+    virtual bool EventWiseContainer() override;
+    virtual bool isPassed(const std::string&) override;
+    virtual bool isPassed(const std::string&, const std::string&) override;
 
     
     /* Experimental methods */
-    void ExperimentalAndExpertMethods(){m_experimentalAndExpertMethods=true;};
+    virtual void ExperimentalAndExpertMethods() override {m_experimentalAndExpertMethods=true;};
     
-    void match( const xAOD::Egamma *, const HLT::TriggerElement *&);
-    const HLT::TriggerElement* getTEMatched(){return m_teMatched;};
+    virtual void match( const xAOD::Egamma *, const HLT::TriggerElement *&) override;
+    virtual const HLT::TriggerElement* getTEMatched() override {return m_teMatched;};
 
 
   private:
@@ -93,7 +94,7 @@ class TrigEgammaEmulationTool
     std::vector<std::string>                      m_supportingTrigList;
     std::map<std::string, Trig::Info>             m_trigInfo;
 
-    Root::TAccept                                 m_accept;
+    asg::AcceptInfo                               m_accept;
     StoreGateSvc                                 *m_storeGate;
     ToolHandle<Trig::TrigDecisionTool>            m_trigdec;
     ToolHandle<Trig::ITrigEgammaMatchingTool>     m_matchTool;
diff --git a/Trigger/TrigAnalysis/TrigEgammaEmulationTool/TrigEgammaEmulationTool/TrigEgammaSelectorBaseTool.h b/Trigger/TrigAnalysis/TrigEgammaEmulationTool/TrigEgammaEmulationTool/TrigEgammaSelectorBaseTool.h
index a5869fb8499eb83ba25f0cc5f7c16ce4167d3d68..e4cac53267cea2b57f519b2daa8b7a75d491eaa1 100644
--- a/Trigger/TrigAnalysis/TrigEgammaEmulationTool/TrigEgammaEmulationTool/TrigEgammaSelectorBaseTool.h
+++ b/Trigger/TrigAnalysis/TrigEgammaEmulationTool/TrigEgammaEmulationTool/TrigEgammaSelectorBaseTool.h
@@ -8,7 +8,6 @@
 
 
 #include "AsgTools/AsgTool.h"
-#include "PATCore/TAccept.h"
 #include "TrigDecisionTool/TrigDecisionTool.h"
 #include "LumiBlockComps/ILumiBlockMuTool.h"
 #include "LumiBlockComps/ILuminosityTool.h"
@@ -44,10 +43,10 @@ namespace Trig{
 
       //using ITrigEgammaSelectorBaseTool::emulation;
       TrigEgammaSelectorBaseTool(const std::string& myname);
-      ~TrigEgammaSelectorBaseTool(){;}
+      virtual ~TrigEgammaSelectorBaseTool(){;}
 
-      StatusCode initialize();
-      StatusCode finalize();
+      virtual StatusCode initialize() override;
+      virtual StatusCode finalize() override;
 
       //FIXME: static_cast for IParticleContainer to EmTau and emCluster
       //doent work. Because this I add these extra methods. Need to check
diff --git a/Trigger/TrigAnalysis/TrigEgammaEmulationTool/src/TrigEgammaEmulationToolAlg.cxx b/Trigger/TrigAnalysis/TrigEgammaEmulationTool/src/TrigEgammaEmulationToolAlg.cxx
index 3fe7bbac74684a0e67ed843213c265b3b4181eb3..e0600fe97edef0393f6f248fad1c7d3fde332f27 100644
--- a/Trigger/TrigAnalysis/TrigEgammaEmulationTool/src/TrigEgammaEmulationToolAlg.cxx
+++ b/Trigger/TrigAnalysis/TrigEgammaEmulationTool/src/TrigEgammaEmulationToolAlg.cxx
@@ -11,7 +11,6 @@
 #include "xAODCaloEvent/CaloClusterContainer.h"
 #include "xAODEgamma/ElectronContainer.h"
 #include "xAODEgamma/PhotonContainer.h"
-#include "PATCore/TAccept.h"
 
 namespace Trig {
 TrigEgammaEmulationToolAlg::
diff --git a/Trigger/TrigAnalysis/TrigEgammaEmulationTool/src/TrigEgammaEmulationToolAlg.h b/Trigger/TrigAnalysis/TrigEgammaEmulationTool/src/TrigEgammaEmulationToolAlg.h
index e612fab00e7ed6528fe74c81c1328890b87e8396..21905462a78180de414c01564b51b16e3413de69 100644
--- a/Trigger/TrigAnalysis/TrigEgammaEmulationTool/src/TrigEgammaEmulationToolAlg.h
+++ b/Trigger/TrigAnalysis/TrigEgammaEmulationTool/src/TrigEgammaEmulationToolAlg.h
@@ -19,10 +19,10 @@ namespace Trig {
   class TrigEgammaEmulationToolAlg : public AthAlgorithm {
     public:
       TrigEgammaEmulationToolAlg(const std::string& name, ISvcLocator* pSvcLocator);
-      ~TrigEgammaEmulationToolAlg();
-      StatusCode initialize();
-      StatusCode execute();
-      StatusCode finalize();
+      virtual ~TrigEgammaEmulationToolAlg();
+      virtual StatusCode initialize() override;
+      virtual StatusCode execute() override;
+      virtual StatusCode finalize() override;
     private:
       //
       std::vector<std::string>   m_triggerList;
diff --git a/Trigger/TrigAnalysis/TrigEgammaEmulationTool/src/TrigEgammaEmulationToolTest.cxx b/Trigger/TrigAnalysis/TrigEgammaEmulationTool/src/TrigEgammaEmulationToolTest.cxx
index 5a95b72e5f4ae49f7a8de8914c1f03ac104f758f..fbb1ce39d94f165cb1ec5a4ee6521c66052e0945 100644
--- a/Trigger/TrigAnalysis/TrigEgammaEmulationTool/src/TrigEgammaEmulationToolTest.cxx
+++ b/Trigger/TrigAnalysis/TrigEgammaEmulationTool/src/TrigEgammaEmulationToolTest.cxx
@@ -13,7 +13,6 @@
 #include "xAODCaloEvent/CaloClusterContainer.h"
 #include "xAODEgamma/ElectronContainer.h"
 #include "xAODEgamma/PhotonContainer.h"
-#include "PATCore/TAccept.h"
 using std::string;
 
 //**********************************************************************
@@ -118,23 +117,23 @@ StatusCode TrigEgammaEmulationToolTest::Method1() {
         ATH_MSG_DEBUG("TE is nullptr");
         continue;
       }
-      setAccept(finalFC);
+      asg::AcceptData acceptData = setAccept(finalFC);
       
       count("Method1__total__"+trigger);      
-      if(m_accept.getCutResult("L1Calo"))   count("Method1__TDT__L1Calo__" +trigger);
-      if(m_accept.getCutResult("L2Calo"))   count("Method1__TDT__L2Calo__" +trigger);
-      if(m_accept.getCutResult("L2"))       count("Method1__TDT__L2__"     +trigger);
-      if(m_accept.getCutResult("EFTrack"))  count("Method1__TDT__EFTrack__"+trigger);
-      if(m_accept.getCutResult("EFCalo"))   count("Method1__TDT__EFCalo__" +trigger);
-      if(m_accept.getCutResult("HLT"))      count("Method1__TDT__HLT__"    +trigger);
-
-      Root::TAccept accept = m_emulationTool->executeTool(finalFC, trigger);
-      if(accept.getCutResult("L1Calo"))   count("Method1__EMU__L1Calo__" +trigger);
-      if(accept.getCutResult("L2Calo"))   count("Method1__EMU__L2Calo__" +trigger);
-      if(accept.getCutResult("L2"))       count("Method1__EMU__L2__"     +trigger);
-      if(accept.getCutResult("EFTrack"))  count("Method1__EMU__EFTrack__"+trigger);
-      if(accept.getCutResult("EFCalo"))   count("Method1__EMU__EFCalo__" +trigger);
-      if(accept.getCutResult("HLT"))      count("Method1__EMU__HLT__"    +trigger);
+      if(acceptData.getCutResult("L1Calo"))   count("Method1__TDT__L1Calo__" +trigger);
+      if(acceptData.getCutResult("L2Calo"))   count("Method1__TDT__L2Calo__" +trigger);
+      if(acceptData.getCutResult("L2"))       count("Method1__TDT__L2__"     +trigger);
+      if(acceptData.getCutResult("EFTrack"))  count("Method1__TDT__EFTrack__"+trigger);
+      if(acceptData.getCutResult("EFCalo"))   count("Method1__TDT__EFCalo__" +trigger);
+      if(acceptData.getCutResult("HLT"))      count("Method1__TDT__HLT__"    +trigger);
+
+      asg::AcceptData accept2 = m_emulationTool->executeTool(finalFC, trigger);
+      if(accept2.getCutResult("L1Calo"))   count("Method1__EMU__L1Calo__" +trigger);
+      if(accept2.getCutResult("L2Calo"))   count("Method1__EMU__L2Calo__" +trigger);
+      if(accept2.getCutResult("L2"))       count("Method1__EMU__L2__"     +trigger);
+      if(accept2.getCutResult("EFTrack"))  count("Method1__EMU__EFTrack__"+trigger);
+      if(accept2.getCutResult("EFCalo"))   count("Method1__EMU__EFCalo__" +trigger);
+      if(accept2.getCutResult("HLT"))      count("Method1__EMU__HLT__"    +trigger);
       
     }// loop over electrons offline
   }// loop over triggers
@@ -156,22 +155,22 @@ StatusCode TrigEgammaEmulationToolTest::Method2() {
         continue;
       }
 
-      setAccept(finalFC);
+      asg::AcceptData acceptData = setAccept(finalFC);
       count("Method2__total__"+trigger);      
-      if(m_accept.getCutResult("L1Calo"))   count("Method2__TDT__L1Calo__" +trigger);
-      if(m_accept.getCutResult("L2Calo"))   count("Method2__TDT__L2Calo__" +trigger);
-      if(m_accept.getCutResult("L2"))       count("Method2__TDT__L2__"     +trigger);
-      if(m_accept.getCutResult("EFTrack"))  count("Method2__TDT__EFTrack__"+trigger);
-      if(m_accept.getCutResult("EFCalo"))   count("Method2__TDT__EFCalo__" +trigger);
-      if(m_accept.getCutResult("HLT"))      count("Method2__TDT__HLT__"    +trigger);
-
-      Root::TAccept accept = m_emulationTool->executeTool(trigger);
-      if(accept.getCutResult("L1Calo"))   count("Method2__EMU__L1Calo__" +trigger);
-      if(accept.getCutResult("L2Calo"))   count("Method2__EMU__L2Calo__" +trigger);
-      if(accept.getCutResult("L2"))       count("Method2__EMU__L2__"     +trigger);
-      if(accept.getCutResult("EFTrack"))  count("Method2__EMU__EFTrack__"+trigger);
-      if(accept.getCutResult("EFCalo"))   count("Method2__EMU__EFCalo__" +trigger);
-      if(accept.getCutResult("HLT"))      count("Method2__EMU__HLT__"    +trigger);
+      if(acceptData.getCutResult("L1Calo"))   count("Method2__TDT__L1Calo__" +trigger);
+      if(acceptData.getCutResult("L2Calo"))   count("Method2__TDT__L2Calo__" +trigger);
+      if(acceptData.getCutResult("L2"))       count("Method2__TDT__L2__"     +trigger);
+      if(acceptData.getCutResult("EFTrack"))  count("Method2__TDT__EFTrack__"+trigger);
+      if(acceptData.getCutResult("EFCalo"))   count("Method2__TDT__EFCalo__" +trigger);
+      if(acceptData.getCutResult("HLT"))      count("Method2__TDT__HLT__"    +trigger);
+
+      asg::AcceptData accept2 = m_emulationTool->executeTool(trigger);
+      if(accept2.getCutResult("L1Calo"))   count("Method2__EMU__L1Calo__" +trigger);
+      if(accept2.getCutResult("L2Calo"))   count("Method2__EMU__L2Calo__" +trigger);
+      if(accept2.getCutResult("L2"))       count("Method2__EMU__L2__"     +trigger);
+      if(accept2.getCutResult("EFTrack"))  count("Method2__EMU__EFTrack__"+trigger);
+      if(accept2.getCutResult("EFCalo"))   count("Method2__EMU__EFCalo__" +trigger);
+      if(accept2.getCutResult("HLT"))      count("Method2__EMU__HLT__"    +trigger);
     
     }
   }
@@ -213,11 +212,12 @@ void TrigEgammaEmulationToolTest::writeEmulationSummary(){
  
 }
 
-bool TrigEgammaEmulationToolTest::setAccept( const HLT::TriggerElement *finalFC){
-  m_accept.clear();
-  
+asg::AcceptData
+TrigEgammaEmulationToolTest::setAccept( const HLT::TriggerElement *finalFC)
+{
+  asg::AcceptData acceptData (&m_accept);
   if(!finalFC)
-    return false;
+    return acceptData;
     
   bool passedL1         = false;
   bool passedL2Calo     = false;
@@ -254,14 +254,14 @@ bool TrigEgammaEmulationToolTest::setAccept( const HLT::TriggerElement *finalFC)
   if( m_trigdec->ancestor<xAOD::ElectronContainer>(finalFC).te() != nullptr )
     passedHLT=m_trigdec->ancestor<xAOD::ElectronContainer>(finalFC).te()->getActiveState();
 
-  m_accept.setCutResult("L1Calo", passedL1);
-  m_accept.setCutResult("L2Calo", passedL2Calo);
-  m_accept.setCutResult("L2", passedL2);
-  m_accept.setCutResult("EFTrack", passedEFTrack);
-  m_accept.setCutResult("EFCalo", passedEFCalo);
-  m_accept.setCutResult("HLT", passedHLT);
+  acceptData.setCutResult("L1Calo", passedL1);
+  acceptData.setCutResult("L2Calo", passedL2Calo);
+  acceptData.setCutResult("L2", passedL2);
+  acceptData.setCutResult("EFTrack", passedEFTrack);
+  acceptData.setCutResult("EFCalo", passedEFCalo);
+  acceptData.setCutResult("HLT", passedHLT);
 
-  return true;
+  return acceptData;
 }
 
 }///namespace
diff --git a/Trigger/TrigAnalysis/TrigEgammaEmulationTool/src/TrigEgammaEmulationToolTest.h b/Trigger/TrigAnalysis/TrigEgammaEmulationTool/src/TrigEgammaEmulationToolTest.h
index 903832077a1d09398243798606a9dd5ca29cb4da..deb1fd59d7a44f35ba91b252fce6dcb166ce84c5 100644
--- a/Trigger/TrigAnalysis/TrigEgammaEmulationTool/src/TrigEgammaEmulationToolTest.h
+++ b/Trigger/TrigAnalysis/TrigEgammaEmulationTool/src/TrigEgammaEmulationToolTest.h
@@ -14,6 +14,8 @@
 #include "TrigEgammaMatchingTool/ITrigEgammaMatchingTool.h"
 #include "TrigEgammaEmulationTool/ITrigEgammaEmulationTool.h"
 #include "xAODEgamma/ElectronContainer.h"
+#include "PATCore/AcceptInfo.h"
+#include "PATCore/AcceptData.h"
 
 #include <string>
 #include <map>
@@ -29,12 +31,12 @@ namespace Trig{
             TrigEgammaEmulationToolTest(const std::string& name, ISvcLocator* pSvcLocator);
 
             /// Destructor: 
-            ~TrigEgammaEmulationToolTest(); 
+            virtual ~TrigEgammaEmulationToolTest(); 
 
             /// Athena algorithm's Hooks
-            StatusCode  initialize();
-            StatusCode  execute();
-            StatusCode  finalize();
+            virtual StatusCode  initialize() override;
+            virtual StatusCode  execute() override;
+            virtual StatusCode  finalize() override;
 
         private: 
 
@@ -43,7 +45,7 @@ namespace Trig{
             StatusCode Method1();
             StatusCode Method2();
             void writeEmulationSummary();
-            bool setAccept(const HLT::TriggerElement*);
+            asg::AcceptData setAccept(const HLT::TriggerElement*);
             float ratio(float,float);
 
 
@@ -66,7 +68,7 @@ namespace Trig{
             std::map<std::string, unsigned >m_countMap;
             std::vector<std::string>   m_triggerList;
             StoreGateSvc              *m_storeGate;
-            Root::TAccept              m_accept;
+            asg::AcceptInfo            m_accept;
 
             const xAOD::ElectronContainer   *m_offElectrons;
 
diff --git a/Trigger/TrigCost/TrigCostRootAnalysis/Root/Config.cxx b/Trigger/TrigCost/TrigCostRootAnalysis/Root/Config.cxx
index fce9ed7a8bada74f2b5c0fea1c180cf5d02ce62b..647e0765447498a09abe73acbb516fc377bc033e 100644
--- a/Trigger/TrigCost/TrigCostRootAnalysis/Root/Config.cxx
+++ b/Trigger/TrigCost/TrigCostRootAnalysis/Root/Config.cxx
@@ -1057,7 +1057,7 @@ namespace TrigCostRootAnalysis {
         break;
 
       case '1':
-        // I'm setting the _patternsNoLumiWeight strings
+        // I'm setting the patternsNoLumiWeight strings
         patternsNoLumiWeight.push_back(std::string(optarg));
         while (optind < argc) {
           if (std::string(argv[optind]).substr(0, 1) == "-") { //We're back to arguments
@@ -1068,7 +1068,7 @@ namespace TrigCostRootAnalysis {
         break;
 
       case '2':
-        // I'm setting the _patternsNoMuLumiWeight strings
+        // I'm setting the patternsNoMuLumiWeight strings
         patternsNoMuLumiWeight.push_back(std::string(optarg));
         while (optind < argc) {
           if (std::string(argv[optind]).substr(0, 1) == "-") { //We're back to arguments
@@ -1079,7 +1079,7 @@ namespace TrigCostRootAnalysis {
         break;
 
       case '3':
-        // I'm setting the _patternsNoBunchLumiWeight strings
+        // I'm setting the patternsNoBunchLumiWeight strings
         patternsNoBunchLumiWeight.push_back(std::string(optarg));
         while (optind < argc) {
           if (std::string(argv[optind]).substr(0, 1) == "-") { //We're back to arguments
diff --git a/Trigger/TrigCost/TrigCostRootAnalysis/Root/CounterRatesChain.cxx b/Trigger/TrigCost/TrigCostRootAnalysis/Root/CounterRatesChain.cxx
index 2b897d9aeb7d319d4a5050e43605a7fbc70169ba..8a52ae7e8b4f982e6b2004ab573e6d166bb1183d 100644
--- a/Trigger/TrigCost/TrigCostRootAnalysis/Root/CounterRatesChain.cxx
+++ b/Trigger/TrigCost/TrigCostRootAnalysis/Root/CounterRatesChain.cxx
@@ -105,7 +105,7 @@ namespace TrigCostRootAnalysis {
         L2->getLumiExtrapolationFactor(m_costData->getLumi(), m_disableEventLumiExtrapolation);
       //if (getName() == "HLT_cscmon_L1All") Info("DEBUG", "WL1:%f, NL1:%s, 1-L1: %f, HLT:%f, total: %f, lumi%f",
       // m_lowerRates->getLastWeight(), m_lowerRates->getName().c_str(),  1. - L1Weight,
-      // L2->getPSWeight(_includeExpress), L2->getPSWeight(_includeExpress) * ( 1. - L1Weight ),
+      // L2->getPSWeight(includeExpress), L2->getPSWeight(includeExpress) * ( 1. - L1Weight ),
       //  L2->getLumiExtrapolationFactor()  );
       m_cachedWeight = L2->getPSWeight(includeExpress) * (1. - L1Weight);
     } else { // A L1Chain
diff --git a/Trigger/TrigCost/TrigCostRootAnalysis/Root/MonitorBase.cxx b/Trigger/TrigCost/TrigCostRootAnalysis/Root/MonitorBase.cxx
index 771a7e4de662ea4d70133488d3b941a2f910a57f..13d52df40e8fa83b5e9cc7c9c338b00ac2f9a41f 100644
--- a/Trigger/TrigCost/TrigCostRootAnalysis/Root/MonitorBase.cxx
+++ b/Trigger/TrigCost/TrigCostRootAnalysis/Root/MonitorBase.cxx
@@ -97,7 +97,7 @@ namespace TrigCostRootAnalysis {
   }
 
   /**
-   * @ param _pass Set which pass through the input files are we on.
+   * @ param pass Set which pass through the input files are we on.
    */
   void MonitorBase::setPass(UInt_t pass) {
     m_pass = pass;
@@ -253,7 +253,7 @@ namespace TrigCostRootAnalysis {
    * @param name reference to the name of counter collection to add (will be created if does not exist)
    * @param lumiBlockNumber Current LB, used for bookkeeping for this CounterCollection
    * @param lumiLength Length of current LB, used for bookkeeping for this CounterCollection
-   * @param _type Conf key specifying the type of this CounterCollection which may be queried later.
+   * @param type Conf key specifying the type of this CounterCollection which may be queried later.
    */
   void MonitorBase::addToCollectionsToProcess(const std::string& name, UInt_t lumiBlockNumber, Float_t lumiLength,
                                               const ConfKey_t type) {
diff --git a/Trigger/TrigCost/TrigCostRootAnalysis/Root/MonitorRates.cxx b/Trigger/TrigCost/TrigCostRootAnalysis/Root/MonitorRates.cxx
index cd3be03cff6970fc1cbdf69f3b7a5f14dd4d7d96..e6fd547bdbf496cc857b648f8c09e2b688420add 100644
--- a/Trigger/TrigCost/TrigCostRootAnalysis/Root/MonitorRates.cxx
+++ b/Trigger/TrigCost/TrigCostRootAnalysis/Root/MonitorRates.cxx
@@ -405,9 +405,9 @@ namespace TrigCostRootAnalysis {
       CounterBaseRates* L1Counter = nullptr;
       if (itCm != counterMap->end()) L1Counter = (CounterBaseRates*) itCm->second;
 
-      //bool _hasL1Seed = kTRUE;
+      //bool hasL1Seed = kTRUE;
       if (L1Name == Config::config().getStr(kBlankString)) {
-        //_hasL1Seed = kFALSE;
+        //hasL1Seed = kFALSE;
         L1Counter = m_globalRateL1Counter;
       }
 
@@ -452,7 +452,7 @@ namespace TrigCostRootAnalysis {
       // Then at the end it subtracts this rate from the global rate. So we need to add *all* chains *but* this one.
 
       CounterBaseRates* thisChainsUniqueCounter = 0;
-      if (Config::config().getInt(kDoUniqueRates) == kTRUE /*&& _hasL1Seed == kTRUE*/) {
+      if (Config::config().getInt(kDoUniqueRates) == kTRUE /*&& hasL1Seed == kTRUE*/) {
         for (CounterMapIt_t itA = counterMap->begin(); itA != counterMap->end(); ++itA) {
           CounterBaseRates* counter = static_cast<CounterBaseRates*>(itA->second);
           if (counter->getStrDecoration(kDecType) != "UniqueHLT") continue;
@@ -617,7 +617,7 @@ namespace TrigCostRootAnalysis {
 
       // Debug
       // std::stringstream ss;
-      // for (UInt_t _group = 0; _group < chainGroups.size(); ++_group) ss << chainGroups.at(_group) << " ";
+      // for (UInt_t group = 0; group < chainGroups.size(); ++group) ss << chainGroups.at(group) << " ";
       // ss << TrigConfInterface::getChainCPSGroup(i);
       // Info("MonitorRates::createGroupCounters","Chain %s in groups: %s", TrigConfInterface::getChainName(i).c_str(),
       // ss.str().c_str());
diff --git a/Trigger/TrigCost/TrigCostRootAnalysis/Root/MonitorRatesUpgrade.cxx b/Trigger/TrigCost/TrigCostRootAnalysis/Root/MonitorRatesUpgrade.cxx
index e624ae4514b3883a8417ecd137acb218ed7ec481..6d0533b0095cdfa65689a147aac081c3fe476adc 100644
--- a/Trigger/TrigCost/TrigCostRootAnalysis/Root/MonitorRatesUpgrade.cxx
+++ b/Trigger/TrigCost/TrigCostRootAnalysis/Root/MonitorRatesUpgrade.cxx
@@ -262,8 +262,8 @@ namespace TrigCostRootAnalysis {
               if (t == 15) triggerLogic.addCondition("TE", 1, sE, 0, 0, 49);
               if (t == 16) triggerLogic.addCondition("HT", 1, sE, 0, 0, 49);
 
-              auto _it = m_upgradeChains.insert(ChainInfo(name.str(), 1, triggerLogic, group.str(), "", 1., 1.));
-              TriggerLogic* tl = const_cast<TriggerLogic*>(&(_it->m_triggerLogic)); //Why is this const in the first
+              auto it = m_upgradeChains.insert(ChainInfo(name.str(), 1, triggerLogic, group.str(), "", 1., 1.));
+              TriggerLogic* tl = const_cast<TriggerLogic*>(&(it->m_triggerLogic)); //Why is this const in the first
                                                                                      // place?
 
               RatesChainItem* L1 = new RatesChainItem(name.str(), /*chainLevel=*/ 1, 1.);
@@ -276,7 +276,7 @@ namespace TrigCostRootAnalysis {
     }
 
     for (std::multiset<ChainInfo>::iterator it = m_upgradeChains.begin(); it != m_upgradeChains.end(); ++it) {
-      //for (auto _item : m_upgradeChains) {
+      //for (auto item : m_upgradeChains) {
       if (it->m_level == 2) {
         continue; // not doing HLT yet
       }
@@ -373,18 +373,18 @@ namespace TrigCostRootAnalysis {
     // for (int jE = 10; jE <= 25; jE += 5) {
     //   for (int TE = 250; TE <= 500; TE += 50) {
 
-    //     std::string _chainName = "L1_4J" + std::to_string(jE) + "__AND__L1_TE" + std::to_string(TE);
-    //     CounterRatesIntersection* _L1Chain = new CounterRatesIntersection(m_costData, _chainName, ID++, 10,
+    //     std::string chainName = "L1_4J" + std::to_string(jE) + "__AND__L1_TE" + std::to_string(TE);
+    //     CounterRatesIntersection* L1Chain = new CounterRatesIntersection(m_costData, chainName, ID++, 10,
     // (MonitorBase*)this); // Mint new counter
-    //     _L1Chain->decorate(kDecRatesGroupName, "Intersection" );
-    //     _L1Chain->decorate(kDecPrescaleStr, "-");
-    //     _L1Chain->decorate(kDecType, "Intersection");
-    //     _L1Chain->addL1Item( m_chainItemsL1["L1_4J" + std::to_string(jE)] );
-    //     _L1Chain->addL1Item( m_chainItemsL1["L1_TE" + std::to_string(TE)] );
+    //     L1Chain->decorate(kDecRatesGroupName, "Intersection" );
+    //     L1Chain->decorate(kDecPrescaleStr, "-");
+    //     L1Chain->decorate(kDecType, "Intersection");
+    //     L1Chain->addL1Item( m_chainItemsL1["L1_4J" + std::to_string(jE)] );
+    //     L1Chain->addL1Item( m_chainItemsL1["L1_TE" + std::to_string(TE)] );
     //     assert( m_chainItemsL1.count("L1_4J" + std::to_string(jE)) +   m_chainItemsL1.count("L1_TE" +
     // std::to_string(TE)) == 2);
-    //     (*counterMap)[_chainName] = static_cast<CounterBase*>(_L1Chain); // Insert into the counterMap
-    //     Info("MonitorRatesUpgrade::createL1Counters","Made a L1 counter for: %s", _L1Chain->getName().c_str() );
+    //     (*counterMap)[chainName] = static_cast<CounterBase*>(L1Chain); // Insert into the counterMap
+    //     Info("MonitorRatesUpgrade::createL1Counters","Made a L1 counter for: %s", L1Chain->getName().c_str() );
     //   }
     // }
 
@@ -724,11 +724,11 @@ namespace TrigCostRootAnalysis {
 
 
     //if ( fabs( m_eventsToMix - round(m_eventsToMix) ) <  0.1) m_eventsToMix = round(m_eventsToMix);
-    ////static Int_t _debug2 = 0;
-    // if (++_debug2 < 20) Info("MonitorRatesUpgrade::newEvent", "Mixing %i events (f %f)", (Int_t)
+    ////static Int_t debug2 = 0;
+    // if (++debug2 < 20) Info("MonitorRatesUpgrade::newEvent", "Mixing %i events (f %f)", (Int_t)
     // round(m_eventsToMix), m_eventsToMix);
     // // Add pileup
-    // for (Int_t _pu = 0; _pu <  (Int_t) round(m_eventsToMix); ++_pu) { // Cast to int rounds down
+    // for (Int_t pu = 0; pu <  (Int_t) round(m_eventsToMix); ++pu) { // Cast to int rounds down
     //   UInt_t pileupLottery = m_R3.Integer( m_pileupDatabase.size() );
     //   m_thisEventPtr->add( m_pileupDatabase.at( pileupLottery ) );
     // }
diff --git a/Trigger/TrigCost/TrigCostRootAnalysis/Root/MonitorSliceCPU.cxx b/Trigger/TrigCost/TrigCostRootAnalysis/Root/MonitorSliceCPU.cxx
index bc8bfb74a267b8df362523aeda04895a80602d35..d66c6289d741835f1853d91eadf0926561ec5c71 100644
--- a/Trigger/TrigCost/TrigCostRootAnalysis/Root/MonitorSliceCPU.cxx
+++ b/Trigger/TrigCost/TrigCostRootAnalysis/Root/MonitorSliceCPU.cxx
@@ -142,7 +142,7 @@ namespace TrigCostRootAnalysis {
   /**
    * Construct new counter of correct derived type, pass back as base type.
    * This function must be implemented by all derived monitor types.
-   * @see MonitorBase::addCounter( const std::string &_name, Int_t _ID )
+   * @see MonitorBase::addCounter( const std::string &_name, Int_t ID )
    * @param name Cost reference to name of counter.
    * @param ID Reference to ID number of counter.
    * @returns Base class pointer to new counter object of correct serived type.
diff --git a/Trigger/TrigCost/TrigCostRootAnalysis/Root/RatesChainItem.cxx b/Trigger/TrigCost/TrigCostRootAnalysis/Root/RatesChainItem.cxx
index f2ba8657c291e75f578e50d3742e7ceba98e3004..e2173479e915e2403b4c99afd00af1cb6085d9bd 100644
--- a/Trigger/TrigCost/TrigCostRootAnalysis/Root/RatesChainItem.cxx
+++ b/Trigger/TrigCost/TrigCostRootAnalysis/Root/RatesChainItem.cxx
@@ -369,7 +369,7 @@ namespace TrigCostRootAnalysis {
   }
 
   /**
-   * @param _eventTOBs A TOBAccumulator of all TOBs in this event or pseudo-event (simulated high pileup TOB overlay).
+   * @param eventTOBs A TOBAccumulator of all TOBs in this event or pseudo-event (simulated high pileup TOB overlay).
    * Note - this function call requires a TriggerLogic pointer to be set, this logic will be used against the set of
    *TOBs
    */
diff --git a/Trigger/TrigCost/TrigCostRootAnalysis/Root/TrigConfInterface.cxx b/Trigger/TrigCost/TrigCostRootAnalysis/Root/TrigConfInterface.cxx
index d82ed86d6d990f78a651ac96f46dac06c2463765..37a2b0197519e42a2d2e6f26d16b0326f7ea1212 100644
--- a/Trigger/TrigCost/TrigCostRootAnalysis/Root/TrigConfInterface.cxx
+++ b/Trigger/TrigCost/TrigCostRootAnalysis/Root/TrigConfInterface.cxx
@@ -526,7 +526,7 @@ namespace TrigCostRootAnalysis {
     if (Config::config().debug()) Info("TrigConfInterface::dump", "Saving trigger configuration to %s",
                                        fileName.c_str());
 
-    //std::ofstream _foutHtml( std::string(fileName + ".htm").c_str() );
+    //std::ofstream foutHtml( std::string(fileName + ".htm").c_str() );
     std::ofstream foutJson(fileName.c_str());
 
     JsonExport* json = new JsonExport();
@@ -541,9 +541,9 @@ namespace TrigCostRootAnalysis {
     // CHAIN
     for (UInt_t c = 0; c < getTCT()->GetChainN(); ++c) {
       Bool_t isL1 = kFALSE;
-      //std::string _counter = "</b>, Counter:<i>";
+      //std::string counter = "</b>, Counter:<i>";
       if (getTCT()->GetChainLevel(c) == 1) {
-        //_counter = "</b>, CTPID:<i>";
+        //counter = "</b>, CTPID:<i>";
         isL1 = kTRUE;
       } else if (jsonDoingL1 == kTRUE) {
         //switch over to HLT
@@ -552,16 +552,16 @@ namespace TrigCostRootAnalysis {
         jsonDoingL1 = kFALSE;
       }
       //foutHtml << "<hr>" << std::endl;
-      //foutHtml << "<li>Trigger Chain: Name:<b>" << getTCT()->GetChainName(c) << _counter <<
+      //foutHtml << "<li>Trigger Chain: Name:<b>" << getTCT()->GetChainName(c) << counter <<
       // getTCT()->GetChainCounter(c) << "</i></li>" << std::endl;
       std::string chainName = getTCT()->GetChainName(c);
       json->addNode(foutJson, chainName + " (PS:" + floatToString(getTCT()->GetPrescale(chainName), 2) + ")", "C");
       // foutHtml << "<li>Prescale:<i>" << getPrescale( getTCT()->GetChainName(c) ) << "</i></li>" << std::endl;
       // if (getTCT()->GetChainGroupNameSize(c)) {
       //   foutHtml << "<li>Groups:<i>";
-      //   for (UInt_t _g = 0; _g < getTCT()->GetChainGroupNameSize(c); ++_g) {
-      //     foutHtml << getTCT()->GetChainGroupName( c, _g );
-      //     if (_g != getTCT()->GetChainGroupNameSize(c) - 1) foutHtml << ",";
+      //   for (UInt_t g = 0; g < getTCT()->GetChainGroupNameSize(c); ++g) {
+      //     foutHtml << getTCT()->GetChainGroupName( c, g );
+      //     if (g != getTCT()->GetChainGroupNameSize(c) - 1) foutHtml << ",";
       //   }
       //   foutHtml << "</i></li>" << std::endl;
       // }
diff --git a/Trigger/TrigCost/TrigCostRootAnalysis/Root/TrigCostData_Calculations.cxx b/Trigger/TrigCost/TrigCostRootAnalysis/Root/TrigCostData_Calculations.cxx
index 27f170278938a1afb07ebce4c85e20e93f7a2bb2..08659abc664bf7b59a823b9fd33c384d564c7b88 100644
--- a/Trigger/TrigCost/TrigCostRootAnalysis/Root/TrigCostData_Calculations.cxx
+++ b/Trigger/TrigCost/TrigCostRootAnalysis/Root/TrigCostData_Calculations.cxx
@@ -632,13 +632,13 @@ namespace TrigCostRootAnalysis {
   /**
    * As algs are already stored under sequences (hence - vector<vector<stuff>>) we cannot go deeper.
    * But algs can have many ROI. So we use a linking index to connect seq_alg_roi_index() with a location in seq_roi().
-   * At this location we find a vector with size getSeqAlgNRoI(_seq, _alg) which contains a list of ROI ID
-   * These can be accessed in the D3PD by calling getRoIIndexFromId( _roiID ) and then looking at the returned D3PD
+   * At this location we find a vector with size getSeqAlgNRoI(seq, alg) which contains a list of ROI ID
+   * These can be accessed in the D3PD by calling getRoIIndexFromId( roiID ) and then looking at the returned D3PD
    *index location.
    *
    * Given this complexity, it is probably better to look at the example below.
    *
-   * @see getRoIIndexFromId( _roiID )
+   * @see getRoIIndexFromId( roiID )
    * @param n Sequence index in D3PD.
    * @param a Algorithm index in sequence.
    * @param roi Which ROI to get the ID for - this still needs to be mapped to the location in the D3PD using
diff --git a/Trigger/TrigCost/TrigCostRootAnalysis/Root/TrigXMLService.cxx b/Trigger/TrigCost/TrigCostRootAnalysis/Root/TrigXMLService.cxx
index e62829106226524887f9d37fc1f7ff4633573cac..647e40267420e7f7c3af4d2d4d5ba7f26d8cc657 100644
--- a/Trigger/TrigCost/TrigCostRootAnalysis/Root/TrigXMLService.cxx
+++ b/Trigger/TrigCost/TrigCostRootAnalysis/Root/TrigXMLService.cxx
@@ -83,8 +83,8 @@ namespace TrigCostRootAnalysis {
       if (mr == Config::config().getInt(kRunNumber)) {
         Fatal("TrigXMLService::TrigXMLService",
               "If doing MultiRun, provide the 'primary' run's inputs first, followed by the additional runs whose run numbers were speificed to --multiRun");
-        //Bool_t _primaryRunOpenedFirstBeforeMultiRunInputFiles = kFALSE;
-        //assert(_primaryRunOpenedFirstBeforeMultiRunInputFiles);
+        //Bool_t primaryRunOpenedFirstBeforeMultiRunInputFiles = kFALSE;
+        //assert(primaryRunOpenedFirstBeforeMultiRunInputFiles);
         std::abort();
       }
       parseRunXML(mr, kFALSE);
@@ -1259,7 +1259,7 @@ namespace TrigCostRootAnalysis {
    * Read (if not already imported) the XML rates and bunch groups for this run.
    * Return the weight for this event and store the event's  bunch group setting using the config service.
    * @param pass Which pass through the file(s), only increment counters on first pass
-   * @param _bcid Current event BCID
+   * @param bcid Current event BCID
    * @return The event weight from the EnhancedBias XML.
    */
   Float_t TrigXMLService::getEventWeight(UInt_t eventNumber, UInt_t lb, UInt_t pass) {
diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigL2CaloHypoTool.py b/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigL2CaloHypoTool.py
index 88793c56174db416f1d5f540a34091b64c677457..0751673fe563b834bcbe2c377b1022b4d0ca6178 100644
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigL2CaloHypoTool.py
+++ b/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigL2CaloHypoTool.py
@@ -1,13 +1,7 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-import re
-_pattern = "(?P<mult>\d*)(e(?P<threshold1>\d+))(e(?P<threshold2>\d+))*"
-_cpattern = re.compile( _pattern )
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 
 from AthenaCommon.SystemOfUnits import GeV
 
-
-
-
 def _IncTool(name, threshold, sel):
 
     from TrigEgammaHypo.TrigEgammaHypoConf import TrigL2CaloHypoToolInc    
@@ -27,11 +21,11 @@ def _IncTool(name, threshold, sel):
     if 'Validation' in TriggerFlags.enableMonitoring() or 'Online' in  TriggerFlags.enableMonitoring():
         from AthenaMonitoring.GenericMonitoringTool import GenericMonitoringTool, defineHistogram
         monTool = GenericMonitoringTool("MonTool_"+name)
-        monTool.Histograms = [ defineHistogram('dEta', type='TH1F', title="L2Calo Hypo #Delta#eta_{L2 L1}; #Delta#eta_{L2 L1}", xbins=80, xmin=-0.01, xmax=0.01),
-                               defineHistogram('dPhi', type='TH1F', title="L2Calo Hypo #Delta#phi_{L2 L1}; #Delta#phi_{L2 L1}", xbins=80, xmin=-0.01, xmax=0.01),
-                               defineHistogram('Et_em', type='TH1F', title="L2Calo Hypo cluster E_{T}^{EM};E_{T}^{EM} [MeV]", xbins=50, xmin=-2000, xmax=100000),
-                               defineHistogram('Eta', type='TH1F', title="L2Calo Hypo entries per Eta;Eta", xbins=100, xmin=-2.5, xmax=2.5),
-                               defineHistogram('Phi', type='TH1F', title="L2Calo Hypo entries per Phi;Phi", xbins=128, xmin=-3.2, xmax=3.2) ]
+        monTool.Histograms = [ defineHistogram('dEta', type='TH1F', path='EXPERT', title="L2Calo Hypo #Delta#eta_{L2 L1}; #Delta#eta_{L2 L1}", xbins=80, xmin=-0.01, xmax=0.01),
+                               defineHistogram('dPhi', type='TH1F', path='EXPERT', title="L2Calo Hypo #Delta#phi_{L2 L1}; #Delta#phi_{L2 L1}", xbins=80, xmin=-0.01, xmax=0.01),
+                               defineHistogram('Et_em', type='TH1F', path='EXPERT', title="L2Calo Hypo cluster E_{T}^{EM};E_{T}^{EM} [MeV]", xbins=50, xmin=-2000, xmax=100000),
+                               defineHistogram('Eta', type='TH1F', path='EXPERT', title="L2Calo Hypo entries per Eta;Eta", xbins=100, xmin=-2.5, xmax=2.5),
+                               defineHistogram('Phi', type='TH1F', path='EXPERT', title="L2Calo Hypo entries per Phi;Phi", xbins=128, xmin=-3.2, xmax=3.2) ]
 
         cuts=['Input','has one TrigEMCluster', '#Delta #eta L2-L1', '#Delta #phi L2-L1','eta','rCore',
               'eRatio','E_{T}^{EM}', 'E_{T}^{Had}','f_{1}','Weta2','Wstot','F3']
@@ -40,18 +34,18 @@ def _IncTool(name, threshold, sel):
         for c in cuts:
             labelsDescription +=  c+':'
             
-        monTool.Histograms += [ defineHistogram('CutCounter', type='TH1I', title="L2Calo Hypo Passed Cuts;Cut",
+        monTool.Histograms += [ defineHistogram('CutCounter', type='TH1I', path='EXPERT', title="L2Calo Hypo Passed Cuts;Cut",
                                              xbins=13, xmin=-1.5, xmax=12.5,  opt="kCumulative", labels=labelsDescription) ]
 
         if 'Validation' in TriggerFlags.enableMonitoring():
-            monTool.Histograms += [ defineHistogram('Et_had', type='TH1F', title="L2Calo Hypo E_{T}^{had} in first layer;E_{T}^{had} [MeV]", xbins=50, xmin=-2000, xmax=100000),
-                                    defineHistogram('Rcore', type='TH1F', title="L2Calo Hypo R_{core};E^{3x3}/E^{3x7} in sampling 2", xbins=48, xmin=-0.1, xmax=1.1),
-                                    defineHistogram('Eratio', type='TH1F', title="L2Calo Hypo E_{ratio};E^{max1}-E^{max2}/E^{max1}+E^{max2} in sampling 1 (excl.crack)", xbins=64, xmin=-0.1, xmax=1.5),
-                                    defineHistogram('EtaBin', type='TH1I', title="L2Calo Hypo entries per Eta bin;Eta bin no.", xbins=11, xmin=-0.5, xmax=10.5),
-                                    defineHistogram('F1', type='TH1F', title="L2Calo Hypo f_{1};f_{1}", xbins=34, xmin=-0.5, xmax=1.2),                                    
-                                    defineHistogram('Weta2', type='TH1F', title="L2Calo Hypo Weta2; E Width in sampling 2", xbins=96, xmin=-0.1, xmax=0.61),     
-                                    defineHistogram('Wstot', type='TH1F', title="L2Calo Hypo Wstot; E Width in sampling 1", xbins=48, xmin=-0.1, xmax=11.),
-                                    defineHistogram('F3', type='TH1F', title="L2Calo Hypo F3; E3/(E0+E1+E2+E3)", xbins=96, xmin=-0.1, xmax=1.1) ]        
+            monTool.Histograms += [ defineHistogram('Et_had', type='TH1F', path='EXPERT', title="L2Calo Hypo E_{T}^{had} in first layer;E_{T}^{had} [MeV]", xbins=50, xmin=-2000, xmax=100000),
+                                    defineHistogram('Rcore', type='TH1F', path='EXPERT', title="L2Calo Hypo R_{core};E^{3x3}/E^{3x7} in sampling 2", xbins=48, xmin=-0.1, xmax=1.1),
+                                    defineHistogram('Eratio', type='TH1F', path='EXPERT', title="L2Calo Hypo E_{ratio};E^{max1}-E^{max2}/E^{max1}+E^{max2} in sampling 1 (excl.crack)", xbins=64, xmin=-0.1, xmax=1.5),
+                                    defineHistogram('EtaBin', type='TH1I', path='EXPERT', title="L2Calo Hypo entries per Eta bin;Eta bin no.", xbins=11, xmin=-0.5, xmax=10.5),
+                                    defineHistogram('F1', type='TH1F', path='EXPERT', title="L2Calo Hypo f_{1};f_{1}", xbins=34, xmin=-0.5, xmax=1.2),
+                                    defineHistogram('Weta2', type='TH1F', path='EXPERT', title="L2Calo Hypo Weta2; E Width in sampling 2", xbins=96, xmin=-0.1, xmax=0.61),
+                                    defineHistogram('Wstot', type='TH1F', path='EXPERT', title="L2Calo Hypo Wstot; E Width in sampling 1", xbins=48, xmin=-0.1, xmax=11.),
+                                    defineHistogram('F3', type='TH1F', path='EXPERT', title="L2Calo Hypo F3; E3/(E0+E1+E2+E3)", xbins=96, xmin=-0.1, xmax=1.1) ]
             
         monTool.HistPath = 'L2CaloHypo/'+tool.name()
         tool.MonTool = monTool
@@ -119,19 +113,6 @@ def _MultTool(name):
     return TrigL2CaloHypoToolMult( name )
 
 
-def decodeThreshold( threshold ):
-    """ decodes the thresholds of the form e10, 2e10, e10e15, ... """
-    print "TrigL2CaloHypoToolFromName: decoding threshold ", threshold
-    if threshold[0].isdigit(): # is if the from NeX, return as list [X,X,X...N times...]
-        assert threshold[1] == 'e', "Two digit multiplicity not supported"
-        return [ threshold[2:] ] * int( threshold[0] )
-
-    if threshold.count('e') > 1: # is of the form eXeYeZ, return as [X, Y, Z]
-        return threshold.strip('e').split('e')
-
-    # inclusive, return as 1 element list
-    return [ threshold[1:] ] 
-
 
 def TrigL2CaloHypoToolFromDict( d ):
     """ Use menu decoded chain dictionary to configure the tool """
@@ -165,7 +146,7 @@ def TrigL2CaloHypoToolFromName( name, conf ):
     """ To be phased out """
     from AthenaCommon.Constants import DEBUG
     """ set the name of the HypoTool (name=chain) and figure out the threshold and selection from conf """
-    #print "Configuring ", name
+
     from TriggerMenuMT.HLTMenuConfig.Menu.DictFromChainName import DictFromChainName
     decoder = DictFromChainName()
     decodedDict = decoder.analyseShortName(conf, [], "") # no L1 info
diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigL2ElectronHypoTool.py b/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigL2ElectronHypoTool.py
index a6e7fb677baaedfe4f352de3c86dc0db87db4b89..91a1460d483cf3158af90793c11a1c6c5e785f8c 100644
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigL2ElectronHypoTool.py
+++ b/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigL2ElectronHypoTool.py
@@ -1,14 +1,13 @@
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 
-def TrigL2ElectronHypoToolFromName( name, conf ):
-    """ provides configuration of the hypo tool giben the chain name
-    The argument will be replaced by "parsed" chain dict. For now it only serves simplest chain HLT_eXYZ.
-    """
-    bname = conf.split('_')
+def TrigL2ElectronHypoToolFromDict( chainDict ):
+    """ Use menu decoded chain dictionary to configure the tool """
 
-    threshold = bname[1]
-    from TrigEgammaHypo.TrigL2CaloHypoTool import decodeThreshold
-    thresholds = decodeThreshold( threshold )
+    thresholds = sum([ [cpart['threshold']]*int(cpart['multiplicity']) for cpart in chainDict['chainParts']], [])
 
+
+    name = chainDict['chainName']
+    
     from TrigEgammaHypo.TrigEgammaHypoConf import TrigL2ElectronHypoTool
     tool = TrigL2ElectronHypoTool(name)
     tool.RespectPreviousDecision = True
@@ -18,14 +17,14 @@ def TrigL2ElectronHypoToolFromName( name, conf ):
         from AthenaMonitoring.GenericMonitoringTool import GenericMonitoringTool, defineHistogram
         monTool = GenericMonitoringTool("MonTool"+name)
         monTool.Histograms = [         
-            defineHistogram('CutCounter', type='TH1I', title="L2Electron Hypo Cut Counter;Cut Counter", xbins=8, xmin=-1.5, xmax=7.5, opt="kCumulative"),
-            defineHistogram('CaloTrackdEta', type='TH1F', title="L2Electron Hypo #Delta #eta between cluster and track;#Delta #eta;Nevents", xbins=80, xmin=-0.4, xmax=0.4),
-            defineHistogram('CaloTrackdPhi', type='TH1F', title="L2Electron Hypo #Delta #phi between cluster and track;#Delta #phi;Nevents", xbins=80, xmin=-0.4, xmax=0.4),
-            defineHistogram('CaloTrackEoverP', type='TH1F', title="L2Electron Hypo E/p;E/p;Nevents", xbins=120, xmin=0, xmax=12),
-            defineHistogram('PtTrack', type='TH1F', title="L2Electron Hypo p_{T}^{track} [MeV];p_{T}^{track} [MeV];Nevents", xbins=50, xmin=0, xmax=100000),
-            defineHistogram('PtCalo', type='TH1F', title="L2Electron Hypo p_{T}^{calo} [MeV];p_{T}^{calo} [MeV];Nevents", xbins=50, xmin=0, xmax=100000),
-            defineHistogram('CaloEta', type='TH1F', title="L2Electron Hypo #eta^{calo} ; #eta^{calo};Nevents", xbins=200, xmin=-2.5, xmax=2.5),
-            defineHistogram('CaloPhi', type='TH1F', title="L2Electron Hypo #phi^{calo} ; #phi^{calo};Nevents", xbins=320, xmin=-3.2, xmax=3.2) ]        
+            defineHistogram('CutCounter', type='TH1I', path='EXPERT', title="L2Electron Hypo Cut Counter;Cut Counter", xbins=8, xmin=-1.5, xmax=7.5, opt="kCumulative"),
+            defineHistogram('CaloTrackdEta', type='TH1F', path='EXPERT', title="L2Electron Hypo #Delta #eta between cluster and track;#Delta #eta;Nevents", xbins=80, xmin=-0.4, xmax=0.4),
+            defineHistogram('CaloTrackdPhi', type='TH1F', path='EXPERT', title="L2Electron Hypo #Delta #phi between cluster and track;#Delta #phi;Nevents", xbins=80, xmin=-0.4, xmax=0.4),
+            defineHistogram('CaloTrackEoverP', type='TH1F', path='EXPERT', title="L2Electron Hypo E/p;E/p;Nevents", xbins=120, xmin=0, xmax=12),
+            defineHistogram('PtTrack', type='TH1F', path='EXPERT', title="L2Electron Hypo p_{T}^{track} [MeV];p_{T}^{track} [MeV];Nevents", xbins=50, xmin=0, xmax=100000),
+            defineHistogram('PtCalo', type='TH1F', path='EXPERT', title="L2Electron Hypo p_{T}^{calo} [MeV];p_{T}^{calo} [MeV];Nevents", xbins=50, xmin=0, xmax=100000),
+            defineHistogram('CaloEta', type='TH1F', path='EXPERT', title="L2Electron Hypo #eta^{calo} ; #eta^{calo};Nevents", xbins=200, xmin=-2.5, xmax=2.5),
+            defineHistogram('CaloPhi', type='TH1F', path='EXPERT', title="L2Electron Hypo #phi^{calo} ; #phi^{calo};Nevents", xbins=320, xmin=-3.2, xmax=3.2) ]
 
         monTool.HistPath = 'L2ElectronHypo/'+tool.name()
         tool.MonTool = monTool
@@ -41,8 +40,7 @@ def TrigL2ElectronHypoToolFromName( name, conf ):
     tool.TRTRatio = [ -999. ] * nt
 
 
-    for th, thvalue in enumerate(thresholds):
-        print th, thvalue
+    for th, thvalue in enumerate(thresholds):        
         if float(thvalue) < 15:
             tool.TrackPt[ th ] = 1.0 * GeV 
         elif float(thvalue) >= 15 and float(thvalue) < 20:
@@ -58,6 +56,19 @@ def TrigL2ElectronHypoToolFromName( name, conf ):
     return tool
 
 
+def TrigL2ElectronHypoToolFromName( name, conf ):
+    """ provides configuration of the hypo tool giben the chain name
+    The argument will be replaced by "parsed" chain dict. For now it only serves simplest chain HLT_eXYZ.
+    """
+    from TriggerMenuMT.HLTMenuConfig.Menu.DictFromChainName import DictFromChainName
+    decoder = DictFromChainName()
+    decodedDict = decoder.analyseShortName(conf, [], "") # no L1 info
+    decodedDict['chainName'] = name # override
+        
+    return TrigL2ElectronHypoToolFromDict( decodedDict )
+
+
+
 if __name__ == "__main__":
     tool = TrigL2ElectronHypoToolFromName("HLT_e3_etcut", "HLT_e3_etcut")
     assert tool, "Not configured simple tool"
@@ -66,4 +77,8 @@ if __name__ == "__main__":
     assert tool, "Not configured simple tool"
     assert len(tool.TrackPt) == 2, "Multiplicity missonfigured, set "+ str( len( tool.TrackPt ) )
 
+    tool = TrigL2ElectronHypoToolFromName("HLT_e3_e5_etcut", "HLT_e3_e5_etcut")    
+    assert tool, "Not configured simple tool"
+    assert len(tool.TrackPt) == 2, "Multiplicity missonfigured, set "+ str( len( tool.TrackPt ) )
+
     print ( "\n\nALL OK\n\n" )    
diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigL2PhotonHypoTool.py b/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigL2PhotonHypoTool.py
index d27183989671d08c3404ee51c94f838dad690d03..6545372fb8f3a7d494fee8df15df0ce5500bb7f5 100644
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigL2PhotonHypoTool.py
+++ b/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigL2PhotonHypoTool.py
@@ -1,15 +1,12 @@
 
 
-def TrigL2PhotonHypoToolFromName( name, conf ):
-    """ provides configuration of the hypo tool giben the chain name
-    The argument will be replaced by "parsed" chain dict. For now it only serves simplest chain HLT_eXYZ.
-    """
-    bname = conf.split('_')
+def TrigL2PhotonHypoToolFromDict( chainDict ):
+    """ Use menu decoded chain dictionary to configure the tool """
+    thresholds = sum([ [cpart['threshold']]*int(cpart['multiplicity']) for cpart in chainDict['chainParts']], [])
 
-    threshold = bname[1]
-    from TrigEgammaHypo.TrigL2CaloHypoTool import decodeThreshold
-    thresholds = decodeThreshold( threshold )
+    name = chainDict['chainName']
 
+    
     from TrigEgammaHypo.TrigEgammaHypoConf import TrigL2PhotonHypoTool
     tool = TrigL2PhotonHypoTool(name)
     tool.MonTool = ""
@@ -18,10 +15,10 @@ def TrigL2PhotonHypoToolFromName( name, conf ):
         from AthenaMonitoring.GenericMonitoringTool import GenericMonitoringTool, defineHistogram
         monTool = GenericMonitoringTool("MonTool"+name)
         monTool.Histograms = [         
-            defineHistogram('CutCounter', type='TH1I', title="L2Photon Hypo Cut Counter;Cut Counter", xbins=8, xmin=-1.5, xmax=7.5, opt="kCumulative"),
-            defineHistogram('PtCalo', type='TH1F', title="L2Photon Hypo p_{T}^{calo} [MeV];p_{T}^{calo} [MeV];Nevents", xbins=50, xmin=0, xmax=100000),
-            defineHistogram('CaloEta', type='TH1F', title="L2Photon Hypo #eta^{calo} ; #eta^{calo};Nevents", xbins=200, xmin=-2.5, xmax=2.5),
-            defineHistogram('CaloPhi', type='TH1F', title="L2Photon Hypo #phi^{calo} ; #phi^{calo};Nevents", xbins=320, xmin=-3.2, xmax=3.2) ]        
+            defineHistogram('CutCounter', type='TH1I', path='EXPERT', title="L2Photon Hypo Cut Counter;Cut Counter", xbins=8, xmin=-1.5, xmax=7.5, opt="kCumulative"),
+            defineHistogram('PtCalo', type='TH1F', path='EXPERT', title="L2Photon Hypo p_{T}^{calo} [MeV];p_{T}^{calo} [MeV];Nevents", xbins=50, xmin=0, xmax=100000),
+            defineHistogram('CaloEta', type='TH1F', path='EXPERT', title="L2Photon Hypo #eta^{calo} ; #eta^{calo};Nevents", xbins=200, xmin=-2.5, xmax=2.5),
+            defineHistogram('CaloPhi', type='TH1F', path='EXPERT', title="L2Photon Hypo #phi^{calo} ; #phi^{calo};Nevents", xbins=320, xmin=-3.2, xmax=3.2) ]
 
         monTool.HistPath = 'L2PhotonHypo/'+tool.name()
         tool.MonTool = monTool
@@ -47,6 +44,19 @@ def TrigL2PhotonHypoToolFromName( name, conf ):
     return tool
 
 
+def TrigL2PhotonHypoToolFromName( name, conf ):
+    """ provides configuration of the hypo tool giben the chain name
+    The argument will be replaced by "parsed" chain dict. For now it only serves simplest chain HLT_eXYZ.
+    """
+    
+    from TriggerMenuMT.HLTMenuConfig.Menu.DictFromChainName import DictFromChainName
+    decoder = DictFromChainName()
+    decodedDict = decoder.analyseShortName(conf, [], "") # no L1 info
+    decodedDict['chainName'] = name # override
+        
+    return TrigL2PhotonHypoToolFromDict( decodedDict )
+
+
 if __name__ == "__main__":
     tool = TrigL2PhotonHypoToolFromName("HLT_g5_etcut", "HLT_g5_etcut")   
     assert tool, "Not configured simple tool"
diff --git a/Trigger/TrigHypothesis/TrigMissingETHypo/CMakeLists.txt b/Trigger/TrigHypothesis/TrigMissingETHypo/CMakeLists.txt
index 068bfe52a5723ba1d7e87eae77bed6b1152d823c..9119cb010ceb84844fadd441aa85b02acaf3203a 100644
--- a/Trigger/TrigHypothesis/TrigMissingETHypo/CMakeLists.txt
+++ b/Trigger/TrigHypothesis/TrigMissingETHypo/CMakeLists.txt
@@ -35,6 +35,9 @@ atlas_add_component( TrigMissingETHypo
                      INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
                      LINK_LIBRARIES ${CLHEP_LIBRARIES} TrigInterfacesLib TrigTimeAlgsLib xAODTrigMissingET GaudiKernel TrigMissingEtEvent TrigMissingETHypoLib DecisionHandling  )
 
+atlas_add_test( TrigMissingETHypoConfigMT SCRIPT python -m TrigMissingETHypo.TrigMissingETHypoConfigMT
+		POST_EXEC_SCRIPT nopost.sh )
+
 # Install files from the package:
 atlas_install_python_modules( python/*.py )
 atlas_install_joboptions( share/TriggerConfig_*.py )
diff --git a/Trigger/TrigHypothesis/TrigMissingETHypo/python/TrigMissingETHypoConfigMT.py b/Trigger/TrigHypothesis/TrigMissingETHypo/python/TrigMissingETHypoConfigMT.py
index a14e2922920752d060d01b8ab97e16b951f3c973..e3221afc9d6e0156bdde492b9112221b2418a5fb 100644
--- a/Trigger/TrigHypothesis/TrigMissingETHypo/python/TrigMissingETHypoConfigMT.py
+++ b/Trigger/TrigHypothesis/TrigMissingETHypo/python/TrigMissingETHypoConfigMT.py
@@ -49,11 +49,44 @@ class MissingETHypoToolMT(TrigMissingETHypoToolMT):
             self.metThreshold = int(filter(str.isdigit, trigParts[idx-1]))
 
 
+            
+def TrigMETCellHypoToolFromDict(chainDict):
+    """ Configure tool operating on met from cells"""
+    # note for future developers, it seems that the chainDict has the information about the type of alg, it would be god to use it
+    # not calling the class above as it tries to parse the name back
+    # also there seems no property to decide if it is met from cells yet, not setting it therefore
+    # possibly there would be only one function if the met source is available in the chainDict and settable tool property
+    
+    tool = MissingETHypoToolMT( chainDict['chainName'] )
+    tool.metThreshold = int(chainDict['chainParts'][0]['threshold'])
+    
+    return tool
+            
+
 def TrigMETCellHypoToolFromName(name, conf):
-    return MissingETHypoToolMT(name, alg='cell')
+    from TriggerMenuMT.HLTMenuConfig.Menu.DictFromChainName import DictFromChainName
+    
+    decoder = DictFromChainName()    
+    decodedDict = decoder.analyseShortName(conf, [], "") # no L1 info
+    decodedDict['chainName'] = name 
+    
+    return TrigMETCellHypoToolFromDict( decodedDict )
+
+
+def TrigMETPufitHypoToolFromName(name, conf):
+    return MissingETHypoToolMT(name, alg='pufit')
+
 
 def TrigMETPufitHypoToolFromName(name, conf):
     return MissingETHypoToolMT(name, alg='pufit')
 
 def TrigMETMhtHypoToolFromName(name, conf):
     return MissingETHypoToolMT(name, alg='mht')
+
+
+if __name__ == "__main__":
+    confCell = TrigMETCellHypoToolFromName("HLT_xe65_L1XE50", "HLT_xe65_L1XE50")
+    assert confCell, "Cell tool not configured"
+
+
+    
diff --git a/Trigger/TrigHypothesis/TrigMissingETHypo/python/TrigMissingETHypoMonitoringTool.py b/Trigger/TrigHypothesis/TrigMissingETHypo/python/TrigMissingETHypoMonitoringTool.py
index 3eaa9a96534b458b334a8e13640807d08f79e19b..e9bdc9f099ef4c90921d333b15f291ecf3ae862a 100644
--- a/Trigger/TrigHypothesis/TrigMissingETHypo/python/TrigMissingETHypoMonitoringTool.py
+++ b/Trigger/TrigHypothesis/TrigMissingETHypo/python/TrigMissingETHypoMonitoringTool.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 
 from AthenaMonitoring.GenericMonitoringTool import GenericMonitoringTool, defineHistogram
 
@@ -9,21 +9,21 @@ class TrigMissingETHypoMonitoringToolBase(GenericMonitoringTool):
 
         self.Histograms = []
 
-        hEx_log    = defineHistogram('Hypo_MEx_log',   type='TH1F', title="Missing E_{x};sgn(ME_{x}) log_{10}(ME_{x}/GeV)", xbins=41, xmin=-5.075, xmax=5.075)
-        hEy_log    = defineHistogram('Hypo_MEy_log',   type='TH1F', title="Missing E_{y};sgn(ME_{y}) log_{10}(ME_{y}/GeV)", xbins=41, xmin=-5.075, xmax=5.075)
-        hEz_log    = defineHistogram('Hypo_MEz_log',   type='TH1F', title="Missing E_{z};sgn(ME_{z}) log_{10}(ME_{z}/GeV)", xbins=41, xmin=-5.075, xmax=5.075)
-        hMET_log   = defineHistogram('Hypo_MET_log',   type='TH1F', title="|Missing E_{T}|;log_{10}(ME_{T}/GeV)",           xbins=35, xmin=-1.875, xmax=5.375)
-        hSumEt_log = defineHistogram('Hypo_SumEt_log', type='TH1F', title="Sum |E_{T}|;log_{10}(SumE_{T}/GeV)",             xbins=35, xmin=-1.875, xmax=5.125)
-
-        hEx_lin    = defineHistogram('Hypo_MEx_lin',   type='TH1F', title="Missing E_{x};ME_{x} (GeV)",    xbins=199, xmin=-298.5, xmax=298.5)
-        hEy_lin    = defineHistogram('Hypo_MEy_lin',   type='TH1F', title="Missing E_{y};ME_{y} (GeV)",    xbins=199, xmin=-298.5, xmax=298.5)
-        hEz_lin    = defineHistogram('Hypo_MEz_lin',   type='TH1F', title="Missing E_{z};ME_{z} (GeV)",    xbins=199, xmin=-298.5, xmax=298.5)
-        hMET_lin   = defineHistogram('Hypo_MET_lin',   type='TH1F', title="|Missing E_{T}|;ME_{T} (GeV)",  xbins=105, xmin=-13.5,  xmax=301.5)
-        hSumEt_lin = defineHistogram('Hypo_SumEt_lin', type='TH1F', title="Sum |E_{T}|;SumE_{T} (GeV)",    xbins=155, xmin=-27.,   xmax=2000.)
-
-        hMETPhi    = defineHistogram('Hypo_MET_phi',   type='TH1F', title="MET #phi;#phi (rad)",           xbins=32, xmin=-3.1416, xmax=3.1416) 
-        hXS        = defineHistogram('Hypo_XS',        type='TH1F', title="EF Significance; (XS/GeV^{1/2})",         xbins=40,  xmin=-0.025,   xmax=20.025)
-        hXS2       = defineHistogram('Hypo_XS2',        type='TH1F', title="EF Significance 2; (XS2/GeV^{1/2})",         xbins=40,  xmin=-0.025,   xmax=20.025)
+        hEx_log    = defineHistogram('Hypo_MEx_log',   type='TH1F', path='EXPERT', title="Missing E_{x};sgn(ME_{x}) log_{10}(ME_{x}/GeV)", xbins=41, xmin=-5.075, xmax=5.075)
+        hEy_log    = defineHistogram('Hypo_MEy_log',   type='TH1F', path='EXPERT', title="Missing E_{y};sgn(ME_{y}) log_{10}(ME_{y}/GeV)", xbins=41, xmin=-5.075, xmax=5.075)
+        hEz_log    = defineHistogram('Hypo_MEz_log',   type='TH1F', path='EXPERT', title="Missing E_{z};sgn(ME_{z}) log_{10}(ME_{z}/GeV)", xbins=41, xmin=-5.075, xmax=5.075)
+        hMET_log   = defineHistogram('Hypo_MET_log',   type='TH1F', path='EXPERT', title="|Missing E_{T}|;log_{10}(ME_{T}/GeV)",           xbins=35, xmin=-1.875, xmax=5.375)
+        hSumEt_log = defineHistogram('Hypo_SumEt_log', type='TH1F', path='EXPERT', title="Sum |E_{T}|;log_{10}(SumE_{T}/GeV)",             xbins=35, xmin=-1.875, xmax=5.125)
+
+        hEx_lin    = defineHistogram('Hypo_MEx_lin',   type='TH1F', path='EXPERT', title="Missing E_{x};ME_{x} (GeV)",    xbins=199, xmin=-298.5, xmax=298.5)
+        hEy_lin    = defineHistogram('Hypo_MEy_lin',   type='TH1F', path='EXPERT', title="Missing E_{y};ME_{y} (GeV)",    xbins=199, xmin=-298.5, xmax=298.5)
+        hEz_lin    = defineHistogram('Hypo_MEz_lin',   type='TH1F', path='EXPERT', title="Missing E_{z};ME_{z} (GeV)",    xbins=199, xmin=-298.5, xmax=298.5)
+        hMET_lin   = defineHistogram('Hypo_MET_lin',   type='TH1F', path='EXPERT', title="|Missing E_{T}|;ME_{T} (GeV)",  xbins=105, xmin=-13.5,  xmax=301.5)
+        hSumEt_lin = defineHistogram('Hypo_SumEt_lin', type='TH1F', path='EXPERT', title="Sum |E_{T}|;SumE_{T} (GeV)",    xbins=155, xmin=-27.,   xmax=2000.)
+
+        hMETPhi    = defineHistogram('Hypo_MET_phi',   type='TH1F', path='EXPERT', title="MET #phi;#phi (rad)",           xbins=32, xmin=-3.1416, xmax=3.1416)
+        hXS        = defineHistogram('Hypo_XS',        type='TH1F', path='EXPERT', title="EF Significance; (XS/GeV^{1/2})",         xbins=40,  xmin=-0.025,   xmax=20.025)
+        hXS2       = defineHistogram('Hypo_XS2',        type='TH1F', path='EXPERT', title="EF Significance 2; (XS2/GeV^{1/2})",         xbins=40,  xmin=-0.025,   xmax=20.025)
 
 
 class TrigMissingETHypoMonitoringTool(TrigMissingETHypoMonitoringToolBase):
diff --git a/Trigger/TrigHypothesis/TrigMissingETHypo/src/TrigMissingETHypoAlgMT.cxx b/Trigger/TrigHypothesis/TrigMissingETHypo/src/TrigMissingETHypoAlgMT.cxx
index e79752ca8af50956206a6d93897ef74d04457deb..a95be0d0bc0f26faf192d2f1cc360b7a982913ac 100644
--- a/Trigger/TrigHypothesis/TrigMissingETHypo/src/TrigMissingETHypoAlgMT.cxx
+++ b/Trigger/TrigHypothesis/TrigMissingETHypo/src/TrigMissingETHypoAlgMT.cxx
@@ -6,7 +6,6 @@
 #include "GaudiKernel/Property.h"
 #include "DecisionHandling/HLTIdentifier.h"
 #include "DecisionHandling/TrigCompositeUtils.h"
-#include "AthenaMonitoring/MonitoredScope.h"
 #include "TrigEFMissingET/EFMissingETAlgMT.h"
 
 using namespace TrigCompositeUtils;
diff --git a/Trigger/TrigHypothesis/TrigMultiVarHypo/python/TrigL2CaloRingerFexMTInit.py b/Trigger/TrigHypothesis/TrigMultiVarHypo/python/TrigL2CaloRingerFexMTInit.py
index 6953a89590b8efa24041aae1ee87676bde960918..7cb18851af92a500c2f872c1c35a15047e0d2e19 100755
--- a/Trigger/TrigHypothesis/TrigMultiVarHypo/python/TrigL2CaloRingerFexMTInit.py
+++ b/Trigger/TrigHypothesis/TrigMultiVarHypo/python/TrigL2CaloRingerFexMTInit.py
@@ -1,5 +1,5 @@
 #
-#  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+#  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 #
 
 from TrigMultiVarHypo.TrigL2CaloRingerCutDefs import TrigL2CaloRingerCutDefs
@@ -39,14 +39,14 @@ def add_monitoring(tool):
     from AthenaMonitoring.GenericMonitoringTool import GenericMonitoringTool, defineHistogram
     monTool = GenericMonitoringTool("RingerFexMon")
     
-    monTool.Histograms = [     defineHistogram('Et', type='TH1F', title="E_{T}", xbins=50, xmin=0, xmax=50),
-                               defineHistogram('Eta', type='TH1F', title="#eta", xbins=25, xmin=0, xmax=2.5),
-                               defineHistogram('rnnOut', type='TH1F', title="NN output", xbins=80, xmin=-1, xmax=1),
-                               defineHistogram('Eta,rnnOut', type='TH2F', title="NN output as function of #eta",  xbins=15, xmin=0, xmax=2.5, ybins=80, ymin=-1, ymax=1),
-                               defineHistogram('Et,rnnOut', type='TH2F', title="NN output as function of E_{T}",  xbins=20, xmin=0, xmax=50,  ybins=80, ymin=-1, ymax=1),
-                               defineHistogram( "TIME_total",      title="Total Time;time[ms]",         xbins=50, xmin=0, xmax=100 ),
-                               defineHistogram( "TIME_preprocess", title="Preprocessing Time;time[ms]", xbins=50, xmin=0, xmax=50 ),
-                               defineHistogram( "TIME_decision",   title="Decision Time;time[ms]",      xbins=50, xmin=0, xmax=50 )]
+    monTool.Histograms = [     defineHistogram('Et', type='TH1F', path='EXPERT', title="E_{T}", xbins=50, xmin=0, xmax=50),
+                               defineHistogram('Eta', type='TH1F', path='EXPERT', title="#eta", xbins=25, xmin=0, xmax=2.5),
+                               defineHistogram('rnnOut', type='TH1F', path='EXPERT', title="NN output", xbins=80, xmin=-1, xmax=1),
+                               defineHistogram('Eta,rnnOut', type='TH2F', path='EXPERT', title="NN output as function of #eta",  xbins=15, xmin=0, xmax=2.5, ybins=80, ymin=-1, ymax=1),
+                               defineHistogram('Et,rnnOut', type='TH2F', path='EXPERT', title="NN output as function of E_{T}",  xbins=20, xmin=0, xmax=50,  ybins=80, ymin=-1, ymax=1),
+                               defineHistogram( "TIME_total",      path='EXPERT', title="Total Time;time[ms]",         xbins=50, xmin=0, xmax=100 ),
+                               defineHistogram( "TIME_preprocess", path='EXPERT', title="Preprocessing Time;time[ms]", xbins=50, xmin=0, xmax=50 ),
+                               defineHistogram( "TIME_decision",   path='EXPERT', title="Decision Time;time[ms]",      xbins=50, xmin=0, xmax=50 )]
     tool.MonTool = monTool
 
     monTool.HistPath = 'TrigL2CaloRinger/'+tool.name()
diff --git a/Trigger/TrigHypothesis/TrigMuonHypo/CMakeLists.txt b/Trigger/TrigHypothesis/TrigMuonHypo/CMakeLists.txt
index 9b8d1c9d9f4468a9cb124da46a3517347d8bd739..a0f038d21caa942107fcafc27f9288d4dae4031f 100644
--- a/Trigger/TrigHypothesis/TrigMuonHypo/CMakeLists.txt
+++ b/Trigger/TrigHypothesis/TrigMuonHypo/CMakeLists.txt
@@ -39,6 +39,9 @@ atlas_add_component( TrigMuonHypo
                      INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
                      LINK_LIBRARIES ${CLHEP_LIBRARIES} xAODTrigMuon MuonIdHelpersLib MuonRecHelperToolsLib TrigInDetEvent TrigMuonEvent TrigSteeringEvent TrigInterfacesLib DecisionHandling AthViews xAODMuon xAODTracking GaudiKernel MuonSegment MuonSegmentMakerUtils TrigConfHLTData TrigT1Interfaces TrigT1Result )
 
+atlas_add_test( TrigMuonHypoConfig SCRIPT python -m  	TrigMuonHypo.testTrigMuonHypoConfig
+		POST_EXEC_SCRIPT nopost.sh )
+
 # Install files from the package:
 atlas_install_headers( TrigMuonHypo )
 atlas_install_python_modules( python/*.py )
diff --git a/Trigger/TrigHypothesis/TrigMuonHypo/python/TrigMuonHypoMonitoringMT.py b/Trigger/TrigHypothesis/TrigMuonHypo/python/TrigMuonHypoMonitoringMT.py
index 16301782450ae8206a51dbf6bad74e33ef6333cb..268d8863071274599cd4bdbfca83e1cc0781784a 100755
--- a/Trigger/TrigHypothesis/TrigMuonHypo/python/TrigMuonHypoMonitoringMT.py
+++ b/Trigger/TrigHypothesis/TrigMuonHypo/python/TrigMuonHypoMonitoringMT.py
@@ -1,6 +1,6 @@
-# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 #
-# PORPOSE: AthenaMT Migration
+# PURPOSE: AthenaMT Migration
 #
 
 from AthenaMonitoring.GenericMonitoringTool import GenericMonitoringTool, defineHistogram
@@ -10,15 +10,15 @@ class TrigMufastHypoMonitoring(GenericMonitoringTool):
         super(TrigMufastHypoMonitoring, self).__init__(name)
 
         self.HistPath = name  
-        self.Histograms = [ defineHistogram('Pt', type='TH1F', title="P_{T} reconstruction from #muFast; P_{T} (GeV)", xbins=200, xmin=-100, xmax=100),
-                            defineHistogram('PtFL', type='TH1F', title="P_{T} of not selected muons from #muFast; p_{T} (GeV)", xbins=200, xmin=-100, xmax=100),
-                            defineHistogram('Eta , Phi', type='TH2F', title="Eta vs Phi reconstruction of #muFast; Eta; Phi",xbins=50, xmin=-3.2, xmax=3.2, ybins=25, ymin=-3.15, ymax=3.15),
-                            defineHistogram('Eta', type='TH1F', title="Eta reconstruction from #muFast; Eta",xbins=100, xmin=-3.2, xmax=3.2),
-                            defineHistogram('Phi', type='TH1F', title="Phi reconstruction from #muFast; Phi",xbins=100, xmin=-3.15, xmax=3.15),
-                            defineHistogram('ZatSt, Phi', type='TH2F', title="Z vs Phi reconstructed in MIDDLE station; Z (cm); Phi (rad)",xbins=50, xmin=-1200., xmax=1200., ybins=25, ymin=-3.2, ymax=3.2),
-                            defineHistogram('XatSt , YatSt', type='TH2F', title="Y vs X reconstructed in MIDDLE station; X (cm); Y(cm)",xbins=50, xmin=-1200., xmax=1200., ybins=50, ymin=-1200., ymax=1200.),
-                            defineHistogram('ZatBe', type='TH1F', title="DCA along Z; Z (cm)",xbins=100, xmin=-2100, xmax=2100),
-                            defineHistogram('XatBe', type='TH1F', title="DCA along X; X (cm)",xbins=100, xmin=-1000, xmax=1000) ]
+        self.Histograms = [ defineHistogram('Pt', type='TH1F', path='EXPERT', title="P_{T} reconstruction from #muFast; P_{T} (GeV)", xbins=200, xmin=-100, xmax=100),
+                            defineHistogram('PtFL', type='TH1F', path='EXPERT', title="P_{T} of not selected muons from #muFast; p_{T} (GeV)", xbins=200, xmin=-100, xmax=100),
+                            defineHistogram('Eta , Phi', type='TH2F', path='EXPERT', title="Eta vs Phi reconstruction of #muFast; Eta; Phi",xbins=50, xmin=-3.2, xmax=3.2, ybins=25, ymin=-3.15, ymax=3.15),
+                            defineHistogram('Eta', type='TH1F', path='EXPERT', title="Eta reconstruction from #muFast; Eta",xbins=100, xmin=-3.2, xmax=3.2),
+                            defineHistogram('Phi', type='TH1F', path='EXPERT', title="Phi reconstruction from #muFast; Phi",xbins=100, xmin=-3.15, xmax=3.15),
+                            defineHistogram('ZatSt, Phi', type='TH2F', path='EXPERT', title="Z vs Phi reconstructed in MIDDLE station; Z (cm); Phi (rad)",xbins=50, xmin=-1200., xmax=1200., ybins=25, ymin=-3.2, ymax=3.2),
+                            defineHistogram('XatSt , YatSt', type='TH2F', path='EXPERT', title="Y vs X reconstructed in MIDDLE station; X (cm); Y(cm)",xbins=50, xmin=-1200., xmax=1200., ybins=50, ymin=-1200., ymax=1200.),
+                            defineHistogram('ZatBe', type='TH1F', path='EXPERT', title="DCA along Z; Z (cm)",xbins=100, xmin=-2100, xmax=2100),
+                            defineHistogram('XatBe', type='TH1F', path='EXPERT', title="DCA along X; X (cm)",xbins=100, xmin=-1000, xmax=1000) ]
 
 
 class TrigmuCombHypoMonitoring(GenericMonitoringTool):
@@ -26,19 +26,19 @@ class TrigmuCombHypoMonitoring(GenericMonitoringTool):
         super(TrigmuCombHypoMonitoring, self).__init__(name)
 
         self.HistPath = name  
-        self.Histograms = [ defineHistogram('Pt', type='TH1F', title="p_{T} reconstruction from #muComb; p_{T} (GeV)",
+        self.Histograms = [ defineHistogram('Pt', type='TH1F', path='EXPERT', title="p_{T} reconstruction from #muComb; p_{T} (GeV)",
                                             xbins=210, xmin=-105, xmax=105) ]
-        self.Histograms += [ defineHistogram('PtFL', type='TH1F', title="p_{T} of not selected muons from #muComb; p_{T} (GeV)",
+        self.Histograms += [ defineHistogram('PtFL', type='TH1F', path='EXPERT', title="p_{T} of not selected muons from #muComb; p_{T} (GeV)",
                                             xbins=210, xmin=-105., xmax=105.) ]
-        self.Histograms += [ defineHistogram('StrategyFlag', type='TH1F', title="Combination Strategy from #muComb; Strategy Code",
+        self.Histograms += [ defineHistogram('StrategyFlag', type='TH1F', path='EXPERT', title="Combination Strategy from #muComb; Strategy Code",
                                             xbins=12, xmin=-1.5, xmax=10.5) ]
-        self.Histograms += [ defineHistogram('Eta', type='TH1F', title="Eta reconstruction from #muComb; Eta",
+        self.Histograms += [ defineHistogram('Eta', type='TH1F', path='EXPERT', title="Eta reconstruction from #muComb; Eta",
                                              xbins=108, xmin=-2.7, xmax=2.7) ]
-        self.Histograms += [ defineHistogram('Phi', type='TH1F', title="Phi reconstruction from #muComb; Phi (rad)",
+        self.Histograms += [ defineHistogram('Phi', type='TH1F', path='EXPERT', title="Phi reconstruction from #muComb; Phi (rad)",
                                              xbins=96, xmin=-3.1416, xmax=3.1416) ]
-        self.Histograms += [ defineHistogram('Z0', type='TH1F', title="PCA along Z from ID track from #muComb; PCA(Z0) (mm)",
+        self.Histograms += [ defineHistogram('Z0', type='TH1F', path='EXPERT', title="PCA along Z from ID track from #muComb; PCA(Z0) (mm)",
                                              xbins=100, xmin=-200, xmax=200) ]
-        self.Histograms += [ defineHistogram('A0', type='TH1F', title="PCA along x-y from ID track from #muComb; PCA(A0) (mm)",
+        self.Histograms += [ defineHistogram('A0', type='TH1F', path='EXPERT', title="PCA along x-y from ID track from #muComb; PCA(A0) (mm)",
                                              xbins=100, xmin=-0.6, xmax=0.6) ]
 
 class TrigMuisoHypoMonitoring(GenericMonitoringTool):
@@ -47,8 +47,8 @@ class TrigMuisoHypoMonitoring(GenericMonitoringTool):
         super(TrigMuisoHypoMonitoring, self).__init__(name)
 
         self.HistPath = name  
-        self.Histograms  = [ defineHistogram('CutCounter', type='TH1F', title="MuIsoHypo cut counter;cut; nevents", xbins=9, xmin=-1.5, xmax=7.5, opt="kCumulative") ]
-        self.Histograms += [ defineHistogram('SumPtCone', type='TH1F', title="MuIsoHypo SumPt in cone around muon;E [GeV/c]; nevents", xbins=200, xmin=0., xmax=15.) ]
+        self.Histograms  = [ defineHistogram('CutCounter', type='TH1F', path='EXPERT', title="MuIsoHypo cut counter;cut; nevents", xbins=9, xmin=-1.5, xmax=7.5, opt="kCumulative") ]
+        self.Histograms += [ defineHistogram('SumPtCone', type='TH1F', path='EXPERT', title="MuIsoHypo SumPt in cone around muon;E [GeV/c]; nevents", xbins=200, xmin=0., xmax=15.) ]
 
 
 class TrigMuonEFMSonlyHypoMonitoring(GenericMonitoringTool):
@@ -57,17 +57,17 @@ class TrigMuonEFMSonlyHypoMonitoring(GenericMonitoringTool):
         super(TrigMuonEFMSonlyHypoMonitoring, self).__init__(name)
         self.HistPath = name  
 
-        self.Histograms = [ defineHistogram('Pt', type='TH1F', title="P_{T} reconstruction from #TrigMuonEFMSonlyHypo; P_{T} (MeV)",
+        self.Histograms = [ defineHistogram('Pt', type='TH1F', path='EXPERT', title="P_{T} reconstruction from #TrigMuonEFMSonlyHypo; P_{T} (MeV)",
                                             xbins=200, xmin=-100, xmax=100) ]
-        self.Histograms += [ defineHistogram('Eta', type='TH1F', title="Eta reconstruction from #TrigMuonEFMSonlyHypo; Eta",
+        self.Histograms += [ defineHistogram('Eta', type='TH1F', path='EXPERT', title="Eta reconstruction from #TrigMuonEFMSonlyHypo; Eta",
                                             xbins=100, xmin=-3.2, xmax=3.2) ]
-        self.Histograms += [ defineHistogram('Phi', type='TH1F', title="Phi reconstruction from #TrigMuonEFMSonlyHypo; Phi",
+        self.Histograms += [ defineHistogram('Phi', type='TH1F', path='EXPERT', title="Phi reconstruction from #TrigMuonEFMSonlyHypo; Phi",
                                     xbins=100, xmin=-3.15, xmax=3.15) ]
-        self.Histograms += [ defineHistogram('Pt_sel', type='TH1F', title="Selected P_{T} reconstruction from #TrigMuonEFMSonlyHypo; P_{T} (MeV)",
+        self.Histograms += [ defineHistogram('Pt_sel', type='TH1F', path='EXPERT', title="Selected P_{T} reconstruction from #TrigMuonEFMSonlyHypo; P_{T} (MeV)",
                                             xbins=200, xmin=-100, xmax=100) ]
-        self.Histograms += [ defineHistogram('Eta_sel', type='TH1F', title="Selected Eta reconstruction from #TrigMuonEFMSonlyHypo; Eta",
+        self.Histograms += [ defineHistogram('Eta_sel', type='TH1F', path='EXPERT', title="Selected Eta reconstruction from #TrigMuonEFMSonlyHypo; Eta",
                                             xbins=100, xmin=-3.2, xmax=3.2) ]
-        self.Histograms += [ defineHistogram('Phi_sel', type='TH1F', title="Selected Phi reconstruction from #TrigMuonEFMSonlyHypo; Phi",
+        self.Histograms += [ defineHistogram('Phi_sel', type='TH1F', path='EXPERT', title="Selected Phi reconstruction from #TrigMuonEFMSonlyHypo; Phi",
                                     xbins=100, xmin=-3.15, xmax=3.15) ]
 
 class TrigMuonEFCombinerHypoMonitoring(GenericMonitoringTool):
@@ -76,15 +76,15 @@ class TrigMuonEFCombinerHypoMonitoring(GenericMonitoringTool):
         super(TrigMuonEFCombinerHypoMonitoring, self).__init__(name)
         self.HistPath = name  
 
-        self.Histograms = [ defineHistogram('Pt', type='TH1F', title="P_{T} reconstruction from #TrigMuonEFCombinerHypo; P_{T} (MeV)",
+        self.Histograms = [ defineHistogram('Pt', type='TH1F', path='EXPERT', title="P_{T} reconstruction from #TrigMuonEFCombinerHypo; P_{T} (MeV)",
                                             xbins=200, xmin=-100, xmax=100) ]
-        self.Histograms += [ defineHistogram('Eta', type='TH1F', title="Eta reconstruction from #TrigMuonEFCombinerHypo; Eta",
+        self.Histograms += [ defineHistogram('Eta', type='TH1F', path='EXPERT', title="Eta reconstruction from #TrigMuonEFCombinerHypo; Eta",
                                             xbins=100, xmin=-3.2, xmax=3.2) ]
-        self.Histograms += [ defineHistogram('Phi', type='TH1F', title="Phi reconstruction from #TrigMuonEFCombinerHypo; Phi",
+        self.Histograms += [ defineHistogram('Phi', type='TH1F', path='EXPERT', title="Phi reconstruction from #TrigMuonEFCombinerHypo; Phi",
                                     xbins=100, xmin=-3.15, xmax=3.15) ]
-        self.Histograms += [ defineHistogram('Pt_sel', type='TH1F', title="Selected P_{T} reconstruction from #TrigMuonEFCombinerHypo; P_{T} (MeV)",
+        self.Histograms += [ defineHistogram('Pt_sel', type='TH1F', path='EXPERT', title="Selected P_{T} reconstruction from #TrigMuonEFCombinerHypo; P_{T} (MeV)",
                                             xbins=200, xmin=-100, xmax=100) ]
-        self.Histograms += [ defineHistogram('Eta_sel', type='TH1F', title="Selected Eta reconstruction from #TrigMuonEFCombinerHypo; Eta",
+        self.Histograms += [ defineHistogram('Eta_sel', type='TH1F', path='EXPERT', title="Selected Eta reconstruction from #TrigMuonEFCombinerHypo; Eta",
                                             xbins=100, xmin=-3.2, xmax=3.2) ]
-        self.Histograms += [ defineHistogram('Phi_sel', type='TH1F', title="Selected Phi reconstruction from #TrigMuonEFCombinerHypo; Phi",
+        self.Histograms += [ defineHistogram('Phi_sel', type='TH1F', path='EXPERT', title="Selected Phi reconstruction from #TrigMuonEFCombinerHypo; Phi",
                                     xbins=100, xmin=-3.15, xmax=3.15) ]
diff --git a/Trigger/TrigHypothesis/TrigMuonHypo/python/testTrigMuonHypoConfig.py b/Trigger/TrigHypothesis/TrigMuonHypo/python/testTrigMuonHypoConfig.py
index cdf44d0b7e3696a7013dc12b5353113d0e7b338a..f41f16c9f73c62912b329b624de67d6f5e8be2aa 100755
--- a/Trigger/TrigHypothesis/TrigMuonHypo/python/testTrigMuonHypoConfig.py
+++ b/Trigger/TrigHypothesis/TrigMuonHypo/python/testTrigMuonHypoConfig.py
@@ -1,6 +1,6 @@
-# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 
-from TrigMuonHypo.TrigMuonHypoConf import TrigMufastHypoAlg, TrigMufastHypoTool, TrigmuCombHypoAlg, TrigmuCombHypoTool, TrigMuonEFMSonlyHypoAlg, TrigMuonEFMSonlyHypoTool, TrigMuisoHypoAlg, TrigMuisoHypoTool
+from TrigMuonHypo.TrigMuonHypoConf import TrigMufastHypoAlg, TrigMufastHypoTool, TrigmuCombHypoAlg, TrigmuCombHypoTool, TrigMuonEFMSonlyHypoAlg, TrigMuonEFMSonlyHypoTool, TrigMuisoHypoAlg, TrigMuisoHypoTool, TrigMuonEFCombinerHypoTool
 from TrigMuonHypo.TrigMuonHypoMonitoringMT import *
 from AthenaCommon.SystemOfUnits import GeV
 from MuonByteStream.MuonByteStreamFlags import muonByteStreamFlags
@@ -387,47 +387,40 @@ muFastThresholdsForECWeakBRegion = {
     }
 
 
-def TrigMufastHypoToolFromName( toolName,  thresholdHLT ):	
-        
-    name = "TrigMufastHypoTool"
-    config = TrigMufastHypoConfig()
-    
-    # Separete HLT_NmuX to bname[0]=HLT and bname[1]=NmuX
-    bname = thresholdHLT.split('_') 
-    threshold = bname[1]
-    thresholds = config.decodeThreshold( threshold )
-    print "TrigMufastHypoConfig: Decoded ", thresholdHLT, " to ", thresholds
-
-    tool=config.ConfigurationHypoTool( toolName, thresholds )
-    
-    # Setup MonTool for monitored variables in AthenaMonitoring package
-    TriggerFlags.enableMonitoring = ["Validation"]
-
+def addMonitoring(tool, monClass, name, thresholdHLT ):
     try:
-            if 'Validation' in TriggerFlags.enableMonitoring() or 'Online' in TriggerFlags.enableMonitoring() or 'Cosmic' in TriggerFlags.enableMonitoring():
-                tool.MonTool = TrigMufastHypoMonitoring( name + "Monitoring_" + thresholdHLT ) 
+        if 'Validation' in TriggerFlags.enableMonitoring() or 'Online' in TriggerFlags.enableMonitoring() or 'Cosmic' in TriggerFlags.enableMonitoring():
+            tool.MonTool = monClass( name + "Monitoring_" + thresholdHLT ) 
     except AttributeError:
-            tool.MonTool = ""
-            print name, ' Monitoring Tool failed'
+        tool.MonTool = ""
+        print name, ' Monitoring Tool failed'
 
-    return tool
 
+def getThresholdsFromDict( chainDict ):    
+    return sum( [ [part['threshold']]*int(part['multiplicity']) for part in chainDict['chainParts']], [])
 
-class TrigMufastHypoConfig():
 
-    def decodeThreshold( self, threshold ):
-        """ decodes the thresholds of the form mu6, 2mu6, ... """
-        print "decoding ", threshold
+def TrigMufastHypoToolFromDict( chainDict ):	
 
-        if threshold[0].isdigit():  # If the form is NmuX, return as list [X,X,X...N times...]
-            assert threshold[1:3] == "mu", "Two digit multiplicity not supported"
-            return [ threshold[3:] ] * int( threshold[0] )
-    
-        if threshold.count('mu') > 1:  # If theform is muXmuY, return as [X,Y]
-            return threshold.strip('mu').split('mu')
+    thresholds = getThresholdsFromDict( chainDict )
+    config = TrigMufastHypoConfig()
+    tool=config.ConfigurationHypoTool( chainDict['chainName'], thresholds )
+    # # Setup MonTool for monitored variables in AthenaMonitoring package
+    TriggerFlags.enableMonitoring = ['Validation']
+    addMonitoring( tool, TrigMufastHypoMonitoring, 'TrigMufastHypoTool', chainDict['chainName'] )
     
-        # If the form is muX(inclusive), return as 1 element list
-        return [ threshold[2:] ]        
+    return tool
+
+
+def TrigMufastHypoToolFromName( name,  thresholdHLT ):	
+    from TriggerMenuMT.HLTMenuConfig.Menu.DictFromChainName import DictFromChainName   
+    decoder = DictFromChainName()    
+    decodedDict = decoder.analyseShortName(thresholdHLT, [], "") # no L1 info    
+    decodedDict['chainName'] = name # override
+    return TrigMufastHypoToolFromDict( decodedDict )
+
+
+class TrigMufastHypoConfig():
     
     def ConfigurationHypoTool( self, thresholdHLT, thresholds ): 
         
@@ -481,35 +474,27 @@ class TrigMufastHypoConfig():
                     raise Exception('MuFast Hypo Misconfigured: threshold %r not supported' % thvaluename)
 
         return tool
-    
 
-def TrigmuCombHypoToolFromName( toolName, thresholdHLT ):	
-        
-    name = "TrigmuCombHypoTool"
+def TrigmuCombHypoToolFromDict( chainDict ):
+    print chainDict
+
+    thresholds = getThresholdsFromDict( chainDict )
     config = TrigmuCombHypoConfig()
     
-    # Separete HLT_NmuX to bname[0]=HLT and bname[1]=NmuX
-    bname = thresholdHLT.split('_') 
-    threshold = bname[1]
-    thresholds = config.decodeThreshold( threshold )
-    print "TrigmuCombHypoConfig: Decoded ", thresholdHLT, " to ", thresholds
-
-    tight = False
-    tool=config.ConfigurationHypoTool( toolName, thresholds, tight )
-    
-    # Setup MonTool for monitored variables in AthenaMonitoring package
-    TriggerFlags.enableMonitoring = ["Validation"]
+    tight = False # can be probably decoded from some of the proprties of the chain, expert work
+    tool=config.ConfigurationHypoTool( chainDict['chainName'], thresholds, tight )
 
-    try:
-            if 'Validation' in TriggerFlags.enableMonitoring() or 'Online' in TriggerFlags.enableMonitoring() or 'Cosmic' in TriggerFlags.enableMonitoring():
-                tool.MonTool = TrigmuCombHypoMonitoring( name + "Monitoring_" + thresholdHLT ) 
-    except AttributeError:
-            tool.MonTool = ""
-            print name, ' Monitoring Tool failed'
+    addMonitoring( tool, TrigmuCombHypoMonitoring, "TrigmuCombHypoTool", chainDict['chainName'] )
 
     return tool
 
-
+def TrigmuCombHypoToolFromName( name, thresholdsHLT ):	
+    from TriggerMenuMT.HLTMenuConfig.Menu.DictFromChainName import DictFromChainName   
+    decoder = DictFromChainName()    
+    decodedDict = decoder.analyseShortName(thresholdsHLT, [], "") # no L1 info    
+    decodedDict['chainName'] = name # override
+    return TrigmuCombHypoToolFromDict( decodedDict )
+        
 class TrigmuCombHypoConfig():
 
     def decodeThreshold( self, threshold ):
@@ -566,46 +551,36 @@ class TrigmuCombHypoConfig():
         return tool 
 
 
+
 ### for TrigMuisoHypo
-def TrigMuisoHypoToolFromName( toolName, thresholdHLT ):
+def TrigMuisoHypoToolFromDict( chainDict ):
 
-    name = "TrigMuisoHypoTool"
     config = TrigMuisoHypoConfig()
+    tool = config.ConfigurationHypoTool( chainDict['chainName'] )
+    addMonitoring( tool, TrigMuisoHypoMonitoring,  "TrigMuisoHypoTool", chainDict['chainName'])
+    return tool
+    
 
-    # Separete HLT_NmuX to bname[0]=HLT and bname[1]=NmuX
-    bnames = thresholdHLT.split('_') 
-
-    print "TrigMuisoHypoConfig: Decoded ", thresholdHLT 
-
-    tool = config.ConfigurationHypoTool( toolName, bnames )
-
+def TrigMuisoHypoToolFromName( name, thresholdHLT ):
 
-    # Setup MonTool for monitored variables in AthenaMonitoring package
-    TriggerFlags.enableMonitoring = ["Validation"]
-
-    try:
-        if 'Validation' in TriggerFlags.enableMonitoring() or 'Online' in TriggerFlags.enableMonitoring() or 'Cosmic' in TriggerFlags.enableMonitoring():
-            tool.MonTool = TrigMuisoHypoMonitoring( name + "Monitoring_" + thresholdHLT ) 
-    except AttributeError:
-        tool.MonTool = ""
-        print name, ' Monitoring Tool failed'
-
-    return tool
+    from TriggerMenuMT.HLTMenuConfig.Menu.DictFromChainName import DictFromChainName   
+    decoder = DictFromChainName()    
+    decodedDict = decoder.analyseShortName(thresholdHLT, [], "") # no L1 info    
+    decodedDict['chainName'] = name # override
+    return TrigMuisoHypoToolFromDict( decodedDict )
 
 
 class TrigMuisoHypoConfig() :
 
-
-    def ConfigurationHypoTool( self, toolName, bnames ):	
+    def ConfigurationHypoTool( self, toolName ):	
 
         tool = TrigMuisoHypoTool( toolName )  
         
-        # If configured with passthrough, set AcceptAll flag on
+        # If configured with passthrough, set AcceptAll flag on, not quite there in the menu
         tool.AcceptAll = False
-        for bname in bnames:
-            if 'passthrough' in bname:
-                tool.AcceptAll = True
-                print 'MuisoHypoConfig configured in pasthrough mode'
+        if 'passthrough' in toolName:                    
+            tool.AcceptAll = True
+            print 'MuisoHypoConfig configured in pasthrough mode'
 
         if "FTK" in toolName: # allows us to use different working points in FTK mode
             tool.IDConeSize   = 2;
@@ -623,30 +598,21 @@ class TrigMuisoHypoConfig() :
         return tool
 
 
-def TrigMuonEFMSonlyHypoToolFromName( toolName, thresholdHLT ) :
-
-    name = "TrigMuonEFMSonlyHypoTool"
+def TrigMuonEFMSonlyHypoToolFromDict( chainDict ) :
+    thresholds = getThresholdsFromDict( chainDict ) 
     config = TrigMuonEFMSonlyHypoConfig()
+    tool = config.ConfigurationHypoTool( chainDict['chainName'], thresholds )
+    addMonitoring( tool, TrigMuonEFMSonlyHypoMonitoring, "TrigMuonEFMSonlyHypoTool", chainDict['chainName'] )
+    return tool
 
-    # Separete HLT_NmuX to bname[0]=HLT and bname[1]=NmuX
-    bname = thresholdHLT.split('_') 
-    threshold = bname[1]
-    thresholds = config.decodeThreshold( threshold )
-    print "TrigMuonEFMSonlyHypoConfig: Decoded ", thresholdHLT, " to ", thresholds
-
-    tool = config.ConfigurationHypoTool( toolName, thresholds )
- 
-    # Setup MonTool for monitored variables in AthenaMonitoring package
-    TriggerFlags.enableMonitoring = ["Validation"]
-
-    try:
-            if 'Validation' in TriggerFlags.enableMonitoring() or 'Online' in TriggerFlags.enableMonitoring() or 'Cosmic' in TriggerFlags.enableMonitoring():
-                tool.MonTool = TrigMuonEFMSonlyHypoMonitoring( name + "Monitoring_" + thresholdHLT ) 
-    except AttributeError:
-            tool.MonTool = ""
-            print name, ' Monitoring Tool failed'
     
-    return tool
+def TrigMuonEFMSonlyHypoToolFromName( name, thresholdHLT ) :
+
+    from TriggerMenuMT.HLTMenuConfig.Menu.DictFromChainName import DictFromChainName   
+    decoder = DictFromChainName()    
+    decodedDict = decoder.analyseShortName(thresholdHLT, [], "") # no L1 info    
+    decodedDict['chainName'] = name # override
+    return TrigMuonEFMSonlyHypoToolFromDict( decodedDict )
     
 class TrigMuonEFMSonlyHypoConfig(): 
         
@@ -694,30 +660,22 @@ class TrigMuonEFMSonlyHypoConfig():
 
         return tool
 
-def TrigMuonEFCombinerHypoToolFromName( toolName, thresholdHLT ) :
-
-    name = "TrigMuonEFCombinerHypoTool"
+    
+def TrigMuonEFCombinerHypoToolFromDict( chainDict ) :
+    thresholds = getThresholdsFromDict( chainDict ) 
     config = TrigMuonEFCombinerHypoConfig()
+    tool = config.ConfigurationHypoTool( chainDict['chainName'], thresholds )
+    addMonitoring( tool, TrigMuonEFCombinerHypoMonitoring, "TrigMuonEFCombinerHypoTool", chainDict['chainName'] )
+    return tool
+    
+def TrigMuonEFCombinerHypoToolFromName( name, thresholdHLT ) :
 
-    # Separete HLT_NmuX to bname[0]=HLT and bname[1]=NmuX
-    bname = thresholdHLT.split('_') 
-    threshold = bname[1]
-    thresholds = config.decodeThreshold( threshold )
-    print "TrigMuonEFCombinerHypoConfig: Decoded ", thresholdHLT, " to ", thresholds
-
-    tool = config.ConfigurationHypoTool( toolName, thresholds )
- 
-    # Setup MonTool for monitored variables in AthenaMonitoring package
-    TriggerFlags.enableMonitoring = ["Validation"]
+    from TriggerMenuMT.HLTMenuConfig.Menu.DictFromChainName import DictFromChainName   
+    decoder = DictFromChainName()    
+    decodedDict = decoder.analyseShortName(thresholdHLT, [], "") # no L1 info    
+    decodedDict['chainName'] = name # override
+    return TrigMuonEFCombinerHypoToolFromDict( decodedDict )
 
-    try:
-            if 'Validation' in TriggerFlags.enableMonitoring() or 'Online' in TriggerFlags.enableMonitoring() or 'Cosmic' in TriggerFlags.enableMonitoring():
-                tool.MonTool = TrigMuonEFCombinerHypoMonitoring( name + "Monitoring_" + thresholdHLT ) 
-    except AttributeError:
-            tool.MonTool = ""
-            print name, ' Monitoring Tool failed'
-    
-    return tool
 
 class TrigMuonEFCombinerHypoConfig(): 
         
@@ -764,3 +722,33 @@ class TrigMuonEFCombinerHypoConfig():
 
         return tool
 
+
+
+
+if __name__ == '__main__':
+    # normaly this tools are private and have no clash in naming, for the test we create them and never assign so they are like public,
+    # in Run3 config this is checked in a different way so having Run 3 JO behaviour solves test issue
+    from AthenaCommon.Configurable import Configurable
+    Configurable.configurableRun3Behavior=1 
+
+    configToTest = [ 'HLT_mu6fast',
+                     'HLT_mu6Comb',
+                     'HLT_mu6'                    
+                     'HLT_mu20_ivar',
+                     'HLT_2mu6Comb',
+                     'HLT_2mu6']
+                    
+    for c in configToTest:
+        print "testing config ", c
+        toolMufast = TrigMufastHypoToolFromName(c, c)
+        assert toolMufast
+        toolmuComb = TrigmuCombHypoToolFromName(c, c)
+        assert toolmuComb
+        toolMuiso = TrigMuisoHypoToolFromName(c, c)
+        assert toolMuiso
+        toolEFMSonly = TrigMuonEFMSonlyHypoToolFromName(c, c)
+        assert toolEFMSonly
+        toolEFCombiner = TrigMuonEFCombinerHypoToolFromName(c, c)
+        assert toolEFCombiner
+        
+    print "All OK"
diff --git a/Trigger/TrigMonitoring/TrigMuonMonitoring/python/TrigMuonMonitCategory.py b/Trigger/TrigMonitoring/TrigMuonMonitoring/python/TrigMuonMonitCategory.py
index 02ccbf29dbcbad01eeab58a872b3194e63efadc1..292685694b0c90a567aba75bc2df6747ff27ae5d 100644
--- a/Trigger/TrigMonitoring/TrigMuonMonitoring/python/TrigMuonMonitCategory.py
+++ b/Trigger/TrigMonitoring/TrigMuonMonitoring/python/TrigMuonMonitCategory.py
@@ -1,7 +1,7 @@
 # Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 
 monitoring_muonNonIso = ['HLT_mu50']
-monitoring_muonNonIso_HI = ['HLT_mu15_L1MU10','HLT_mu14']#8TeV
+monitoring_muonNonIso_HI = ['HLT_mu8','HLT_mu3', 'HLT_mu4']#8TeV
 #monitoring_muonNonIso_HI = ['HLT_mu10','HLT_mu14']
 monitoring_muonNonIso_pp = ['HLT_mu50']
 
@@ -31,7 +31,7 @@ monitoring_muonLowpt = ["HLT_mu14"]
 ### TE name of the hypos for the L2
 #L2 standalone
 monitoring_muonNonIso_L2SAHypo = ['L2_mu_SAhyp_Muon6GeV_v15a_MU20']
-monitoring_muonNonIso_HI_L2SAHypo = ['HLT_mu15_L1MU10','L2_mu_SAhyp_Muon6GeV_v15a_MU10']#8TeV
+monitoring_muonNonIso_HI_L2SAHypo = ['L2_mu_SAhyp_Muon6GeV_v15a_MU6','L2_mu_SAhyp_Muon3GeV_v15a_MU4','L2_mu_SAhyp_Muon4GeV_v15a_MU4']#8TeV
 monitoring_muonNonIso_pp_L2SAHypo = ['L2_mu_SAhyp_Muon6GeV_v15a_MU20']
 
 monitoring_muonIso_L2SAHypo = ['L2_mu_SAhyp_Muon6GeV_v15a_MU20']
@@ -39,7 +39,7 @@ monitoring_muonIso_HI_L2SAHypo = ['']
 monitoring_muonIso_pp_L2SAHypo = ['L2_mu_SAhyp_Muon6GeV_v15a_MU20']
 
 monitoring_MSonly_L2SAHypo = ['L2_mu_SAhyp_Muon6GeV_v15a_MU20']
-monitoring_MSonly_HI_L2SAHypo = ['HLT_mu15_msonly']
+monitoring_MSonly_HI_L2SAHypo = ['L2_mu_SAhyp_Muon6GeV_v15a_MU11']
 monitoring_MSonly_pp_L2SAHypo = ['L2_mu_SAhyp_Muon6GeV_v15a_MU20']
 
 monitoring_muonEFFS_L2SAHypo = ['']
@@ -56,7 +56,7 @@ monitoring_muonLowpt_pp_L2SAHypo = ["L2_mu_SAhyp_Muon6GeV_v15a_MU10"]
 
 #L2 combined
 monitoring_muonNonIso_L2CBHypo = ['L2_mucombhyp_mu22_MU20']
-monitoring_muonNonIso_HI_L2CBHypo = ['HLT_mu15_L1MU10','L2_mucombhyp_mu14_MU10']#8TeV
+monitoring_muonNonIso_HI_L2CBHypo = ['L2_mucombhyp_mu8_MU6', 'L2_mucombhyp_mu3_MU4', 'L2_mucombhyp_mu4_MU4']#8TeV
 monitoring_muonNonIso_pp_L2CBHypo = ['L2_mucombhyp_mu22_MU20']
 
 monitoring_muonIso_L2CBHypo = ['L2_mucombhyp_mu22_MU20']
diff --git a/Trigger/TrigMonitoring/TrigMuonMonitoring/src/CommonMon.cxx b/Trigger/TrigMonitoring/TrigMuonMonitoring/src/CommonMon.cxx
index 371a504575c020ef74c899b8095bf4bb4173730f..a618cb6bd6dabc80c0757ea52a21e90e3921e7d6 100644
--- a/Trigger/TrigMonitoring/TrigMuonMonitoring/src/CommonMon.cxx
+++ b/Trigger/TrigMonitoring/TrigMuonMonitoring/src/CommonMon.cxx
@@ -1404,17 +1404,13 @@ StatusCode HLTMuonMonTool::fillCommonDQA()
   // updated for real config: 15.02.11
   std::vector<std::string> vs_ESstd;
   if( !m_HI_pp_mode ){
-    vs_ESstd.push_back("HLT_noalg_L1MU4"); 
-    vs_ESstd.push_back("HLT_noalg_L1MU6"); 
-    vs_ESstd.push_back("HLT_noalg_L1MU10"); 
-    //vs_ESstd.push_back("HLT_noalg_L1MU11"); 
+    vs_ESstd.push_back("HLT_mu8"); // increasing stat for muZTP, which requests now ES bits
   }else{
     vs_ESstd.push_back("HLT_mu26_ivarmedium"); // increasing stat for muZTP, which requests now ES bits
   }
-  // vs_ESstd.push_back("HLT_mu18i4_tight"); // for test
-  // vs_ESstd.push_back("HLT_mu22_medium"); // for test
 
   std::vector<std::string> vs_ESnoniso;
+  vs_ESnoniso.push_back("HLT_mu8");   // for HI, but HI does not use iso
   vs_ESnoniso.push_back("HLT_mu14");  // for EnhancedBias
   vs_ESnoniso.push_back("HLT_mu26");
   vs_ESnoniso.push_back("HLT_mu24");      
diff --git a/Trigger/TrigMonitoring/TrigMuonMonitoring/src/HLTMuonMonTool.cxx b/Trigger/TrigMonitoring/TrigMuonMonitoring/src/HLTMuonMonTool.cxx
index 3e4e2bd1d7541957ec854c4d84721802e252df8d..6439e72ff1bf8d17fcdef7a7302c88dc01a56acb 100755
--- a/Trigger/TrigMonitoring/TrigMuonMonitoring/src/HLTMuonMonTool.cxx
+++ b/Trigger/TrigMonitoring/TrigMuonMonitoring/src/HLTMuonMonTool.cxx
@@ -159,6 +159,7 @@ StatusCode HLTMuonMonTool::init()
   //(*m_log).setLevel(MSG::DEBUG); // YY: not yet used
   // this->msg().setLevel(MSG::DEBUG);  // YY tried this, worked fine
   ATH_MSG_DEBUG("init being called");
+  ATH_MSG_DEBUG("HI_pp_mode:" << m_HI_pp_mode);
   // some switches and flags
   m_requestESchains = true;
   //initialization for common tools
@@ -255,13 +256,15 @@ StatusCode HLTMuonMonTool::init()
   // v5 primary
   //m_histChainEFFS.push_back("muChainEFFS");
   //m_chainsEFFS.push_back("mu18_mu8noL1");
+
   if(!m_HI_pp_mode){
     m_FS_pre_trigger = "HLT_mu4";
-    m_FS_pre_trigger = "HLT_mu10";
+    m_FS_pre_trigger_second = "HLT_mu8";
   }else{
     m_FS_pre_trigger = "HLT_mu24_ivarmedium";
+    m_FS_pre_trigger_second = "HLT_mu26_ivarmedium";
   }
-  m_FS_pre_trigger_second = "HLT_mu26_ivarmedium";
+
   for(unsigned int ich = 0; ich < m_chainsEFFS.size(); ich++){
 	if(ich > 0) continue;
 	m_histChainEFFS.push_back("muChainEFFS");
@@ -1057,13 +1060,16 @@ const HLT::TriggerElement* HLTMuonMonTool :: getDirectSuccessorHypoTEForL2(const
   const HLT::TriggerElement *hypote = NULL;
   std::vector<HLT::TriggerElement*> TEsuccessors = m_ExpertMethods->getNavigation()->getDirectSuccessors(te);
   for(auto te2 : TEsuccessors){
-    //ATH_MSG_DEBUG("[" << chainname <<"] ::TE2: " << te2->getId() << " " <<  Trig::getTEName(*te2) );
+    ATH_MSG_VERBOSE("[" << chainname <<"] ::TE2: " << te2->getId() << " " <<  Trig::getTEName(*te2) );
     if(Trig::getTEName(*te2)==hyponame){
       ATH_MSG_DEBUG("[" << chainname<< "] selected HypoTE: " << te2->getId() << " " <<  Trig::getTEName(*te2) <<  " isPassed=" << te2->getActiveState() );
       hypote = te2;
     }
   }
-
+  if(!hypote){
+      ATH_MSG_DEBUG("[" << chainname<< "] HypoTE not found. Assigning alg TE.");
+      hypote = te;
+  }
 
   return hypote;
 }
diff --git a/Trigger/TrigSteer/TrigOutputHandling/src/HLTEDMCreator.cxx b/Trigger/TrigSteer/TrigOutputHandling/src/HLTEDMCreator.cxx
index 689666dbd7c02b8416f3d0a49864be44bfcb72bb..68b31538f4b4d86fe395793faec99cc05b75dae3 100644
--- a/Trigger/TrigSteer/TrigOutputHandling/src/HLTEDMCreator.cxx
+++ b/Trigger/TrigSteer/TrigOutputHandling/src/HLTEDMCreator.cxx
@@ -183,7 +183,7 @@ StatusCode HLTEDMCreator::fixLinks( const ConstHandlesGroup< xAOD::TrigComposite
       }
 
       // Store the remapped TCs
-      SG::WriteHandle<xAOD::TrigCompositeContainer> writeHandle( "remap_" + writeHandleKey.key() );
+      SG::WriteHandle<xAOD::TrigCompositeContainer> writeHandle( m_remapKey + writeHandleKey.key() );
       CHECK(output.record( writeHandle ));
     }
   }
@@ -195,12 +195,14 @@ template<typename T, typename G, typename M>
 StatusCode HLTEDMCreator::createIfMissing( const EventContext& context, const ConstHandlesGroup<T>& handles, G& generator, M merger ) const {
 
   for ( auto writeHandleKey : handles.out ) {
+    
     SG::ReadHandle<T> readHandle( writeHandleKey.key() );
-
+    ATH_MSG_DEBUG( "Checking " << writeHandleKey.key() );
+    
     if ( readHandle.isValid() ) {
       ATH_MSG_DEBUG( "The " << writeHandleKey.key() << " already present" );
     } else {      
-      ATH_MSG_DEBUG( "The " << writeHandleKey.key() << " was absent, creating it, possibly filling with content from views" );
+      ATH_MSG_DEBUG( "The " << writeHandleKey.key() << " was absent, creating it" );
       generator.create();      
       if ( handles.views.size() != 0 ) {
 
@@ -264,7 +266,8 @@ StatusCode HLTEDMCreator::createOutput(const EventContext& context) const {
   CREATE_XAOD( MuonContainer, MuonAuxContainer );
 
   // After view collections are merged, need to update collection links
-  CHECK( fixLinks( ConstHandlesGroup<xAOD::TrigCompositeContainer>( m_TrigCompositeContainer, m_TrigCompositeContainerInViews, m_TrigCompositeContainerViews ) ) );
+  if ( m_fixLinks )
+    ATH_CHECK( fixLinks( ConstHandlesGroup<xAOD::TrigCompositeContainer>( m_TrigCompositeContainer, m_TrigCompositeContainerInViews, m_TrigCompositeContainerViews ) ) );
 
 #undef CREATE_XAOD
 #undef CREATE_XAOD_NO_MERGE
diff --git a/Trigger/TrigSteer/TrigOutputHandling/src/HLTEDMCreator.h b/Trigger/TrigSteer/TrigOutputHandling/src/HLTEDMCreator.h
index f631f57517c8e8298908cec9c888106c3b33d468..359f2b96ded92d014a98c140c90eef2790eb1c5e 100644
--- a/Trigger/TrigSteer/TrigOutputHandling/src/HLTEDMCreator.h
+++ b/Trigger/TrigSteer/TrigOutputHandling/src/HLTEDMCreator.h
@@ -68,7 +68,8 @@ class HLTEDMCreator: public extends<AthAlgTool, IHLTOutputTool>  {
  private: 
 
   HLTEDMCreator();
-
+  Gaudi::Property<std::string> m_remapKey{ this, "RemapKey", "remap_", "Prefix for remapped collections"};
+  Gaudi::Property<bool> m_fixLinks{ this, "FixLinks", true, "Fix links that may be pointing objects in views"};
 
 #define DEF_VIEWS(__TYPE) \
   SG::ReadHandleKeyArray< ViewContainer > m_##__TYPE##Views{ this, #__TYPE"Views", {}, "Name  views from where the "#__TYPE" will be read"}
diff --git a/Trigger/TrigSteer/TrigOutputHandling/src/HLTEDMCreatorAlg.cxx b/Trigger/TrigSteer/TrigOutputHandling/src/HLTEDMCreatorAlg.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..fd6e5b6802149263875322e87b07ca2019a187be
--- /dev/null
+++ b/Trigger/TrigSteer/TrigOutputHandling/src/HLTEDMCreatorAlg.cxx
@@ -0,0 +1,34 @@
+/*
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+*/
+
+#include "HLTEDMCreatorAlg.h"
+
+HLTEDMCreatorAlg::HLTEDMCreatorAlg(const std::string& name, ISvcLocator* pSvcLocator) :
+  AthReentrantAlgorithm(name, pSvcLocator)
+{
+}
+
+HLTEDMCreatorAlg::~HLTEDMCreatorAlg()
+{
+}
+
+StatusCode HLTEDMCreatorAlg::initialize()
+{
+  ATH_CHECK( m_tools.retrieve() );
+  return StatusCode::SUCCESS;
+}
+
+StatusCode HLTEDMCreatorAlg::finalize()
+{
+  return StatusCode::SUCCESS;
+}
+
+StatusCode HLTEDMCreatorAlg::execute(const EventContext& context) const
+{
+  for ( auto& t: m_tools )  {
+    ATH_CHECK( t->createOutput( context ) );
+  }
+  return StatusCode::SUCCESS;
+}
+
diff --git a/Trigger/TrigSteer/TrigOutputHandling/src/HLTEDMCreatorAlg.h b/Trigger/TrigSteer/TrigOutputHandling/src/HLTEDMCreatorAlg.h
new file mode 100644
index 0000000000000000000000000000000000000000..02155fa328f93e8ffef75745b293ed94dd50e326
--- /dev/null
+++ b/Trigger/TrigSteer/TrigOutputHandling/src/HLTEDMCreatorAlg.h
@@ -0,0 +1,30 @@
+/*
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+*/
+#ifndef TRIGOUTPUTHANDLING_HLTEDMCREATORALG_H
+#define TRIGOUTPUTHANDLING_HLTEDMCREATORALG_H
+
+
+#include "AthenaBaseComps/AthReentrantAlgorithm.h"
+#include "DecisionHandling/IHLTOutputTool.h"
+
+#include <string>
+
+/**
+ * @class HLTEDMCreatorAlg
+ * @brief 
+ **/
+class HLTEDMCreatorAlg : public AthReentrantAlgorithm {
+public:
+  HLTEDMCreatorAlg(const std::string& name, ISvcLocator* pSvcLocator);
+  virtual ~HLTEDMCreatorAlg() override;
+
+  virtual StatusCode initialize() override;
+  virtual StatusCode execute(const EventContext& context) const override;
+  virtual StatusCode finalize() override;
+
+private:
+  ToolHandleArray<IHLTOutputTool> m_tools{ this, "OutputTools", {}, "Tools that generate output"};
+};
+
+#endif // TRIGOUTPUTHANDLING_HLTEDMCREATORALG_H
diff --git a/Trigger/TrigSteer/TrigOutputHandling/src/TriggerEDMDeserialiserAlg.cxx b/Trigger/TrigSteer/TrigOutputHandling/src/TriggerEDMDeserialiserAlg.cxx
index 14c08b9e06deb8a5517696842cb2cef04f42d9a9..4de3368cb9202813d16de5438ca0a685e2dd0142 100644
--- a/Trigger/TrigSteer/TrigOutputHandling/src/TriggerEDMDeserialiserAlg.cxx
+++ b/Trigger/TrigSteer/TrigOutputHandling/src/TriggerEDMDeserialiserAlg.cxx
@@ -51,6 +51,9 @@ StatusCode TriggerEDMDeserialiserAlg::execute(const EventContext& context) const
 		};
     
   auto resultHandle = SG::makeHandle( m_resultKey, context );
+  if ( resultHandle.isValid() )
+    ATH_MSG_DEBUG("Obtained HLTResultMT " << m_resultKey.key() );
+  
   const Payload* dataptr = nullptr;
   // TODO: revise if there are use cases where result may be not available in some events
   if ( resultHandle->getSerialisedData( m_moduleID, dataptr ).isFailure() ) {
@@ -66,7 +69,7 @@ StatusCode TriggerEDMDeserialiserAlg::execute(const EventContext& context) const
     std::string transientType;
     ATH_CHECK( m_clidSvc->getTypeNameOfID( clid, transientType ) );
     const std::string actualTypeName{ name.substr(0, name.find('#')) };
-    const std::string key{ name.substr( name.find('#') ) };
+    const std::string key{ name.substr( name.find('#')+1 ) };
         
     ATH_MSG_DEBUG( "fragment: clid, type, key, size " << clid << " " << transientType<< " " << actualTypeName << " " << key << " " << bsize );
     resize( bsize );
diff --git a/Trigger/TrigSteer/TrigOutputHandling/src/components/TrigOutputHandling_entries.cxx b/Trigger/TrigSteer/TrigOutputHandling/src/components/TrigOutputHandling_entries.cxx
index 81a554dac93322f94e5c7333a699af7d73368bf2..ebc99e25e1ae51adf25288a0664df6e3eebd4405 100644
--- a/Trigger/TrigSteer/TrigOutputHandling/src/components/TrigOutputHandling_entries.cxx
+++ b/Trigger/TrigSteer/TrigOutputHandling/src/components/TrigOutputHandling_entries.cxx
@@ -1,4 +1,5 @@
 #include "../HLTEDMCreator.h"
+#include "../HLTEDMCreatorAlg.h"
 #include "../StreamTagMakerTool.h"
 #include "../HLTResultMTMakerAlg.h"
 #include "TrigOutputHandling/HLTResultMTMaker.h"
@@ -8,6 +9,7 @@
 #include "../TriggerEDMDeserialiserAlg.h"
 
 DECLARE_COMPONENT( HLTEDMCreator )
+DECLARE_COMPONENT( HLTEDMCreatorAlg )
 DECLARE_COMPONENT( HLTResultMTMakerAlg )
 DECLARE_COMPONENT( HLTResultMTMaker )
 DECLARE_COMPONENT( StreamTagMakerTool )
diff --git a/Trigger/TrigT1/L1Topo/L1TopoSimulation/src/MuonInputProvider.h b/Trigger/TrigT1/L1Topo/L1TopoSimulation/src/MuonInputProvider.h
index 62c48e966af273ceb2990933482e09f27ff721c8..150bed834e1060b3ed0d14b624922e9233ab4c55 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoSimulation/src/MuonInputProvider.h
+++ b/Trigger/TrigT1/L1Topo/L1TopoSimulation/src/MuonInputProvider.h
@@ -56,6 +56,17 @@ namespace LVL1 {
       TCS::MuonTOB createMuonTOB(uint32_t roiword) const;
       TCS::MuonTOB createMuonTOB(const MuCTPIL1TopoCandidate & roi) const;
       TCS::LateMuonTOB createLateMuonTOB(const MuCTPIL1TopoCandidate & roi) const;
+      /**
+         @brief convert the 2-bit value from MuCTPIL1TopoCandidate::getptL1TopoCode() to an actual pt
+
+         The muon TOB encodes pt values in 2 bits.
+         A MuCTPIL1TopoCandidate provides the encoded 2-bit value with
+         the function getptL1TopoCode().
+         This function uses the information from the l1 trigger menu
+         configuration to convert the threshold to an actual pt value.
+         For more details, see ATR-16781.
+      */
+      unsigned int topoMuonPtThreshold(const MuCTPIL1TopoCandidate &mctpiCand) const;
 
       SG::ReadHandleKey<ROIB::RoIBResult> m_roibLocation;
 
diff --git a/Trigger/TrigT1/L1Topo/L1TopoSimulationUtils/Root/KFLUT.cxx b/Trigger/TrigT1/L1Topo/L1TopoSimulationUtils/Root/KFLUT.cxx
index de7e8d91fa9af86ce3d56839ffee0bacd638bc1d..c30a7b3a7ed7fbd07d1304527b38ee959027d765 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoSimulationUtils/Root/KFLUT.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoSimulationUtils/Root/KFLUT.cxx
@@ -71,11 +71,11 @@ void TCS::KFLUT::fillLUT(){
     etalimits = {-0.10,0.10,0.30,0.50,0.70,0.90,1.10,1.30,1.50,1.70,1.90,2.10,2.33,2.55,2.80,3.42};
     etlimits = {8,16,32,64,128,1024};
 
-    vector<double> v0 {-0.12,-0.09,-0.09,-0.05,0.03,0.08,0.14,0.36,0.29,0.04,0.06,0.04,-0.02,-0.09,-0.18,-0.31};
-    vector<double> v1 {0.08,0.09,0.09,0.12,0.2,0.27,0.32,0.46,0.39,0.2,0.16,0.13,0.08,-0.09,-0.16,-0.39};
-    vector<double> v2 {0.11,0.11,0.12,0.13,0.18,0.21,0.25,0.38,0.28,0.15,0.11,0.1,0.12,-0.03,-0.09,-0.37}; 
-    vector<double> v3 {0.04,0.03,0.04,0.03,0.09,0.11,0.14,0.23,0.15,0.06,0.03,0.04,0.02,-0.05,-0.07,-0.4};
-    vector<double> v4 {-0.05,-0.07,-0.06,-0.07,0,0.01,0.01,0.12,0.02,-0.06,-0.05,-0.06,-0.05,-0.09,-0.12,-0.47};
+    vector<double> v0 {0.14,0.12,0.12,0.17,0.26,0.3,0.3,0.42,0.38,0.19,0.16,0.15,0.52,0.59,0.62,0.33};
+    vector<double> v1 {0.19,0.17,0.18,0.2,0.27,0.3,0.3,0.43,0.36,0.19,0.16,0.14,0.33,0.35,0.38,0.28};
+    vector<double> v2 {0.13,0.11,0.11,0.13,0.17,0.19,0.18,0.28,0.21,0.11,0.09,0.08,0.12,0.09,0.12,0.17};
+    vector<double> v3 {-0.01,-0.02,-0.02,-0.01,0.02,0.03,0.03,0.12,0.04,-0.04,-0.05,-0.06,-0.03,-0.06,-0.03,0.05};
+    vector<double> v4 {-0.12,-0.12,-0.12,-0.11,-0.08,-0.07,-0.08,-0.01,-0.08,-0.14,-0.14,-0.15,-0.13,-0.15,-0.12,-0.04};
 
     LUTKF.push_back(v0);
     LUTKF.push_back(v1);
diff --git a/Trigger/TrigT1/L1Topo/L1TopoSimulationUtils/share/L1TopoSimulationUtils_test.ref b/Trigger/TrigT1/L1Topo/L1TopoSimulationUtils/share/L1TopoSimulationUtils_test.ref
index d1b6cc93a6e006fc5891ef026fefa61c3fa1b885..1f9caaf4de0dc5ef3c4f8100995dd5dbf15d4d4a 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoSimulationUtils/share/L1TopoSimulationUtils_test.ref
+++ b/Trigger/TrigT1/L1Topo/L1TopoSimulationUtils/share/L1TopoSimulationUtils_test.ref
@@ -3,6 +3,14 @@ delta eta:  abs(0 - 23) = 23, cosh 000000001010000101
 delta eta:  abs(0 - 23) = 23, cosh 000000001010000101
 delta eta:  abs(0 - 24) = 24, cosh 000000001011000111
 ** test2: L1TopoSimulationUtils KFLUT correction vs. et and eta**
+ et 4 [0],  eta 2.4 [12] : 0.52 >>>
+ et 12 [0],  eta 2.4 [12] : 0.52 >>>
+ et 4 [0],  eta 2.6 [13] : 0.59 >>>
+ et 12 [0],  eta 2.6 [13] : 0.59 >>>
+ et 4 [0],  eta 2.9 [14] : 0.62 >>>
+ et 12 [0],  eta 2.9 [14] : 0.62 >>>
+ et 4 [0],  eta 3.1 [14] : 0.62 >>>
+ et 12 [0],  eta 3.1 [14] : 0.62 >>>
 ** test3: L1TopoSimulationUtils KFLUT saturation**
 This out_of_range is expected for ET values beyond 1024 : vector::_M_range_check: __n (which is 5) >= this->size() (which is 5)
 ** test4: L1TopoSimulationUtils quadraticSumBW bitshift**
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/PpmByteStreamReadV1V2Tool.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/PpmByteStreamReadV1V2Tool.cxx
index d7de8e6edce0b7cf2456554cd5d206911924d57b..5a926c38333d7a97d2442723343185c32d12daf5 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/PpmByteStreamReadV1V2Tool.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/PpmByteStreamReadV1V2Tool.cxx
@@ -12,7 +12,8 @@
 // ===========================================================================
 #include "eformat/SourceIdentifier.h"
 #include "TrigT1Interfaces/TrigT1CaloDefs.h"
-#include "xAODTrigL1Calo/TriggerTowerAuxContainer.h" 
+#include "TrigT1CaloUtils/DataError.h"
+#include "xAODTrigL1Calo/TriggerTowerAuxContainer.h"
 
 #include "CaloUserHeader.h"
 #include "SubBlockHeader.h"
@@ -30,11 +31,15 @@ uint32_t bitFieldSize(uint32_t word, uint8_t offset, uint8_t size) {
   return (word >> offset) & ((1U << size) - 1);
 }
 
+uint32_t crateModuleMask(uint8_t crate, uint8_t module) {
+  return (crate << 8) | (1 << 4) | module;
+}
+
 uint32_t coolId(uint8_t crate, uint8_t module, uint8_t channel) {
   const uint8_t pin = channel % 16;
   const uint8_t asic = channel / 16;
-  return (crate << 24) | (1 << 20) | (module << 16) | (pin << 8) | asic;
-} 
+  return (crateModuleMask(crate, module) << 16) | (pin << 8) | asic;
+}
 
 int16_t pedCorrection(uint16_t twoBytePedCor) {
   return twoBytePedCor > 511? (twoBytePedCor - 1024): twoBytePedCor;
@@ -71,8 +76,8 @@ PpmByteStreamReadV1V2Tool::PpmByteStreamReadV1V2Tool(const std::string& name /*=
     m_verCode(0),
     m_ppPointer(0),
     m_ppMaxBit(0),
-    m_triggerTowers(nullptr),
-    m_maxSizeSeen(0)
+    m_maxSizeSeen(0),
+    m_triggerTowers(nullptr)
 {
   declareInterface<PpmByteStreamReadV1V2Tool>(this);
   declareProperty("PpmMappingTool", m_ppmMaps,
@@ -100,7 +105,7 @@ StatusCode PpmByteStreamReadV1V2Tool::initialize() {
   ServiceHandle<IIncidentSvc> incidentSvc("IncidentSvc", name());
   CHECK(incidentSvc.retrieve());
   incidentSvc->addListener(this, IncidentType::EndEvent);
-  
+
   return StatusCode::SUCCESS;
 }
 // ===========================================================================
@@ -115,8 +120,8 @@ StatusCode PpmByteStreamReadV1V2Tool::finalize() {
 void PpmByteStreamReadV1V2Tool::handle( const Incident& inc )
 {
   if ( inc.type() == IncidentType::EndEvent) {
-   
-  } 
+
+  }
 }
 // Conversion bytestream to trigger towers
 StatusCode PpmByteStreamReadV1V2Tool::convert(
@@ -124,9 +129,11 @@ StatusCode PpmByteStreamReadV1V2Tool::convert(
     xAOD::TriggerTowerContainer* const ttCollection) {
 
   m_triggerTowers = ttCollection;
-  if (m_maxSizeSeen > m_triggerTowers->capacity())
+
+  if (m_maxSizeSeen > m_triggerTowers->capacity()){
     m_triggerTowers->reserve (m_maxSizeSeen);
-  m_coolIds.clear();
+  }
+
   m_subDetectorID = eformat::TDAQ_CALO_PREPROC;
   m_requestedType = RequestType::PPM;
 
@@ -135,11 +142,13 @@ StatusCode PpmByteStreamReadV1V2Tool::convert(
 
   int robCounter = 1;
   for (; rob != robEnd; ++rob, ++robCounter) {
+
     StatusCode sc = processRobFragment_(rob, RequestType::PPM);
     if (!sc.isSuccess()) {
 
     }
   }
+
   m_maxSizeSeen = std::max (m_maxSizeSeen, m_triggerTowers->size());
   m_triggerTowers = nullptr;
   return StatusCode::SUCCESS;
@@ -219,7 +228,6 @@ StatusCode PpmByteStreamReadV1V2Tool::processRobFragment_(
   }
 
   ATH_MSG_DEBUG("Treating crate " << rodCrate << " slink " << rodSlink);
-
   m_caloUserHeader = CaloUserHeader(*payload);
   if (!m_caloUserHeader.isValid()) {
     ATH_MSG_ERROR("Invalid or missing user header");
@@ -245,7 +253,7 @@ StatusCode PpmByteStreamReadV1V2Tool::processRobFragment_(
     } else if (SubBlockHeader::isSubBlockHeader(*payload)) {
       indata = 0;
       CHECK(processPpmBlock_());
-      
+
       m_ppLuts.clear();
       m_ppFadcs.clear();
       m_ppBlock.clear();
@@ -263,7 +271,7 @@ StatusCode PpmByteStreamReadV1V2Tool::processRobFragment_(
         );
         subBlock = blockType & 0xe;
       } else if (blockType == (subBlock | 1)) {
-        m_subBlockStatus = SubBlockStatus(*payload);
+        processSubBlockStatus_(m_subBlockHeader.crate(), m_subBlockHeader.module(), *payload);
         subBlock = 0;
       }
     } else {
@@ -283,14 +291,14 @@ StatusCode PpmByteStreamReadV1V2Tool::processRobFragment_(
 
 StatusCode PpmByteStreamReadV1V2Tool::processPpmWord_(uint32_t word,
     int indata) {
-  if ( (m_subBlockHeader.format() == 0) 
-      || (m_subBlockHeader.format() >= 2) 
+  if ( (m_subBlockHeader.format() == 0)
+      || (m_subBlockHeader.format() >= 2)
       || (m_verCode >= 0x41)) {
     m_ppBlock.push_back(word);
   } else if ((m_verCode == 0x21) || (m_verCode == 0x31)) {
     return processPpmStandardR3V1_(word, indata);
   } else {
-    ATH_MSG_ERROR("Unsupported PPM version:format (" 
+    ATH_MSG_ERROR("Unsupported PPM version:format ("
       << m_verCode << ":" << m_subBlockHeader.format()
       <<") combination");
     return StatusCode::FAILURE;
@@ -332,10 +340,10 @@ StatusCode PpmByteStreamReadV1V2Tool::processPpmBlock_() {
       CHECK(sc);
       return sc;
     }
-    ATH_MSG_ERROR("Unknown PPM subheader format '" 
-      << int(m_subBlockHeader.format()) 
+    ATH_MSG_ERROR("Unknown PPM subheader format '"
+      << int(m_subBlockHeader.format())
       << "' for rob version '"
-      << MSG::hex << int(m_verCode) 
+      << MSG::hex << int(m_verCode)
       << MSG::dec << "'" );
     return StatusCode::FAILURE;
   }
@@ -362,8 +370,8 @@ StatusCode PpmByteStreamReadV1V2Tool::processPpmNeutral_() {
 
       bool nonZeroData = false;
       for (uint8_t slice = 0; slice < numLut; ++slice) {
-        if (rotated[slice] 
-            || rotated[slice + numLut] 
+        if (rotated[slice]
+            || rotated[slice + numLut]
             || rotated[slice + 2 * numLut + numFadc]) { // CP, JET
           nonZeroData = true;
           break;
@@ -385,7 +393,7 @@ StatusCode PpmByteStreamReadV1V2Tool::processPpmNeutral_() {
           lcpVal.push_back(rotated[slice] & 0xff);
           ljeVal.push_back(rotated[slice + numLut] & 0xff);
           pedCor.push_back(::pedCorrection(rotated[slice + 2 * numLut + numFadc] & 0x3ff));
-          
+
           lcpBcidVec.push_back((rotated[slice] >> 8) & 0x7);
           ljeSat80Vec.push_back((rotated[slice + numLut] >> 8) & 0x7);
           pedEn.push_back((rotated[slice + 2 * numLut + numFadc] >> 10) & 0x1);
@@ -433,8 +441,8 @@ StatusCode PpmByteStreamReadV1V2Tool::processPpmCompressedR3V1_() {
     while (chan < 64) {
       uint8_t present = 1;
       if (m_subBlockHeader.format() == 3) {
-        present = getPpmBytestreamField_(1); 
-      } 
+        present = getPpmBytestreamField_(1);
+      }
 
       if (present == 1) {
         uint8_t lutVal = 0;
@@ -504,7 +512,7 @@ StatusCode PpmByteStreamReadV1V2Tool::processPpmCompressedR3V1_() {
   }catch (const std::out_of_range& ex) {
       ATH_MSG_WARNING("Excess Data in Sub-block");
       m_errorTool->rodError(m_rodSourceId, L1CaloSubBlock::UNPACK_EXCESS_DATA);
-  } 
+  }
   return StatusCode::SUCCESS;
 }
 
@@ -548,7 +556,7 @@ std::vector<uint16_t> PpmByteStreamReadV1V2Tool::getPpmAdcSamplesR3_(
 StatusCode PpmByteStreamReadV1V2Tool::processPpmStandardR3V1_(uint32_t word,
     int inData){
 
-  StatusCode sc;
+  StatusCode sc = StatusCode::SUCCESS;
   if (m_subBlockHeader.seqNum() == 63) { // Error block
     ATH_MSG_DEBUG("Error PPM subblock");
     //TODO: errorTool
@@ -559,7 +567,7 @@ StatusCode PpmByteStreamReadV1V2Tool::processPpmStandardR3V1_(uint32_t word,
     const uint8_t wordsPerBlock = 8; // 16 towers (4 MCMs) / 2 per word
     const uint8_t iBlk =  inData / wordsPerBlock;
     uint8_t iChan =  m_subBlockHeader.seqNum() + 2 * (inData % wordsPerBlock);
-    
+
     if (iBlk < numLut) { // First all LUT values
       for(uint8_t i = 0; i < 2; ++i) {
         uint16_t subword = (word >> 16 * i) & 0x7ff;
@@ -572,12 +580,12 @@ StatusCode PpmByteStreamReadV1V2Tool::processPpmStandardR3V1_(uint32_t word,
         m_ppFadcs[iChan].push_back(subword);
         iChan++;
       }
-    
+
     } else{
       ATH_MSG_WARNING("Error decoding Ppm word (run1)");
       sc = StatusCode::FAILURE;
     }
- 
+
   }
   return sc;
 }
@@ -587,7 +595,6 @@ StatusCode PpmByteStreamReadV1V2Tool::processPpmBlockR4V1_() {
     CHECK(processPpmStandardR4V1_());
     return StatusCode::SUCCESS;
   } else if (m_subBlockHeader.format() >= 2) {
-    // TODO: convert compressed
     CHECK(processPpmCompressedR4V1_());
     return StatusCode::SUCCESS;
   }
@@ -609,19 +616,19 @@ StatusCode PpmByteStreamReadV1V2Tool::processPpmCompressedR4V1_() {
   // }
 
   try{
-    for(uint8_t chan = 0; chan < 64; ++chan) {
+    for(uint8_t chan = 0; chan < s_channels; ++chan) {
       uint8_t present = 1;
 
       std::vector<uint8_t> haveLut(numLut, 0);
       std::vector<uint8_t> lcpVal(numLut, 0);
-      
+
       std::vector<uint8_t> lcpExt(numLut, 0);
       std::vector<uint8_t> lcpSat(numLut, 0);
       std::vector<uint8_t> lcpPeak(numLut, 0);
       std::vector<uint8_t> lcpBcidVec(numLut, 0);
-      
+
       std::vector<uint8_t> ljeVal(numLut, 0);
-      
+
       std::vector<uint8_t> ljeLow(numLut, 0);
       std::vector<uint8_t> ljeHigh(numLut, 0);
       std::vector<uint8_t> ljeRes(numLut, 0);
@@ -631,7 +638,7 @@ StatusCode PpmByteStreamReadV1V2Tool::processPpmCompressedR4V1_() {
       std::vector<uint8_t> adcExt(numAdc, 0);
       std::vector<int16_t> pedCor(numLut, 0);
       std::vector<uint8_t> pedEn(numLut, 0);
-  
+
       int8_t encoding = -1;
       int8_t minIndex = -1;
 
@@ -666,9 +673,9 @@ StatusCode PpmByteStreamReadV1V2Tool::processPpmCompressedR4V1_() {
                 ljeVal[i] = getPpmBytestreamField_(3);
               }
             }
-          }            
+          }
         } else if (encoding < 6) {
-          // Get LUT presence flag for each LUT slice. 
+          // Get LUT presence flag for each LUT slice.
           for(uint8_t i = 0; i < numLut; ++i){
             haveLut[i] = getPpmBytestreamField_(1);
           }
@@ -681,7 +688,7 @@ StatusCode PpmByteStreamReadV1V2Tool::processPpmCompressedR4V1_() {
               adcExt[i] = getPpmBytestreamField_(1);
             }
           }
-          
+
           for(uint8_t i = 0; i < numLut; ++i){
             if (haveLut[i] == 1) {
               lcpVal[i] = getPpmBytestreamField_(8);
@@ -690,7 +697,7 @@ StatusCode PpmByteStreamReadV1V2Tool::processPpmCompressedR4V1_() {
               lcpPeak[i] = getPpmBytestreamField_(1);
             }
           }
-          // Get JEP LUT values and corresponding bits.         
+          // Get JEP LUT values and corresponding bits.
           for(uint8_t i = 0; i < numLut; ++i){
             if (haveLut[i] == 1) {
               ljeVal[i] = getPpmBytestreamField_(8);
@@ -699,7 +706,7 @@ StatusCode PpmByteStreamReadV1V2Tool::processPpmCompressedR4V1_() {
               ljeRes[i] = getPpmBytestreamField_(1);
             }
           }
-  
+
         }
 
       }
@@ -728,7 +735,7 @@ StatusCode PpmByteStreamReadV1V2Tool::processPpmCompressedR4V1_() {
 
     for(uint8_t i=0; i < numLut; ++i){
       lcpBcidVec[i] = uint8_t((lcpPeak[i] << 2) | (lcpSat[i] << 1) | lcpExt[i]);
-      ljeSat80Vec[i] = uint8_t((ljeRes[i] << 2) | (ljeHigh[i] << 1) | ljeLow[i]); 
+      ljeSat80Vec[i] = uint8_t((ljeRes[i] << 2) | (ljeHigh[i] << 1) | ljeLow[i]);
     }
     CHECK(addTriggerTowerV2_(m_subBlockHeader.crate(), m_subBlockHeader.module(),
                              chan,
@@ -736,11 +743,12 @@ StatusCode PpmByteStreamReadV1V2Tool::processPpmCompressedR4V1_() {
                              std::move(ljeVal), std::move(ljeSat80Vec),
                              std::move(adcVal), std::move(adcExt),
                              std::move(pedCor), std::move(pedEn)));
-    }
+    } // for
   } catch (const std::out_of_range& ex) {
       ATH_MSG_WARNING("Excess Data in Sub-block");
       m_errorTool->rodError(m_rodSourceId, L1CaloSubBlock::UNPACK_EXCESS_DATA);
   }
+  //Check status workd
   return StatusCode::SUCCESS;
 
 }
@@ -751,7 +759,7 @@ void PpmByteStreamReadV1V2Tool::interpretPpmHeaderR4V1_(uint8_t numAdc,
 
   if (numAdc == 5) {
     minHeader = getPpmBytestreamField_(4);
-    //ATH_MSG_DEBUG("SASHA: minHeader=" << int(minHeader));
+
     minIndex = minHeader % 5;
     if (minHeader < 15){ // Encodings 0-5
       if (minHeader < 10) {
@@ -778,7 +786,7 @@ void PpmByteStreamReadV1V2Tool::interpretPpmHeaderR4V1_(uint8_t numAdc,
         uint8_t encValue = fieldSize - 1;
         if (minHeader == encValue) { // Encoding 6
           encoding = 6;
-          minIndex = 0; 
+          minIndex = 0;
         } else {
           minHeader += getPpmBytestreamField_(2) << numBits;
           minIndex = minHeader % fieldSize;
@@ -807,15 +815,15 @@ std::vector<uint16_t> PpmByteStreamReadV1V2Tool::getPpmAdcSamplesR4_(
     adc[minIndex] = minAdc;
     for(uint8_t i = 1; i < numAdc; ++i) {
       adc[i == minIndex? 0: i] = getPpmBytestreamField_(encoding + 2) + minAdc;
-    } 
-    return adc;   
+    }
+    return adc;
   } else {
     std::vector<uint16_t> adc(numAdc, 0);
     uint16_t minAdc = getPpmBytestreamField_(1)
                       ? getPpmBytestreamField_(encoding * 2)
-                      : (getPpmBytestreamField_(5) + 
+                      : (getPpmBytestreamField_(5) +
                           m_caloUserHeader.ppLowerBound());
- 
+
     adc[minIndex] = minAdc;
     for (uint8_t i = 1; i < numAdc; ++i) {
       adc[minIndex == i? 0: i] = getPpmBytestreamField_(
@@ -848,6 +856,7 @@ StatusCode PpmByteStreamReadV1V2Tool::processPpmStandardR4V1_() {
   m_ppMaxBit = 31 * m_ppBlock.size();
 
   for (uint8_t chan = 0; chan < 64; ++chan) {
+
     //for (uint8_t k = 0; k < 4; ++k) {
     std::vector<uint8_t> lcpVal;
     std::vector<uint8_t> lcpBcidVec;
@@ -900,7 +909,7 @@ StatusCode PpmByteStreamReadV1V2Tool::processPpmStandardR4V1_() {
 StatusCode PpmByteStreamReadV1V2Tool::processPpmStandardR3V1_() {
     for(auto lut : m_ppLuts) {
       CHECK(addTriggerTowerV1_(
-        m_subBlockHeader.crate(), 
+        m_subBlockHeader.crate(),
         m_subBlockHeader.module(),
         lut.first,
         lut.second,
@@ -909,6 +918,26 @@ StatusCode PpmByteStreamReadV1V2Tool::processPpmStandardR3V1_() {
     return StatusCode::SUCCESS;
 }
 
+void PpmByteStreamReadV1V2Tool::processSubBlockStatus_(uint8_t crate, uint8_t module, uint32_t payload){
+  LVL1::DataError errorBits(0);
+  errorBits.set(LVL1::DataError::SubStatusWord, payload);
+
+  const uint32_t error = errorBits.error();
+  int curr = m_triggerTowers->size() - 1;
+  for(int i=0; i < s_channels; ++i){
+    if (curr < 0){
+      break;
+    }
+    auto tt = (*m_triggerTowers)[curr--];
+    if (tt->coolId() >> 16 & crateModuleMask(crate, module)){
+      tt->setErrorWord(error);
+    }else{
+      break;
+    }
+  }
+}
+
+
 StatusCode PpmByteStreamReadV1V2Tool::addTriggerTowerV2_(
     uint8_t crate,
     uint8_t module,
@@ -922,52 +951,34 @@ StatusCode PpmByteStreamReadV1V2Tool::addTriggerTowerV2_(
     std::vector<int16_t>&& pedCor,
     std::vector<uint8_t>&& pedEn) {
 
+  uint32_t coolId = ::coolId(crate, module, channel);
+
   int layer = 0;
-  int error = 0;
   double eta = 0.;
   double phi = 0.;
-  
-  bool isNotSpare = m_ppmMaps->mapping(crate, module, channel, eta, phi, layer);
-  if (!isNotSpare && !m_ppmIsRetSpare && !m_ppmIsRetMuon){
+
+  bool isData = m_ppmMaps->mapping(crate, module, channel, eta, phi, layer);
+
+  if (!isData && !m_ppmIsRetSpare && !m_ppmIsRetMuon){
     return StatusCode::SUCCESS;
   }
 
-  if (!isNotSpare) {
+  if (!isData) {
     const int pin  = channel % 16;
     const int asic = channel / 16;
     eta = 16 * crate + module;
     phi = 4 * pin + asic;
   }
 
-  uint32_t coolId = ::coolId(crate, module, channel);
-  CHECK(m_coolIds.count(coolId) == 0);
-  m_coolIds.insert(coolId);
-
   xAOD::TriggerTower* tt = new xAOD::TriggerTower();
   m_triggerTowers->push_back(tt);
-  // tt->initialize(
-  //         const uint_least32_t& coolId,
-  //         const uint_least8_t& layer,
-  //         const float& eta,
-  //         const float& phi,
-  //         const std::vector<uint_least8_t>& lut_cp,
-  //         const std::vector<uint_least8_t>& lut_jep,
-  //         const std::vector<int_least16_t>& correction,
-  //         const std::vector<uint_least8_t>& correctionEnabled,
-  //         const std::vector<uint_least8_t>& bcidVec,
-  //         const std::vector<uint_least16_t>& adc,
-  //         const std::vector<uint_least8_t>& bcidExt,
-  //         const std::vector<uint_least8_t>& sat80, 
-  //         const uint_least16_t& error,
-  //         const uint_least8_t& peak,
-  //         const uint_least8_t& adcPeak
-  // );
+
   tt->initialize(coolId, eta, phi,
                  std::move(lcpVal), std::move(ljeVal),
                  std::move(pedCor), std::move(pedEn),
                  std::move(lcpBcidVec), std::move(adcVal),
                  std::move(adcExt), std::move(ljeSat80Vec),
-                 error, m_caloUserHeader.lut(),
+                 0, m_caloUserHeader.lut(),
       m_caloUserHeader.ppFadc());
   return StatusCode::SUCCESS;
 }
@@ -1033,7 +1044,7 @@ StatusCode PpmByteStreamReadV1V2Tool::addTriggerTowerV1_(
 
 const std::vector<uint32_t>& PpmByteStreamReadV1V2Tool::ppmSourceIDs(
   const std::string& sgKey) {
-  
+
   const int crates = 8;
   m_ppmIsRetMuon = false;
   m_ppmIsRetSpare =  false;
@@ -1043,7 +1054,7 @@ const std::vector<uint32_t>& PpmByteStreamReadV1V2Tool::ppmSourceIDs(
   } else if (sgKey.find("Spare") != std::string::npos) {
     m_ppmIsRetSpare = true;
   }
-  
+
   if (m_ppmSourceIDs.empty()) {
     for (int crate = 0; crate < crates; ++crate) {
       for (int slink = 0; slink < m_srcIdMap->maxSlinks(); ++slink) {
@@ -1092,12 +1103,6 @@ uint32_t PpmByteStreamReadV1V2Tool::getPpmBytestreamField_(const uint8_t numBits
       result = field1 | (field2 << nb1);
     }
 
-    // std::bitset<32> r(result);
-    // for(size_t i = 0; i < numBits; ++i) {
-    //   std::cout << int(r[i]);
-    // }
-    // std::cout << " " << result << std::endl;
-
     return result;
   }
 
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/PpmByteStreamReadV1V2Tool.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/PpmByteStreamReadV1V2Tool.h
index 1a4f26933fb31160ad0c9d96c0aea32406d7c610..7d97023455576423c8556a1866cd2f04a57688c6 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/PpmByteStreamReadV1V2Tool.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/PpmByteStreamReadV1V2Tool.h
@@ -11,6 +11,9 @@
 // ===========================================================================
 #include <stdint.h>
 #include <vector>
+#include <unordered_map>
+#include <unordered_set>
+
 
 // ===========================================================================
 // Athena:
@@ -138,6 +141,8 @@ private:
     std::vector<uint8_t>&& bcidExt
   );
 
+  void processSubBlockStatus_(uint8_t crate, uint8_t module, uint32_t word);
+
 private:
   ToolHandle<LVL1BS::L1CaloErrorByteStreamTool> m_errorTool;
   /// Channel mapping tool
@@ -148,7 +153,7 @@ private:
 private:
   CaloUserHeader m_caloUserHeader;
   SubBlockHeader m_subBlockHeader;
-  SubBlockStatus m_subBlockStatus;
+  // SubBlockStatus m_subBlockStatus;
 
   uint8_t m_subDetectorID;
   RequestType m_requestedType;
@@ -175,10 +180,16 @@ private:
   // For RUN1
   std::map<uint8_t, std::vector<uint16_t>> m_ppLuts;
   std::map<uint8_t, std::vector<uint16_t>> m_ppFadcs;
+  size_t m_maxSizeSeen;
 // ==========================================================================
 private:
   xAOD::TriggerTowerContainer* m_triggerTowers;
-  size_t m_maxSizeSeen;
+
+private:
+   static const uint8_t s_crates   = 8;
+   static const uint8_t s_modules  = 16;
+   static const uint8_t s_channels = 64;
+   static const uint16_t s_maxtowers = s_crates * s_modules * s_channels;
 };
 
 // ===========================================================================
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/SubBlockStatus.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/SubBlockStatus.h
index d19b867af5d02653dba84341acf89f09bc7e6e53..94aa16179621742f6d9d3051b0c8287969455bf9 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/SubBlockStatus.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/SubBlockStatus.h
@@ -31,6 +31,9 @@ public:
   uint8_t protocol() const;
   uint8_t parity() const;
   uint8_t bcLowBits() const;
+
+  bool isPresent() const { return m_status != 0; }
+
 };
 
 
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/test/TrigT1CaloByteStream_entries.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/test/TrigT1CaloByteStream_entries.cxx
index 9096a5979ed1467d6edb5e96d9af541abcfc31da..499e22108b3d4cb825af4a0d8fe57ecdb3869583 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/test/TrigT1CaloByteStream_entries.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/test/TrigT1CaloByteStream_entries.cxx
@@ -1,6 +1,3 @@
-/*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-*/
 #include "AthContainers/DataVector.h"
 
 // Post-LS1
diff --git a/Trigger/TrigT1/TrigT1CaloCalibConditions/TrigT1CaloCalibConditions/L1CaloDerivedRunPars.h b/Trigger/TrigT1/TrigT1CaloCalibConditions/TrigT1CaloCalibConditions/L1CaloDerivedRunPars.h
new file mode 100644
index 0000000000000000000000000000000000000000..d164dea9e88c0fd0253bfa7ffebf5aafdf760f69
--- /dev/null
+++ b/Trigger/TrigT1/TrigT1CaloCalibConditions/TrigT1CaloCalibConditions/L1CaloDerivedRunPars.h
@@ -0,0 +1,37 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+#ifndef TRIGT1CALOCALIBCONDITIONS_L1CALODERIVEDRUNPARS_H
+#define TRIGT1CALOCALIBCONDITIONS_L1CALODERIVEDRUNPARS_H
+
+#include <string>
+#include <iostream>
+
+/**
+ * Folder <-> Object mapping for /TRIGGER/L1Calo/V1/Conditions/DerivedRunPars .
+ * Automatically created using:
+ *
+ * ../python/CreateClassesForFolder.py --db frontier://ATLF/();schema=ATLAS_COOLONL_TRIGGER;dbname=CONDBR2 /TRIGGER/L1Calo/V1/Conditions/DerivedRunPars
+ */
+class L1CaloDerivedRunPars
+{
+  friend std::ostream& operator<<(std::ostream& output, const L1CaloDerivedRunPars& r);
+public:
+  L1CaloDerivedRunPars() {}
+  L1CaloDerivedRunPars(unsigned int channelId, const std::string& timingRegime, const std::string& tierZeroTag);
+
+  unsigned int channelId() const { return m_channelId; }
+  std::string timingRegime() const { return m_timingRegime; }
+  std::string tierZeroTag() const { return m_tierZeroTag; }
+
+  void setChannelId(unsigned int channelId) { m_channelId = channelId; }
+  void settimingRegime(const std::string& timingRegime) { m_timingRegime = timingRegime; }
+  void settierZeroTag(const std::string& tierZeroTag) { m_tierZeroTag = tierZeroTag; }
+
+private:
+  unsigned int m_channelId = 0;
+  std::string m_timingRegime = 0;
+  std::string m_tierZeroTag = 0;
+};
+
+#endif // TRIGT1CALOCALIBCONDITIONS_L1CALODERIVEDRUNPARS_H
diff --git a/Trigger/TrigT1/TrigT1CaloCalibConditions/TrigT1CaloCalibConditions/L1CaloDerivedRunParsContainer.h b/Trigger/TrigT1/TrigT1CaloCalibConditions/TrigT1CaloCalibConditions/L1CaloDerivedRunParsContainer.h
new file mode 100644
index 0000000000000000000000000000000000000000..7fe187481fce944960ccbe18f0ec0c2f97eaf35f
--- /dev/null
+++ b/Trigger/TrigT1/TrigT1CaloCalibConditions/TrigT1CaloCalibConditions/L1CaloDerivedRunParsContainer.h
@@ -0,0 +1,63 @@
+// -*- C++ -*-
+#ifndef TRIGT1CALOCALIBCONDITIONS_L1CALODERIVEDRUNPARSCONTAINER_H
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+#define TRIGT1CALOCALIBCONDITIONS_L1CALODERIVEDRUNPARSCONTAINER_H
+
+#include <map>
+#include <string>
+#include <vector>
+#include "AthenaKernel/CLASS_DEF.h"
+#include "GaudiKernel/DataObject.h"
+#include "TrigT1CaloCalibConditions/AbstractL1CaloPersistentCondition.h"
+#include "TrigT1CaloCalibConditions/L1CaloCoolChannelId.h"
+
+class CondAttrListCollection;
+class L1CaloDerivedRunPars;
+
+/***
+* Container of L1CaloDerivedRunPars objects. Automatically created using:
+*
+* ../python/CreateClassesForFolder.py --db frontier://ATLF/();schema=ATLAS_COOLONL_TRIGGER;dbname=CONDBR2 /TRIGGER/L1Calo/V1/Conditions/DerivedRunPars
+*/
+class L1CaloDerivedRunParsContainer : public DataObject, virtual public AbstractL1CaloPersistentCondition
+{
+private:
+  enum eAttrSpecification { etimingRegime, etierZeroTag };
+public:
+  L1CaloDerivedRunParsContainer();
+  L1CaloDerivedRunParsContainer(const std::string& folderKey);
+  virtual ~L1CaloDerivedRunParsContainer() {}
+
+  // interface of AbstractL1CaloPersistentCondition
+  using AbstractL1CaloPersistentCondition::makeTransient;
+  virtual void makeTransient(const std::map<std::string, CondAttrListCollection*>);
+  virtual DataObject* makePersistent() const;
+  virtual std::vector<std::string> coolInputKeys() const { return {m_coolFolderKey}; }
+  virtual std::string coolOutputKey() const { return m_coolFolderKey; }
+  virtual void clear() { m_derivedRunParss.clear(); }
+
+  // getters
+  const L1CaloDerivedRunPars* derivedRunPars(unsigned int channelId) const;
+  const L1CaloDerivedRunPars* derivedRunPars(const L1CaloCoolChannelId& channelId) const {
+    return derivedRunPars(channelId.id());
+  }
+
+  using const_iterator = std::vector<L1CaloDerivedRunPars>::const_iterator;
+  const_iterator begin() const { return m_derivedRunParss.begin(); }
+  const_iterator end() const { return m_derivedRunParss.end(); }
+
+  // setters
+  void addDerivedRunPars(const L1CaloDerivedRunPars& derivedRunPars);
+
+  void dump() const;
+
+private:
+  std::vector<L1CaloDerivedRunPars> m_derivedRunParss;
+  std::string m_coolFolderKey = "/TRIGGER/L1Calo/V1/Conditions/DerivedRunPars";
+};
+
+CLASS_DEF( L1CaloDerivedRunParsContainer, 1081812192, 1 )
+
+#endif // TRIGT1CALOCALIBCONDITIONS_L1CALODERIVEDRUNPARSCONTAINER_H
diff --git a/Trigger/TrigT1/TrigT1CaloCalibConditions/TrigT1CaloCalibConditions/L1CaloPprChanStrategy.h b/Trigger/TrigT1/TrigT1CaloCalibConditions/TrigT1CaloCalibConditions/L1CaloPprChanStrategy.h
new file mode 100644
index 0000000000000000000000000000000000000000..66fc2cb94d3897bd7347c4b3dc0df4a69f299b00
--- /dev/null
+++ b/Trigger/TrigT1/TrigT1CaloCalibConditions/TrigT1CaloCalibConditions/L1CaloPprChanStrategy.h
@@ -0,0 +1,43 @@
+// -*- C++ -*-
+#ifndef TRIGT1CALOCALIBCONDITIONS_L1CALOPPRCHANSTRATEGY_H
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+#define TRIGT1CALOCALIBCONDITIONS_L1CALOPPRCHANSTRATEGY_H
+
+#include <iostream>
+#include <string>
+/**
+ * Folder <-> Object mapping for /TRIGGER/L1Calo/V2/Configuration/PprChanStrategy .
+ * Automatically created using:
+ *
+ * ../athena/Trigger/TrigT1/TrigT1CaloCalibConditions/python/CreateClassesForFolder.py --db frontier://ATLF/();schema=ATLAS_COOLONL_TRIGGER;dbname=CONDBR2 /TRIGGER/L1Calo/V2/Configuration/PprChanStrategy
+ */
+class L1CaloPprChanStrategy
+{
+  friend std::ostream& operator<<(std::ostream& output, const L1CaloPprChanStrategy& r);
+public:
+  L1CaloPprChanStrategy() {}
+  L1CaloPprChanStrategy(unsigned int channelId, const std::string& strategy, unsigned int code, const std::string& timingRegime, const std::string& description);
+
+  unsigned int channelId() const { return m_channelId; }
+  std::string strategy() const { return m_strategy; }
+  unsigned int code() const { return m_code; }
+  std::string  timingRegime() const { return m_timingRegime; }
+  std::string  description() const { return m_description; }
+
+  void setChannelId(unsigned int channelId) { m_channelId = channelId; }
+  void setStrategy(const std::string&  strategy) { m_strategy = strategy; }
+  void setCode(unsigned int code) { m_code = code; }
+  void setTimingRegime(const std::string&  timingRegime) { m_timingRegime = timingRegime; }
+  void setDescription(const std::string& description) { m_description = description; }
+
+private:
+  unsigned int m_channelId = 0;
+  std::string  m_strategy = 0;
+  unsigned int m_code = 0;
+  std::string  m_timingRegime = 0;
+  std::string  m_description = 0;
+};
+
+#endif // TRIGT1CALOCALIBCONDITIONS_L1CALOPPRCHANSTRATEGY_H
diff --git a/Trigger/TrigT1/TrigT1CaloCalibConditions/TrigT1CaloCalibConditions/L1CaloPprChanStrategyContainer.h b/Trigger/TrigT1/TrigT1CaloCalibConditions/TrigT1CaloCalibConditions/L1CaloPprChanStrategyContainer.h
new file mode 100644
index 0000000000000000000000000000000000000000..7c6cb4dd67def6e9ce772fb259b6203257ea3aa7
--- /dev/null
+++ b/Trigger/TrigT1/TrigT1CaloCalibConditions/TrigT1CaloCalibConditions/L1CaloPprChanStrategyContainer.h
@@ -0,0 +1,63 @@
+// -*- C++ -*-
+#ifndef TRIGT1CALOCALIBCONDITIONS_L1CALOPPRCHANSTRATEGYCONTAINER_H
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+#define TRIGT1CALOCALIBCONDITIONS_L1CALOPPRCHANSTRATEGYCONTAINER_H
+
+#include <map>
+#include <string>
+#include <vector>
+#include "AthenaKernel/CLASS_DEF.h"
+#include "GaudiKernel/DataObject.h"
+#include "TrigT1CaloCalibConditions/AbstractL1CaloPersistentCondition.h"
+#include "TrigT1CaloCalibConditions/L1CaloCoolChannelId.h"
+
+class CondAttrListCollection;
+class L1CaloPprChanStrategy;
+
+/***
+* Container of L1CaloPprChanStrategy objects. Automatically created using:
+*
+* ../athena/Trigger/TrigT1/TrigT1CaloCalibConditions/python/CreateClassesForFolder.py --db frontier://ATLF/();schema=ATLAS_COOLONL_TRIGGER;dbname=CONDBR2 /TRIGGER/L1Calo/V2/Configuration/PprChanStrategy
+*/
+class L1CaloPprChanStrategyContainer : public DataObject, virtual public AbstractL1CaloPersistentCondition
+{
+private:
+  enum eAttrSpecification { eStrategy, eCode, eTimingRegime, eDescription };
+public:
+  L1CaloPprChanStrategyContainer();
+  L1CaloPprChanStrategyContainer(const std::string& folderKey);
+  virtual ~L1CaloPprChanStrategyContainer() {}
+
+  // interface of AbstractL1CaloPersistentCondition
+  using AbstractL1CaloPersistentCondition::makeTransient;
+  virtual void makeTransient(const std::map<std::string, CondAttrListCollection*>);
+  virtual DataObject* makePersistent() const;
+  virtual std::vector<std::string> coolInputKeys() const { return {m_coolFolderKey}; }
+  virtual std::string coolOutputKey() const { return m_coolFolderKey; }
+  virtual void clear() { m_pprChanStrategys.clear(); }
+
+  // getters
+  const L1CaloPprChanStrategy* pprChanStrategy(unsigned int channelId) const;
+  const L1CaloPprChanStrategy* pprChanStrategy(const L1CaloCoolChannelId& channelId) const {
+    return pprChanStrategy(channelId.id());
+  }
+
+  using const_iterator = std::vector<L1CaloPprChanStrategy>::const_iterator;
+  const_iterator begin() const { return m_pprChanStrategys.begin(); }
+  const_iterator end() const { return m_pprChanStrategys.end(); }
+
+  // setters
+  void addPprChanStrategy(const L1CaloPprChanStrategy& pprChanStrategy);
+
+  void dump() const;
+
+private:
+  std::vector<L1CaloPprChanStrategy> m_pprChanStrategys;
+  std::string m_coolFolderKey = "/TRIGGER/L1Calo/V2/Configuration/PprChanStrategy";
+};
+
+CLASS_DEF( L1CaloPprChanStrategyContainer, 1240855406, 1 )
+
+#endif // TRIGT1CALOCALIBCONDITIONS_L1CALOPPRCHANSTRATEGYCONTAINER_H
diff --git a/Trigger/TrigT1/TrigT1CaloCalibConditions/TrigT1CaloCalibConditions/L1CaloPprConditionsContainerRun2.h b/Trigger/TrigT1/TrigT1CaloCalibConditions/TrigT1CaloCalibConditions/L1CaloPprConditionsContainerRun2.h
index 392fd213b66fa0506832ee7e36097a6321fb05cf..377c3f40025ce16de4b973d2031922f6aa1880e7 100644
--- a/Trigger/TrigT1/TrigT1CaloCalibConditions/TrigT1CaloCalibConditions/L1CaloPprConditionsContainerRun2.h
+++ b/Trigger/TrigT1/TrigT1CaloCalibConditions/TrigT1CaloCalibConditions/L1CaloPprConditionsContainerRun2.h
@@ -41,7 +41,7 @@ private:
                             eLutJepStrategy, eLutJepOffset, eLutJepNoiseCut, eLutJepSlope, eLutJepPar1, eLutJepPar2, eLutJepPar3, eLutJepPar4, eLutJepScale};
 
 public:
-  enum eCoolFolders { ePprChanDefaults, ePprChanCalib };
+  enum eCoolFolders { ePprChanDefaults, ePprChanCalib, ePprChanCalibCommon, ePprChanCalibStrategy };
 
   L1CaloPprConditionsContainerRun2();
   L1CaloPprConditionsContainerRun2(const std::map<L1CaloPprConditionsContainerRun2::eCoolFolders, std::string>& folderKeysMap);
diff --git a/Trigger/TrigT1/TrigT1CaloCalibConditions/TrigT1CaloCalibConditions/L1CaloPprConditionsRun2.h b/Trigger/TrigT1/TrigT1CaloCalibConditions/TrigT1CaloCalibConditions/L1CaloPprConditionsRun2.h
index 96a5688bf9ea2a2260fd203f2c59b72a40ff97ae..0253a6e51b8c29a88dff2a320bf54e685dc68279 100644
--- a/Trigger/TrigT1/TrigT1CaloCalibConditions/TrigT1CaloCalibConditions/L1CaloPprConditionsRun2.h
+++ b/Trigger/TrigT1/TrigT1CaloCalibConditions/TrigT1CaloCalibConditions/L1CaloPprConditionsRun2.h
@@ -22,6 +22,7 @@ class L1CaloPprConditionsRun2
 public:
 
   L1CaloPprConditionsRun2() = default;
+
   L1CaloPprConditionsRun2(unsigned short extBcidThreshold,
                           unsigned short satBcidThreshLow,
                           unsigned short satBcidThreshHigh,
@@ -55,6 +56,12 @@ public:
                           unsigned int pedValue,
                           float pedMean,
                           unsigned int pedFirSum);
+
+  void initializeByStrategy(unsigned short firStartBit, short int firCoeff1,
+    short int firCoeff2, short int firCoeff3, short int firCoeff4,
+    short int firCoeff5, unsigned short lutCpSlope, unsigned short lutCpNoiseCut,
+    unsigned short lutJepSlope, unsigned short lutJepNoiseCut);
+
   virtual ~L1CaloPprConditionsRun2() {};
 
   // getters
@@ -88,6 +95,8 @@ public:
   float          pedMean()             const { return m_pedMean; }
   unsigned int   pedFirSum()           const { return m_pedFirSum; }
 
+
+
 private:
   friend std::ostream& operator<<(std::ostream& output, const L1CaloPprConditionsRun2& r);
 
diff --git a/Trigger/TrigT1/TrigT1CaloCalibConditions/TrigT1CaloCalibConditions/L1CaloReadoutConfig.h b/Trigger/TrigT1/TrigT1CaloCalibConditions/TrigT1CaloCalibConditions/L1CaloReadoutConfig.h
new file mode 100644
index 0000000000000000000000000000000000000000..6d33e538378f2891150461c69675cffc9b179bf7
--- /dev/null
+++ b/Trigger/TrigT1/TrigT1CaloCalibConditions/TrigT1CaloCalibConditions/L1CaloReadoutConfig.h
@@ -0,0 +1,176 @@
+// -*- C++ -*-
+#ifndef TRIGT1CALOCALIBCONDITIONS_L1CALOREADOUTCONFIG_H
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+#define TRIGT1CALOCALIBCONDITIONS_L1CALOREADOUTCONFIG_H
+
+#include <string>
+/**
+ * Folder <-> Object mapping for /TRIGGER/L1Calo/V2/Configuration/ReadoutConfig .
+ * Automatically created using:
+ *
+ * ../python/CreateClassesForFolder.py --db frontier://ATLF/();schema=ATLAS_COOLONL_TRIGGER;dbname=CONDBR2 /TRIGGER/L1Calo/V2/Configuration/ReadoutConfig
+ */
+class L1CaloReadoutConfig
+{
+public:
+  L1CaloReadoutConfig() {}
+  L1CaloReadoutConfig(unsigned int channelId, const std::string& description, unsigned int baselinePointer, unsigned int numFadcSlices, unsigned int l1aFadcSlice, unsigned int numLutSlices, unsigned int l1aLutSlice, unsigned int numProcSlices, unsigned int l1aProcSlice, unsigned int numTopoSlices, unsigned int l1aTopoSlice, unsigned int latencyPpmFadc, unsigned int latencyPpmLut, unsigned int latencyCpmInput, unsigned int latencyCpmHits, unsigned int latencyCpmRoi, unsigned int latencyJemInput, unsigned int latencyJemRoi, unsigned int latencyCpCmxBackplane, unsigned int latencyCpCmxLocal, unsigned int latencyCpCmxCable, unsigned int latencyCpCmxSystem, unsigned int latencyCpCmxInfo, unsigned int latencyJetCmxBackplane, unsigned int latencyJetCmxLocal, unsigned int latencyJetCmxCable, unsigned int latencyJetCmxSystem, unsigned int latencyJetCmxInfo, unsigned int latencyJetCmxRoi, unsigned int latencyEnergyCmxBackplane, unsigned int latencyEnergyCmxLocal, unsigned int latencyEnergyCmxCable, unsigned int latencyEnergyCmxSystem, unsigned int latencyEnergyCmxInfo, unsigned int latencyEnergyCmxRoi, unsigned int latencyTopo, unsigned int internalLatencyJemJet, unsigned int internalLatencyJemSum, unsigned int bcOffsetJemJet, unsigned int bcOffsetJemSum, int bcOffsetCmx, int bcOffsetTopo, const std::string& formatTypePpm, const std::string& formatTypeCpJep, const std::string& formatTypeTopo, unsigned int compressionThresholdPpm, unsigned int compressionThresholdCpJep, unsigned int compressionThresholdTopo, unsigned int compressionBaselinePpm, unsigned int readout80ModePpm);
+
+  unsigned int channelId() const { return m_channelId; }
+  std::string description() const { return m_description; }
+  unsigned int baselinePointer() const { return m_baselinePointer; }
+  unsigned int numFadcSlices() const { return m_numFadcSlices; }
+  unsigned int l1aFadcSlice() const { return m_l1aFadcSlice; }
+  unsigned int numLutSlices() const { return m_numLutSlices; }
+  unsigned int l1aLutSlice() const { return m_l1aLutSlice; }
+  unsigned int numProcSlices() const { return m_numProcSlices; }
+  unsigned int l1aProcSlice() const { return m_l1aProcSlice; }
+  unsigned int numTopoSlices() const { return m_numTopoSlices; }
+  unsigned int l1aTopoSlice() const { return m_l1aTopoSlice; }
+  unsigned int latencyPpmFadc() const { return m_latencyPpmFadc; }
+  unsigned int latencyPpmLut() const { return m_latencyPpmLut; }
+  unsigned int latencyCpmInput() const { return m_latencyCpmInput; }
+  unsigned int latencyCpmHits() const { return m_latencyCpmHits; }
+  unsigned int latencyCpmRoi() const { return m_latencyCpmRoi; }
+  unsigned int latencyJemInput() const { return m_latencyJemInput; }
+  unsigned int latencyJemRoi() const { return m_latencyJemRoi; }
+  unsigned int latencyCpCmxBackplane() const { return m_latencyCpCmxBackplane; }
+  unsigned int latencyCpCmxLocal() const { return m_latencyCpCmxLocal; }
+  unsigned int latencyCpCmxCable() const { return m_latencyCpCmxCable; }
+  unsigned int latencyCpCmxSystem() const { return m_latencyCpCmxSystem; }
+  unsigned int latencyCpCmxInfo() const { return m_latencyCpCmxInfo; }
+  unsigned int latencyJetCmxBackplane() const { return m_latencyJetCmxBackplane; }
+  unsigned int latencyJetCmxLocal() const { return m_latencyJetCmxLocal; }
+  unsigned int latencyJetCmxCable() const { return m_latencyJetCmxCable; }
+  unsigned int latencyJetCmxSystem() const { return m_latencyJetCmxSystem; }
+  unsigned int latencyJetCmxInfo() const { return m_latencyJetCmxInfo; }
+  unsigned int latencyJetCmxRoi() const { return m_latencyJetCmxRoi; }
+  unsigned int latencyEnergyCmxBackplane() const { return m_latencyEnergyCmxBackplane; }
+  unsigned int latencyEnergyCmxLocal() const { return m_latencyEnergyCmxLocal; }
+  unsigned int latencyEnergyCmxCable() const { return m_latencyEnergyCmxCable; }
+  unsigned int latencyEnergyCmxSystem() const { return m_latencyEnergyCmxSystem; }
+  unsigned int latencyEnergyCmxInfo() const { return m_latencyEnergyCmxInfo; }
+  unsigned int latencyEnergyCmxRoi() const { return m_latencyEnergyCmxRoi; }
+  unsigned int latencyTopo() const { return m_latencyTopo; }
+  unsigned int internalLatencyJemJet() const { return m_internalLatencyJemJet; }
+  unsigned int internalLatencyJemSum() const { return m_internalLatencyJemSum; }
+  unsigned int bcOffsetJemJet() const { return m_bcOffsetJemJet; }
+  unsigned int bcOffsetJemSum() const { return m_bcOffsetJemSum; }
+  int bcOffsetCmx() const { return m_bcOffsetCmx; }
+  int bcOffsetTopo() const { return m_bcOffsetTopo; }
+  std::string formatTypePpm() const { return m_formatTypePpm; }
+  std::string formatTypeCpJep() const { return m_formatTypeCpJep; }
+  std::string formatTypeTopo() const { return m_formatTypeTopo; }
+  unsigned int compressionThresholdPpm() const { return m_compressionThresholdPpm; }
+  unsigned int compressionThresholdCpJep() const { return m_compressionThresholdCpJep; }
+  unsigned int compressionThresholdTopo() const { return m_compressionThresholdTopo; }
+  unsigned int compressionBaselinePpm() const { return m_compressionBaselinePpm; }
+  unsigned int readout80ModePpm() const { return m_readout80ModePpm; }
+
+  void setChannelId(unsigned int channelId) { m_channelId = channelId; }
+  void setdescription(const std::string& description) { m_description = description; }
+  void setbaselinePointer(unsigned int baselinePointer) { m_baselinePointer = baselinePointer; }
+  void setnumFadcSlices(unsigned int numFadcSlices) { m_numFadcSlices = numFadcSlices; }
+  void setl1aFadcSlice(unsigned int l1aFadcSlice) { m_l1aFadcSlice = l1aFadcSlice; }
+  void setnumLutSlices(unsigned int numLutSlices) { m_numLutSlices = numLutSlices; }
+  void setl1aLutSlice(unsigned int l1aLutSlice) { m_l1aLutSlice = l1aLutSlice; }
+  void setnumProcSlices(unsigned int numProcSlices) { m_numProcSlices = numProcSlices; }
+  void setl1aProcSlice(unsigned int l1aProcSlice) { m_l1aProcSlice = l1aProcSlice; }
+  void setnumTopoSlices(unsigned int numTopoSlices) { m_numTopoSlices = numTopoSlices; }
+  void setl1aTopoSlice(unsigned int l1aTopoSlice) { m_l1aTopoSlice = l1aTopoSlice; }
+  void setlatencyPpmFadc(unsigned int latencyPpmFadc) { m_latencyPpmFadc = latencyPpmFadc; }
+  void setlatencyPpmLut(unsigned int latencyPpmLut) { m_latencyPpmLut = latencyPpmLut; }
+  void setlatencyCpmInput(unsigned int latencyCpmInput) { m_latencyCpmInput = latencyCpmInput; }
+  void setlatencyCpmHits(unsigned int latencyCpmHits) { m_latencyCpmHits = latencyCpmHits; }
+  void setlatencyCpmRoi(unsigned int latencyCpmRoi) { m_latencyCpmRoi = latencyCpmRoi; }
+  void setlatencyJemInput(unsigned int latencyJemInput) { m_latencyJemInput = latencyJemInput; }
+  void setlatencyJemRoi(unsigned int latencyJemRoi) { m_latencyJemRoi = latencyJemRoi; }
+  void setlatencyCpCmxBackplane(unsigned int latencyCpCmxBackplane) { m_latencyCpCmxBackplane = latencyCpCmxBackplane; }
+  void setlatencyCpCmxLocal(unsigned int latencyCpCmxLocal) { m_latencyCpCmxLocal = latencyCpCmxLocal; }
+  void setlatencyCpCmxCable(unsigned int latencyCpCmxCable) { m_latencyCpCmxCable = latencyCpCmxCable; }
+  void setlatencyCpCmxSystem(unsigned int latencyCpCmxSystem) { m_latencyCpCmxSystem = latencyCpCmxSystem; }
+  void setlatencyCpCmxInfo(unsigned int latencyCpCmxInfo) { m_latencyCpCmxInfo = latencyCpCmxInfo; }
+  void setlatencyJetCmxBackplane(unsigned int latencyJetCmxBackplane) { m_latencyJetCmxBackplane = latencyJetCmxBackplane; }
+  void setlatencyJetCmxLocal(unsigned int latencyJetCmxLocal) { m_latencyJetCmxLocal = latencyJetCmxLocal; }
+  void setlatencyJetCmxCable(unsigned int latencyJetCmxCable) { m_latencyJetCmxCable = latencyJetCmxCable; }
+  void setlatencyJetCmxSystem(unsigned int latencyJetCmxSystem) { m_latencyJetCmxSystem = latencyJetCmxSystem; }
+  void setlatencyJetCmxInfo(unsigned int latencyJetCmxInfo) { m_latencyJetCmxInfo = latencyJetCmxInfo; }
+  void setlatencyJetCmxRoi(unsigned int latencyJetCmxRoi) { m_latencyJetCmxRoi = latencyJetCmxRoi; }
+  void setlatencyEnergyCmxBackplane(unsigned int latencyEnergyCmxBackplane) { m_latencyEnergyCmxBackplane = latencyEnergyCmxBackplane; }
+  void setlatencyEnergyCmxLocal(unsigned int latencyEnergyCmxLocal) { m_latencyEnergyCmxLocal = latencyEnergyCmxLocal; }
+  void setlatencyEnergyCmxCable(unsigned int latencyEnergyCmxCable) { m_latencyEnergyCmxCable = latencyEnergyCmxCable; }
+  void setlatencyEnergyCmxSystem(unsigned int latencyEnergyCmxSystem) { m_latencyEnergyCmxSystem = latencyEnergyCmxSystem; }
+  void setlatencyEnergyCmxInfo(unsigned int latencyEnergyCmxInfo) { m_latencyEnergyCmxInfo = latencyEnergyCmxInfo; }
+  void setlatencyEnergyCmxRoi(unsigned int latencyEnergyCmxRoi) { m_latencyEnergyCmxRoi = latencyEnergyCmxRoi; }
+  void setlatencyTopo(unsigned int latencyTopo) { m_latencyTopo = latencyTopo; }
+  void setinternalLatencyJemJet(unsigned int internalLatencyJemJet) { m_internalLatencyJemJet = internalLatencyJemJet; }
+  void setinternalLatencyJemSum(unsigned int internalLatencyJemSum) { m_internalLatencyJemSum = internalLatencyJemSum; }
+  void setbcOffsetJemJet(unsigned int bcOffsetJemJet) { m_bcOffsetJemJet = bcOffsetJemJet; }
+  void setbcOffsetJemSum(unsigned int bcOffsetJemSum) { m_bcOffsetJemSum = bcOffsetJemSum; }
+  void setbcOffsetCmx(int bcOffsetCmx) { m_bcOffsetCmx = bcOffsetCmx; }
+  void setbcOffsetTopo(int bcOffsetTopo) { m_bcOffsetTopo = bcOffsetTopo; }
+  void setformatTypePpm(const std::string& formatTypePpm) { m_formatTypePpm = formatTypePpm; }
+  void setformatTypeCpJep(const std::string& formatTypeCpJep) { m_formatTypeCpJep = formatTypeCpJep; }
+  void setformatTypeTopo(const std::string& formatTypeTopo) { m_formatTypeTopo = formatTypeTopo; }
+  void setcompressionThresholdPpm(unsigned int compressionThresholdPpm) { m_compressionThresholdPpm = compressionThresholdPpm; }
+  void setcompressionThresholdCpJep(unsigned int compressionThresholdCpJep) { m_compressionThresholdCpJep = compressionThresholdCpJep; }
+  void setcompressionThresholdTopo(unsigned int compressionThresholdTopo) { m_compressionThresholdTopo = compressionThresholdTopo; }
+  void setcompressionBaselinePpm(unsigned int compressionBaselinePpm) { m_compressionBaselinePpm = compressionBaselinePpm; }
+  void setreadout80ModePpm(unsigned int readout80ModePpm) { m_readout80ModePpm = readout80ModePpm; }
+
+private:
+  unsigned int m_channelId = 0;
+  std::string m_description = 0;
+  unsigned int m_baselinePointer = 0;
+  unsigned int m_numFadcSlices = 0;
+  unsigned int m_l1aFadcSlice = 0;
+  unsigned int m_numLutSlices = 0;
+  unsigned int m_l1aLutSlice = 0;
+  unsigned int m_numProcSlices = 0;
+  unsigned int m_l1aProcSlice = 0;
+  unsigned int m_numTopoSlices = 0;
+  unsigned int m_l1aTopoSlice = 0;
+  unsigned int m_latencyPpmFadc = 0;
+  unsigned int m_latencyPpmLut = 0;
+  unsigned int m_latencyCpmInput = 0;
+  unsigned int m_latencyCpmHits = 0;
+  unsigned int m_latencyCpmRoi = 0;
+  unsigned int m_latencyJemInput = 0;
+  unsigned int m_latencyJemRoi = 0;
+  unsigned int m_latencyCpCmxBackplane = 0;
+  unsigned int m_latencyCpCmxLocal = 0;
+  unsigned int m_latencyCpCmxCable = 0;
+  unsigned int m_latencyCpCmxSystem = 0;
+  unsigned int m_latencyCpCmxInfo = 0;
+  unsigned int m_latencyJetCmxBackplane = 0;
+  unsigned int m_latencyJetCmxLocal = 0;
+  unsigned int m_latencyJetCmxCable = 0;
+  unsigned int m_latencyJetCmxSystem = 0;
+  unsigned int m_latencyJetCmxInfo = 0;
+  unsigned int m_latencyJetCmxRoi = 0;
+  unsigned int m_latencyEnergyCmxBackplane = 0;
+  unsigned int m_latencyEnergyCmxLocal = 0;
+  unsigned int m_latencyEnergyCmxCable = 0;
+  unsigned int m_latencyEnergyCmxSystem = 0;
+  unsigned int m_latencyEnergyCmxInfo = 0;
+  unsigned int m_latencyEnergyCmxRoi = 0;
+  unsigned int m_latencyTopo = 0;
+  unsigned int m_internalLatencyJemJet = 0;
+  unsigned int m_internalLatencyJemSum = 0;
+  unsigned int m_bcOffsetJemJet = 0;
+  unsigned int m_bcOffsetJemSum = 0;
+  int m_bcOffsetCmx = 0;
+  int m_bcOffsetTopo = 0;
+  std::string m_formatTypePpm = 0;
+  std::string m_formatTypeCpJep = 0;
+  std::string m_formatTypeTopo = 0;
+  unsigned int m_compressionThresholdPpm = 0;
+  unsigned int m_compressionThresholdCpJep = 0;
+  unsigned int m_compressionThresholdTopo = 0;
+  unsigned int m_compressionBaselinePpm = 0;
+  unsigned int m_readout80ModePpm = 0;
+};
+
+#endif // TRIGT1CALOCALIBCONDITIONS_L1CALOREADOUTCONFIG_H
diff --git a/Trigger/TrigT1/TrigT1CaloCalibConditions/TrigT1CaloCalibConditions/L1CaloReadoutConfigContainer.h b/Trigger/TrigT1/TrigT1CaloCalibConditions/TrigT1CaloCalibConditions/L1CaloReadoutConfigContainer.h
new file mode 100644
index 0000000000000000000000000000000000000000..9eaed682b996f066b514b28e9a4afb9a1cf1808e
--- /dev/null
+++ b/Trigger/TrigT1/TrigT1CaloCalibConditions/TrigT1CaloCalibConditions/L1CaloReadoutConfigContainer.h
@@ -0,0 +1,61 @@
+// -*- C++ -*-
+#ifndef TRIGT1CALOCALIBCONDITIONS_L1CALOREADOUTCONFIGCONTAINER_H
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+#define TRIGT1CALOCALIBCONDITIONS_L1CALOREADOUTCONFIGCONTAINER_H
+
+#include <map>
+#include <string>
+#include <vector>
+#include "AthenaKernel/CLASS_DEF.h"
+#include "GaudiKernel/DataObject.h"
+#include "TrigT1CaloCalibConditions/AbstractL1CaloPersistentCondition.h"
+#include "TrigT1CaloCalibConditions/L1CaloCoolChannelId.h"
+
+class CondAttrListCollection;
+class L1CaloReadoutConfig;
+
+/***
+* Container of L1CaloReadoutConfig objects. Automatically created using:
+*
+* ../python/CreateClassesForFolder.py --db frontier://ATLF/();schema=ATLAS_COOLONL_TRIGGER;dbname=CONDBR2 /TRIGGER/L1Calo/V2/Configuration/ReadoutConfig
+*/
+class L1CaloReadoutConfigContainer : public DataObject, virtual public AbstractL1CaloPersistentCondition
+{
+private:
+  enum eAttrSpecification { edescription, ebaselinePointer, enumFadcSlices, el1aFadcSlice, enumLutSlices, el1aLutSlice, enumProcSlices, el1aProcSlice, enumTopoSlices, el1aTopoSlice, elatencyPpmFadc, elatencyPpmLut, elatencyCpmInput, elatencyCpmHits, elatencyCpmRoi, elatencyJemInput, elatencyJemRoi, elatencyCpCmxBackplane, elatencyCpCmxLocal, elatencyCpCmxCable, elatencyCpCmxSystem, elatencyCpCmxInfo, elatencyJetCmxBackplane, elatencyJetCmxLocal, elatencyJetCmxCable, elatencyJetCmxSystem, elatencyJetCmxInfo, elatencyJetCmxRoi, elatencyEnergyCmxBackplane, elatencyEnergyCmxLocal, elatencyEnergyCmxCable, elatencyEnergyCmxSystem, elatencyEnergyCmxInfo, elatencyEnergyCmxRoi, elatencyTopo, einternalLatencyJemJet, einternalLatencyJemSum, ebcOffsetJemJet, ebcOffsetJemSum, ebcOffsetCmx, ebcOffsetTopo, eformatTypePpm, eformatTypeCpJep, eformatTypeTopo, ecompressionThresholdPpm, ecompressionThresholdCpJep, ecompressionThresholdTopo, ecompressionBaselinePpm, ereadout80ModePpm };
+public:
+  L1CaloReadoutConfigContainer();
+  L1CaloReadoutConfigContainer(const std::string& folderKey);
+  virtual ~L1CaloReadoutConfigContainer() {}
+
+  // interface of AbstractL1CaloPersistentCondition
+  using AbstractL1CaloPersistentCondition::makeTransient;
+  virtual void makeTransient(const std::map<std::string, CondAttrListCollection*>);
+  virtual DataObject* makePersistent() const;
+  virtual std::vector<std::string> coolInputKeys() const { return {m_coolFolderKey}; }
+  virtual std::string coolOutputKey() const { return m_coolFolderKey; }
+  virtual void clear() { m_readoutConfigs.clear(); }
+
+  // getters
+  const L1CaloReadoutConfig* readoutConfig(unsigned int channelId) const;
+  const L1CaloReadoutConfig* readoutConfig(const L1CaloCoolChannelId& channelId) const {
+    return readoutConfig(channelId.id());
+  }
+
+  using const_iterator = std::vector<L1CaloReadoutConfig>::const_iterator;
+  const_iterator begin() const { return m_readoutConfigs.begin(); }
+  const_iterator end() const { return m_readoutConfigs.end(); }
+
+  // setters
+  void addReadoutConfig(const L1CaloReadoutConfig& readoutConfig);
+
+private:
+  std::vector<L1CaloReadoutConfig> m_readoutConfigs;
+  std::string m_coolFolderKey = "/TRIGGER/L1Calo/V2/Configuration/ReadoutConfig";
+};
+
+CLASS_DEF( L1CaloReadoutConfigContainer, 1122647625, 1 )
+
+#endif // TRIGT1CALOCALIBCONDITIONS_L1CALOREADOUTCONFIGCONTAINER_H
diff --git a/Trigger/TrigT1/TrigT1CaloCalibConditions/TrigT1CaloCalibConditions/L1CaloRunParameters.h b/Trigger/TrigT1/TrigT1CaloCalibConditions/TrigT1CaloCalibConditions/L1CaloRunParameters.h
new file mode 100644
index 0000000000000000000000000000000000000000..fae55ace17423f16495e3b6c121331599274761f
--- /dev/null
+++ b/Trigger/TrigT1/TrigT1CaloCalibConditions/TrigT1CaloCalibConditions/L1CaloRunParameters.h
@@ -0,0 +1,62 @@
+// -*- C++ -*-
+#ifndef TRIGT1CALOCALIBCONDITIONS_L1CALORUNPARAMETERS_H
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+#define TRIGT1CALOCALIBCONDITIONS_L1CALORUNPARAMETERS_H
+
+#include <string>
+#include <iostream>
+
+/**
+ * Folder <-> Object mapping for /TRIGGER/L1Calo/V1/Conditions/RunParameters .
+ * Automatically created using:
+ *
+ * ./CreateClassesForFolder.py /TRIGGER/L1Calo/V1/Conditions/RunParameters
+ */
+class L1CaloRunParameters
+{
+  friend std::ostream& operator<<(std::ostream& output, const L1CaloRunParameters& r);
+public:
+  L1CaloRunParameters() {}
+  L1CaloRunParameters(unsigned int channelId, const std::string& runType, const std::string& runActionName, unsigned int runActionVersion, const std::string& readoutConfig, unsigned int readoutConfigID, const std::string& ttcConfiguration, unsigned int ttcConfigurationID, const std::string& triggerMenu, const std::string& calibration, const std::string& conditions);
+
+  unsigned int channelId() const { return m_channelId; }
+  std::string runType() const { return m_runType; }
+  std::string runActionName() const { return m_runActionName; }
+  unsigned int runActionVersion() const { return m_runActionVersion; }
+  std::string readoutConfig() const { return m_readoutConfig; }
+  unsigned int readoutConfigID() const { return m_readoutConfigID; }
+  std::string ttcConfiguration() const { return m_ttcConfiguration; }
+  unsigned int ttcConfigurationID() const { return m_ttcConfigurationID; }
+  std::string triggerMenu() const { return m_triggerMenu; }
+  std::string calibration() const { return m_calibration; }
+  std::string conditions() const { return m_conditions; }
+
+  void setChannelId(unsigned int channelId) { m_channelId = channelId; }
+  void setrunType(const std::string& runType) { m_runType = runType; }
+  void setrunActionName(const std::string& runActionName) { m_runActionName = runActionName; }
+  void setrunActionVersion(unsigned int runActionVersion) { m_runActionVersion = runActionVersion; }
+  void setreadoutConfig(const std::string& readoutConfig) { m_readoutConfig = readoutConfig; }
+  void setreadoutConfigID(unsigned int readoutConfigID) { m_readoutConfigID = readoutConfigID; }
+  void setttcConfiguration(const std::string& ttcConfiguration) { m_ttcConfiguration = ttcConfiguration; }
+  void setttcConfigurationID(unsigned int ttcConfigurationID) { m_ttcConfigurationID = ttcConfigurationID; }
+  void settriggerMenu(const std::string& triggerMenu) { m_triggerMenu = triggerMenu; }
+  void setcalibration(const std::string& calibration) { m_calibration = calibration; }
+  void setconditions(const std::string& conditions) { m_conditions = conditions; }
+
+private:
+  unsigned int m_channelId = 0;
+  std::string m_runType = 0;
+  std::string m_runActionName = 0;
+  unsigned int m_runActionVersion = 0;
+  std::string m_readoutConfig = 0;
+  unsigned int m_readoutConfigID = 0;
+  std::string m_ttcConfiguration = 0;
+  unsigned int m_ttcConfigurationID = 0;
+  std::string m_triggerMenu = 0;
+  std::string m_calibration = 0;
+  std::string m_conditions = 0;
+};
+
+#endif // TRIGT1CALOCALIBCONDITIONS_L1CALORUNPARAMETERS_H
diff --git a/Trigger/TrigT1/TrigT1CaloCalibConditions/TrigT1CaloCalibConditions/L1CaloRunParametersContainer.h b/Trigger/TrigT1/TrigT1CaloCalibConditions/TrigT1CaloCalibConditions/L1CaloRunParametersContainer.h
new file mode 100644
index 0000000000000000000000000000000000000000..4b287219f8e02afe7c3fb780769470b307bb5f27
--- /dev/null
+++ b/Trigger/TrigT1/TrigT1CaloCalibConditions/TrigT1CaloCalibConditions/L1CaloRunParametersContainer.h
@@ -0,0 +1,63 @@
+// -*- C++ -*-
+#ifndef TRIGT1CALOCALIBCONDITIONS_L1CALORUNPARAMETERSCONTAINER_H
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+#define TRIGT1CALOCALIBCONDITIONS_L1CALORUNPARAMETERSCONTAINER_H
+
+#include <map>
+#include <string>
+#include <vector>
+#include "AthenaKernel/CLASS_DEF.h"
+#include "GaudiKernel/DataObject.h"
+#include "TrigT1CaloCalibConditions/AbstractL1CaloPersistentCondition.h"
+#include "TrigT1CaloCalibConditions/L1CaloCoolChannelId.h"
+
+class CondAttrListCollection;
+class L1CaloRunParameters;
+
+/***
+* Container of L1CaloRunParameters objects. Automatically created using:
+*
+* ./CreateClassesForFolder.py /TRIGGER/L1Calo/V1/Conditions/RunParameters
+*/
+class L1CaloRunParametersContainer : public DataObject, virtual public AbstractL1CaloPersistentCondition
+{
+private:
+  enum eAttrSpecification { erunType, erunActionName, erunActionVersion, ereadoutConfig, ereadoutConfigID, ettcConfiguration, ettcConfigurationID, etriggerMenu, ecalibration, econditions };
+public:
+  L1CaloRunParametersContainer();
+  L1CaloRunParametersContainer(const std::string& folderKey);
+  virtual ~L1CaloRunParametersContainer() {}
+
+  // interface of AbstractL1CaloPersistentCondition
+  using AbstractL1CaloPersistentCondition::makeTransient;
+  virtual void makeTransient(const std::map<std::string, CondAttrListCollection*>);
+  virtual DataObject* makePersistent() const;
+  virtual std::vector<std::string> coolInputKeys() const { return {m_coolFolderKey}; }
+  virtual std::string coolOutputKey() const { return m_coolFolderKey; }
+  virtual void clear() { m_runParameterss.clear(); }
+
+  // getters
+  const L1CaloRunParameters* runParameters(unsigned int channelId) const;
+  const L1CaloRunParameters* runParameters(const L1CaloCoolChannelId& channelId) const {
+    return runParameters(channelId.id());
+  }
+
+  using const_iterator = std::vector<L1CaloRunParameters>::const_iterator;
+  const_iterator begin() const { return m_runParameterss.begin(); }
+  const_iterator end() const { return m_runParameterss.end(); }
+
+  // setters
+  void addRunParameters(const L1CaloRunParameters& runParameters);
+
+  void dump() const;
+  
+private:
+  std::vector<L1CaloRunParameters> m_runParameterss;
+  std::string m_coolFolderKey = "/TRIGGER/L1Calo/V1/Conditions/RunParameters";
+};
+
+CLASS_DEF( L1CaloRunParametersContainer, 1236303918, 1 )
+
+#endif // TRIGT1CALOCALIBCONDITIONS_L1CALORUNPARAMETERSCONTAINER_H
diff --git a/Trigger/TrigT1/TrigT1CaloCalibConditions/TrigT1CaloCalibConditions/TrigT1CaloCalibConditionsDict.h b/Trigger/TrigT1/TrigT1CaloCalibConditions/TrigT1CaloCalibConditions/TrigT1CaloCalibConditionsDict.h
index 6da4777b813da00c66348ba6ec746a5f102319a8..0e3d8f37e0e1805a764230ef060f75d13182e729 100755
--- a/Trigger/TrigT1/TrigT1CaloCalibConditions/TrigT1CaloCalibConditions/TrigT1CaloCalibConditionsDict.h
+++ b/Trigger/TrigT1/TrigT1CaloCalibConditions/TrigT1CaloCalibConditions/TrigT1CaloCalibConditionsDict.h
@@ -28,6 +28,18 @@
 #include "TrigT1CaloCalibConditions/L1CaloPpmDeadChannelsContainer.h"
 #include "TrigT1CaloCalibConditions/L1CaloDisabledTowers.h"
 #include "TrigT1CaloCalibConditions/L1CaloDisabledTowersContainer.h"
+#include "TrigT1CaloCalibConditions/L1CaloPprChanStrategyContainer.h"
+#include "TrigT1CaloCalibConditions/L1CaloPprChanStrategy.h"
+#include "TrigT1CaloCalibConditions/L1CaloDerivedRunParsContainer.h"
+#include "TrigT1CaloCalibConditions/L1CaloDerivedRunPars.h"
+#include "TrigT1CaloCalibConditions/L1CaloReadoutConfigContainer.h"
+#include "TrigT1CaloCalibConditions/L1CaloReadoutConfig.h"
+
+#include "TrigT1CaloCalibConditions/L1CaloRunParametersContainer.h"
+#include "TrigT1CaloCalibConditions/L1CaloRunParameters.h"
+
+
+
 
 struct TrigT1CaloCalibConditions_DUMMY_Instantiation {
   // we need to instantiate templated objects to get them into the dict
@@ -47,6 +59,11 @@ struct TrigT1CaloCalibConditions_DUMMY_Instantiation {
   L1CaloPprChanDefaultsContainer::const_iterator L1CaloPprChanDefaultsContainerCI;
   L1CaloPpmDeadChannelsContainer::const_iterator L1CaloPpmDeadChannelsContainerCI;
   L1CaloDisabledTowersContainer::const_iterator L1CaloDisabledTowersContainerCI;
+  L1CaloPprChanStrategyContainer::const_iterator L1CaloPprChanStrategyContainerConstInterator;
+  L1CaloDerivedRunParsContainer::const_iterator L1CaloDerivedRunParsContainerConstInterator;
+  L1CaloReadoutConfigContainer::const_iterator L1CaloReadoutConfigContainerConstInterator;
+  L1CaloRunParametersContainer::const_iterator L1CaloRunParametersContainerConstInterator;
+
 };
 
 #endif
diff --git a/Trigger/TrigT1/TrigT1CaloCalibConditions/TrigT1CaloCalibConditions/selection.xml b/Trigger/TrigT1/TrigT1CaloCalibConditions/TrigT1CaloCalibConditions/selection.xml
index e4a04f37c28b0dac1b21b2b01e6ecffb54c96f24..ca303690bf51230a3dd4743a5262d6444438b668 100755
--- a/Trigger/TrigT1/TrigT1CaloCalibConditions/TrigT1CaloCalibConditions/selection.xml
+++ b/Trigger/TrigT1/TrigT1CaloCalibConditions/TrigT1CaloCalibConditions/selection.xml
@@ -29,7 +29,7 @@
 	<class name="L1CaloPprConditionsContainer" id="CDC75AED-FE0B-41AD-957B-94CD6A75B4EF" />
 	<class name="L1CaloPprConditions" />
 	<class name="L1CaloPprConditionsContainerRun2" id="CDC75AED-FE0B-41AD-957B-94CD6A75B4EF" />
-<!--	<class name="L1CaloPprConditionsRun2" /> -->
+	<!--	<class name="L1CaloPprConditionsRun2" /> -->
 
 	<class name="ChanCalibErrorCode" />
 	<class name="ChanDeadErrorCode" />
@@ -61,4 +61,18 @@
 	<class name="L1CaloDisabledTowersContainer" id="C3641506-70A4-4F96-844C-6B7B74F8A48C" />
 	<class name="L1CaloDisabledTowersContainer::const_iterator" />
 	<class name="L1CaloDisabledTowers" />
-</lcgdict>
+
+	<class name="L1CaloPprChanStrategyContainer" id="E1ADA778-3F76-4774-BBE4-A384BF2E268D" />
+	<class name="L1CaloPprChanStrategyContainer::const_iterator" />
+	<class name="L1CaloPprChanStrategy" />
+
+	<class name="L1CaloDerivedRunParsContainer" id="F6852A0F-35C3-4FCF-B6C0-22CB27EA1857" />
+   	<class name="L1CaloDerivedRunParsContainer::const_iterator" />
+	<class name="L1CaloDerivedRunPars" />
+
+	<class name="L1CaloRunParametersContainer" id="C32C53CB-FDDC-44A0-9140-B0CCDD32AE6F" />
+	<class name="L1CaloRunParametersContainer::const_iterator" />
+	<class name="L1CaloRunParameters" />
+
+
+  </lcgdict>
diff --git a/Trigger/TrigT1/TrigT1CaloCalibConditions/python/CreateClassesForFolder.py b/Trigger/TrigT1/TrigT1CaloCalibConditions/python/CreateClassesForFolder.py
index a55dee0dd62982a5df25971db6f40aaa5ee5cea8..251d7f10565cbc3b3a013912fbea720a0b2cdf0e 100644
--- a/Trigger/TrigT1/TrigT1CaloCalibConditions/python/CreateClassesForFolder.py
+++ b/Trigger/TrigT1/TrigT1CaloCalibConditions/python/CreateClassesForFolder.py
@@ -225,7 +225,9 @@ def _mapToCpp(t):
         'Int16' : 'short',
         'Int32' : 'int',
         'Double': 'double',
-        'Blob64k': 'char*'}
+        'Blob64k': 'char*',
+        'String255': 'char*'
+        }
     return _m[t]
 
 def _toCamelCase(identifier):
diff --git a/Trigger/TrigT1/TrigT1CaloCalibConditions/share/L1CaloCalibConditionsRun2_jobOptions.py b/Trigger/TrigT1/TrigT1CaloCalibConditions/share/L1CaloCalibConditionsRun2_jobOptions.py
index 8e6009100d39b317f00b99fe7f19efc118df6df2..1ae1935c847849361cffbf2360df5fbf49af8598 100644
--- a/Trigger/TrigT1/TrigT1CaloCalibConditions/share/L1CaloCalibConditionsRun2_jobOptions.py
+++ b/Trigger/TrigT1/TrigT1CaloCalibConditions/share/L1CaloCalibConditionsRun2_jobOptions.py
@@ -4,8 +4,25 @@ include("TrigT1CaloCalibConditions/L1CaloCalibConditionsTier0Run2_jobOptions.py"
 
 from IOVDbSvc.CondDB import conddb
 L1CaloFolderList = []
+L1CaloFolderList += ["/TRIGGER/L1Calo/V2/Configuration/PprChanStrategy"]
 L1CaloFolderList += ["/TRIGGER/L1Calo/V1/Calibration/Physics/PprChanCalib"]
+
 L1CaloFolderList += ["/TRIGGER/L1Calo/V2/Calibration/Physics/PprChanCalib"]
+L1CaloFolderList += ["/TRIGGER/L1Calo/V2/Calibration/Physics/PprChanCommon"]
+L1CaloFolderList += ["/TRIGGER/L1Calo/V2/Calibration/Physics/PprChanLowMu"]
+L1CaloFolderList += ["/TRIGGER/L1Calo/V2/Calibration/Physics/PprChanHighMu"]
+
+L1CaloFolderList += ["/TRIGGER/L1Calo/V2/Calibration/Calib1/PprChanCalib"]
+L1CaloFolderList += ["/TRIGGER/L1Calo/V2/Calibration/Calib1/PprChanCommon"]
+L1CaloFolderList += ["/TRIGGER/L1Calo/V2/Calibration/Calib1/PprChanLowMu"]
+L1CaloFolderList += ["/TRIGGER/L1Calo/V2/Calibration/Calib1/PprChanHighMu"]
+
+L1CaloFolderList += ["/TRIGGER/L1Calo/V2/Calibration/Calib2/PprChanCalib"]
+L1CaloFolderList += ["/TRIGGER/L1Calo/V2/Calibration/Calib2/PprChanCommon"]
+L1CaloFolderList += ["/TRIGGER/L1Calo/V2/Calibration/Calib2/PprChanLowMu"]
+L1CaloFolderList += ["/TRIGGER/L1Calo/V2/Calibration/Calib2/PprChanHighMu"]
+
+
 L1CaloFolderList += ["/TRIGGER/L1Calo/V1/Conditions/RunParameters"]
 L1CaloFolderList += ["/TRIGGER/L1Calo/V1/Conditions/DerivedRunPars"]
 L1CaloFolderList += ["/TRIGGER/Receivers/Conditions/VgaDac"]
diff --git a/Trigger/TrigT1/TrigT1CaloCalibConditions/share/L1CaloCalibConditionsTier0Run2_jobOptions.py b/Trigger/TrigT1/TrigT1CaloCalibConditions/share/L1CaloCalibConditionsTier0Run2_jobOptions.py
index 9e24ea325898e742498dcad4be90ad1e6456d254..28b267d64e390f709a0600f88503d97b34316a4a 100644
--- a/Trigger/TrigT1/TrigT1CaloCalibConditions/share/L1CaloCalibConditionsTier0Run2_jobOptions.py
+++ b/Trigger/TrigT1/TrigT1CaloCalibConditions/share/L1CaloCalibConditionsTier0Run2_jobOptions.py
@@ -10,6 +10,7 @@ from IOVDbSvc.CondDB import conddb
 L1CaloFolderList = []
 L1CaloFolderList += ["/TRIGGER/L1Calo/V1/Calibration/PpmDeadChannels"]
 L1CaloFolderList += ["/TRIGGER/L1Calo/V1/Conditions/DisabledTowers"]
+L1CaloFolderList += ["/TRIGGER/L1Calo/V1/Conditions/RunParameters"]
 L1CaloFolderList += ["/TRIGGER/L1Calo/V1/Configuration/PprChanDefaults"]
 L1CaloFolderList += ["/TRIGGER/L1Calo/V2/Configuration/PprChanDefaults"]
 
diff --git a/Trigger/TrigT1/TrigT1CaloCalibConditions/src/L1CaloDerivedRunPars.cxx b/Trigger/TrigT1/TrigT1CaloCalibConditions/src/L1CaloDerivedRunPars.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..38da7013ed2a62a77e8eaf5e22fb20d6b98077ee
--- /dev/null
+++ b/Trigger/TrigT1/TrigT1CaloCalibConditions/src/L1CaloDerivedRunPars.cxx
@@ -0,0 +1,21 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+#include "TrigT1CaloCalibConditions/L1CaloDerivedRunPars.h"
+
+#include <iomanip>
+
+L1CaloDerivedRunPars::L1CaloDerivedRunPars(unsigned int channelId, const std::string& timingRegime, const std::string& tierZeroTag)
+ : m_channelId(channelId)
+ , m_timingRegime(timingRegime)
+ , m_tierZeroTag(tierZeroTag)
+{
+}
+
+std::ostream& operator<<(std::ostream& output, const L1CaloDerivedRunPars& r) {
+  output << "channelID: " << std::hex << r.channelId() << std::dec
+         << ", timingRegime: " << r.timingRegime() 
+         << ", tierZeroTag: " << r.tierZeroTag();
+
+  return output;
+}
diff --git a/Trigger/TrigT1/TrigT1CaloCalibConditions/src/L1CaloDerivedRunParsContainer.cxx b/Trigger/TrigT1/TrigT1CaloCalibConditions/src/L1CaloDerivedRunParsContainer.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..c1641fe96aee8b249447376f36d68dd25ff57826
--- /dev/null
+++ b/Trigger/TrigT1/TrigT1CaloCalibConditions/src/L1CaloDerivedRunParsContainer.cxx
@@ -0,0 +1,99 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+#include "TrigT1CaloCalibConditions/L1CaloDerivedRunParsContainer.h"
+
+#include <algorithm>
+#include <memory>
+
+#include "CxxUtils/make_unique.h"
+#include "CoralBase/AttributeListSpecification.h"
+#include "AthenaPoolUtilities/CondAttrListCollection.h"
+#include "AthenaPoolUtilities/AthenaAttributeList.h"
+
+#include "TrigT1CaloCalibConditions/L1CaloDerivedRunPars.h"
+
+L1CaloDerivedRunParsContainer::L1CaloDerivedRunParsContainer()
+  : AbstractL1CaloPersistentCondition("CondAttrListCollection") 
+{
+  this->addSpecification(etimingRegime, "timingRegime", "string");
+  this->addSpecification(etierZeroTag, "tierZeroTag", "string");
+}
+
+L1CaloDerivedRunParsContainer::L1CaloDerivedRunParsContainer(const std::string& folderKey)
+  : L1CaloDerivedRunParsContainer() // delegating constructor
+{
+  m_coolFolderKey = folderKey;
+}
+
+
+DataObject* L1CaloDerivedRunParsContainer::makePersistent() const
+{
+  using CxxUtils::make_unique;
+
+  if(m_coolFolderKey.empty()) return nullptr;
+
+  auto* attrSpecification = this->createAttributeListSpecification();
+  if(!attrSpecification || !attrSpecification->size()) return nullptr;
+
+  auto attrListCollection = make_unique<CondAttrListCollection>(true);
+  for(const auto& item : m_derivedRunParss) {
+    AthenaAttributeList attrList(*attrSpecification);
+    attrList[specificationName(etimingRegime)].setValue(item.timingRegime());
+    attrList[specificationName(etierZeroTag)].setValue(item.tierZeroTag());
+    
+    attrListCollection->add(item.channelId(), attrList);
+  }
+  return static_cast<DataObject*>(attrListCollection.release());
+}
+
+void L1CaloDerivedRunParsContainer::makeTransient(const std::map<std::string, CondAttrListCollection*> condAttrListCollectionMap)
+{
+  clear();
+
+  auto it = condAttrListCollectionMap.find(m_coolFolderKey);
+  if(it == std::end(condAttrListCollectionMap)) return;
+
+  auto attrListCollection = it->second;
+  for(const auto& item : *attrListCollection) {
+    auto chanNum = item.first;
+    const auto& attrList = item.second;
+    
+    auto timingRegime = attrList[specificationName(etimingRegime)].data<std::string>();
+    auto tierZeroTag = attrList[specificationName(etierZeroTag)].data<std::string>();
+
+    addDerivedRunPars(L1CaloDerivedRunPars(chanNum, timingRegime, tierZeroTag));
+  }
+}
+
+const L1CaloDerivedRunPars* L1CaloDerivedRunParsContainer::derivedRunPars(unsigned int channelId) const
+{
+  auto it = std::lower_bound(std::begin(m_derivedRunParss),
+                            std::end(m_derivedRunParss),
+                            channelId,
+                            [](const L1CaloDerivedRunPars& el, unsigned int val) -> bool {
+                              return el.channelId() < val;
+                            });
+  if(it == std::end(m_derivedRunParss)) return nullptr;
+  return &(*it);
+}
+
+void L1CaloDerivedRunParsContainer::addDerivedRunPars(const L1CaloDerivedRunPars& derivedRunPars)
+{
+  // insert into the correct position mainting the sorted vector
+  m_derivedRunParss.insert(std::lower_bound(std::begin(m_derivedRunParss),
+                                           std::end(m_derivedRunParss),
+                                           derivedRunPars.channelId(),
+                                           [](const L1CaloDerivedRunPars& el, unsigned int va) -> bool {
+                                             return el.channelId() < va;
+                                           }),
+                          derivedRunPars);
+}
+
+
+void L1CaloDerivedRunParsContainer::dump() const {
+  L1CaloDerivedRunParsContainer::const_iterator it = this->begin();
+  for(;it!=this->end();++it) {
+    std::cout << " * item: " << *it <<std::endl;
+  }
+}
\ No newline at end of file
diff --git a/Trigger/TrigT1/TrigT1CaloCalibConditions/src/L1CaloPpmDeadChannelsContainer.cxx b/Trigger/TrigT1/TrigT1CaloCalibConditions/src/L1CaloPpmDeadChannelsContainer.cxx
index 6a1c51fe8c3af3f75491299238006414fb473a91..d436ac0ebe52df70ff672f3006510c9285d1b7e5 100644
--- a/Trigger/TrigT1/TrigT1CaloCalibConditions/src/L1CaloPpmDeadChannelsContainer.cxx
+++ b/Trigger/TrigT1/TrigT1CaloCalibConditions/src/L1CaloPpmDeadChannelsContainer.cxx
@@ -55,7 +55,7 @@ void L1CaloPpmDeadChannelsContainer::makeTransient(const std::map<std::string, C
   // In the case of overlay, we need multiple instances of L1CaloPpmDeadChannelsContainer
   // Take the last element in the map  
   if (condAttrListCollectionMap.empty()) return;
-  auto it = condAttrListCollectionMap.rbegin();  
+  auto it = condAttrListCollectionMap.rbegin();
 
   auto attrListCollection = it->second;
   for(const auto& item : *attrListCollection) {
diff --git a/Trigger/TrigT1/TrigT1CaloCalibConditions/src/L1CaloPprChanCalibContainer.cxx b/Trigger/TrigT1/TrigT1CaloCalibConditions/src/L1CaloPprChanCalibContainer.cxx
index 0686187079819bfb090b78cf9b772243d6c50300..bacd529054f87a320114808a792d353dc2281dad 100644
--- a/Trigger/TrigT1/TrigT1CaloCalibConditions/src/L1CaloPprChanCalibContainer.cxx
+++ b/Trigger/TrigT1/TrigT1CaloCalibConditions/src/L1CaloPprChanCalibContainer.cxx
@@ -119,7 +119,7 @@ void L1CaloPprChanCalibContainer::makeTransient(const std::map<std::string, Cond
   // In the case of overlay, we need multiple instances of L1CaloPprChanCalibContainer
   // Take the last element in the map
   if (condAttrListCollectionMap.empty()) return;
-  auto it = condAttrListCollectionMap.rbegin();  
+  auto it = condAttrListCollectionMap.rbegin();
 
   auto attrListCollection = it->second;
 
diff --git a/Trigger/TrigT1/TrigT1CaloCalibConditions/src/L1CaloPprChanDefaultsContainer.cxx b/Trigger/TrigT1/TrigT1CaloCalibConditions/src/L1CaloPprChanDefaultsContainer.cxx
index dbffcdf70ffc9e8c7e6ca5968f8bc6158e20cf6d..4d4eee2d2529db986389f46161cb83d71f75cbe9 100644
--- a/Trigger/TrigT1/TrigT1CaloCalibConditions/src/L1CaloPprChanDefaultsContainer.cxx
+++ b/Trigger/TrigT1/TrigT1CaloCalibConditions/src/L1CaloPprChanDefaultsContainer.cxx
@@ -119,7 +119,7 @@ void L1CaloPprChanDefaultsContainer::makeTransient(const std::map<std::string, C
   // In the case of overlay, we need multiple instances of L1CaloPprChanDefaultsContainer
   // Take the last element in the map
   if (condAttrListCollectionMap.empty()) return;
-  auto it = condAttrListCollectionMap.rbegin();  
+  auto it = condAttrListCollectionMap.rbegin();
 
   auto attrListCollection = it->second;
   for(const auto& item : *attrListCollection) {
diff --git a/Trigger/TrigT1/TrigT1CaloCalibConditions/src/L1CaloPprChanStrategy.cxx b/Trigger/TrigT1/TrigT1CaloCalibConditions/src/L1CaloPprChanStrategy.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..57f3495305b8050ae5dc3d87403749be584639fd
--- /dev/null
+++ b/Trigger/TrigT1/TrigT1CaloCalibConditions/src/L1CaloPprChanStrategy.cxx
@@ -0,0 +1,28 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+#include "TrigT1CaloCalibConditions/L1CaloPprChanStrategy.h"
+
+#include <iostream>
+#include <iomanip>
+#include <string>
+
+L1CaloPprChanStrategy::L1CaloPprChanStrategy(unsigned int channelId,
+                                             const std::string& strategy,
+                                             unsigned int code,
+                                             const std::string& timingRegime,
+                                             const std::string& description)
+    : m_channelId(channelId),
+      m_strategy(strategy),
+      m_code(code),
+      m_timingRegime(timingRegime),
+      m_description(description) {}
+
+std::ostream& operator<<(std::ostream& output, const L1CaloPprChanStrategy& r) {
+  output << "channelID: " << std::hex << r.m_channelId << std::dec
+         << ", strategy: " << r.m_strategy << ", code: " << r.m_code
+         << ", m_timingRegime: " << r.m_timingRegime
+         << ", description: " << r.m_description;
+
+  return output;
+}
diff --git a/Trigger/TrigT1/TrigT1CaloCalibConditions/src/L1CaloPprChanStrategyContainer.cxx b/Trigger/TrigT1/TrigT1CaloCalibConditions/src/L1CaloPprChanStrategyContainer.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..149a1eb2fd5f7e9816ad8febd8e0e1644ead1952
--- /dev/null
+++ b/Trigger/TrigT1/TrigT1CaloCalibConditions/src/L1CaloPprChanStrategyContainer.cxx
@@ -0,0 +1,104 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+#include "TrigT1CaloCalibConditions/L1CaloPprChanStrategyContainer.h"
+
+#include <algorithm>
+#include <memory>
+
+#include "CxxUtils/make_unique.h"
+#include "CoralBase/AttributeListSpecification.h"
+#include "AthenaPoolUtilities/CondAttrListCollection.h"
+#include "AthenaPoolUtilities/AthenaAttributeList.h"
+
+#include "TrigT1CaloCalibConditions/L1CaloPprChanStrategy.h"
+
+L1CaloPprChanStrategyContainer::L1CaloPprChanStrategyContainer()
+  : AbstractL1CaloPersistentCondition("CondAttrListCollection") 
+{
+  this->addSpecification(eStrategy, "Strategy", "string");
+  this->addSpecification(eCode, "Code", "unsigned int");
+  this->addSpecification(eTimingRegime, "TimingRegime", "string");
+  this->addSpecification(eDescription, "Description", "string");
+}
+
+L1CaloPprChanStrategyContainer::L1CaloPprChanStrategyContainer(const std::string& folderKey)
+  : L1CaloPprChanStrategyContainer() // delegating constructor
+{
+  m_coolFolderKey = folderKey;
+}
+
+
+DataObject* L1CaloPprChanStrategyContainer::makePersistent() const
+{
+  using CxxUtils::make_unique;
+
+  if(m_coolFolderKey.empty()) return nullptr;
+
+  auto* attrSpecification = this->createAttributeListSpecification();
+  if(!attrSpecification || !attrSpecification->size()) return nullptr;
+
+  auto attrListCollection = make_unique<CondAttrListCollection>(true);
+  for(const auto& item : m_pprChanStrategys) {
+    AthenaAttributeList attrList(*attrSpecification);
+    attrList[specificationName(eStrategy)].setValue(item.strategy());
+    attrList[specificationName(eCode)].setValue(item.code());
+    attrList[specificationName(eTimingRegime)].setValue(item.timingRegime());
+    attrList[specificationName(eDescription)].setValue(item.description());
+    
+    attrListCollection->add(item.channelId(), attrList);
+  }
+  return static_cast<DataObject*>(attrListCollection.release());
+}
+
+void L1CaloPprChanStrategyContainer::makeTransient(const std::map<std::string, CondAttrListCollection*> condAttrListCollectionMap)
+{
+  clear();
+
+  auto it = condAttrListCollectionMap.find(m_coolFolderKey);
+  if(it == std::end(condAttrListCollectionMap)) return;
+
+  auto attrListCollection = it->second;
+  for(const auto& item : *attrListCollection) {
+    auto chanNum = item.first;
+    const auto& attrList = item.second;
+    
+    auto strategy = attrList[specificationName(eStrategy)].data<std::string>();
+    auto code = attrList[specificationName(eCode)].data<unsigned int>();
+    auto timingRegime = attrList[specificationName(eTimingRegime)].data<std::string>();
+    auto description = attrList[specificationName(eDescription)].data<std::string>();
+
+    addPprChanStrategy(L1CaloPprChanStrategy(chanNum, strategy, code, timingRegime, description));
+  }
+}
+
+const L1CaloPprChanStrategy* L1CaloPprChanStrategyContainer::pprChanStrategy(unsigned int channelId) const
+{
+  auto it = std::lower_bound(std::begin(m_pprChanStrategys),
+                            std::end(m_pprChanStrategys),
+                            channelId,
+                            [](const L1CaloPprChanStrategy& el, unsigned int val) -> bool {
+                              return el.channelId() < val;
+                            });
+  if(it == std::end(m_pprChanStrategys)) return nullptr;
+  return &(*it);
+}
+
+void L1CaloPprChanStrategyContainer::addPprChanStrategy(const L1CaloPprChanStrategy& pprChanStrategy)
+{
+  // insert into the correct position mainting the sorted vector
+  m_pprChanStrategys.insert(std::lower_bound(std::begin(m_pprChanStrategys),
+                                           std::end(m_pprChanStrategys),
+                                           pprChanStrategy.channelId(),
+                                           [](const L1CaloPprChanStrategy& el, unsigned int va) -> bool {
+                                             return el.channelId() < va;
+                                           }),
+                          pprChanStrategy);
+}
+
+void L1CaloPprChanStrategyContainer::dump() const {
+  L1CaloPprChanStrategyContainer::const_iterator it = this->begin();
+  for(;it!=this->end();++it) {
+    std::cout << " * item: " << *it <<std::endl;
+  }
+}
diff --git a/Trigger/TrigT1/TrigT1CaloCalibConditions/src/L1CaloPprConditionsContainerRun2.cxx b/Trigger/TrigT1/TrigT1CaloCalibConditions/src/L1CaloPprConditionsContainerRun2.cxx
index 207b352c6a8c99f37fb3c9bb00709c4286f1ce0b..4f2dab89e4030a962342a6fdebd9ebd9a6b3d13e 100644
--- a/Trigger/TrigT1/TrigT1CaloCalibConditions/src/L1CaloPprConditionsContainerRun2.cxx
+++ b/Trigger/TrigT1/TrigT1CaloCalibConditions/src/L1CaloPprConditionsContainerRun2.cxx
@@ -16,85 +16,156 @@
 const unsigned int L1CaloPprConditionsContainerRun2::s_vectorSize;
 
 L1CaloPprConditionsContainerRun2::L1CaloPprConditionsContainerRun2()
-  : AbstractL1CaloPersistentCondition("CondAttrListCollection")
-  , m_coolFoldersKeysMap({{L1CaloPprConditionsContainerRun2::ePprChanCalib, "/TRIGGER/L1Calo/V2/Calibration/Physics/PprChanCalib"},
-        {L1CaloPprConditionsContainerRun2::ePprChanDefaults, "/TRIGGER/L1Calo/V2/Configuration/PprChanDefaults"}})
-{
-  // Define DB rows names and types in order to construct the AttributeListSpecification object
-  this->addSpecification(eExtBcidThreshold,    std::string("ExtBcidThreshold"),     std::string("UInt16"));
-  this->addSpecification(eSatBcidThreshLow,    std::string("SatBcidThreshLow"),     std::string("UInt16"));
-  this->addSpecification(eSatBcidThreshHigh,   std::string("SatBcidThreshHigh"),    std::string("UInt16"));
-  this->addSpecification(eSatBcidLevel,        std::string("SatBcidLevel"),         std::string("UInt16"));
-  this->addSpecification(eBcidEnergyRangeLow,  std::string("BcidEnergyRangeLow"),   std::string("UInt16"));
-  this->addSpecification(eBcidEnergyRangeHigh, std::string("BcidEnergyRangeHigh"),  std::string("UInt16"));
-  this->addSpecification(eFirStartBit,         std::string("FirStartBit"),          std::string("UInt16"));
-
-  this->addSpecification(eBcidDecision1,       std::string("CR12_BcidDecision1"),   std::string("Int32"));
-  this->addSpecification(eSatOverride1,        std::string("CR12_SatOverride1"),    std::string("Int32"));
-  this->addSpecification(eBcidDecision2,       std::string("CR13_BcidDecision2"),   std::string("Int32"));
-  this->addSpecification(eSatOverride2,        std::string("CR13_SatOverride2"),    std::string("Int32"));
-  this->addSpecification(eBcidDecision3,       std::string("CR14_BcidDecision3"),   std::string("Int32"));
-  this->addSpecification(eSatOverride3,        std::string("CR14_SatOverride3"),    std::string("Int32"));
-  this->addSpecification(ePeakFinderCond,      std::string("CR15_PeakFinderCond"),  std::string("Int32"));
-  this->addSpecification(eDecisionSource,      std::string("CR15_DecisionSource"),  std::string("Int32"));
-
-  this->addSpecification(eFirCoeff1, std::string("FirCoeff1"), std::string("short"));
-  this->addSpecification(eFirCoeff2, std::string("FirCoeff2"), std::string("short"));
-  this->addSpecification(eFirCoeff3, std::string("FirCoeff3"), std::string("short"));
-  this->addSpecification(eFirCoeff4, std::string("FirCoeff4"), std::string("short"));
-  this->addSpecification(eFirCoeff5, std::string("FirCoeff5"), std::string("short"));
-
-  this->addSpecification(ePedValue,       std::string("PedValue"),      std::string("UInt32"));
-  this->addSpecification(ePedMean,        std::string("PedMean"),       std::string("Double"));
-  this->addSpecification(ePedFirSum,      std::string("PedFirSum"),     std::string("UInt32"));
-
-  this->addSpecification(eLutCpStrategy,    std::string("LutCpStrategy"),   std::string("UInt16"));
-  this->addSpecification(eLutCpOffset,      std::string("LutCpOffset"),     std::string("UInt16"));
-  this->addSpecification(eLutCpSlope,       std::string("LutCpSlope"),      std::string("UInt16"));
-  this->addSpecification(eLutCpNoiseCut,    std::string("LutCpNoiseCut"),   std::string("UInt16"));
-  this->addSpecification(eLutCpScale,       std::string("LutCpScale"),      std::string("UInt16"));
-  this->addSpecification(eLutCpPar1,        std::string("LutCpPar1"),       std::string("UInt16"));
-  this->addSpecification(eLutCpPar2,        std::string("LutCpPar2"),       std::string("UInt16"));
-  this->addSpecification(eLutCpPar3,        std::string("LutCpPar3"),       std::string("UInt16"));
-  this->addSpecification(eLutCpPar4,        std::string("LutCpPar4"),       std::string("UInt16"));
-
-  this->addSpecification(eLutJepStrategy,    std::string("LutJepStrategy"),   std::string("UInt16"));
-  this->addSpecification(eLutJepOffset,      std::string("LutJepOffset"),     std::string("UInt16"));
-  this->addSpecification(eLutJepSlope,       std::string("LutJepSlope"),      std::string("UInt16"));
-  this->addSpecification(eLutJepNoiseCut,    std::string("LutJepNoiseCut"),   std::string("UInt16"));
-  this->addSpecification(eLutJepScale,       std::string("LutJepScale"),      std::string("UInt16"));
-  this->addSpecification(eLutJepPar1,        std::string("LutJepPar1"),       std::string("UInt16"));
-  this->addSpecification(eLutJepPar2,        std::string("LutJepPar2"),       std::string("UInt16"));
-  this->addSpecification(eLutJepPar3,        std::string("LutJepPar3"),       std::string("UInt16"));
-  this->addSpecification(eLutJepPar4,        std::string("LutJepPar4"),       std::string("UInt16"));
+    : AbstractL1CaloPersistentCondition("CondAttrListCollection"),
+      m_coolFoldersKeysMap(
+          {{L1CaloPprConditionsContainerRun2::ePprChanCalib,
+            "/TRIGGER/L1Calo/V2/Calibration/Physics/PprChanCalib"},
+           {L1CaloPprConditionsContainerRun2::ePprChanDefaults,
+            "/TRIGGER/L1Calo/V2/Configuration/PprChanDefaults"}}) {
+  this->addSpecification(eBcidDecision1, std::string("CR12_BcidDecision1"),
+                         std::string("Int32"));
+  this->addSpecification(eSatOverride1, std::string("CR12_SatOverride1"),
+                         std::string("Int32"));
+  this->addSpecification(eBcidDecision2, std::string("CR13_BcidDecision2"),
+                         std::string("Int32"));
+  this->addSpecification(eSatOverride2, std::string("CR13_SatOverride2"),
+                         std::string("Int32"));
+  this->addSpecification(eBcidDecision3, std::string("CR14_BcidDecision3"),
+                         std::string("Int32"));
+  this->addSpecification(eSatOverride3, std::string("CR14_SatOverride3"),
+                         std::string("Int32"));
+  this->addSpecification(ePeakFinderCond, std::string("CR15_PeakFinderCond"),
+                         std::string("Int32"));
+  this->addSpecification(eDecisionSource, std::string("CR15_DecisionSource"),
+                         std::string("Int32"));
+
+  // ------------------------------------------------------------------------------------------------------------------
+  // Common
+  // ------------------------------------------------------------------------------------------------------------------
+  // Define DB rows names and types in order to construct the
+  // AttributeListSpecification object
+  this->addSpecification(eExtBcidThreshold, std::string("ExtBcidThreshold"),
+                         std::string("UInt16"));
+  this->addSpecification(eSatBcidThreshLow, std::string("SatBcidThreshLow"),
+                         std::string("UInt16"));
+  this->addSpecification(eSatBcidThreshHigh, std::string("SatBcidThreshHigh"),
+                         std::string("UInt16"));
+  this->addSpecification(eSatBcidLevel, std::string("SatBcidLevel"),
+                         std::string("UInt16"));
+  this->addSpecification(eBcidEnergyRangeLow, std::string("BcidEnergyRangeLow"),
+                         std::string("UInt16"));
+  this->addSpecification(eBcidEnergyRangeHigh,
+                         std::string("BcidEnergyRangeHigh"),
+                         std::string("UInt16"));
+
+  this->addSpecification(ePedValue, std::string("PedValue"),
+                         std::string("UInt32"));
+  this->addSpecification(ePedMean, std::string("PedMean"),
+                         std::string("Double"));
+
+  this->addSpecification(eLutCpStrategy, std::string("LutCpStrategy"),
+                         std::string("UInt16"));
+
+  this->addSpecification(eLutCpScale, std::string("LutCpScale"),
+                         std::string("UInt16"));
+  this->addSpecification(eLutCpPar1, std::string("LutCpPar1"),
+                         std::string("UInt16"));
+  this->addSpecification(eLutCpPar2, std::string("LutCpPar2"),
+                         std::string("UInt16"));
+  this->addSpecification(eLutCpPar3, std::string("LutCpPar3"),
+                         std::string("UInt16"));
+  this->addSpecification(eLutCpPar4, std::string("LutCpPar4"),
+                         std::string("UInt16"));
+
+  this->addSpecification(eLutJepStrategy, std::string("LutJepStrategy"),
+                         std::string("UInt16"));
+
+  this->addSpecification(eLutJepScale, std::string("LutJepScale"),
+                         std::string("UInt16"));
+  this->addSpecification(eLutJepPar1, std::string("LutJepPar1"),
+                         std::string("UInt16"));
+  this->addSpecification(eLutJepPar2, std::string("LutJepPar2"),
+                         std::string("UInt16"));
+  this->addSpecification(eLutJepPar3, std::string("LutJepPar3"),
+                         std::string("UInt16"));
+  this->addSpecification(eLutJepPar4, std::string("LutJepPar4"),
+                         std::string("UInt16"));
+
+  // Missing attributes in model with strategy
+  this->addSpecification(ePedFirSum, std::string("PedFirSum"),
+                         std::string("UInt32"));
+  this->addSpecification(eLutCpOffset, std::string("LutCpOffset"),
+                         std::string("UInt16"));
+  this->addSpecification(eLutJepOffset, std::string("LutJepOffset"),
+                         std::string("UInt16"));
+  // ------------------------------------------------------------------------------------------------------------------
+  // Strategy
+  // ------------------------------------------------------------------------------------------------------------------
+  this->addSpecification(eFirStartBit, std::string("FirStartBit"),
+                         std::string("UInt16"));
+  this->addSpecification(eFirCoeff1, std::string("FirCoeff1"),
+                         std::string("short"));
+  this->addSpecification(eFirCoeff2, std::string("FirCoeff2"),
+                         std::string("short"));
+  this->addSpecification(eFirCoeff3, std::string("FirCoeff3"),
+                         std::string("short"));
+  this->addSpecification(eFirCoeff4, std::string("FirCoeff4"),
+                         std::string("short"));
+  this->addSpecification(eFirCoeff5, std::string("FirCoeff5"),
+                         std::string("short"));
+  this->addSpecification(eLutCpNoiseCut, std::string("LutCpNoiseCut"),
+                         std::string("UInt16"));
+  this->addSpecification(eLutCpSlope, std::string("LutCpSlope"),
+                         std::string("UInt16"));
+  this->addSpecification(eLutJepNoiseCut, std::string("LutJepNoiseCut"),
+                         std::string("UInt16"));
+  this->addSpecification(eLutJepSlope, std::string("LutJepSlope"),
+                         std::string("UInt16"));
+  // ------------------------------------------------------------------------------------------------------------------
 
   m_pprConditionsVec.reserve(s_vectorSize);
   this->clear();
 }
 
-L1CaloPprConditionsContainerRun2::L1CaloPprConditionsContainerRun2(const std::map<L1CaloPprConditionsContainerRun2::eCoolFolders, std::string>& folderKeysMap)
-  : L1CaloPprConditionsContainerRun2() // delegating constructor
+L1CaloPprConditionsContainerRun2::L1CaloPprConditionsContainerRun2(
+    const std::map<L1CaloPprConditionsContainerRun2::eCoolFolders, std::string>&
+        folderKeysMap)
+    : L1CaloPprConditionsContainerRun2()  // delegating constructor
 {
   m_coolFoldersKeysMap = folderKeysMap;
 }
 
-L1CaloPprConditionsContainerRun2::~L1CaloPprConditionsContainerRun2()
-{
+L1CaloPprConditionsContainerRun2::~L1CaloPprConditionsContainerRun2() {
   this->clear();
 }
 
-std::string L1CaloPprConditionsContainerRun2::coolFolderKey(L1CaloPprConditionsContainerRun2::eCoolFolders efolder) const {
-
+std::string L1CaloPprConditionsContainerRun2::coolFolderKey(
+    L1CaloPprConditionsContainerRun2::eCoolFolders efolder) const {
   auto it = m_coolFoldersKeysMap.find(efolder);
-  if(it != m_coolFoldersKeysMap.end()) {
+  if (it != m_coolFoldersKeysMap.end()) {
     return it->second;
   } else {
     return std::string("");
   }
 }
 
-std::vector<std::string> L1CaloPprConditionsContainerRun2::coolInputKeys() const {
-  return {this->coolFolderKey(L1CaloPprConditionsContainerRun2::ePprChanCalib), this->coolFolderKey(L1CaloPprConditionsContainerRun2::ePprChanDefaults)};
+std::vector<std::string> L1CaloPprConditionsContainerRun2::coolInputKeys()
+    const {
+  std::vector<std::string> result{
+      this->coolFolderKey(L1CaloPprConditionsContainerRun2::ePprChanDefaults)};
+  std::string calibKey =
+      this->coolFolderKey(L1CaloPprConditionsContainerRun2::ePprChanCalib);
+
+  if (!calibKey.empty()) {
+    result.push_back(calibKey);
+  } else {
+    result.push_back(this->coolFolderKey(
+        L1CaloPprConditionsContainerRun2::ePprChanCalibCommon));
+    result.push_back(this->coolFolderKey(
+        L1CaloPprConditionsContainerRun2::ePprChanCalibStrategy));
+  }
+
+  return result;
 }
 
 std::string L1CaloPprConditionsContainerRun2::coolOutputKey() const {
@@ -106,131 +177,341 @@ DataObject* L1CaloPprConditionsContainerRun2::makePersistent() const {
   return 0;
 }
 
-void L1CaloPprConditionsContainerRun2::makeTransient(const std::map<std::string, CondAttrListCollection*> condAttrListCollectionMap) {
-
+void L1CaloPprConditionsContainerRun2::makeTransient(const std::map<
+    std::string, CondAttrListCollection*> condAttrListCollectionMap) {
   this->clear();
-
-  std::string chanCalibFolderKey(this->coolFolderKey(L1CaloPprConditionsContainerRun2::ePprChanCalib));
-  auto it_pprChanCalibAttrListCollection = condAttrListCollectionMap.find(chanCalibFolderKey);
-  if(it_pprChanCalibAttrListCollection == condAttrListCollectionMap.end()) {
-    std::cout << "L1CaloPprConditionsContainerRun2 : Could not find requested CondAttrListCollection " << chanCalibFolderKey << std::endl;
-    return;
+  // --------------------------------------------------------------------------
+  // Folder names
+  std::string chanCalibFolderKey =
+      this->coolFolderKey(L1CaloPprConditionsContainerRun2::ePprChanCalib);
+  std::string chanCalibCommonFolderKey = this->coolFolderKey(
+      L1CaloPprConditionsContainerRun2::ePprChanCalibCommon);
+  std::string chanCalibStrategyFolderKey = this->coolFolderKey(
+      L1CaloPprConditionsContainerRun2::ePprChanCalibStrategy);
+
+  decltype(condAttrListCollectionMap)::const_iterator
+      it_pprChanCalibAttrListCollection = condAttrListCollectionMap.end();
+  
+  decltype(condAttrListCollectionMap)::const_iterator
+      it_pprChanCalibStrategyAttrListCollection =
+          condAttrListCollectionMap.end();
+  // --------------------------------------------------------------------------
+  bool isUseStrategy = false;
+  // Check that folders exist
+  if (!chanCalibFolderKey.empty()) {
+    it_pprChanCalibAttrListCollection =
+        condAttrListCollectionMap.find(chanCalibFolderKey);
+  } else {
+    isUseStrategy = true;
+    it_pprChanCalibAttrListCollection =
+        condAttrListCollectionMap.find(chanCalibCommonFolderKey);
+    
+    it_pprChanCalibStrategyAttrListCollection =
+        condAttrListCollectionMap.find(chanCalibStrategyFolderKey);
   }
+  // --------------------------------------------------------------------------
+  if (isUseStrategy) {
+    // Check that strategy folder exists
+    if (it_pprChanCalibStrategyAttrListCollection ==
+        condAttrListCollectionMap.end()) {
+      std::cout << "L1CaloPprConditionsContainerRun2 : Could not find "
+                   "requested CondAttrListCollection "
+                << chanCalibStrategyFolderKey << std::endl;
+      return;
+    }
 
-  CondAttrListCollection* chanCalibAttrListCollection = it_pprChanCalibAttrListCollection->second;
-
-  std::string chanDefaultsFolderKey(this->coolFolderKey(L1CaloPprConditionsContainerRun2::ePprChanDefaults));
-  auto it_pprChanDefaultsAttrListCollection = condAttrListCollectionMap.find(chanDefaultsFolderKey);
-  if(it_pprChanDefaultsAttrListCollection == condAttrListCollectionMap.end()) {
-    std::cout << "L1CaloPprConditionsContainerRun2 : Could not find requested CondAttrListCollection " << chanDefaultsFolderKey << std::endl;
+    // Check that common folder exists
+    if (it_pprChanCalibAttrListCollection == condAttrListCollectionMap.end()) {
+      std::cout << "L1CaloPprConditionsContainerRun2 : Could not find "
+                   "requested CondAttrListCollection "
+                << chanCalibCommonFolderKey << std::endl;
+      return;
+    }
+  } else {
+    if (it_pprChanCalibAttrListCollection == condAttrListCollectionMap.end()) {
+      std::cout << "L1CaloPprConditionsContainerRun2 : Could not find "
+                   "requested CondAttrListCollection "
+                << chanCalibCommonFolderKey << std::endl;
+      return;
+    }
+  }
+  // --------------------------------------------------------------------------
+  CondAttrListCollection* chanCalibAttrListCollection =
+      it_pprChanCalibAttrListCollection->second;
+
+  std::string chanDefaultsFolderKey(
+      this->coolFolderKey(L1CaloPprConditionsContainerRun2::ePprChanDefaults));
+  auto it_pprChanDefaultsAttrListCollection =
+      condAttrListCollectionMap.find(chanDefaultsFolderKey);
+  if (it_pprChanDefaultsAttrListCollection == condAttrListCollectionMap.end()) {
+    std::cout << "L1CaloPprConditionsContainerRun2 : Could not find requested "
+                 "CondAttrListCollection " << chanDefaultsFolderKey
+              << std::endl;
     return;
   }
+  // --------------------------------------------------------------------------
+  CondAttrListCollection* chanDefaultsAttrListCollection =
+      it_pprChanDefaultsAttrListCollection->second;
 
-  CondAttrListCollection* chanDefaultsAttrListCollection = it_pprChanDefaultsAttrListCollection->second;
-        
   // There should be only one channel (channel#1) in the Default folder
-  // we just retrieve that one, waiting for a better method to retrieve that information.
+  // we just retrieve that one, waiting for a better method to retrieve that
+  // information.
   const int defaultChannel = 1;
-  const AthenaAttributeList& chanDefaultAttrList(chanDefaultsAttrListCollection->attributeList(defaultChannel));
-
-  m_bcidDecision1 = chanDefaultAttrList[ this->specificationName(eBcidDecision1) ].data<int>();
-  m_satOverride1 = chanDefaultAttrList[ this->specificationName(eSatOverride1) ].data<int>();
-  m_bcidDecision2 = chanDefaultAttrList[ this->specificationName(eBcidDecision2) ].data<int>();
-  m_satOverride2 = chanDefaultAttrList[ this->specificationName(eSatOverride2) ].data<int>();
-  m_bcidDecision3 = chanDefaultAttrList[ this->specificationName(eBcidDecision3) ].data<int>();
-  m_satOverride3 = chanDefaultAttrList[ this->specificationName(eSatOverride3) ].data<int>();
-  m_peakFinderCond = chanDefaultAttrList[ this->specificationName(ePeakFinderCond) ].data<int>();
-  m_decisionSource = chanDefaultAttrList[ this->specificationName(eDecisionSource) ].data<int>();
-
-  //loop over CondAttrListCollection
+  const AthenaAttributeList& chanDefaultAttrList(
+      chanDefaultsAttrListCollection->attributeList(defaultChannel));
+
+  m_bcidDecision1 =
+      chanDefaultAttrList[this->specificationName(eBcidDecision1)].data<int>();
+  m_satOverride1 =
+      chanDefaultAttrList[this->specificationName(eSatOverride1)].data<int>();
+  m_bcidDecision2 =
+      chanDefaultAttrList[this->specificationName(eBcidDecision2)].data<int>();
+  m_satOverride2 =
+      chanDefaultAttrList[this->specificationName(eSatOverride2)].data<int>();
+  m_bcidDecision3 =
+      chanDefaultAttrList[this->specificationName(eBcidDecision3)].data<int>();
+  m_satOverride3 =
+      chanDefaultAttrList[this->specificationName(eSatOverride3)].data<int>();
+  m_peakFinderCond =
+      chanDefaultAttrList[this->specificationName(ePeakFinderCond)].data<int>();
+  m_decisionSource =
+      chanDefaultAttrList[this->specificationName(eDecisionSource)].data<int>();
+  // ------------------------------------------------------------------------
+  // loop over CondAttrListCollection
   auto it_AttrListColl = chanCalibAttrListCollection->begin();
   auto it_AttrListCollE = chanCalibAttrListCollection->end();
-  for(;it_AttrListColl != it_AttrListCollE; ++it_AttrListColl) {
-    CondAttrListCollection::ChanNum chanNum(it_AttrListColl->first);
-    const AthenaAttributeList& chanCalibAttrList(it_AttrListColl->second);
-
-    unsigned short extBcidThreshold = chanCalibAttrList[ this->specificationName(eExtBcidThreshold) ].data<unsigned short>();
-    unsigned short satBcidThreshLow = chanCalibAttrList[ this->specificationName(eSatBcidThreshLow) ].data<unsigned short>();
-    unsigned short satBcidThreshHigh = chanCalibAttrList[ this->specificationName(eSatBcidThreshHigh) ].data<unsigned short>();
-    unsigned short satBcidLevel = chanCalibAttrList[ this->specificationName(eSatBcidLevel) ].data<unsigned short>();
-
-    unsigned short bcidEnergyRangeLow = chanCalibAttrList[ this->specificationName(eBcidEnergyRangeLow) ].data<unsigned short>();
-    unsigned short bcidEnergyRangeHigh = chanCalibAttrList[ this->specificationName(eBcidEnergyRangeHigh) ].data<unsigned short>();
-
-    unsigned short firStartBit = chanCalibAttrList[ this->specificationName(eFirStartBit) ].data<unsigned short>();
-
-    short int firCoeff1 = chanCalibAttrList[ this->specificationName(eFirCoeff1) ].data<short>();
-    short int firCoeff2 = chanCalibAttrList[ this->specificationName(eFirCoeff2) ].data<short>();
-    short int firCoeff3 = chanCalibAttrList[ this->specificationName(eFirCoeff3) ].data<short>();
-    short int firCoeff4 = chanCalibAttrList[ this->specificationName(eFirCoeff4) ].data<short>();
-    short int firCoeff5 = chanCalibAttrList[ this->specificationName(eFirCoeff5) ].data<short>();
-
-    unsigned short lutCpStrategy = chanCalibAttrList[ this->specificationName(eLutCpStrategy) ].data<unsigned short>();
-    unsigned short lutCpOffset = chanCalibAttrList[ this->specificationName(eLutCpOffset) ].data<unsigned short>();
-    unsigned short lutCpSlope = chanCalibAttrList[ this->specificationName(eLutCpSlope) ].data<unsigned short>(); 
-    unsigned short lutCpNoiseCut = chanCalibAttrList[ this->specificationName(eLutCpNoiseCut) ].data<unsigned short>();
-    unsigned short lutCpScale = chanCalibAttrList[ this->specificationName(eLutCpScale) ].data<unsigned short>();
-    short lutCpPar1 = chanCalibAttrList[ this->specificationName(eLutCpPar1) ].data<short>();
-    short lutCpPar2 = chanCalibAttrList[ this->specificationName(eLutCpPar2) ].data<short>();
-    short lutCpPar3 = chanCalibAttrList[ this->specificationName(eLutCpPar3) ].data<short>();
-    short lutCpPar4 = chanCalibAttrList[ this->specificationName(eLutCpPar4) ].data<short>();
-
-    unsigned short lutJepStrategy = chanCalibAttrList[ this->specificationName(eLutJepStrategy) ].data<unsigned short>();
-    unsigned short lutJepOffset = chanCalibAttrList[ this->specificationName(eLutJepOffset) ].data<unsigned short>();
-    unsigned short lutJepSlope = chanCalibAttrList[ this->specificationName(eLutJepSlope) ].data<unsigned short>(); 
-    unsigned short lutJepNoiseCut = chanCalibAttrList[ this->specificationName(eLutJepNoiseCut) ].data<unsigned short>();
-    unsigned short lutJepScale = chanCalibAttrList[ this->specificationName(eLutJepScale) ].data<unsigned short>();
-    short lutJepPar1 = chanCalibAttrList[ this->specificationName(eLutJepPar1) ].data<short>();
-    short lutJepPar2 = chanCalibAttrList[ this->specificationName(eLutJepPar2) ].data<short>();
-    short lutJepPar3 = chanCalibAttrList[ this->specificationName(eLutJepPar3) ].data<short>();
-    short lutJepPar4 = chanCalibAttrList[ this->specificationName(eLutJepPar4) ].data<short>();
-
-    unsigned int pedValue = chanCalibAttrList[ this->specificationName(ePedValue) ].data<unsigned int>();
-    float pedMean = (float) chanCalibAttrList[ this->specificationName(ePedMean) ].data<double>();
-    unsigned int pedFirSum = chanCalibAttrList[ this->specificationName(ePedFirSum) ].data<unsigned int>();
-
-    L1CaloCoolChannelId coolId(chanNum);
-    unsigned int index = (coolId.crate()<<10)+(coolId.module()<<6)+(coolId.subModule()<<2)+coolId.channel();
-    if (index < s_vectorSize) {
-      m_pprConditionsVec[index] = new L1CaloPprConditionsRun2(extBcidThreshold, satBcidThreshLow, satBcidThreshHigh,
-                                                              satBcidLevel, bcidEnergyRangeLow, bcidEnergyRangeHigh,
-                                                              firStartBit, firCoeff1, firCoeff2, firCoeff3, firCoeff4, firCoeff5,
-                                                              lutCpStrategy, lutCpOffset, lutCpSlope, lutCpNoiseCut, lutCpPar1, lutCpPar2, lutCpPar3, lutCpPar4, lutCpScale,
-                                                              lutJepStrategy, lutJepOffset, lutJepSlope, lutJepNoiseCut, lutJepPar1, lutJepPar2, lutJepPar3, lutJepPar4, lutJepScale,
-                                                              pedValue, pedMean, pedFirSum);
+  // --------------------------------------------------------------------------
+  for (; it_AttrListColl != it_AttrListCollE; ++it_AttrListColl) {
+    // ------------------------------------------------------------------------
+    L1CaloCoolChannelId coolId(it_AttrListColl->first);
+    unsigned int index = (coolId.crate() << 10) + (coolId.module() << 6) +
+                         (coolId.subModule() << 2) + coolId.channel();
+    // ------------------------------------------------------------------------                     
+    if (index >= s_vectorSize) {
+      continue;
     }
+    // ------------------------------------------------------------------------
+    const AthenaAttributeList& chanCalibAttrList(it_AttrListColl->second);
+    // ------------------------------------------------------------------------
+    unsigned short extBcidThreshold =
+        chanCalibAttrList[this->specificationName(eExtBcidThreshold)]
+            .data<unsigned short>();
+    unsigned short satBcidThreshLow =
+        chanCalibAttrList[this->specificationName(eSatBcidThreshLow)]
+            .data<unsigned short>();
+    unsigned short satBcidThreshHigh =
+        chanCalibAttrList[this->specificationName(eSatBcidThreshHigh)]
+            .data<unsigned short>();
+    unsigned short satBcidLevel =
+        chanCalibAttrList[this->specificationName(eSatBcidLevel)]
+            .data<unsigned short>();
+
+    unsigned short bcidEnergyRangeLow =
+        chanCalibAttrList[this->specificationName(eBcidEnergyRangeLow)]
+            .data<unsigned short>();
+    unsigned short bcidEnergyRangeHigh =
+        chanCalibAttrList[this->specificationName(eBcidEnergyRangeHigh)]
+            .data<unsigned short>();
+    unsigned short lutCpStrategy =
+        chanCalibAttrList[this->specificationName(eLutCpStrategy)]
+            .data<unsigned short>();
+
+    short lutCpPar1 =
+        chanCalibAttrList[this->specificationName(eLutCpPar1)].data<short>();
+    short lutCpPar2 =
+        chanCalibAttrList[this->specificationName(eLutCpPar2)].data<short>();
+    short lutCpPar3 =
+        chanCalibAttrList[this->specificationName(eLutCpPar3)].data<short>();
+    short lutCpPar4 =
+        chanCalibAttrList[this->specificationName(eLutCpPar4)].data<short>();
+    unsigned short lutJepStrategy =
+        chanCalibAttrList[this->specificationName(eLutJepStrategy)]
+            .data<unsigned short>();
+
+    unsigned short lutCpScale =
+        chanCalibAttrList[this->specificationName(eLutCpScale)]
+            .data<unsigned short>();
+    unsigned short lutJepScale =
+        chanCalibAttrList[this->specificationName(eLutJepScale)]
+            .data<unsigned short>();
+    short lutJepPar1 =
+        chanCalibAttrList[this->specificationName(eLutJepPar1)].data<short>();
+    short lutJepPar2 =
+        chanCalibAttrList[this->specificationName(eLutJepPar2)].data<short>();
+    short lutJepPar3 =
+        chanCalibAttrList[this->specificationName(eLutJepPar3)].data<short>();
+    short lutJepPar4 =
+        chanCalibAttrList[this->specificationName(eLutJepPar4)].data<short>();
+    unsigned int pedValue =
+        chanCalibAttrList[this->specificationName(ePedValue)]
+            .data<unsigned int>();
+    float pedMean =
+        (float)
+        chanCalibAttrList[this->specificationName(ePedMean)].data<double>();
+
+    unsigned short lutJepOffset =
+        isUseStrategy
+            ? 0
+            : chanCalibAttrList[this->specificationName(eLutJepOffset)]
+                  .data<unsigned short>();
+    unsigned short lutCpOffset =
+        isUseStrategy ? 0
+                      : chanCalibAttrList[this->specificationName(eLutCpOffset)]
+                            .data<unsigned short>();
+    unsigned int pedFirSum =
+        isUseStrategy ? 0
+                      : chanCalibAttrList[this->specificationName(ePedFirSum)]
+                            .data<unsigned int>();
+
+    unsigned short firStartBit =
+        isUseStrategy ? 0
+                      : chanCalibAttrList[this->specificationName(eFirStartBit)]
+                            .data<unsigned short>();
+    short int firCoeff1 =
+        isUseStrategy ? 0
+                      : chanCalibAttrList[this->specificationName(eFirCoeff1)]
+                            .data<short>();
+    short int firCoeff2 =
+        isUseStrategy ? 0
+                      : chanCalibAttrList[this->specificationName(eFirCoeff2)]
+                            .data<short>();
+    short int firCoeff3 =
+        isUseStrategy ? 0
+                      : chanCalibAttrList[this->specificationName(eFirCoeff3)]
+                            .data<short>();
+    short int firCoeff4 =
+        isUseStrategy ? 0
+                      : chanCalibAttrList[this->specificationName(eFirCoeff4)]
+                            .data<short>();
+    short int firCoeff5 =
+        isUseStrategy ? 0
+                      : chanCalibAttrList[this->specificationName(eFirCoeff5)]
+                            .data<short>();
+
+    unsigned short lutCpSlope =
+        isUseStrategy ? 0
+                      : chanCalibAttrList[this->specificationName(eLutCpSlope)]
+                            .data<unsigned short>();
+    unsigned short lutCpNoiseCut =
+        isUseStrategy
+            ? 0
+            : chanCalibAttrList[this->specificationName(eLutCpNoiseCut)]
+                  .data<unsigned short>();
+    unsigned short lutJepSlope =
+        isUseStrategy ? 0
+                      : chanCalibAttrList[this->specificationName(eLutJepSlope)]
+                            .data<unsigned short>();
+    unsigned short lutJepNoiseCut =
+        isUseStrategy
+            ? 0
+            : chanCalibAttrList[this->specificationName(eLutJepNoiseCut)]
+                  .data<unsigned short>();
+    // ------------------------------------------------------------------------
+    m_pprConditionsVec[index] = new L1CaloPprConditionsRun2(
+        extBcidThreshold, satBcidThreshLow, satBcidThreshHigh, satBcidLevel,
+        bcidEnergyRangeLow, bcidEnergyRangeHigh, firStartBit, firCoeff1,
+        firCoeff2, firCoeff3, firCoeff4, firCoeff5, lutCpStrategy, lutCpOffset,
+        lutCpSlope, lutCpNoiseCut, lutCpPar1, lutCpPar2, lutCpPar3, lutCpPar4,
+        lutCpScale, lutJepStrategy, lutJepOffset, lutJepSlope, lutJepNoiseCut,
+        lutJepPar1, lutJepPar2, lutJepPar3, lutJepPar4, lutJepScale, pedValue,
+        pedMean, pedFirSum);
   }
+  // --------------------------------------------------------------------------
+  if (isUseStrategy){
+    // ------------------------------------------------------------------------
+    CondAttrListCollection* chanCalibAttrListCollection =
+      it_pprChanCalibStrategyAttrListCollection->second; 
+    auto it_AttrListColl = chanCalibAttrListCollection->begin();
+    auto it_AttrListCollE = chanCalibAttrListCollection->end();
+    // ------------------------------------------------------------------------
+    for (; it_AttrListColl != it_AttrListCollE; ++it_AttrListColl) {
+      L1CaloCoolChannelId coolId(it_AttrListColl->first);
+      unsigned int index = (coolId.crate() << 10) + (coolId.module() << 6) +
+                           (coolId.subModule() << 2) + coolId.channel();
+
+      if (index >= s_vectorSize) {
+        continue;
+      }
+
+      const AthenaAttributeList& chanCalibAttrList(it_AttrListColl->second);
+
+      if (m_pprConditionsVec[index] == nullptr){
+          std::cout << "L1CaloPprConditionsContainerRun2 : Could not find channel "
+                 << " with index " << index << std::endl;
+          return;
+      }
+
+      unsigned short firStartBit =
+          chanCalibAttrList[this->specificationName(eFirStartBit)]
+              .data<unsigned short>();
+      short int firCoeff1 =
+          chanCalibAttrList[this->specificationName(eFirCoeff1)].data<short>();
+      short int firCoeff2 =
+          chanCalibAttrList[this->specificationName(eFirCoeff2)].data<short>();
+      short int firCoeff3 =
+          chanCalibAttrList[this->specificationName(eFirCoeff3)].data<short>();
+      short int firCoeff4 =
+          chanCalibAttrList[this->specificationName(eFirCoeff4)].data<short>();
+      short int firCoeff5 =
+          chanCalibAttrList[this->specificationName(eFirCoeff5)].data<short>();
+
+      unsigned short lutCpSlope =
+          chanCalibAttrList[this->specificationName(eLutCpSlope)]
+              .data<unsigned short>();
+      unsigned short lutCpNoiseCut =
+          chanCalibAttrList[this->specificationName(eLutCpNoiseCut)]
+              .data<unsigned short>();
+      unsigned short lutJepSlope =
+          chanCalibAttrList[this->specificationName(eLutJepSlope)]
+              .data<unsigned short>();
+      unsigned short lutJepNoiseCut =
+          chanCalibAttrList[this->specificationName(eLutJepNoiseCut)]
+              .data<unsigned short>();
+      m_pprConditionsVec[index]->initializeByStrategy(
+          firStartBit, firCoeff1, firCoeff2, firCoeff3, firCoeff4, firCoeff5,
+          lutCpSlope, lutCpNoiseCut, lutJepSlope, lutJepNoiseCut);
+
+    } // end for
+    // ------------------------------------------------------------------------
+  } // end isUseStrategy
+  // --------------------------------------------------------------------------
+ 
 }
 
-const L1CaloPprConditionsRun2* L1CaloPprConditionsContainerRun2::pprConditions(unsigned int channelId) const {
+const L1CaloPprConditionsRun2* L1CaloPprConditionsContainerRun2::pprConditions(
+    unsigned int channelId) const {
   L1CaloCoolChannelId coolId(channelId);
   return pprConditions(coolId);
 }
 
-const L1CaloPprConditionsRun2* L1CaloPprConditionsContainerRun2::pprConditions(const L1CaloCoolChannelId& channelId) const {
-  unsigned int index = (channelId.crate()<<10)+(channelId.module()<<6)+(channelId.subModule()<<2)+channelId.channel();
-  if (index < s_vectorSize) return m_pprConditionsVec[index];
-  else return 0;
+const L1CaloPprConditionsRun2* L1CaloPprConditionsContainerRun2::pprConditions(
+    const L1CaloCoolChannelId& channelId) const {
+  unsigned int index = (channelId.crate() << 10) + (channelId.module() << 6) +
+                       (channelId.subModule() << 2) + channelId.channel();
+  if (index < s_vectorSize)
+    return m_pprConditionsVec[index];
+  else
+    return 0;
 }
 
 void L1CaloPprConditionsContainerRun2::dump() const {
-  std::cout << "bcidDecision1: "  << m_bcidDecision1  << ", "
-            << "satOverride1: "   << m_satOverride1   << ", "
-            << "bcidDecision2: "  << m_bcidDecision2  << ", "
-            << "satOverride2: "   << m_satOverride2   << ", "
-            << "bcidDecision3: "  << m_bcidDecision3  << ", "
-            << "satOverride3: "   << m_satOverride3   << ", "
+  std::cout << "bcidDecision1: " << m_bcidDecision1 << ", "
+            << "satOverride1: " << m_satOverride1 << ", "
+            << "bcidDecision2: " << m_bcidDecision2 << ", "
+            << "satOverride2: " << m_satOverride2 << ", "
+            << "bcidDecision3: " << m_bcidDecision3 << ", "
+            << "satOverride3: " << m_satOverride3 << ", "
             << "peakFinderCond: " << m_peakFinderCond << ", "
             << "decisionSource: " << m_decisionSource << std::endl;
   std::size_t index(0);
-  for(auto * C : m_pprConditionsVec) {
-    if(C) std::cout << "index " << index++ << " * item: " << *C << std::endl;
+  for (auto* C : m_pprConditionsVec) {
+    if (C) std::cout << "index " << index++ << " * item: " << *C << std::endl;
   }
 }
 
 void L1CaloPprConditionsContainerRun2::clear() {
-  for(L1CaloPprConditionsRun2* p : m_pprConditionsVec) {
-    if(p) delete p;
+  for (L1CaloPprConditionsRun2* p : m_pprConditionsVec) {
+    if (p) delete p;
   }
   m_pprConditionsVec.assign(s_vectorSize, nullptr);
 }
diff --git a/Trigger/TrigT1/TrigT1CaloCalibConditions/src/L1CaloPprConditionsRun2.cxx b/Trigger/TrigT1/TrigT1CaloCalibConditions/src/L1CaloPprConditionsRun2.cxx
index ca69259774591fc22e80e4c1334015a69f295a63..5b54a05078bb77caf6572364397285cec3bcd023 100644
--- a/Trigger/TrigT1/TrigT1CaloCalibConditions/src/L1CaloPprConditionsRun2.cxx
+++ b/Trigger/TrigT1/TrigT1CaloCalibConditions/src/L1CaloPprConditionsRun2.cxx
@@ -5,6 +5,7 @@
 #include "TrigT1CaloCalibConditions/L1CaloPprConditionsRun2.h"
 
 #include <iostream>
+#include <cmath>
 
 L1CaloPprConditionsRun2::L1CaloPprConditionsRun2(unsigned short extBcidThreshold,
                                                  unsigned short satBcidThreshLow,
@@ -71,6 +72,48 @@ L1CaloPprConditionsRun2::L1CaloPprConditionsRun2(unsigned short extBcidThreshold
 {
 }
 
+namespace {
+unsigned short getLutOffset(double pedMean, unsigned short firStartBit,
+                            std::vector<short int> firCoeff,
+                            unsigned short lutSlope,
+                            unsigned short lutStrategy) {
+  unsigned short lutOffset = 0;
+  int firCoeffSum = 0;
+  for (unsigned int i = 0; i < firCoeff.size(); i++) {
+    firCoeffSum += firCoeff.at(i);
+  }
+  float lutOffsetReal = 0;
+  if (lutStrategy == 0) {
+    lutOffsetReal = (pedMean * static_cast<float>(firCoeffSum) /
+                     std::pow(2., static_cast<float>(firStartBit)));
+  } else {
+    lutOffsetReal = (pedMean * static_cast<float>(firCoeffSum) *
+                         static_cast<float>(lutSlope) /
+                         std::pow(2., static_cast<float>(firStartBit)) -
+                     static_cast<float>(lutSlope) / 2.0);
+  }
+  lutOffset =
+      static_cast<unsigned short>(lutOffsetReal < 0. ? 0 : lutOffsetReal + 0.5);
+  return lutOffset;
+}
+}
+
+void L1CaloPprConditionsRun2::initializeByStrategy(unsigned short firStartBit, short int firCoeff1,
+    short int firCoeff2, short int firCoeff3, short int firCoeff4,
+    short int firCoeff5, unsigned short lutCpSlope, unsigned short lutCpNoiseCut,
+    unsigned short lutJepSlope, unsigned short lutJepNoiseCut)
+{
+  m_firStartBit = firStartBit;
+  m_vFirCoefficients = {firCoeff1, firCoeff2, firCoeff3, firCoeff4, firCoeff5},
+  m_lutCpSlope = lutCpSlope;
+  m_lutCpNoiseCut = lutCpNoiseCut;
+  m_lutJepSlope = lutJepSlope;
+  m_lutJepNoiseCut = lutJepNoiseCut;
+
+  m_lutCpOffset = getLutOffset(m_pedMean, m_firStartBit, m_vFirCoefficients,m_lutCpSlope, m_lutCpStrategy);
+  m_lutJepOffset = getLutOffset(m_pedMean, m_firStartBit, m_vFirCoefficients,m_lutJepSlope, m_lutJepStrategy);
+}
+
 std::ostream& operator<<(std::ostream& output, const  L1CaloPprConditionsRun2& r) {
   output << "extBcidThreshold: "    << r.m_extBcidThreshold       << ", "
          << "satBcidThreshLow: "    << r.m_satBcidThreshLow       << ", "
diff --git a/Trigger/TrigT1/TrigT1CaloCalibConditions/src/L1CaloReadoutConfig.cxx b/Trigger/TrigT1/TrigT1CaloCalibConditions/src/L1CaloReadoutConfig.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..a6d436118788397320212787b0e78d17ef6348a6
--- /dev/null
+++ b/Trigger/TrigT1/TrigT1CaloCalibConditions/src/L1CaloReadoutConfig.cxx
@@ -0,0 +1,58 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+#include "TrigT1CaloCalibConditions/L1CaloReadoutConfig.h"
+
+L1CaloReadoutConfig::L1CaloReadoutConfig(unsigned int channelId, const std::string& description, unsigned int baselinePointer, unsigned int numFadcSlices, unsigned int l1aFadcSlice, unsigned int numLutSlices, unsigned int l1aLutSlice, unsigned int numProcSlices, unsigned int l1aProcSlice, unsigned int numTopoSlices, unsigned int l1aTopoSlice, unsigned int latencyPpmFadc, unsigned int latencyPpmLut, unsigned int latencyCpmInput, unsigned int latencyCpmHits, unsigned int latencyCpmRoi, unsigned int latencyJemInput, unsigned int latencyJemRoi, unsigned int latencyCpCmxBackplane, unsigned int latencyCpCmxLocal, unsigned int latencyCpCmxCable, unsigned int latencyCpCmxSystem, unsigned int latencyCpCmxInfo, unsigned int latencyJetCmxBackplane, unsigned int latencyJetCmxLocal, unsigned int latencyJetCmxCable, unsigned int latencyJetCmxSystem, unsigned int latencyJetCmxInfo, unsigned int latencyJetCmxRoi, unsigned int latencyEnergyCmxBackplane, unsigned int latencyEnergyCmxLocal, unsigned int latencyEnergyCmxCable, unsigned int latencyEnergyCmxSystem, unsigned int latencyEnergyCmxInfo, unsigned int latencyEnergyCmxRoi, unsigned int latencyTopo, unsigned int internalLatencyJemJet, unsigned int internalLatencyJemSum, unsigned int bcOffsetJemJet, unsigned int bcOffsetJemSum, int bcOffsetCmx, int bcOffsetTopo, const std::string& formatTypePpm, const std::string& formatTypeCpJep, const std::string& formatTypeTopo, unsigned int compressionThresholdPpm, unsigned int compressionThresholdCpJep, unsigned int compressionThresholdTopo, unsigned int compressionBaselinePpm, unsigned int readout80ModePpm)
+ : m_channelId(channelId)
+ , m_description(description)
+ , m_baselinePointer(baselinePointer)
+ , m_numFadcSlices(numFadcSlices)
+ , m_l1aFadcSlice(l1aFadcSlice)
+ , m_numLutSlices(numLutSlices)
+ , m_l1aLutSlice(l1aLutSlice)
+ , m_numProcSlices(numProcSlices)
+ , m_l1aProcSlice(l1aProcSlice)
+ , m_numTopoSlices(numTopoSlices)
+ , m_l1aTopoSlice(l1aTopoSlice)
+ , m_latencyPpmFadc(latencyPpmFadc)
+ , m_latencyPpmLut(latencyPpmLut)
+ , m_latencyCpmInput(latencyCpmInput)
+ , m_latencyCpmHits(latencyCpmHits)
+ , m_latencyCpmRoi(latencyCpmRoi)
+ , m_latencyJemInput(latencyJemInput)
+ , m_latencyJemRoi(latencyJemRoi)
+ , m_latencyCpCmxBackplane(latencyCpCmxBackplane)
+ , m_latencyCpCmxLocal(latencyCpCmxLocal)
+ , m_latencyCpCmxCable(latencyCpCmxCable)
+ , m_latencyCpCmxSystem(latencyCpCmxSystem)
+ , m_latencyCpCmxInfo(latencyCpCmxInfo)
+ , m_latencyJetCmxBackplane(latencyJetCmxBackplane)
+ , m_latencyJetCmxLocal(latencyJetCmxLocal)
+ , m_latencyJetCmxCable(latencyJetCmxCable)
+ , m_latencyJetCmxSystem(latencyJetCmxSystem)
+ , m_latencyJetCmxInfo(latencyJetCmxInfo)
+ , m_latencyJetCmxRoi(latencyJetCmxRoi)
+ , m_latencyEnergyCmxBackplane(latencyEnergyCmxBackplane)
+ , m_latencyEnergyCmxLocal(latencyEnergyCmxLocal)
+ , m_latencyEnergyCmxCable(latencyEnergyCmxCable)
+ , m_latencyEnergyCmxSystem(latencyEnergyCmxSystem)
+ , m_latencyEnergyCmxInfo(latencyEnergyCmxInfo)
+ , m_latencyEnergyCmxRoi(latencyEnergyCmxRoi)
+ , m_latencyTopo(latencyTopo)
+ , m_internalLatencyJemJet(internalLatencyJemJet)
+ , m_internalLatencyJemSum(internalLatencyJemSum)
+ , m_bcOffsetJemJet(bcOffsetJemJet)
+ , m_bcOffsetJemSum(bcOffsetJemSum)
+ , m_bcOffsetCmx(bcOffsetCmx)
+ , m_bcOffsetTopo(bcOffsetTopo)
+ , m_formatTypePpm(formatTypePpm)
+ , m_formatTypeCpJep(formatTypeCpJep)
+ , m_formatTypeTopo(formatTypeTopo)
+ , m_compressionThresholdPpm(compressionThresholdPpm)
+ , m_compressionThresholdCpJep(compressionThresholdCpJep)
+ , m_compressionThresholdTopo(compressionThresholdTopo)
+ , m_compressionBaselinePpm(compressionBaselinePpm)
+ , m_readout80ModePpm(readout80ModePpm)
+{
+}
diff --git a/Trigger/TrigT1/TrigT1CaloCalibConditions/src/L1CaloReadoutConfigContainer.cxx b/Trigger/TrigT1/TrigT1CaloCalibConditions/src/L1CaloReadoutConfigContainer.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..1b1577dda44a0fdc80be7f2df8305029fbfc05b7
--- /dev/null
+++ b/Trigger/TrigT1/TrigT1CaloCalibConditions/src/L1CaloReadoutConfigContainer.cxx
@@ -0,0 +1,232 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+#include "TrigT1CaloCalibConditions/L1CaloReadoutConfigContainer.h"
+
+#include <algorithm>
+#include <memory>
+
+#include "CxxUtils/make_unique.h"
+#include "CoralBase/AttributeListSpecification.h"
+#include "AthenaPoolUtilities/CondAttrListCollection.h"
+#include "AthenaPoolUtilities/AthenaAttributeList.h"
+
+#include "TrigT1CaloCalibConditions/L1CaloReadoutConfig.h"
+
+L1CaloReadoutConfigContainer::L1CaloReadoutConfigContainer()
+  : AbstractL1CaloPersistentCondition("CondAttrListCollection") 
+{
+  this->addSpecification(edescription, "description", "string");
+  this->addSpecification(ebaselinePointer, "baselinePointer", "unsigned int");
+  this->addSpecification(enumFadcSlices, "numFadcSlices", "unsigned int");
+  this->addSpecification(el1aFadcSlice, "l1aFadcSlice", "unsigned int");
+  this->addSpecification(enumLutSlices, "numLutSlices", "unsigned int");
+  this->addSpecification(el1aLutSlice, "l1aLutSlice", "unsigned int");
+  this->addSpecification(enumProcSlices, "numProcSlices", "unsigned int");
+  this->addSpecification(el1aProcSlice, "l1aProcSlice", "unsigned int");
+  this->addSpecification(enumTopoSlices, "numTopoSlices", "unsigned int");
+  this->addSpecification(el1aTopoSlice, "l1aTopoSlice", "unsigned int");
+  this->addSpecification(elatencyPpmFadc, "latencyPpmFadc", "unsigned int");
+  this->addSpecification(elatencyPpmLut, "latencyPpmLut", "unsigned int");
+  this->addSpecification(elatencyCpmInput, "latencyCpmInput", "unsigned int");
+  this->addSpecification(elatencyCpmHits, "latencyCpmHits", "unsigned int");
+  this->addSpecification(elatencyCpmRoi, "latencyCpmRoi", "unsigned int");
+  this->addSpecification(elatencyJemInput, "latencyJemInput", "unsigned int");
+  this->addSpecification(elatencyJemRoi, "latencyJemRoi", "unsigned int");
+  this->addSpecification(elatencyCpCmxBackplane, "latencyCpCmxBackplane", "unsigned int");
+  this->addSpecification(elatencyCpCmxLocal, "latencyCpCmxLocal", "unsigned int");
+  this->addSpecification(elatencyCpCmxCable, "latencyCpCmxCable", "unsigned int");
+  this->addSpecification(elatencyCpCmxSystem, "latencyCpCmxSystem", "unsigned int");
+  this->addSpecification(elatencyCpCmxInfo, "latencyCpCmxInfo", "unsigned int");
+  this->addSpecification(elatencyJetCmxBackplane, "latencyJetCmxBackplane", "unsigned int");
+  this->addSpecification(elatencyJetCmxLocal, "latencyJetCmxLocal", "unsigned int");
+  this->addSpecification(elatencyJetCmxCable, "latencyJetCmxCable", "unsigned int");
+  this->addSpecification(elatencyJetCmxSystem, "latencyJetCmxSystem", "unsigned int");
+  this->addSpecification(elatencyJetCmxInfo, "latencyJetCmxInfo", "unsigned int");
+  this->addSpecification(elatencyJetCmxRoi, "latencyJetCmxRoi", "unsigned int");
+  this->addSpecification(elatencyEnergyCmxBackplane, "latencyEnergyCmxBackplane", "unsigned int");
+  this->addSpecification(elatencyEnergyCmxLocal, "latencyEnergyCmxLocal", "unsigned int");
+  this->addSpecification(elatencyEnergyCmxCable, "latencyEnergyCmxCable", "unsigned int");
+  this->addSpecification(elatencyEnergyCmxSystem, "latencyEnergyCmxSystem", "unsigned int");
+  this->addSpecification(elatencyEnergyCmxInfo, "latencyEnergyCmxInfo", "unsigned int");
+  this->addSpecification(elatencyEnergyCmxRoi, "latencyEnergyCmxRoi", "unsigned int");
+  this->addSpecification(elatencyTopo, "latencyTopo", "unsigned int");
+  this->addSpecification(einternalLatencyJemJet, "internalLatencyJemJet", "unsigned int");
+  this->addSpecification(einternalLatencyJemSum, "internalLatencyJemSum", "unsigned int");
+  this->addSpecification(ebcOffsetJemJet, "bcOffsetJemJet", "unsigned int");
+  this->addSpecification(ebcOffsetJemSum, "bcOffsetJemSum", "unsigned int");
+  this->addSpecification(ebcOffsetCmx, "bcOffsetCmx", "int");
+  this->addSpecification(ebcOffsetTopo, "bcOffsetTopo", "int");
+  this->addSpecification(eformatTypePpm, "formatTypePpm", "string");
+  this->addSpecification(eformatTypeCpJep, "formatTypeCpJep", "string");
+  this->addSpecification(eformatTypeTopo, "formatTypeTopo", "string");
+  this->addSpecification(ecompressionThresholdPpm, "compressionThresholdPpm", "unsigned int");
+  this->addSpecification(ecompressionThresholdCpJep, "compressionThresholdCpJep", "unsigned int");
+  this->addSpecification(ecompressionThresholdTopo, "compressionThresholdTopo", "unsigned int");
+  this->addSpecification(ecompressionBaselinePpm, "compressionBaselinePpm", "unsigned int");
+  this->addSpecification(ereadout80ModePpm, "readout80ModePpm", "unsigned int");
+}
+
+L1CaloReadoutConfigContainer::L1CaloReadoutConfigContainer(const std::string& folderKey)
+  : L1CaloReadoutConfigContainer() // delegating constructor
+{
+  m_coolFolderKey = folderKey;
+}
+
+
+DataObject* L1CaloReadoutConfigContainer::makePersistent() const
+{
+  using CxxUtils::make_unique;
+
+  if(m_coolFolderKey.empty()) return nullptr;
+
+  auto* attrSpecification = this->createAttributeListSpecification();
+  if(!attrSpecification || !attrSpecification->size()) return nullptr;
+
+  auto attrListCollection = make_unique<CondAttrListCollection>(true);
+  for(const auto& item : m_readoutConfigs) {
+    AthenaAttributeList attrList(*attrSpecification);
+    attrList[specificationName(edescription)].setValue(item.description());
+    attrList[specificationName(ebaselinePointer)].setValue(item.baselinePointer());
+    attrList[specificationName(enumFadcSlices)].setValue(item.numFadcSlices());
+    attrList[specificationName(el1aFadcSlice)].setValue(item.l1aFadcSlice());
+    attrList[specificationName(enumLutSlices)].setValue(item.numLutSlices());
+    attrList[specificationName(el1aLutSlice)].setValue(item.l1aLutSlice());
+    attrList[specificationName(enumProcSlices)].setValue(item.numProcSlices());
+    attrList[specificationName(el1aProcSlice)].setValue(item.l1aProcSlice());
+    attrList[specificationName(enumTopoSlices)].setValue(item.numTopoSlices());
+    attrList[specificationName(el1aTopoSlice)].setValue(item.l1aTopoSlice());
+    attrList[specificationName(elatencyPpmFadc)].setValue(item.latencyPpmFadc());
+    attrList[specificationName(elatencyPpmLut)].setValue(item.latencyPpmLut());
+    attrList[specificationName(elatencyCpmInput)].setValue(item.latencyCpmInput());
+    attrList[specificationName(elatencyCpmHits)].setValue(item.latencyCpmHits());
+    attrList[specificationName(elatencyCpmRoi)].setValue(item.latencyCpmRoi());
+    attrList[specificationName(elatencyJemInput)].setValue(item.latencyJemInput());
+    attrList[specificationName(elatencyJemRoi)].setValue(item.latencyJemRoi());
+    attrList[specificationName(elatencyCpCmxBackplane)].setValue(item.latencyCpCmxBackplane());
+    attrList[specificationName(elatencyCpCmxLocal)].setValue(item.latencyCpCmxLocal());
+    attrList[specificationName(elatencyCpCmxCable)].setValue(item.latencyCpCmxCable());
+    attrList[specificationName(elatencyCpCmxSystem)].setValue(item.latencyCpCmxSystem());
+    attrList[specificationName(elatencyCpCmxInfo)].setValue(item.latencyCpCmxInfo());
+    attrList[specificationName(elatencyJetCmxBackplane)].setValue(item.latencyJetCmxBackplane());
+    attrList[specificationName(elatencyJetCmxLocal)].setValue(item.latencyJetCmxLocal());
+    attrList[specificationName(elatencyJetCmxCable)].setValue(item.latencyJetCmxCable());
+    attrList[specificationName(elatencyJetCmxSystem)].setValue(item.latencyJetCmxSystem());
+    attrList[specificationName(elatencyJetCmxInfo)].setValue(item.latencyJetCmxInfo());
+    attrList[specificationName(elatencyJetCmxRoi)].setValue(item.latencyJetCmxRoi());
+    attrList[specificationName(elatencyEnergyCmxBackplane)].setValue(item.latencyEnergyCmxBackplane());
+    attrList[specificationName(elatencyEnergyCmxLocal)].setValue(item.latencyEnergyCmxLocal());
+    attrList[specificationName(elatencyEnergyCmxCable)].setValue(item.latencyEnergyCmxCable());
+    attrList[specificationName(elatencyEnergyCmxSystem)].setValue(item.latencyEnergyCmxSystem());
+    attrList[specificationName(elatencyEnergyCmxInfo)].setValue(item.latencyEnergyCmxInfo());
+    attrList[specificationName(elatencyEnergyCmxRoi)].setValue(item.latencyEnergyCmxRoi());
+    attrList[specificationName(elatencyTopo)].setValue(item.latencyTopo());
+    attrList[specificationName(einternalLatencyJemJet)].setValue(item.internalLatencyJemJet());
+    attrList[specificationName(einternalLatencyJemSum)].setValue(item.internalLatencyJemSum());
+    attrList[specificationName(ebcOffsetJemJet)].setValue(item.bcOffsetJemJet());
+    attrList[specificationName(ebcOffsetJemSum)].setValue(item.bcOffsetJemSum());
+    attrList[specificationName(ebcOffsetCmx)].setValue(item.bcOffsetCmx());
+    attrList[specificationName(ebcOffsetTopo)].setValue(item.bcOffsetTopo());
+    attrList[specificationName(eformatTypePpm)].setValue(item.formatTypePpm());
+    attrList[specificationName(eformatTypeCpJep)].setValue(item.formatTypeCpJep());
+    attrList[specificationName(eformatTypeTopo)].setValue(item.formatTypeTopo());
+    attrList[specificationName(ecompressionThresholdPpm)].setValue(item.compressionThresholdPpm());
+    attrList[specificationName(ecompressionThresholdCpJep)].setValue(item.compressionThresholdCpJep());
+    attrList[specificationName(ecompressionThresholdTopo)].setValue(item.compressionThresholdTopo());
+    attrList[specificationName(ecompressionBaselinePpm)].setValue(item.compressionBaselinePpm());
+    attrList[specificationName(ereadout80ModePpm)].setValue(item.readout80ModePpm());
+    
+    attrListCollection->add(item.channelId(), attrList);
+  }
+  return static_cast<DataObject*>(attrListCollection.release());
+}
+
+void L1CaloReadoutConfigContainer::makeTransient(const std::map<std::string, CondAttrListCollection*> condAttrListCollectionMap)
+{
+  clear();
+
+  auto it = condAttrListCollectionMap.find(m_coolFolderKey);
+  if(it == std::end(condAttrListCollectionMap)) return;
+
+  auto attrListCollection = it->second;
+  for(const auto& item : *attrListCollection) {
+    auto chanNum = item.first;
+    const auto& attrList = item.second;
+    
+    auto description = attrList[specificationName(edescription)].data<std::string>();
+    auto baselinePointer = attrList[specificationName(ebaselinePointer)].data<unsigned int>();
+    auto numFadcSlices = attrList[specificationName(enumFadcSlices)].data<unsigned int>();
+    auto l1aFadcSlice = attrList[specificationName(el1aFadcSlice)].data<unsigned int>();
+    auto numLutSlices = attrList[specificationName(enumLutSlices)].data<unsigned int>();
+    auto l1aLutSlice = attrList[specificationName(el1aLutSlice)].data<unsigned int>();
+    auto numProcSlices = attrList[specificationName(enumProcSlices)].data<unsigned int>();
+    auto l1aProcSlice = attrList[specificationName(el1aProcSlice)].data<unsigned int>();
+    auto numTopoSlices = attrList[specificationName(enumTopoSlices)].data<unsigned int>();
+    auto l1aTopoSlice = attrList[specificationName(el1aTopoSlice)].data<unsigned int>();
+    auto latencyPpmFadc = attrList[specificationName(elatencyPpmFadc)].data<unsigned int>();
+    auto latencyPpmLut = attrList[specificationName(elatencyPpmLut)].data<unsigned int>();
+    auto latencyCpmInput = attrList[specificationName(elatencyCpmInput)].data<unsigned int>();
+    auto latencyCpmHits = attrList[specificationName(elatencyCpmHits)].data<unsigned int>();
+    auto latencyCpmRoi = attrList[specificationName(elatencyCpmRoi)].data<unsigned int>();
+    auto latencyJemInput = attrList[specificationName(elatencyJemInput)].data<unsigned int>();
+    auto latencyJemRoi = attrList[specificationName(elatencyJemRoi)].data<unsigned int>();
+    auto latencyCpCmxBackplane = attrList[specificationName(elatencyCpCmxBackplane)].data<unsigned int>();
+    auto latencyCpCmxLocal = attrList[specificationName(elatencyCpCmxLocal)].data<unsigned int>();
+    auto latencyCpCmxCable = attrList[specificationName(elatencyCpCmxCable)].data<unsigned int>();
+    auto latencyCpCmxSystem = attrList[specificationName(elatencyCpCmxSystem)].data<unsigned int>();
+    auto latencyCpCmxInfo = attrList[specificationName(elatencyCpCmxInfo)].data<unsigned int>();
+    auto latencyJetCmxBackplane = attrList[specificationName(elatencyJetCmxBackplane)].data<unsigned int>();
+    auto latencyJetCmxLocal = attrList[specificationName(elatencyJetCmxLocal)].data<unsigned int>();
+    auto latencyJetCmxCable = attrList[specificationName(elatencyJetCmxCable)].data<unsigned int>();
+    auto latencyJetCmxSystem = attrList[specificationName(elatencyJetCmxSystem)].data<unsigned int>();
+    auto latencyJetCmxInfo = attrList[specificationName(elatencyJetCmxInfo)].data<unsigned int>();
+    auto latencyJetCmxRoi = attrList[specificationName(elatencyJetCmxRoi)].data<unsigned int>();
+    auto latencyEnergyCmxBackplane = attrList[specificationName(elatencyEnergyCmxBackplane)].data<unsigned int>();
+    auto latencyEnergyCmxLocal = attrList[specificationName(elatencyEnergyCmxLocal)].data<unsigned int>();
+    auto latencyEnergyCmxCable = attrList[specificationName(elatencyEnergyCmxCable)].data<unsigned int>();
+    auto latencyEnergyCmxSystem = attrList[specificationName(elatencyEnergyCmxSystem)].data<unsigned int>();
+    auto latencyEnergyCmxInfo = attrList[specificationName(elatencyEnergyCmxInfo)].data<unsigned int>();
+    auto latencyEnergyCmxRoi = attrList[specificationName(elatencyEnergyCmxRoi)].data<unsigned int>();
+    auto latencyTopo = attrList[specificationName(elatencyTopo)].data<unsigned int>();
+    auto internalLatencyJemJet = attrList[specificationName(einternalLatencyJemJet)].data<unsigned int>();
+    auto internalLatencyJemSum = attrList[specificationName(einternalLatencyJemSum)].data<unsigned int>();
+    auto bcOffsetJemJet = attrList[specificationName(ebcOffsetJemJet)].data<unsigned int>();
+    auto bcOffsetJemSum = attrList[specificationName(ebcOffsetJemSum)].data<unsigned int>();
+    auto bcOffsetCmx = attrList[specificationName(ebcOffsetCmx)].data<int>();
+    auto bcOffsetTopo = attrList[specificationName(ebcOffsetTopo)].data<int>();
+    auto formatTypePpm = attrList[specificationName(eformatTypePpm)].data<std::string>();
+    auto formatTypeCpJep = attrList[specificationName(eformatTypeCpJep)].data<std::string>();
+    auto formatTypeTopo = attrList[specificationName(eformatTypeTopo)].data<std::string>();
+    auto compressionThresholdPpm = attrList[specificationName(ecompressionThresholdPpm)].data<unsigned int>();
+    auto compressionThresholdCpJep = attrList[specificationName(ecompressionThresholdCpJep)].data<unsigned int>();
+    auto compressionThresholdTopo = attrList[specificationName(ecompressionThresholdTopo)].data<unsigned int>();
+    auto compressionBaselinePpm = attrList[specificationName(ecompressionBaselinePpm)].data<unsigned int>();
+    auto readout80ModePpm = attrList[specificationName(ereadout80ModePpm)].data<unsigned int>();
+
+    addReadoutConfig(L1CaloReadoutConfig(chanNum, description, baselinePointer, numFadcSlices, l1aFadcSlice, numLutSlices, l1aLutSlice, numProcSlices, l1aProcSlice, numTopoSlices, l1aTopoSlice, latencyPpmFadc, latencyPpmLut, latencyCpmInput, latencyCpmHits, latencyCpmRoi, latencyJemInput, latencyJemRoi, latencyCpCmxBackplane, latencyCpCmxLocal, latencyCpCmxCable, latencyCpCmxSystem, latencyCpCmxInfo, latencyJetCmxBackplane, latencyJetCmxLocal, latencyJetCmxCable, latencyJetCmxSystem, latencyJetCmxInfo, latencyJetCmxRoi, latencyEnergyCmxBackplane, latencyEnergyCmxLocal, latencyEnergyCmxCable, latencyEnergyCmxSystem, latencyEnergyCmxInfo, latencyEnergyCmxRoi, latencyTopo, internalLatencyJemJet, internalLatencyJemSum, bcOffsetJemJet, bcOffsetJemSum, bcOffsetCmx, bcOffsetTopo, formatTypePpm, formatTypeCpJep, formatTypeTopo, compressionThresholdPpm, compressionThresholdCpJep, compressionThresholdTopo, compressionBaselinePpm, readout80ModePpm));
+  }
+}
+
+const L1CaloReadoutConfig* L1CaloReadoutConfigContainer::readoutConfig(unsigned int channelId) const
+{
+  auto it = std::lower_bound(std::begin(m_readoutConfigs),
+                            std::end(m_readoutConfigs),
+                            channelId,
+                            [](const L1CaloReadoutConfig& el, unsigned int val) -> bool {
+                              return el.channelId() < val;
+                            });
+  if(it == std::end(m_readoutConfigs)) return nullptr;
+  return &(*it);
+}
+
+void L1CaloReadoutConfigContainer::addReadoutConfig(const L1CaloReadoutConfig& readoutConfig)
+{
+  // insert into the correct position mainting the sorted vector
+  m_readoutConfigs.insert(std::lower_bound(std::begin(m_readoutConfigs),
+                                           std::end(m_readoutConfigs),
+                                           readoutConfig.channelId(),
+                                           [](const L1CaloReadoutConfig& el, unsigned int va) -> bool {
+                                             return el.channelId() < va;
+                                           }),
+                          readoutConfig);
+}
diff --git a/Trigger/TrigT1/TrigT1CaloCalibConditions/src/L1CaloRunParameters.cxx b/Trigger/TrigT1/TrigT1CaloCalibConditions/src/L1CaloRunParameters.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..82992529ba05cd7d4d30d005fc3deb3ff2c74c84
--- /dev/null
+++ b/Trigger/TrigT1/TrigT1CaloCalibConditions/src/L1CaloRunParameters.cxx
@@ -0,0 +1,26 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+#include "TrigT1CaloCalibConditions/L1CaloRunParameters.h"
+
+L1CaloRunParameters::L1CaloRunParameters(unsigned int channelId, const std::string& runType, const std::string& runActionName, unsigned int runActionVersion, const std::string& readoutConfig, unsigned int readoutConfigID, const std::string& ttcConfiguration, unsigned int ttcConfigurationID, const std::string& triggerMenu, const std::string& calibration, const std::string& conditions)
+ : m_channelId(channelId)
+ , m_runType(runType)
+ , m_runActionName(runActionName)
+ , m_runActionVersion(runActionVersion)
+ , m_readoutConfig(readoutConfig)
+ , m_readoutConfigID(readoutConfigID)
+ , m_ttcConfiguration(ttcConfiguration)
+ , m_ttcConfigurationID(ttcConfigurationID)
+ , m_triggerMenu(triggerMenu)
+ , m_calibration(calibration)
+ , m_conditions(conditions)
+{
+}
+
+std::ostream& operator<<(std::ostream& output, const L1CaloRunParameters& r) {
+  output << "channelID: " << std::hex << r.channelId() << std::dec
+         << ", runType: " << r.runType();
+
+  return output;
+}
diff --git a/Trigger/TrigT1/TrigT1CaloCalibConditions/src/L1CaloRunParametersContainer.cxx b/Trigger/TrigT1/TrigT1CaloCalibConditions/src/L1CaloRunParametersContainer.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..aaaaf39574f590189e36312d04c207b0d32c021e
--- /dev/null
+++ b/Trigger/TrigT1/TrigT1CaloCalibConditions/src/L1CaloRunParametersContainer.cxx
@@ -0,0 +1,122 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+#include "TrigT1CaloCalibConditions/L1CaloRunParametersContainer.h"
+
+#include <algorithm>
+#include <memory>
+
+#include "CxxUtils/make_unique.h"
+#include "CoralBase/AttributeListSpecification.h"
+#include "AthenaPoolUtilities/CondAttrListCollection.h"
+#include "AthenaPoolUtilities/AthenaAttributeList.h"
+
+#include "TrigT1CaloCalibConditions/L1CaloRunParameters.h"
+
+L1CaloRunParametersContainer::L1CaloRunParametersContainer()
+  : AbstractL1CaloPersistentCondition("CondAttrListCollection") 
+{
+  this->addSpecification(erunType, "runType", "string");
+  this->addSpecification(erunActionName, "runActionName", "string");
+  this->addSpecification(erunActionVersion, "runActionVersion", "unsigned int");
+  this->addSpecification(ereadoutConfig, "readoutConfig", "string");
+  this->addSpecification(ereadoutConfigID, "readoutConfigID", "unsigned int");
+  this->addSpecification(ettcConfiguration, "ttcConfiguration", "string");
+  this->addSpecification(ettcConfigurationID, "ttcConfigurationID", "unsigned int");
+  this->addSpecification(etriggerMenu, "triggerMenu", "string");
+  this->addSpecification(ecalibration, "calibration", "string");
+  this->addSpecification(econditions, "conditions", "string");
+}
+
+L1CaloRunParametersContainer::L1CaloRunParametersContainer(const std::string& folderKey)
+  : L1CaloRunParametersContainer() // delegating constructor
+{
+  m_coolFolderKey = folderKey;
+}
+
+
+DataObject* L1CaloRunParametersContainer::makePersistent() const
+{
+  using CxxUtils::make_unique;
+
+  if(m_coolFolderKey.empty()) return nullptr;
+
+  auto* attrSpecification = this->createAttributeListSpecification();
+  if(!attrSpecification || !attrSpecification->size()) return nullptr;
+
+  auto attrListCollection = make_unique<CondAttrListCollection>(true);
+  for(const auto& item : m_runParameterss) {
+    AthenaAttributeList attrList(*attrSpecification);
+    attrList[specificationName(erunType)].setValue(item.runType());
+    attrList[specificationName(erunActionName)].setValue(item.runActionName());
+    attrList[specificationName(erunActionVersion)].setValue(item.runActionVersion());
+    attrList[specificationName(ereadoutConfig)].setValue(item.readoutConfig());
+    attrList[specificationName(ereadoutConfigID)].setValue(item.readoutConfigID());
+    attrList[specificationName(ettcConfiguration)].setValue(item.ttcConfiguration());
+    attrList[specificationName(ettcConfigurationID)].setValue(item.ttcConfigurationID());
+    attrList[specificationName(etriggerMenu)].setValue(item.triggerMenu());
+    attrList[specificationName(ecalibration)].setValue(item.calibration());
+    attrList[specificationName(econditions)].setValue(item.conditions());
+    
+    attrListCollection->add(item.channelId(), attrList);
+  }
+  return static_cast<DataObject*>(attrListCollection.release());
+}
+
+void L1CaloRunParametersContainer::makeTransient(const std::map<std::string, CondAttrListCollection*> condAttrListCollectionMap)
+{
+  clear();
+
+  auto it = condAttrListCollectionMap.find(m_coolFolderKey);
+  if(it == std::end(condAttrListCollectionMap)) return;
+
+  auto attrListCollection = it->second;
+  for(const auto& item : *attrListCollection) {
+    auto chanNum = item.first;
+    const auto& attrList = item.second;
+    
+    auto runType = attrList[specificationName(erunType)].data<std::string>();
+    auto runActionName = attrList[specificationName(erunActionName)].data<std::string>();
+    auto runActionVersion = attrList[specificationName(erunActionVersion)].data<unsigned int>();
+    auto readoutConfig = attrList[specificationName(ereadoutConfig)].data<std::string>();
+    auto readoutConfigID = attrList[specificationName(ereadoutConfigID)].data<unsigned int>();
+    auto ttcConfiguration = attrList[specificationName(ettcConfiguration)].data<std::string>();
+    auto ttcConfigurationID = attrList[specificationName(ettcConfigurationID)].data<unsigned int>();
+    auto triggerMenu = attrList[specificationName(etriggerMenu)].data<std::string>();
+    auto calibration = attrList[specificationName(ecalibration)].data<std::string>();
+    auto conditions = attrList[specificationName(econditions)].data<std::string>();
+
+    addRunParameters(L1CaloRunParameters(chanNum, runType, runActionName, runActionVersion, readoutConfig, readoutConfigID, ttcConfiguration, ttcConfigurationID, triggerMenu, calibration, conditions));
+  }
+}
+
+const L1CaloRunParameters* L1CaloRunParametersContainer::runParameters(unsigned int channelId) const
+{
+  auto it = std::lower_bound(std::begin(m_runParameterss),
+                            std::end(m_runParameterss),
+                            channelId,
+                            [](const L1CaloRunParameters& el, unsigned int val) -> bool {
+                              return el.channelId() < val;
+                            });
+  if(it == std::end(m_runParameterss)) return nullptr;
+  return &(*it);
+}
+
+void L1CaloRunParametersContainer::addRunParameters(const L1CaloRunParameters& runParameters)
+{
+  // insert into the correct position mainting the sorted vector
+  m_runParameterss.insert(std::lower_bound(std::begin(m_runParameterss),
+                                           std::end(m_runParameterss),
+                                           runParameters.channelId(),
+                                           [](const L1CaloRunParameters& el, unsigned int va) -> bool {
+                                             return el.channelId() < va;
+                                           }),
+                          runParameters);
+}
+
+void L1CaloRunParametersContainer::dump() const {
+  L1CaloRunParametersContainer::const_iterator it = this->begin();
+  for(;it!=this->end();++it) {
+    std::cout << " * item: " << *it <<std::endl;
+  }
+}
diff --git a/Trigger/TrigT1/TrigT1CaloCalibToolInterfaces/TrigT1CaloCalibToolInterfaces/IL1CaloxAODOfflineTriggerTowerTools.h b/Trigger/TrigT1/TrigT1CaloCalibToolInterfaces/TrigT1CaloCalibToolInterfaces/IL1CaloxAODOfflineTriggerTowerTools.h
index d502266c9ac075cae2809e67b99bbfd1afcbd2f1..45442d0fd7b2fb300d21166eacc8499bc868170f 100644
--- a/Trigger/TrigT1/TrigT1CaloCalibToolInterfaces/TrigT1CaloCalibToolInterfaces/IL1CaloxAODOfflineTriggerTowerTools.h
+++ b/Trigger/TrigT1/TrigT1CaloCalibToolInterfaces/TrigT1CaloCalibToolInterfaces/IL1CaloxAODOfflineTriggerTowerTools.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 //  ***************************************************************************
 //  *   Author: John Morris (john.morris@cern.ch)                             *
@@ -43,8 +43,6 @@ namespace LVL1{
       
       /// Calo Cells into maps for L1Calo use
       virtual StatusCode                                 initCaloCells() = 0;
-      /// Database init 
-      virtual StatusCode                                 initDatabase() = 0;
 
       virtual std::vector<L1CaloRxCoolChannelId>         receivers( const xAOD::TriggerTower& tt ) const = 0;
       virtual std::vector<unsigned int>                  receiversId( const xAOD::TriggerTower& tt ) const = 0;
diff --git a/Trigger/TrigT1/TrigT1CaloCalibTools/TrigT1CaloCalibTools/L1CaloTriggerTowerDecoratorAlg.h b/Trigger/TrigT1/TrigT1CaloCalibTools/TrigT1CaloCalibTools/L1CaloTriggerTowerDecoratorAlg.h
index 5caa1eaea8187e61e279db5eade36e13cc94bbcc..5c748db207e85d6f3afaa211ca5f9166876018ed 100644
--- a/Trigger/TrigT1/TrigT1CaloCalibTools/TrigT1CaloCalibTools/L1CaloTriggerTowerDecoratorAlg.h
+++ b/Trigger/TrigT1/TrigT1CaloCalibTools/TrigT1CaloCalibTools/L1CaloTriggerTowerDecoratorAlg.h
@@ -1,7 +1,7 @@
 // Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: L1CaloTriggerTowerDecoratorAlg.h 728363 2016-03-08 12:45:29Z amazurov $
@@ -9,11 +9,14 @@
 #define TRIGGER_TRIGT1_TRIGT1CALOXAODCALIBTOOLS_DECORATETRIGGERTOWERSALG_H
 
 // Gaudi/Athena include(s):
+#include "xAODTrigL1Calo/TriggerTowerContainer.h"
 #include "AthenaBaseComps/AthAlgorithm.h"
 #include "AsgTools/ToolHandle.h"
+#include "StoreGate/ReadHandleKey.h"
 
 // Local include(s):
 #include "TrigT1CaloCalibToolInterfaces/IL1CaloxAODOfflineTriggerTowerTools.h"
+#include "TrigT1Interfaces/TrigT1CaloDefs.h"
 
 namespace LVL1 {
 class L1CaloTriggerTowerDecoratorAlg : public AthAlgorithm {
@@ -28,6 +31,8 @@ class L1CaloTriggerTowerDecoratorAlg : public AthAlgorithm {
   virtual StatusCode execute();
 
  private:
+  SG::ReadHandleKey<xAOD::TriggerTowerContainer> m_triggerTowerContainerKey
+  { this, "sgKey_TriggerTowers", LVL1::TrigT1CaloDefs::xAODTriggerTowerLocation, "" };
   std::string m_sgKey_TriggerTowers;
 
   /// Decoration strings (leave empty to disable the decoration)
diff --git a/Trigger/TrigT1/TrigT1CaloCalibTools/TrigT1CaloCalibTools/L1CaloxAODOfflineTriggerTowerTools.h b/Trigger/TrigT1/TrigT1CaloCalibTools/TrigT1CaloCalibTools/L1CaloxAODOfflineTriggerTowerTools.h
index 9f2f676e74df985813871c3e9355930a9027acd1..8b69243491a3ad6696a47e2c8e2ebf026c6796c1 100644
--- a/Trigger/TrigT1/TrigT1CaloCalibTools/TrigT1CaloCalibTools/L1CaloxAODOfflineTriggerTowerTools.h
+++ b/Trigger/TrigT1/TrigT1CaloCalibTools/TrigT1CaloCalibTools/L1CaloxAODOfflineTriggerTowerTools.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 //  ***************************************************************************
 //  *   Author: John Morris (john.morris@cern.ch)                             *
@@ -12,6 +12,7 @@
 
 // Framework include(s):
 #include "AsgTools/AsgTool.h"
+#include "StoreGate/ReadHandleKey.h"
 #include "GaudiKernel/ToolHandle.h"
 
 // STL include(s):
@@ -73,8 +74,6 @@ namespace LVL1{
       
       /// Calo Cells into maps for L1Calo use
       StatusCode                                 initCaloCells(); 
-      /// Database init 
-      StatusCode                                 initDatabase();      
 
       std::vector<L1CaloRxCoolChannelId>         receivers( const xAOD::TriggerTower& tt ) const;
       std::vector<unsigned int>                  receiversId( const xAOD::TriggerTower& tt ) const;
@@ -179,9 +178,8 @@ namespace LVL1{
       CaloTriggerTowerService*                     m_ttSvc;
       
       /// StoreGate keys for the Calo Cells 
-      std::string m_sgKey_CaloCells;
-      /// StoreGate keys for the Database
-      std::string m_sgKey_dbPpmChanCalib;
+      SG::ReadHandleKey<CaloCellContainer> m_caloCellContainerKey
+      { this, "CaloCellContainerKey", "AllCalo" };
       
       /// Database
       const CondAttrListCollection* m_dbPpmChanCalib;
diff --git a/Trigger/TrigT1/TrigT1CaloCalibTools/share/DecorateL1CaloTriggerTowers_prodJobOFragment.py b/Trigger/TrigT1/TrigT1CaloCalibTools/share/DecorateL1CaloTriggerTowers_prodJobOFragment.py
index 829cda4897fd86ac14bf11b1184be9ef2c582999..be5f98defb9a31878d6ba107b6c87e4620fddeee 100644
--- a/Trigger/TrigT1/TrigT1CaloCalibTools/share/DecorateL1CaloTriggerTowers_prodJobOFragment.py
+++ b/Trigger/TrigT1/TrigT1CaloCalibTools/share/DecorateL1CaloTriggerTowers_prodJobOFragment.py
@@ -7,6 +7,6 @@ include.block( "TrigT1CaloCalibTools/DecorateL1CaloTriggerTowers_prodJobOFragmen
 
 include("TrigT1CaloCalibConditions/L1CaloCalibConditions_jobOptions.py")
 
-ToolSvc += CfgMgr.LVL1__L1CaloxAODOfflineTriggerTowerTools( "LVL1__L1CaloxAODOfflineTriggerTowerTools" )
+triggerTowerTools = CfgMgr.LVL1__L1CaloxAODOfflineTriggerTowerTools( "LVL1__L1CaloxAODOfflineTriggerTowerTools" )
 # decorate L1Calo Trigger Towers
-topSequence += CfgMgr.LVL1__L1CaloTriggerTowerDecoratorAlg( TriggerTowerTools = ToolSvc.LVL1__L1CaloxAODOfflineTriggerTowerTools )
+topSequence += CfgMgr.LVL1__L1CaloTriggerTowerDecoratorAlg( TriggerTowerTools = triggerTowerTools )
diff --git a/Trigger/TrigT1/TrigT1CaloCalibTools/src/L1CaloTriggerTowerDecoratorAlg.cxx b/Trigger/TrigT1/TrigT1CaloCalibTools/src/L1CaloTriggerTowerDecoratorAlg.cxx
index 69bc22f05c675b94853b8922e081e59e8f3e6c77..4204f82e83dac51fb3d92e62a7498453011046ac 100644
--- a/Trigger/TrigT1/TrigT1CaloCalibTools/src/L1CaloTriggerTowerDecoratorAlg.cxx
+++ b/Trigger/TrigT1/TrigT1CaloCalibTools/src/L1CaloTriggerTowerDecoratorAlg.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: L1CaloTriggerTowerDecoratorAlg.cxx 728363 2016-03-08 12:45:29Z amazurov $
@@ -31,17 +31,15 @@ namespace LVL1 {
 L1CaloTriggerTowerDecoratorAlg::L1CaloTriggerTowerDecoratorAlg(
     const std::string& name, ISvcLocator* svcLoc)
     : AthAlgorithm(name, svcLoc),
-      m_sgKey_TriggerTowers(LVL1::TrigT1CaloDefs::xAODTriggerTowerLocation),
       m_caloCellEnergy(""),  // disabled by default
       m_caloCellET(""),      // disabled by default
       m_caloCellEnergyByLayer("CaloCellEnergyByLayer"),
       m_caloCellETByLayer("CaloCellETByLayer"),
       m_caloCellsQuality("CaloCellQuality"),
       m_caloCellEnergyByLayerByReceiver(""),  // disabled by default
-      m_caloCellETByLayerByReceiver("")       // disabled by default
+      m_caloCellETByLayerByReceiver(""),       // disabled by default
+      m_ttTools(this)
 {
-  declareProperty("sgKey_TriggerTowers", m_sgKey_TriggerTowers);
-
   declareProperty("DecorName_caloCellEnergy",
                   m_caloCellEnergy,  // disabled by default
                   "Decoration name - leave empty to disable");
@@ -108,6 +106,8 @@ StatusCode L1CaloTriggerTowerDecoratorAlg::initialize() {
             m_caloCellETByLayerByReceiver);
   }
 
+  CHECK( m_triggerTowerContainerKey.initialize(SG::AllowEmpty) );
+
   // Return gracefully:
   return StatusCode::SUCCESS;
 }
@@ -132,12 +132,11 @@ StatusCode L1CaloTriggerTowerDecoratorAlg::execute() {
   // use decorators to avoid the costly name -> auxid lookup
 
   // Shall I proceed?
-  if (evtStore()->contains<xAOD::TriggerTowerContainer>(
-          m_sgKey_TriggerTowers)) {
+  if (!m_triggerTowerContainerKey.empty()) {
     CHECK(m_ttTools->initCaloCells());
 
-    const xAOD::TriggerTowerContainer* tts(nullptr);
-    CHECK(evtStore()->retrieve(tts, m_sgKey_TriggerTowers));
+    const EventContext& ctx = Gaudi::Hive::currentContext();
+    SG::ReadHandle<xAOD::TriggerTowerContainer> tts (m_triggerTowerContainerKey, ctx);
     for (const auto x : *tts) {
       if (caloCellEnergyDecorator)
         (*caloCellEnergyDecorator)(*x) = m_ttTools->caloCellsEnergy(*x);
diff --git a/Trigger/TrigT1/TrigT1CaloCalibTools/src/L1CaloxAODOfflineTriggerTowerTools.cxx b/Trigger/TrigT1/TrigT1CaloCalibTools/src/L1CaloxAODOfflineTriggerTowerTools.cxx
index 063b38344acbb6e899d0fa8b93e31b2e87a546b6..36535e4219e8da2a3b5da703d205d1b7344a65f5 100644
--- a/Trigger/TrigT1/TrigT1CaloCalibTools/src/L1CaloxAODOfflineTriggerTowerTools.cxx
+++ b/Trigger/TrigT1/TrigT1CaloCalibTools/src/L1CaloxAODOfflineTriggerTowerTools.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 //  ***************************************************************************
 //  *   Author: John Morris (john.morris@cern.ch)                             *
@@ -9,6 +9,7 @@
 // Like it says above, please chop up this code until it does what you want !
 
 #include "TrigT1CaloCalibTools/L1CaloxAODOfflineTriggerTowerTools.h"
+#include "StoreGate/ReadHandle.h"
 
 #include <algorithm> // for std::transform
 #include <iterator> // for std::back_inserter
@@ -24,8 +25,6 @@ namespace LVL1{
     m_caloMgr(nullptr),
     m_lvl1Helper(nullptr),
     m_ttSvc(nullptr),
-    m_sgKey_CaloCells("AllCalo"),
-    m_sgKey_dbPpmChanCalib("/TRIGGER/L1Calo/V1/Calibration/Physics/PprChanCalib"),
     m_dbPpmChanCalib(nullptr)
   {      
   }
@@ -53,8 +52,9 @@ namespace LVL1{
 
     CHECK( svcLoc->service( "ToolSvc",toolSvc  ) );
     CHECK( toolSvc->retrieveTool("CaloTriggerTowerService",m_ttSvc) );
-   
-    
+
+    CHECK( m_caloCellContainerKey.initialize() );
+
     // Return gracefully:    
     return StatusCode::SUCCESS; 
   }
@@ -71,28 +71,13 @@ namespace LVL1{
   StatusCode                                 
   L1CaloxAODOfflineTriggerTowerTools::initCaloCells()
   {
-    if( ! evtStore()->contains< CaloCellContainer >( m_sgKey_CaloCells ) ){
-      ATH_MSG_INFO("Could not find CaloCellContainer with key "<<m_sgKey_CaloCells);
-      return StatusCode::FAILURE;
-    }
-    
-    const CaloCellContainer* cells(nullptr);
-    CHECK( evtStore()->retrieve( cells , m_sgKey_CaloCells ) );
+    SG::ReadHandle<CaloCellContainer> cells (m_caloCellContainerKey);
     m_cells2tt->initCaloCellsTriggerTowers( *cells );
     
     // Return gracefully:
     return StatusCode::SUCCESS;      
   }
   
-  StatusCode                                 
-  L1CaloxAODOfflineTriggerTowerTools::initDatabase()
-  {
-    CHECK( evtStore()->retrieve( m_dbPpmChanCalib , m_sgKey_dbPpmChanCalib ) );
-    
-    // Return gracefully:
-    return StatusCode::SUCCESS;     
-  }
-  
   std::vector<L1CaloRxCoolChannelId>         
   L1CaloxAODOfflineTriggerTowerTools::receivers( const xAOD::TriggerTower& tt ) const
   {
diff --git a/Trigger/TrigT1/TrigT1CaloCalibUtils/python/doL1CaloHVCorrections.py b/Trigger/TrigT1/TrigT1CaloCalibUtils/python/doL1CaloHVCorrections.py
index 6d485980c0fe42f2684838a7257031a9ca9a38a4..aae275eaed59cf8672afca416188bdbd5bff1db7 100644
--- a/Trigger/TrigT1/TrigT1CaloCalibUtils/python/doL1CaloHVCorrections.py
+++ b/Trigger/TrigT1/TrigT1CaloCalibUtils/python/doL1CaloHVCorrections.py
@@ -11,7 +11,7 @@ import time
 import os
 #from ctypes import *
 import struct 
-from array import *
+import array
 
 from PyCool import cool
 from optparse import OptionParser
@@ -21,6 +21,53 @@ import PlotCalibrationHV
 
 import mergeEnergyRamps
 
+class HVCorrectionCOOLReader:
+
+  def __init__(self):
+
+    self.correctionsFromCOOL = {}
+    self.UNIX2COOL = 1000000000
+
+    # get database service and open database
+    dbSvc = cool.DatabaseSvcFactory.databaseService()
+
+    dbString = 'oracle://ATLAS_COOLPROD;schema=ATLAS_COOLONL_TRIGGER;dbname=CONDBR2'
+    try:
+      db = dbSvc.openDatabase(dbString, False)        
+    except Exception, e:
+      print 'Error: Problem opening database', e
+      sys.exit(1)
+
+    folder_name = "/TRIGGER/Receivers/Factors/HVCorrections"
+    folder=db.getFolder(folder_name)
+    ch = folder.listChannels()
+       
+    startUtime = int(time.time())
+    endUtime = int(time.time())
+    startValKey = startUtime * self.UNIX2COOL
+    endValKey = endUtime * self.UNIX2COOL
+    chsel = cool.ChannelSelection(0,sys.maxint)
+
+    try:
+      itr=folder.browseObjects(startValKey, endValKey, chsel)
+    except Exception, e:
+      print e
+      sys.exit(1)
+
+    for row in itr:
+      ReceiverId = hex(int(row.channelId()))
+      payload = row.payload()
+      HVCorrection = payload['factor']
+
+      self.correctionsFromCOOL[ReceiverId] = HVCorrection
+     
+  # close database
+    db.closeDatabase()
+
+  def getCorrection(self, receiver):
+
+    return self.correctionsFromCOOL[receiver]
+
 class HVCorrectionCalculator:
 
   def __init__(self, mapping):
@@ -237,10 +284,24 @@ if __name__ == "__main__":
 
   h_corrEmec_em  = PlotCalibrationGains.L1CaloMap("Calculated HV corrections for EM overlap (EMEC)","#eta bin","#phi bin")
   h_corrFcalHighEta_had = PlotCalibrationGains.L1CaloMap("Calculated HV corrections for HAD FCAL (high #eta)","#eta bin","#phi bin")
+#
+  h_RefcorrEmb_em  = PlotCalibrationGains.L1CaloMap("Reference HV corrections for EM  (EMB in overlap) ","#eta bin","#phi bin")
+  h_RefcorrFcalLowEta_had = PlotCalibrationGains.L1CaloMap("Reference HV corrections for HAD (FCAL low #eta)","#eta bin","#phi bin")
 
+  h_RefcorrEmec_em  = PlotCalibrationGains.L1CaloMap("Reference HV corrections for EM overlap (EMEC)","#eta bin","#phi bin")
+  h_RefcorrFcalHighEta_had = PlotCalibrationGains.L1CaloMap("Reference HV corrections for HAD FCAL (high #eta)","#eta bin","#phi bin")
+#
+  h_DiffcorrEmb_em  = PlotCalibrationGains.L1CaloMap("(calculated-reference) HV corrections for EM  (EMB in overlap) ","#eta bin","#phi bin")
+  h_DiffcorrFcalLowEta_had = PlotCalibrationGains.L1CaloMap("(calculated-reference) HV corrections for HAD (FCAL low #eta)","#eta bin","#phi bin")
+
+  h_DiffcorrEmec_em  = PlotCalibrationGains.L1CaloMap("(calculated-reference) HV corrections for EM overlap (EMEC)","#eta bin","#phi bin")
+  h_DiffcorrFcalHighEta_had = PlotCalibrationGains.L1CaloMap("(calculated-reference) HV corrections for HAD FCAL (high #eta)","#eta bin","#phi bin")
+#
     
   hv_input = PlotCalibrationHV.L1CaloHVReader(options.hv_input) 
 
+  referenceCorrectionReader = HVCorrectionCOOLReader()
+
   geometry_convertor = PlotCalibrationGains.L1CaloGeometryConvertor()
   geometry_convertor.LoadReceiverPPMMap()
 
@@ -348,33 +409,49 @@ if __name__ == "__main__":
     ### check if the channel has overall HV correction larger than the threshold
     
     predictedCorrection = correctionCalculator.GetCorrection(receiver, layer_corr, layer_names)
+    referenceCorrection = referenceCorrectionReader.getCorrection(receiver)
+
+    correctionDifference = (predictedCorrection-referenceCorrection)
+
+#    print "predictedCorrection=", predictedCorrection, "  referenceCorrection=", referenceCorrection
 
-    if abs(predictedCorrection - 1) <= options.hv_corr_diff:
+    if abs(correctionDifference) <= options.hv_corr_diff:                # we update only towers that changed
       continue # skip this receiver, the correction is not high enough
 
     calculatedCorrections[receiver] = [predictedCorrection,0]
-    print >> output_text, ("%5s %9s  %3i %2i  %.3f") % (receiver, coolid, eta_bin, phi_bin, predictedCorrection)
+    print >> output_text, ("%5s %9s  %3i %2i  %.3f (%.3f)") % (receiver, coolid, eta_bin, phi_bin, predictedCorrection,referenceCorrection)
 
 
     if geometry_convertor.isCoolEm(coolid):
       if not geometry_convertor.isPPMOverlap(coolid):
         h_corrEmb_em.Fill(eta_bin,phi_bin,predictedCorrection)
+        h_RefcorrEmb_em.Fill(eta_bin,phi_bin,referenceCorrection)
+        h_DiffcorrEmb_em.Fill(eta_bin,phi_bin,correctionDifference)
       else:
         if geometry_convertor.getOverlapLayer(receiver)=='EMB':
           h_corrEmb_em.Fill(eta_bin,phi_bin,predictedCorrection)
+          h_RefcorrEmb_em.Fill(eta_bin,phi_bin,referenceCorrection)
+          h_DiffcorrEmb_em.Fill(eta_bin,phi_bin,correctionDifference)
         else:
           h_corrEmec_em.Fill(eta_bin,phi_bin,predictedCorrection)
+          h_RefcorrEmec_em.Fill(eta_bin,phi_bin,referenceCorrection)
+          h_DiffcorrEmec_em.Fill(eta_bin,phi_bin,correctionDifference)
 
 
     if geometry_convertor.isCoolHad(coolid):
       if not geometry_convertor.isPPMFCAL(coolid):
         h_corrFcalLowEta_had.Fill(eta_bin,phi_bin,predictedCorrection)
+        h_RefcorrFcalLowEta_had.Fill(eta_bin,phi_bin,referenceCorrection)
+        h_DiffcorrFcalLowEta_had.Fill(eta_bin,phi_bin,correctionDifference)
       else:
         if geometry_convertor.getFCAL23RecEta(receiver)=='HighEta':
           h_corrFcalHighEta_had.Fill(eta_bin,phi_bin,predictedCorrection)
+          h_RefcorrFcalHighEta_had.Fill(eta_bin,phi_bin,referenceCorrection)
+          h_DiffcorrFcalHighEta_had.Fill(eta_bin,phi_bin,correctionDifference)
         else: 
           h_corrFcalLowEta_had.Fill(eta_bin,phi_bin,predictedCorrection)
-
+          h_RefcorrFcalLowEta_had.Fill(eta_bin,phi_bin,referenceCorrection)
+          h_DiffcorrFcalLowEta_had.Fill(eta_bin,phi_bin,correctionDifference)
 
   writeHVToSqlite(options.output_files+".sqlite",calculatedCorrections)
   output_text.close()
@@ -400,8 +477,53 @@ if __name__ == "__main__":
   h_corrFcalHighEta_had.SetMinimum(1.)
   h_corrFcalHighEta_had.SetMaximum(2.1)
   h_corrFcalHighEta_had.Draw()
-  c1.Print(options.output_files+".ps)")
+  c1.Print(options.output_files+".ps")
+
+  # Now corrections from COOL
+
+  h_RefcorrEmb_em.SetMinimum(1.)
+  h_RefcorrEmb_em.SetMaximum(2.1)
+  h_RefcorrEmb_em.Draw()
+  c1.Print(options.output_files+".ps")
+
+  h_RefcorrFcalLowEta_had.SetMinimum(1.)
+  h_RefcorrFcalLowEta_had.SetMaximum(2.1)
+  h_RefcorrFcalLowEta_had.Draw()
+  c1.Print(options.output_files+".ps")
+
+
+  h_RefcorrEmec_em.SetMinimum(1.)
+  h_RefcorrEmec_em.SetMaximum(2.1)
+  h_RefcorrEmec_em.Draw()
+  c1.Print(options.output_files+".ps")
+
+  h_RefcorrFcalHighEta_had.SetMinimum(1.)
+  h_RefcorrFcalHighEta_had.SetMaximum(2.1)
+  h_RefcorrFcalHighEta_had.Draw()
+  c1.Print(options.output_files+".ps")
+
+  # Now difference
+  h_DiffcorrEmb_em.SetMinimum(-0.1)
+  h_DiffcorrEmb_em.SetMaximum(0.1)
+  h_DiffcorrEmb_em.Draw()
+  c1.Print(options.output_files+".ps")
+
+  h_DiffcorrFcalLowEta_had.SetMinimum(-0.1)
+  h_DiffcorrFcalLowEta_had.SetMaximum(0.1)
+  h_DiffcorrFcalLowEta_had.Draw()
+  c1.Print(options.output_files+".ps")
 
+
+  h_DiffcorrEmec_em.SetMinimum(-0.1)
+  h_DiffcorrEmec_em.SetMaximum(0.1)
+  h_DiffcorrEmec_em.Draw()
+  c1.Print(options.output_files+".ps")
+
+  h_DiffcorrFcalHighEta_had.SetMinimum(-0.1)
+  h_DiffcorrFcalHighEta_had.SetMaximum(0.1)
+  h_DiffcorrFcalHighEta_had.Draw()
+  c1.Print(options.output_files+".ps)")
+#
   os.system("ps2pdf " + options.output_files+".ps")
  # os.system("cp HVStatus.pdf /home/jb/public_web/tmp ")
 
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/EmTauROI.h b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/EmTauROI.h
index 072cef6810b9bf0116a2aec37f30222ebcc804a4..4e58979115cfd812492de3a41af16628a2c038ec 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/EmTauROI.h
+++ b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/EmTauROI.h
@@ -8,10 +8,6 @@
     email                : moyse@heppch.ph.qmw.ac.uk
  ***************************************************************************/
 
-/***************************************************************************
- *                                                                         *
- *                                                                         *
- ***************************************************************************/
 
 #ifndef EMTAUROI_H
 #define EMTAUROI_H
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/EnergyRoI.h b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/EnergyRoI.h
index e66eebadbdecea0f7ad2ab63929c3b1ce7d827b3..dc82a0ba7422eb8a1c65b1306de6911086e1a888 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/EnergyRoI.h
+++ b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/EnergyRoI.h
@@ -8,10 +8,6 @@
     email                : e.moyse@qmul.ac.uk
  ***************************************************************************/
 
-/***************************************************************************
- *                                                                         *
- *                                                                         *
- ***************************************************************************/
 
 #ifndef EnergyRoI_H
 #define EnergyRoI_H
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/EnergyTopoData.h b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/EnergyTopoData.h
index 0c23602a585fa2e29ffb576114052c512ce100a7..03519be7f9a24fdc89f2f613ea0f89b07db742e0 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/EnergyTopoData.h
+++ b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/EnergyTopoData.h
@@ -8,10 +8,6 @@
     email                : Alan.Watson@CERN.CH
  ***************************************************************************/
 
-/***************************************************************************
- *                                                                         *
- *                                                                         *
- ***************************************************************************/
 
 #ifndef EnergyTopoData_H
 #define EnergyTopoData_H
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JetEtRoI.h b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JetEtRoI.h
index 1ff934c94bac179b7def4fb92170c66132eeaa5c..0f5f9a755c4c97e8555abd2aaf7c4ff4dda367da 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JetEtRoI.h
+++ b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JetEtRoI.h
@@ -8,10 +8,6 @@
     email                : Alan.Watson@cern.ch
  ***************************************************************************/
 
-/***************************************************************************
- *                                                                         *
- *                                                                         *
- ***************************************************************************/
 
 #ifndef JetEtRoI_H
 #define JetEtRoI_H
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JetROI.h b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JetROI.h
index 1f74548703cbff565daae6ea80b1a39e7263556e..29ea23345779d82e68d8b7e18a60d52cc8d94eaa 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JetROI.h
+++ b/Trigger/TrigT1/TrigT1CaloEvent/TrigT1CaloEvent/JetROI.h
@@ -8,10 +8,6 @@
     email                : moyse@heppch.ph.qmw.ac.uk
  ***************************************************************************/
 
-/***************************************************************************
- *                                                                         *
- *                                                                         *
- ***************************************************************************/
 
 #ifndef JetROI_H
 #define JetROI_H
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/src/CMMCPHits.cxx b/Trigger/TrigT1/TrigT1CaloEvent/src/CMMCPHits.cxx
index d67b9fdff06535633a12707117ea3718c9ea46b6..6705f1b347ca367ce3c9ac1ca89e72f6c602174f 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/src/CMMCPHits.cxx
+++ b/Trigger/TrigT1/TrigT1CaloEvent/src/CMMCPHits.cxx
@@ -8,10 +8,6 @@
     email                : Alan.Watson@cern.ch
  ***************************************************************************/
 
-/***************************************************************************
- *                                                                         *
- *                                                                         *
- ***************************************************************************/
 
 
 
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/src/CMMEtSums.cxx b/Trigger/TrigT1/TrigT1CaloEvent/src/CMMEtSums.cxx
index db978a3a41d8b542961bc360c1507fd48e7eeee0..8e9ea8ed9ff5799d117bf7a58cd4f20f0e77747a 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/src/CMMEtSums.cxx
+++ b/Trigger/TrigT1/TrigT1CaloEvent/src/CMMEtSums.cxx
@@ -8,10 +8,6 @@
     email                : Alan.Watson@cern.ch
  ***************************************************************************/
 
-/***************************************************************************
- *                                                                         *
- *                                                                         *
- ***************************************************************************/
 
 
 
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/src/CMMJetHits.cxx b/Trigger/TrigT1/TrigT1CaloEvent/src/CMMJetHits.cxx
index 4b9ca8f2fceb0fd7ce85d5447633cc0d66f4a4cc..34ccb2c7a0a878e983c09823f3b9d04501d55712 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/src/CMMJetHits.cxx
+++ b/Trigger/TrigT1/TrigT1CaloEvent/src/CMMJetHits.cxx
@@ -8,10 +8,6 @@
     email                : Alan.Watson@cern.ch
  ***************************************************************************/
 
-/***************************************************************************
- *                                                                         *
- *                                                                         *
- ***************************************************************************/
 
 
 
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/src/CMXCPHits.cxx b/Trigger/TrigT1/TrigT1CaloEvent/src/CMXCPHits.cxx
index 2d04027934983ab3935cefe7e6cbb7ae35ef0151..e35ccdd3f0c96f6fed8b39465855dbd02001d4c3 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/src/CMXCPHits.cxx
+++ b/Trigger/TrigT1/TrigT1CaloEvent/src/CMXCPHits.cxx
@@ -2,10 +2,6 @@
   Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
-/***************************************************************************
- *                                                                         *
- *                                                                         *
- ***************************************************************************/
 
 
 
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/src/CMXCPTob.cxx b/Trigger/TrigT1/TrigT1CaloEvent/src/CMXCPTob.cxx
index 86dc79f7afa75ae4e27329b1d9a5a27ca71c1ee0..e7c8c2ddecc3dc6cfd3900d180540866a46a040e 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/src/CMXCPTob.cxx
+++ b/Trigger/TrigT1/TrigT1CaloEvent/src/CMXCPTob.cxx
@@ -2,10 +2,6 @@
   Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
-/***************************************************************************
- *                                                                         *
- *                                                                         *
- ***************************************************************************/
 
 
 
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/src/CMXEtSums.cxx b/Trigger/TrigT1/TrigT1CaloEvent/src/CMXEtSums.cxx
index 52e02fb0420248fdc354605f1f33e1fdf3760c62..25a70e1d424994a3670cd382e70440231e9b73c3 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/src/CMXEtSums.cxx
+++ b/Trigger/TrigT1/TrigT1CaloEvent/src/CMXEtSums.cxx
@@ -2,10 +2,6 @@
   Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
-/***************************************************************************
- *                                                                         *
- *                                                                         *
- ***************************************************************************/
 
 
 
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/src/CMXJetHits.cxx b/Trigger/TrigT1/TrigT1CaloEvent/src/CMXJetHits.cxx
index 79b7a57c846afc647707d9f34673a91ff480f67e..98234d3a5367b50b8a0f8f70cf867dfb3ee936bd 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/src/CMXJetHits.cxx
+++ b/Trigger/TrigT1/TrigT1CaloEvent/src/CMXJetHits.cxx
@@ -2,10 +2,6 @@
   Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
-/***************************************************************************
- *                                                                         *
- *                                                                         *
- ***************************************************************************/
 
 
 
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/src/CMXJetTob.cxx b/Trigger/TrigT1/TrigT1CaloEvent/src/CMXJetTob.cxx
index 0f675694748eea808716e4813a3f4e91c24d5da6..f07f78a7524340e11084302a868a9f3dbc95d201 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/src/CMXJetTob.cxx
+++ b/Trigger/TrigT1/TrigT1CaloEvent/src/CMXJetTob.cxx
@@ -2,10 +2,6 @@
   Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
-/***************************************************************************
- *                                                                         *
- *                                                                         *
- ***************************************************************************/
 
 
 
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/src/CPMHits.cxx b/Trigger/TrigT1/TrigT1CaloEvent/src/CPMHits.cxx
index 7629e94a32650c07596edf347e1c6f97906de03e..389a0aaee4886724f911009a6d95559afcb7edb1 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/src/CPMHits.cxx
+++ b/Trigger/TrigT1/TrigT1CaloEvent/src/CPMHits.cxx
@@ -8,10 +8,6 @@
     email                : Alan.Watson@cern.ch
  ***************************************************************************/
 
-/***************************************************************************
- *                                                                         *
- *                                                                         *
- ***************************************************************************/
 
 
 
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/src/CPMTower.cxx b/Trigger/TrigT1/TrigT1CaloEvent/src/CPMTower.cxx
index 56a639b45a2a7d1ff560d87a89ef079e8da92423..327ebea748260c7b9e0e3879da30a0362ad0f1d1 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/src/CPMTower.cxx
+++ b/Trigger/TrigT1/TrigT1CaloEvent/src/CPMTower.cxx
@@ -8,10 +8,6 @@
         email                : Alan.Watson@cern.ch
  ***************************************************************************/
 
-/***************************************************************************
- *                                                                         *
- *                                                                         *
- ***************************************************************************/
 
 #include "TrigT1CaloEvent/CPMTower.h"
 
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/src/EmTauROI.cxx b/Trigger/TrigT1/TrigT1CaloEvent/src/EmTauROI.cxx
index 8b47e2c8f7a636796a03bcbb06282c47036fa5f7..1eaf153d97d140c313b7731cd96ef86a7f1d4a36 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/src/EmTauROI.cxx
+++ b/Trigger/TrigT1/TrigT1CaloEvent/src/EmTauROI.cxx
@@ -8,10 +8,6 @@
     email                : moyse@heppch.ph.qmw.ac.uk
  ***************************************************************************/
 
-/***************************************************************************
- *                                                                         *
- *                                                                         *
- ***************************************************************************/
 
 #include "TrigT1CaloEvent/EmTauROI.h"
 
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/src/JEMEtSums.cxx b/Trigger/TrigT1/TrigT1CaloEvent/src/JEMEtSums.cxx
index 96577d76cdcbe72a7884c670aa51ceb5c1e2fcae..ee081d1c99a20e3cc0b3e80b52ba838d7cd10782 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/src/JEMEtSums.cxx
+++ b/Trigger/TrigT1/TrigT1CaloEvent/src/JEMEtSums.cxx
@@ -8,10 +8,6 @@
     email                : Alan.Watson@cern.ch
  ***************************************************************************/
 
-/***************************************************************************
- *                                                                         *
- *                                                                         *
- ***************************************************************************/
 
 
 
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/src/JEMHits.cxx b/Trigger/TrigT1/TrigT1CaloEvent/src/JEMHits.cxx
index c011351eea24270a580d7c41ffece27671e0bb43..c1993a44e444aac0a8fafaf1bd0f27e3e61b4310 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/src/JEMHits.cxx
+++ b/Trigger/TrigT1/TrigT1CaloEvent/src/JEMHits.cxx
@@ -8,10 +8,6 @@
     email                : Alan.Watson@cern.ch
  ***************************************************************************/
 
-/***************************************************************************
- *                                                                         *
- *                                                                         *
- ***************************************************************************/
 
 
 
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/src/JetElement.cxx b/Trigger/TrigT1/TrigT1CaloEvent/src/JetElement.cxx
index fae3804eb13d65cbd938316178bd38df388d4db6..70f1ff3372b960f7ddde20dda41617e2329f1e1c 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/src/JetElement.cxx
+++ b/Trigger/TrigT1/TrigT1CaloEvent/src/JetElement.cxx
@@ -8,10 +8,6 @@
     email                : e.moyse@qmw.ac.uk
  ***************************************************************************/
 
-/***************************************************************************
- *                                                                         *
- *                                                                         *
- ***************************************************************************/
 
 
 
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/src/JetInput.cxx b/Trigger/TrigT1/TrigT1CaloEvent/src/JetInput.cxx
index c31aff9743cd7e580fa95cf017de9c09635fb5a7..ed9afc4877c6f63c490b356c346f280e6b31945f 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/src/JetInput.cxx
+++ b/Trigger/TrigT1/TrigT1CaloEvent/src/JetInput.cxx
@@ -8,10 +8,6 @@
     email                : Alan.Watson@cern.ch
  ***************************************************************************/
 
-/***************************************************************************
- *                                                                         *
- *                                                                         *
- ***************************************************************************/
 
 
 
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/src/JetROI.cxx b/Trigger/TrigT1/TrigT1CaloEvent/src/JetROI.cxx
index 493378aa1c5b2a3e6890d91bd8bb40d3264099ae..df43670b901c6b7c7b6444c68dfc75ee1ae6dd4c 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/src/JetROI.cxx
+++ b/Trigger/TrigT1/TrigT1CaloEvent/src/JetROI.cxx
@@ -8,10 +8,6 @@
     email                : moyse@heppch.ph.qmw.ac.uk
  ***************************************************************************/
 
-/***************************************************************************
- *                                                                         *
- *                                                                         *
- ***************************************************************************/
 
 #include "TrigT1CaloEvent/JetROI.h"
 namespace LVL1 {
diff --git a/Trigger/TrigT1/TrigT1CaloEvent/src/TriggerTower.cxx b/Trigger/TrigT1/TrigT1CaloEvent/src/TriggerTower.cxx
index acf3379fd6b6d40f3917a1354118c5d0eb4ddb70..43aa9ece90251e22e3d465d009458da40dc9f2b3 100755
--- a/Trigger/TrigT1/TrigT1CaloEvent/src/TriggerTower.cxx
+++ b/Trigger/TrigT1/TrigT1CaloEvent/src/TriggerTower.cxx
@@ -8,10 +8,6 @@
     email                : e.moyse@qmw.ac.uk
  ***************************************************************************/
 
-/***************************************************************************
- *                                                                         *
- *                                                                         *
- ***************************************************************************/
 
 #include "TrigT1CaloEvent/TriggerTower.h"
 
diff --git a/Trigger/TrigT1/TrigT1CaloMonitoring/CMakeLists.txt b/Trigger/TrigT1/TrigT1CaloMonitoring/CMakeLists.txt
index 0102e0d48da957ead688e1c38f0c811bf4ef1999..453a16b1344be85cc641c57b35be2343b111e1bc 100644
--- a/Trigger/TrigT1/TrigT1CaloMonitoring/CMakeLists.txt
+++ b/Trigger/TrigT1/TrigT1CaloMonitoring/CMakeLists.txt
@@ -36,6 +36,7 @@ atlas_depends_on_subdirs( PRIVATE
                           Trigger/TrigT1/TrigT1CaloEvent
                           Trigger/TrigT1/TrigT1CaloMonitoringTools
                           Trigger/TrigT1/TrigT1CaloToolInterfaces
+                          Trigger/TrigT1/TrigT1CaloCondSvc
                           Trigger/TrigT1/TrigT1CaloUtils
                           Trigger/TrigT1/TrigT1Interfaces )
 
@@ -48,7 +49,7 @@ atlas_add_component( TrigT1CaloMonitoring
                      src/*.cxx
                      src/components/*.cxx
                      INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} CaloEvent CaloIdentifier AthenaMonitoringLib AthContainers SGTools StoreGateLib SGtests AthenaPoolUtilities Identifier EventInfo xAODJet xAODTrigL1Calo xAODEgamma GaudiKernel AnalysisTriggerEvent JetInterface TileConditionsLib TileEvent LWHists VxVertex TrigDecisionToolLib TrigConfL1Data TrigT1CaloCalibConditions TrigT1CaloCalibToolInterfaces TrigT1CaloCalibToolsLib TrigT1CaloEventLib TrigT1CaloMonitoringToolsLib TrigT1CaloToolInterfaces TrigT1CaloUtilsLib TrigT1Interfaces )
+                     LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} CaloEvent CaloIdentifier AthenaMonitoringLib AthContainers SGTools StoreGateLib SGtests AthenaPoolUtilities Identifier EventInfo xAODJet xAODTrigL1Calo xAODEgamma GaudiKernel AnalysisTriggerEvent JetInterface TileConditionsLib TileEvent LWHists VxVertex TrigDecisionToolLib TrigConfL1Data TrigT1CaloCalibConditions TrigT1CaloCalibToolInterfaces TrigT1CaloCalibToolsLib TrigT1CaloEventLib TrigT1CaloMonitoringToolsLib TrigT1CaloToolInterfaces TrigT1CaloUtilsLib TrigT1Interfaces TrigT1CaloCondSvcLib )
 
 # Install files from the package:
 atlas_install_headers( TrigT1CaloMonitoring )
diff --git a/Trigger/TrigT1/TrigT1CaloMonitoring/share/TrigT1CaloMonitoring_forRecExCommission_Run1.py b/Trigger/TrigT1/TrigT1CaloMonitoring/share/TrigT1CaloMonitoring_forRecExCommission_Run1.py
index 749265418431e7f2292a6f2a828cc231c5e8328d..3d3e33ca0ae7d3166806f84e663c1dae7dd23239 100644
--- a/Trigger/TrigT1/TrigT1CaloMonitoring/share/TrigT1CaloMonitoring_forRecExCommission_Run1.py
+++ b/Trigger/TrigT1/TrigT1CaloMonitoring/share/TrigT1CaloMonitoring_forRecExCommission_Run1.py
@@ -321,7 +321,7 @@ if l1caloRawMon:
         #                                                       )
         #     #from AthenaCommon.AppMgr import ToolSvc
         #     ToolSvc += JetCleaningTool('JetCleaningLooseTool')
-        #      #ToolSvc += JetCleaningTool('JetCleaningMediumTool')
+        #     # ToolSvc += JetCleaningTool('JetCleaningMediumTool')
         #     ToolSvc += JetCleaningTool('JetCleaningTightTool')
         #     L1JetEfficienciesMonTool.JetCleaningLooseTool = ConfiguredJetCleaningTool_Loose("JetCleaningLooseTool")       
         #     # L1JetEfficienciesMonTool.JetCleaningMediumTool = ConfiguredJetCleaningTool_Medium("JetCleaningMediumTool")
diff --git a/Trigger/TrigT1/TrigT1CaloMonitoring/share/TrigT1CaloMonitoring_forRecExCommission_Run2.py b/Trigger/TrigT1/TrigT1CaloMonitoring/share/TrigT1CaloMonitoring_forRecExCommission_Run2.py
old mode 100644
new mode 100755
index e15e73e900be5b2fc5d9f41cc184d522b85e84bd..2bde474a0d54e35a9f03f8858ab4e6e824bf9937
--- a/Trigger/TrigT1/TrigT1CaloMonitoring/share/TrigT1CaloMonitoring_forRecExCommission_Run2.py
+++ b/Trigger/TrigT1/TrigT1CaloMonitoring/share/TrigT1CaloMonitoring_forRecExCommission_Run2.py
@@ -3,7 +3,7 @@
 # Standard monitoring jobOptions - runs on Tier0 (Reco_tf.py) or online.
 #
 # @authors Johanna Fleckner, Andrea Neusiedl, Peter Faulkner
-#
+
 if not 'DQMonFlags' in dir():
     print "TrigT1CaloMonitoring_forRecExCommission.py: DQMonFlags not yet imported - I import them now"
     from AthenaMonitoring.DQMonFlags import DQMonFlags
@@ -73,7 +73,7 @@ if l1caloRawMon:
         #from AthenaServices.AthenaServicesConf import MetaDataSvc
         #svcMgr += MetaDataSvc("MetaDataSvc")
         #svcMgr.IOVDbSvc.Folders += ["<dbConnection>sqlite://;schema=;dbname=L1CALO</dbConnection>/TRIGGER/L1Calo/V1/References/FineTimeReferences"]
-                
+
         from IOVDbSvc.CondDB import conddb
         conddb.addFolder("TRIGGER","/TRIGGER/L1Calo/V1/References/FineTimeReferences")
         doFineTime = True
@@ -153,17 +153,42 @@ if l1caloRawMon:
         #ToolSvc += L1PPrMonTool
         L1CaloMan.AthenaMonTools += [L1PPrMonTool]
 
+
+        if isData and rec.triggerStream() == "Mistimed":
+
+            #======================================================================
+            #=================== Monitoring of the Mistimed Stream ================
+            #======================================================================
+            from TrigT1CaloMonitoring.TrigT1CaloMonitoringConf import LVL1__MistimedStreamMon
+
+            from AthenaCommon.JobProperties import jobproperties
+            L1MistimedStreamTool = LVL1__MistimedStreamMon(
+                name="L1MistimedStreamTool",
+                #OnlineTest = True,
+                #OutputLevel = DEBUG
+            )
+            # ToolSvc += L1MistimedStreamTool
+            L1CaloMan.AthenaMonTools += [L1MistimedStreamTool]
+
+            from TrigT1CaloCondSvc.TrigT1CaloCondSvcConf import L1CaloCondSvc
+            ServiceMgr += L1CaloCondSvc()
+            from IOVDbSvc.CondDB import conddb
+            conddb.addFolderWithTag("TRIGGER","/TRIGGER/L1Calo/V1/Conditions/RunParameters","HEAD")
+            conddb.addFolderWithTag("TRIGGER","/TRIGGER/L1Calo/V2/Configuration/ReadoutConfig","HEAD")
+
         if isData:
 
             from TrigT1CaloMonitoring.TrigT1CaloMonitoringConf import LVL1__PPMSimBSMon
             PPMSimBSMonTool = LVL1__PPMSimBSMon("PPMSimBSMonTool")
             #ToolSvc += PPMSimBSMonTool
             L1CaloMan.AthenaMonTools += [PPMSimBSMonTool]
-            #ToolSvc.PPMSimBSMonTool.OutputLevel = DEBUG
             from TrigT1CaloTools.TrigT1CaloToolsConf import LVL1__L1TriggerTowerTool
             L1TriggerTowerTool = LVL1__L1TriggerTowerTool("L1TriggerTowerTool")
             ToolSvc += L1TriggerTowerTool
-            #ToolSvc.L1TriggerTowerTool.OutputLevel = DEBUG
+            from TrigT1CaloCondSvc.TrigT1CaloCondSvcConf import L1CaloCondSvc
+            ServiceMgr += L1CaloCondSvc()
+            from IOVDbSvc.CondDB import conddb
+            conddb.addFolderWithTag("TRIGGER","/TRIGGER/L1Calo/V1/Conditions/RunParameters","HEAD")
 
             #--------------------------------- PPM Spare Channels--------------
             from TrigT1CaloMonitoring.TrigT1CaloMonitoringConf import LVL1__PPrSpareMon
@@ -172,7 +197,7 @@ if l1caloRawMon:
                 ADCHitMap_Thresh=40,
                 PathInRootFile="L1Calo/PPM/SpareChannels",
                 ErrorPathInRootFile="L1Calo/PPM/SpareChannels/Errors",
-                #OutputLevel = DEBUG	
+                #OutputLevel = DEBUG
             )
             #ToolSvc += L1PPrSpareMonTool
             L1CaloMan.AthenaMonTools += [L1PPrSpareMonTool]
@@ -278,8 +303,8 @@ if l1caloRawMon:
 
             #==================================================================
             #===================== Tag & Probe Efficiencies  ==================
-            #==================================================================           
-            
+            #==================================================================
+
             from TrigT1CaloMonitoring.TrigT1CaloMonitoringConf import LVL1__TagProbeEfficiencyMon
             TagProbeEfficiencyMonTool = LVL1__TagProbeEfficiencyMon("TagProbeEfficiencyMonTool")
             #ToolSvc += TagProbeEfficiencyMonTool
diff --git a/Trigger/TrigT1/TrigT1CaloMonitoring/src/JEPSimMon.cxx b/Trigger/TrigT1/TrigT1CaloMonitoring/src/JEPSimMon.cxx
index 009858d58ff959f8df56ae11c2bbc6efd85cce0b..e2ef971e520c93b653b990d707b5b793a6547210 100644
--- a/Trigger/TrigT1/TrigT1CaloMonitoring/src/JEPSimMon.cxx
+++ b/Trigger/TrigT1/TrigT1CaloMonitoring/src/JEPSimMon.cxx
@@ -910,7 +910,7 @@ StatusCode JEPSimMon::fillHistograms()
     compare(cmxTobSimMap, ctMap, errorsJEM, errorsCMX);
     cmxTobSimMap.clear();
     
-    // Sasha: Delate later, will use simulated tobs later since data tobs does not
+    // Sasha: Delete later, will use simulated tobs later since data tobs does not
     // contains overflow bits
     // delete cmxTobSIM;
     // delete cmxTobSIMAux;
@@ -930,17 +930,12 @@ StatusCode JEPSimMon::fillHistograms()
     }
     CmxJetHitsMap cmxLocalSimMap;
     setupMap(cmxLocalSIM, cmxLocalSimMap);
-    //SASHA
     compare(cmxLocalSimMap, chMap, errorsCMX,
             xAOD::CMXJetHits::Sources::LOCAL_MAIN);
-    // for(auto p: chMap){
-    //     auto key = p.first;
-    //     auto v = p.second;
-    //     ATH_MSG_INFO("SASHA0 DAT " << *v);
-    //     if (cmxLocalSimMap.find(key) != cmxLocalSimMap.end()){
-    //         ATH_MSG_INFO("SASHA0 SIM " << *cmxLocalSimMap[key] << std::endl);
-    //     }
-    // }
+    
+    dumpDataAndSim("Compare Local sums simulated from CMX TOBs with Local sums from data",
+        chMap, cmxLocalSimMap);
+
     cmxLocalSimMap.clear();
     delete cmxLocalSIM;
     delete cmxLocalSIMAux;
@@ -1029,6 +1024,10 @@ StatusCode JEPSimMon::fillHistograms()
     compare(cmxEtLocalSimMap, csMap, errorsCMX,
             xAOD::CMXEtSums::Sources::LOCAL_STANDARD);
 
+    dumpDataAndSim(
+        "Compare Local sums simulated from CMXEtSums with Local sums from data",
+        csMap, cmxEtLocalSimMap);
+
     cmxEtLocalSimMap.clear();
     delete cmxEtLocalSIM;
     delete cmxEtLocalSIMAux;
@@ -1054,6 +1053,11 @@ StatusCode JEPSimMon::fillHistograms()
     setupMap(cmxEtTotalSIM, cmxEtTotalSimMap);
     compare(cmxEtTotalSimMap, csMap, errorsCMX,
             xAOD::CMXEtSums::Sources::TOTAL_STANDARD);
+    
+    dumpDataAndSim(
+      "Compare Total sums simulated from Remote sums with Total sums from data",
+       csMap, cmxEtTotalSimMap
+    );
 
     cmxEtTotalSimMap.clear();
     delete cmxEtTotalSIM;
@@ -1077,6 +1081,12 @@ StatusCode JEPSimMon::fillHistograms()
     setupMap(cmxSumEtSIM, cmxSumEtSimMap);
     compare(cmxSumEtSimMap, csMap, errorsCMX,
               xAOD::CMXEtSums::Sources::SUM_ET_STANDARD);
+    
+    dumpDataAndSim(
+      "Compare Et Maps (sumEt/missingEt/missingEtSig) simulated from Total sums",
+      csMap, cmxSumEtSimMap
+    );
+    
 
     cmxSumEtSimMap.clear();
     delete cmxSumEtSIM;
@@ -2538,9 +2548,18 @@ void JEPSimMon::compare(const CmxEtSumsMap &cmxSimMap,
             cmxEy = cmxD->ey();
             if (!etmaps)
             {
-                cmxSimEt |= ((cmxS->etError() & 0x1) << 15);
-                cmxSimEx |= ((cmxS->exError() & 0x1) << 15);
-                cmxSimEy |= ((cmxS->eyError() & 0x1) << 15);
+                if (source == xAOD::CMXEtSums::Sources::LOCAL_RESTRICTED || source == xAOD::CMXEtSums::Sources::TOTAL_RESTRICTED)
+                {
+                  // Take error bits from data!
+                  cmxSimEt |= ((cmxD->etError() & 0x1) << 15);
+                  cmxSimEx |= ((cmxD->exError() & 0x1) << 15);
+                  cmxSimEy |= ((cmxD->eyError() & 0x1) << 15);
+                } else {
+                  cmxSimEt |= ((cmxS->etError() & 0x1) << 15);
+                  cmxSimEx |= ((cmxS->exError() & 0x1) << 15);
+                  cmxSimEy |= ((cmxS->eyError() & 0x1) << 15);
+                }
+
                 cmxEt |= ((cmxD->etError() & 0x1) << 15);
                 cmxEx |= ((cmxD->exError() & 0x1) << 15);
                 cmxEy |= ((cmxD->eyError() & 0x1) << 15);
diff --git a/Trigger/TrigT1/TrigT1CaloMonitoring/src/JEPSimMon.h b/Trigger/TrigT1/TrigT1CaloMonitoring/src/JEPSimMon.h
index 3abc2b1743558373209e08f51693f5d10effaebb..48b71c51736951066d88ff9d160f357a9ab1b8f5 100644
--- a/Trigger/TrigT1/TrigT1CaloMonitoring/src/JEPSimMon.h
+++ b/Trigger/TrigT1/TrigT1CaloMonitoring/src/JEPSimMon.h
@@ -320,6 +320,10 @@ private:
   /// Load ROD Headers
   void  loadRodHeaders();
 
+  template <typename T>
+  void dumpDataAndSim(const std::string& msg, const std::map<int, T*>& data,
+                         const std::map<int, T*>& sim);
+
   /// CMX-Jet simulation tool
   ToolHandle<LVL1::IL1JetCMXTools>            m_jetCmxTool;
   /// JEM RoI simulation tool
@@ -462,6 +466,22 @@ private:
 
 };
 
+template <typename T> inline
+void JEPSimMon::dumpDataAndSim(const std::string& msg, const std::map<int, T*>& data,
+                    const std::map<int, T*>& sim) {
+  if (!m_debug) return;
+
+  ATH_MSG_DEBUG(msg);
+  for (const auto& p : data) {
+    ATH_MSG_DEBUG(" DAT " << *p.second);
+    auto itSim =  sim.find(p.first);
+    if (itSim != sim.end()) {
+      ATH_MSG_DEBUG(" SIM " << *itSim->second << std::endl);
+    }
+  }
+  ATH_MSG_DEBUG("End Compare");
+  }
+
 } // end namespace
 
 #endif
diff --git a/Trigger/TrigT1/TrigT1CaloMonitoring/src/MistimedStreamMon.cxx b/Trigger/TrigT1/TrigT1CaloMonitoring/src/MistimedStreamMon.cxx
new file mode 100755
index 0000000000000000000000000000000000000000..204b57c586d845aed4bd440d35914fe87bb05ad0
--- /dev/null
+++ b/Trigger/TrigT1/TrigT1CaloMonitoring/src/MistimedStreamMon.cxx
@@ -0,0 +1,717 @@
+/*
+  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+*/
+
+#include <cmath>
+#include "GaudiKernel/MsgStream.h"
+#include "GaudiKernel/StatusCode.h"
+#include "SGTools/StlVectorClids.h"
+
+#include "LWHists/LWHist.h"
+#include "LWHists/TH1F_LW.h"
+
+#include "AthenaMonitoring/AthenaMonManager.h"
+
+#include "EventInfo/EventInfo.h"
+#include "EventInfo/EventID.h"
+
+#include "TrigT1Interfaces/TrigT1CaloDefs.h"
+
+#include "TrigDecisionTool/TrigDecisionTool.h"
+
+#include "TrigT1CaloMonitoringTools/ITrigT1CaloMonErrorTool.h"
+#include "TrigT1CaloMonitoringTools/TrigT1CaloLWHistogramTool.h"
+#include "TrigT1CaloToolInterfaces/IL1TriggerTowerTool.h"
+#include "TrigT1CaloCalibConditions/L1CaloCoolChannelId.h"
+
+#include "TrigT1CaloEvent/TriggerTowerCollection.h"
+#include "TrigT1CaloEvent/TriggerTower_ClassDEF.h"
+#include "TrigT1CaloUtils/DataError.h"
+
+//for the 80MHz functionality (db access)
+#include "TrigT1CaloCondSvc/L1CaloCondSvc.h"
+#include "TrigT1CaloCalibConditions/L1CaloRunParameters.h"  
+#include "TrigT1CaloCalibConditions/L1CaloRunParametersContainer.h"  
+#include "TrigT1CaloCalibConditions/L1CaloReadoutConfig.h"  
+#include "TrigT1CaloCalibConditions/L1CaloReadoutConfigContainer.h"  
+
+#include "xAODTrigL1Calo/TriggerTowerContainer.h"
+#include "xAODTrigL1Calo/TriggerTowerAuxContainer.h"
+#include "xAODTrigL1Calo/CPMTowerContainer.h"
+#include "xAODTrigL1Calo/JetElementContainer.h"
+
+#include "AthenaPoolUtilities/AthenaAttributeList.h"
+
+
+#include "MistimedStreamMon.h"
+// ============================================================================
+namespace LVL1 {
+// ============================================================================
+MistimedStreamMon::MistimedStreamMon(const std::string & type, const std::string & name, const IInterface* parent): ManagedMonitorToolBase ( type, name, parent ),
+      m_errorTool("LVL1::TrigT1CaloMonErrorTool/TrigT1CaloMonErrorTool"),
+      m_histTool("LVL1::TrigT1CaloLWHistogramTool/TrigT1CaloLWHistogramTool"),            m_ttTool("LVL1::L1TriggerTowerTool/L1TriggerTowerTool"), // can provide coolID, prob. not needed
+      m_trigDec("Trig::TrigDecisionTool/TrigDecisionTool"),
+      m_histBooked(false),
+      m_h_1d_cutFlow_mistimedStreamAna(0),
+      m_h_1d_selectedEvents_mistimedStreamAna(0),
+      m_l1CondSvc("L1CaloCondSvc",name),
+      m_maxHistos(1),
+      m_curHistos(0),
+      m_thistSvc("THistSvc", name)
+{
+     declareProperty("PathInRootFile", m_PathInRootFile = "L1Calo/MistimedStream");
+     declareProperty("TrigDecisionTool", m_trigDec, "The tool to access TrigDecision" );
+     declareProperty("BS_xAODTriggerTowerContainer", m_xAODTriggerTowerContainerName = LVL1::TrigT1CaloDefs::xAODTriggerTowerLocation);
+     declareProperty("maxHistos",m_maxHistos = 1);
+}
+
+MistimedStreamMon::~MistimedStreamMon()
+{
+}
+
+#ifndef PACKAGE_VERSION
+#define PACKAGE_VERSION "unknown"
+#endif
+
+/*---------------------------------------------------------*/
+StatusCode MistimedStreamMon::initialize()
+/*---------------------------------------------------------*/
+{
+  ATH_MSG_INFO("Initializing " << name() << " - package version " << PACKAGE_VERSION);
+
+  CHECK(ManagedMonitorToolBase::initialize());
+  CHECK(m_errorTool.retrieve());
+  CHECK(m_histTool.retrieve());
+  CHECK(m_ttTool.retrieve());
+  CHECK(m_trigDec.retrieve());
+  CHECK(m_l1CondSvc.retrieve());
+
+  return StatusCode::SUCCESS;
+
+}
+
+/*---------------------------------------------------------*/
+
+StatusCode MistimedStreamMon::finalize()
+{
+  //delete things here
+  return StatusCode::SUCCESS;
+}
+
+bool MistimedStreamMon::pulseQuality(std::vector<uint16_t> ttPulse, int peakSlice) {
+     
+    bool goodPulse = true;
+    
+    int a = ttPulse[peakSlice-1];
+    int b = ttPulse[peakSlice];
+    int c = ttPulse[peakSlice+1];
+    double tim = (0.5*a-0.5*c)/(a+c-2*b);
+    double wid = (a+c-64.0)/(b-32.0);
+    if ( tim < 0.0 ) goodPulse = false;
+    if ( tim > 0.3 ) goodPulse = false;
+    if ( wid < 1.0 ) goodPulse = false;
+    if ( wid > 1.6 ) goodPulse = false;             
+//     std::cout<<"Pulse qual= "<< goodPulse<<" tim = "<<tim<<" wid = "<<wid <<std::endl;
+//     std::cout<<"a = "<< a <<" b = "<<b<<" c = "<<c <<std::endl;
+    return goodPulse;
+}
+
+/*---------------------------------------------------------*/
+StatusCode MistimedStreamMon:: retrieveConditions()
+/*---------------------------------------------------------*/
+{
+  ATH_MSG_VERBOSE("PPMSimBSMon::retrieveConditions");
+  if (m_l1CondSvc) {
+    ATH_MSG_VERBOSE( "Retrieving Run Parameters Containers" );
+    CHECK_WITH_CONTEXT(m_l1CondSvc->retrieve(m_runParametersContainer),"MistimedStreamMon");
+    if (std::cbegin(*m_runParametersContainer) == std::cend(*m_runParametersContainer)) {
+      ATH_MSG_ERROR("Empty L1CaloRunParametersContainer");
+      return StatusCode::FAILURE;
+    }
+    ATH_MSG_VERBOSE( "Retrieving Readount Configuration Containers" );
+    CHECK_WITH_CONTEXT(m_l1CondSvc->retrieve(m_readoutConfigContainer),"MistimedStreamMon");
+    if (std::cbegin(*m_readoutConfigContainer) == std::cend(*m_readoutConfigContainer)) {
+      ATH_MSG_ERROR("Empty L1CaloReadoutConfigContainer");
+      return StatusCode::FAILURE;
+    }
+
+  }else{
+    ATH_MSG_ERROR("L1CondSvc not present!");
+  }
+
+  return StatusCode::SUCCESS;
+}
+
+/*---------------------------------------------------------*/
+void MistimedStreamMon::fillEtaPhiMap(TH2F* hist, double eta, double phi, double weight, bool shrinkEtaBins)
+/*---------------------------------------------------------*/
+{
+  double phiMod = phi * (32./M_PI);
+  double etaMod = eta;
+  const double absEta = fabs(eta);
+  if (absEta > 3.2) {
+    if (shrinkEtaBins) {
+      etaMod = 2.9 + 0.1*(absEta-3.2)/0.425;
+      if (eta < 0.) etaMod = -etaMod;
+    }
+    // Fill four bins in phi
+    phiMod = floor(phiMod/4)*4. + 2.;
+    hist->Fill(etaMod, phiMod + 1.5, weight);
+    hist->Fill(etaMod, phiMod + 0.5, weight);
+    hist->Fill(etaMod, phiMod - 0.5, weight);
+    hist->Fill(etaMod, phiMod - 1.5, weight);
+  } else if (absEta > 2.5) {
+    if (shrinkEtaBins) {
+      etaMod = (absEta > 3.1) ? 2.85 : 2.5 + (absEta-2.5)/2.;
+      if (eta < 0.) etaMod = -etaMod;
+    }
+    // Fill two bins in phi
+    phiMod = floor(phiMod/2)*2. + 1.;
+    hist->Fill(etaMod, phiMod + 0.5, weight);
+    hist->Fill(etaMod, phiMod - 0.5, weight);
+  } else hist->Fill(eta, phiMod, weight);
+}
+
+
+/*---------------------------------------------------------*/
+TH2F* MistimedStreamMon::createEtaPhiMap(std::string name, std::string title, bool isHADLayer, bool shrinkEtaBins) 
+/*---------------------------------------------------------*/
+{
+  // construct ppmEtaPhi Histo (modified from TrigT1CaloLWHistogramTool, but without the booking
+  TH2F* hist = 0;
+  TAxis* axis = 0;
+  if (shrinkEtaBins) {
+     hist = new TH2F(name.c_str(), title.c_str(), 66, -3.3, 3.3, 64, 0., 64.); 
+     hist->SetOption("colz");
+     axis = hist->GetXaxis();
+     for (int ch = -25; ch < 25; ch+=4) {
+       int chan = ch;
+       if (chan >= -1) ++chan;
+       const double eta = (chan/10.)+0.05;
+       std::ostringstream cnum;
+       cnum << chan << "/" << std::setiosflags(std::ios::fixed | std::ios::showpoint) << std::setprecision(2) << eta;       
+       axis->SetBinLabel(chan+34, cnum.str().c_str());
+     }
+     axis->SetBinLabel(1, "-49/-4.41");
+     axis->SetBinLabel(5, "-32/-3.15");
+     axis->SetBinLabel(62, "31/3.15");
+     axis->SetBinLabel(66, "44/4.41");
+  } else {
+    const int nxbins = 66;
+    const double xbins[nxbins+1] = {-4.9,-4.475,-4.050,-3.625,-3.2,-3.1,-2.9,
+                                    -2.7,-2.5,-2.4,-2.3,-2.2,-2.1,-2.0,-1.9,
+  				    -1.8,-1.7,-1.6,-1.5,-1.4,-1.3,-1.2,-1.1,
+				    -1.0,-0.9,-0.8,-0.7,-0.6,-0.5,-0.4,-0.3,
+				    -0.2,-0.1,0.0,0.1,0.2,0.3,0.4,0.5,0.6,0.7,
+				    0.8,0.9,1.0,1.1,1.2,1.3,1.4,1.5,1.6,1.7,
+				    1.8,1.9,2.0,2.1,2.2,2.3,2.4,2.5,2.7,2.9,
+				    3.1,3.2,3.625,4.050,4.475,4.9};
+    hist = new TH2F(name.c_str(), title.c_str(), nxbins, xbins, 64, 0., 64.); 
+    hist->SetOption("colz");                  
+    hist->SetXTitle("eta");
+  }
+
+  axis = hist->GetYaxis();
+  const double phiBin     = M_PI/32.;
+  const double halfPhiBin = M_PI/64.;
+  for (int chan = 0; chan < 64; chan += 4 ) {
+    const double rad = chan*phiBin + halfPhiBin;
+    std::ostringstream lab;
+    lab << chan << "/" << std::setiosflags(std::ios::fixed | std::ios::showpoint) << std::setprecision(2) << rad;          
+    axis->SetBinLabel(chan+1, lab.str().c_str());
+  }
+  if (shrinkEtaBins) axis->SetBinLabel(64, "etaVphi");
+  else               axis->SetBinLabel(64, "phi");
+  
+  // now relabel the outer bins for the HAD Layer
+  if (shrinkEtaBins && isHADLayer) {
+    axis = hist->GetXaxis();    
+    axis->SetBinLabel(1, "-49/-4.17");
+    axis->SetBinLabel(66, "44/4.19");
+  }
+  
+  return hist;  
+}
+
+/*---------------------------------------------------------*/
+StatusCode MistimedStreamMon::bookHistogramsRecurrent() // based on bookHistogramsRecurrent from PPrMon
+/*---------------------------------------------------------*/
+{
+  if (msgLvl(MSG::DEBUG))
+    msg(MSG::DEBUG) << "in MistimedStreamMon::bookHistograms" << endmsg;
+  
+  MgmtAttr_t attr = ATTRIB_UNMANAGED;
+
+  if (newRunFlag()) {
+
+    // create MonGroup with the folder to store histos
+    MonGroup TT_MistimedMon(this, m_PathInRootFile, run, attr);
+    m_histTool->setMonGroup(&TT_MistimedMon);
+  
+    // overview histograms (only one per run)
+    m_h_1d_selectedEvents_mistimedStreamAna =
+        m_histTool->book1F("1d_selectedEvents_mistimedStreamAna",
+                           "Selected events per lumi block by the MistimedStream analysis",
+                           9999, 0, 9999); // this plot will "only" cover 9999 lumi blocks
+    m_h_1d_cutFlow_mistimedStreamAna =
+        m_histTool->book1F("1d_cutFlow_mistimedStreamAna",
+                           "Total events selected by the MistimedStream analysis for this run",
+                           10, 0, 10); // overall cutflow plot
+   
+    m_h_1d_cutFlow_mistimedStreamAna->GetXaxis()->SetBinLabel( 1, "All" );
+    m_h_1d_cutFlow_mistimedStreamAna->GetXaxis()->SetBinLabel( 2, "unsuitable readout" );
+    m_h_1d_cutFlow_mistimedStreamAna->GetXaxis()->SetBinLabel( 3, "HLT_mistimemonj400" );
+    m_h_1d_cutFlow_mistimedStreamAna->GetXaxis()->SetBinLabel( 4, "L1_J100" );
+    m_h_1d_cutFlow_mistimedStreamAna->GetXaxis()->SetBinLabel( 5, "<= 4 bad peak TT" );
+    m_h_1d_cutFlow_mistimedStreamAna->GetXaxis()->SetBinLabel( 6, "<= 4 bad central TT" );
+    m_h_1d_cutFlow_mistimedStreamAna->GetXaxis()->SetBinLabel( 7, "<= 4 bad late TT" );
+    m_h_1d_cutFlow_mistimedStreamAna->GetXaxis()->SetBinLabel( 8, ">= 2 late TT" );
+    m_h_1d_cutFlow_mistimedStreamAna->GetXaxis()->SetBinLabel( 9, "<= 3 in-time" );
+    m_h_1d_cutFlow_mistimedStreamAna->GetXaxis()->SetBinLabel(10, ">= 1 significant TT in EM layer" );
+      
+    m_histTool->unsetMonGroup();
+    if (newRunFlag())
+      m_histBooked = true;
+  }
+
+  return StatusCode::SUCCESS;
+}
+
+
+StatusCode MistimedStreamMon::fillHistograms()
+{
+ const bool debug = msgLvl(MSG::DEBUG);
+  if (debug)
+    msg(MSG::DEBUG) << "in fillHistograms()" << endmsg;
+
+  if (!m_histBooked) {
+    if (debug)
+      msg(MSG::DEBUG) << "Histogram(s) not booked" << endmsg;
+    return StatusCode::SUCCESS;
+  }
+
+  // Skip events believed to be corrupt
+  if (m_errorTool->corrupt()) {
+    if (debug)
+      msg(MSG::DEBUG) << "Skipping corrupt event" << endmsg;
+    return StatusCode::SUCCESS;
+  }
+
+  // Retrieve TriggerTowers from SG
+  const xAOD::TriggerTowerContainer_v2 *TriggerTowerTES = 0;
+  StatusCode sc =
+      evtStore()->retrieve(TriggerTowerTES, m_xAODTriggerTowerContainerName);
+  if (sc.isFailure() || !TriggerTowerTES) {
+    if (debug)
+      msg(MSG::DEBUG) << "No TriggerTower found in TES at "
+                      << m_xAODTriggerTowerContainerName << endmsg;
+    return StatusCode::SUCCESS;
+  }
+
+  //Create container for the decorated TT, as well as auxiliary container holding the actual properties
+  xAOD::TriggerTowerContainer*    ttContainer = new xAOD::TriggerTowerContainer;
+  xAOD::TriggerTowerAuxContainer* ttAuxContainer = new xAOD::TriggerTowerAuxContainer;
+  // To tell the TT container in which auxiliary container it should write its member variables
+  ttContainer->setStore(ttAuxContainer); //gives it a new associated aux container
+  //Object holding the decoration, to optimize access speed
+  xAOD::TriggerTower::Decorator<float> myDecoration("pulseClassification");
+  
+  //Get CPM Towers for LUT_CP
+  const xAOD::CPMTowerContainer* cpmTowCon = 0;
+  CHECK(evtStore()->retrieve(cpmTowCon,"CPMTowers")); 
+  
+  //Get Jet Elements for LUT-JEP
+  const xAOD::JetElementContainer* jetEleCon = 0;
+  CHECK(evtStore()->retrieve(jetEleCon,"JetElements")); 
+  
+  //Get readout info from data base
+  if(this->retrieveConditions().isFailure()) {
+      REPORT_MESSAGE(MSG::WARNING);
+      return StatusCode::FAILURE;
+  }
+  
+  m_readoutConfigContainer->readoutConfig(6);
+  
+  unsigned int readoutConfigID = std::cbegin(*m_runParametersContainer)->readoutConfigID();
+  unsigned int channelID = 0;
+  unsigned int numFadcSlices = 0; 
+  unsigned int l1aFadcSlice = 0; 
+  unsigned int readout80ModePpm = 0;
+  //the readout config ID tells you, which readoutConfig is loaded. now you can retrieve the l1aFadcSlice from this DB entry
+  for(const auto& it: *m_readoutConfigContainer){
+    if (it.channelId() == readoutConfigID){
+        channelID = it.channelId();
+        numFadcSlices = it.numFadcSlices();
+        l1aFadcSlice = it.l1aFadcSlice();
+        readout80ModePpm = it.readout80ModePpm();
+    }
+  }
+  
+  if(msgLvl(MSG::DEBUG)){
+    ATH_MSG_VERBOSE("ReadoutConfigID = " << readoutConfigID );
+    ATH_MSG_VERBOSE("ChannelID = " << channelID );
+    ATH_MSG_VERBOSE("numFadcSlices = " << numFadcSlices );
+    ATH_MSG_VERBOSE("l1aFadcSlice = " << l1aFadcSlice );
+    ATH_MSG_VERBOSE("readout80ModePpm = " << readout80ModePpm );
+  } 
+
+//   std::cout<<"readoutConfigID = "<<readoutConfigID<<std::endl;
+//   std::cout<<"ChannelID = "<<channelID<<std::endl;
+//   std::cout<<"numFadcSlices = "<<numFadcSlices<<std::endl;
+//   std::cout<<"l1aFadcSlice = "<<l1aFadcSlice<<std::endl;
+//   std::cout<<"readout80ModePpm = "<<readout80ModePpm<<std::endl;
+  
+  // Retrieve EventInfo from SG and save lumi block number, global event number and run number
+  unsigned int lumiNo = 0;
+  unsigned int currentRunNo = 0;
+  unsigned int currentEventNo = 0;
+  const EventInfo *evInfo = 0;
+  sc = evtStore()->retrieve(evInfo);
+  if (sc.isFailure() || !evInfo) {
+    if (debug)
+      msg(MSG::DEBUG) << "No EventInfo found" << endmsg;
+  } else {
+    const EventID *evID = evInfo->event_ID();
+    if (evID) {
+      lumiNo = evID->lumi_block();
+      currentRunNo = evID->run_number();
+      currentEventNo = evID->event_number();
+    }
+  }
+  m_h_1d_cutFlow_mistimedStreamAna->Fill(0.5);
+
+  //for the algorithm to run, we need the 2 adc slices before and after the l1a-slice
+  //add some readout compatibility checks of the algo here
+  if(readout80ModePpm){
+     if(numFadcSlices < 9){
+       msg(MSG::DEBUG) << "Number of ADC slices < 9 for 80 MHz readout, algorithm cannot run, aborting..." << endmsg;
+       return StatusCode::SUCCESS;
+     }
+     if(l1aFadcSlice < 4){
+       msg(MSG::DEBUG) << "L1a readout pointer < 4 for 80 MHz readout, algorithm cannot run, aborting..." << endmsg;
+       return StatusCode::SUCCESS;
+     }
+     if(numFadcSlices - l1aFadcSlice < 4){
+       msg(MSG::DEBUG) << "L1a readout pointer is at "<< l1aFadcSlice << " with "<< numFadcSlices << "slices at 80 MHz readout mode, algorithm cannot run, aborting..." << endmsg;
+       return StatusCode::SUCCESS;
+     } 
+  }else{
+     if(numFadcSlices < 5){
+       msg(MSG::DEBUG) << "Number of ADC slices < 5 for 40 MHz readout, algorithm cannot run, aborting..." << endmsg;
+       return StatusCode::SUCCESS;
+     }
+     if(l1aFadcSlice < 2){
+       msg(MSG::DEBUG) << "L1a readout pointer < 2 for 40 MHz readout, algorithm cannot run, aborting..." << endmsg;
+       return StatusCode::SUCCESS;
+     } 
+     if(numFadcSlices - l1aFadcSlice < 2){
+       msg(MSG::DEBUG) << "L1a readout pointer is at "<< l1aFadcSlice << " with "<< numFadcSlices << "slices at 40 MHz readout mode, algorithm cannot run, aborting..." << endmsg;
+       return StatusCode::SUCCESS;
+     }  
+  }   
+  m_h_1d_cutFlow_mistimedStreamAna->Fill(1.5);
+  
+  //Select events that fired HLT_mistimedmonj400
+  if(! (m_trigDec->isPassed("HLT_mistimemonj400",TrigDefs::requireDecision))){
+    return StatusCode::SUCCESS;
+  }
+  m_h_1d_cutFlow_mistimedStreamAna->Fill(2.5);
+
+  //Only select events which passed the L1_J100
+  if(! (m_trigDec->isPassed("L1_J100"))){
+    return StatusCode::SUCCESS;
+  }
+  m_h_1d_cutFlow_mistimedStreamAna->Fill(3.5);
+
+  // now classify the tower signals by looking at their FADC counts, if it exceeds 70
+  int satCounter = 0; // saturated TT
+  int badCounter = 0; // category 2 really bad
+  int bad2Counter = 0; // category 4 bad peak 2 
+  int bad3Counter = 0; // category 6 bad peak 3 
+  int good3Counter = 0; // category 5 good peak 3 
+  int good2Counter = 0; // category 5 good peak 3 
+  int emActivityCounter = 0; //count number of TT in EM layer with ADC > 70 
+
+  // =====================================================================
+  // ================= Container: TriggerTower ===========================
+  // =====================================================================
+  
+  xAOD::TriggerTowerContainer_v2::const_iterator TriggerTowerIterator = 
+      TriggerTowerTES->begin();
+  xAOD::TriggerTowerContainer_v2::const_iterator TriggerTowerIteratorEnd =
+      TriggerTowerTES->end();
+  
+  for (; TriggerTowerIterator != TriggerTowerIteratorEnd;
+       ++TriggerTowerIterator) {
+    auto vecIndexTT = std::distance( TriggerTowerTES->begin(), TriggerTowerIterator ) ;
+    float ttPulseCategory = 0;
+    std::vector<uint16_t> ttADC = TriggerTowerTES->at(vecIndexTT)->adc();
+    //Check which RunParameters are set in COOL database -> modify acd input accordingly
+    // need to know: - readout mode (40 or 80MHz)
+    //               - central slice position
+    //               - number of readout slices (== .adc().size())
+ 
+    std::vector<uint16_t> readoutCorrectedADC; //this is the standard readout ADC vector: 5 40MHz samples with l1A in the middle
+    if(!readout80ModePpm){//40 MHz
+       //just acess the acd vector, as the sanity checks where done above
+       readoutCorrectedADC.push_back(ttADC.at(l1aFadcSlice-2));
+       readoutCorrectedADC.push_back(ttADC.at(l1aFadcSlice-1));
+       readoutCorrectedADC.push_back(ttADC.at(l1aFadcSlice));
+       readoutCorrectedADC.push_back(ttADC.at(l1aFadcSlice+1));
+       readoutCorrectedADC.push_back(ttADC.at(l1aFadcSlice+2));
+    }else{//80 MHz
+       readoutCorrectedADC.push_back(ttADC.at(l1aFadcSlice-4));
+       readoutCorrectedADC.push_back(ttADC.at(l1aFadcSlice-2));
+       readoutCorrectedADC.push_back(ttADC.at(l1aFadcSlice));
+       readoutCorrectedADC.push_back(ttADC.at(l1aFadcSlice+2));
+       readoutCorrectedADC.push_back(ttADC.at(l1aFadcSlice+4));
+    }
+  
+    // retrieve max ADC value and position, this seems to be buggy in the DAOD
+    auto maxValIterator = std::max_element(readoutCorrectedADC.begin(), readoutCorrectedADC.end());
+    int maxADCval = *maxValIterator;
+    int adcPeakPositon = std::distance(std::begin(readoutCorrectedADC), maxValIterator);
+    
+    if(maxADCval < 70){
+       ttPulseCategory = 0.1;
+    }else if(maxADCval == 1023) {
+        satCounter++;
+        ttPulseCategory = 1;
+        if(!TriggerTowerTES->at(vecIndexTT)->layer()) emActivityCounter++;
+    }else{
+        bool goodQual = pulseQuality(readoutCorrectedADC, adcPeakPositon);
+        if(!TriggerTowerTES->at(vecIndexTT)->layer()) emActivityCounter++;
+        //look at any of the five FADC values
+        if(adcPeakPositon == 2){ // can be class 3 or 4 now
+          if(goodQual){
+             good2Counter++;
+             ttPulseCategory = 3;
+          }else{
+             bad2Counter++;
+             ttPulseCategory = 4;
+          }
+        }else if(adcPeakPositon == 3){ // can be class 5 or 6 now
+           if(goodQual){
+             good3Counter++;
+             ttPulseCategory = 5;
+           }else{
+             bad3Counter++;
+             ttPulseCategory = 6;
+           }
+        }else{
+          //this is class 2 - really bad
+          badCounter++;
+          ttPulseCategory = 2;
+      }
+    }
+    // decorate the TT in order to have to recompute the pulse categorisation
+    xAOD::TriggerTower* newTT = new xAOD::TriggerTower; //create a new TT object
+    ttContainer->push_back(newTT); // add the newTT to new output TT container (at the end of it)
+    *newTT = *TriggerTowerTES->at(vecIndexTT); // copy over all information from TT to newTT
+    newTT->auxdata<float>("pulseClassification") = ttPulseCategory; //decorate
+//     myDecoration(*newJet) = 10.0; // same decoration with a Decorator (faster)
+  }
+  
+  if(badCounter > 4){
+    //reject events with more than 4 wrongly peaked towers
+    return StatusCode::SUCCESS;
+  }
+  m_h_1d_cutFlow_mistimedStreamAna->Fill(4.5);
+ 
+  if(bad2Counter > 4){
+    //reject events with more than 4 pulses peaking in slice 2 that are badly timed or mis-shapen
+    return StatusCode::SUCCESS;
+  }
+  m_h_1d_cutFlow_mistimedStreamAna->Fill(5.5);
+  
+  if(bad3Counter > 4){
+    //reject events with more than 4 pulses peaking in slice 3 that are badly timed or mis-shapen
+    return StatusCode::SUCCESS;
+  }
+  m_h_1d_cutFlow_mistimedStreamAna->Fill(6.5);
+  
+  if(good3Counter < 2){
+    //reject events with less than 2 pulses nicely peaking in slice 3 
+    return StatusCode::SUCCESS;
+  }
+  m_h_1d_cutFlow_mistimedStreamAna->Fill(7.5);
+   
+  if(good2Counter > 2){
+    //reject events with more than 2 pulses nicely peaking in slice 2 to avoid event being triggered by pileup 
+    return StatusCode::SUCCESS;
+  }
+  m_h_1d_cutFlow_mistimedStreamAna->Fill(8.5);
+  
+  if(!emActivityCounter){
+    //reject events with no activity in the EM layer
+    return StatusCode::SUCCESS;
+  }
+  m_h_1d_cutFlow_mistimedStreamAna->Fill(9.5);
+
+  if(m_curHistos < m_maxHistos){
+
+    //adding the histos dynamically using THistSvc into an event-specific sub-directory
+    // Construct a subdirectory name for the histograms:
+    std::ostringstream fullPathInFile;
+    fullPathInFile  << "/" << m_fileKey << "/" << "run_" << AthenaMonManager::runNumber() << "/" << m_PathInRootFile << "/run_" << std::to_string(currentRunNo) << "_event_" << std::to_string(currentEventNo) << "/";
+  
+    std::string name, title;
+    name = "em_2d_etaPhi_tt_classification_mistimedStreamAna";
+    title = "#eta - #phi Map of TT classification, EM layer: event no. " + std::to_string(currentEventNo) + " in lb. " + std::to_string(lumiNo) + " of run " + std::to_string(currentRunNo);
+    TH2F *emClass = createEtaPhiMap(name, title);
+    CHECK(m_thistSvc->regHist(fullPathInFile.str() + name.c_str(), emClass));
+    
+    name = "had_2d_etaPhi_tt_classification_mistimedStreamAna";
+    title = "#eta - #phi Map of TT classification, HAD layer: event no. " + std::to_string(currentEventNo) + " in lb. " + std::to_string(lumiNo) + " of run " + std::to_string(currentRunNo);
+    TH2F *hadClass = createEtaPhiMap(name, title, true);
+    CHECK(m_thistSvc->regHist(fullPathInFile.str() + name.c_str(), hadClass));
+  
+    name = "em_2d_etaPhi_tt_pseBits_mistimedStreamAna";
+    title = "#eta - #phi Map of TT PSE Bits, EM layer: event no. " + std::to_string(currentEventNo) + " in lb. " + std::to_string(lumiNo) + " of run " + std::to_string(currentRunNo);
+    TH2F *emPSE = createEtaPhiMap(name, title);
+    CHECK(m_thistSvc->regHist(fullPathInFile.str() + name.c_str(), emPSE));
+  
+    name = "had_2d_etaPhi_tt_pseBits_mistimedStreamAna";
+    title = "#eta - #phi Map of TT PSE Bits, HAD layer: event no. " + std::to_string(currentEventNo) + " in lb. " + std::to_string(lumiNo) + " of run " + std::to_string(currentRunNo);
+    TH2F *hadPSE = createEtaPhiMap(name, title, true);
+    CHECK(m_thistSvc->regHist(fullPathInFile.str() + name.c_str(), hadPSE));
+  
+    // histos for the LUT values. They show a combination of CP (central) and JEP (forward) output 
+    name = "em_2d_etaPhi_tt_lut0_mistimedStreamAna";
+    title = "#eta - #phi Map of TT LUT in timeslice 0 = BCID-1, EM layer: event no. " + std::to_string(currentEventNo) + " in lb. " + std::to_string(lumiNo) + " of run " + std::to_string(currentRunNo);
+    TH2F *emLUT0 = createEtaPhiMap(name, title);
+    CHECK(m_thistSvc->regHist(fullPathInFile.str() + name.c_str(), emLUT0));
+    
+    name = "had_2d_etaPhi_tt_lut0_mistimedStreamAna";
+    title = "#eta - #phi Map of TT LUT in timeslice 0 = BCID-1, HAD layer: event no. " + std::to_string(currentEventNo) + " in lb. " + std::to_string(lumiNo) + " of run " + std::to_string(currentRunNo);
+    TH2F *hadLUT0 = createEtaPhiMap(name, title, true);
+    CHECK(m_thistSvc->regHist(fullPathInFile.str() + name.c_str(), hadLUT0));
+    
+    name = "em_2d_etaPhi_tt_lut1_mistimedStreamAna";
+    title = "#eta - #phi Map of TT LUT in timeslice 1 = BCID, EM layer: event no. " + std::to_string(currentEventNo) + " in lb. " + std::to_string(lumiNo) + " of run " + std::to_string(currentRunNo);
+    TH2F *emLUT1 = createEtaPhiMap(name, title);
+    CHECK(m_thistSvc->regHist(fullPathInFile.str() + name.c_str(), emLUT1));
+  
+    name = "had_2d_etaPhi_tt_lut1_mistimedStreamAna";
+    title = "#eta - #phi Map of TT LUT in timeslice 1 = BCID, HAD layer: event no. " + std::to_string(currentEventNo) + " in lb. " + std::to_string(lumiNo) + " of run " + std::to_string(currentRunNo);
+    TH2F *hadLUT1 = createEtaPhiMap(name, title, true);
+    CHECK(m_thistSvc->regHist(fullPathInFile.str() + name.c_str(), hadLUT1));
+  
+    name = "em_2d_etaPhi_tt_lut2_mistimedStreamAna";
+    title = "#eta - #phi Map of TT LUT in timeslice 2 = BCID+1, EM layer: event no. " + std::to_string(currentEventNo) + " in lb. " + std::to_string(lumiNo) + " of run " + std::to_string(currentRunNo);
+    TH2F *emLUT2 = createEtaPhiMap(name, title);
+    CHECK(m_thistSvc->regHist(fullPathInFile.str() + name.c_str(), emLUT2));
+  
+    name = "had_2d_etaPhi_tt_lut2_mistimedStreamAna";
+    title = "#eta - #phi Map of TT LUT in timeslice 2 = BCID+1, HAD layer: event no. " + std::to_string(currentEventNo) + " in lb. " + std::to_string(lumiNo) + " of run " + std::to_string(currentRunNo);
+    TH2F *hadLUT2 = createEtaPhiMap(name, title, true);
+    CHECK(m_thistSvc->regHist(fullPathInFile.str() + name.c_str(), hadLUT2));
+    
+    
+    // loop over the decorated TTcollection to fill the classification and pse histos
+    for(auto decoratedIterator = ttContainer->begin() ; decoratedIterator != ttContainer->end() ; ++decoratedIterator ){
+  
+        const int layer = (*decoratedIterator)->layer();
+        const double eta = (*decoratedIterator)->eta();
+        const double phi = (*decoratedIterator)->phi();
+        const float pulseCat = (*decoratedIterator)->auxdata<float>("pulseClassification");
+        uint8_t bcidWord = (*decoratedIterator)->bcidVec()[0]; // look at the status bit in the central time slice. Hard coded for now as we do the 5 slice check above
+          
+        // Check if TT is in EM or HAD layer:
+        if (layer == 0) { //========== ELECTROMAGNETIC LAYER =========================
+            fillEtaPhiMap(emClass, eta, phi, pulseCat);
+            if(pulseCat > 0.5) fillEtaPhiMap(emPSE, eta, phi, (unsigned int)bcidWord);
+        }
+        else if(layer == 1) { //========== HADRONIC LAYER ===============================
+            fillEtaPhiMap(hadClass, eta, phi, pulseCat);
+            if(pulseCat > 0.5) fillEtaPhiMap(hadPSE, eta, phi, (unsigned int)bcidWord);
+        }
+     }
+  
+     //loop over the cpm tower container to fill the lut histos 
+     for(auto thisCT:*cpmTowCon){
+        double eta = thisCT->eta();
+        double phi = thisCT->phi();
+        std::vector<uint8_t> cpmEMenergy = thisCT->emEnergyVec();
+        std::vector<uint8_t> cpmHADenergy = thisCT->hadEnergyVec();
+  
+        if(cpmEMenergy.size() > 2){ // expect 3 slices to be read out
+            fillEtaPhiMap(emLUT0, eta, phi, (int) cpmEMenergy.at(0));
+            fillEtaPhiMap(emLUT1, eta, phi, (int) cpmEMenergy.at(1));
+            fillEtaPhiMap(emLUT2, eta, phi, (int) cpmEMenergy.at(2));
+        }
+        if(cpmHADenergy.size() > 2){
+            fillEtaPhiMap(hadLUT0, eta, phi, (int) cpmHADenergy.at(0));
+            fillEtaPhiMap(hadLUT1, eta, phi, (int) cpmHADenergy.at(1));
+            fillEtaPhiMap(hadLUT2, eta, phi, (int) cpmHADenergy.at(2));
+        }
+      }
+      // and the jet element container for the forward region
+      for(auto thisJE:*jetEleCon){
+        double eta = thisJE->eta();
+        double phi = thisJE->phi();
+        int signeta = 1;
+        if(eta < 0) signeta = -1;
+        std::vector<uint16_t> jepEMenergy = thisJE->emJetElementETVec();
+        std::vector<uint16_t> jepHADenergy = thisJE->hadJetElementETVec();
+        
+        if (eta < -2.5 || eta > 2.5) {// Use JEP info to fill the forward part of the lut plots, but since this has TT granularity we have to play some tricks
+           if(jepEMenergy.size() > 2){
+             fillEtaPhiMap(emLUT0, eta, phi, (int)jepEMenergy.at(0));
+             fillEtaPhiMap(emLUT1, eta, phi, (int)jepEMenergy.at(1));
+             fillEtaPhiMap(emLUT2, eta, phi, (int)jepEMenergy.at(2));           
+             if (eta < -3.2 || eta > 3.2) {//for the FCal, the jep elements eta will be 4.05 -> to mimic this in the PPM histo histos fill 3 more bins in eta 
+                fillEtaPhiMap(emLUT0, signeta*4.7, phi, (int)jepEMenergy.at(0));
+                fillEtaPhiMap(emLUT1, signeta*4.7, phi, (int)jepEMenergy.at(1));
+                fillEtaPhiMap(emLUT2, signeta*4.7, phi, (int)jepEMenergy.at(2));
+                fillEtaPhiMap(emLUT0, signeta*3.7, phi, (int)jepEMenergy.at(0));
+                fillEtaPhiMap(emLUT1, signeta*3.7, phi, (int)jepEMenergy.at(1));
+                fillEtaPhiMap(emLUT2, signeta*3.7, phi, (int)jepEMenergy.at(2));
+                fillEtaPhiMap(emLUT0, signeta*3.5, phi, (int)jepEMenergy.at(0));
+                fillEtaPhiMap(emLUT1, signeta*3.5, phi, (int)jepEMenergy.at(1));
+                fillEtaPhiMap(emLUT2, signeta*3.5, phi, (int)jepEMenergy.at(2));    
+             }else if (eta < -2.9 || eta > 2.9) {//here the jep element eta will be 3.05 -> to mimic this in the PPM histo fill one more eta bin
+                fillEtaPhiMap(emLUT0, signeta*3.15, phi, (int)jepEMenergy.at(0));
+                fillEtaPhiMap(emLUT1, signeta*3.15, phi, (int)jepEMenergy.at(1));
+                fillEtaPhiMap(emLUT2, signeta*3.15, phi, (int)jepEMenergy.at(2));   
+              } 
+           }
+           if(jepHADenergy.size()> 2){
+             fillEtaPhiMap(hadLUT0, eta, phi, (int)jepHADenergy.at(0));
+             fillEtaPhiMap(hadLUT1, eta, phi, (int)jepHADenergy.at(1));
+             fillEtaPhiMap(hadLUT2, eta, phi, (int)jepHADenergy.at(2));   
+             if (eta < -3.2 || eta > 3.2) {//for the FCal, the jep elements are summed horizontally, mimic this in the TH2TT histos -> fill 3 more bins in eta
+               fillEtaPhiMap(hadLUT0, signeta*4.7, phi, (int)jepHADenergy.at(0));
+               fillEtaPhiMap(hadLUT1, signeta*4.7, phi, (int)jepHADenergy.at(1));
+               fillEtaPhiMap(hadLUT2, signeta*4.7, phi, (int)jepHADenergy.at(2));
+               fillEtaPhiMap(hadLUT0, signeta*3.7, phi, (int)jepHADenergy.at(0));
+               fillEtaPhiMap(hadLUT1, signeta*3.7, phi, (int)jepHADenergy.at(1));
+               fillEtaPhiMap(hadLUT2, signeta*3.7, phi, (int)jepHADenergy.at(2));
+               fillEtaPhiMap(hadLUT0, signeta*3.5, phi, (int)jepHADenergy.at(0));
+               fillEtaPhiMap(hadLUT1, signeta*3.5, phi, (int)jepHADenergy.at(1));
+               fillEtaPhiMap(hadLUT2, signeta*3.5, phi, (int)jepHADenergy.at(2));     
+             }else if (eta < -2.9 || eta > 2.9) {
+               fillEtaPhiMap(hadLUT0, signeta*3.15, phi, (int)jepHADenergy.at(0));
+               fillEtaPhiMap(hadLUT1, signeta*3.15, phi, (int)jepHADenergy.at(1));
+               fillEtaPhiMap(hadLUT2, signeta*3.15, phi, (int)jepHADenergy.at(2));
+	     } 
+	   }
+	}
+      }
+      
+      m_curHistos++;
+  }
+
+
+  m_h_1d_selectedEvents_mistimedStreamAna->Fill(lumiNo);
+  
+  //dont forget to delete the decorated TTcontainers
+  delete ttContainer;
+  delete ttAuxContainer;
+ 
+  return StatusCode::SUCCESS;
+}
+
+// ============================================================================
+} // end namespace
+// ============================================================================
diff --git a/Trigger/TrigT1/TrigT1CaloMonitoring/src/MistimedStreamMon.h b/Trigger/TrigT1/TrigT1CaloMonitoring/src/MistimedStreamMon.h
new file mode 100755
index 0000000000000000000000000000000000000000..10c96eac99eff46ab479a68d95070052af635dc2
--- /dev/null
+++ b/Trigger/TrigT1/TrigT1CaloMonitoring/src/MistimedStreamMon.h
@@ -0,0 +1,132 @@
+/*
+  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+*/
+
+// ********************************************************************
+//
+// NAME:        MistimedStreamMon.h
+// PACKAGE:     TrigT1CaloMonitoring
+//
+// Author:      Julia I. Djuvsland (julia.djuvsland@kip.uni-heidelberg.de)
+//              Sebastian M. Weber (sebastian.weber@kip.uni-heidelberg.de)
+//              Universitaet Heidelberg
+//
+// ********************************************************************
+
+#ifndef TRIGT1CALOMONITORING_MISTIMEDSTREAMMON_H
+#define TRIGT1CALOMONITORING_MISTIMEDSTREAMMON_H
+
+#include <string>
+#include <vector>
+
+#include "AthenaMonitoring/ManagedMonitorToolBase.h"
+#include "GaudiKernel/ToolHandle.h"
+#include "GaudiKernel/ServiceHandle.h"
+#include "GaudiKernel/IIncidentListener.h"
+
+#include "xAODTrigL1Calo/TriggerTower.h"
+#include "xAODTrigL1Calo/TriggerTowerContainer.h"
+#include "AthenaMonitoring/ManagedMonitorToolBase.h"
+
+class TH1F_LW;
+
+class L1CaloCondSvc;
+class L1CaloRunParametersContainer;
+class L1CaloReadoutConfigContainer;
+
+class StatusCode;
+class EventInfo;
+class ITHistSvc;
+
+namespace Trig {
+  class TrigDecisionTool;
+}
+
+// ============================================================================
+namespace LVL1 {
+// ============================================================================
+// Forward declarations:
+// ============================================================================
+class IL1TriggerTowerTool;
+class ITrigT1CaloMonErrorTool;
+class TrigT1CaloLWHistogramTool;
+
+/** This class monitors events that fired the trigger HLT_mistimemonj400
+ *  to spot potential late or mistimed trigger towers, but will also pick up noise
+ *
+ *  <b>ROOT Histogram Directories (Tier0):</b>
+ *
+ *  <table>
+ *  <tr><th> Directory                                    </th><th> Contents               </th></tr>
+ *  <tr><td> @c L1Calo/MistimedStream/EventsPerLumiBlock  </td><td> Selected events per lumiblock <br>
+ *  </table>
+ *
+ *
+ *  @authors Julia I. Djuvsland, Sebastian M. Weber
+ *
+ * */
+
+class MistimedStreamMon: public ManagedMonitorToolBase
+{
+
+ public:
+  
+  MistimedStreamMon(const std::string & type, const std::string & name,const IInterface* parent);
+  virtual ~MistimedStreamMon();
+
+  virtual StatusCode initialize();
+  virtual StatusCode finalize();
+  virtual StatusCode bookHistogramsRecurrent();
+  virtual StatusCode fillHistograms();
+  
+private:
+    
+  StatusCode retrieveConditions();
+  void fillEtaPhiMap(TH2F* hist, double eta, double phi, double weight, bool shrinkEtaBins = true);
+  TH2F* createEtaPhiMap(std::string name, std::string title, bool isHADLayer = false, bool shrinkEtaBins = true);
+  bool pulseQuality(std::vector<uint16_t> ttPulse, int peakSlice);
+   
+  /// Tool to retrieve bytestream errors
+  ToolHandle<ITrigT1CaloMonErrorTool>   m_errorTool;
+  /// Histogram helper tool
+  ToolHandle<TrigT1CaloLWHistogramTool> m_histTool;
+  /// TT simulation tool for Identifiers
+  ToolHandle<LVL1::IL1TriggerTowerTool> m_ttTool;
+  /// Tool to retrieve the trigger decision
+  ToolHandle<Trig::TrigDecisionTool> m_trigDec;
+
+  /// Histograms booked flag
+  bool m_histBooked;
+  // Histograms
+  
+  // Overview histos
+  // Overall selected events and cut flow of analysis
+  TH1F_LW* m_h_1d_cutFlow_mistimedStreamAna;  
+  // Selected events per lumi block
+  TH1F_LW* m_h_1d_selectedEvents_mistimedStreamAna;
+    
+  //Variables for the properties
+  /// Root directory
+  std::string m_PathInRootFile;
+  /// xAODTriggerTower Container key
+  std::string m_xAODTriggerTowerContainerName;
+  /// L1Calo conditions                                                                               
+  ServiceHandle<L1CaloCondSvc> m_l1CondSvc;
+  /// Database container for the run parameters
+  L1CaloRunParametersContainer* m_runParametersContainer;
+  /// Database container for the readout configuration
+  L1CaloReadoutConfigContainer* m_readoutConfigContainer;
+
+  //Control maximum number of histograms per job
+  int m_maxHistos;
+  int m_curHistos;
+  
+  //  Athena hist service
+  ServiceHandle<ITHistSvc> m_thistSvc;
+};
+
+// ============================================================================
+}  // end namespace
+// ============================================================================
+
+#endif
diff --git a/Trigger/TrigT1/TrigT1CaloMonitoring/src/PPMSimBSMon.cxx b/Trigger/TrigT1/TrigT1CaloMonitoring/src/PPMSimBSMon.cxx
index a0402307a49d76bc02df8fd49ff7296689758b05..436e4a655ca4022c09dd9a41ea34df4cc63bdc01 100644
--- a/Trigger/TrigT1/TrigT1CaloMonitoring/src/PPMSimBSMon.cxx
+++ b/Trigger/TrigT1/TrigT1CaloMonitoring/src/PPMSimBSMon.cxx
@@ -32,6 +32,11 @@
 #include "TrigT1CaloMonitoringTools/TrigT1CaloLWHistogramTool.h"
 #include "TrigT1Interfaces/TrigT1CaloDefs.h"
 
+#include "TrigT1CaloCondSvc/L1CaloCondSvc.h"
+#include "TrigT1CaloCalibConditions/L1CaloRunParameters.h"  
+#include "TrigT1CaloCalibConditions/L1CaloRunParametersContainer.h"  
+
+
 // ============================================================================
 namespace LVL1 {
 // ============================================================================
@@ -42,6 +47,7 @@ PPMSimBSMon::PPMSimBSMon(const std::string & type,
     m_ttTool("LVL1::L1TriggerTowerTool/L1TriggerTowerTool"),
     m_errorTool("LVL1::TrigT1CaloMonErrorTool/TrigT1CaloMonErrorTool"),
     m_histTool("LVL1::TrigT1CaloLWHistogramTool/TrigT1CaloLWHistogramTool"),
+    m_l1CondSvc("L1CaloCondSvc",name),
     m_histBooked(false),
     m_h_ppm_em_2d_etaPhi_tt_lutCp_SimEqData(0),
     m_h_ppm_em_2d_etaPhi_tt_lutCp_SimNeData(0),
@@ -108,10 +114,34 @@ StatusCode PPMSimBSMon:: initialize()
   CHECK(m_ttTool.retrieve());
   CHECK(m_errorTool.retrieve());
   CHECK(m_histTool.retrieve());
+  CHECK(m_l1CondSvc.retrieve());
+
+
+  return StatusCode::SUCCESS;
+}
+
+/*---------------------------------------------------------*/
+StatusCode PPMSimBSMon:: retrieveConditions()
+/*---------------------------------------------------------*/
+{
+  ATH_MSG_VERBOSE("PPMSimBSMon::retrieveConditions");
+  if (m_l1CondSvc) {
+    ATH_MSG_VERBOSE( "Retrieving Conditions Containers" );
+    CHECK_WITH_CONTEXT(m_l1CondSvc->retrieve(m_runParametersContainer),"PPMSimBSMon");
+
+    if (std::cbegin(*m_runParametersContainer) == std::cend(*m_runParametersContainer)) {
+      ATH_MSG_ERROR("Empty L1CaloRunParametersContainer");
+      return StatusCode::FAILURE;
+      }
+
+  }else{
+    ATH_MSG_ERROR("L1CondSvc not present!");
+  }
 
   return StatusCode::SUCCESS;
 }
 
+
 /*---------------------------------------------------------*/
 StatusCode PPMSimBSMon:: finalize()
 /*---------------------------------------------------------*/
@@ -321,6 +351,17 @@ void PPMSimBSMon::simulateAndCompare(const xAOD::TriggerTowerContainer* ttIn)
       return;
   }
 
+  if(this->retrieveConditions().isFailure()) {
+      REPORT_MESSAGE(MSG::WARNING);
+      return;
+  }
+
+  unsigned int readoutConfigID   = std::cbegin(*m_runParametersContainer)->readoutConfigID();
+
+  if(msgLvl(MSG::DEBUG)){
+    ATH_MSG_VERBOSE("ReadoutConfigID = " << readoutConfigID );
+  }
+
   bool isRun2 = true;
   const EventInfo* evInfo = nullptr;
   if (evtStore()->retrieve(evInfo).isFailure() || !evInfo) {
@@ -346,9 +387,6 @@ void PPMSimBSMon::simulateAndCompare(const xAOD::TriggerTowerContainer* ttIn)
     const double phi = tt->phi();
     const int datCp = tt->cpET();
     const int datJep = tt->lut_jep().empty() ? 0 : tt->jepET();
-    const std::vector<uint_least16_t>& ADC = tt->adc();
-    const int Slices = ADC.size();
-    const int Peak = tt->adcPeak();
     bool pedCorrOverflow = false;
     const std::size_t nPedCorr = tt->correction().size();
     int simCp = 0;
@@ -360,6 +398,33 @@ void PPMSimBSMon::simulateAndCompare(const xAOD::TriggerTowerContainer* ttIn)
       datBcid = datBcidVec[tt->peak()];
     }
 
+  //Retrieve RunParameters container from COOL database and check if run was taken with 80MHz readout. If yes, drop the 80MHz samples to emulate 40 MHz readout
+
+    std::vector<uint16_t> digits40;
+
+    if(readoutConfigID==5 or readoutConfigID==6){
+
+      int nSlices = tt->adc().size();
+
+      if((nSlices%4)==3){
+	for (int i=0 ; i < (nSlices-1)/2 ; i++ ){
+	  digits40.push_back(tt->adc().at(2*i+1));
+	}
+      }
+      else if((nSlices%4)==1){
+	for (int i=0 ; i <= (nSlices-1)/2 ; i++ ){
+	  digits40.push_back(tt->adc().at(2*i));
+	}
+      }
+
+    }else{
+      digits40 = tt->adc();
+    }
+
+    const std::vector<uint_least16_t>& ADC = digits40;
+    const int Slices = ADC.size();
+    const int Peak = Slices/2.;
+
     //Check for over-/underflow of pedestalCorrection
     for(std::size_t i = 0; i < nPedCorr; ++i) {
       if(tt->correction()[i]>=511 or tt->correction()[i]<=-512){
diff --git a/Trigger/TrigT1/TrigT1CaloMonitoring/src/PPMSimBSMon.h b/Trigger/TrigT1/TrigT1CaloMonitoring/src/PPMSimBSMon.h
index eb63d5e4e7ac8bc758bad1368d62ab6c92c9d481..1950ef68c848648b3d68767e4cf0db5839326d7e 100644
--- a/Trigger/TrigT1/TrigT1CaloMonitoring/src/PPMSimBSMon.h
+++ b/Trigger/TrigT1/TrigT1CaloMonitoring/src/PPMSimBSMon.h
@@ -19,6 +19,7 @@
 #include <vector>
 
 #include "GaudiKernel/ToolHandle.h"
+#include "GaudiKernel/ServiceHandle.h"
 
 #include "AthenaMonitoring/ManagedMonitorToolBase.h"
 #include "xAODTrigL1Calo/TriggerTowerContainer.h"
@@ -26,6 +27,9 @@
 class TH2F_LW;
 class TH2I_LW;
 
+class L1CaloCondSvc;
+class L1CaloRunParametersContainer;
+
 // ============================================================================
 namespace LVL1 {
 // ============================================================================
@@ -35,6 +39,9 @@ class TriggerTower;
 class IL1TriggerTowerTool;
 class ITrigT1CaloMonErrorTool;
 class TrigT1CaloLWHistogramTool;
+
+
+
 // ============================================================================
 
 /** Cross-check of PPM LUT data with simulation.
@@ -124,6 +131,8 @@ public:
 private:
 
   typedef std::vector<int> ErrorVector;
+
+  StatusCode retrieveConditions();
   
   /// Fill error event number histogram
   void  fillEventSample(int crate, int module);
@@ -137,7 +146,13 @@ private:
   ToolHandle<ITrigT1CaloMonErrorTool>    m_errorTool;
   /// Histogram helper tool
   ToolHandle<TrigT1CaloLWHistogramTool> m_histTool;
-      
+
+  /// L1Calo conditions                                                                               
+  ServiceHandle<L1CaloCondSvc> m_l1CondSvc;
+
+  /// Database container
+  L1CaloRunParametersContainer* m_runParametersContainer;
+
   /// Root directory name
   std::string m_rootDir;
 
diff --git a/Trigger/TrigT1/TrigT1CaloMonitoring/src/components/TrigT1CaloMonitoring_entries.cxx b/Trigger/TrigT1/TrigT1CaloMonitoring/src/components/TrigT1CaloMonitoring_entries.cxx
index ca504276a172e1373c9c2b856c43ff4e311bbe74..6656b9ccd8da4327c88604be8fc2af55042316de 100644
--- a/Trigger/TrigT1/TrigT1CaloMonitoring/src/components/TrigT1CaloMonitoring_entries.cxx
+++ b/Trigger/TrigT1/TrigT1CaloMonitoring/src/components/TrigT1CaloMonitoring_entries.cxx
@@ -4,6 +4,7 @@
 #include "../JEPCMXMon.h"
 #include "../JEPSimMon.h"
 #include "../PPrMon.h"
+#include "../MistimedStreamMon.h"
 #include "../PPrStabilityMon.h"
 #include "../PPrSpareMon.h"
 #include "../PPMSimBSMon.h"
@@ -11,11 +12,11 @@
 #include "../OverviewMon.h"
 #include "../TagProbeEfficiencyMon.h"
 
-//Run 1
+// Run 1
 #include "../CMMMon.h"
 #include "../CPMSimBSMon.h"
 #include "../JEMMon.h"
-//#include "../JEPSimBSMon.h"
+// #include "../JEPSimBSMon.h"
 #include "../TrigT1CaloBSMon.h"
 #include "../TrigT1CaloCpmMonTool.h"
 #include "../TrigT1CaloGlobalMonTool.h"
@@ -32,6 +33,7 @@ DECLARE_COMPONENT( LVL1::JEPCMXMon )
 DECLARE_COMPONENT( LVL1::JEPSimMon )
 
 DECLARE_COMPONENT( LVL1::PPrMon )
+DECLARE_COMPONENT( LVL1::MistimedStreamMon )
 DECLARE_COMPONENT( LVL1::PPrStabilityMon )
 DECLARE_COMPONENT( LVL1::PPrSpareMon )
 DECLARE_COMPONENT( LVL1::PPMSimBSMon )
@@ -39,14 +41,14 @@ DECLARE_COMPONENT( LVL1::RODMon )
 
 DECLARE_COMPONENT( LVL1::TagProbeEfficiencyMon )
 
-//Run 1
+// Run 1
 DECLARE_COMPONENT( LVL1::CMMMon )
 DECLARE_COMPONENT( LVL1::CPMSimBSMon )
 DECLARE_COMPONENT( LVL1::JEMMon )
-//DECLARE_COMPONENT( LVL1::JEPSimBSMon )
+// DECLARE_COMPONENT( LVL1::JEPSimBSMon )
 DECLARE_COMPONENT( LVL1::TrigT1CaloBSMon )
 DECLARE_COMPONENT( LVL1::TrigT1CaloCpmMonTool )
 DECLARE_COMPONENT( LVL1::TrigT1CaloGlobalMonTool )
-//DECLARE_COMPONENT( LVL1::EmEfficienciesMonTool )
+// DECLARE_COMPONENT( LVL1::EmEfficienciesMonTool )
 DECLARE_COMPONENT( LVL1::JetEfficienciesMonTool )
 DECLARE_COMPONENT( LVL1::RODMonV1 )
diff --git a/Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/RoIROD.h b/Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/RoIROD.h
index 066ae7189599fb54d5f431a173eb47c1e9203eb4..767b1d45405d97f90c0bc30ec70eaad530ad5242 100644
--- a/Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/RoIROD.h
+++ b/Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/RoIROD.h
@@ -8,10 +8,6 @@
     email                : Alan.Watson@CERN.CH
  ***************************************************************************/
 
-/***************************************************************************
- *                                                                         *
- *                                                                         *
- ***************************************************************************/
 
 #ifndef _RoIROD_H_
 #define _RoIROD_H_
diff --git a/Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/Run2TriggerTowerMaker.h b/Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/Run2TriggerTowerMaker.h
index f195bac4b5b431e2d7acd01faf73f028af64040d..aed51bfb39f061eebfcfacc417a0d69ed99923f7 100755
--- a/Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/Run2TriggerTowerMaker.h
+++ b/Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/Run2TriggerTowerMaker.h
@@ -256,6 +256,9 @@ private:
   std::vector<int> ADC(L1CaloCoolChannelId channel, const std::vector<double>& amps) const;
   int EtRange(int et, unsigned short bcidEnergyRangeLow, unsigned short bcidEnergyRangeHigh) const;
 
+  // void preProcessLayer(int layer, int eventBCID, InternalTriggerTower* tower, std::vector<int>& etResultVector, std::vector<int>& bcidResultVector);
+  StatusCode preProcessTower(xAOD::TriggerTower* tower, int eventBCID);
+
   int etaToElement(float feta, int layer) const;
   
   // non-linear LUT 
diff --git a/Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/Tester.h b/Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/Tester.h
index a1206d3d000ff9baa1f928e7ad824efbf0992b4f..adb906c8eb260ec453c6cbaa19bed5428a64130f 100644
--- a/Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/Tester.h
+++ b/Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/Tester.h
@@ -8,10 +8,6 @@
     email                : moyse@heppch.ph.qmw.ac.uk
  ***************************************************************************/
 
-/***************************************************************************
- *                                                                         *
- *                                                                         *
- ***************************************************************************/
 #ifndef _TESTER_H_
 #define _TESTER_H_
 
diff --git a/Trigger/TrigT1/TrigT1CaloSim/src/EnergyCMX.cxx b/Trigger/TrigT1/TrigT1CaloSim/src/EnergyCMX.cxx
index 9af99d65445062456ce50d298520f6ecad401bbf..165e4258f4f2f9f559f661b33d6b24519bff3c9b 100644
--- a/Trigger/TrigT1/TrigT1CaloSim/src/EnergyCMX.cxx
+++ b/Trigger/TrigT1/TrigT1CaloSim/src/EnergyCMX.cxx
@@ -13,10 +13,6 @@
 // EnergyCMX class Implementation
 // ================================================
 //
-/***************************************************************************
- *                                                                         *
- *                                                                         *
- ***************************************************************************/
 //
 //
 //
diff --git a/Trigger/TrigT1/TrigT1CaloSim/src/Tester.cxx b/Trigger/TrigT1/TrigT1CaloSim/src/Tester.cxx
index 1d06e6ce8d937b1c4eb52cf8dad298dbba5cceaa..ed5a127b457135e0828021048f054a048b2b8915 100644
--- a/Trigger/TrigT1/TrigT1CaloSim/src/Tester.cxx
+++ b/Trigger/TrigT1/TrigT1CaloSim/src/Tester.cxx
@@ -11,10 +11,6 @@
 //    updated: June 20, M. Wielers
 //             move to Storegate
 // 
-/***************************************************************************
- *                                                                         *
- *                                                                         *
- ***************************************************************************/
 // ================================================
 // Tester class Implementation
 // ================================================
@@ -270,25 +266,30 @@ void LVL1::Tester::loadEmTauROIs(){
 
   // Now test new EM/Tau implementation
   
-  const DataVector<LVL1::TriggerTower>* TTVector;
-  if( evtStore()->retrieve(TTVector, m_TriggerTowerLocation).isSuccess() ) {  
-    DataVector<CPAlgorithm>* rois = new DataVector<CPAlgorithm>;
-    m_EmTauTool->findRoIs(TTVector,rois);
-    DataVector<CPAlgorithm>::iterator cpw = rois->begin();
-    for ( ; cpw != rois->end(); cpw++) {
-      ATH_MSG_DEBUG("CPAlgorithm has properties : " << std::hex
-                    << "RoIWord     : " << std::hex << (*cpw)->RoIWord() 
-                    << std::dec << endmsg
-                    << "eta         : " << (*cpw)->eta() << endmsg
-                    << "phi         : " << (*cpw)->phi() << endmsg
-                    << "Core ET     : " << (*cpw)->Core() << endmsg
-                    << "EM cluster  : " << (*cpw)->EMClus() << endmsg
-                    << "Tau cluster : " << (*cpw)->TauClus() << endmsg
-                    << "EM isol     : " << (*cpw)->EMIsol() << endmsg
-                    << "Had isol    : " << (*cpw)->HadIsol() << endmsg
-                    << "Had veto    : " << (*cpw)->HadVeto() );
+  StatusCode sc = m_EmTauTool.retrieve();
+  if (sc.isFailure()) {
+    ATH_MSG_ERROR( "Problem retrieving EmTauTool" );
+  }
+  else {
+    const DataVector<LVL1::TriggerTower>* TTVector;
+    if( evtStore()->retrieve(TTVector, m_TriggerTowerLocation).isSuccess() ) {  
+      DataVector<CPAlgorithm>* rois = new DataVector<CPAlgorithm>;
+      m_EmTauTool->findRoIs(TTVector,rois);
+      DataVector<CPAlgorithm>::iterator cpw = rois->begin();
+      for ( ; cpw != rois->end(); cpw++) {
+        ATH_MSG_DEBUG("CPAlgorithm has properties : " << std::hex
+           << "RoIWord     : " << std::hex << (*cpw)->RoIWord() << std::dec << endmsg
+           << "eta         : " << (*cpw)->eta() << endmsg
+           << "phi         : " << (*cpw)->phi() << endmsg
+           << "Core ET     : " << (*cpw)->Core() << endmsg
+           << "EM cluster  : " << (*cpw)->EMClus() << endmsg
+           << "Tau cluster : " << (*cpw)->TauClus() << endmsg
+           << "EM isol     : " << (*cpw)->EMIsol() << endmsg
+           << "Had isol    : " << (*cpw)->HadIsol() << endmsg
+           << "Had veto    : " << (*cpw)->HadVeto() );
+      }
+      delete rois;
     }
-    delete rois;
   }
     
   return;
diff --git a/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1CPCMXTools.h b/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1CPCMXTools.h
index df6f00b4bf8c7b0427dafea9b9a27d89172d382a..50fb9d48f8c17b071f01641b079a4f4339477c55 100644
--- a/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1CPCMXTools.h
+++ b/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1CPCMXTools.h
@@ -3,7 +3,7 @@
 */
 
 ///////////////////////////////////////////////////////////////////
-// IL1CPCMXTools.h, (c) ATLAS Detector software
+// IL1CPCMXTools.h, 
 ///////////////////////////////////////////////////////////////////
 #ifndef ILVL1L1CPCMXTOOLS_H
 #define ILVL1L1CPCMXTOOLS_H
diff --git a/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1CPHitsTools.h b/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1CPHitsTools.h
index 4fa3d60d45a1d0ac6b2c235709efd763c7cf268e..6cdcb6076ba535ae009d890873e67508262cbc11 100644
--- a/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1CPHitsTools.h
+++ b/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1CPHitsTools.h
@@ -3,7 +3,7 @@
 */
 
 ///////////////////////////////////////////////////////////////////
-// IL1CPHitsTools.h, (c) ATLAS Detector software
+// IL1CPHitsTools.h, 
 ///////////////////////////////////////////////////////////////////
 #ifndef ILVL1L1CPHITSTOOLS_H
 #define ILVL1L1CPHITSTOOLS_H
diff --git a/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1CPMTools.h b/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1CPMTools.h
index 0e85114667ed480ea07c5856e28d1caee9036f14..68ab722f6a0d5d4c1e096f716b7cd83f1ed8e22d 100644
--- a/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1CPMTools.h
+++ b/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1CPMTools.h
@@ -5,10 +5,6 @@
 // L1CPMTools.h, 
 ///////////////////////////////////////////////////////////////////
 
- /***************************************************************************
-  *                                                                         *
-  *                                                                         *
-  ***************************************************************************/
 
 #ifndef ILVL1L1CPMTOOLS_H
 #define ILVL1L1CPMTOOLS_H
diff --git a/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1CPMTowerTools.h b/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1CPMTowerTools.h
index 0b47a1a69dccb427a80c8b97c2a1533d43a2dd7d..c53775f1c86de385825bbc7f29f157a45e6587c2 100755
--- a/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1CPMTowerTools.h
+++ b/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1CPMTowerTools.h
@@ -3,7 +3,7 @@
 */
 
 ///////////////////////////////////////////////////////////////////
-// IL1CPMTowerTools.h, (c) ATLAS Detector software
+// IL1CPMTowerTools.h, 
 ///////////////////////////////////////////////////////////////////
 #ifndef ILVL1L1CPMTOWERTOOLS_H
 #define ILVL1L1CPMTOWERTOOLS_H
diff --git a/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1DynamicPedestalProvider.h b/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1DynamicPedestalProvider.h
index e7bd4ec339ca33458d523dd108e1b6fe6a81defc..74314ff3ef89cef7602ca109a7872c62e01ee6f1 100644
--- a/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1DynamicPedestalProvider.h
+++ b/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1DynamicPedestalProvider.h
@@ -1,15 +1,10 @@
 // -*- C++ -*-
+///////////////////////////////////////////////////////////////////
 /*
   Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
+// IL1DynamicPedestalProvider.h,
 ///////////////////////////////////////////////////////////////////
-// IL1DynamicPedestalProvider.h, (c) Veit Scharf
-///////////////////////////////////////////////////////////////////
-
- /***************************************************************************
-  *                                                                         *
-  *                                                                         *
-  ***************************************************************************/
 
 #ifndef TRIGT1CALOTOOLINTERFACES_IL1DYNAMICPEDESTALPROVIDER_H
 #define TRIGT1CALOTOOLINTERFACES_IL1DYNAMICPEDESTALPROVIDER_H
diff --git a/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1EmTauTools.h b/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1EmTauTools.h
index da167ee56c1280a1740ded1a76e47e14eeeb50e9..b35285c27c5073c451d5c9f2dfcc12e9c29316dd 100755
--- a/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1EmTauTools.h
+++ b/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1EmTauTools.h
@@ -3,7 +3,7 @@
 */
 
 ///////////////////////////////////////////////////////////////////
-// IL1EmTauTools.h, (c) ATLAS Detector software
+// IL1EmTauTools.h, 
 ///////////////////////////////////////////////////////////////////
 #ifndef ILVL1L1EMTAUTOOLS_H
 #define ILVL1L1EMTAUTOOLS_H
diff --git a/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1EnergyCMXTools.h b/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1EnergyCMXTools.h
index 51f760aad51451b84c443c28cc3b534d24d7616b..a3f48645fd5321e029872b3fb0280db156f8f074 100644
--- a/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1EnergyCMXTools.h
+++ b/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1EnergyCMXTools.h
@@ -3,7 +3,7 @@
 */
 
 ///////////////////////////////////////////////////////////////////
-// IL1EnergyCMXTools.h, (c) ATLAS Detector software
+// IL1EnergyCMXTools.h, 
 ///////////////////////////////////////////////////////////////////
 #ifndef ILVL1L1ENERGYCMXTOOLS_H
 #define ILVL1L1ENERGYCMXTOOLS_H
diff --git a/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1EtTools.h b/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1EtTools.h
index ad87a8cf47ab331306770c3b3e23aadefd65ea93..77af271ee3e848e830e6d0534559c74f783d4afc 100755
--- a/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1EtTools.h
+++ b/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1EtTools.h
@@ -3,7 +3,7 @@
 */
 
 ///////////////////////////////////////////////////////////////////
-// IL1EtTools.h, (c) ATLAS Detector software
+// IL1EtTools.h
 ///////////////////////////////////////////////////////////////////
 #ifndef ILVL1L1ETTOOLS_H
 #define ILVL1L1ETTOOLS_H
@@ -15,7 +15,7 @@
 //#include "TrigT1CaloUtils/CrateEnergy.h"
 //#include "TrigT1CaloUtils/SystemEnergy.h"
 
-namespace LVL1 
+namespace LVL1
 {
 class ModuleEnergy;
 class CrateEnergy;
@@ -48,14 +48,14 @@ Interface definition for L1EtTools
     virtual SystemEnergy systemSums(const DataVector<CrateEnergy>* crates) const = 0;
     virtual SystemEnergy systemSums(const xAOD::JetElementContainer* jetelements, int slice = -1, uint32_t maskXE = 0xff, uint32_t maskTE = 0xff, bool restricted = false) const = 0;
     virtual SystemEnergy systemSums(const xAOD::JetElementMap_t* jemap, int slice = -1, uint32_t maskXE = 0xff, uint32_t maskTE = 0xff, bool restricted = false) const = 0;
-  
+
   };
 
   inline const InterfaceID& LVL1::IL1EtTools::interfaceID()
-    { 
+    {
       return IID_IL1EtTools;
     }
 
 } // end of namespace
 
-#endif 
+#endif
diff --git a/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1JEMJetTools.h b/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1JEMJetTools.h
index 5d66a7f22de765b5aa3a0c1e895950c245d2b529..ba2fa7a8eb3646b3186102ee53a592385ee30e1e 100644
--- a/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1JEMJetTools.h
+++ b/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1JEMJetTools.h
@@ -3,7 +3,7 @@
 */
 
 ///////////////////////////////////////////////////////////////////
-// IL1JEMJetTools.h, (c) ATLAS Detector software
+// IL1JEMJetTools.h, 
 ///////////////////////////////////////////////////////////////////
 #ifndef ILVL1L1JEMJETTOOLS_H
 #define ILVL1L1JEMJETTOOLS_H
diff --git a/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1JEPEtSumsTools.h b/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1JEPEtSumsTools.h
index 3e05c4414a593616edc08f8bc8f8d7bfc79b39e7..fca76ebb6569dc50508dff1574f5a6faeb48e11a 100644
--- a/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1JEPEtSumsTools.h
+++ b/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1JEPEtSumsTools.h
@@ -3,7 +3,7 @@
 */
 
 ///////////////////////////////////////////////////////////////////
-// IL1JEPEtSumsTools.h, (c) ATLAS Detector software
+// IL1JEPEtSumsTools.h, 
 ///////////////////////////////////////////////////////////////////
 #ifndef ILVL1L1JEPETSUMSTOOLS_H
 #define ILVL1L1JEPETSUMSTOOLS_H
diff --git a/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1JEPHitsTools.h b/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1JEPHitsTools.h
index ee51146920d7847976fd8b71a6115eea1bb107a2..7590f84d54f26276e5323b8a7f046d3471c91ff3 100644
--- a/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1JEPHitsTools.h
+++ b/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1JEPHitsTools.h
@@ -3,7 +3,7 @@
 */
 
 ///////////////////////////////////////////////////////////////////
-// IL1JEPHitsTools.h, (c) ATLAS Detector software
+// IL1JEPHitsTools.h, 
 ///////////////////////////////////////////////////////////////////
 #ifndef ILVL1L1JEPHITSTOOLS_H
 #define ILVL1L1JEPHITSTOOLS_H
diff --git a/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1JetCMXTools.h b/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1JetCMXTools.h
index 029c745dc9b1a1ad9e225133c4e3c70660cb8526..3925e657b139a2c0658f75a1a9011b82e8b877cf 100644
--- a/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1JetCMXTools.h
+++ b/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1JetCMXTools.h
@@ -3,7 +3,7 @@
 */
 
 ///////////////////////////////////////////////////////////////////
-// IL1JetCMXTools.h, (c) ATLAS Detector software
+// IL1JetCMXTools.h, 
 ///////////////////////////////////////////////////////////////////
 #ifndef ILVL1L1JETCMXTOOLS_H
 #define ILVL1L1JETCMXTOOLS_H
diff --git a/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1JetElementTools.h b/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1JetElementTools.h
index 5db88d51b2689fcb30b94185c19c53f293de2d83..4e102a9d823a4076f355e049c4dade5d9d73d6dd 100755
--- a/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1JetElementTools.h
+++ b/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1JetElementTools.h
@@ -3,7 +3,7 @@
 */
 
 ///////////////////////////////////////////////////////////////////
-// IL1JetElementTools.h, (c) ATLAS Detector software
+// IL1JetElementTools.h, 
 ///////////////////////////////////////////////////////////////////
 #ifndef ILVL1L1JETELEMENTTOOLS_H
 #define ILVL1L1JETELEMENTTOOLS_H
diff --git a/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1JetEtTools.h b/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1JetEtTools.h
index 2edffc68aec1c3333a4e29b8a14e086f74961f3c..26f5b6b402a6de36230a7d5fc296bde04e5e3b23 100644
--- a/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1JetEtTools.h
+++ b/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1JetEtTools.h
@@ -3,7 +3,7 @@
 */
 
 ///////////////////////////////////////////////////////////////////
-// IL1JetEtTools.h, (c) ATLAS Detector software
+// IL1JetEtTools.h, 
 ///////////////////////////////////////////////////////////////////
 #ifndef ILVL1L1JETETTOOLS_H
 #define ILVL1L1JETETTOOLS_H
diff --git a/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1JetTools.h b/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1JetTools.h
index 14d74c4a21d87b3da803b64633af8934fe03b4d9..5412340ae9ec7c24c9098fda35c43cc35585d446 100755
--- a/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1JetTools.h
+++ b/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1JetTools.h
@@ -3,7 +3,7 @@
 */
 
 ///////////////////////////////////////////////////////////////////
-// IL1JetTools.h, (c) ATLAS Detector software
+// IL1JetTools.h, 
 ///////////////////////////////////////////////////////////////////
 #ifndef ILVL1L1JETTOOLS_H
 #define ILVL1L1JETTOOLS_H
diff --git a/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1RoITools.h b/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1RoITools.h
index e7c31791f08299abd01fd79613bf738656062024..fbbf164b604b4030de136e57a911ac355d7a70ca 100644
--- a/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1RoITools.h
+++ b/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1RoITools.h
@@ -3,7 +3,7 @@
 */
 
 ///////////////////////////////////////////////////////////////////
-// IL1RoITools.h, (c) ATLAS Detector software
+// IL1RoITools.h, 
 ///////////////////////////////////////////////////////////////////
 #ifndef ILVL1L1ROITOOLS_H
 #define ILVL1L1ROITOOLS_H
diff --git a/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1TriggerTowerTool.h b/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1TriggerTowerTool.h
index 3e7d05d649cb76d0d32edb43ab11a64b21603b29..e5a3a336232c90e88104723cbca44567e27098df 100644
--- a/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1TriggerTowerTool.h
+++ b/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1TriggerTowerTool.h
@@ -5,11 +5,6 @@
 // L1TriggerTowerTool.h, 
 ///////////////////////////////////////////////////////////////////
 
- /***************************************************************************
-  *                                                                         *
-  *                                                                         *
-  ***************************************************************************/
-
 #ifndef IL1TRIGGERTOWERTOOL_H
 #define IL1TRIGGERTOWERTOOL_H
 
diff --git a/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1CPCMXTools.h b/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1CPCMXTools.h
index 04dad37d3fa25b1f184751460b261313f0659ca0..2cbbc5843159afeadbf814f110e0d4bf6087961e 100644
--- a/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1CPCMXTools.h
+++ b/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1CPCMXTools.h
@@ -2,10 +2,6 @@
   Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
-/***************************************************************************
- *                                                                         *
- *                                                                         *
- ***************************************************************************/
 
 #ifndef LVL1L1CPCMXTOOLS_H
 #define LVL1L1CPCMXTOOLS_H
diff --git a/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1DynamicPedestalProviderRoot.h b/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1DynamicPedestalProviderRoot.h
index 421c5030896369462e768cc6fdf249c5c2232e0b..9a939970e2662e9ada7435a3580083b0dbb38a62 100644
--- a/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1DynamicPedestalProviderRoot.h
+++ b/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1DynamicPedestalProviderRoot.h
@@ -1,8 +1,8 @@
-/** -*- C++ -*-*/
+/** -*- C++ -*- */
 /*
   Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
-/*
+/**
  * @file TrigT1CaloTools/L1DynamicPedestalProviderRoot.h
  * @author V. Scharf <vscharf@kip.uni-heidelberg.de>
  * @date June 2014
diff --git a/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1DynamicPedestalProviderTxt.h b/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1DynamicPedestalProviderTxt.h
index ebc47fa4e309e05f87e2f07a3d6a0529e07bfd2b..e21e3d91a450bb30acd2b9044c97dd6274fe9fdd 100644
--- a/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1DynamicPedestalProviderTxt.h
+++ b/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1DynamicPedestalProviderTxt.h
@@ -2,7 +2,7 @@
 /*
   Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
-/*
+/* 
  * @file TrigT1CaloTools/L1DynamicPedestalProviderTxt.h
  * @author V. Scharf <vscharf@kip.uni-heidelberg.de>
  * @date June 2014
diff --git a/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1EnergyCMXTools.h b/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1EnergyCMXTools.h
index afa99d1aa65a551bbe2b8d2a3ea15ae8b99c48b2..14fd8ec4921a12436bfc865b95919141483321ac 100644
--- a/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1EnergyCMXTools.h
+++ b/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1EnergyCMXTools.h
@@ -115,6 +115,8 @@ class L1EnergyCMXTools : virtual public IL1EnergyCMXTools, public AthAlgTool
     void etMapsToEtSums(const MultiSliceSystemEnergy &systemVec,
                         xAOD::CMXEtSumsContainer *cmxEtSumsVec, int peak) const;
     void findRestrictedEta(uint32_t &maskXE, uint32_t &maskTE) const;
+
+    void dumpCrateEnergies(const std::string& msg, const MultiSliceCrateEnergy& crates) const;
     /** trigger configuration service */
     ServiceHandle<TrigConf::ITrigConfigSvc> m_configSvc;
     /** Tool for JetElement map */
@@ -124,7 +126,7 @@ class L1EnergyCMXTools : virtual public IL1EnergyCMXTools, public AthAlgTool
     /** Debug flag */
     bool m_debug;
     /** Find restructed eta range.
-     *  This will use the min/max values for any threshold in the range 9-16 to define the ranges
+     *  This will use the min/max values for the first valid threshold in the range 9-16 to define the ranges
      */
     uint32_t m_maskXE;
     uint32_t m_maskTE;
diff --git a/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1JetCMXTools.h b/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1JetCMXTools.h
index 6c6e685896fff798193920c9b90c177bd9aae2a3..49ac48849808929db0d349b6731d81a33ca079d9 100644
--- a/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1JetCMXTools.h
+++ b/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1JetCMXTools.h
@@ -2,10 +2,6 @@
   Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
-/***************************************************************************
- *                                                                         *
- *                                                                         *
- ***************************************************************************/
 
 #ifndef LVL1L1JETCMXTOOLS_H
 #define LVL1L1JETCMXTOOLS_H
diff --git a/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1TriggerTowerTool.h b/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1TriggerTowerTool.h
index c9aefd048fae3a813e7ebf72fefda77570eb1992..0e89ea1b839152c576d8b072400b984f133b7ecf 100644
--- a/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1TriggerTowerTool.h
+++ b/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1TriggerTowerTool.h
@@ -28,6 +28,9 @@ class CaloTriggerTowerService;
 class Incident;
 class L1CaloCondSvc;
 class L1CaloPpmFineTimeRefsContainer;
+class L1CaloDerivedRunParsContainer;
+class L1CaloRunParametersContainer;
+class L1CaloPprChanStrategyContainer;
 
 namespace TrigConf { class ILVL1ConfigSvc; }
 
@@ -154,6 +157,12 @@ namespace LVL1
 
       // one of L1CaloPprConditionsContainer{,Run2}*
       bool m_isRun2;
+      
+      /// For Run2 strategy (LowMu, HighMu)
+      L1CaloPprChanStrategyContainer* m_strategyContainer;
+      L1CaloDerivedRunParsContainer* m_derivedRunParsContainer;
+      L1CaloRunParametersContainer* m_runParametersContainer;
+      
       boost::any m_conditionsContainer;
       // one of L1CaloPprDisabledChannelContainer{,Run2}*
       boost::any m_disabledChannelContainer;
diff --git a/Trigger/TrigT1/TrigT1CaloTools/src/L1DynamicPedestalProviderRoot.cxx b/Trigger/TrigT1/TrigT1CaloTools/src/L1DynamicPedestalProviderRoot.cxx
index d2aef15831c67edd16914b4455aabc3353c63da3..26ce045a1ecf96dd27157401d486ce6f81a8ad74 100644
--- a/Trigger/TrigT1/TrigT1CaloTools/src/L1DynamicPedestalProviderRoot.cxx
+++ b/Trigger/TrigT1/TrigT1CaloTools/src/L1DynamicPedestalProviderRoot.cxx
@@ -2,7 +2,7 @@
   Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 //////////////////////////////////////////////////////////////////////
-//  L1DynamicPedestalProviderRoot.cxx (c) Veit Scjarf
+//  L1DynamicPedestalProviderRoot.cxx 
 ///////////////////////////////////////////////////////////////////////
 
 #include "TrigT1CaloTools/L1DynamicPedestalProviderRoot.h"
diff --git a/Trigger/TrigT1/TrigT1CaloTools/src/L1DynamicPedestalProviderTxt.cxx b/Trigger/TrigT1/TrigT1CaloTools/src/L1DynamicPedestalProviderTxt.cxx
index fdbaf7eb0014b6cc4f78c18cf796bc22c82e443d..dc87d244a4dfc613a71575fdf9fc63893ec5d093 100644
--- a/Trigger/TrigT1/TrigT1CaloTools/src/L1DynamicPedestalProviderTxt.cxx
+++ b/Trigger/TrigT1/TrigT1CaloTools/src/L1DynamicPedestalProviderTxt.cxx
@@ -2,7 +2,7 @@
   Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 //////////////////////////////////////////////////////////////////////
-//  L1DynamicPedestalProviderTxt.cxx (c) Veit Scjarf
+//  L1DynamicPedestalProviderTxt.cxx 
 ///////////////////////////////////////////////////////////////////////
 
 #include "TrigT1CaloTools/L1DynamicPedestalProviderTxt.h"
diff --git a/Trigger/TrigT1/TrigT1CaloTools/src/L1EnergyCMXTools.cxx b/Trigger/TrigT1/TrigT1CaloTools/src/L1EnergyCMXTools.cxx
index d609d07f5980c5173cd0d38d9f73ff6e11188cb8..d22ca5656213eb5eb701544189df4445669c85e0 100644
--- a/Trigger/TrigT1/TrigT1CaloTools/src/L1EnergyCMXTools.cxx
+++ b/Trigger/TrigT1/TrigT1CaloTools/src/L1EnergyCMXTools.cxx
@@ -451,6 +451,9 @@ void L1EnergyCMXTools::etSumsToCrateEnergy(const xAOD::CMXEtSumsContainer *etSum
                                               eyErr.get(DataError::Overflow), restricted));
         }
     }
+
+    dumpCrateEnergies("Crates from full region (for total)", crateVecFull);
+    dumpCrateEnergies("Crates from restricted region (for total)", crateVecRestricted);
 }
 
 /** Convert CMXEtSums container to internal SystemEnergy objects */
@@ -650,6 +653,10 @@ void L1EnergyCMXTools::crateEnergyToEtSums(
     unsigned int nslices = cratesVecFull.size();
     std::vector<uint16_t> dummy(nslices);
     std::vector<uint32_t> error(nslices);
+    
+    dumpCrateEnergies("Crates from full region", cratesVecFull);
+    dumpCrateEnergies("Crates from restricted region", cratesVecRestricted);
+    
 
     for (unsigned int slice = 0; slice < nslices; ++slice)
     {
@@ -773,6 +780,8 @@ void L1EnergyCMXTools::systemEnergyToEtSums(
         int exOverflow = energy->exOverflow();
         int eyOverflow = energy->eyOverflow();
         int etOverflow = energy->etOverflow();
+        
+        // don't trust to exOverflow for restricted
         if (ex == 0 && ey == 0 && et == 0 &&
             exOverflow == 0 && eyOverflow == 0 && etOverflow == 0)
             continue;
@@ -793,12 +802,14 @@ void L1EnergyCMXTools::systemEnergyToEtSums(
         exVec[slice] = ex;
         eyVec[slice] = ey;
         etVec[slice] = et;
+
         if (exOverflow)
         {
             DataError dEx(exErr[slice]);
             dEx.set(DataError::Overflow);
             exErr[slice] = dEx.error();
         }
+
         if (eyOverflow)
         {
             DataError dEy(eyErr[slice]);
@@ -955,4 +966,20 @@ void L1EnergyCMXTools::etMapsToEtSums(
     }
 }
 
+void L1EnergyCMXTools::dumpCrateEnergies(
+    const std::string &msg, const MultiSliceCrateEnergy &crates) const {
+  if (!m_debug) return;
+
+  ATH_MSG_DEBUG(msg);
+  for (const auto& p : crates) {
+    for (const auto& c : *p) {
+      ATH_MSG_DEBUG(" CrateEnergy: crate " << c->crate() << " results ");
+      ATH_MSG_DEBUG("  Et " << c->et() << " overflow " << c->etOverflow());
+      ATH_MSG_DEBUG("  Ex " << c->ex() << " overflow " << c->exOverflow());
+      ATH_MSG_DEBUG("  Ey " << c->ey() << " overflow "<< c->eyOverflow());
+    }
+    ATH_MSG_DEBUG("");
+  }
+}
+
 } // end of namespace
diff --git a/Trigger/TrigT1/TrigT1CaloTools/src/L1TriggerTowerTool.cxx b/Trigger/TrigT1/TrigT1CaloTools/src/L1TriggerTowerTool.cxx
index 4d7ab0fab4af74b07fc3973d014adc74cabb4728..16cf890421a8070addbee79e6b9419db0574071c 100644
--- a/Trigger/TrigT1/TrigT1CaloTools/src/L1TriggerTowerTool.cxx
+++ b/Trigger/TrigT1/TrigT1CaloTools/src/L1TriggerTowerTool.cxx
@@ -33,6 +33,15 @@
 #include "TrigT1CaloCalibConditions/L1CaloPprDisabledChannelContainer.h"
 #include "TrigT1CaloCalibConditions/L1CaloPprDisabledChannelContainerRun2.h"
 
+#include "TrigT1CaloCalibConditions/L1CaloDerivedRunPars.h"
+#include "TrigT1CaloCalibConditions/L1CaloDerivedRunParsContainer.h"
+
+#include "TrigT1CaloCalibConditions/L1CaloPprChanStrategy.h"
+#include "TrigT1CaloCalibConditions/L1CaloPprChanStrategyContainer.h"
+
+#include "TrigT1CaloCalibConditions/L1CaloRunParameters.h"
+#include "TrigT1CaloCalibConditions/L1CaloRunParametersContainer.h"
+
 #include "TrigT1CaloCalibToolInterfaces/IL1CaloTTIdTools.h"
 #include "TrigT1CaloMappingToolInterfaces/IL1CaloMappingTool.h"
 #include "TrigT1CaloToolInterfaces/IL1DynamicPedestalProvider.h"
@@ -181,6 +190,15 @@ namespace { // helper function
     target = C;
     return StatusCode::SUCCESS;
   }
+
+  template<class T, class FolderMap>
+  StatusCode retrieveGenericWithFolders(ServiceHandle<L1CaloCondSvc>& svc, const FolderMap& fmap, boost::any& target) {
+    T* C = nullptr;
+    CHECK_WITH_CONTEXT(svc->retrieve(C, fmap), "L1TriggerTowerTool");
+    target = C;
+    return StatusCode::SUCCESS;
+  }
+
 } // anonymous namespace
 
 /** Retrieve pointers to the L1Calo conditions containers */
@@ -192,16 +210,76 @@ StatusCode L1TriggerTowerTool::retrieveConditions()
     bool verbose = msgLvl(MSG::VERBOSE);
 
     if(m_isRun2) {
-      CHECK(retrieveGeneric<L1CaloPprConditionsContainerRun2>(m_l1CondSvc, m_conditionsContainer));
+      CHECK_WITH_CONTEXT(m_l1CondSvc->retrieve(m_derivedRunParsContainer), "L1TriggerTowerTool");
+      if (std::cbegin(*m_derivedRunParsContainer) == std::cend(*m_derivedRunParsContainer)) {
+        ATH_MSG_WARNING("Empty L1CaloDerivedRunParsContainer");
+        return StatusCode::FAILURE;
+      }
+
+      CHECK_WITH_CONTEXT(m_l1CondSvc->retrieve(m_runParametersContainer), "L1TriggerTowerTool");
+      if (std::cbegin(*m_runParametersContainer) == std::cend(*m_runParametersContainer)) {
+        ATH_MSG_WARNING("Empty L1CaloRunParametersContainer");
+        return StatusCode::FAILURE;
+      }
+
+
+      std::string timingRegime = std::cbegin(*m_derivedRunParsContainer)->timingRegime();
+
+      CHECK_WITH_CONTEXT(m_l1CondSvc->retrieve(m_strategyContainer), "L1TriggerTowerTool");
+      
+      std::string strategy;
+      for(const auto& it: *m_strategyContainer){
+        if (it.timingRegime() == timingRegime){
+          strategy = it.strategy();
+        }
+      }
+
+      std::map<L1CaloPprConditionsContainerRun2::eCoolFolders, std::string> 
+        coolFoldersKeysMap = {
+           {
+            L1CaloPprConditionsContainerRun2::ePprChanDefaults,
+            "/TRIGGER/L1Calo/V2/Configuration/PprChanDefaults"
+           }
+         };
+      
+      if (strategy.empty()){
+        coolFoldersKeysMap[L1CaloPprConditionsContainerRun2::ePprChanCalib] 
+          = "/TRIGGER/L1Calo/V2/Calibration/" + timingRegime + "/PprChanCalib";
+      } else {
+        coolFoldersKeysMap[L1CaloPprConditionsContainerRun2::ePprChanCalibCommon] = 
+            "/TRIGGER/L1Calo/V2/Calibration/" + timingRegime + "/PprChanCommon";
+        coolFoldersKeysMap[L1CaloPprConditionsContainerRun2::ePprChanCalibStrategy] =  
+            "/TRIGGER/L1Calo/V2/Calibration/" + timingRegime + "/PprChan" + strategy;
+      }
+
+      CHECK(retrieveGenericWithFolders<L1CaloPprConditionsContainerRun2>(
+          m_l1CondSvc, coolFoldersKeysMap, m_conditionsContainer));
+
       CHECK(retrieveGeneric<L1CaloPprDisabledChannelContainerRun2>(m_l1CondSvc, m_disabledChannelContainer));
     } else {
       CHECK(retrieveGeneric<L1CaloPprConditionsContainer>(m_l1CondSvc, m_conditionsContainer));
       CHECK(retrieveGeneric<L1CaloPprDisabledChannelContainer>(m_l1CondSvc, m_disabledChannelContainer));
     }
-    ATH_MSG_VERBOSE( "Retrieved ConditionsContainer" );
+
+    
     if(verbose) {
-      if(m_isRun2) boost::any_cast<L1CaloPprConditionsContainerRun2*>(m_conditionsContainer)->dump();
-      else boost::any_cast<L1CaloPprConditionsContainer*>(m_conditionsContainer)->dump();
+      ATH_MSG_VERBOSE( "Retrieved ConditionsContainer" );
+      if(m_isRun2){
+        boost::any_cast<L1CaloPprConditionsContainerRun2*>(m_conditionsContainer)->dump();
+      } else{
+        boost::any_cast<L1CaloPprConditionsContainer*>(m_conditionsContainer)->dump();
+      }
+    }
+
+    if(verbose) {
+      if(m_isRun2){
+        ATH_MSG_VERBOSE( "Retrieved DerivedRunParsContainer" );
+        m_derivedRunParsContainer->dump();
+	ATH_MSG_VERBOSE( "Retrieved RunParametersContainer" );
+	m_runParametersContainer->dump();
+        ATH_MSG_VERBOSE( "Retrieved StrategyContainer" );
+        m_strategyContainer->dump();
+      }
     }
 
     ATH_MSG_VERBOSE( "Retrieved DisabledChannelContainer" );
@@ -298,7 +376,7 @@ template <typename DST, typename SRC>
 std::vector<DST> convertVectorType(const std::vector<SRC>& s) {
    std::vector<DST> d(s.size());
    std::transform(std::begin(s), std::end(s), std::begin(d),
-		  [](SRC v){return static_cast<DST>(v);});
+      [](SRC v){return static_cast<DST>(v);});
    return d;
 } 
 }
@@ -306,7 +384,46 @@ std::vector<DST> convertVectorType(const std::vector<SRC>& s) {
 /** All-in-one routine - give it the TT identifier, and  it returns the results */
 void L1TriggerTowerTool::simulateChannel(const xAOD::TriggerTower& tt, std::vector<int>& outCpLut, std::vector<int>& outJepLut, std::vector<int>& bcidResults, std::vector<int>& bcidDecisions)
 {
-  const auto& digits = convertVectorType<int>(tt.adc());
+
+  //If we have 80 MHz readout, we need to extract the 40 MHz samples. The central 80 MHz sample is always a 40 MHz sample. We use the cool database (runParameters folder) to understand if we are in 80MHz readout
+
+  unsigned int readoutConfigID   = std::cbegin(*m_runParametersContainer)->readoutConfigID();
+
+  if(m_debug){
+    ATH_MSG_VERBOSE("ReadoutConfigID = " << readoutConfigID );
+  }
+
+  std::vector<uint16_t> digits40;
+
+  if(readoutConfigID == 5 or readoutConfigID == 6){
+
+    if(m_debug){
+      ATH_MSG_VERBOSE("80 MHz readout detected, emulating 40 MHz samples");
+    }
+ 
+    int nSlices = tt.adc().size();
+
+    if((nSlices%4)==3){
+      for (int i=0 ; i < (nSlices-1)/2 ; i++ ){
+	digits40.push_back(tt.adc().at(2*i+1));
+      }
+    }
+    else if((nSlices%4)==1){
+      for (int i=0 ; i <= (nSlices-1)/2 ; i++){
+	digits40.push_back(tt.adc().at(2*i));
+      }
+    }
+
+
+  }else{
+    if(m_debug){
+      ATH_MSG_VERBOSE("40 MHz readout detected");
+    }
+    digits40 = tt.adc();
+  }
+  
+  const auto& digits = convertVectorType<int>(digits40);
+
   L1CaloCoolChannelId channelId {tt.coolId()}; 
 
   if (m_debug) {
@@ -785,12 +902,17 @@ void L1TriggerTowerTool::lut(const std::vector<int> &fir, const L1CaloCoolChanne
 // TODO implement scale
 void L1TriggerTowerTool::cpLut(const std::vector<int> &fir, const L1CaloCoolChannelId& channelId, std::vector<int> &output)
 {   
+  int startBit = 0;
   int strategy = 0;
   int offset   = 0;
+  double offsetReal = 0;
   int slope    = 0;
   int cut      = 0;
   unsigned short scale = 0;
+  double pedMean = 0;
   int ped      = 0;
+  int hwCoeffSum = 0;
+  const std::vector<short int>* hwCoeffs;
 
   if(!m_isRun2) {
     // assert instead ?!
@@ -801,12 +923,31 @@ void L1TriggerTowerTool::cpLut(const std::vector<int> &fir, const L1CaloCoolChan
     auto conditionsContainer = boost::any_cast<L1CaloPprConditionsContainerRun2*>(m_conditionsContainer);
     const L1CaloPprConditionsRun2* settings = conditionsContainer->pprConditions(channelId.id());
     if (settings) {
+      startBit = settings->firStartBit();
       strategy = settings->lutCpStrategy();
-      offset   = settings->lutCpOffset();
       slope    = settings->lutCpSlope();
       cut      = settings->lutCpNoiseCut();
       scale    = settings->lutCpScale();
       ped      = settings->pedValue();
+      pedMean  = settings->pedMean();
+
+      hwCoeffs = getFirCoefficients<L1CaloPprConditionsContainerRun2>(channelId.id(), m_conditionsContainer);
+
+      for (unsigned int i = 0; i < hwCoeffs->size(); i++){
+        hwCoeffSum += hwCoeffs->at(i);
+      }
+      
+      if (strategy == 0){
+        offsetReal = pedMean * hwCoeffSum / pow(2.,startBit);
+      }
+      else{
+        offsetReal = pedMean * hwCoeffSum * slope / pow(2.,startBit) - slope/2.;
+      }
+      offset = static_cast<unsigned short>( offsetReal < 0. ? 0 : offsetReal + 0.5 );
+
+      ATH_MSG_VERBOSE( "::cpLut: Offset: offset/strategy/pedMean/firCoeffSum/startBit/slope: "
+		       << offset << " " << strategy << " " << " " << pedMean << " " << hwCoeffSum << " " << startBit << " " << slope );
+      
     } else ATH_MSG_WARNING( "::cpLut: No L1CaloPprConditions found" );
   } else ATH_MSG_WARNING( "::cpLut: No Conditions Container retrieved" );
 
@@ -826,13 +967,18 @@ void L1TriggerTowerTool::cpLut(const std::vector<int> &fir, const L1CaloCoolChan
 
 void L1TriggerTowerTool::jepLut(const std::vector<int> &fir, const L1CaloCoolChannelId& channelId, std::vector<int> &output)
 {   
+  int startBit = 0;
   int strategy   = 0;
   int offset     = 0;
+  double offsetReal = 0;
   int slope      = 0;
   int cut        = 0;
   unsigned short scale_db   = 0;
   unsigned short scale_menu = 0;
   int ped        = 0;
+  double pedMean = 0;
+  int hwCoeffSum = 0;
+  const std::vector<short int>* hwCoeffs;
   short par1     = 0;
   short par2     = 0;
   short par3     = 0;
@@ -847,11 +993,12 @@ void L1TriggerTowerTool::jepLut(const std::vector<int> &fir, const L1CaloCoolCha
     auto conditionsContainer = boost::any_cast<L1CaloPprConditionsContainerRun2*>(m_conditionsContainer);
     const L1CaloPprConditionsRun2* settings = conditionsContainer->pprConditions(channelId.id());
     if (settings) {
+      startBit = settings->firStartBit();
       strategy   = settings->lutJepStrategy();
-      offset     = settings->lutJepOffset();
       slope      = settings->lutJepSlope();
       cut        = settings->lutJepNoiseCut();
       ped        = settings->pedValue();
+      pedMean    = settings->pedMean();
       scale_db   = settings->lutJepScale();
       scale_menu = m_configSvc->thresholdConfig()->caloInfo().globalJetScale(); // Retrieve scale param from menu instead of coolDB
       if (strategy == 3) {
@@ -860,6 +1007,24 @@ void L1TriggerTowerTool::jepLut(const std::vector<int> &fir, const L1CaloCoolCha
         par3  = settings->lutJepPar3();
         par4  = settings->lutJepPar4();
       }
+
+      hwCoeffs = getFirCoefficients<L1CaloPprConditionsContainerRun2>(channelId.id(), m_conditionsContainer);
+
+      for (unsigned int i = 0; i < hwCoeffs->size(); i++){
+        hwCoeffSum += hwCoeffs->at(i);
+      }
+      
+      if (strategy == 0){
+        offsetReal = pedMean * hwCoeffSum / pow(2.,startBit);
+      }
+      else{
+        offsetReal = pedMean * hwCoeffSum * slope / pow(2.,startBit) - slope/2.;
+      }
+      offset = static_cast<unsigned short>( offsetReal < 0. ? 0 : offsetReal + 0.5 );
+
+      ATH_MSG_VERBOSE( "::jepLut: Offset: offset/strategy/pedMean/firCoeffSum/startBit/slope: "
+		       << offset << " " << strategy << " " << " " << pedMean << " " << hwCoeffSum << " " << startBit << " " << slope );
+
     } else ATH_MSG_WARNING( "::jepLut: No L1CaloPprConditions found" );
   } else ATH_MSG_WARNING( "::jepLut: No Conditions Container retrieved" );
 
@@ -1196,11 +1361,14 @@ void L1TriggerTowerTool::cpLutParams(const L1CaloCoolChannelId& channelId, int&
   startBit = 0;
   strategy = 0;
   offset   = 0;
+  double offsetReal = 0;
   slope    = 0;
   cut      = 0;
   pedValue = 0;
   pedMean  = 0.;
   disabled = true;
+  int hwCoeffSum = 0;
+  const std::vector<short int>* hwCoeffs;
   
   if(!m_isRun2) {
     // assert instead ?!
@@ -1214,11 +1382,27 @@ void L1TriggerTowerTool::cpLutParams(const L1CaloCoolChannelId& channelId, int&
     if(settings) {
       startBit = settings->firStartBit();
       strategy = settings->lutCpStrategy();
-      offset   = settings->lutCpOffset();
       slope    = settings->lutCpSlope();
       cut      = settings->lutCpNoiseCut();
       pedValue = settings->pedValue();
       pedMean  = settings->pedMean();
+
+      hwCoeffs = getFirCoefficients<L1CaloPprConditionsContainerRun2>(channelId.id(), m_conditionsContainer);
+      for (unsigned int i = 0; i < hwCoeffs->size(); i++){
+	hwCoeffSum += hwCoeffs->at(i);
+      }
+      
+      if (strategy == 0){
+	offsetReal = pedMean * hwCoeffSum / pow(2.,startBit);
+      }
+      else{
+	offsetReal = pedMean * hwCoeffSum * slope / pow(2.,startBit) - slope/2.;
+      }
+      offset = static_cast<unsigned short>( offsetReal < 0. ? 0 : offsetReal + 0.5 );
+      
+      ATH_MSG_VERBOSE( "::jepLutParams: Offset: offset/strategy/pedMean/firCoeffSum/startBit/slope: "
+		     << offset << " " << strategy << " " << " " << pedMean << " " << hwCoeffSum << " " << startBit << " " << slope );
+
     } else ATH_MSG_WARNING( "::cpLutParams: No L1CaloPprConditions found" );
   } else ATH_MSG_WARNING( "::cpLutParams: No Conditions Container retrieved" );
 
@@ -1234,11 +1418,14 @@ void L1TriggerTowerTool::jepLutParams(const L1CaloCoolChannelId& channelId, int&
   startBit = 0;
   strategy = 0;
   offset   = 0;
+  double offsetReal = 0;
   slope    = 0;
   cut      = 0;
   pedValue = 0;
   pedMean  = 0.;
   disabled = true;
+  int hwCoeffSum = 0;
+  const std::vector<short int>* hwCoeffs;
   
   if(!m_isRun2) {
     // assert instead ?!
@@ -1252,11 +1439,28 @@ void L1TriggerTowerTool::jepLutParams(const L1CaloCoolChannelId& channelId, int&
     if(settings) {
       startBit = settings->firStartBit();
       strategy = settings->lutJepStrategy();
-      offset   = settings->lutJepOffset();
       slope    = settings->lutJepSlope();
       cut      = settings->lutJepNoiseCut();
       pedValue = settings->pedValue();
       pedMean  = settings->pedMean();
+
+      hwCoeffs = getFirCoefficients<L1CaloPprConditionsContainerRun2>(channelId.id(), m_conditionsContainer);
+
+      for (unsigned int i = 0; i < hwCoeffs->size(); i++){
+	hwCoeffSum += hwCoeffs->at(i);
+      }
+      
+      if (strategy == 0){
+	offsetReal = pedMean * hwCoeffSum / pow(2.,startBit);
+      }
+      else{
+	offsetReal = pedMean * hwCoeffSum * slope / pow(2.,startBit) - slope/2.;
+      }
+      offset = static_cast<unsigned short>( offsetReal < 0. ? 0 : offsetReal + 0.5 );
+      
+      ATH_MSG_VERBOSE( "::jepLutParams: Offset: offset/strategy/pedMean/firCoeffSum/startBit/slope: "
+		     << offset << " " << strategy << " " << " " << pedMean << " " << hwCoeffSum << " " << startBit << " " << slope );
+
     } else ATH_MSG_WARNING( "::jepLutParams: No L1CaloPprConditions found" );
   } else ATH_MSG_WARNING( "::jepLutParams: No Conditions Container retrieved" );
 
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/BinAndCoord.h b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/BinAndCoord.h
index 0d0a0a27261e84a85fb70c9381adf66caa783d5c..3c278b02840dc2913ca5e41acc28323e5af05a87 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/BinAndCoord.h
+++ b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/BinAndCoord.h
@@ -8,10 +8,6 @@
     email                : e.moyse@qmul.ac.uk
  ***************************************************************************/
 
-/***************************************************************************
- *                                                                         *
- *                                                                         *
- ***************************************************************************/
 
 
 
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/CPAlgorithm.h b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/CPAlgorithm.h
index 68be2af72fd72c5dc79ab5579bca1fda11e02ea6..fcc1d6ce7b6f44b4bc7bb99651898d16bbfe1e72 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/CPAlgorithm.h
+++ b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/CPAlgorithm.h
@@ -9,10 +9,6 @@
     email                : Alan.Watson@cern.ch
  ***************************************************************************/
 
-/***************************************************************************
- *                                                                         *
- *                                                                         *
- ***************************************************************************/
 
 #ifndef CPALGORITHM_H
 #define CPALGORITHM_H
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/CPMTobAlgorithm.h b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/CPMTobAlgorithm.h
index 8724f92552e9494de6583db3d2cb2d50e668bfd9..544d658c08e5fdb5713096359652a777afe94a5b 100644
--- a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/CPMTobAlgorithm.h
+++ b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/CPMTobAlgorithm.h
@@ -8,10 +8,6 @@
     email                : Alan.Watson@cern.ch
  ***************************************************************************/
 
-/***************************************************************************
- *                                                                         *
- *                                                                         *
- ***************************************************************************/
 
 #ifndef CPMTobAlgorithm_H
 #define CPMTobAlgorithm_H
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/ClusterProcessorModuleKey.h b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/ClusterProcessorModuleKey.h
index c9dd0d9f97a0cf3efc7758065d833a180c08ee45..918a7ac6492a59071a3512d63d0afefc9ebb4cbd 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/ClusterProcessorModuleKey.h
+++ b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/ClusterProcessorModuleKey.h
@@ -8,10 +8,6 @@
     email                : e.moyse@qmw.ac.uk
  ***************************************************************************/
 
-/***************************************************************************
- *                                                                         *
- *                                                                         *
- ***************************************************************************/
 
 #ifndef ClusterProcessorModuleKey_H
 #define ClusterProcessorModuleKey_H
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/CoordToHardware.h b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/CoordToHardware.h
index df577af88aaa6f82bd6efcbb4225c46430bf971f..6b20cda2a88ef348d8d5c2040f331ee476d67555 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/CoordToHardware.h
+++ b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/CoordToHardware.h
@@ -8,10 +8,6 @@
     email                : moyse@ph.qmw.ac.uk
  ***************************************************************************/
 
-/***************************************************************************
- *                                                                         *
- *                                                                         *
- ***************************************************************************/
 
 #ifndef COORDTOHARDWARE_H
 #define COORDTOHARDWARE_H
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/CrateEnergy.h b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/CrateEnergy.h
index 8929c88694aea9e38a5c59de57ad3cce8037c6c8..1e5f80ef514952563daa014719df90b0bf94f30c 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/CrateEnergy.h
+++ b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/CrateEnergy.h
@@ -8,10 +8,6 @@
     email                : Alan.Watson@cern.ch
  ***************************************************************************/
 
-/***************************************************************************
- *                                                                         *
- *                                                                         *
- ***************************************************************************/
 
 
 
@@ -67,8 +63,7 @@ private:
   bool m_debug;
   static const unsigned int m_sumBitsTC=15;
   static const unsigned int m_sumBits=14;
-  static const unsigned int m_jemEtSaturation=4032;
-
+  static const unsigned int m_jemEtSaturation= 0x3fff; // was 4032
 private:
   unsigned int encodeTC(int input) const;
   int decodeTC(unsigned int input) const;
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/ICoordinate.h b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/ICoordinate.h
index eb40a8f7375a0f7e15abd137591f0167f0735157..4e1ac778ca762bc042699916a3a6c4fbcb99d6aa 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/ICoordinate.h
+++ b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/ICoordinate.h
@@ -8,10 +8,6 @@
     email                : e.moyse@qmul.ac.uk
  ***************************************************************************/
 
-/***************************************************************************
- *                                                                         *
- *                                                                         *
- ***************************************************************************/
 
 
 
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/JEMJetAlgorithm.h b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/JEMJetAlgorithm.h
index b07c840b242358c45d03a4655f0b64fab998081d..f7759254fff1d9d244984065c7f01c9cbff45439 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/JEMJetAlgorithm.h
+++ b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/JEMJetAlgorithm.h
@@ -8,10 +8,6 @@
     email                : Alan.Watson@cern.ch
  ***************************************************************************/
 
-/***************************************************************************
- *                                                                         *
- *                                                                         *
- ***************************************************************************/
 
 #ifndef JETALGORITHM_H
 #define JETALGORITHM_H
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/JetAlgorithm.h b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/JetAlgorithm.h
index 3fef9fc3c091ff665bebfe09bef0741f9dc7825b..0811eecc03817d8b86cc9eb50503196344ad0621 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/JetAlgorithm.h
+++ b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/JetAlgorithm.h
@@ -8,10 +8,6 @@
     email                : Alan.Watson@cern.ch
  ***************************************************************************/
 
-/***************************************************************************
- *                                                                         *
- *                                                                         *
- ***************************************************************************/
 
 #ifndef JETALGORITHM_H
 #define JETALGORITHM_H
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/JetElementKey.h b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/JetElementKey.h
index 5397d38e0622732ec119d064f6a1a68cf4b50e2a..85e0b6c69e2e897ce2119b2d3732c21d85a72dcc 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/JetElementKey.h
+++ b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/JetElementKey.h
@@ -8,10 +8,6 @@
     email                : Alan.Watson@cern.ch
  ***************************************************************************/
 
-/***************************************************************************
- *                                                                         *
- *                                                                         *
- ***************************************************************************/
 
 #ifndef JetElementKey_H
 #define JetElementKey_H
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/JetElementKeyBase.h b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/JetElementKeyBase.h
index f390e044b45bb9c94c0c9d5657d3306a8fa365de..1bf0884ab409abf0d3eb8d17602b4e2bacd63aa4 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/JetElementKeyBase.h
+++ b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/JetElementKeyBase.h
@@ -10,10 +10,6 @@
   Converted to base class JetElementKeyBase by Alan Watson, 20/01/06
 ***************************************************************************/
 
-/***************************************************************************
- *                                                                         *
- *                                                                         *
- ***************************************************************************/
 
 #ifndef JetElementKeyBase_H
 #define JetElementKeyBase_H
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/JetEnergyModuleKey.h b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/JetEnergyModuleKey.h
index 89fd2f4291b4b4d9d6cd81453f1bdd01fb37700e..b4a93aa5390b1c8f830ae03e15990f62d8d88794 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/JetEnergyModuleKey.h
+++ b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/JetEnergyModuleKey.h
@@ -8,10 +8,6 @@
     email                : e.moyse@qmw.ac.uk
  ***************************************************************************/
 
-/***************************************************************************
- *                                                                         *
- *                                                                         *
- ***************************************************************************/
 
 #ifndef JETENERGYMODULEKEY_H
 #define JETENERGYMODULEKEY_H
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/JetInputKey.h b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/JetInputKey.h
index 67a9a84951e11ff8c00e37763e96f2dbe161b561..60957aa2c0b85f025d73c2f5cf43ec13c17a9350 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/JetInputKey.h
+++ b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/JetInputKey.h
@@ -8,10 +8,6 @@
     email                : Alan.Watson@cern.ch
  ***************************************************************************/
 
-/***************************************************************************
- *                                                                         *
- *                                                                         *
- ***************************************************************************/
 
 #ifndef JetInputKey_H
 #define JetInputKey_H
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/KeyUtilities.h b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/KeyUtilities.h
index cea7f5d90d1851c4fc92e3e1747e7e4383b74a66..d174d4a5689ecf8cb6c0a7a181d729b94a98b36d 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/KeyUtilities.h
+++ b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/KeyUtilities.h
@@ -8,10 +8,6 @@
     email                : e.moyse@qmw.ac.uk
  ***************************************************************************/
 
-/***************************************************************************
- *                                                                         *
- *                                                                         *
- ***************************************************************************/
 
 #ifndef KeyUtilities_H
 #define KeyUtilities_H
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/L1TopoDataMaker.h b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/L1TopoDataMaker.h
index 51b11ff760cfaac294358f3c058c7a87e6e399b3..89f9b84d661739176e5aca3ee129ccf2b0f853e9 100644
--- a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/L1TopoDataMaker.h
+++ b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/L1TopoDataMaker.h
@@ -5,10 +5,6 @@
 // L1TopoDataMaker.h, 
 ///////////////////////////////////////////////////////////////////
 
- /***************************************************************************
-  *                                                                         *
-  *                                                                         *
-  ***************************************************************************/
 
 #ifndef L1TOPODATAMAKER_H
 #define L1TOPODATAMAKER_H
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/ModuleEnergy.h b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/ModuleEnergy.h
index 0389606147ed9796ee9c4c2b5e54d3783d697915..1ac9715bf2fe67ac875977d7294e0ddc66f36e6f 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/ModuleEnergy.h
+++ b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/ModuleEnergy.h
@@ -8,10 +8,6 @@
     email                : Alan.Watson@cern.ch
  ***************************************************************************/
 
-/***************************************************************************
- *                                                                         *
- *                                                                         *
- ***************************************************************************/
 
 #ifndef MODULEENERGY_H
 #define MODULEENERGY_H
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/Parity.h b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/Parity.h
index f0168724f9a8cfcd30c342722c9452376621ed8a..c19c1b97e6e84aff4ec1001e22e47914437f0de3 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/Parity.h
+++ b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/Parity.h
@@ -8,10 +8,6 @@
     email                : moyse@zanzibar
  ***************************************************************************/
 
-/***************************************************************************
- *                                                                         *
- *                                                                         *
- ***************************************************************************/
 
 #ifndef PARITY_H
 #define PARITY_H
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/QuadLinear.h b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/QuadLinear.h
index 93e6d9e932732d11c145ce26a4d7d145f327a002..9258b0c281382166a48d154ff3f74c2eb18f6f4f 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/QuadLinear.h
+++ b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/QuadLinear.h
@@ -8,10 +8,6 @@
     email                : Alan.Watson@cern.ch
  ***************************************************************************/
 
-/***************************************************************************
- *                                                                         *
- *                                                                         *
- ***************************************************************************/
                                                                                 
  #ifndef QUADLINEAR_H
  #define QUADLINEAR_H
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/SystemEnergy.h b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/SystemEnergy.h
index 3e4ed2fc2155ab9c7b3b1d0fad0f63c2991d370f..617041eb1f8479b263aba7ef111ecc9b877a2fdc 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/SystemEnergy.h
+++ b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/SystemEnergy.h
@@ -8,10 +8,6 @@
     email                : Alan.Watson@cern.ch
  ***************************************************************************/
 
-/***************************************************************************
- *                                                                         *
- *                                                                         *
- ***************************************************************************/
 
 
 
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/TriggerTowerKey.h b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/TriggerTowerKey.h
index afb0b43d7ca998e5b32c10ec359fb34d7dabc5e3..ee241d33cadeb2ef2f64d52cd23966fdc80871f1 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/TriggerTowerKey.h
+++ b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/TriggerTowerKey.h
@@ -8,10 +8,6 @@
     email                : e.moyse@qmw.ac.uk
  ***************************************************************************/
 
-/***************************************************************************
- *                                                                         *
- *                                                                         *
- ***************************************************************************/
 
 #ifndef TRIGGERTOWERKEY_H
 
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/src/CPAlgorithm.cxx b/Trigger/TrigT1/TrigT1CaloUtils/src/CPAlgorithm.cxx
index 9ad110f47f5c4cae41f337e389e65808e12ef0ec..df976804587eeb71f9d9d99b2490d868e47f5ce6 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/src/CPAlgorithm.cxx
+++ b/Trigger/TrigT1/TrigT1CaloUtils/src/CPAlgorithm.cxx
@@ -9,10 +9,6 @@
     email                : Alan.Watson@cern.ch
  ***************************************************************************/
 
-/***************************************************************************
- *                                                                         *
- *                                                                         *
- ***************************************************************************/
 #include "TrigT1CaloUtils/CPAlgorithm.h"
 
 #include "TrigConfL1Data/L1DataDef.h"
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/src/CPMTobAlgorithm.cxx b/Trigger/TrigT1/TrigT1CaloUtils/src/CPMTobAlgorithm.cxx
index 2548d96da8e67f89b2af2cd139b07453d78b39f3..c5ef9d4221b1070d799505e908f031a9cd8ff640 100644
--- a/Trigger/TrigT1/TrigT1CaloUtils/src/CPMTobAlgorithm.cxx
+++ b/Trigger/TrigT1/TrigT1CaloUtils/src/CPMTobAlgorithm.cxx
@@ -9,10 +9,6 @@
     email                : Alan.Watson@cern.ch
  ***************************************************************************/
 
-/***************************************************************************
- *                                                                         *
- *                                                                         *
- ***************************************************************************/
 #include "TrigT1CaloUtils/CPMTobAlgorithm.h"
 #include "TrigConfL1Data/L1DataDef.h"
 #include "TrigT1Interfaces/TrigT1CaloDefs.h"
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/src/ClusterProcessorModuleKey.cxx b/Trigger/TrigT1/TrigT1CaloUtils/src/ClusterProcessorModuleKey.cxx
index 469ddef72396d1ad55b8155ef9b3b40bf7205d10..8183ff52f1eb5ff7803d02d6cfb0261f11c64067 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/src/ClusterProcessorModuleKey.cxx
+++ b/Trigger/TrigT1/TrigT1CaloUtils/src/ClusterProcessorModuleKey.cxx
@@ -8,10 +8,6 @@
     email                : e.moyse@qmw.ac.uk
  ***************************************************************************/
 
-/***************************************************************************
- *                                                                         *
- *                                                                         *
- ***************************************************************************/
 #ifndef  TRIGGERSPACE
 // running in Athena
 #include "TrigT1CaloUtils/ClusterProcessorModuleKey.h"
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/src/CoordToHardware.cxx b/Trigger/TrigT1/TrigT1CaloUtils/src/CoordToHardware.cxx
index 924b72b23bea770111f0d13ddc7daaac0fc796bd..89f57fff3077d55212ba16cbd047b779ab0a9244 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/src/CoordToHardware.cxx
+++ b/Trigger/TrigT1/TrigT1CaloUtils/src/CoordToHardware.cxx
@@ -8,10 +8,6 @@
     email                : moyse@ph.qmw.ac.uk
  ***************************************************************************/
 
-/***************************************************************************
- *                                                                         *
- *                                                                         *
- ***************************************************************************/
 #ifndef TRIGGERSPACE
 #include "TrigT1CaloUtils/CoordToHardware.h"
 #else
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/src/CrateEnergy.cxx b/Trigger/TrigT1/TrigT1CaloUtils/src/CrateEnergy.cxx
index 9bc9078ca8fbe4043a5e90827538ba5e8ee8d374..767d54d387cafbaf48bb04e85b0ffe6ebd6339be 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/src/CrateEnergy.cxx
+++ b/Trigger/TrigT1/TrigT1CaloUtils/src/CrateEnergy.cxx
@@ -8,10 +8,6 @@
     email                : Alan.Watson@cern.ch
  ***************************************************************************/
 
-/***************************************************************************
- *                                                                         *
- *                                                                         *
- ***************************************************************************/
 
 #include "TrigT1CaloUtils/CrateEnergy.h"
 
@@ -63,27 +59,28 @@ CrateEnergy::CrateEnergy(unsigned int crate, const DataVector<ModuleEnergy>* JEM
   }   // Loop over JEMs
   
   /** Check for overflows then truncate quadrant sums*/
-  unsigned int mask = (1<<m_sumBits) - 1;
-  for (int quad = 0; quad < 2; quad++) {
-    if (eT[quad] > mask) m_overflowT = 1;
-    eT[quad] = eT[quad]&mask ;
-    
-    if (eX[quad] > mask) m_overflowX = 1;
-    eX[quad] = eX[quad]&mask ;
-    
-    if (eY[quad] > mask) m_overflowY = 1;
-    eY[quad] = eY[quad]&mask ;
-  }
+  unsigned int mask = (1 << m_sumBits) - 1;
 
   /** Form crate sums */
   /** For total ET we must check for further overflows */
   m_crateEt = eT[0] + eT[1];
-  if (m_crateEt > mask) m_overflowT = 1;
-  m_crateEt = m_crateEt&mask ;
+  if (m_crateEt >= mask){
+    m_overflowT = 1;
+    m_crateEt = mask;
+  }
 
-  /** No further overflow can occur during Ex, Ey summing (subtraction) */
-  m_crateEx = eX[0] - eX[1];
-  m_crateEy = eY[0] - eY[1];
+ 
+  if (!m_overflowX){
+    m_crateEx = eX[0] - eX[1];
+  } else{
+    m_crateEx = -(mask + 1);
+  }
+  if (!m_overflowY){
+    m_crateEy = eY[0] - eY[1];
+  }else{
+    m_crateEy = -(mask + 1);
+  }
+  
 
   if (m_debug) {
     std::cout << "CrateEnergy: crate " << m_crate << " results " << std::endl
@@ -143,26 +140,26 @@ CrateEnergy::CrateEnergy(unsigned int crate, const DataVector<EnergyCMXData>* JE
   
   /** Check for overflows then truncate quadrant sums*/
   unsigned int mask = (1<<m_sumBits) - 1;
-  for (int quad = 0; quad < 2; quad++) {
-    if (eT[quad] > mask) m_overflowT = 1;
-    eT[quad] = eT[quad]&mask ;
-    
-    if (eX[quad] > mask) m_overflowX = 1;
-    eX[quad] = eX[quad]&mask ;
-    
-    if (eY[quad] > mask) m_overflowY = 1;
-    eY[quad] = eY[quad]&mask ;
-  }
+
 
   /** Form crate sums */
   /** For total ET we must check for further overflows */
   m_crateEt = eT[0] + eT[1];
-  if (m_crateEt > mask) m_overflowT = 1;
-  m_crateEt = m_crateEt&mask ;
+  if (m_crateEt >= mask){
+    m_overflowT = 1;
+    m_crateEt = mask;
+  }
 
-  /** No further overflow can occur during Ex, Ey summing (subtraction) */
-  m_crateEx = eX[0] - eX[1];
-  m_crateEy = eY[0] - eY[1];
+  if (!m_overflowX){
+    m_crateEx = eX[0] - eX[1];
+  } else{
+    m_crateEx = -(mask + 1);
+  }
+  if (!m_overflowY){
+    m_crateEy = eY[0] - eY[1];
+  }else{
+    m_crateEy = -(mask + 1);
+  }
 
   if (m_debug) {
     std::cout << "CrateEnergy: crate " << m_crate << " results " << std::endl
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/src/InternalTriggerTower.cxx b/Trigger/TrigT1/TrigT1CaloUtils/src/InternalTriggerTower.cxx
index 72359afe6f9affe269749b9f0ddbc89855f0ba1a..df697d047faa812af517ac85360f3c9e33a5f620 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/src/InternalTriggerTower.cxx
+++ b/Trigger/TrigT1/TrigT1CaloUtils/src/InternalTriggerTower.cxx
@@ -8,10 +8,6 @@
     email                : Alan.Watson@cern.ch
  ***************************************************************************/
 
-/***************************************************************************
- *                                                                         *
- *                                                                         *
- ***************************************************************************/
 
 #include "TrigT1CaloUtils/InternalTriggerTower.h"
 
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/src/JEMJetAlgorithm.cxx b/Trigger/TrigT1/TrigT1CaloUtils/src/JEMJetAlgorithm.cxx
index abdf133a9d38409b6c31123a089cde5e6c185ea2..312efe6141ce78c0bb7a59c91bedacf6a86bae94 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/src/JEMJetAlgorithm.cxx
+++ b/Trigger/TrigT1/TrigT1CaloUtils/src/JEMJetAlgorithm.cxx
@@ -8,10 +8,6 @@
     email                : Alan.Watson@cern.ch
  ***************************************************************************/
 
-/***************************************************************************
- *                                                                         *
- *                                                                         *
- ***************************************************************************/
 #include "TrigT1CaloUtils/JEMJetAlgorithm.h"
 #include "TrigConfL1Data/L1DataDef.h"
 #include "TrigT1Interfaces/TrigT1CaloDefs.h"
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/src/JetAlgorithm.cxx b/Trigger/TrigT1/TrigT1CaloUtils/src/JetAlgorithm.cxx
index 438f338f461518fe33b0b7c9ca96884e91644f84..e5340e5a1f3e96624fc1c3315840a88f90483ba8 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/src/JetAlgorithm.cxx
+++ b/Trigger/TrigT1/TrigT1CaloUtils/src/JetAlgorithm.cxx
@@ -8,10 +8,6 @@
     email                : Alan.Watson@cern.ch
  ***************************************************************************/
 
-/***************************************************************************
- *                                                                         *
- *                                                                         *
- ***************************************************************************/
 #include "TrigT1CaloUtils/JetAlgorithm.h"
 #include "TrigConfL1Data/L1DataDef.h"
 #include "TrigConfL1Data/CTPConfig.h"
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/src/JetElementKey.cxx b/Trigger/TrigT1/TrigT1CaloUtils/src/JetElementKey.cxx
index 72f0902d3212b2d1e5de06a47c0225a3120278e9..59642c765d2cb715c1a8f59ec77525f9c734debf 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/src/JetElementKey.cxx
+++ b/Trigger/TrigT1/TrigT1CaloUtils/src/JetElementKey.cxx
@@ -8,10 +8,6 @@
     email                : e.moyse@qmw.ac.uk
  ***************************************************************************/
 
-/***************************************************************************
- *                                                                         *
- *                                                                         *
- ***************************************************************************/
 #ifndef  TRIGGERSPACE
 // running in Athena
 #include "TrigT1CaloUtils/JetElementKey.h"
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/src/JetElementKeyBase.cxx b/Trigger/TrigT1/TrigT1CaloUtils/src/JetElementKeyBase.cxx
index 0af624dd2412cacb61413210ae98689e6b8b4c9f..e4cccf02e674562ee25ad3711fe6f92b7ee89da3 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/src/JetElementKeyBase.cxx
+++ b/Trigger/TrigT1/TrigT1CaloUtils/src/JetElementKeyBase.cxx
@@ -10,10 +10,6 @@
   Converted to base class JetElementKeyBase by Alan Watson, 20/01/06
  ***************************************************************************/
 
-/***************************************************************************
- *                                                                         *
- *                                                                         *
- ***************************************************************************/
 #ifndef  TRIGGERSPACE
 // running in Athena
 #include "TrigT1CaloUtils/JetElementKeyBase.h"
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/src/JetEnergyModuleKey.cxx b/Trigger/TrigT1/TrigT1CaloUtils/src/JetEnergyModuleKey.cxx
index e5af5cb0538a7496321af5b4c48a6c8449116db8..195a4d8b3e8350561ded017feb5e2290e112407c 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/src/JetEnergyModuleKey.cxx
+++ b/Trigger/TrigT1/TrigT1CaloUtils/src/JetEnergyModuleKey.cxx
@@ -8,10 +8,6 @@
     email                : e.moyse@qmw.ac.uk
  ***************************************************************************/
 
-/***************************************************************************
- *                                                                         *
- *                                                                         *
- ***************************************************************************/
 #ifndef  TRIGGERSPACE
 // running in Athena
 #include "TrigT1Interfaces/TrigT1CaloDefs.h"
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/src/JetInputKey.cxx b/Trigger/TrigT1/TrigT1CaloUtils/src/JetInputKey.cxx
index e2383f28956f016bd579ad8dbe6b2c6b2837af0b..43cb32053ba7c5b4bf605cc201fd6e02416e7743 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/src/JetInputKey.cxx
+++ b/Trigger/TrigT1/TrigT1CaloUtils/src/JetInputKey.cxx
@@ -8,10 +8,6 @@
     email                : Alan.Watson@cern.ch
  ***************************************************************************/
 
-/***************************************************************************
- *                                                                         *
- *                                                                         *
- ***************************************************************************/
 #ifndef  TRIGGERSPACE
 // running in Athena
 #include "TrigT1CaloUtils/JetInputKey.h"
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/src/KeyUtilities.cxx b/Trigger/TrigT1/TrigT1CaloUtils/src/KeyUtilities.cxx
index 91a8ce2568494c804e537c8bf266d1f1909eb0f1..e427f08d2c924e9dfc875f5645d0c56a7b3378da 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/src/KeyUtilities.cxx
+++ b/Trigger/TrigT1/TrigT1CaloUtils/src/KeyUtilities.cxx
@@ -8,10 +8,6 @@
     email                : e.moyse@qmw.ac.uk
  ***************************************************************************/
 
-/***************************************************************************
- *                                                                         *
- *                                                                         *
- ***************************************************************************/
 
 #ifndef  TRIGGERSPACE
 // running in Athena
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/src/L1TopoDataMaker.cxx b/Trigger/TrigT1/TrigT1CaloUtils/src/L1TopoDataMaker.cxx
index cf10e2b470779e5e50feda9f92d2a1a95ff4c9b2..c1f0e99f34758011726f1d1573de5f4afeaa0d11 100644
--- a/Trigger/TrigT1/TrigT1CaloUtils/src/L1TopoDataMaker.cxx
+++ b/Trigger/TrigT1/TrigT1CaloUtils/src/L1TopoDataMaker.cxx
@@ -2,7 +2,7 @@
   Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 ///////////////////////////////////////////////////////////////////
-// L1TopoDataMaker.cxx,  
+// L1TopoDataMaker.cxx, 
 ///////////////////////////////////////////////////////////////////
 
 #include "TrigT1CaloUtils/L1TopoDataMaker.h"
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/src/ModuleEnergy.cxx b/Trigger/TrigT1/TrigT1CaloUtils/src/ModuleEnergy.cxx
index 0ed5b9752812db7fa25a5d62dd6973c16ce165e5..952625d74e76d2c40911931dd10fd8f68c21e626 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/src/ModuleEnergy.cxx
+++ b/Trigger/TrigT1/TrigT1CaloUtils/src/ModuleEnergy.cxx
@@ -9,10 +9,6 @@
     email                : Alan.Watson@cern.ch
  ***************************************************************************/
 
-/***************************************************************************
- *                                                                         *
- *                                                                         *
- ***************************************************************************/
 #include "TrigT1CaloUtils/ModuleEnergy.h"
 #include "TrigT1CaloUtils/QuadLinear.h"
 
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/src/Parity.cxx b/Trigger/TrigT1/TrigT1CaloUtils/src/Parity.cxx
index ec9fbb50ee16a0dbb2fc0ec4ff75981e957d2926..b473da1aa215ea51a229ef10a1879ca4614fd9da 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/src/Parity.cxx
+++ b/Trigger/TrigT1/TrigT1CaloUtils/src/Parity.cxx
@@ -8,10 +8,6 @@
     email                : moyse@zanzibar
  ***************************************************************************/
 
-/***************************************************************************
- *                                                                         *
- *                                                                         *
- ***************************************************************************/
 
 #include "TrigT1CaloUtils/Parity.h"
 
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/src/QuadLinear.cxx b/Trigger/TrigT1/TrigT1CaloUtils/src/QuadLinear.cxx
index 424671f825254ecab1a23f7212b35de9b64f4956..3a7322f9db94a186d5b159f10be082a857342141 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/src/QuadLinear.cxx
+++ b/Trigger/TrigT1/TrigT1CaloUtils/src/QuadLinear.cxx
@@ -8,10 +8,6 @@
     email                : Alan.Watson@cern.ch
  ***************************************************************************/
 
-/***************************************************************************
- *                                                                         *
- *                                                                         *
- ***************************************************************************/
 #include "TrigT1CaloUtils/QuadLinear.h"
 
 namespace LVL1 {
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/src/SystemEnergy.cxx b/Trigger/TrigT1/TrigT1CaloUtils/src/SystemEnergy.cxx
index 59164952a9d68129cca113ba1577553b9c4e6931..c056897e459f4fe75bc588b53f1fcb1079dba619 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/src/SystemEnergy.cxx
+++ b/Trigger/TrigT1/TrigT1CaloUtils/src/SystemEnergy.cxx
@@ -8,10 +8,6 @@
     email                : Alan.Watson@cern.ch
  ***************************************************************************/
 
-/***************************************************************************
- *                                                                         *
- *                                                                         *
- ***************************************************************************/
 
 #include "TrigT1CaloUtils/SystemEnergy.h"
 #include "TrigT1Interfaces/TrigT1CaloDefs.h"
@@ -24,210 +20,241 @@
 
 using namespace TrigConf;
 
-namespace LVL1 {
-
-SystemEnergy::SystemEnergy(const DataVector<CrateEnergy>* crates, ServiceHandle<TrigConf::ITrigConfigSvc> config):
-  m_configSvc(config),
-  m_systemEx(0),
-  m_systemEy(0),
-  m_systemEt(0),
-  m_overflowX(0),
-  m_overflowY(0),
-  m_overflowT(0),
-  m_restricted(0),
-  m_etMissHits(0),
-  m_etSumHits(0),
-  m_metSigHits(0),
-  m_debug(false)
-  {
+namespace LVL1
+{
+
+SystemEnergy::SystemEnergy(const DataVector<CrateEnergy> *crates, ServiceHandle<TrigConf::ITrigConfigSvc> config) : m_configSvc(config),
+                                                                                                                    m_systemEx(0),
+                                                                                                                    m_systemEy(0),
+                                                                                                                    m_systemEt(0),
+                                                                                                                    m_overflowX(0),
+                                                                                                                    m_overflowY(0),
+                                                                                                                    m_overflowT(0),
+                                                                                                                    m_restricted(0),
+                                                                                                                    m_etMissHits(0),
+                                                                                                                    m_etSumHits(0),
+                                                                                                                    m_metSigHits(0),
+                                                                                                                    m_debug(false)
+{
+
+  int xyMax = 1 << (m_sumBits - 1);
 
   /** Get Ex, Ey, ET sums from crates and form global sums <br>
       Propagate overflows and test for new ones <br> */
 
   DataVector<CrateEnergy>::const_iterator it = crates->begin();
-  for ( ; it != crates->end(); it++) {
-    if ((*it)->crate() == 0) {
+  for (; it != crates->end(); it++)
+  {
+    if ((*it)->crate() == 0)
+    {
       m_systemEx += (*it)->ex();
       m_systemEy += (*it)->ey();
       m_systemEt += (*it)->et();
     }
-    else if ((*it)->crate() == 1) {
+    else if ((*it)->crate() == 1)
+    {
       m_systemEx -= (*it)->ex();
       m_systemEy += (*it)->ey();
       m_systemEt += (*it)->et();
     }
-    m_overflowX = m_overflowX|(*it)->exOverflow();
-    m_overflowY = m_overflowY|(*it)->eyOverflow();
-    m_overflowT = m_overflowT|(*it)->etOverflow();
-   
-    if ((*it)->restricted()) m_restricted = 1;
+    
+    m_overflowX = m_overflowX | ((*it)->ex() == -xyMax);
+    m_overflowY = m_overflowY | ((*it)->ey() == -xyMax);
+    m_overflowT = m_overflowT | ((*it)->et() == m_maxEtSumThr);
+
+    if ((*it)->restricted())
+      m_restricted = 1;
   }
-  
+
   /** Check for EtSum overflow */
-  if (m_overflowT != 0) m_systemEt = m_etSumOverflow;
-  /** Check for overflow of Ex, Ey sums */
-  int xyMax = (1<<(m_sumBits-1)) - 1;
-  if (abs(m_systemEx) > xyMax) {
+  if (m_overflowT != 0) {
+    m_systemEt = m_etSumOverflow;
+  }
+    
+
+
+  if ((abs(m_systemEx) >= xyMax) || m_overflowX)
+  {
     m_overflowX = 1;
-    m_systemEx = (m_systemEx > 0 ? 1 : -1) * ( abs(m_systemEx)&xyMax );
+    m_systemEx = -xyMax;
   }
-  if (abs(m_systemEy) > xyMax) {
+
+  if ((abs(m_systemEy) >= xyMax) || m_overflowY)
+  {
     m_overflowY = 1;
-    m_systemEy = (m_systemEy > 0 ? 1 : -1) * ( abs(m_systemEy)&xyMax );
+    m_systemEy = -xyMax;
   }
- 
 
-  if (m_debug) {
+  if (m_debug)
+  {
     std::cout << "SystemEnergy results: " << std::endl
-              << "   Et "  << m_systemEt << " overflow " << m_overflowT << std::endl
-              << "   Ex "  << m_systemEx << " overflow " << m_overflowX << std::endl
-              << "   Ey "  << m_systemEy << " overflow " << m_overflowY << std::endl;
-              
+              << "   Et " << m_systemEt << " overflow " << m_overflowT << std::endl
+              << "   Ex " << m_systemEx << " overflow " << m_overflowX << std::endl
+              << "   Ey " << m_systemEy << " overflow " << m_overflowY << std::endl;
   }
 
   /** Having completed sums, we can now compare with thresholds */
   etMissTrigger();
   etSumTrigger();
   metSigTrigger();
-  
 }
 
 SystemEnergy::SystemEnergy(unsigned int et, unsigned int exTC, unsigned int eyTC,
                            unsigned int overflowT, unsigned int overflowX,
-			   unsigned int overflowY, unsigned int restricted,
-			   ServiceHandle<TrigConf::ITrigConfigSvc> config):
-  m_configSvc(config),
-  m_systemEx(0),
-  m_systemEy(0),
-  m_systemEt(et),
-  m_overflowX(overflowX),
-  m_overflowY(overflowY),
-  m_overflowT(overflowT),
-  m_restricted(restricted),
-  m_etMissHits(0),
-  m_etSumHits(0),
-  m_metSigHits(0),
-  m_debug(false)
+                           unsigned int overflowY, unsigned int restricted,
+                           ServiceHandle<TrigConf::ITrigConfigSvc> config) : m_configSvc(config),
+                                                                             m_systemEx(0),
+                                                                             m_systemEy(0),
+                                                                             m_systemEt(et),
+                                                                             m_overflowX(overflowX),
+                                                                             m_overflowY(overflowY),
+                                                                             m_overflowT(overflowT),
+                                                                             m_restricted(restricted),
+                                                                             m_etMissHits(0),
+                                                                             m_etSumHits(0),
+                                                                             m_metSigHits(0),
+                                                                             m_debug(false)
 {
+
   m_systemEx = decodeTC(exTC);
   m_systemEy = decodeTC(eyTC);
 
-  if (m_debug) {
+  int xyMax = 1 << (m_sumBits - 1);
+
+  m_overflowT = m_systemEt == m_etSumOverflow;
+  m_overflowX = m_systemEx == -xyMax;
+  m_overflowY = m_systemEy == -xyMax;
+
+  if (m_debug)
+  {
     std::cout << "SystemEnergy results: " << std::endl
-              << "   Et "  << m_systemEt << " overflow " << m_overflowT << std::endl
-              << "   Ex "  << m_systemEx << " overflow " << m_overflowX << std::endl
-              << "   Ey "  << m_systemEy << " overflow " << m_overflowY << std::endl;
-              
+              << "   Et " << m_systemEt << " overflow " << m_overflowT << std::endl
+              << "   Ex " << m_systemEx << " overflow " << m_overflowX << std::endl
+              << "   Ey " << m_systemEy << " overflow " << m_overflowY << std::endl;
   }
 
   /** Having completed sums, we can now compare with thresholds */
   etMissTrigger();
   etSumTrigger();
   metSigTrigger();
-
 }
 
-SystemEnergy::~SystemEnergy(){
+SystemEnergy::~SystemEnergy()
+{
 }
 
 /** return crate Et */
-int SystemEnergy::et() {
+int SystemEnergy::et()
+{
   return m_systemEt;
 }
 
 /** return crate Ex */
-int SystemEnergy::ex() {
+int SystemEnergy::ex()
+{
   return m_systemEx;
 }
 
 /** return crate Ey */
-int SystemEnergy::ey() {
+int SystemEnergy::ey()
+{
   return m_systemEy;
 }
 
 /** return Et overflow bit */
-unsigned int SystemEnergy::etOverflow() {
+unsigned int SystemEnergy::etOverflow()
+{
   return m_overflowT & 0x1;
 }
 
 /** return Ex overflow bit */
-unsigned int SystemEnergy::exOverflow() {
+unsigned int SystemEnergy::exOverflow()
+{
   return m_overflowX & 0x1;
 }
 
 /** return Ey overflow bit */
-unsigned int SystemEnergy::eyOverflow() {
+unsigned int SystemEnergy::eyOverflow()
+{
   return m_overflowY & 0x1;
 }
 
 /** return crate Ex in 15-bit twos-complement format (hardware format) */
-unsigned int SystemEnergy::exTC() {
-  return encodeTC(m_systemEx) ;
+unsigned int SystemEnergy::exTC()
+{
+  return encodeTC(m_systemEx);
 }
 
 /** return crate Ey in 15-bit twos-complement format (hardware format) */
-unsigned int SystemEnergy::eyTC() {
-  return encodeTC(m_systemEy) ;
+unsigned int SystemEnergy::eyTC()
+{
+  return encodeTC(m_systemEy);
 }
 
 /** return EtMiss hits */
-unsigned int SystemEnergy::etMissHits() {
+unsigned int SystemEnergy::etMissHits()
+{
   return m_etMissHits;
 }
 
 /** return EtSum hits */
-unsigned int SystemEnergy::etSumHits() {
+unsigned int SystemEnergy::etSumHits()
+{
   return m_etSumHits;
 }
 
 /** return MEtSig hits */
-unsigned int SystemEnergy::metSigHits() {
+unsigned int SystemEnergy::metSigHits()
+{
   return m_metSigHits;
 }
 
 /** return RoI word 0 (Ex value & overflow) */
-unsigned int SystemEnergy::roiWord0() {
+unsigned int SystemEnergy::roiWord0()
+{
   // Start by setting up header
-  unsigned int word = TrigT1CaloDefs::energyRoIType<<30 ;
-  word += TrigT1CaloDefs::energyRoI0<<28;
+  unsigned int word = TrigT1CaloDefs::energyRoIType << 30;
+  word += TrigT1CaloDefs::energyRoI0 << 28;
   // set full/restricted eta range flag
-  word += (m_restricted&1)<<26;
+  word += (m_restricted & 1) << 26;
   // add MET Significance hits
-  word += metSigHits()<<16;
+  word += metSigHits() << 16;
   // add Ex overflow bit
-  word += exOverflow()<<15;
+  word += exOverflow() << 15;
   // add Ex value (twos-complement)
   word += exTC();
   return word;
 }
 
 /** return RoI word 1 (Ey value & overflow, EtSum hits) */
-unsigned int SystemEnergy::roiWord1() {
+unsigned int SystemEnergy::roiWord1()
+{
   // Start by setting up header
-  unsigned int word = TrigT1CaloDefs::energyRoIType<<30 ;
-  word += TrigT1CaloDefs::energyRoI1<<28;
+  unsigned int word = TrigT1CaloDefs::energyRoIType << 30;
+  word += TrigT1CaloDefs::energyRoI1 << 28;
   // set full/restricted eta range flag
-  word += (m_restricted&1)<<26;
+  word += (m_restricted & 1) << 26;
   // add EtSum hits
-  word += etSumHits()<<16;
+  word += etSumHits() << 16;
   // add Ey overflow bit
-  word += eyOverflow()<<15;
+  word += eyOverflow() << 15;
   // add Ey value (twos-complement)
   word += eyTC();
   return word;
 }
 
 /** return RoI word 2 (Et value & overflow, EtMiss hits) */
-unsigned int SystemEnergy::roiWord2() {
+unsigned int SystemEnergy::roiWord2()
+{
   // Start by setting up header
-  unsigned int word = TrigT1CaloDefs::energyRoIType<<30 ;
-  word += TrigT1CaloDefs::energyRoI2<<28;
+  unsigned int word = TrigT1CaloDefs::energyRoIType << 30;
+  word += TrigT1CaloDefs::energyRoI2 << 28;
   // set full/restricted eta range flag
-  word += (m_restricted&1)<<26;
+  word += (m_restricted & 1) << 26;
   // add EtMiss hits
-  word += etMissHits()<<16;
+  word += etMissHits() << 16;
   // add Et overflow bit
-  word += etOverflow()<<15;
+  word += etOverflow() << 15;
   // add Et value (unsigned)
   word += et();
   return word;
@@ -236,87 +263,97 @@ unsigned int SystemEnergy::roiWord2() {
 /** Test Ex, Ey sums against ETmiss thresholds <br>
     Regrettably not as simple as it sounds if we emulate hardware! <br>
     See CMM specificiation from L1Calo web pages for details */
-void SystemEnergy::etMissTrigger() {
+void SystemEnergy::etMissTrigger()
+{
   /// Start cleanly
   m_etMissHits = 0;
-  
+
   /// Calculate MET^2
-  m_etMissQ = m_systemEx*m_systemEx + m_systemEy*m_systemEy;
-  
+  m_etMissQ = m_systemEx * m_systemEx + m_systemEy * m_systemEy;
+
   /// Ex or Ey overflow automatically fires all thresholds
-  if ( (m_overflowX != 0) || (m_overflowY != 0) ) {
-    m_etMissHits = (1<<TrigT1CaloDefs::numOfMissingEtThresholds) - 1;
+  if ((m_overflowX != 0) || (m_overflowY != 0))
+  {
+    m_etMissHits = (1 << TrigT1CaloDefs::numOfMissingEtThresholds) - 1;
     return;
   }
-  
+
   /// Otherwise see which thresholds were passed
-  
+
   // Get thresholds
-  std::vector<TriggerThreshold*> thresholds = m_configSvc->ctpConfig()->menu().thresholdVector();
-  std::vector<TriggerThreshold*>::const_iterator it;
+  std::vector<TriggerThreshold *> thresholds = m_configSvc->ctpConfig()->menu().thresholdVector();
+  std::vector<TriggerThreshold *>::const_iterator it;
   //float etScale = m_configSvc->thresholdConfig()->caloInfo().globalJetScale();
-  
+
   // get Threshold values and test
 
   L1DataDef def;
-  for (it = thresholds.begin(); it != thresholds.end(); ++it) {
-    if ( (*it)->type() == def.xeType() ) {
-      TriggerThresholdValue* tv = (*it)->triggerThresholdValue(0,0);       
+  for (it = thresholds.begin(); it != thresholds.end(); ++it)
+  {
+    if ((*it)->type() == def.xeType())
+    {
+      TriggerThresholdValue *tv = (*it)->triggerThresholdValue(0, 0);
       int thresholdValue = (*tv).thresholdValueCount();
-      uint32_t tvQ = thresholdValue*thresholdValue;
+      uint32_t tvQ = thresholdValue * thresholdValue;
       int threshNumber = (*it)->thresholdNumber();
-      if (m_restricted == 0 && threshNumber < 8) {
-        if ( m_etMissQ > tvQ )
-           m_etMissHits = m_etMissHits|(1<<threshNumber);
+      if (m_restricted == 0 && threshNumber < 8)
+      {
+        if (m_etMissQ > tvQ)
+          m_etMissHits = m_etMissHits | (1 << threshNumber);
       }
-      else if (m_restricted != 0 && threshNumber >= 8) {
-	if ( m_etMissQ > tvQ )
-           m_etMissHits = m_etMissHits|(1<<(threshNumber-8));
+      else if (m_restricted != 0 && threshNumber >= 8)
+      {
+        if (m_etMissQ > tvQ)
+          m_etMissHits = m_etMissHits | (1 << (threshNumber - 8));
       }
     }
   }
 
   return;
-  
 }
 
 /** Test Et sum against ETsum thresholds */
-void SystemEnergy::etSumTrigger() {
+void SystemEnergy::etSumTrigger()
+{
   // Start cleanly
   m_etSumHits = 0;
 
   // Overflow of any sort automatically fires all thresholds
-  if (m_overflowT != 0 || m_systemEt > m_maxEtSumThr) {
-    m_etSumHits = (1<<TrigT1CaloDefs::numOfSumEtThresholds) - 1;
+  if (m_overflowT != 0 || m_systemEt > m_maxEtSumThr)
+  {
+    m_etSumHits = (1 << TrigT1CaloDefs::numOfSumEtThresholds) - 1;
     return;
   }
-  
+
   // Get thresholds
-  std::vector<TriggerThreshold*> thresholds = m_configSvc->ctpConfig()->menu().thresholdVector();
-  std::vector<TriggerThreshold*>::const_iterator it;
+  std::vector<TriggerThreshold *> thresholds = m_configSvc->ctpConfig()->menu().thresholdVector();
+  std::vector<TriggerThreshold *>::const_iterator it;
   //float etScale = m_configSvc->thresholdConfig()->caloInfo().globalJetScale();
-  
+
   // get Threshold values and test
   // Since eta-dependent values are being used to disable TE in regions, must find lowest value for each threshold
   L1DataDef def;
-  for (it = thresholds.begin(); it != thresholds.end(); ++it) {
-    if ( (*it)->type() == def.teType() ) {
+  for (it = thresholds.begin(); it != thresholds.end(); ++it)
+  {
+    if ((*it)->type() == def.teType())
+    {
       int threshNumber = (*it)->thresholdNumber();
       int thresholdValue = m_maxEtSumThr;
-      std::vector<TriggerThresholdValue*> tvv = (*it)->thresholdValueVector();
-      for (std::vector<TriggerThresholdValue*>::const_iterator ittvv = tvv.begin(); ittvv != tvv.end(); ++ittvv) 
-	if ((*ittvv)->thresholdValueCount() < thresholdValue) thresholdValue = (*ittvv)->thresholdValueCount();
-
-      if (m_restricted == 0 && threshNumber < 8) {
-        if (static_cast<int>(m_systemEt) > thresholdValue )
-           m_etSumHits = m_etSumHits|(1<<threshNumber);
+      std::vector<TriggerThresholdValue *> tvv = (*it)->thresholdValueVector();
+      for (std::vector<TriggerThresholdValue *>::const_iterator ittvv = tvv.begin(); ittvv != tvv.end(); ++ittvv)
+        if ((*ittvv)->thresholdValueCount() < thresholdValue)
+          thresholdValue = (*ittvv)->thresholdValueCount();
+
+      if (m_restricted == 0 && threshNumber < 8)
+      {
+        if (static_cast<int>(m_systemEt) > thresholdValue)
+          m_etSumHits = m_etSumHits | (1 << threshNumber);
       }
-      else if (m_restricted != 0 && threshNumber >= 8) {
-	if (static_cast<int>(m_systemEt) > thresholdValue )
-           m_etSumHits = m_etSumHits|(1<<(threshNumber-8));
+      else if (m_restricted != 0 && threshNumber >= 8)
+      {
+        if (static_cast<int>(m_systemEt) > thresholdValue)
+          m_etSumHits = m_etSumHits | (1 << (threshNumber - 8));
       }
-      
-
     }
   }
 
@@ -324,13 +361,15 @@ void SystemEnergy::etSumTrigger() {
 }
 
 /** Test MEt Significance against METSig thresholds */
-void SystemEnergy::metSigTrigger() {
+void SystemEnergy::metSigTrigger()
+{
   /// Start cleanly
   m_metSigHits = 0;
-  
+
   /// No restricted eta MET significance trigger
-  if (m_restricted != 0) return; 
-  
+  if (m_restricted != 0)
+    return;
+
   /// Obtain parameters from configuration service
   METSigParam params = m_configSvc->thresholdConfig()->caloInfo().metSigParam();
   unsigned int Scale = params.xsSigmaScale();
@@ -341,71 +380,80 @@ void SystemEnergy::metSigTrigger() {
   int sqrtTEmax = params.teSqrtMax();
 
   /// Start with overflow and range checks
-  if ( (m_overflowX > 0) || (m_overflowY > 0) || (m_etMissQ > XEmax*XEmax) ) {
-    m_metSigHits = (1<<TrigT1CaloDefs::numOfMEtSigThresholds) - 1;
+  if ((m_overflowX > 0) || (m_overflowY > 0) || (m_etMissQ > XEmax * XEmax))
+  {
+    m_metSigHits = (1 << TrigT1CaloDefs::numOfMEtSigThresholds) - 1;
     return;
   }
-  else if ( (m_etMissQ < XEmin*XEmin) || (m_systemEt < sqrtTEmin*sqrtTEmin) || (m_systemEt > sqrtTEmax*sqrtTEmax) ) {
+  else if ((m_etMissQ < XEmin * XEmin) || (m_systemEt < sqrtTEmin * sqrtTEmin) || (m_systemEt > sqrtTEmax * sqrtTEmax))
+  {
     return;
   }
-  
+
   /// Perform threshold tests. Emulate firmware logic for this, so don't explicitly calculate XS
   /// Prepare factors we wil re-use for each threshold.
   /// Scale bQ to hardware precision
-  unsigned long aQ = Scale*Scale;
-  unsigned int bQ = ceil(Offset*Offset*1.e-6);
-  unsigned long fourbQTE = 4*bQ*m_systemEt;
+  unsigned long aQ = Scale * Scale;
+  unsigned int bQ = ceil(Offset * Offset * 1.e-6);
+  unsigned long fourbQTE = 4 * bQ * m_systemEt;
 
   // Get thresholds
-  std::vector<TriggerThreshold*> thresholds = m_configSvc->ctpConfig()->menu().thresholdVector();
-  std::vector<TriggerThreshold*>::const_iterator it;
-  
+  std::vector<TriggerThreshold *> thresholds = m_configSvc->ctpConfig()->menu().thresholdVector();
+  std::vector<TriggerThreshold *>::const_iterator it;
+
   /// get Threshold values and test
   /// aQTiQ has to be scaled to hardware precision after product formed
   L1DataDef def;
-  for (it = thresholds.begin(); it != thresholds.end(); ++it) {
-    if ( (*it)->type() == def.xsType() ) {
-        TriggerThresholdValue* tv = (*it)->triggerThresholdValue(0,0);
-	
-	int threshNumber = (*it)->thresholdNumber();
-	unsigned int Ti = (*tv).thresholdValueCount();
-	unsigned long aQTiQ = (0.5 + double(aQ*1.e-8)*Ti*Ti);
-
-        long left  = aQTiQ*aQTiQ*fourbQTE;
-        long right = aQTiQ*(m_systemEt+bQ) - m_etMissQ;
-	
-        if ( right < 0 || left > right*right ) m_metSigHits = m_metSigHits|(1<<threshNumber);
+  for (it = thresholds.begin(); it != thresholds.end(); ++it)
+  {
+    if ((*it)->type() == def.xsType())
+    {
+      TriggerThresholdValue *tv = (*it)->triggerThresholdValue(0, 0);
+
+      int threshNumber = (*it)->thresholdNumber();
+      unsigned int Ti = (*tv).thresholdValueCount();
+      unsigned long aQTiQ = (0.5 + double(aQ * 1.e-8) * Ti * Ti);
+
+      long left = aQTiQ * aQTiQ * fourbQTE;
+      long right = aQTiQ * (m_systemEt + bQ) - m_etMissQ;
+
+      if (right < 0 || left > right * right)
+        m_metSigHits = m_metSigHits | (1 << threshNumber);
     }
   }
-  
+
   return;
 }
 
 /** encode int as 15-bit twos-complement format (hardware Ex/Ey format) */
-unsigned int SystemEnergy::encodeTC(int input) {
+unsigned int SystemEnergy::encodeTC(int input)
+{
   unsigned int value;
 
-  if (input > 0) {
+  if (input > 0)
+  {
     value = input;
   }
-  else {
-    value = (1<<m_sumBits) + input;
+  else
+  {
+    value = (1 << m_sumBits) + input;
   }
 
-  int mask = (1<<m_sumBits) - 1;
-  return value&mask ;
+  int mask = (1 << m_sumBits) - 1;
+  return value & mask;
 }
 
 /** decode 15-bit twos-complement format (hardware Ex/Ey format) as int */
-int SystemEnergy::decodeTC(unsigned int input) {
+int SystemEnergy::decodeTC(unsigned int input)
+{
 
-  int mask = (1<<m_sumBits) - 1;
-  int value = input&mask;
+  int mask = (1 << m_sumBits) - 1;
+  int value = input & mask;
 
-  if ((value >> (m_sumBits - 1))) {
+  if ((value >> (m_sumBits - 1)))
+  {
     int complement = ~value;
-    value = -( (complement+1) & mask );
-
+    value = -((complement + 1) & mask);
   }
 
   return value;
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/src/TriggerTowerKey.cxx b/Trigger/TrigT1/TrigT1CaloUtils/src/TriggerTowerKey.cxx
index 31ed055932ac11afd08170acff8bd498d7af3a3b..af1af7a5ad2bff14fab1f44ec6b3e8c576d20932 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/src/TriggerTowerKey.cxx
+++ b/Trigger/TrigT1/TrigT1CaloUtils/src/TriggerTowerKey.cxx
@@ -8,10 +8,6 @@
     email                : e.moyse@qmw.ac.uk
  ***************************************************************************/
 
-/***************************************************************************
- *                                                                         *
- *                                                                         *
- ***************************************************************************/
 
 #ifndef  TRIGGERSPACE
 // running in Athena
diff --git a/Trigger/TrigTools/TrigT2CaloCalibration/src/T2SampCalibTool.cxx b/Trigger/TrigTools/TrigT2CaloCalibration/src/T2SampCalibTool.cxx
index 7b3a3a20291e70c31674a25013e42a081db5187f..97ea39652da95fe25cc358fd8790984440bea755 100755
--- a/Trigger/TrigTools/TrigT2CaloCalibration/src/T2SampCalibTool.cxx
+++ b/Trigger/TrigTools/TrigT2CaloCalibration/src/T2SampCalibTool.cxx
@@ -37,12 +37,6 @@
 #include "GaudiKernel/IToolSvc.h"
 #include "GaudiKernel/Property.h"
 
-// Event Info 
-#include "EventInfo/EventIncident.h"
-#include "EventInfo/EventInfo.h"
-#include "EventInfo/EventID.h"
-#include "EventInfo/EventType.h"
-
 // Needed to register dB object
 #include "RegistrationServices/IIOVRegistrationSvc.h"
 
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/CMakeLists.txt b/Trigger/TrigValidation/TrigUpgradeTest/CMakeLists.txt
index 7d3df74a6b4f2c3456322a72d2aceadfcd33db66..9acc904b0538731ad38f029633f1e437c7b60d80 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/CMakeLists.txt
+++ b/Trigger/TrigValidation/TrigUpgradeTest/CMakeLists.txt
@@ -67,10 +67,20 @@ atlas_add_test( IDRunData SCRIPT test/test_id_run_data.sh
 file( MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_egammaRunData )
 atlas_add_test( egammaRunData
    SCRIPT test/test_egamma_run_data.sh
-   PROPERTIES TIMEOUT 1000
+   PROPERTIES TIMEOUT 1000   
+   EXTRA_PATTERNS "-s TrigSignatureMoniMT.*HLT_.*|Payload size after inserting"
    PROPERTIES WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_egammaRunData
    )
 
+file( MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_decodeBS )
+atlas_add_test( decodeBS
+   SCRIPT test/test_decodeBS.sh
+   PROPERTIES TIMEOUT 1000
+   EXTRA_PATTERNS "-s FillMissingEDM.*(present|absent)"
+   PROPERTIES WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_decodeBS
+   DEPENDS egammaRunData
+   )
+
 file( MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_photonMenu )
 atlas_add_test( photonMenu
    SCRIPT test/test_photon_menu.sh
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/python/jetDefs.py b/Trigger/TrigValidation/TrigUpgradeTest/python/jetDefs.py
index 780ec7476a5e3c89bcbed50d59857b7911219c78..8b465c1e96cd3b154a3f374e4fc950ed69e0d32a 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/python/jetDefs.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/python/jetDefs.py
@@ -1,5 +1,5 @@
 #
-#  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+#  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 #
 
 def jetRecoSequence(RoIs):
@@ -23,16 +23,20 @@ def jetRecoSequence(RoIs):
     mon = GenericMonitoringTool("CaloDataAccessSvcMon")
     mon.Histograms += [
         defineHistogram("TIME_locking_LAr_RoI",
+                        path="EXPERT",
                         title="Time spent in unlocking the LAr collection",
                         xbins=100, xmin=0, xmax=100 ),
         defineHistogram("roiROBs_LAr",
+                        path="EXPERT",
                         title="Number of ROBs unpacked in RoI requests",
                         xbins=20, xmin=0, xmax=20 ),
         defineHistogram("TIME_locking_LAr_FullDet",
+                        path="EXPERT",
                         title="Time spent in unlocking the LAr collection",
                         xbins=100, xmin=0, xmax=100 ),
         defineHistogram("roiEta_LAr,roiPhi_LAr",
                         type="TH2F",
+                        path="EXPERT",
                         title="Geometric usage",
                         xbins=50, xmin=-5, xmax=5,
                         ybins=64, ymin=-math.pi, ymax=math.pi )]
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/python/metDefs.py b/Trigger/TrigValidation/TrigUpgradeTest/python/metDefs.py
index f83bfc6ab88f931d1ea1beb9de1341b07dbb9fe0..eac0537f8f38ad59f40f2fac1c7247f0586ba421 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/python/metDefs.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/python/metDefs.py
@@ -1,5 +1,5 @@
 #
-#  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+#  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 #
 
 def metCellRecoSequence(RoIs):
@@ -28,10 +28,10 @@ def metCellRecoSequence(RoIs):
     # Set up monitoring for CaloDataAccess
     #################################################
     mon = GenericMonitoringTool("CaloDataAccessSvcMon")
-    mon.Histograms += [defineHistogram( "TIME_locking_LAr_RoI", title="Time spent in unlocking the LAr collection", xbins=100, xmin=0, xmax=100 ),
-                       defineHistogram( "roiROBs_LAr", title="Number of ROBs unpacked in RoI requests", xbins=20, xmin=0, xmax=20 ),
-                       defineHistogram( "TIME_locking_LAr_FullDet", title="Time spent in unlocking the LAr collection", xbins=100, xmin=0, xmax=100 ),
-                       defineHistogram( "roiEta_LAr,roiPhi_LAr", type="TH2F", title="Geometric usage", xbins=50, xmin=-5, xmax=5, ybins=64, ymin=-pi, ymax=pi )]
+    mon.Histograms += [defineHistogram( "TIME_locking_LAr_RoI", path='EXPERT', title="Time spent in unlocking the LAr collection", xbins=100, xmin=0, xmax=100 ),
+                       defineHistogram( "roiROBs_LAr", path='EXPERT', title="Number of ROBs unpacked in RoI requests", xbins=20, xmin=0, xmax=20 ),
+                       defineHistogram( "TIME_locking_LAr_FullDet", path='EXPERT', title="Time spent in unlocking the LAr collection", xbins=100, xmin=0, xmax=100 ),
+                       defineHistogram( "roiEta_LAr,roiPhi_LAr", type="TH2F", path='EXPERT', title="Geometric usage", xbins=50, xmin=-5, xmax=5, ybins=64, ymin=-pi, ymax=pi )]
 
     svcMgr += TrigCaloDataAccessSvc()
     svcMgr.TrigCaloDataAccessSvc.MonTool = mon
@@ -60,8 +60,8 @@ def metCellRecoSequence(RoIs):
         # Setup monitoring for EFMissingETAlg
         #///////////////////////////////////////////
     metMon = GenericMonitoringTool("METMonTool")
-    metMon.Histograms = [ defineHistogram( "TIME_Total", title="Time spent Alg", xbins=100, xmin=0, xmax=100 ),
-                          defineHistogram( "TIME_Loop", title="Time spent in Tools loop", xbins=100, xmin=0, xmax=100 )]
+    metMon.Histograms = [ defineHistogram( "TIME_Total", path='EXPERT', title="Time spent Alg", xbins=100, xmin=0, xmax=100 ),
+                          defineHistogram( "TIME_Loop", path='EXPERT', title="Time spent in Tools loop", xbins=100, xmin=0, xmax=100 )]
     from TrigEFMissingET.TrigEFMissingETMonitoring import ( hEx_log, hEy_log, hEz_log, hMET_log, hSumEt_log,
                                                             hMET_lin, hSumEt_lin,
                                                             hXS, hMETPhi, hMETStatus,
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/decodeBS.py b/Trigger/TrigValidation/TrigUpgradeTest/share/decodeBS.py
new file mode 100644
index 0000000000000000000000000000000000000000..607cbd29be610bcf8046412af1156e648b56ca55
--- /dev/null
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/decodeBS.py
@@ -0,0 +1,57 @@
+#
+#  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+#
+
+include("TrigUpgradeTest/testHLT_MT.py")
+
+from AthenaCommon.AlgSequence import AlgSequence, AthSequencer
+topSequence = AlgSequence()
+
+from TrigHLTResultByteStream.TrigHLTResultByteStreamConf import HLTResultMTByteStreamDecoderAlg
+decoder = HLTResultMTByteStreamDecoderAlg()
+decoder.OutputLevel=DEBUG
+topSequence += decoder
+
+
+from TrigOutputHandling.TrigOutputHandlingConf import TriggerEDMDeserialiserAlg
+deserialiser = TriggerEDMDeserialiserAlg("TrigDeserialiser")
+deserialiser.OutputLevel=DEBUG
+topSequence += deserialiser
+
+from OutputStreamAthenaPool.OutputStreamAthenaPool import  createOutputStream
+StreamESD=createOutputStream("StreamESD","myESDfromBS.pool.root",True)
+topSequence.remove( StreamESD )
+StreamESD.ItemList += [ "xAOD::TrigElectronContainer#HLT_xAOD__TrigElectronContainer_L2ElectronFex", 
+                        "xAOD::TrackParticleContainer#HLT_xAOD_TrackParticleContainer_L2ElectronTracks",
+                        "xAOD::TrigEMClusterContainer#HLT_xAOD__TrigEMClusterContainer_L2CaloClusters"]
+
+StreamESD.ItemList += [ "xAOD::TrigElectronAuxContainer#HLT_xAOD__TrigElectronContainer_L2ElectronFexAux.", 
+                        "xAOD::TrackParticleAuxContainer#HLT_xAOD_TrackParticleContainer_L2ElectronTracksAux.", 
+                        "xAOD::TrigEMClusterAuxContainer#HLT_xAOD__TrigEMClusterContainer_L2CaloClustersAux."]
+
+StreamESD.ItemList += [ "EventInfo#ByteStreamEventInfo" ]
+
+decisions = [ "EgammaCaloDecisions", "L2CaloLinks", "FilteredEgammaCaloDecisions", "FilteredEMRoIDecisions", "EMRoIDecisions", "RerunEMRoIDecisions" ]
+StreamESD.ItemList += [ "xAOD::TrigCompositeContainer#remap_"+d for d in decisions ]
+StreamESD.ItemList += [ "xAOD::TrigCompositeAuxContainer#remap_"+d+"Aux." for d in decisions ]
+
+
+from TrigOutputHandling.TrigOutputHandlingConf import HLTEDMCreator
+egammaCreator = HLTEDMCreator("egammaCreator")
+egammaCreator.FixLinks=False
+egammaCreator.OutputLevel=DEBUG
+egammaCreator.TrigCompositeContainer = [ "remap_"+d for d in decisions ]
+
+egammaCreator.TrackParticleContainer = [ "HLT_xAOD_TrackParticleContainer_L2ElectronTracks" ]
+egammaCreator.TrigElectronContainer  = [ "HLT_xAOD__TrigElectronContainer_L2ElectronFex" ]
+egammaCreator.TrigEMClusterContainer = [ "HLT_xAOD__TrigEMClusterContainer_L2CaloClusters" ]
+
+from TrigOutputHandling.TrigOutputHandlingConf import HLTEDMCreatorAlg
+fillGaps = HLTEDMCreatorAlg( "FillMissingEDM" )
+fillGaps.OutputTools = [ egammaCreator ]
+
+
+outSequence = AthSequencer("AthOutSeq")
+outSequence += fillGaps
+outSequence += StreamESD
+
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/decodeBS.ref b/Trigger/TrigValidation/TrigUpgradeTest/share/decodeBS.ref
new file mode 100644
index 0000000000000000000000000000000000000000..617b3d1b586e37607931eb62676dcddaba1e60e8
--- /dev/null
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/decodeBS.ref
@@ -0,0 +1,301 @@
+Py:inputFilePeeker    INFO stream_names not present in input bytestream file. Giving default name 'StreamRAW'
+TriggerEDMDeserialiserAlg               0   0     DEBUG fragment: clid, type, key, size 1333228823 xAOD::TrigCompositeContainer xAOD::TrigCompositeContainer_v1 remap_EgammaCaloDecisions 69
+TriggerEDMDeserialiserAlg               0   0     DEBUG fragment: clid, type, key, size 1175586382 xAOD::TrigCompositeAuxContainer xAOD::TrigCompositeAuxContainer_v1 remap_EgammaCaloDecisionsAux. 304
+TriggerEDMDeserialiserAlg               0   0     DEBUG fragment: clid, type, key, size 1264979038 xAOD::TrigEMClusterContainer xAOD::TrigEMClusterContainer_v1 HLT_xAOD__TrigEMClusterContainer_L2CaloClusters 69
+TriggerEDMDeserialiserAlg               0   0     DEBUG fragment: clid, type, key, size 1111649561 xAOD::TrigEMClusterAuxContainer xAOD::TrigEMClusterAuxContainer_v2 HLT_xAOD__TrigEMClusterContainer_L2CaloClustersAux. 663
+TriggerEDMDeserialiserAlg               0   0     DEBUG fragment: clid, type, key, size 1119645201 xAOD::TrigElectronContainer xAOD::TrigElectronContainer_v1 HLT_xAOD__TrigElectronContainer_L2ElectronFex 68
+TriggerEDMDeserialiserAlg               0   0     DEBUG fragment: clid, type, key, size 1180743572 xAOD::TrigElectronAuxContainer xAOD::TrigElectronAuxContainer_v1 HLT_xAOD__TrigElectronContainer_L2ElectronFexAux. 610
+FillMissingEDM.egammaCreator            0   0     DEBUG The remap_EgammaCaloDecisions already present
+FillMissingEDM.egammaCreator            0   0     DEBUG The remap_L2CaloLinks was absent, creating it
+FillMissingEDM.egammaCreator            0   0     DEBUG The remap_FilteredEgammaCaloDecisions was absent, creating it
+FillMissingEDM.egammaCreator            0   0     DEBUG The remap_FilteredEMRoIDecisions was absent, creating it
+FillMissingEDM.egammaCreator            0   0     DEBUG The remap_EMRoIDecisions was absent, creating it
+FillMissingEDM.egammaCreator            0   0     DEBUG The remap_RerunEMRoIDecisions was absent, creating it
+FillMissingEDM.egammaCreator            0   0     DEBUG The HLT_xAOD__TrigElectronContainer_L2ElectronFex already present
+FillMissingEDM.egammaCreator            0   0     DEBUG The HLT_xAOD__TrigEMClusterContainer_L2CaloClusters already present
+FillMissingEDM.egammaCreator            0   0     DEBUG The HLT_xAOD_TrackParticleContainer_L2ElectronTracks was absent, creating it
+TriggerEDMDeserialiserAlg               1   0     DEBUG fragment: clid, type, key, size 1333228823 xAOD::TrigCompositeContainer xAOD::TrigCompositeContainer_v1 remap_EgammaCaloDecisions 69
+TriggerEDMDeserialiserAlg               1   0     DEBUG fragment: clid, type, key, size 1175586382 xAOD::TrigCompositeAuxContainer xAOD::TrigCompositeAuxContainer_v1 remap_EgammaCaloDecisionsAux. 641
+TriggerEDMDeserialiserAlg               1   0     DEBUG fragment: clid, type, key, size 1264979038 xAOD::TrigEMClusterContainer xAOD::TrigEMClusterContainer_v1 HLT_xAOD__TrigEMClusterContainer_L2CaloClusters 69
+TriggerEDMDeserialiserAlg               1   0     DEBUG fragment: clid, type, key, size 1111649561 xAOD::TrigEMClusterAuxContainer xAOD::TrigEMClusterAuxContainer_v2 HLT_xAOD__TrigEMClusterContainer_L2CaloClustersAux. 1623
+TriggerEDMDeserialiserAlg               1   0     DEBUG fragment: clid, type, key, size 1119645201 xAOD::TrigElectronContainer xAOD::TrigElectronContainer_v1 HLT_xAOD__TrigElectronContainer_L2ElectronFex 68
+TriggerEDMDeserialiserAlg               1   0     DEBUG fragment: clid, type, key, size 1180743572 xAOD::TrigElectronAuxContainer xAOD::TrigElectronAuxContainer_v1 HLT_xAOD__TrigElectronContainer_L2ElectronFexAux. 2726
+FillMissingEDM.egammaCreator            1   0     DEBUG The remap_EgammaCaloDecisions already present
+FillMissingEDM.egammaCreator            1   0     DEBUG The remap_L2CaloLinks was absent, creating it
+FillMissingEDM.egammaCreator            1   0     DEBUG The remap_FilteredEgammaCaloDecisions was absent, creating it
+FillMissingEDM.egammaCreator            1   0     DEBUG The remap_FilteredEMRoIDecisions was absent, creating it
+FillMissingEDM.egammaCreator            1   0     DEBUG The remap_EMRoIDecisions was absent, creating it
+FillMissingEDM.egammaCreator            1   0     DEBUG The remap_RerunEMRoIDecisions was absent, creating it
+FillMissingEDM.egammaCreator            1   0     DEBUG The HLT_xAOD__TrigElectronContainer_L2ElectronFex already present
+FillMissingEDM.egammaCreator            1   0     DEBUG The HLT_xAOD__TrigEMClusterContainer_L2CaloClusters already present
+FillMissingEDM.egammaCreator            1   0     DEBUG The HLT_xAOD_TrackParticleContainer_L2ElectronTracks was absent, creating it
+TriggerEDMDeserialiserAlg               2   0     DEBUG fragment: clid, type, key, size 1333228823 xAOD::TrigCompositeContainer xAOD::TrigCompositeContainer_v1 remap_EgammaCaloDecisions 69
+TriggerEDMDeserialiserAlg               2   0     DEBUG fragment: clid, type, key, size 1175586382 xAOD::TrigCompositeAuxContainer xAOD::TrigCompositeAuxContainer_v1 remap_EgammaCaloDecisionsAux. 851
+TriggerEDMDeserialiserAlg               2   0     DEBUG fragment: clid, type, key, size 1264979038 xAOD::TrigEMClusterContainer xAOD::TrigEMClusterContainer_v1 HLT_xAOD__TrigEMClusterContainer_L2CaloClusters 69
+TriggerEDMDeserialiserAlg               2   0     DEBUG fragment: clid, type, key, size 1111649561 xAOD::TrigEMClusterAuxContainer xAOD::TrigEMClusterAuxContainer_v2 HLT_xAOD__TrigEMClusterContainer_L2CaloClustersAux. 2263
+TriggerEDMDeserialiserAlg               2   0     DEBUG fragment: clid, type, key, size 1119645201 xAOD::TrigElectronContainer xAOD::TrigElectronContainer_v1 HLT_xAOD__TrigElectronContainer_L2ElectronFex 68
+TriggerEDMDeserialiserAlg               2   0     DEBUG fragment: clid, type, key, size 1180743572 xAOD::TrigElectronAuxContainer xAOD::TrigElectronAuxContainer_v1 HLT_xAOD__TrigElectronContainer_L2ElectronFexAux. 1622
+FillMissingEDM.egammaCreator            2   0     DEBUG The remap_EgammaCaloDecisions already present
+FillMissingEDM.egammaCreator            2   0     DEBUG The remap_L2CaloLinks was absent, creating it
+FillMissingEDM.egammaCreator            2   0     DEBUG The remap_FilteredEgammaCaloDecisions was absent, creating it
+FillMissingEDM.egammaCreator            2   0     DEBUG The remap_FilteredEMRoIDecisions was absent, creating it
+FillMissingEDM.egammaCreator            2   0     DEBUG The remap_EMRoIDecisions was absent, creating it
+FillMissingEDM.egammaCreator            2   0     DEBUG The remap_RerunEMRoIDecisions was absent, creating it
+FillMissingEDM.egammaCreator            2   0     DEBUG The HLT_xAOD__TrigElectronContainer_L2ElectronFex already present
+FillMissingEDM.egammaCreator            2   0     DEBUG The HLT_xAOD__TrigEMClusterContainer_L2CaloClusters already present
+FillMissingEDM.egammaCreator            2   0     DEBUG The HLT_xAOD_TrackParticleContainer_L2ElectronTracks was absent, creating it
+TriggerEDMDeserialiserAlg               3   0     DEBUG fragment: clid, type, key, size 1333228823 xAOD::TrigCompositeContainer xAOD::TrigCompositeContainer_v1 remap_EgammaCaloDecisions 69
+TriggerEDMDeserialiserAlg               3   0     DEBUG fragment: clid, type, key, size 1175586382 xAOD::TrigCompositeAuxContainer xAOD::TrigCompositeAuxContainer_v1 remap_EgammaCaloDecisionsAux. 629
+TriggerEDMDeserialiserAlg               3   0     DEBUG fragment: clid, type, key, size 1264979038 xAOD::TrigEMClusterContainer xAOD::TrigEMClusterContainer_v1 HLT_xAOD__TrigEMClusterContainer_L2CaloClusters 69
+TriggerEDMDeserialiserAlg               3   0     DEBUG fragment: clid, type, key, size 1111649561 xAOD::TrigEMClusterAuxContainer xAOD::TrigEMClusterAuxContainer_v2 HLT_xAOD__TrigEMClusterContainer_L2CaloClustersAux. 1623
+TriggerEDMDeserialiserAlg               3   0     DEBUG fragment: clid, type, key, size 1119645201 xAOD::TrigElectronContainer xAOD::TrigElectronContainer_v1 HLT_xAOD__TrigElectronContainer_L2ElectronFex 68
+TriggerEDMDeserialiserAlg               3   0     DEBUG fragment: clid, type, key, size 1180743572 xAOD::TrigElectronAuxContainer xAOD::TrigElectronAuxContainer_v1 HLT_xAOD__TrigElectronContainer_L2ElectronFexAux. 3186
+FillMissingEDM.egammaCreator            3   0     DEBUG The remap_EgammaCaloDecisions already present
+FillMissingEDM.egammaCreator            3   0     DEBUG The remap_L2CaloLinks was absent, creating it
+FillMissingEDM.egammaCreator            3   0     DEBUG The remap_FilteredEgammaCaloDecisions was absent, creating it
+FillMissingEDM.egammaCreator            3   0     DEBUG The remap_FilteredEMRoIDecisions was absent, creating it
+FillMissingEDM.egammaCreator            3   0     DEBUG The remap_EMRoIDecisions was absent, creating it
+FillMissingEDM.egammaCreator            3   0     DEBUG The remap_RerunEMRoIDecisions was absent, creating it
+FillMissingEDM.egammaCreator            3   0     DEBUG The HLT_xAOD__TrigElectronContainer_L2ElectronFex already present
+FillMissingEDM.egammaCreator            3   0     DEBUG The HLT_xAOD__TrigEMClusterContainer_L2CaloClusters already present
+FillMissingEDM.egammaCreator            3   0     DEBUG The HLT_xAOD_TrackParticleContainer_L2ElectronTracks was absent, creating it
+TriggerEDMDeserialiserAlg               4   0     DEBUG fragment: clid, type, key, size 1333228823 xAOD::TrigCompositeContainer xAOD::TrigCompositeContainer_v1 remap_EgammaCaloDecisions 69
+TriggerEDMDeserialiserAlg               4   0     DEBUG fragment: clid, type, key, size 1175586382 xAOD::TrigCompositeAuxContainer xAOD::TrigCompositeAuxContainer_v1 remap_EgammaCaloDecisionsAux. 419
+TriggerEDMDeserialiserAlg               4   0     DEBUG fragment: clid, type, key, size 1264979038 xAOD::TrigEMClusterContainer xAOD::TrigEMClusterContainer_v1 HLT_xAOD__TrigEMClusterContainer_L2CaloClusters 69
+TriggerEDMDeserialiserAlg               4   0     DEBUG fragment: clid, type, key, size 1111649561 xAOD::TrigEMClusterAuxContainer xAOD::TrigEMClusterAuxContainer_v2 HLT_xAOD__TrigEMClusterContainer_L2CaloClustersAux. 983
+TriggerEDMDeserialiserAlg               4   0     DEBUG fragment: clid, type, key, size 1119645201 xAOD::TrigElectronContainer xAOD::TrigElectronContainer_v1 HLT_xAOD__TrigElectronContainer_L2ElectronFex 68
+TriggerEDMDeserialiserAlg               4   0     DEBUG fragment: clid, type, key, size 1180743572 xAOD::TrigElectronAuxContainer xAOD::TrigElectronAuxContainer_v1 HLT_xAOD__TrigElectronContainer_L2ElectronFexAux. 886
+FillMissingEDM.egammaCreator            4   0     DEBUG The remap_EgammaCaloDecisions already present
+FillMissingEDM.egammaCreator            4   0     DEBUG The remap_L2CaloLinks was absent, creating it
+FillMissingEDM.egammaCreator            4   0     DEBUG The remap_FilteredEgammaCaloDecisions was absent, creating it
+FillMissingEDM.egammaCreator            4   0     DEBUG The remap_FilteredEMRoIDecisions was absent, creating it
+FillMissingEDM.egammaCreator            4   0     DEBUG The remap_EMRoIDecisions was absent, creating it
+FillMissingEDM.egammaCreator            4   0     DEBUG The remap_RerunEMRoIDecisions was absent, creating it
+FillMissingEDM.egammaCreator            4   0     DEBUG The HLT_xAOD__TrigElectronContainer_L2ElectronFex already present
+FillMissingEDM.egammaCreator            4   0     DEBUG The HLT_xAOD__TrigEMClusterContainer_L2CaloClusters already present
+FillMissingEDM.egammaCreator            4   0     DEBUG The HLT_xAOD_TrackParticleContainer_L2ElectronTracks was absent, creating it
+TriggerEDMDeserialiserAlg               5   0     DEBUG fragment: clid, type, key, size 1333228823 xAOD::TrigCompositeContainer xAOD::TrigCompositeContainer_v1 remap_EgammaCaloDecisions 69
+TriggerEDMDeserialiserAlg               5   0     DEBUG fragment: clid, type, key, size 1175586382 xAOD::TrigCompositeAuxContainer xAOD::TrigCompositeAuxContainer_v1 remap_EgammaCaloDecisionsAux. 954
+TriggerEDMDeserialiserAlg               5   0     DEBUG fragment: clid, type, key, size 1264979038 xAOD::TrigEMClusterContainer xAOD::TrigEMClusterContainer_v1 HLT_xAOD__TrigEMClusterContainer_L2CaloClusters 69
+TriggerEDMDeserialiserAlg               5   0     DEBUG fragment: clid, type, key, size 1111649561 xAOD::TrigEMClusterAuxContainer xAOD::TrigEMClusterAuxContainer_v2 HLT_xAOD__TrigEMClusterContainer_L2CaloClustersAux. 2583
+TriggerEDMDeserialiserAlg               5   0     DEBUG fragment: clid, type, key, size 1119645201 xAOD::TrigElectronContainer xAOD::TrigElectronContainer_v1 HLT_xAOD__TrigElectronContainer_L2ElectronFex 68
+TriggerEDMDeserialiserAlg               5   0     DEBUG fragment: clid, type, key, size 1180743572 xAOD::TrigElectronAuxContainer xAOD::TrigElectronAuxContainer_v1 HLT_xAOD__TrigElectronContainer_L2ElectronFexAux. 4474
+FillMissingEDM.egammaCreator            5   0     DEBUG The remap_EgammaCaloDecisions already present
+FillMissingEDM.egammaCreator            5   0     DEBUG The remap_L2CaloLinks was absent, creating it
+FillMissingEDM.egammaCreator            5   0     DEBUG The remap_FilteredEgammaCaloDecisions was absent, creating it
+FillMissingEDM.egammaCreator            5   0     DEBUG The remap_FilteredEMRoIDecisions was absent, creating it
+FillMissingEDM.egammaCreator            5   0     DEBUG The remap_EMRoIDecisions was absent, creating it
+FillMissingEDM.egammaCreator            5   0     DEBUG The remap_RerunEMRoIDecisions was absent, creating it
+FillMissingEDM.egammaCreator            5   0     DEBUG The HLT_xAOD__TrigElectronContainer_L2ElectronFex already present
+FillMissingEDM.egammaCreator            5   0     DEBUG The HLT_xAOD__TrigEMClusterContainer_L2CaloClusters already present
+FillMissingEDM.egammaCreator            5   0     DEBUG The HLT_xAOD_TrackParticleContainer_L2ElectronTracks was absent, creating it
+TriggerEDMDeserialiserAlg               6   0     DEBUG fragment: clid, type, key, size 1333228823 xAOD::TrigCompositeContainer xAOD::TrigCompositeContainer_v1 remap_EgammaCaloDecisions 69
+TriggerEDMDeserialiserAlg               6   0     DEBUG fragment: clid, type, key, size 1175586382 xAOD::TrigCompositeAuxContainer xAOD::TrigCompositeAuxContainer_v1 remap_EgammaCaloDecisionsAux. 308
+TriggerEDMDeserialiserAlg               6   0     DEBUG fragment: clid, type, key, size 1264979038 xAOD::TrigEMClusterContainer xAOD::TrigEMClusterContainer_v1 HLT_xAOD__TrigEMClusterContainer_L2CaloClusters 69
+TriggerEDMDeserialiserAlg               6   0     DEBUG fragment: clid, type, key, size 1111649561 xAOD::TrigEMClusterAuxContainer xAOD::TrigEMClusterAuxContainer_v2 HLT_xAOD__TrigEMClusterContainer_L2CaloClustersAux. 663
+TriggerEDMDeserialiserAlg               6   0     DEBUG fragment: clid, type, key, size 1119645201 xAOD::TrigElectronContainer xAOD::TrigElectronContainer_v1 HLT_xAOD__TrigElectronContainer_L2ElectronFex 68
+TriggerEDMDeserialiserAlg               6   0     DEBUG fragment: clid, type, key, size 1180743572 xAOD::TrigElectronAuxContainer xAOD::TrigElectronAuxContainer_v1 HLT_xAOD__TrigElectronContainer_L2ElectronFexAux. 1070
+FillMissingEDM.egammaCreator            6   0     DEBUG The remap_EgammaCaloDecisions already present
+FillMissingEDM.egammaCreator            6   0     DEBUG The remap_L2CaloLinks was absent, creating it
+FillMissingEDM.egammaCreator            6   0     DEBUG The remap_FilteredEgammaCaloDecisions was absent, creating it
+FillMissingEDM.egammaCreator            6   0     DEBUG The remap_FilteredEMRoIDecisions was absent, creating it
+FillMissingEDM.egammaCreator            6   0     DEBUG The remap_EMRoIDecisions was absent, creating it
+FillMissingEDM.egammaCreator            6   0     DEBUG The remap_RerunEMRoIDecisions was absent, creating it
+FillMissingEDM.egammaCreator            6   0     DEBUG The HLT_xAOD__TrigElectronContainer_L2ElectronFex already present
+FillMissingEDM.egammaCreator            6   0     DEBUG The HLT_xAOD__TrigEMClusterContainer_L2CaloClusters already present
+FillMissingEDM.egammaCreator            6   0     DEBUG The HLT_xAOD_TrackParticleContainer_L2ElectronTracks was absent, creating it
+TriggerEDMDeserialiserAlg               7   0     DEBUG fragment: clid, type, key, size 1333228823 xAOD::TrigCompositeContainer xAOD::TrigCompositeContainer_v1 remap_EgammaCaloDecisions 69
+TriggerEDMDeserialiserAlg               7   0     DEBUG fragment: clid, type, key, size 1175586382 xAOD::TrigCompositeAuxContainer xAOD::TrigCompositeAuxContainer_v1 remap_EgammaCaloDecisionsAux. 522
+TriggerEDMDeserialiserAlg               7   0     DEBUG fragment: clid, type, key, size 1264979038 xAOD::TrigEMClusterContainer xAOD::TrigEMClusterContainer_v1 HLT_xAOD__TrigEMClusterContainer_L2CaloClusters 69
+TriggerEDMDeserialiserAlg               7   0     DEBUG fragment: clid, type, key, size 1111649561 xAOD::TrigEMClusterAuxContainer xAOD::TrigEMClusterAuxContainer_v2 HLT_xAOD__TrigEMClusterContainer_L2CaloClustersAux. 1303
+TriggerEDMDeserialiserAlg               7   0     DEBUG fragment: clid, type, key, size 1119645201 xAOD::TrigElectronContainer xAOD::TrigElectronContainer_v1 HLT_xAOD__TrigElectronContainer_L2ElectronFex 68
+TriggerEDMDeserialiserAlg               7   0     DEBUG fragment: clid, type, key, size 1180743572 xAOD::TrigElectronAuxContainer xAOD::TrigElectronAuxContainer_v1 HLT_xAOD__TrigElectronContainer_L2ElectronFexAux. 2910
+FillMissingEDM.egammaCreator            7   0     DEBUG The remap_EgammaCaloDecisions already present
+FillMissingEDM.egammaCreator            7   0     DEBUG The remap_L2CaloLinks was absent, creating it
+FillMissingEDM.egammaCreator            7   0     DEBUG The remap_FilteredEgammaCaloDecisions was absent, creating it
+FillMissingEDM.egammaCreator            7   0     DEBUG The remap_FilteredEMRoIDecisions was absent, creating it
+FillMissingEDM.egammaCreator            7   0     DEBUG The remap_EMRoIDecisions was absent, creating it
+FillMissingEDM.egammaCreator            7   0     DEBUG The remap_RerunEMRoIDecisions was absent, creating it
+FillMissingEDM.egammaCreator            7   0     DEBUG The HLT_xAOD__TrigElectronContainer_L2ElectronFex already present
+FillMissingEDM.egammaCreator            7   0     DEBUG The HLT_xAOD__TrigEMClusterContainer_L2CaloClusters already present
+FillMissingEDM.egammaCreator            7   0     DEBUG The HLT_xAOD_TrackParticleContainer_L2ElectronTracks was absent, creating it
+TriggerEDMDeserialiserAlg               8   0     DEBUG fragment: clid, type, key, size 1333228823 xAOD::TrigCompositeContainer xAOD::TrigCompositeContainer_v1 remap_EgammaCaloDecisions 69
+TriggerEDMDeserialiserAlg               8   0     DEBUG fragment: clid, type, key, size 1175586382 xAOD::TrigCompositeAuxContainer xAOD::TrigCompositeAuxContainer_v1 remap_EgammaCaloDecisionsAux. 427
+TriggerEDMDeserialiserAlg               8   0     DEBUG fragment: clid, type, key, size 1264979038 xAOD::TrigEMClusterContainer xAOD::TrigEMClusterContainer_v1 HLT_xAOD__TrigEMClusterContainer_L2CaloClusters 69
+TriggerEDMDeserialiserAlg               8   0     DEBUG fragment: clid, type, key, size 1111649561 xAOD::TrigEMClusterAuxContainer xAOD::TrigEMClusterAuxContainer_v2 HLT_xAOD__TrigEMClusterContainer_L2CaloClustersAux. 983
+TriggerEDMDeserialiserAlg               8   0     DEBUG fragment: clid, type, key, size 1119645201 xAOD::TrigElectronContainer xAOD::TrigElectronContainer_v1 HLT_xAOD__TrigElectronContainer_L2ElectronFex 68
+TriggerEDMDeserialiserAlg               8   0     DEBUG fragment: clid, type, key, size 1180743572 xAOD::TrigElectronAuxContainer xAOD::TrigElectronAuxContainer_v1 HLT_xAOD__TrigElectronContainer_L2ElectronFexAux. 702
+FillMissingEDM.egammaCreator            8   0     DEBUG The remap_EgammaCaloDecisions already present
+FillMissingEDM.egammaCreator            8   0     DEBUG The remap_L2CaloLinks was absent, creating it
+FillMissingEDM.egammaCreator            8   0     DEBUG The remap_FilteredEgammaCaloDecisions was absent, creating it
+FillMissingEDM.egammaCreator            8   0     DEBUG The remap_FilteredEMRoIDecisions was absent, creating it
+FillMissingEDM.egammaCreator            8   0     DEBUG The remap_EMRoIDecisions was absent, creating it
+FillMissingEDM.egammaCreator            8   0     DEBUG The remap_RerunEMRoIDecisions was absent, creating it
+FillMissingEDM.egammaCreator            8   0     DEBUG The HLT_xAOD__TrigElectronContainer_L2ElectronFex already present
+FillMissingEDM.egammaCreator            8   0     DEBUG The HLT_xAOD__TrigEMClusterContainer_L2CaloClusters already present
+FillMissingEDM.egammaCreator            8   0     DEBUG The HLT_xAOD_TrackParticleContainer_L2ElectronTracks was absent, creating it
+TriggerEDMDeserialiserAlg               9   0     DEBUG fragment: clid, type, key, size 1333228823 xAOD::TrigCompositeContainer xAOD::TrigCompositeContainer_v1 remap_EgammaCaloDecisions 69
+TriggerEDMDeserialiserAlg               9   0     DEBUG fragment: clid, type, key, size 1175586382 xAOD::TrigCompositeAuxContainer xAOD::TrigCompositeAuxContainer_v1 remap_EgammaCaloDecisionsAux. 183
+TriggerEDMDeserialiserAlg               9   0     DEBUG fragment: clid, type, key, size 1264979038 xAOD::TrigEMClusterContainer xAOD::TrigEMClusterContainer_v1 HLT_xAOD__TrigEMClusterContainer_L2CaloClusters 69
+TriggerEDMDeserialiserAlg               9   0     DEBUG fragment: clid, type, key, size 1111649561 xAOD::TrigEMClusterAuxContainer xAOD::TrigEMClusterAuxContainer_v2 HLT_xAOD__TrigEMClusterContainer_L2CaloClustersAux. 343
+TriggerEDMDeserialiserAlg               9   0     DEBUG fragment: clid, type, key, size 1119645201 xAOD::TrigElectronContainer xAOD::TrigElectronContainer_v1 HLT_xAOD__TrigElectronContainer_L2ElectronFex 68
+TriggerEDMDeserialiserAlg               9   0     DEBUG fragment: clid, type, key, size 1180743572 xAOD::TrigElectronAuxContainer xAOD::TrigElectronAuxContainer_v1 HLT_xAOD__TrigElectronContainer_L2ElectronFexAux. 334
+FillMissingEDM.egammaCreator            9   0     DEBUG The remap_EgammaCaloDecisions already present
+FillMissingEDM.egammaCreator            9   0     DEBUG The remap_L2CaloLinks was absent, creating it
+FillMissingEDM.egammaCreator            9   0     DEBUG The remap_FilteredEgammaCaloDecisions was absent, creating it
+FillMissingEDM.egammaCreator            9   0     DEBUG The remap_FilteredEMRoIDecisions was absent, creating it
+FillMissingEDM.egammaCreator            9   0     DEBUG The remap_EMRoIDecisions was absent, creating it
+FillMissingEDM.egammaCreator            9   0     DEBUG The remap_RerunEMRoIDecisions was absent, creating it
+FillMissingEDM.egammaCreator            9   0     DEBUG The HLT_xAOD__TrigElectronContainer_L2ElectronFex already present
+FillMissingEDM.egammaCreator            9   0     DEBUG The HLT_xAOD__TrigEMClusterContainer_L2CaloClusters already present
+FillMissingEDM.egammaCreator            9   0     DEBUG The HLT_xAOD_TrackParticleContainer_L2ElectronTracks was absent, creating it
+TriggerEDMDeserialiserAlg               10  0     DEBUG fragment: clid, type, key, size 1333228823 xAOD::TrigCompositeContainer xAOD::TrigCompositeContainer_v1 remap_EgammaCaloDecisions 69
+TriggerEDMDeserialiserAlg               10  0     DEBUG fragment: clid, type, key, size 1175586382 xAOD::TrigCompositeAuxContainer xAOD::TrigCompositeAuxContainer_v1 remap_EgammaCaloDecisionsAux. 661
+TriggerEDMDeserialiserAlg               10  0     DEBUG fragment: clid, type, key, size 1264979038 xAOD::TrigEMClusterContainer xAOD::TrigEMClusterContainer_v1 HLT_xAOD__TrigEMClusterContainer_L2CaloClusters 69
+TriggerEDMDeserialiserAlg               10  0     DEBUG fragment: clid, type, key, size 1111649561 xAOD::TrigEMClusterAuxContainer xAOD::TrigEMClusterAuxContainer_v2 HLT_xAOD__TrigEMClusterContainer_L2CaloClustersAux. 1623
+TriggerEDMDeserialiserAlg               10  0     DEBUG fragment: clid, type, key, size 1119645201 xAOD::TrigElectronContainer xAOD::TrigElectronContainer_v1 HLT_xAOD__TrigElectronContainer_L2ElectronFex 68
+TriggerEDMDeserialiserAlg               10  0     DEBUG fragment: clid, type, key, size 1180743572 xAOD::TrigElectronAuxContainer xAOD::TrigElectronAuxContainer_v1 HLT_xAOD__TrigElectronContainer_L2ElectronFexAux. 3370
+FillMissingEDM.egammaCreator            10  0     DEBUG The remap_EgammaCaloDecisions already present
+FillMissingEDM.egammaCreator            10  0     DEBUG The remap_L2CaloLinks was absent, creating it
+FillMissingEDM.egammaCreator            10  0     DEBUG The remap_FilteredEgammaCaloDecisions was absent, creating it
+FillMissingEDM.egammaCreator            10  0     DEBUG The remap_FilteredEMRoIDecisions was absent, creating it
+FillMissingEDM.egammaCreator            10  0     DEBUG The remap_EMRoIDecisions was absent, creating it
+FillMissingEDM.egammaCreator            10  0     DEBUG The remap_RerunEMRoIDecisions was absent, creating it
+FillMissingEDM.egammaCreator            10  0     DEBUG The HLT_xAOD__TrigElectronContainer_L2ElectronFex already present
+FillMissingEDM.egammaCreator            10  0     DEBUG The HLT_xAOD__TrigEMClusterContainer_L2CaloClusters already present
+FillMissingEDM.egammaCreator            10  0     DEBUG The HLT_xAOD_TrackParticleContainer_L2ElectronTracks was absent, creating it
+TriggerEDMDeserialiserAlg               11  0     DEBUG fragment: clid, type, key, size 1333228823 xAOD::TrigCompositeContainer xAOD::TrigCompositeContainer_v1 remap_EgammaCaloDecisions 69
+TriggerEDMDeserialiserAlg               11  0     DEBUG fragment: clid, type, key, size 1175586382 xAOD::TrigCompositeAuxContainer xAOD::TrigCompositeAuxContainer_v1 remap_EgammaCaloDecisionsAux. 304
+TriggerEDMDeserialiserAlg               11  0     DEBUG fragment: clid, type, key, size 1264979038 xAOD::TrigEMClusterContainer xAOD::TrigEMClusterContainer_v1 HLT_xAOD__TrigEMClusterContainer_L2CaloClusters 69
+TriggerEDMDeserialiserAlg               11  0     DEBUG fragment: clid, type, key, size 1111649561 xAOD::TrigEMClusterAuxContainer xAOD::TrigEMClusterAuxContainer_v2 HLT_xAOD__TrigEMClusterContainer_L2CaloClustersAux. 663
+TriggerEDMDeserialiserAlg               11  0     DEBUG fragment: clid, type, key, size 1119645201 xAOD::TrigElectronContainer xAOD::TrigElectronContainer_v1 HLT_xAOD__TrigElectronContainer_L2ElectronFex 68
+TriggerEDMDeserialiserAlg               11  0     DEBUG fragment: clid, type, key, size 1180743572 xAOD::TrigElectronAuxContainer xAOD::TrigElectronAuxContainer_v1 HLT_xAOD__TrigElectronContainer_L2ElectronFexAux. 702
+FillMissingEDM.egammaCreator            11  0     DEBUG The remap_EgammaCaloDecisions already present
+FillMissingEDM.egammaCreator            11  0     DEBUG The remap_L2CaloLinks was absent, creating it
+FillMissingEDM.egammaCreator            11  0     DEBUG The remap_FilteredEgammaCaloDecisions was absent, creating it
+FillMissingEDM.egammaCreator            11  0     DEBUG The remap_FilteredEMRoIDecisions was absent, creating it
+FillMissingEDM.egammaCreator            11  0     DEBUG The remap_EMRoIDecisions was absent, creating it
+FillMissingEDM.egammaCreator            11  0     DEBUG The remap_RerunEMRoIDecisions was absent, creating it
+FillMissingEDM.egammaCreator            11  0     DEBUG The HLT_xAOD__TrigElectronContainer_L2ElectronFex already present
+FillMissingEDM.egammaCreator            11  0     DEBUG The HLT_xAOD__TrigEMClusterContainer_L2CaloClusters already present
+FillMissingEDM.egammaCreator            11  0     DEBUG The HLT_xAOD_TrackParticleContainer_L2ElectronTracks was absent, creating it
+TriggerEDMDeserialiserAlg               12  0     DEBUG fragment: clid, type, key, size 1333228823 xAOD::TrigCompositeContainer xAOD::TrigCompositeContainer_v1 remap_EgammaCaloDecisions 69
+TriggerEDMDeserialiserAlg               12  0     DEBUG fragment: clid, type, key, size 1175586382 xAOD::TrigCompositeAuxContainer xAOD::TrigCompositeAuxContainer_v1 remap_EgammaCaloDecisionsAux. 1093
+TriggerEDMDeserialiserAlg               12  0     DEBUG fragment: clid, type, key, size 1264979038 xAOD::TrigEMClusterContainer xAOD::TrigEMClusterContainer_v1 HLT_xAOD__TrigEMClusterContainer_L2CaloClusters 69
+TriggerEDMDeserialiserAlg               12  0     DEBUG fragment: clid, type, key, size 1111649561 xAOD::TrigEMClusterAuxContainer xAOD::TrigEMClusterAuxContainer_v2 HLT_xAOD__TrigEMClusterContainer_L2CaloClustersAux. 2903
+TriggerEDMDeserialiserAlg               12  0     DEBUG fragment: clid, type, key, size 1119645201 xAOD::TrigElectronContainer xAOD::TrigElectronContainer_v1 HLT_xAOD__TrigElectronContainer_L2ElectronFex 68
+TriggerEDMDeserialiserAlg               12  0     DEBUG fragment: clid, type, key, size 1180743572 xAOD::TrigElectronAuxContainer xAOD::TrigElectronAuxContainer_v1 HLT_xAOD__TrigElectronContainer_L2ElectronFexAux. 3738
+FillMissingEDM.egammaCreator            12  0     DEBUG The remap_EgammaCaloDecisions already present
+FillMissingEDM.egammaCreator            12  0     DEBUG The remap_L2CaloLinks was absent, creating it
+FillMissingEDM.egammaCreator            12  0     DEBUG The remap_FilteredEgammaCaloDecisions was absent, creating it
+FillMissingEDM.egammaCreator            12  0     DEBUG The remap_FilteredEMRoIDecisions was absent, creating it
+FillMissingEDM.egammaCreator            12  0     DEBUG The remap_EMRoIDecisions was absent, creating it
+FillMissingEDM.egammaCreator            12  0     DEBUG The remap_RerunEMRoIDecisions was absent, creating it
+FillMissingEDM.egammaCreator            12  0     DEBUG The HLT_xAOD__TrigElectronContainer_L2ElectronFex already present
+FillMissingEDM.egammaCreator            12  0     DEBUG The HLT_xAOD__TrigEMClusterContainer_L2CaloClusters already present
+FillMissingEDM.egammaCreator            12  0     DEBUG The HLT_xAOD_TrackParticleContainer_L2ElectronTracks was absent, creating it
+TriggerEDMDeserialiserAlg               13  0     DEBUG fragment: clid, type, key, size 1333228823 xAOD::TrigCompositeContainer xAOD::TrigCompositeContainer_v1 remap_EgammaCaloDecisions 69
+TriggerEDMDeserialiserAlg               13  0     DEBUG fragment: clid, type, key, size 1175586382 xAOD::TrigCompositeAuxContainer xAOD::TrigCompositeAuxContainer_v1 remap_EgammaCaloDecisionsAux. 431
+TriggerEDMDeserialiserAlg               13  0     DEBUG fragment: clid, type, key, size 1264979038 xAOD::TrigEMClusterContainer xAOD::TrigEMClusterContainer_v1 HLT_xAOD__TrigEMClusterContainer_L2CaloClusters 69
+TriggerEDMDeserialiserAlg               13  0     DEBUG fragment: clid, type, key, size 1111649561 xAOD::TrigEMClusterAuxContainer xAOD::TrigEMClusterAuxContainer_v2 HLT_xAOD__TrigEMClusterContainer_L2CaloClustersAux. 983
+TriggerEDMDeserialiserAlg               13  0     DEBUG fragment: clid, type, key, size 1119645201 xAOD::TrigElectronContainer xAOD::TrigElectronContainer_v1 HLT_xAOD__TrigElectronContainer_L2ElectronFex 68
+TriggerEDMDeserialiserAlg               13  0     DEBUG fragment: clid, type, key, size 1180743572 xAOD::TrigElectronAuxContainer xAOD::TrigElectronAuxContainer_v1 HLT_xAOD__TrigElectronContainer_L2ElectronFexAux. 2358
+FillMissingEDM.egammaCreator            13  0     DEBUG The remap_EgammaCaloDecisions already present
+FillMissingEDM.egammaCreator            13  0     DEBUG The remap_L2CaloLinks was absent, creating it
+FillMissingEDM.egammaCreator            13  0     DEBUG The remap_FilteredEgammaCaloDecisions was absent, creating it
+FillMissingEDM.egammaCreator            13  0     DEBUG The remap_FilteredEMRoIDecisions was absent, creating it
+FillMissingEDM.egammaCreator            13  0     DEBUG The remap_EMRoIDecisions was absent, creating it
+FillMissingEDM.egammaCreator            13  0     DEBUG The remap_RerunEMRoIDecisions was absent, creating it
+FillMissingEDM.egammaCreator            13  0     DEBUG The HLT_xAOD__TrigElectronContainer_L2ElectronFex already present
+FillMissingEDM.egammaCreator            13  0     DEBUG The HLT_xAOD__TrigEMClusterContainer_L2CaloClusters already present
+FillMissingEDM.egammaCreator            13  0     DEBUG The HLT_xAOD_TrackParticleContainer_L2ElectronTracks was absent, creating it
+TriggerEDMDeserialiserAlg               14  0     DEBUG fragment: clid, type, key, size 1333228823 xAOD::TrigCompositeContainer xAOD::TrigCompositeContainer_v1 remap_EgammaCaloDecisions 69
+TriggerEDMDeserialiserAlg               14  0     DEBUG fragment: clid, type, key, size 1175586382 xAOD::TrigCompositeAuxContainer xAOD::TrigCompositeAuxContainer_v1 remap_EgammaCaloDecisionsAux. 308
+TriggerEDMDeserialiserAlg               14  0     DEBUG fragment: clid, type, key, size 1264979038 xAOD::TrigEMClusterContainer xAOD::TrigEMClusterContainer_v1 HLT_xAOD__TrigEMClusterContainer_L2CaloClusters 69
+TriggerEDMDeserialiserAlg               14  0     DEBUG fragment: clid, type, key, size 1111649561 xAOD::TrigEMClusterAuxContainer xAOD::TrigEMClusterAuxContainer_v2 HLT_xAOD__TrigEMClusterContainer_L2CaloClustersAux. 663
+TriggerEDMDeserialiserAlg               14  0     DEBUG fragment: clid, type, key, size 1119645201 xAOD::TrigElectronContainer xAOD::TrigElectronContainer_v1 HLT_xAOD__TrigElectronContainer_L2ElectronFex 68
+TriggerEDMDeserialiserAlg               14  0     DEBUG fragment: clid, type, key, size 1180743572 xAOD::TrigElectronAuxContainer xAOD::TrigElectronAuxContainer_v1 HLT_xAOD__TrigElectronContainer_L2ElectronFexAux. 610
+FillMissingEDM.egammaCreator            14  0     DEBUG The remap_EgammaCaloDecisions already present
+FillMissingEDM.egammaCreator            14  0     DEBUG The remap_L2CaloLinks was absent, creating it
+FillMissingEDM.egammaCreator            14  0     DEBUG The remap_FilteredEgammaCaloDecisions was absent, creating it
+FillMissingEDM.egammaCreator            14  0     DEBUG The remap_FilteredEMRoIDecisions was absent, creating it
+FillMissingEDM.egammaCreator            14  0     DEBUG The remap_EMRoIDecisions was absent, creating it
+FillMissingEDM.egammaCreator            14  0     DEBUG The remap_RerunEMRoIDecisions was absent, creating it
+FillMissingEDM.egammaCreator            14  0     DEBUG The HLT_xAOD__TrigElectronContainer_L2ElectronFex already present
+FillMissingEDM.egammaCreator            14  0     DEBUG The HLT_xAOD__TrigEMClusterContainer_L2CaloClusters already present
+FillMissingEDM.egammaCreator            14  0     DEBUG The HLT_xAOD_TrackParticleContainer_L2ElectronTracks was absent, creating it
+TriggerEDMDeserialiserAlg               15  0     DEBUG fragment: clid, type, key, size 1333228823 xAOD::TrigCompositeContainer xAOD::TrigCompositeContainer_v1 remap_EgammaCaloDecisions 69
+TriggerEDMDeserialiserAlg               15  0     DEBUG fragment: clid, type, key, size 1175586382 xAOD::TrigCompositeAuxContainer xAOD::TrigCompositeAuxContainer_v1 remap_EgammaCaloDecisionsAux. 183
+TriggerEDMDeserialiserAlg               15  0     DEBUG fragment: clid, type, key, size 1264979038 xAOD::TrigEMClusterContainer xAOD::TrigEMClusterContainer_v1 HLT_xAOD__TrigEMClusterContainer_L2CaloClusters 69
+TriggerEDMDeserialiserAlg               15  0     DEBUG fragment: clid, type, key, size 1111649561 xAOD::TrigEMClusterAuxContainer xAOD::TrigEMClusterAuxContainer_v2 HLT_xAOD__TrigEMClusterContainer_L2CaloClustersAux. 343
+TriggerEDMDeserialiserAlg               15  0     DEBUG fragment: clid, type, key, size 1119645201 xAOD::TrigElectronContainer xAOD::TrigElectronContainer_v1 HLT_xAOD__TrigElectronContainer_L2ElectronFex 68
+TriggerEDMDeserialiserAlg               15  0     DEBUG fragment: clid, type, key, size 1180743572 xAOD::TrigElectronAuxContainer xAOD::TrigElectronAuxContainer_v1 HLT_xAOD__TrigElectronContainer_L2ElectronFexAux. 334
+FillMissingEDM.egammaCreator            15  0     DEBUG The remap_EgammaCaloDecisions already present
+FillMissingEDM.egammaCreator            15  0     DEBUG The remap_L2CaloLinks was absent, creating it
+FillMissingEDM.egammaCreator            15  0     DEBUG The remap_FilteredEgammaCaloDecisions was absent, creating it
+FillMissingEDM.egammaCreator            15  0     DEBUG The remap_FilteredEMRoIDecisions was absent, creating it
+FillMissingEDM.egammaCreator            15  0     DEBUG The remap_EMRoIDecisions was absent, creating it
+FillMissingEDM.egammaCreator            15  0     DEBUG The remap_RerunEMRoIDecisions was absent, creating it
+FillMissingEDM.egammaCreator            15  0     DEBUG The HLT_xAOD__TrigElectronContainer_L2ElectronFex already present
+FillMissingEDM.egammaCreator            15  0     DEBUG The HLT_xAOD__TrigEMClusterContainer_L2CaloClusters already present
+FillMissingEDM.egammaCreator            15  0     DEBUG The HLT_xAOD_TrackParticleContainer_L2ElectronTracks was absent, creating it
+TriggerEDMDeserialiserAlg               16  0     DEBUG fragment: clid, type, key, size 1333228823 xAOD::TrigCompositeContainer xAOD::TrigCompositeContainer_v1 remap_EgammaCaloDecisions 69
+TriggerEDMDeserialiserAlg               16  0     DEBUG fragment: clid, type, key, size 1175586382 xAOD::TrigCompositeAuxContainer xAOD::TrigCompositeAuxContainer_v1 remap_EgammaCaloDecisionsAux. 300
+TriggerEDMDeserialiserAlg               16  0     DEBUG fragment: clid, type, key, size 1264979038 xAOD::TrigEMClusterContainer xAOD::TrigEMClusterContainer_v1 HLT_xAOD__TrigEMClusterContainer_L2CaloClusters 69
+TriggerEDMDeserialiserAlg               16  0     DEBUG fragment: clid, type, key, size 1111649561 xAOD::TrigEMClusterAuxContainer xAOD::TrigEMClusterAuxContainer_v2 HLT_xAOD__TrigEMClusterContainer_L2CaloClustersAux. 663
+TriggerEDMDeserialiserAlg               16  0     DEBUG fragment: clid, type, key, size 1119645201 xAOD::TrigElectronContainer xAOD::TrigElectronContainer_v1 HLT_xAOD__TrigElectronContainer_L2ElectronFex 68
+TriggerEDMDeserialiserAlg               16  0     DEBUG fragment: clid, type, key, size 1180743572 xAOD::TrigElectronAuxContainer xAOD::TrigElectronAuxContainer_v1 HLT_xAOD__TrigElectronContainer_L2ElectronFexAux. 978
+FillMissingEDM.egammaCreator            16  0     DEBUG The remap_EgammaCaloDecisions already present
+FillMissingEDM.egammaCreator            16  0     DEBUG The remap_L2CaloLinks was absent, creating it
+FillMissingEDM.egammaCreator            16  0     DEBUG The remap_FilteredEgammaCaloDecisions was absent, creating it
+FillMissingEDM.egammaCreator            16  0     DEBUG The remap_FilteredEMRoIDecisions was absent, creating it
+FillMissingEDM.egammaCreator            16  0     DEBUG The remap_EMRoIDecisions was absent, creating it
+FillMissingEDM.egammaCreator            16  0     DEBUG The remap_RerunEMRoIDecisions was absent, creating it
+FillMissingEDM.egammaCreator            16  0     DEBUG The HLT_xAOD__TrigElectronContainer_L2ElectronFex already present
+FillMissingEDM.egammaCreator            16  0     DEBUG The HLT_xAOD__TrigEMClusterContainer_L2CaloClusters already present
+FillMissingEDM.egammaCreator            16  0     DEBUG The HLT_xAOD_TrackParticleContainer_L2ElectronTracks was absent, creating it
+TriggerEDMDeserialiserAlg               17  0     DEBUG fragment: clid, type, key, size 1333228823 xAOD::TrigCompositeContainer xAOD::TrigCompositeContainer_v1 remap_EgammaCaloDecisions 69
+TriggerEDMDeserialiserAlg               17  0     DEBUG fragment: clid, type, key, size 1175586382 xAOD::TrigCompositeAuxContainer xAOD::TrigCompositeAuxContainer_v1 remap_EgammaCaloDecisionsAux. 431
+TriggerEDMDeserialiserAlg               17  0     DEBUG fragment: clid, type, key, size 1264979038 xAOD::TrigEMClusterContainer xAOD::TrigEMClusterContainer_v1 HLT_xAOD__TrigEMClusterContainer_L2CaloClusters 69
+TriggerEDMDeserialiserAlg               17  0     DEBUG fragment: clid, type, key, size 1111649561 xAOD::TrigEMClusterAuxContainer xAOD::TrigEMClusterAuxContainer_v2 HLT_xAOD__TrigEMClusterContainer_L2CaloClustersAux. 983
+TriggerEDMDeserialiserAlg               17  0     DEBUG fragment: clid, type, key, size 1119645201 xAOD::TrigElectronContainer xAOD::TrigElectronContainer_v1 HLT_xAOD__TrigElectronContainer_L2ElectronFex 68
+TriggerEDMDeserialiserAlg               17  0     DEBUG fragment: clid, type, key, size 1180743572 xAOD::TrigElectronAuxContainer xAOD::TrigElectronAuxContainer_v1 HLT_xAOD__TrigElectronContainer_L2ElectronFexAux. 1254
+FillMissingEDM.egammaCreator            17  0     DEBUG The remap_EgammaCaloDecisions already present
+FillMissingEDM.egammaCreator            17  0     DEBUG The remap_L2CaloLinks was absent, creating it
+FillMissingEDM.egammaCreator            17  0     DEBUG The remap_FilteredEgammaCaloDecisions was absent, creating it
+FillMissingEDM.egammaCreator            17  0     DEBUG The remap_FilteredEMRoIDecisions was absent, creating it
+FillMissingEDM.egammaCreator            17  0     DEBUG The remap_EMRoIDecisions was absent, creating it
+FillMissingEDM.egammaCreator            17  0     DEBUG The remap_RerunEMRoIDecisions was absent, creating it
+FillMissingEDM.egammaCreator            17  0     DEBUG The HLT_xAOD__TrigElectronContainer_L2ElectronFex already present
+FillMissingEDM.egammaCreator            17  0     DEBUG The HLT_xAOD__TrigEMClusterContainer_L2CaloClusters already present
+FillMissingEDM.egammaCreator            17  0     DEBUG The HLT_xAOD_TrackParticleContainer_L2ElectronTracks was absent, creating it
+TriggerEDMDeserialiserAlg               18  0     DEBUG fragment: clid, type, key, size 1333228823 xAOD::TrigCompositeContainer xAOD::TrigCompositeContainer_v1 remap_EgammaCaloDecisions 69
+TriggerEDMDeserialiserAlg               18  0     DEBUG fragment: clid, type, key, size 1175586382 xAOD::TrigCompositeAuxContainer xAOD::TrigCompositeAuxContainer_v1 remap_EgammaCaloDecisionsAux. 427
+TriggerEDMDeserialiserAlg               18  0     DEBUG fragment: clid, type, key, size 1264979038 xAOD::TrigEMClusterContainer xAOD::TrigEMClusterContainer_v1 HLT_xAOD__TrigEMClusterContainer_L2CaloClusters 69
+TriggerEDMDeserialiserAlg               18  0     DEBUG fragment: clid, type, key, size 1111649561 xAOD::TrigEMClusterAuxContainer xAOD::TrigEMClusterAuxContainer_v2 HLT_xAOD__TrigEMClusterContainer_L2CaloClustersAux. 983
+TriggerEDMDeserialiserAlg               18  0     DEBUG fragment: clid, type, key, size 1119645201 xAOD::TrigElectronContainer xAOD::TrigElectronContainer_v1 HLT_xAOD__TrigElectronContainer_L2ElectronFex 68
+TriggerEDMDeserialiserAlg               18  0     DEBUG fragment: clid, type, key, size 1180743572 xAOD::TrigElectronAuxContainer xAOD::TrigElectronAuxContainer_v1 HLT_xAOD__TrigElectronContainer_L2ElectronFexAux. 702
+FillMissingEDM.egammaCreator            18  0     DEBUG The remap_EgammaCaloDecisions already present
+FillMissingEDM.egammaCreator            18  0     DEBUG The remap_L2CaloLinks was absent, creating it
+FillMissingEDM.egammaCreator            18  0     DEBUG The remap_FilteredEgammaCaloDecisions was absent, creating it
+FillMissingEDM.egammaCreator            18  0     DEBUG The remap_FilteredEMRoIDecisions was absent, creating it
+FillMissingEDM.egammaCreator            18  0     DEBUG The remap_EMRoIDecisions was absent, creating it
+FillMissingEDM.egammaCreator            18  0     DEBUG The remap_RerunEMRoIDecisions was absent, creating it
+FillMissingEDM.egammaCreator            18  0     DEBUG The HLT_xAOD__TrigElectronContainer_L2ElectronFex already present
+FillMissingEDM.egammaCreator            18  0     DEBUG The HLT_xAOD__TrigEMClusterContainer_L2CaloClusters already present
+FillMissingEDM.egammaCreator            18  0     DEBUG The HLT_xAOD_TrackParticleContainer_L2ElectronTracks was absent, creating it
+TriggerEDMDeserialiserAlg               19  0     DEBUG fragment: clid, type, key, size 1333228823 xAOD::TrigCompositeContainer xAOD::TrigCompositeContainer_v1 remap_EgammaCaloDecisions 69
+TriggerEDMDeserialiserAlg               19  0     DEBUG fragment: clid, type, key, size 1175586382 xAOD::TrigCompositeAuxContainer xAOD::TrigCompositeAuxContainer_v1 remap_EgammaCaloDecisionsAux. 526
+TriggerEDMDeserialiserAlg               19  0     DEBUG fragment: clid, type, key, size 1264979038 xAOD::TrigEMClusterContainer xAOD::TrigEMClusterContainer_v1 HLT_xAOD__TrigEMClusterContainer_L2CaloClusters 69
+TriggerEDMDeserialiserAlg               19  0     DEBUG fragment: clid, type, key, size 1111649561 xAOD::TrigEMClusterAuxContainer xAOD::TrigEMClusterAuxContainer_v2 HLT_xAOD__TrigEMClusterContainer_L2CaloClustersAux. 1303
+TriggerEDMDeserialiserAlg               19  0     DEBUG fragment: clid, type, key, size 1119645201 xAOD::TrigElectronContainer xAOD::TrigElectronContainer_v1 HLT_xAOD__TrigElectronContainer_L2ElectronFex 68
+TriggerEDMDeserialiserAlg               19  0     DEBUG fragment: clid, type, key, size 1180743572 xAOD::TrigElectronAuxContainer xAOD::TrigElectronAuxContainer_v1 HLT_xAOD__TrigElectronContainer_L2ElectronFexAux. 3186
+FillMissingEDM.egammaCreator            19  0     DEBUG The remap_EgammaCaloDecisions already present
+FillMissingEDM.egammaCreator            19  0     DEBUG The remap_L2CaloLinks was absent, creating it
+FillMissingEDM.egammaCreator            19  0     DEBUG The remap_FilteredEgammaCaloDecisions was absent, creating it
+FillMissingEDM.egammaCreator            19  0     DEBUG The remap_FilteredEMRoIDecisions was absent, creating it
+FillMissingEDM.egammaCreator            19  0     DEBUG The remap_EMRoIDecisions was absent, creating it
+FillMissingEDM.egammaCreator            19  0     DEBUG The remap_RerunEMRoIDecisions was absent, creating it
+FillMissingEDM.egammaCreator            19  0     DEBUG The HLT_xAOD__TrigElectronContainer_L2ElectronFex already present
+FillMissingEDM.egammaCreator            19  0     DEBUG The HLT_xAOD__TrigEMClusterContainer_L2CaloClusters already present
+FillMissingEDM.egammaCreator            19  0     DEBUG The HLT_xAOD_TrackParticleContainer_L2ElectronTracks was absent, creating it
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/egamma.withViews.py b/Trigger/TrigValidation/TrigUpgradeTest/share/egamma.withViews.py
index 833f7afac3a9b567121c85fc9e3740d8009362e9..a202531b23b2463368f0ab681db256364e95f721 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/egamma.withViews.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/egamma.withViews.py
@@ -39,7 +39,7 @@ CTPToChainMapping = {"HLT_e3_etcut": "L1_EM3",
                      "HLT_e5_etcut":  "L1_EM3",
                      "HLT_e7_etcut":  "L1_EM7",
                      "HLT_2e3_etcut": "L1_2EM3",
-                     "HLT_e3e5_etcut":"L1_2EM3"}
+                     "HLT_e3_e5_etcut":"L1_2EM3"}
 
 topSequence.L1DecoderTest.prescaler.Prescales = ["HLT_e3_etcut:2", "HLT_2e3_etcut:2.5"]
 
@@ -247,7 +247,7 @@ summary = TriggerSummaryAlg( "TriggerSummaryAlg" )
 summary.InputDecision = "L1DecoderSummary"
 summary.FinalDecisions = [ "ElectronL2Decisions", "MuonL2Decisions" ]
 
-from TrigOutputHandling.TrigOutputHandlingConf import HLTEDMCreator
+from TrigOutputHandling.TrigOutputHandlingConf import HLTEDMCreator, HLTEDMCreatorAlg
 egammaViewsMerger = HLTEDMCreator("egammaViewsMerger")
 egammaViewsMerger.TrigCompositeContainer = [ "filterCaloRoIsAlg", "EgammaCaloDecisions","ElectronL2Decisions", "MuonL2Decisions", "EMRoIDecisions", "METRoIDecisions", "MURoIDecisions", "L1DecoderSummary", "JRoIDecisions", "MonitoringSummaryStep1", "RerunEMRoIDecisions", "RerunMURoIDecisions", "TAURoIDecisions", "L2CaloLinks", "FilteredEMRoIDecisions", "FilteredEgammaCaloDecisions" ]
 
@@ -269,11 +269,10 @@ egammaViewsMerger.OutputLevel = VERBOSE
 svcMgr.StoreGateSvc.OutputLevel = INFO
 
 
-summary.OutputTools = [ egammaViewsMerger ]
+edmMakerAlg = HLTEDMCreatorAlg("EDMMaker")
+edmMakerAlg.OutputTools = [ egammaViewsMerger ]
 
 
-summary.OutputLevel = DEBUG
-
 step0filter = parOR("step0filter", [ findAlgorithm( egammaCaloStep, "filterL1RoIsAlg") ] )
 step1filter = parOR("step1filter", [ findAlgorithm(egammaIDStep, "filterCaloRoIsAlg") ] )
 step2filter = parOR("step2filter", [ findAlgorithm(egammaEFCaloStep, "filterL2ElectronRoIsAlg") ] )
@@ -392,8 +391,8 @@ deserialiser = TriggerEDMDeserialiserAlg()
 deserialiser.Prefix="SERIALISED_"
 deserialiser.OutputLevel=DEBUG
 
-# add prefix + remove version to class name
-l = [ c.split("#")[0].split("_")[0] + "#" + deserialiser.Prefix + c.split("#")[1] for c in serialiser.CollectionsToSerialize ] 
+# # add prefix + remove version to class name
+# l = [ c.split("#")[0].split("_")[0] + "#" + deserialiser.Prefix + c.split("#")[1] for c in serialiser.CollectionsToSerialize ] 
 #StreamESD.ItemList += l
 
 
@@ -408,8 +407,9 @@ svcMgr.ByteStreamAddressProviderSvc.TypeNames = ["ROIB::RoIBResult/RoIBResult",
 
 from ByteStreamCnvSvc import WriteByteStream
 streamBS = WriteByteStream.getStream("EventStorage","StreamBSFileOutput")
+streamBS.OutputLevel=DEBUG
 ServiceMgr.ByteStreamCnvSvc.OutputLevel = VERBOSE
-ServiceMgr.ByteStreamCnvSvc.IsSimulation = True
+ServiceMgr.ByteStreamCnvSvc.IsSimulation = False
 ServiceMgr.ByteStreamCnvSvc.InitCnvs += ["HLT::HLTResultMT"]
 streamBS.ItemList += ["HLT::HLTResultMT#HLTResultMT"]
 
@@ -421,7 +421,7 @@ svcMgr.ByteStreamEventStorageOutputSvc.OutputLevel = VERBOSE
 
 ################################################################################
 # assemble top list of algorithms
-hltTop = seqOR( "hltTop", [ steps,  summary,  summMaker, mon, hltResultMakerAlg, deserialiser, StreamESD, streamBS ] )
+hltTop = seqOR( "hltTop", [ steps,  summMaker, mon, edmMakerAlg, hltResultMakerAlg, StreamESD, streamBS, deserialiser ] )
 
 
 
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/egammaRunData.ref b/Trigger/TrigValidation/TrigUpgradeTest/share/egammaRunData.ref
new file mode 100644
index 0000000000000000000000000000000000000000..73550d00f28e8d851e97ebf75d242b714efc265f
--- /dev/null
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/egammaRunData.ref
@@ -0,0 +1,130 @@
+HLTRMakerAlg.MKTool.Serialiser          0   0     DEBUG Payload size after inserting xAOD::TrigCompositeContainer_v1#remap_EgammaCaloDecisions 152 bytes
+HLTRMakerAlg.MKTool.Serialiser          0   0     DEBUG Payload size after inserting xAOD::TrigCompositeAuxContainer_v1#remap_EgammaCaloDecisionsAux. 540 bytes
+HLTRMakerAlg.MKTool.Serialiser          0   0     DEBUG Payload size after inserting xAOD::TrigEMClusterContainer_v1#HLT_xAOD__TrigEMClusterContainer_L2CaloClusters 712 bytes
+HLTRMakerAlg.MKTool.Serialiser          0   0     DEBUG Payload size after inserting xAOD::TrigEMClusterAuxContainer_v2#HLT_xAOD__TrigEMClusterContainer_L2CaloClustersAux. 1536 bytes
+HLTRMakerAlg.MKTool.Serialiser          0   0     DEBUG Payload size after inserting xAOD::TrigElectronContainer_v1#HLT_xAOD__TrigElectronContainer_L2ElectronFex 1704 bytes
+HLTRMakerAlg.MKTool.Serialiser          0   0     DEBUG Payload size after inserting xAOD::TrigElectronAuxContainer_v1#HLT_xAOD__TrigElectronContainer_L2ElectronFexAux. 3312 bytes
+HLTRMakerAlg.MKTool.Serialiser          1   0     DEBUG Payload size after inserting xAOD::TrigCompositeContainer_v1#remap_EgammaCaloDecisions 152 bytes
+HLTRMakerAlg.MKTool.Serialiser          1   0     DEBUG Payload size after inserting xAOD::TrigCompositeAuxContainer_v1#remap_EgammaCaloDecisionsAux. 884 bytes
+HLTRMakerAlg.MKTool.Serialiser          1   0     DEBUG Payload size after inserting xAOD::TrigEMClusterContainer_v1#HLT_xAOD__TrigEMClusterContainer_L2CaloClusters 1056 bytes
+HLTRMakerAlg.MKTool.Serialiser          1   0     DEBUG Payload size after inserting xAOD::TrigEMClusterAuxContainer_v2#HLT_xAOD__TrigEMClusterContainer_L2CaloClustersAux. 2852 bytes
+HLTRMakerAlg.MKTool.Serialiser          1   0     DEBUG Payload size after inserting xAOD::TrigElectronContainer_v1#HLT_xAOD__TrigElectronContainer_L2ElectronFex 3020 bytes
+HLTRMakerAlg.MKTool.Serialiser          1   0     DEBUG Payload size after inserting xAOD::TrigElectronAuxContainer_v1#HLT_xAOD__TrigElectronContainer_L2ElectronFexAux. 8032 bytes
+HLTRMakerAlg.MKTool.Serialiser          2   0     DEBUG Payload size after inserting xAOD::TrigCompositeContainer_v1#remap_EgammaCaloDecisions 152 bytes
+HLTRMakerAlg.MKTool.Serialiser          2   0     DEBUG Payload size after inserting xAOD::TrigCompositeAuxContainer_v1#remap_EgammaCaloDecisionsAux. 1092 bytes
+HLTRMakerAlg.MKTool.Serialiser          2   0     DEBUG Payload size after inserting xAOD::TrigEMClusterContainer_v1#HLT_xAOD__TrigEMClusterContainer_L2CaloClusters 1264 bytes
+HLTRMakerAlg.MKTool.Serialiser          2   0     DEBUG Payload size after inserting xAOD::TrigEMClusterAuxContainer_v2#HLT_xAOD__TrigEMClusterContainer_L2CaloClustersAux. 3708 bytes
+HLTRMakerAlg.MKTool.Serialiser          2   0     DEBUG Payload size after inserting xAOD::TrigElectronContainer_v1#HLT_xAOD__TrigElectronContainer_L2ElectronFex 3876 bytes
+HLTRMakerAlg.MKTool.Serialiser          2   0     DEBUG Payload size after inserting xAOD::TrigElectronAuxContainer_v1#HLT_xAOD__TrigElectronContainer_L2ElectronFexAux. 7112 bytes
+HLTRMakerAlg.MKTool.Serialiser          3   0     DEBUG Payload size after inserting xAOD::TrigCompositeContainer_v1#remap_EgammaCaloDecisions 152 bytes
+HLTRMakerAlg.MKTool.Serialiser          3   0     DEBUG Payload size after inserting xAOD::TrigCompositeAuxContainer_v1#remap_EgammaCaloDecisionsAux. 872 bytes
+HLTRMakerAlg.MKTool.Serialiser          3   0     DEBUG Payload size after inserting xAOD::TrigEMClusterContainer_v1#HLT_xAOD__TrigEMClusterContainer_L2CaloClusters 1044 bytes
+HLTRMakerAlg.MKTool.Serialiser          3   0     DEBUG Payload size after inserting xAOD::TrigEMClusterAuxContainer_v2#HLT_xAOD__TrigEMClusterContainer_L2CaloClustersAux. 2840 bytes
+HLTRMakerAlg.MKTool.Serialiser          3   0     DEBUG Payload size after inserting xAOD::TrigElectronContainer_v1#HLT_xAOD__TrigElectronContainer_L2ElectronFex 3008 bytes
+HLTRMakerAlg.MKTool.Serialiser          3   0     DEBUG Payload size after inserting xAOD::TrigElectronAuxContainer_v1#HLT_xAOD__TrigElectronContainer_L2ElectronFexAux. 8760 bytes
+HLTRMakerAlg.MKTool.Serialiser          4   0     DEBUG Payload size after inserting xAOD::TrigCompositeContainer_v1#remap_EgammaCaloDecisions 152 bytes
+HLTRMakerAlg.MKTool.Serialiser          4   0     DEBUG Payload size after inserting xAOD::TrigCompositeAuxContainer_v1#remap_EgammaCaloDecisionsAux. 660 bytes
+HLTRMakerAlg.MKTool.Serialiser          4   0     DEBUG Payload size after inserting xAOD::TrigEMClusterContainer_v1#HLT_xAOD__TrigEMClusterContainer_L2CaloClusters 832 bytes
+HLTRMakerAlg.MKTool.Serialiser          4   0     DEBUG Payload size after inserting xAOD::TrigEMClusterAuxContainer_v2#HLT_xAOD__TrigEMClusterContainer_L2CaloClustersAux. 1980 bytes
+HLTRMakerAlg.MKTool.Serialiser          4   0     DEBUG Payload size after inserting xAOD::TrigElectronContainer_v1#HLT_xAOD__TrigElectronContainer_L2ElectronFex 2148 bytes
+HLTRMakerAlg.MKTool.Serialiser          4   0     DEBUG Payload size after inserting xAOD::TrigElectronAuxContainer_v1#HLT_xAOD__TrigElectronContainer_L2ElectronFexAux. 4200 bytes
+HLTRMakerAlg.MKTool.Serialiser          5   0     DEBUG Payload size after inserting xAOD::TrigCompositeContainer_v1#remap_EgammaCaloDecisions 152 bytes
+HLTRMakerAlg.MKTool.Serialiser          5   0     DEBUG Payload size after inserting xAOD::TrigCompositeAuxContainer_v1#remap_EgammaCaloDecisionsAux. 1196 bytes
+HLTRMakerAlg.MKTool.Serialiser          5   0     DEBUG Payload size after inserting xAOD::TrigEMClusterContainer_v1#HLT_xAOD__TrigEMClusterContainer_L2CaloClusters 1368 bytes
+HLTRMakerAlg.MKTool.Serialiser          5   0     DEBUG Payload size after inserting xAOD::TrigEMClusterAuxContainer_v2#HLT_xAOD__TrigEMClusterContainer_L2CaloClustersAux. 4136 bytes
+HLTRMakerAlg.MKTool.Serialiser          5   0     DEBUG Payload size after inserting xAOD::TrigElectronContainer_v1#HLT_xAOD__TrigElectronContainer_L2ElectronFex 4304 bytes
+HLTRMakerAlg.MKTool.Serialiser          5   0     DEBUG Payload size after inserting xAOD::TrigElectronAuxContainer_v1#HLT_xAOD__TrigElectronContainer_L2ElectronFexAux. 12128 bytes
+HLTRMakerAlg.MKTool.Serialiser          6   0     DEBUG Payload size after inserting xAOD::TrigCompositeContainer_v1#remap_EgammaCaloDecisions 152 bytes
+HLTRMakerAlg.MKTool.Serialiser          6   0     DEBUG Payload size after inserting xAOD::TrigCompositeAuxContainer_v1#remap_EgammaCaloDecisionsAux. 544 bytes
+HLTRMakerAlg.MKTool.Serialiser          6   0     DEBUG Payload size after inserting xAOD::TrigEMClusterContainer_v1#HLT_xAOD__TrigEMClusterContainer_L2CaloClusters 716 bytes
+HLTRMakerAlg.MKTool.Serialiser          6   0     DEBUG Payload size after inserting xAOD::TrigEMClusterAuxContainer_v2#HLT_xAOD__TrigEMClusterContainer_L2CaloClustersAux. 1540 bytes
+HLTRMakerAlg.MKTool.Serialiser          6   0     DEBUG Payload size after inserting xAOD::TrigElectronContainer_v1#HLT_xAOD__TrigElectronContainer_L2ElectronFex 1708 bytes
+HLTRMakerAlg.MKTool.Serialiser          6   0     DEBUG Payload size after inserting xAOD::TrigElectronAuxContainer_v1#HLT_xAOD__TrigElectronContainer_L2ElectronFexAux. 4056 bytes
+HLTRMakerAlg.MKTool.Serialiser          7   0     DEBUG Payload size after inserting xAOD::TrigCompositeContainer_v1#remap_EgammaCaloDecisions 152 bytes
+HLTRMakerAlg.MKTool.Serialiser          7   0     DEBUG Payload size after inserting xAOD::TrigCompositeAuxContainer_v1#remap_EgammaCaloDecisionsAux. 764 bytes
+HLTRMakerAlg.MKTool.Serialiser          7   0     DEBUG Payload size after inserting xAOD::TrigEMClusterContainer_v1#HLT_xAOD__TrigEMClusterContainer_L2CaloClusters 936 bytes
+HLTRMakerAlg.MKTool.Serialiser          7   0     DEBUG Payload size after inserting xAOD::TrigEMClusterAuxContainer_v2#HLT_xAOD__TrigEMClusterContainer_L2CaloClustersAux. 2408 bytes
+HLTRMakerAlg.MKTool.Serialiser          7   0     DEBUG Payload size after inserting xAOD::TrigElectronContainer_v1#HLT_xAOD__TrigElectronContainer_L2ElectronFex 2576 bytes
+HLTRMakerAlg.MKTool.Serialiser          7   0     DEBUG Payload size after inserting xAOD::TrigElectronAuxContainer_v1#HLT_xAOD__TrigElectronContainer_L2ElectronFexAux. 7884 bytes
+HLTRMakerAlg.MKTool.Serialiser          8   0     DEBUG Payload size after inserting xAOD::TrigCompositeContainer_v1#remap_EgammaCaloDecisions 152 bytes
+HLTRMakerAlg.MKTool.Serialiser          8   0     DEBUG Payload size after inserting xAOD::TrigCompositeAuxContainer_v1#remap_EgammaCaloDecisionsAux. 668 bytes
+HLTRMakerAlg.MKTool.Serialiser          8   0     DEBUG Payload size after inserting xAOD::TrigEMClusterContainer_v1#HLT_xAOD__TrigEMClusterContainer_L2CaloClusters 840 bytes
+HLTRMakerAlg.MKTool.Serialiser          8   0     DEBUG Payload size after inserting xAOD::TrigEMClusterAuxContainer_v2#HLT_xAOD__TrigEMClusterContainer_L2CaloClustersAux. 1988 bytes
+HLTRMakerAlg.MKTool.Serialiser          8   0     DEBUG Payload size after inserting xAOD::TrigElectronContainer_v1#HLT_xAOD__TrigElectronContainer_L2ElectronFex 2156 bytes
+HLTRMakerAlg.MKTool.Serialiser          8   0     DEBUG Payload size after inserting xAOD::TrigElectronAuxContainer_v1#HLT_xAOD__TrigElectronContainer_L2ElectronFexAux. 3912 bytes
+HLTRMakerAlg.MKTool.Serialiser          9   0     DEBUG Payload size after inserting xAOD::TrigCompositeContainer_v1#remap_EgammaCaloDecisions 152 bytes
+HLTRMakerAlg.MKTool.Serialiser          9   0     DEBUG Payload size after inserting xAOD::TrigCompositeAuxContainer_v1#remap_EgammaCaloDecisionsAux. 424 bytes
+HLTRMakerAlg.MKTool.Serialiser          9   0     DEBUG Payload size after inserting xAOD::TrigEMClusterContainer_v1#HLT_xAOD__TrigEMClusterContainer_L2CaloClusters 596 bytes
+HLTRMakerAlg.MKTool.Serialiser          9   0     DEBUG Payload size after inserting xAOD::TrigEMClusterAuxContainer_v2#HLT_xAOD__TrigEMClusterContainer_L2CaloClustersAux. 1048 bytes
+HLTRMakerAlg.MKTool.Serialiser          9   0     DEBUG Payload size after inserting xAOD::TrigElectronContainer_v1#HLT_xAOD__TrigElectronContainer_L2ElectronFex 1216 bytes
+HLTRMakerAlg.MKTool.Serialiser          9   0     DEBUG Payload size after inserting xAOD::TrigElectronAuxContainer_v1#HLT_xAOD__TrigElectronContainer_L2ElectronFexAux. 1656 bytes
+HLTRMakerAlg.MKTool.Serialiser          10  0     DEBUG Payload size after inserting xAOD::TrigCompositeContainer_v1#remap_EgammaCaloDecisions 152 bytes
+HLTRMakerAlg.MKTool.Serialiser          10  0     DEBUG Payload size after inserting xAOD::TrigCompositeAuxContainer_v1#remap_EgammaCaloDecisionsAux. 904 bytes
+HLTRMakerAlg.MKTool.Serialiser          10  0     DEBUG Payload size after inserting xAOD::TrigEMClusterContainer_v1#HLT_xAOD__TrigEMClusterContainer_L2CaloClusters 1076 bytes
+HLTRMakerAlg.MKTool.Serialiser          10  0     DEBUG Payload size after inserting xAOD::TrigEMClusterAuxContainer_v2#HLT_xAOD__TrigEMClusterContainer_L2CaloClustersAux. 2872 bytes
+HLTRMakerAlg.MKTool.Serialiser          10  0     DEBUG Payload size after inserting xAOD::TrigElectronContainer_v1#HLT_xAOD__TrigElectronContainer_L2ElectronFex 3040 bytes
+HLTRMakerAlg.MKTool.Serialiser          10  0     DEBUG Payload size after inserting xAOD::TrigElectronAuxContainer_v1#HLT_xAOD__TrigElectronContainer_L2ElectronFexAux. 9088 bytes
+HLTRMakerAlg.MKTool.Serialiser          11  0     DEBUG Payload size after inserting xAOD::TrigCompositeContainer_v1#remap_EgammaCaloDecisions 152 bytes
+HLTRMakerAlg.MKTool.Serialiser          11  0     DEBUG Payload size after inserting xAOD::TrigCompositeAuxContainer_v1#remap_EgammaCaloDecisionsAux. 540 bytes
+HLTRMakerAlg.MKTool.Serialiser          11  0     DEBUG Payload size after inserting xAOD::TrigEMClusterContainer_v1#HLT_xAOD__TrigEMClusterContainer_L2CaloClusters 712 bytes
+HLTRMakerAlg.MKTool.Serialiser          11  0     DEBUG Payload size after inserting xAOD::TrigEMClusterAuxContainer_v2#HLT_xAOD__TrigEMClusterContainer_L2CaloClustersAux. 1536 bytes
+HLTRMakerAlg.MKTool.Serialiser          11  0     DEBUG Payload size after inserting xAOD::TrigElectronContainer_v1#HLT_xAOD__TrigElectronContainer_L2ElectronFex 1704 bytes
+HLTRMakerAlg.MKTool.Serialiser          11  0     DEBUG Payload size after inserting xAOD::TrigElectronAuxContainer_v1#HLT_xAOD__TrigElectronContainer_L2ElectronFexAux. 3460 bytes
+HLTRMakerAlg.MKTool.Serialiser          12  0     DEBUG Payload size after inserting xAOD::TrigCompositeContainer_v1#remap_EgammaCaloDecisions 152 bytes
+HLTRMakerAlg.MKTool.Serialiser          12  0     DEBUG Payload size after inserting xAOD::TrigCompositeAuxContainer_v1#remap_EgammaCaloDecisionsAux. 1336 bytes
+HLTRMakerAlg.MKTool.Serialiser          12  0     DEBUG Payload size after inserting xAOD::TrigEMClusterContainer_v1#HLT_xAOD__TrigEMClusterContainer_L2CaloClusters 1508 bytes
+HLTRMakerAlg.MKTool.Serialiser          12  0     DEBUG Payload size after inserting xAOD::TrigEMClusterAuxContainer_v2#HLT_xAOD__TrigEMClusterContainer_L2CaloClustersAux. 4600 bytes
+HLTRMakerAlg.MKTool.Serialiser          12  0     DEBUG Payload size after inserting xAOD::TrigElectronContainer_v1#HLT_xAOD__TrigElectronContainer_L2ElectronFex 4768 bytes
+HLTRMakerAlg.MKTool.Serialiser          12  0     DEBUG Payload size after inserting xAOD::TrigElectronAuxContainer_v1#HLT_xAOD__TrigElectronContainer_L2ElectronFexAux. 11408 bytes
+HLTRMakerAlg.MKTool.Serialiser          13  0     DEBUG Payload size after inserting xAOD::TrigCompositeContainer_v1#remap_EgammaCaloDecisions 152 bytes
+HLTRMakerAlg.MKTool.Serialiser          13  0     DEBUG Payload size after inserting xAOD::TrigCompositeAuxContainer_v1#remap_EgammaCaloDecisionsAux. 672 bytes
+HLTRMakerAlg.MKTool.Serialiser          13  0     DEBUG Payload size after inserting xAOD::TrigEMClusterContainer_v1#HLT_xAOD__TrigEMClusterContainer_L2CaloClusters 844 bytes
+HLTRMakerAlg.MKTool.Serialiser          13  0     DEBUG Payload size after inserting xAOD::TrigEMClusterAuxContainer_v2#HLT_xAOD__TrigEMClusterContainer_L2CaloClustersAux. 1992 bytes
+HLTRMakerAlg.MKTool.Serialiser          13  0     DEBUG Payload size after inserting xAOD::TrigElectronContainer_v1#HLT_xAOD__TrigElectronContainer_L2ElectronFex 2160 bytes
+HLTRMakerAlg.MKTool.Serialiser          13  0     DEBUG Payload size after inserting xAOD::TrigElectronAuxContainer_v1#HLT_xAOD__TrigElectronContainer_L2ElectronFexAux. 6580 bytes
+HLTRMakerAlg.MKTool.Serialiser          14  0     DEBUG Payload size after inserting xAOD::TrigCompositeContainer_v1#remap_EgammaCaloDecisions 152 bytes
+HLTRMakerAlg.MKTool.Serialiser          14  0     DEBUG Payload size after inserting xAOD::TrigCompositeAuxContainer_v1#remap_EgammaCaloDecisionsAux. 544 bytes
+HLTRMakerAlg.MKTool.Serialiser          14  0     DEBUG Payload size after inserting xAOD::TrigEMClusterContainer_v1#HLT_xAOD__TrigEMClusterContainer_L2CaloClusters 716 bytes
+HLTRMakerAlg.MKTool.Serialiser          14  0     DEBUG Payload size after inserting xAOD::TrigEMClusterAuxContainer_v2#HLT_xAOD__TrigEMClusterContainer_L2CaloClustersAux. 1540 bytes
+HLTRMakerAlg.MKTool.Serialiser          14  0     DEBUG Payload size after inserting xAOD::TrigElectronContainer_v1#HLT_xAOD__TrigElectronContainer_L2ElectronFex 1708 bytes
+HLTRMakerAlg.MKTool.Serialiser          14  0     DEBUG Payload size after inserting xAOD::TrigElectronAuxContainer_v1#HLT_xAOD__TrigElectronContainer_L2ElectronFexAux. 3316 bytes
+HLTRMakerAlg.MKTool.Serialiser          15  0     DEBUG Payload size after inserting xAOD::TrigCompositeContainer_v1#remap_EgammaCaloDecisions 152 bytes
+HLTRMakerAlg.MKTool.Serialiser          15  0     DEBUG Payload size after inserting xAOD::TrigCompositeAuxContainer_v1#remap_EgammaCaloDecisionsAux. 424 bytes
+HLTRMakerAlg.MKTool.Serialiser          15  0     DEBUG Payload size after inserting xAOD::TrigEMClusterContainer_v1#HLT_xAOD__TrigEMClusterContainer_L2CaloClusters 596 bytes
+HLTRMakerAlg.MKTool.Serialiser          15  0     DEBUG Payload size after inserting xAOD::TrigEMClusterAuxContainer_v2#HLT_xAOD__TrigEMClusterContainer_L2CaloClustersAux. 1048 bytes
+HLTRMakerAlg.MKTool.Serialiser          15  0     DEBUG Payload size after inserting xAOD::TrigElectronContainer_v1#HLT_xAOD__TrigElectronContainer_L2ElectronFex 1216 bytes
+HLTRMakerAlg.MKTool.Serialiser          15  0     DEBUG Payload size after inserting xAOD::TrigElectronAuxContainer_v1#HLT_xAOD__TrigElectronContainer_L2ElectronFexAux. 1656 bytes
+HLTRMakerAlg.MKTool.Serialiser          16  0     DEBUG Payload size after inserting xAOD::TrigCompositeContainer_v1#remap_EgammaCaloDecisions 152 bytes
+HLTRMakerAlg.MKTool.Serialiser          16  0     DEBUG Payload size after inserting xAOD::TrigCompositeAuxContainer_v1#remap_EgammaCaloDecisionsAux. 536 bytes
+HLTRMakerAlg.MKTool.Serialiser          16  0     DEBUG Payload size after inserting xAOD::TrigEMClusterContainer_v1#HLT_xAOD__TrigEMClusterContainer_L2CaloClusters 708 bytes
+HLTRMakerAlg.MKTool.Serialiser          16  0     DEBUG Payload size after inserting xAOD::TrigEMClusterAuxContainer_v2#HLT_xAOD__TrigEMClusterContainer_L2CaloClustersAux. 1532 bytes
+HLTRMakerAlg.MKTool.Serialiser          16  0     DEBUG Payload size after inserting xAOD::TrigElectronContainer_v1#HLT_xAOD__TrigElectronContainer_L2ElectronFex 1700 bytes
+HLTRMakerAlg.MKTool.Serialiser          16  0     DEBUG Payload size after inserting xAOD::TrigElectronAuxContainer_v1#HLT_xAOD__TrigElectronContainer_L2ElectronFexAux. 2140 bytes
+HLTRMakerAlg.MKTool.Serialiser          17  0     DEBUG Payload size after inserting xAOD::TrigCompositeContainer_v1#remap_EgammaCaloDecisions 152 bytes
+HLTRMakerAlg.MKTool.Serialiser          17  0     DEBUG Payload size after inserting xAOD::TrigCompositeAuxContainer_v1#remap_EgammaCaloDecisionsAux. 672 bytes
+HLTRMakerAlg.MKTool.Serialiser          17  0     DEBUG Payload size after inserting xAOD::TrigEMClusterContainer_v1#HLT_xAOD__TrigEMClusterContainer_L2CaloClusters 844 bytes
+HLTRMakerAlg.MKTool.Serialiser          17  0     DEBUG Payload size after inserting xAOD::TrigEMClusterAuxContainer_v2#HLT_xAOD__TrigEMClusterContainer_L2CaloClustersAux. 1992 bytes
+HLTRMakerAlg.MKTool.Serialiser          17  0     DEBUG Payload size after inserting xAOD::TrigElectronContainer_v1#HLT_xAOD__TrigElectronContainer_L2ElectronFex 2160 bytes
+HLTRMakerAlg.MKTool.Serialiser          17  0     DEBUG Payload size after inserting xAOD::TrigElectronAuxContainer_v1#HLT_xAOD__TrigElectronContainer_L2ElectronFexAux. 4804 bytes
+HLTRMakerAlg.MKTool.Serialiser          18  0     DEBUG Payload size after inserting xAOD::TrigCompositeContainer_v1#remap_EgammaCaloDecisions 152 bytes
+HLTRMakerAlg.MKTool.Serialiser          18  0     DEBUG Payload size after inserting xAOD::TrigCompositeAuxContainer_v1#remap_EgammaCaloDecisionsAux. 668 bytes
+HLTRMakerAlg.MKTool.Serialiser          18  0     DEBUG Payload size after inserting xAOD::TrigEMClusterContainer_v1#HLT_xAOD__TrigEMClusterContainer_L2CaloClusters 840 bytes
+HLTRMakerAlg.MKTool.Serialiser          18  0     DEBUG Payload size after inserting xAOD::TrigEMClusterAuxContainer_v2#HLT_xAOD__TrigEMClusterContainer_L2CaloClustersAux. 1988 bytes
+HLTRMakerAlg.MKTool.Serialiser          18  0     DEBUG Payload size after inserting xAOD::TrigElectronContainer_v1#HLT_xAOD__TrigElectronContainer_L2ElectronFex 2156 bytes
+HLTRMakerAlg.MKTool.Serialiser          18  0     DEBUG Payload size after inserting xAOD::TrigElectronAuxContainer_v1#HLT_xAOD__TrigElectronContainer_L2ElectronFexAux. 3912 bytes
+HLTRMakerAlg.MKTool.Serialiser          19  0     DEBUG Payload size after inserting xAOD::TrigCompositeContainer_v1#remap_EgammaCaloDecisions 152 bytes
+HLTRMakerAlg.MKTool.Serialiser          19  0     DEBUG Payload size after inserting xAOD::TrigCompositeAuxContainer_v1#remap_EgammaCaloDecisionsAux. 756 bytes
+HLTRMakerAlg.MKTool.Serialiser          19  0     DEBUG Payload size after inserting xAOD::TrigEMClusterContainer_v1#HLT_xAOD__TrigEMClusterContainer_L2CaloClusters 928 bytes
+HLTRMakerAlg.MKTool.Serialiser          19  0     DEBUG Payload size after inserting xAOD::TrigEMClusterAuxContainer_v2#HLT_xAOD__TrigEMClusterContainer_L2CaloClustersAux. 2400 bytes
+HLTRMakerAlg.MKTool.Serialiser          19  0     DEBUG Payload size after inserting xAOD::TrigElectronContainer_v1#HLT_xAOD__TrigElectronContainer_L2ElectronFex 2568 bytes
+HLTRMakerAlg.MKTool.Serialiser          19  0     DEBUG Payload size after inserting xAOD::TrigElectronAuxContainer_v1#HLT_xAOD__TrigElectronContainer_L2ElectronFexAux. 8320 bytes
+TrigSignatureMoniMT                                INFO HLT_2e3_etcut                 20        10        6         5         5         
+TrigSignatureMoniMT                                INFO HLT_2e3_etcut decisions                           16        83        
+TrigSignatureMoniMT                                INFO HLT_e3_e5_etcut               20        20        12        10        10        
+TrigSignatureMoniMT                                INFO HLT_e3_e5_etcut decisions                         46        215       
+TrigSignatureMoniMT                                INFO HLT_e3_etcut                  20        9         8         8         8         
+TrigSignatureMoniMT                                INFO HLT_e3_etcut decisions                            22        107       
+TrigSignatureMoniMT                                INFO HLT_e5_etcut                  20        20        17        17        17        
+TrigSignatureMoniMT                                INFO HLT_e5_etcut decisions                            52        255       
+TrigSignatureMoniMT                                INFO HLT_e7_etcut                  20        20        11        11        11        
+TrigSignatureMoniMT                                INFO HLT_e7_etcut decisions                            17        119       
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/jet.recoToy.py b/Trigger/TrigValidation/TrigUpgradeTest/share/jet.recoToy.py
index 52e63837969ec1cd300ba6a5df5f138aba23db70..ca018f0cf7338a822a3886f45c154fc7131073f8 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/jet.recoToy.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/jet.recoToy.py
@@ -1,5 +1,5 @@
 #
-#  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+#  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 #
 
 include("TrigUpgradeTest/testHLT_MT.py")
@@ -27,16 +27,20 @@ if TriggerFlags.doCalo:
      mon = GenericMonitoringTool("CaloDataAccessSvcMon")
      mon.Histograms += [
        defineHistogram("TIME_locking_LAr_RoI",
+                       path="EXPERT",
                        title="Time spent in unlocking the LAr collection",
                        xbins=100, xmin=0, xmax=100 ),
        defineHistogram("roiROBs_LAr",
+                       path="EXPERT",
                        title="Number of ROBs unpacked in RoI requests",
                        xbins=20, xmin=0, xmax=20 ),
       defineHistogram("TIME_locking_LAr_FullDet",
+                       path="EXPERT",
                        title="Time spent in unlocking the LAr collection",
                       xbins=100, xmin=0, xmax=100 ),
-       defineHistogram("roiEta_LAr,roiPhi_LAr",
+      defineHistogram("roiEta_LAr,roiPhi_LAr",
                        type="TH2F",
+                       path="EXPERT",
                        title="Geometric usage",
                        xbins=50, xmin=-5, xmax=5,
                        ybins=64, ymin=-math.pi, ymax=math.pi )]
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/met.menu.py b/Trigger/TrigValidation/TrigUpgradeTest/share/met.menu.py
index 0a02a8bfe004ce116922ca2d9855cc33d63884bb..bb1deed6f07db99e19dcb11c114b52f9ccf13107 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/met.menu.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/met.menu.py
@@ -16,8 +16,8 @@ from TrigUpgradeTest.metMenuDefs import metCellSequence
 metCellSeq = metCellSequence()
 metCellStep = ChainStep("Step1_met_cell", [metCellSeq])
 testChains = [
-    Chain(name="HLT_xe65_L1XE50", Seed="L1_XE50", ChainSteps=[metCellStep]),
-	Chain(name="HLT_xe30_L1XE10", Seed="L1_XE10", ChainSteps=[metCellStep])
+   Chain(name="HLT_xe65_L1XE50", Seed="L1_XE50", ChainSteps=[metCellStep]),
+   Chain(name="HLT_xe30_L1XE10", Seed="L1_XE10", ChainSteps=[metCellStep])
 ]
 
 #################################
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/metTest.py b/Trigger/TrigValidation/TrigUpgradeTest/share/metTest.py
index f84167c36398d99526f7dc53a770b30a99ad655f..3c9800612f1b85d0bb882efa935c0755e70a7f52 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/metTest.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/metTest.py
@@ -1,5 +1,5 @@
 #
-#  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+#  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 #
 OutputLevel=WARNING
 include("TrigUpgradeTest/testHLT_MT.py")
@@ -12,10 +12,10 @@ from TrigT2CaloCommon.TrigT2CaloCommonConf import TrigCaloDataAccessSvc#, TestCa
 from AthenaMonitoring.GenericMonitoringTool import GenericMonitoringTool, defineHistogram
 
 mon = GenericMonitoringTool("CaloDataAccessSvcMon")
-mon.Histograms += [defineHistogram( "TIME_locking_LAr_RoI", title="Time spent in unlocking the LAr collection", xbins=100, xmin=0, xmax=100 ),
-                   defineHistogram( "roiROBs_LAr", title="Number of ROBs unpacked in RoI requests", xbins=20, xmin=0, xmax=20 ),
-                   defineHistogram( "TIME_locking_LAr_FullDet", title="Time spent in unlocking the LAr collection", xbins=100, xmin=0, xmax=100 ),
-                   defineHistogram( "roiEta_LAr,roiPhi_LAr", type="TH2F", title="Geometric usage", xbins=50, xmin=-5, xmax=5, ybins=64, ymin=-math.pi, ymax=math.pi )]
+mon.Histograms += [defineHistogram( "TIME_locking_LAr_RoI", path='EXPERT', title="Time spent in unlocking the LAr collection", xbins=100, xmin=0, xmax=100 ),
+                   defineHistogram( "roiROBs_LAr", path='EXPERT', title="Number of ROBs unpacked in RoI requests", xbins=20, xmin=0, xmax=20 ),
+                   defineHistogram( "TIME_locking_LAr_FullDet", path='EXPERT', title="Time spent in unlocking the LAr collection", xbins=100, xmin=0, xmax=100 ),
+                   defineHistogram( "roiEta_LAr,roiPhi_LAr", type="TH2F", path='EXPERT', title="Geometric usage", xbins=50, xmin=-5, xmax=5, ybins=64, ymin=-math.pi, ymax=math.pi )]
 
 svcMgr += TrigCaloDataAccessSvc()
 svcMgr.TrigCaloDataAccessSvc.MonTool = mon
@@ -52,8 +52,8 @@ metAlg.HelperTool= helperTool
 metAlg.OutputLevel=WARNING
 
 metMon = GenericMonitoringTool("METMonTool")
-metMon.Histograms = [ defineHistogram( "TIME_Total", title="Time spent Alg", xbins=100, xmin=0, xmax=100 ),
-                      defineHistogram( "TIME_Loop", title="Time spent in Tools loop", xbins=100, xmin=0, xmax=100 )]
+metMon.Histograms = [ defineHistogram( "TIME_Total", path='EXPERT', title="Time spent Alg", xbins=100, xmin=0, xmax=100 ),
+                      defineHistogram( "TIME_Loop", path='EXPERT', title="Time spent in Tools loop", xbins=100, xmin=0, xmax=100 )]
 from TrigEFMissingET.TrigEFMissingETMonitoring import ( hEx_log, hEy_log, hEz_log, hMET_log, hSumEt_log, 
                                                  hMET_lin, hSumEt_lin, 
                                                  hXS, hMETPhi, hMETStatus,
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_decodeBS.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_decodeBS.sh
new file mode 100755
index 0000000000000000000000000000000000000000..b045f5aa72b44e863a48e687da589caad470eb17
--- /dev/null
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_decodeBS.sh
@@ -0,0 +1,27 @@
+#!/bin/sh
+# art-type: build
+# art-include: master/Athena
+
+#
+
+#!/bin/sh
+# art-type: build
+# art-include: master/Athena
+
+#clear BS from previous runs
+rm -rf  data_test.*.data
+athena  --threads=1 --skipEvents=10 --evtMax=20 --filesInput="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data17_13TeV.00327265.physics_EnhancedBias.merge.RAW._lb0100._SFO-1._0001.1" TrigUpgradeTest/egamma.withViews.py
+
+
+
+FNAME=data_test.00327265.Single_Stream.daq.RAW._lb0100._Athena._0000.data 
+if [ -f ${FNAME} ]
+then
+    athena --threads=1  --filesInput=${FNAME} -c "doL1Unpacking=False" TrigUpgradeTest/decodeBS.py &&
+	checkxAOD.py myESDfromBS.pool.root
+    
+else
+    echo "missing input BS file, preceeding test failed"
+    exit -1
+fi
+
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_egamma_run_data.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_egamma_run_data.sh
index 66a8ac9d77caff25d2fe6eb294d0904b58a5c6c3..78bc7cbc808b651199766e4dd4c394c75c7f2558 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_egamma_run_data.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_egamma_run_data.sh
@@ -2,9 +2,8 @@
 # art-type: build
 # art-include: master/Athena
 
-# clear BS from previous runs
+#clear BS from previous runs
 rm -rf  data_test.*.data
-
-athena --dump-configuration=cfg.txt  --threads=1 --skipEvents=10 --evtMax=20 --filesInput="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data17_13TeV.00327265.physics_EnhancedBias.merge.RAW._lb0100._SFO-1._0001.1" TrigUpgradeTest/egamma.withViews.py #&&
+athena  --threads=1 --skipEvents=10 --evtMax=20 --filesInput="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data17_13TeV.00327265.physics_EnhancedBias.merge.RAW._lb0100._SFO-1._0001.1" TrigUpgradeTest/egamma.withViews.py &&
 checkxAOD.py myESD.pool.root &&
-athena TrigUpgradeTest/checkESD.py
+athena TrigUpgradeTest/checkESD.py 
diff --git a/Trigger/TrigValidation/TriggerTest/test/exec_athena_art_trigger_validation.sh b/Trigger/TrigValidation/TriggerTest/test/exec_athena_art_trigger_validation.sh
index 01e24f2c124a836016d6e8cd5eb519945d4dd2ca..457f96fc52c81a10daac3ab1839b20007260d12b 100755
--- a/Trigger/TrigValidation/TriggerTest/test/exec_athena_art_trigger_validation.sh
+++ b/Trigger/TrigValidation/TriggerTest/test/exec_athena_art_trigger_validation.sh
@@ -35,7 +35,7 @@ fi
 ###
 
 if [[ $INPUT == "pbpb" ]]; then
-  export DS='["/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TriggerTest/mc15_5TeV.420000.Hijing_PbPb_5p02TeV_MinBias_Flow_JJFV6.recon.RDO.e3754_s2633_r7161/RDO.06677682._000001.pool.root.1","/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TriggerTest/mc15_5TeV.420000.Hijing_PbPb_5p02TeV_MinBias_Flow_JJFV6.recon.RDO.e3754_s2633_r7161/RDO.06677682._000002.pool.root.1","/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TriggerTest/mc15_5TeV.420000.Hijing_PbPb_5p02TeV_MinBias_Flow_JJFV6.recon.RDO.e3754_s2633_r7161/RDO.06677682._000003.pool.root.1"]'
+  export DS='["/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TriggerTest/mc15_5TeV.420000.Hijing_PbPb_5p02TeV_MinBias_Flow_JJFV6.recon.RDO.e3754_s2633_r7161/RDO.06677682._000002.pool.root.1","/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TriggerTest/mc15_5TeV.420000.Hijing_PbPb_5p02TeV_MinBias_Flow_JJFV6.recon.RDO.e3754_s2633_r7161/RDO.06677682._000003.pool.root.1"]'
 
 elif [[ $INPUT == "ftk" ]]; then
   export DS='["/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TriggerTest/mc16_13TeV.410470.PhPy8EG_A14_ttbar_hdamp258p75_nonallhad.digit.RDO_FTK.e6337_e5984_s3126_d1480_d1471_tid15265974_00/RDO_FTK.15265974._004440.pool.root.1"]'
diff --git a/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfig.py b/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfig.py
index 35e1889d2ed0989dd06a1b18e0ff46d548b1455d..16edb349cb7f3b4a8947114885f8e44c59bdfa08 100644
--- a/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfig.py
+++ b/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfig.py
@@ -31,6 +31,8 @@ def collectHypos( steps ):
                 if 'HypoInputDecisions'  in alg.getProperties():
                     __log.info( "found hypo " + alg.name() + " in " +stepSeq.name() )
                     hypos[stepSeq.name()].append( alg )
+                else:
+                    __log.info("DID NOT FIND HYPO" + alg.name())
     return hypos
 
 def __decisionsFromHypo( hypo ):
diff --git a/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfigGetter.py b/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfigGetter.py
index 6558072e19c4ef222e53211c2f566620342ebe01..7c817028a5ab9d956482ffc841113c5912602652 100644
--- a/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfigGetter.py
+++ b/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfigGetter.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 
 
 __author__  = 'J. Stelzer'
@@ -248,7 +248,7 @@ class TriggerConfigGetter(Configured):
         ### preparations are done!
         try:
             self.svc.SetStates( self.ConfigSrcList )
-        except:
+        except Exception as ex:
             log.error( 'Failed to set state of TrigConfigSvc to %r' % self.ConfigSrcList )
         else:
             log.info('The following configuration services will be tried: %r' % self.ConfigSrcList )
@@ -256,7 +256,7 @@ class TriggerConfigGetter(Configured):
 
         try:
             self.svc.InitialiseSvc()
-        except Exception, ex:
+        except Exception as ex:
             log.error( 'Failed to activate TrigConfigSvc: %r' % ex )
 
         if self.readTriggerDB:
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/l1topo/L1TopoFlags.py b/Trigger/TriggerCommon/TriggerMenu/python/l1topo/L1TopoFlags.py
index 9114f8db9e19f2b895ed277f95b707c87199be9e..a0d17a1af27c0bca01d4f4643567b7e170fdf38c 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/l1topo/L1TopoFlags.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/l1topo/L1TopoFlags.py
@@ -4,8 +4,7 @@
 L1Topo specific flags
 """
 
-from AthenaCommon.JobProperties import JobProperty, JobPropertyContainer, jobproperties
-from TriggerMenu.menu.CommonSliceHelper import AllowedList
+from AthenaCommon.JobProperties import JobProperty, JobPropertyContainer
 from AthenaCommon.Logging import logging
 
 log = logging.getLogger('TriggerMenu.L1TopoFlags.py')
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/l1topo/L1TopoMenu.py b/Trigger/TriggerCommon/TriggerMenu/python/l1topo/L1TopoMenu.py
index fd8aa97e27f8de9a51c5bcb28ce6d11d37ec0c79..6f105e411465e744e35cbce6952a3ded01e17d42 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/l1topo/L1TopoMenu.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/l1topo/L1TopoMenu.py
@@ -1,6 +1,6 @@
 # Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 
-from TopoOutput import TopoOutput, TriggerLine
+from TopoOutput import TriggerLine
 from AthenaCommon.Logging import logging
 log = logging.getLogger("TriggerMenu.l1topo.L1TopoMenu")
 
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/l1topo/TopoAlgos.py b/Trigger/TriggerCommon/TriggerMenu/python/l1topo/TopoAlgos.py
index 4b09969e45fbc8f44478f585ef59b6518bcb852b..5ef84d69cb9b21b44a3aa1230cc26ed8a695d08c 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/l1topo/TopoAlgos.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/l1topo/TopoAlgos.py
@@ -1,7 +1,6 @@
 # Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 
 from AthenaCommon.Logging import logging
-from copy import deepcopy 
 from TriggerJobOpts.TriggerFlags import TriggerFlags
 
 log = logging.getLogger("TopoAlgo") 
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/l1topo/TopoOutput.py b/Trigger/TriggerCommon/TriggerMenu/python/l1topo/TopoOutput.py
index 0738fbce77ee03dbfd92463ac28d3d80af36675d..9bb088a963e5cf80ac54e696f0f3a84231d72b40 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/l1topo/TopoOutput.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/l1topo/TopoOutput.py
@@ -22,7 +22,6 @@ class TopoOutput(object):
 
 
 
-from collections import namedtuple
 class TriggerLine(object):
 
     import re
diff --git a/Trigger/TriggerCommon/TriggerMenu/scripts/makeRuleBook_for_justificationTag.py b/Trigger/TriggerCommon/TriggerMenu/scripts/makeRuleBook_for_justificationTag.py
index d7df2aee474b372e7dcfa579bc45bf5b10d1e84e..603c8f17bf74bf28547cbba4534c367cce8d7056 100644
--- a/Trigger/TriggerCommon/TriggerMenu/scripts/makeRuleBook_for_justificationTag.py
+++ b/Trigger/TriggerCommon/TriggerMenu/scripts/makeRuleBook_for_justificationTag.py
@@ -1,11 +1,11 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 
 ## This script checks the justification database for chains of a specific tag (e.g. "primary_at_1e32"). It makes a list of chains of this specific tag that are also in the menu of a specific release (e.g. "rel_0"). It picks from a reference RuleBook the lines corresponding to that list, and if the RuleBook does not contain any of these items, it writes this item with default value "(0,1)" for lumi 1000.
 ## Tomasz'json is being used.
 ##e.g. (from within the scripts directory) python makeRuleBook_for_justificationTag.py primary_at_1e32 rel_0 ../rules/Physics_pp_rulebook_PT.txt
 
 
-import simplejson as json
+import json
 import urllib2
 import sys, commands
 
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronDef.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronDef.py
index abaa584fd3f61cf9dace5a40a4013edd02ffcbef..119e757f71fe5d17859610240ee3e52ce0df47af 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronDef.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronDef.py
@@ -5,98 +5,70 @@ logging.getLogger().info("Importing %s",__name__)
 log = logging.getLogger("TriggerMenuMT.HLTMenuConfig.Egamma.ElectronDef")
 
 
-
+from TriggerMenuMT.HLTMenuConfig.Menu.ChainConfigurationBase import ChainConfigurationBase
 from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import Chain, ChainStep, RecoFragmentsPool
 from TriggerMenuMT.HLTMenuConfig.Menu.TriggerConfigHLT import TriggerConfigHLT
 
+from TrigUpgradeTest.electronMenuDefs import fastCaloSequence, electronSequence        
+
+#----------------------------------------------------------------
+# fragments generating configuration will be functions in New JO, 
+# so let's make them functions already now
+#----------------------------------------------------------------
 
-# fragments generating configuration will be functions in New JO, so let's make them functions already now
 def fastCaloSequenceCfg( flags ):
-    from TrigUpgradeTest.electronMenuDefs import fastCaloSequence
     return fastCaloSequence()
     
 def electronSequenceCfg( flags ):
-    from TrigUpgradeTest.electronMenuDefs import electronSequence        
     return electronSequence()
 
-def generateChain(flags, chainDict ): # in New JO  we will add flags here
-    chainDict = type("chainDict", (object,), chainDict)
-    # translation from  chainDict["chainName"] to chainDict.chainName (less typing),
-    # it is not exact as the things like the multiplicity are not converted to int, however they should be made int in the first place
-    #
-
 
-    # this is the cache, we hope we will be able to get rid of it in future
-    fastCalo = RecoFragmentsPool.retrieve( fastCaloSequenceCfg, None ) # the None will be used for flags in future
-    electronReco = RecoFragmentsPool.retrieve( electronSequenceCfg, None )
-    
-    return Chain(name = chainDict.chainName,
-                 Seed = chainDict.L1item, 
-                 ChainSteps = [
-                     ChainStep('ElectronStep1', [fastCalo]),
-                     ChainStep('ElectronStep2', [electronReco])
-                 ])
-    
-    
-
-
-class Chain_electron:
+#----------------------------------------------------------------
+# Class to configure chain
+#----------------------------------------------------------------
+class ElectronChainConfiguration(ChainConfigurationBase):
 
     def __init__(self, chainDict):
-
-        self.chainSteps = []
-
-        self.chainPart = chainDict['chainParts']
-        self.chainName = chainDict['chainName']
-        self.chainL1Item = chainDict['L1item']        
-        self.chainPartL1Item = self.chainPart['L1item']
-        self.mult = int(self.chainPart['multiplicity'])
-        self.chainPartName = self.chainPart['chainPartName']
-        self.chainPartNameNoMult = self.chainPartName[1:] if self.mult > 1 else self.chainPartName
-        self.chainPartNameNoMult += "_"+self.chainL1Item
-
-
+        ChainConfigurationBase.__init__(self,chainDict)
+        
+    # ----------------------
+    # Assemble the chain depending on information from chainName
+    # ----------------------
     def assembleChain(self):                            
         myStepNames = []
         chainSteps = []
-        if 'etcut' in self.chainName:
+        log.debug("Assembling chain for " + self.chainName)
+        # --------------------
+        # define here the names of the steps and obtain the chainStep configuration 
+        # --------------------
+        if 'etcut' in self.chainName:            
             myStepNames += ["Step1_etcut"]
-            myStepNames += ["Step2_etcut"]
-            
+            myStepNames += ["Step2_etcut"]            
             for step in myStepNames: 
-                chainSteps += [self.getStep(step)]
-
-
-        self.chainSteps = chainSteps
-        myChain = Chain(name = self.chainName, 
-                        Seed = self.chainL1Item, 
-                        ChainSteps = self.chainSteps)
+                chainSteps += [self.getEtCutStep(step)]
+            log.debug("chainSteps are: ", chainSteps )
+        else:
+            raise RuntimeError("Chain configuration unknown for chain: " + self.chainName )
+            
+        myChain = self.buildChain(chainSteps)
         return myChain
-
-
-    def getFastCaloStep(self, stepName):
-        fastCaloStep= fastCaloSequence()
-        step1=ChainStep(stepName, [fastCaloStep])
-        return step1
-
-    def getElectronStep(self, stepName):
-        electronStep= electronSequence()
-        step2=ChainStep(stepName, [electronStep])
-        return step2
         
-    def getStep(self, name):
-        myTriggerConfigHLT = TriggerConfigHLT.currentTriggerConfig()        
-        if name in myTriggerConfigHLT.allChainSteps:
-            return myTriggerConfigHLT.allChainSteps[name]            
-        log.debug("ChainStep has not been configured so far, add to the list!")
-        if name == "Step1_etcut":
-            chainStep = self.getFastCaloStep(name)
-        elif name == "Step2_etcut":
-            chainStep = self.getElectronStep(name)
-        else:
-            raise RuntimeError("chainStepName unknown: " + name )
+    # --------------------
+    # Configuration of etcut chain
+    # --------------------
+    def getEtCutStep(self, stepName):
+        if stepName == "Step1_etcut":
+            log.debug("Configuring step " + stepName)
+            fastCalo = RecoFragmentsPool.retrieve( fastCaloSequenceCfg, None ) # the None will be used for flags in future
+            chainStep =ChainStep(stepName, [fastCalo])
+        elif stepName == "Step2_etcut":
+            log.debug("Configuring step " + stepName)
+            electronReco = RecoFragmentsPool.retrieve( electronSequenceCfg, None )
+            chainStep=ChainStep(stepName, [electronReco])
+        else:            
+            raise RuntimeError("chainStepName unknown: " + stepName )
                         
-        myTriggerConfigHLT.allChainSteps[name]= chainStep    
+        log.debug("Returning chainStep from getEtCutStep function: " + stepName)
         return chainStep
             
             
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/generateElectronChainDefs.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/generateElectronChainDefs.py
index e58b5f4b36a900036e31acb04ea260f1c705e27a..6634c719aa25899b3665fdad2d9e828cf573ae4b 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/generateElectronChainDefs.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/generateElectronChainDefs.py
@@ -1,9 +1,8 @@
-# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 
-from TriggerMenuMT.HLTMenuConfig.Egamma.ElectronDef import generateChain as generateElectronChain
 from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import Chain
 from TriggerMenuMT.HLTMenuConfig.Menu.ChainDictTools import splitChainDict
-#from TriggerMenuMT.HLTMenuConfig.Egamma.ElectronDef import Chain_electron as Chain_electron
+from TriggerMenuMT.HLTMenuConfig.Egamma.ElectronDef import ElectronChainConfiguration as ElectronChainConfiguration
 
 
 from AthenaCommon.Logging import logging
@@ -21,11 +20,8 @@ def generateChainConfigs( chainDict ):
     listOfChainDefs = []
 
     for subChainDict in listOfChainDicts:
-        log.debug("IN ELECTRON GENERATION CODE")
         
-        Electron = generateElectronChain( None, subChainDict )
-        #Electron = Chain_electron(subChainDict).assembleChain() 
-
+        Electron = ElectronChainConfiguration(subChainDict).assembleChain() 
 
         listOfChainDefs += [Electron]
         log.debug('length of chaindefs %s', len(listOfChainDefs) )
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/ChainConfigurationBase.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/ChainConfigurationBase.py
new file mode 100644
index 0000000000000000000000000000000000000000..6b70ec409f90502dff480b94cac1d9016218ff2e
--- /dev/null
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/ChainConfigurationBase.py
@@ -0,0 +1,42 @@
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+
+
+from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import Chain, ChainStep, RecoFragmentsPool
+
+#----------------------------------------------------------------
+# Base class to configure chain
+#----------------------------------------------------------------
+class ChainConfigurationBase:
+
+    def __init__(self, chainDict):
+        
+        # Consider using translation from  dict["chainName"] to dict.chainName (less typing),
+        # though need to be able to access list of dictionaries as value of chainPart as well 
+        # dict = type("dict", (object,), dict)
+
+        self.dict = {}
+        self.dict.update(chainDict)
+
+        self.chainName = self.dict['chainName']
+        self.chainL1Item = self.dict['L1item']        
+
+        self.chainPart = self.dict['chainParts']
+        self.chainPartL1Item = self.chainPart['L1item']
+        self.mult = int(self.chainPart['multiplicity'])
+        self.chainPartName = self.chainPart['chainPartName']
+        self.chainPartNameNoMult = self.chainPartName[1:] if self.mult > 1 else self.chainPartName
+        self.chainPartNameNoMult += "_"+self.chainL1Item
+
+
+    # this is the cache, hoping to be able to get rid of it in future
+    def checkRecoFragmentPool(mySequenceCfg):
+        mySequence = RecoFragmentsPool.retrieve(mySequenceCfg, None) # the None will be used for flags in future
+        return mySequence
+
+    def buildChain(self, chainSteps):                            
+        myChain = Chain(name = self.chainName, 
+                        Seed = self.chainL1Item, 
+                        ChainSteps = chainSteps)
+        return myChain
+
+        
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/GenerateMenuMT.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/GenerateMenuMT.py
index 1205f0a54f9fcacd00c6b289a51f27db0a75252d..e0acb90930cac7017fffaded7ed530a7a92e887b 100755
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/GenerateMenuMT.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/GenerateMenuMT.py
@@ -51,13 +51,13 @@ class GenerateMenuMT:
 
     def setTriggerConfigHLT(self):
         # setting the hlt menu configuration
-        #(HLTPrescales) = self.setupMenu()
+        (HLTPrescales) = self.setupMenu()
         self.triggerConfigHLT = TriggerConfigHLT(TriggerFlags.outputHLTconfigFile())
         self.triggerConfigHLT.menuName = TriggerFlags.triggerMenuSetup()
         log.debug("Working with menu: %s", self.triggerConfigHLT.menuName)
 
         
-    def getChainConfig(self, chainDicts):
+    def generateChainConfig(self, chainDicts):
         """
         == Assembles the chain configuration and returns a chain object with (name, L1see and list of ChainSteps)
         """
@@ -86,11 +86,8 @@ class GenerateMenuMT:
                     chainConfigs = TriggerMenuMT.HLTMenuConfig.Egamma.generateElectronChainDefs.generateChainConfigs(chainDict)                    
                 except:
                     log.exception( 'Problems creating ChainDef for chain\n %s ' % (chainDict['chainName']) ) 
-
-
                     continue
-            else:
-                
+            else:                
                 log.error('Chain %s ignored - either trigger signature is turned off or the corresponding chain dictionary cannot be read.' %(chainDict['chainName']))
                 log.debug('Chain dictionary of failed chain is %s.', chainDict)
             
@@ -103,7 +100,7 @@ class GenerateMenuMT:
 
         if len(listOfChainConfigs) == 0:  
             log.error('No Chain Configuration found ')
-            return None
+            return False
         
         elif len(listOfChainConfigs)>1:
             if ("mergingStrategy" in chainDicts[0].keys()):
@@ -127,16 +124,17 @@ class GenerateMenuMT:
 
         log.debug('Creating one big list of of enabled signatures and chains')
         chains = []
-        # we can already use new set of flags
-        from AthenaConfiguration.AllConfigFlags import ConfigFlags
-        from TriggerMenuMT.HLTMenuConfig.Menu.LS2_v1_newJO import setupMenu as setupMenuFlags
-        setupMenuFlags( ConfigFlags ) 
-        ConfigFlags.lock()
+        ## we can already use new set of flags
+        #from AthenaConfiguration.AllConfigFlags import ConfigFlags
+        #from TriggerMenuMT.HLTMenuConfig.Menu.LS2_v1_newJO import setupMenu as setupMenuFlags
+        #setupMenuFlags( ConfigFlags ) 
+        #ConfigFlags.lock()
         
-        #if (TriggerFlags.CombinedSlice.signatures() or TriggerFlags.EgammaSlice.signatures()) and self.doEgammaChains:
-        if ConfigFlags.Trigger.menu.electron and self.doEgammaChains:
-            chains += ConfigFlags.Trigger.menu.electron
-            log.debug("egamma chains "+str(ConfigFlags.Trigger.menu.egamma))
+        #if ConfigFlags.Trigger.menu.electron and self.doEgammaChains:
+        if (TriggerFlags.CombinedSlice.signatures() or TriggerFlags.EgammaSlice.signatures()) and self.doEgammaChains:
+            chains += TriggerFlags.EgammaSlice.signatures() 
+            #chains += ConfigFlags.Trigger.menu.electron
+            #log.debug("egamma chains "+str(ConfigFlags.Trigger.menu.egamma))
         else:
             self.doEgammaChains   = False
 
@@ -191,9 +189,9 @@ class GenerateMenuMT:
         # go over the slices and put together big list of signatures requested
         #(L1Prescales, HLTPrescales, streamConfig) = MenuPrescaleConfig(self.triggerPythonConfig)
         # that does not seem to work
-        #(self.L1Prescales, self.HLTPrescales) = MenuPrescaleConfig(self.triggerConfigHLT)
-        #return (self.HLTPrescales)
-        pass
+        (self.L1Prescales, self.HLTPrescales) = MenuPrescaleConfig(self.triggerConfigHLT)
+        return (self.HLTPrescales)
+        #pass
 
 
 
@@ -214,7 +212,7 @@ class GenerateMenuMT:
             chainDict['chainCounter'] = chainCounter
 
             log.debug("Next: getting chain configuration for chain %s ", chain) 
-            chainConfig= self.getChainConfig(chainDict)
+            chainConfig= self.generateChainConfig(chainDict)
 
             log.debug("Finished with retrieving chain configuration for chain %s", chain) 
             self.triggerConfigHLT.allChainConfigs.append(chainConfig)
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
index eebff07b51d8c67c455f0845dc3cf857c8c16608..ee607522968ab934603d3f54ba3980349cf8479d 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
@@ -37,10 +37,9 @@ def setupMenu():
 
      ]
     TriggerFlags.EgammaSlice.signatures = [
-        ['e3_etcut1step', 'L1_EM3', [],  [PhysicsStream], ['RATE:SingleElectron', 'BW:Electron'], -1],
-        ['e3_etcut', 'L1_EM3',      [],  [PhysicsStream], ['RATE:SingleElectron', 'BW:Electron'], -1],
-        ['e5_etcut', 'L1_EM3',      [],  [PhysicsStream], ['RATE:SingleElectron', 'BW:Electron'], -1],
-        ['e7_etcut', 'L1_EM3',      [],  [PhysicsStream], ['RATE:SingleElectron', 'BW:Electron'], -1],
+        ['HLT_e3_etcut', 'L1_EM3',      [],  [PhysicsStream], ['RATE:SingleElectron', 'BW:Electron'], -1],
+        ['HLT_e5_etcut', 'L1_EM3',      [],  [PhysicsStream], ['RATE:SingleElectron', 'BW:Electron'], -1],
+        ['HLT_e7_etcut', 'L1_EM3',      [],  [PhysicsStream], ['RATE:SingleElectron', 'BW:Electron'], -1],
         #['e20',	      'L1_EM10',   [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Electron'], -1],        
         ]
     TriggerFlags.CombinedSlice.signatures = [
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuComponents.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuComponents.py
index 66db49a5a03a35ee03791af1f4490c169e43cc21..39d58c7199c76ac048608b6cb571e6a56fae698a 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuComponents.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuComponents.py
@@ -209,7 +209,7 @@ class ComboMaker(AlgNode):
 
     def addChain(self, chain):
         log.debug("ComboMaker %s adding chain %s"%(self.Alg.name(),chain))
-        from MenuChains import getConfFromChainName
+        from TriggerMenuMT.HLTMenuConfig.Menu.MenuChains import getConfFromChainName
         confs=getConfFromChainName(chain)
         for conf in confs:
             seed=conf.replace("HLT_", "")
@@ -380,7 +380,7 @@ class Chain:
     def decodeHypoToolConfs(self):
         """ This is extrapolating the hypotool configuration from the (combined) chain name"""
         from TriggerMenuMT.HLTMenuConfig.Menu.MenuChains import getConfFromChainName
-        signatures = getConfFromChainName(self.name)
+        signatures = getConfFromChainName(self.name) #currently a lis of chainPart names
         for step in self.steps:
             if len(signatures) != len(step.sequences):
                 log.error("Error in step %s: found %d signatures and %d sequences"%(step.name, len(signatures), len(step.sequences)))
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/SignatureDicts.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/SignatureDicts.py
index 6398c34c508550edc073ec7c9ba0c1b2b77f7238..d2c78e3b8a7b20fb7a2b564f43a14beff9d4b233 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/SignatureDicts.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/SignatureDicts.py
@@ -195,7 +195,7 @@ MuonChainParts = {
     'threshold'      : '',
     'extra'          : ['noL1'],
     'IDinfo'         : [],
-    'isoInfo'        : ['iloose', 'imedium', 'itight', 'ivarloose', 'ivarmedium','icalo','iloosecalo','imediumcalo','iloosems', 'ivarloosecalo', 'ivarmediumcalo'],
+    'isoInfo'        : ['iloose', 'ivar', 'imedium', 'itight', 'ivarloose', 'ivarmedium','icalo','iloosecalo','imediumcalo','iloosems', 'ivarloosecalo', 'ivarmediumcalo'],
     'reccalibInfo'   : ['msonly', 'l2msonly', 'l2idonly', 'nomucomb', 'idperf','muoncalib', 'mucombTag','muL2', 'mgonly'],
     'trkInfo'        : ['fasttr', 'hlttr', 'ftk', 'IDT'],
     'hypoInfo'       : [],
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/TriggerConfigHLT.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/TriggerConfigHLT.py
index 5d44149900cb95038dd9b1670009695b5cd45154..9fbb2bfada605804052a17b23a5fdee56faf0af1 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/TriggerConfigHLT.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/TriggerConfigHLT.py
@@ -15,7 +15,6 @@ class TriggerConfigHLT:
         return TriggerConfigHLT.sCurrentTriggerConfig
     currentTriggerConfig = staticmethod(currentTriggerConfig)
 
-
     def __init__(self, hltfile=None):
         self.menuName = 'TestMenu'
         self.__HLTFile = hltfile
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/scripts/generateMenuMT.py b/Trigger/TriggerCommon/TriggerMenuMT/scripts/generateMenuMT.py
index 0c3ffce84b7b42a900403d32138f2c59c8787d08..479bd89244b6e7df1a93653ad308c8d8847b1dea 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/scripts/generateMenuMT.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/scripts/generateMenuMT.py
@@ -61,5 +61,3 @@ g.generateMT()
 
 
 
-
-
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/scripts/test_HLTmenu.sh b/Trigger/TriggerCommon/TriggerMenuMT/scripts/test_HLTmenu.sh
index bba2ef6c262f350f5b3adfffd1fc0dfc818e0441..9bc1327118ebb207d9f983e7783940f6b9d30498 100755
--- a/Trigger/TriggerCommon/TriggerMenuMT/scripts/test_HLTmenu.sh
+++ b/Trigger/TriggerCommon/TriggerMenuMT/scripts/test_HLTmenu.sh
@@ -1,3 +1,4 @@
 #!bin/sh
 
+
 athena -l DEBUG --threads=1 --skipEvents=10 --evtMax=20 --filesInput="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data17_13TeV.00327265.physics_EnhancedBias.merge.RAW._lb0100._SFO-1._0001.1" TriggerMenuMT/generateMT.py
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/share/generateMT.py b/Trigger/TriggerCommon/TriggerMenuMT/share/generateMT.py
index e2af3b1baa4c8b0094a4eab27a94a9ea91a99c6d..5c6ac07101f5e6adcf37008c9ed5f8c4289ecc4d 100755
--- a/Trigger/TriggerCommon/TriggerMenuMT/share/generateMT.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/share/generateMT.py
@@ -36,6 +36,11 @@ for unpack in topSequence.L1DecoderTest.rerunRoiUnpackers:
 # Menu and CF construction
 ##########################################
 
+from TriggerJobOpts.TriggerFlags import TriggerFlags
+TriggerFlags.triggerMenuSetup = "LS2_v1"
+
+
+
 from TriggerMenuMT.HLTMenuConfig.Menu.GenerateMenuMT import GenerateMenuMT
 g = GenerateMenuMT()
 g.generateMT()
diff --git a/graphics/VP1/VP1AlgsBatch/CMakeLists.txt b/graphics/VP1/VP1AlgsBatch/CMakeLists.txt
index 737502d6a09da6e904b95231b41e3064f2f352ee..9eafa4947feaf0926094a795230f49c2694db687 100644
--- a/graphics/VP1/VP1AlgsBatch/CMakeLists.txt
+++ b/graphics/VP1/VP1AlgsBatch/CMakeLists.txt
@@ -6,27 +6,21 @@
 atlas_subdir( VP1AlgsBatch )
 
 # Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaBaseComps
-                          GaudiKernel
-                          PRIVATE
-                          Database/APR/StorageSvc
-                          Event/EventInfo
-                          Tools/PathResolver
-                          graphics/VP1/VP1UtilsBase )
-
-# External dependencies:
-find_package( Qt5 COMPONENTS Core OpenGL Gui HINTS ${QT5_ROOT} )
-
-
+atlas_depends_on_subdirs(
+   PUBLIC
+   Control/AthenaBaseComps
+   GaudiKernel
+   PRIVATE
+   Database/APR/StorageSvc
+   Event/EventInfo
+   Tools/PathResolver
+   graphics/VP1/VP1UtilsBase )
 
 # Component(s) in the package:
 atlas_add_component( VP1AlgsBatch
-                     src/*.cxx
-                     src/components/*.cxx
-                   LINK_LIBRARIES ${QT5_LIBRARIES} GL AthenaBaseComps GaudiKernel StorageSvc EventInfo PathResolver VP1UtilsBase )
+   VP1AlgsBatch/*.h src/*.cxx src/components/*.cxx
+   LINK_LIBRARIES AthenaBaseComps GaudiKernel StorageSvc EventInfo PathResolver
+   VP1UtilsBase )
 
 # Install files from the package:
-atlas_install_headers( VP1AlgsBatch )
 atlas_install_runtime( share/*.vp1 )
-
diff --git a/graphics/VP1/VP1AlgsEventProd/CMakeLists.txt b/graphics/VP1/VP1AlgsEventProd/CMakeLists.txt
index 5916cd2861ca274ede10cc814574aa7969536ccd..7ee316846f7770a98ee9010433114f42aac19530 100644
--- a/graphics/VP1/VP1AlgsEventProd/CMakeLists.txt
+++ b/graphics/VP1/VP1AlgsEventProd/CMakeLists.txt
@@ -6,27 +6,18 @@
 atlas_subdir( VP1AlgsEventProd )
 
 # Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaBaseComps
-                          GaudiKernel
-                          PRIVATE
-                          Database/APR/StorageSvc
-                          Event/EventInfo
-                          Tools/PathResolver
-                          graphics/VP1/VP1UtilsBase )
-
-# External dependencies:
-find_package( Qt5 COMPONENTS Core OpenGL Gui HINTS ${QT5_ROOT} )
-
-
+atlas_depends_on_subdirs(
+   PUBLIC
+   Control/AthenaBaseComps
+   GaudiKernel
+   PRIVATE
+   Database/APR/StorageSvc
+   Event/EventInfo
+   Tools/PathResolver
+   graphics/VP1/VP1UtilsBase )
 
 # Component(s) in the package:
 atlas_add_component( VP1AlgsEventProd
-                     src/*.cxx
-                     src/components/*.cxx
-                   LINK_LIBRARIES GL AthenaBaseComps GaudiKernel StorageSvc EventInfo PathResolver VP1UtilsBase )
-
-# Install files from the package:
-atlas_install_headers( VP1AlgsEventProd )
-
-
+   VP1AlgsEventProd/*.h src/*.cxx src/components/*.cxx
+   LINK_LIBRARIES AthenaBaseComps GaudiKernel StorageSvc EventInfo PathResolver
+   VP1UtilsBase )
diff --git a/graphics/VP1/VP1Plugins/VP1AODPlugin/CMakeLists.txt b/graphics/VP1/VP1Plugins/VP1AODPlugin/CMakeLists.txt
index 8afd7e74a2cdf2d5017bd0419752272a96a7aef4..597f287e5f7cb723a4ce4188d6b7f9d358977498 100644
--- a/graphics/VP1/VP1Plugins/VP1AODPlugin/CMakeLists.txt
+++ b/graphics/VP1/VP1Plugins/VP1AODPlugin/CMakeLists.txt
@@ -6,37 +6,22 @@
 atlas_subdir( VP1AODPlugin )
 
 # Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          graphics/VP1/VP1Base
-                          PRIVATE
-                          graphics/VP1/VP1Systems/VP1AODSystems
-                          graphics/VP1/VP1Systems/VP1GuideLineSystems )
-
-# Install files from the package:
-atlas_install_headers( VP1AODPlugin )
+atlas_depends_on_subdirs(
+   PUBLIC
+   graphics/VP1/VP1Base
+   PRIVATE
+   graphics/VP1/VP1Systems/VP1AODSystems
+   graphics/VP1/VP1Systems/VP1GuideLineSystems )
 
 # External dependencies:
-find_package( Qt5 COMPONENTS Core OpenGL Gui Widgets HINTS ${QT5_ROOT} )
-find_package( SoQt )
-find_package( Coin3D )
-
-
+find_package( Qt5 COMPONENTS Core )
 
-# Generate UI files automatically:
-set( CMAKE_AUTOUIC TRUE )
 # Generate MOC files automatically:
 set( CMAKE_AUTOMOC TRUE )
 
-# get the package name into the variable 'pkgName', to be used below
-atlas_get_package_name( pkgName )
-
-
 # Build the library.
-atlas_add_library( ${pkgName} ${pkgName}/*.h src/*.cxx src/*.qrc 
-   PUBLIC_HEADERS ${pkgName}
-   INCLUDE_DIRS ${SOQT_INCLUDE_DIRS} ${COIN3D_INCLUDE_DIRS} ${QT5_INCLUDE_DIRS} 
-   PRIVATE_INCLUDE_DIRS tmpqt_extraheaders/  ${ROOT_INCLUDE_DIRS}
-   LINK_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets ${SOQT_LIBRARIES} ${COIN3D_LIBRARIES} GeoPrimitives
-   PRIVATE_LINK_LIBRARIES VP1GuideLineSystems VP1GeometrySystems VP1AODSystems
-)
-
+atlas_add_library( VP1AODPlugin
+   VP1AODPlugin/*.h src/*.cxx
+   PUBLIC_HEADERS VP1AODPlugin
+   LINK_LIBRARIES Qt5::Core VP1Base
+   PRIVATE_LINK_LIBRARIES VP1GuideLineSystems VP1AODSystems )
diff --git a/graphics/VP1/VP1Plugins/VP1GeometryPlugin/CMakeLists.txt b/graphics/VP1/VP1Plugins/VP1GeometryPlugin/CMakeLists.txt
index f6f3e9d71e6ac008a46cf578349efe0206adee05..0de3845a215a617a22bfb41a8b578f1dbcce192f 100644
--- a/graphics/VP1/VP1Plugins/VP1GeometryPlugin/CMakeLists.txt
+++ b/graphics/VP1/VP1Plugins/VP1GeometryPlugin/CMakeLists.txt
@@ -6,33 +6,22 @@
 atlas_subdir( VP1GeometryPlugin )
 
 # Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
-                          graphics/VP1/VP1Systems/VP1GeometrySystems
-                          graphics/VP1/VP1Systems/VP1GuideLineSystems )
-
-# Install files from the package:
-atlas_install_headers( VP1GeometryPlugin )
+atlas_depends_on_subdirs(
+   PUBLIC
+   graphics/VP1/VP1Base
+   PRIVATE
+   graphics/VP1/VP1Systems/VP1GeometrySystems
+   graphics/VP1/VP1Systems/VP1GuideLineSystems )
 
 # External dependencies:
-find_package( Qt5 COMPONENTS Core OpenGL Gui Widgets HINTS ${QT5_ROOT} )
-find_package( SoQt )
-find_package( Coin3D )
+find_package( Qt5 COMPONENTS Core )
 
-# Generate UI files automatically:
-set( CMAKE_AUTOUIC TRUE )
 # Generate MOC files automatically:
 set( CMAKE_AUTOMOC TRUE )
 
-# get the package name into the variable 'pkgName', to be used below
-atlas_get_package_name( pkgName )
-
-
 # Build the library.
-atlas_add_library( ${pkgName} ${pkgName}/*.h src/*.cxx src/*.qrc 
-   PUBLIC_HEADERS ${pkgName}
-   INCLUDE_DIRS ${SOQT_INCLUDE_DIRS} ${COIN3D_INCLUDE_DIRS} ${QT5_INCLUDE_DIRS} 
-   PRIVATE_INCLUDE_DIRS tmpqt_extraheaders/ ${CMAKE_CURRENT_BINARY_DIR} ${ROOT_INCLUDE_DIRS}
-   LINK_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets ${SOQT_LIBRARIES} ${COIN3D_LIBRARIES} GeoPrimitives
-   PRIVATE_LINK_LIBRARIES VP1GuideLineSystems VP1GeometrySystems
-)
-
+atlas_add_library( VP1GeometryPlugin
+   VP1GeometryPlugin/*.h src/*.cxx 
+   PUBLIC_HEADERS VP1GeometryPlugin
+   LINK_LIBRARIES Qt5::Core VP1Base
+   PRIVATE_LINK_LIBRARIES VP1GuideLineSystems VP1GeometrySystems )
diff --git a/graphics/VP1/VP1Systems/VP1AODSystems/CMakeLists.txt b/graphics/VP1/VP1Systems/VP1AODSystems/CMakeLists.txt
index 99cac9e432b55d8228607718bfcbc53404b3ed8f..1778393339363b612063e142c8972a069d6239de 100644
--- a/graphics/VP1/VP1Systems/VP1AODSystems/CMakeLists.txt
+++ b/graphics/VP1/VP1Systems/VP1AODSystems/CMakeLists.txt
@@ -1,4 +1,3 @@
-# $Id: CMakeLists.txt 732142 2016-03-24 11:36:39Z krasznaa $
 ################################################################################
 # Package: VP1AODSystems
 ################################################################################
@@ -28,10 +27,11 @@ atlas_depends_on_subdirs(
 
 # External dependencies:
 find_package( Coin3D )
-find_package( Qt5 COMPONENTS Core Gui Widgets HINTS ${QT5_ROOT} )
+find_package( Qt5 COMPONENTS Core Gui Widgets )
 
 # Generate UI files automatically:
-# Note: add the "Widgets" component to "find_package( Qt5 ...)" if you have UI files, otherwise UIC, even if CMAKE_AUTOUIC is set to ON, is not run
+# Note: add the "Widgets" component to "find_package( Qt5 ...)" if you have UI
+# files, otherwise UIC, even if CMAKE_AUTOUIC is set to ON, is not run
 set( CMAKE_AUTOUIC TRUE )
 # Generate MOC files automatically:
 set( CMAKE_AUTOMOC TRUE )
diff --git a/graphics/VP1/VP1Systems/VP1CaloSystems/VP1CaloSystems/VP1CaloCellController.h b/graphics/VP1/VP1Systems/VP1CaloSystems/VP1CaloSystems/VP1CaloCellController.h
index b61bbc46678f624d04de2cffc721c09471dc3c53..14de776de45eaa3e356c2a640589146953075ea3 100644
--- a/graphics/VP1/VP1Systems/VP1CaloSystems/VP1CaloSystems/VP1CaloCellController.h
+++ b/graphics/VP1/VP1Systems/VP1CaloSystems/VP1CaloSystems/VP1CaloCellController.h
@@ -7,7 +7,7 @@
 
 #include "VP1Base/VP1Controller.h"
 #include "VP1CaloSystems/VP1CaloCells.h"
-#include "GeoModelKernel/Units.h"
+#include "GaudiKernel/SystemOfUnits.h"
 #include <QByteArray>
 #include <QString>
 #include <map>
@@ -114,7 +114,7 @@ class VP1CaloCellController : public VP1Controller
   //For verbose output:
   template <class T> static QString toString( const T& t ) { return VP1Controller::toString(t); }//unhide base methods
   static QString toString(const VP1CCIntervalMap& m) { return "VP1CCIntervalMap of size "+QString::number(m.count()); }
-  static QString toString(const QPair<bool,double>& par) { return "<"+QString(par.first?"log":"linear")+", "+QString::number(par.second/(GeoModelKernelUnits::cm/GeoModelKernelUnits::GeV))+" cm/GeV>"; }
+  static QString toString(const QPair<bool,double>& par) { return "<"+QString(par.first?"log":"linear")+", "+QString::number(par.second/(Gaudi::Units::cm/Gaudi::Units::GeV))+" cm/GeV>"; }
   static QString toString(const VP1CC_GlobalCuts& cuts) { return "VP1CC global cuts: sideA=" + QString(cuts.sideA?"True":"False") + ", sideC=" + QString(cuts.sideC?"True":"False") + ", allowedEta=" + VP1Controller::toString(cuts.allowedEta) + ", allowedPhi="  + VP1Controller::toString(cuts.allowedEta); }
 
 //  // FIXME:You have to compile Qwt with Qt5. LCG's Qwt is compiled with Qt4 only...
diff --git a/graphics/VP1/VP1Systems/VP1CaloSystems/VP1CaloSystems/VP1CaloCells.h b/graphics/VP1/VP1Systems/VP1CaloSystems/VP1CaloSystems/VP1CaloCells.h
index 7b00191e1d9506191e1d7b35f47178a5bba97630..b6afc456c7bfd95911badf9e4c871aa2a559dbff 100644
--- a/graphics/VP1/VP1Systems/VP1CaloSystems/VP1CaloSystems/VP1CaloCells.h
+++ b/graphics/VP1/VP1Systems/VP1CaloSystems/VP1CaloSystems/VP1CaloCells.h
@@ -12,7 +12,7 @@
 
 #include "GeoPrimitives/GeoPrimitives.h"
 #include "GeoModelKernel/GeoDefinitions.h"
-#include "GeoModelKernel/Units.h"
+#include "GaudiKernel/SystemOfUnits.h"
 
 #include <map>
 #include <set>
@@ -187,7 +187,7 @@ class VP1CaloCell
             const VP1CC_GlobalCuts& ) = 0;
 
   double cellDepth(const QPair<bool,double>& scale, const double& energy)
-  { return std::max(1.0*GeoModelKernelUnits::mm,scale.second*(scale.first?log(1+fabs(energy)):fabs(energy))); }
+  { return std::max(1.0*Gaudi::Units::mm,scale.second*(scale.first?log(1+fabs(energy)):fabs(energy))); }
 
   virtual bool isInsideClipVolume(const VP1CC_GlobalCuts&  globalCuts) ; // by default uses radius to determine this
   
diff --git a/graphics/VP1/VP1Systems/VP1CaloSystems/src/VP1CaloCellController.cxx b/graphics/VP1/VP1Systems/VP1CaloSystems/src/VP1CaloCellController.cxx
index c275a81ab16e0ea0874aa6a04389880bb24e526d..52655ba56dfde8c76749a194be0a5abdea5a8501 100644
--- a/graphics/VP1/VP1Systems/VP1CaloSystems/src/VP1CaloCellController.cxx
+++ b/graphics/VP1/VP1Systems/VP1CaloSystems/src/VP1CaloCellController.cxx
@@ -39,9 +39,7 @@
 */
 
 #include <QVector>
-
-#include "CLHEP/Units/SystemOfUnits.h"
-
+#include "GaudiKernel/SystemOfUnits.h"
 #include <map>
 
 // -------------------- Imp -------------------------------
@@ -1137,7 +1135,7 @@ VP1CCIntervalMap VP1CaloCellController::selectionIntervals() const
 
 QPair<bool,double> VP1CaloCellController::scale() const
 {
-	double scl = m_d->ui_visopts.chbxLogscale->isChecked() ? m_d->ui_visopts.dspbxScale->value()*GeoModelKernelUnits::m/log(1+10*GeoModelKernelUnits::GeV) : m_d->ui_visopts.dspbxScale->value()*GeoModelKernelUnits::m/(10*GeoModelKernelUnits::GeV);
+	double scl = m_d->ui_visopts.chbxLogscale->isChecked() ? m_d->ui_visopts.dspbxScale->value()*Gaudi::Units::m/log(1+10*Gaudi::Units::GeV) : m_d->ui_visopts.dspbxScale->value()*Gaudi::Units::m/(10*Gaudi::Units::GeV);
 	return QPair<bool,double>(m_d->ui_visopts.chbxLogscale->isChecked(),scl);
 }
 
diff --git a/graphics/VP1/VP1Systems/VP1GuideLineSystems/VP1GuideLineSystems/GuideSysController.h b/graphics/VP1/VP1Systems/VP1GuideLineSystems/VP1GuideLineSystems/GuideSysController.h
index 8f932861f472f6c7daae6acab8cc3f091973e827..650769f07640cf98ea551ea43c03b3c36a46663a 100644
--- a/graphics/VP1/VP1Systems/VP1GuideLineSystems/VP1GuideLineSystems/GuideSysController.h
+++ b/graphics/VP1/VP1Systems/VP1GuideLineSystems/VP1GuideLineSystems/GuideSysController.h
@@ -92,11 +92,15 @@ public:
   double etaExtent() const;//>0: extent means to a given radius, <0: extent means to a given z.
 
   //TrackingVolumes
-	bool showTrackingVolumes() const;
+  bool showTrackingVolumes() const;
   bool showInnerDetector() const;
   bool showCalorimeters() const;
   bool showMuonSpectrometer() const;
 	
+  // Lines
+  bool showLines() const;
+  double lineLength() const;
+  SbVec3f lineDirection() const;
   
   //ID Proj surfs:
 
@@ -150,6 +154,8 @@ signals:
   void showInnerDetectorChanged(bool);
   void showCalorimetersChanged(bool);
   void showMuonSpectrometerChanged(bool);
+  void showLinesChanged(bool);
+  void lineDirectionChanged(const SbVec3f&);
 
 private:
 
@@ -194,6 +200,8 @@ private slots:
   void possibleChange_showInnerDetector();
   void possibleChange_showCalorimeters();
   void possibleChange_showMuonSpectrometer();
+  void possibleChange_showLines();
+  void possibleChange_lineDirection();
 };
 
 
diff --git a/graphics/VP1/VP1Systems/VP1GuideLineSystems/VP1GuideLineSystems/VP1Lines.h b/graphics/VP1/VP1Systems/VP1GuideLineSystems/VP1GuideLineSystems/VP1Lines.h
new file mode 100644
index 0000000000000000000000000000000000000000..d351946135700f73988cec1252bbfb1915919e17
--- /dev/null
+++ b/graphics/VP1/VP1Systems/VP1GuideLineSystems/VP1GuideLineSystems/VP1Lines.h
@@ -0,0 +1,35 @@
+/*
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef VP1LINES_H
+#define VP1LINES_H
+
+#include "VP1Base/VP1HelperClassBase.h"
+#include <QObject>
+#include <Inventor/C/errors/debugerror.h>
+#include <Inventor/SbColor4f.h>
+class SoSeparator;
+
+class VP1Lines : public QObject, public VP1HelperClassBase {
+
+  Q_OBJECT
+
+public:
+
+  VP1Lines( SoSeparator * attachsep,//where the grid separator will attach itself when visible
+		    IVP1System * sys,QObject * parent = 0);
+  virtual ~VP1Lines();
+
+public slots:
+
+  void setShown(bool);//will attach/detach itself from attachsep depending on this
+  void setColourAndTransp(const SbColor4f&);
+  void setDirection(const SbVec3f&);
+
+private:
+  class Imp;
+  Imp * m_d;
+};
+
+#endif
diff --git a/graphics/VP1/VP1Systems/VP1GuideLineSystems/src/GuideSysController.cxx b/graphics/VP1/VP1Systems/VP1GuideLineSystems/src/GuideSysController.cxx
index 71255fdabd933215d9505dd03cca916162c64b42..5032e37a52b3103194cb21fe46ed4e91c84093a7 100644
--- a/graphics/VP1/VP1Systems/VP1GuideLineSystems/src/GuideSysController.cxx
+++ b/graphics/VP1/VP1Systems/VP1GuideLineSystems/src/GuideSysController.cxx
@@ -23,11 +23,11 @@
 #include "ui_guides_settings_grid_form.h"
 #include "ui_guides_settings_idprojsurfs_form.h"
 #include "ui_guides_settings_trkvolumes_form.h"
+#include "ui_guides_settings_lines_form.h"
 #include "VP1Base/VP1Serialise.h"
 #include "VP1Base/VP1Deserialise.h"
-
-//#include "CLHEP/Units/SystemOfUnits.h"
 #include "GaudiKernel/SystemOfUnits.h"
+#include <cmath>
 
 //____________________________________________________________________
 class GuideSysController::Imp {
@@ -40,6 +40,7 @@ public:
   Ui::VP1GuidesSysSettingsGridForm ui_grid;
   Ui::VP1GuidesSysSettingsIDProjSurfsForm ui_idprojsurfs;
   Ui::VP1TrackingVolumesForm ui_trkvolumes;
+  Ui::VP1LinesForm ui_lines;
 
   static SbColor4f color4f(const QColor& col, int transp_int) {
     return SbColor4f(std::max<float>(0.0f,std::min<float>(1.0f,col.redF())),
@@ -78,6 +79,9 @@ public:
   bool last_showInnerDetector;
   bool last_showCalorimeters;
   bool last_showMuonSpectrometer;
+  bool last_showLines;
+  SbVec3f last_lineDirection;
+  double last_line_eta; // This is needed to update the display in possibleChange_lineDirection
 
   InDetProjFlags::InDetProjPartsFlags last_applicablePixelProjParts;
   InDetProjFlags::InDetProjPartsFlags last_applicableSCTProjParts;
@@ -108,6 +112,7 @@ GuideSysController::GuideSysController(IVP1System * sys)
   initDialog(m_d->ui_grid, m_d->ui.pushButton_settings_grid,m_d->ui.checkBox_grid);
   initDialog(m_d->ui_idprojsurfs, m_d->ui.pushButton_settings_inDetProjSurfs,m_d->ui.checkBox_inDetProjSurfs);
   initDialog(m_d->ui_trkvolumes, m_d->ui.pushButton_settings_trkVolumes,m_d->ui.checkBox_trkVolumes);
+  initDialog(m_d->ui_lines, m_d->ui.pushButton_settings_lines,m_d->ui.checkBox_lines);
 
   //Hide SCT/Pixel projection surface controls for now:
   m_d->ui_idprojsurfs.groupBox_pixelproj->setVisible(false);
@@ -314,6 +319,16 @@ GuideSysController::GuideSysController(IVP1System * sys)
   addUpdateSlot(SLOT(possibleChange_showMuonSpectrometer()));
 	connectToLastUpdateSlot(m_d->ui_trkvolumes.checkBox_MS);
 
+  addUpdateSlot(SLOT(possibleChange_showLines()));
+  connectToLastUpdateSlot(m_d->ui.checkBox_lines);
+  
+  addUpdateSlot(SLOT(possibleChange_lineDirection()));
+  connectToLastUpdateSlot(m_d->ui_lines.doubleSpinBox_phi);
+  connectToLastUpdateSlot(m_d->ui_lines.doubleSpinBox_theta);
+  connectToLastUpdateSlot(m_d->ui_lines.doubleSpinBox_eta);
+  connectToLastUpdateSlot(m_d->ui_lines.doubleSpinBox_length);
+  
+
   initLastVars();
 }
 
@@ -502,6 +517,29 @@ double GuideSysController::etaExtent() const
     * (m_d->ui_etacones.radioButton_etaconeextentisr->isChecked() ? 1.0 : -1.0);
 }
 
+//____________________________________________________________________
+bool GuideSysController::showLines() const
+{
+  return m_d->ui.checkBox_lines->isChecked();
+}
+
+
+//____________________________________________________________________
+SbVec3f GuideSysController::lineDirection() const
+{
+  double r = lineLength();
+  double phi = m_d->ui_lines.doubleSpinBox_phi->value();
+  double theta = m_d->ui_lines.doubleSpinBox_theta->value();
+  SbVec3f direction(r*sin(theta)*cos(phi),r*sin(theta)*sin(phi), r*cos(theta));
+  return direction;
+}
+
+//____________________________________________________________________
+double GuideSysController::lineLength() const
+{
+  return m_d->ui_lines.doubleSpinBox_length->value() * Gaudi::Units::m;
+}
+
 //_____________________________________________________________________________________
 InDetProjFlags::InDetProjPartsFlags GuideSysController::Imp::projPartsFlag( bool barrelinner, bool barrelouter,
 									    bool endcapinner, bool endcapouter,
@@ -726,7 +764,7 @@ bool GuideSysController::showMuonSpectrometer() const
 //____________________________________________________________________
 int GuideSysController::currentSettingsVersion() const
 {
-  return 2;
+  return 3;
 }
 
 //____________________________________________________________________
@@ -833,6 +871,13 @@ void GuideSysController::actualSaveSettings(VP1Serialise&s) const
   s.save(m_d->ui_trkvolumes.checkBox_ID);
   s.save(m_d->ui_trkvolumes.checkBox_Calo);
   s.save(m_d->ui_trkvolumes.checkBox_MS);
+  
+  // Line from origin
+  s.save(m_d->ui.checkBox_lines);
+  s.save(m_d->ui_lines.doubleSpinBox_phi); 
+  s.save(m_d->ui_lines.doubleSpinBox_phi);
+  s.save(m_d->ui_lines.doubleSpinBox_eta);
+  s.save(m_d->ui_lines.doubleSpinBox_length);
 }
 
 //____________________________________________________________________
@@ -946,9 +991,36 @@ void GuideSysController::actualRestoreSettings(VP1Deserialise& s)
     s.restore(m_d->ui_trkvolumes.checkBox_Calo);
     s.restore(m_d->ui_trkvolumes.checkBox_MS);
   } 
+  if (s.version()>=3) {
+    s.restore(m_d->ui.checkBox_lines);
+    s.restore(m_d->ui_lines.doubleSpinBox_phi); 
+    s.restore(m_d->ui_lines.doubleSpinBox_phi);
+    s.restore(m_d->ui_lines.doubleSpinBox_eta);
+    s.restore(m_d->ui_lines.doubleSpinBox_length);
+  } 
+}
 
+void GuideSysController::possibleChange_lineDirection() {	
+  // Bit of a hack possibly to do this here, but I want to be able to update the direction by changing either theta or eta
+  double eta = m_d->ui_lines.doubleSpinBox_eta->value();
+  double theta = m_d->ui_lines.doubleSpinBox_theta->value();
+  
+  if (m_d->last_line_eta != eta){
+    // eta has changed, so update theta in the UI
+    theta = 2*std::atan(std::exp(-1.0 * eta));
+    m_d->ui_lines.doubleSpinBox_theta->setValue(theta);
+  } else if ( theta!= std::acos(m_d->last_lineDirection[2] / lineLength() ) ){
+    eta = -1.0 * std::log(std::tan(theta/2.0));
+    m_d->ui_lines.doubleSpinBox_eta->setValue(eta);  
+  }
+  m_d->last_line_eta = m_d->ui_lines.doubleSpinBox_eta->value();
+  if (changed( m_d->last_lineDirection , lineDirection() ) ) { 
+    if (verbose()&&!initVarsMode()) messageVerbose("Emitting "+QString()+"( lineDirectionChanged"+toString(m_d->last_lineDirection)+" )"); 
+    emit lineDirectionChanged(m_d->last_lineDirection); 
+  }  
 }
 
+
 ///////////////////////////////////////////////////////////////////////////
 // Test for possible changes in values and emit signals as appropriate:
 // (possibleChange_XXX() slots code provided by macros)
@@ -988,3 +1060,5 @@ POSSIBLECHANGE_IMP(showTrackingVolumes)
 POSSIBLECHANGE_IMP(showInnerDetector)
 POSSIBLECHANGE_IMP(showCalorimeters)
 POSSIBLECHANGE_IMP(showMuonSpectrometer)
+POSSIBLECHANGE_IMP(showLines)  
+//POSSIBLECHANGE_IMP(lineDirection) Implemented this manually so we can update eta/theta
diff --git a/graphics/VP1/VP1Systems/VP1GuideLineSystems/src/VP1GuideLineSystem.cxx b/graphics/VP1/VP1Systems/VP1GuideLineSystems/src/VP1GuideLineSystem.cxx
index 9fa913399c4c585e5347e0d4cc3f9f07e1157ade..7f3900c6cc5bab0f3c2fba7d15d31491d23ac545 100644
--- a/graphics/VP1/VP1Systems/VP1GuideLineSystems/src/VP1GuideLineSystem.cxx
+++ b/graphics/VP1/VP1Systems/VP1GuideLineSystems/src/VP1GuideLineSystem.cxx
@@ -23,6 +23,7 @@
 #include "VP1GuideLineSystems/VP1CartesianGrid.h"
 #include "VP1GuideLineSystems/VP1CylindricalGrid.h"
 #include "VP1GuideLineSystems/VP1TrackingVolumes.h"
+#include "VP1GuideLineSystems/VP1Lines.h"
 
 #include "VP1Base/VP1Serialise.h"
 #include "VP1Base/VP1Deserialise.h"
@@ -64,6 +65,7 @@ public:
   VP1EtaCone * etacone2;
   VP1EtaCone * etacone3;
   VP1TrackingVolumes * trackingVolumes;
+  VP1Lines * lines;
 
   ProjectionSurfacesHelper * projsurfhelper_pixel;
   ProjectionSurfacesHelper * projsurfhelper_sct;
@@ -213,7 +215,14 @@ void VP1GuideLineSystem::buildPermanentSceneGraph(StoreGateSvc* /*detstore*/, So
 	connect(m_d->controller,SIGNAL(showCalorimetersChanged(bool)),m_d->trackingVolumes,SLOT(setShownCalo(bool)));
 	connect(m_d->controller,SIGNAL(showMuonSpectrometerChanged(bool)),m_d->trackingVolumes,SLOT(setShownMS(bool)));
 	m_d->trackingVolumes->setShown(m_d->controller->showTrackingVolumes());	
-	
+  
+  //Lines
+  m_d->lines = new VP1Lines(root, this);
+  connect(m_d->controller,SIGNAL(showLinesChanged(bool)),m_d->lines,SLOT(setShown(bool)));
+	m_d->lines->setShown(m_d->controller->showLines());	
+  connect(m_d->controller,SIGNAL(lineDirectionChanged(const SbVec3f&)),m_d->lines,SLOT(setDirection(const SbVec3f&)));
+  m_d->lines->setDirection(m_d->controller->lineDirection());  
+  
   SoSeparator * projsep = new SoSeparator;
   root->addChild(projsep);
 
diff --git a/graphics/VP1/VP1Systems/VP1GuideLineSystems/src/VP1Lines.cxx b/graphics/VP1/VP1Systems/VP1GuideLineSystems/src/VP1Lines.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..aaffe29ccab6e20888d9b605f5eda805eeb2876a
--- /dev/null
+++ b/graphics/VP1/VP1Systems/VP1GuideLineSystems/src/VP1Lines.cxx
@@ -0,0 +1,150 @@
+/*
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+*/
+
+#include "VP1GuideLineSystems/VP1Lines.h"
+
+#include <Inventor/nodes/SoSeparator.h>
+#include <Inventor/nodes/SoVertexProperty.h>
+#include <Inventor/nodes/SoLineSet.h>
+#include <Inventor/SbColor4f.h>
+
+#include "GaudiKernel/SystemOfUnits.h"
+
+
+//____________________________________________________________________
+class VP1Lines::Imp {
+public:
+  Imp(VP1Lines *,
+      SoSeparator * attachsep);
+  VP1Lines * theclass;
+  SoSeparator * attachSep;
+
+  bool shown;
+  SbColor4f colourAndTransp;
+  SbVec3f direction;
+
+  SoSeparator * sep;
+
+  void rebuild3DObjects();
+  void updateColour();
+};
+
+//____________________________________________________________________
+VP1Lines::VP1Lines(SoSeparator * attachsep,
+		   IVP1System * sys,QObject * parent)
+  : QObject(parent), VP1HelperClassBase(sys,"VP1Lines"), m_d(new Imp(this,attachsep))
+{
+}
+
+//____________________________________________________________________
+VP1Lines::~VP1Lines()
+{
+  setShown(false);
+  if (m_d->sep)
+    m_d->sep->unref();
+  m_d->attachSep->unref();
+  delete m_d;
+}
+
+//____________________________________________________________________
+VP1Lines::Imp::Imp(VP1Lines *tc,SoSeparator * as)
+  : theclass(tc), attachSep(as), shown(false),
+    colourAndTransp(SbColor4f(1,1,1,1)), direction(SbVec3f(0,0,0)), sep(0)
+{
+  attachSep->ref();
+}
+
+//____________________________________________________________________
+void VP1Lines::Imp::rebuild3DObjects()
+{
+  theclass->messageVerbose("(Re)building 3D objects");
+
+  if (sep) {
+    sep->removeAllChildren();
+  } else {
+    sep = new SoSeparator;
+    sep->ref();
+  }
+
+  const bool save = sep->enableNotify(false);
+
+  SoVertexProperty * line_vertices = new SoVertexProperty();
+
+  line_vertices->vertex.set1Value(0,0.0,0.0,0.0);
+  line_vertices->vertex.set1Value(1,direction[0],direction[1],direction[2]);
+
+  line_vertices->materialBinding=SoMaterialBinding::OVERALL;
+  line_vertices->normalBinding=SoNormalBinding::OVERALL;
+  SoLineSet * line = new SoLineSet();
+  line->numVertices.enableNotify(FALSE);
+  // line->numVertices.setNum(1);
+  // line->numVertices.set1Value(0,2);
+  line->vertexProperty = line_vertices;
+  line->numVertices.enableNotify(TRUE);
+  line->numVertices.touch();
+
+  sep->addChild(line);
+  updateColour();
+
+  if (save) {
+    sep->enableNotify(true);
+    sep->touch();
+  }
+
+}
+
+//____________________________________________________________________
+void VP1Lines::Imp::updateColour()
+{
+  theclass->messageVerbose("Updating packed colour");
+  if (!sep||sep->getNumChildren()<1)
+    return;
+  SoNode * n = sep->getChild(0);
+  if (!n||n->getTypeId()!=SoLineSet::getClassTypeId())
+    return;
+  SoLineSet * line = static_cast<SoLineSet*>(n);
+  SoVertexProperty * vertices = static_cast<SoVertexProperty *>(line->vertexProperty.getValue());
+  if (!vertices)
+    return;
+  vertices->orderedRGBA = colourAndTransp.getPackedValue();
+}
+
+//____________________________________________________________________
+void VP1Lines::setShown(bool b)
+{
+  messageVerbose("Signal received: setShown("+str(b)+")");
+  if (m_d->shown==b)
+    return;
+  m_d->shown=b;
+  if (m_d->shown) {
+    m_d->rebuild3DObjects();
+    if (m_d->attachSep->findChild(m_d->sep)<0)
+      m_d->attachSep->addChild(m_d->sep);
+  } else {
+    if (m_d->sep&&m_d->attachSep->findChild(m_d->sep)>=0)
+      m_d->attachSep->removeChild(m_d->sep);
+  }
+}
+
+//____________________________________________________________________
+void VP1Lines::setColourAndTransp(const SbColor4f&ct)
+{
+  messageVerbose("Signal received in setColourAndTransp slot.");
+  if (m_d->colourAndTransp==ct)
+    return;
+  m_d->colourAndTransp=ct;
+  if (m_d->shown)
+    m_d->updateColour();
+}
+
+//____________________________________________________________________
+void VP1Lines::setDirection(const SbVec3f& o)
+{
+  messageVerbose("Signal received: setDirection("+str(o)+")");
+  if (m_d->direction==o)
+    return;
+  m_d->direction=o;
+  if (m_d->shown)
+    m_d->rebuild3DObjects();
+}
diff --git a/graphics/VP1/VP1Systems/VP1GuideLineSystems/src/guidelinescontrollerform.ui b/graphics/VP1/VP1Systems/VP1GuideLineSystems/src/guidelinescontrollerform.ui
index c527d377a5d858e303d10f5ebb234ff3bd1302ef..f0d1f101b3b29912ed5ea5c87fd43a9b60835bdc 100644
--- a/graphics/VP1/VP1Systems/VP1GuideLineSystems/src/guidelinescontrollerform.ui
+++ b/graphics/VP1/VP1Systems/VP1GuideLineSystems/src/guidelinescontrollerform.ui
@@ -1,7 +1,8 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>VP1GuidesControllerForm</class>
- <widget class="QWidget" name="VP1GuidesControllerForm" >
-  <property name="geometry" >
+ <widget class="QWidget" name="VP1GuidesControllerForm">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
@@ -9,128 +10,145 @@
     <height>182</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Form</string>
   </property>
-  <layout class="QGridLayout" >
-   <property name="rightMargin" >
+  <layout class="QGridLayout">
+   <property name="rightMargin">
     <number>1</number>
    </property>
-   <property name="bottomMargin" >
+   <property name="bottomMargin">
     <number>1</number>
    </property>
-   <property name="spacing" >
+   <property name="spacing">
     <number>0</number>
    </property>
-   <item row="0" column="0" >
-    <layout class="QGridLayout" >
-     <property name="horizontalSpacing" >
+   <item row="0" column="0">
+    <layout class="QGridLayout">
+     <property name="horizontalSpacing">
       <number>2</number>
      </property>
-     <property name="verticalSpacing" >
+     <property name="verticalSpacing">
       <number>0</number>
      </property>
-     <item row="0" column="0" >
-      <widget class="QCheckBox" name="checkBox_floorAndLetters" >
-       <property name="text" >
+     <item row="0" column="0">
+      <widget class="QCheckBox" name="checkBox_floorAndLetters">
+       <property name="text">
         <string>Floor &amp;&amp; Letters</string>
        </property>
-       <property name="checked" >
+       <property name="checked">
         <bool>true</bool>
        </property>
       </widget>
      </item>
-     <item row="0" column="1" >
-      <widget class="QPushButton" name="pushButton_settings_floorAndLetters" >
-       <property name="text" >
+     <item row="0" column="1">
+      <widget class="QPushButton" name="pushButton_settings_floorAndLetters">
+       <property name="text">
         <string>Configure</string>
        </property>
       </widget>
      </item>
-     <item row="1" column="0" >
-      <widget class="QCheckBox" name="checkBox_coordinateAxes" >
-       <property name="text" >
+     <item row="1" column="0">
+      <widget class="QCheckBox" name="checkBox_coordinateAxes">
+       <property name="text">
         <string>Coordinate axes</string>
        </property>
       </widget>
      </item>
-     <item row="1" column="1" >
-      <widget class="QPushButton" name="pushButton_settings_coordinateAxes" >
-       <property name="text" >
+     <item row="1" column="1">
+      <widget class="QPushButton" name="pushButton_settings_coordinateAxes">
+       <property name="text">
         <string>Configure</string>
        </property>
       </widget>
      </item>
-     <item row="2" column="0" >
-      <widget class="QCheckBox" name="checkBox_grid" >
-       <property name="text" >
+     <item row="2" column="0">
+      <widget class="QCheckBox" name="checkBox_grid">
+       <property name="text">
         <string>Grid</string>
        </property>
       </widget>
      </item>
-     <item row="2" column="1" >
-      <widget class="QPushButton" name="pushButton_settings_grid" >
-       <property name="text" >
+     <item row="2" column="1">
+      <widget class="QPushButton" name="pushButton_settings_grid">
+       <property name="text">
         <string>Configure</string>
        </property>
       </widget>
      </item>
-     <item row="3" column="0" >
-      <widget class="QCheckBox" name="checkBox_etaCones" >
-       <property name="text" >
+     <item row="3" column="0">
+      <widget class="QCheckBox" name="checkBox_etaCones">
+       <property name="text">
         <string>Eta Cones</string>
        </property>
       </widget>
      </item>
-     <item row="3" column="1" >
-      <widget class="QPushButton" name="pushButton_settings_etaCones" >
-       <property name="text" >
+     <item row="3" column="1">
+      <widget class="QPushButton" name="pushButton_settings_etaCones">
+       <property name="text">
         <string>Configure</string>
        </property>
       </widget>
      </item>
-     <item row="4" column="0" >
-      <widget class="QCheckBox" name="checkBox_inDetProjSurfs" >
-       <property name="text" >
+     <item row="4" column="0">
+      <widget class="QCheckBox" name="checkBox_inDetProjSurfs">
+       <property name="text">
         <string>ID projection surfaces</string>
        </property>
-       <property name="checked" >
+       <property name="checked">
         <bool>true</bool>
        </property>
       </widget>
      </item>
-     <item row="4" column="1" >
-      <widget class="QPushButton" name="pushButton_settings_inDetProjSurfs" >
-       <property name="text" >
+     <item row="4" column="1">
+      <widget class="QPushButton" name="pushButton_settings_inDetProjSurfs">
+       <property name="text">
         <string>Configure</string>
        </property>
       </widget>
      </item>
-     <item row="5" column="1" >
-      <widget class="QPushButton" name="pushButton_settings_trkVolumes" >
-       <property name="text" >
+     <item row="5" column="1">
+      <widget class="QPushButton" name="pushButton_settings_trkVolumes">
+       <property name="text">
         <string>Configure</string>
        </property>
       </widget>
      </item>
-     <item row="5" column="0" >
-      <widget class="QCheckBox" name="checkBox_trkVolumes" >
-       <property name="text" >
+     <item row="5" column="0">
+      <widget class="QCheckBox" name="checkBox_trkVolumes">
+       <property name="text">
         <string>Tracking Volumes</string>
        </property>
-       <property name="checked" >
+       <property name="checked">
         <bool>false</bool>
        </property>
       </widget>
      </item>
+     <item row="7" column="0">
+      <widget class="QCheckBox" name="checkBox_lines">
+       <property name="text">
+        <string>Line from origin</string>
+       </property>
+       <property name="checked">
+        <bool>false</bool>
+       </property>
+      </widget>
+     </item>
+     <item row="7" column="1">
+      <widget class="QPushButton" name="pushButton_settings_lines">
+       <property name="text">
+        <string>Configure</string>
+       </property>
+      </widget>
+     </item>
     </layout>
    </item>
-   <item row="0" column="1" >
+   <item row="0" column="1">
     <spacer>
-     <property name="orientation" >
+     <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
-     <property name="sizeHint" stdset="0" >
+     <property name="sizeHint" stdset="0">
       <size>
        <width>1</width>
        <height>20</height>
@@ -138,12 +156,12 @@
      </property>
     </spacer>
    </item>
-   <item row="1" column="0" >
+   <item row="1" column="0">
     <spacer>
-     <property name="orientation" >
+     <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
-     <property name="sizeHint" stdset="0" >
+     <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>1</height>
diff --git a/graphics/VP1/VP1Systems/VP1GuideLineSystems/src/guides_settings_lines_form.ui b/graphics/VP1/VP1Systems/VP1GuideLineSystems/src/guides_settings_lines_form.ui
new file mode 100644
index 0000000000000000000000000000000000000000..aa6ab3689c2de3e167afd3335369e0f6c393e19a
--- /dev/null
+++ b/graphics/VP1/VP1Systems/VP1GuideLineSystems/src/guides_settings_lines_form.ui
@@ -0,0 +1,192 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>VP1LinesForm</class>
+ <widget class="QWidget" name="VP1LinesForm">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>333</width>
+    <height>166</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <layout class="QGridLayout" name="gridLayout">
+     <item row="6" column="0">
+      <widget class="QLabel" name="label_26">
+       <property name="text">
+        <string>Length</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="1">
+      <widget class="QDoubleSpinBox" name="doubleSpinBox_phi">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+       </property>
+       <property name="suffix">
+        <string/>
+       </property>
+       <property name="decimals">
+        <number>3</number>
+       </property>
+       <property name="minimum">
+        <double>-6.280000000000000</double>
+       </property>
+       <property name="maximum">
+        <double>6.280000000000000</double>
+       </property>
+       <property name="singleStep">
+        <double>0.010000000000000</double>
+       </property>
+      </widget>
+     </item>
+     <item row="4" column="1">
+      <widget class="QDoubleSpinBox" name="doubleSpinBox_theta">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+       </property>
+       <property name="suffix">
+        <string/>
+       </property>
+       <property name="decimals">
+        <number>3</number>
+       </property>
+       <property name="minimum">
+        <double>-6.280000000000000</double>
+       </property>
+       <property name="maximum">
+        <double>6.280000000000000</double>
+       </property>
+       <property name="singleStep">
+        <double>0.010000000000000</double>
+       </property>
+      </widget>
+     </item>
+     <item row="6" column="1">
+      <widget class="QDoubleSpinBox" name="doubleSpinBox_length">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+       </property>
+       <property name="suffix">
+        <string> m</string>
+       </property>
+       <property name="decimals">
+        <number>3</number>
+       </property>
+       <property name="minimum">
+        <double>-99.989999999999995</double>
+       </property>
+       <property name="singleStep">
+        <double>0.010000000000000</double>
+       </property>
+       <property name="value">
+        <double>5.000000000000000</double>
+       </property>
+      </widget>
+     </item>
+     <item row="4" column="0">
+      <widget class="QLabel" name="label_27">
+       <property name="text">
+        <string>Theta</string>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="1">
+      <widget class="QDoubleSpinBox" name="doubleSpinBox_eta">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+       </property>
+       <property name="suffix">
+        <string/>
+       </property>
+       <property name="decimals">
+        <number>3</number>
+       </property>
+       <property name="minimum">
+        <double>-5.000000000000000</double>
+       </property>
+       <property name="maximum">
+        <double>5.000000000000000</double>
+       </property>
+       <property name="singleStep">
+        <double>0.010000000000000</double>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="0">
+      <widget class="QLabel" name="label_24">
+       <property name="text">
+        <string>Eta</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="0">
+      <widget class="QLabel" name="label_25">
+       <property name="text">
+        <string>Phi</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="_2">
+     <property name="spacing">
+      <number>0</number>
+     </property>
+     <item>
+      <spacer>
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>1</width>
+         <height>5</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="pushButton_close">
+       <property name="text">
+        <string>&amp;Close</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/graphics/VP1/VP1Utils/CMakeLists.txt b/graphics/VP1/VP1Utils/CMakeLists.txt
index 09ebbed35daca1bb830c1e0777deaa621e929320..7af012dbc4b225ba067178a340a17384481db838 100644
--- a/graphics/VP1/VP1Utils/CMakeLists.txt
+++ b/graphics/VP1/VP1Utils/CMakeLists.txt
@@ -42,14 +42,9 @@ find_package( CLHEP )
 find_package( Coin3D )
 find_package( Eigen )
 find_package( HepPDT )
-find_package( Qt5 COMPONENTS Core HINTS ${QT5_ROOT} )
+find_package( Qt5 COMPONENTS Core )
 find_package( GeoModel )
 
-# CLHEP definitions:
-add_definitions( -DCLHEP_MAX_MIN_DEFINED
-                 -DCLHEP_ABS_DEFINED
-                 -DCLHEP_SQR_DEFINED )
-
 # Generate MOC files automatically:
 set( CMAKE_AUTOMOC TRUE )
 
@@ -59,6 +54,7 @@ atlas_add_library( VP1Utils VP1Utils/*.h src/*.cxx src/*.cpp
    INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
    PRIVATE_INCLUDE_DIRS ${HEPPDT_INCLUDE_DIRS} ${COIN3D_INCLUDE_DIRS}
    ${EIGEN_INCLUDE_DIRS}
+   DEFINITIONS ${CLHEP_DEFINITIONS}
    LINK_LIBRARIES ${CLHEP_LIBRARIES} ${GEOMODEL_LIBRARIES} EventPrimitives
    GaudiKernel VP1Base StoreGateLib SGtests AthDSoCallBacks MuonIdHelpersLib
    GeoPrimitives Qt5::Core
diff --git a/graphics/VP1/VP1Utils/src/SoVisualizeAction.cxx b/graphics/VP1/VP1Utils/src/SoVisualizeAction.cxx
index dec8091d1fe4688b73a66fefa83cef202ea222d7..7a1985019af76488602901d270d67e08de7936cc 100644
--- a/graphics/VP1/VP1Utils/src/SoVisualizeAction.cxx
+++ b/graphics/VP1/VP1Utils/src/SoVisualizeAction.cxx
@@ -14,7 +14,6 @@
 #include "GeoModelKernel/GeoTessellatedSolid.h"
 #include "GeoModelKernel/GeoFacet.h"
 #include "GeoModelKernel/GeoGenericTrap.h"
-#include "GeoModelKernel/Units.h"
 #include "GeoSpecialShapes/LArCustomShape.h"
 #include "GeoSpecialShapes/LArWheelCalculator.h"
 #include "VP1HEPVis/nodes/SoTubs.h"
@@ -27,6 +26,7 @@
 #include "VP1HEPVis/nodes/SoPolyhedron.h"
 #include "VP1HEPVis/VP1HEPVisUtils.h"
 #include "VP1Utils/SbPolyhedrizeAction.h"
+#include "GaudiKernel/SystemOfUnits.h"
 
 SoVisualizeAction::SoVisualizeAction()
   : m_shape(0)
@@ -155,11 +155,11 @@ void SoVisualizeAction::handleLArCustom(const LArCustomShape *custom)
   static const double eta_low = 1.375;
 
 
-  //  static const double zWheelRefPoint       = 3689.5*GeoModelKernelUnits::mm;  //=endg_z0
-  static const double dMechFocaltoWRP      = 3691. *GeoModelKernelUnits::mm;  //=endg_z1
-  //  static const double dElecFocaltoWRP      = 3689. *GeoModelKernelUnits::mm;  //=endg_dcf
-  static const double dWRPtoFrontFace      =   11. *GeoModelKernelUnits::mm;
-  static const double rOuterCutoff         = 2034. *GeoModelKernelUnits::mm;  //=endg_rlimit
+  //  static const double zWheelRefPoint       = 3689.5*Gaudi::Units::mm;  //=endg_z0
+  static const double dMechFocaltoWRP      = 3691. *Gaudi::Units::mm;  //=endg_z1
+  //  static const double dElecFocaltoWRP      = 3689. *Gaudi::Units::mm;  //=endg_dcf
+  static const double dWRPtoFrontFace      =   11. *Gaudi::Units::mm;
+  static const double rOuterCutoff         = 2034. *Gaudi::Units::mm;  //=endg_rlimit
 
 
   SoLAr::initClass();
@@ -182,7 +182,7 @@ void SoVisualizeAction::handleLArCustom(const LArCustomShape *custom)
     rInner[1] = zWheelBackFace  * tanThetaInner;
     // Note that there is a 3mm gap between the outer surface of the
     // inner wheel and the inner surface of the outer wheel.
-    double HalfGapBetweenWheels = 0.15*GeoModelKernelUnits::cm;  // In DB EMECGEOMETRY.DCRACK
+    double HalfGapBetweenWheels = 0.15*Gaudi::Units::cm;  // In DB EMECGEOMETRY.DCRACK
     rOuter[0] = zWheelFrontFace * tanThetaMid - HalfGapBetweenWheels;
     rOuter[1] = zWheelBackFace  * tanThetaMid - HalfGapBetweenWheels;
     solar->fRmin.setValues(0,2,rInner);
@@ -202,7 +202,7 @@ void SoVisualizeAction::handleLArCustom(const LArCustomShape *custom)
     double zWheelBackFace = zWheelFrontFace + calc->GetWheelThickness();
     // Note that there is a 3mm gap between the outer surface of the
     // inner wheel and the inner surface of the outer wheel.
-    double HalfGapBetweenWheels = 0.15*GeoModelKernelUnits::cm;  // In DB! (EMECGEOMETRY.DCRACK);
+    double HalfGapBetweenWheels = 0.15*Gaudi::Units::cm;  // In DB! (EMECGEOMETRY.DCRACK);
     rInner[0] = zWheelFrontFace * tanThetaMid + HalfGapBetweenWheels;
     rInner[2] = zWheelBackFace  * tanThetaMid + HalfGapBetweenWheels;
     rOuter[0] = zWheelFrontFace * tanThetaOuter;
diff --git a/graphics/VP1/VP1UtilsBase/CMakeLists.txt b/graphics/VP1/VP1UtilsBase/CMakeLists.txt
index 93b7084bc0121b9c1a26218071acf095260ceb69..160aa3359f696c6fea764eb90b531f8b8b21545a 100644
--- a/graphics/VP1/VP1UtilsBase/CMakeLists.txt
+++ b/graphics/VP1/VP1UtilsBase/CMakeLists.txt
@@ -8,9 +8,10 @@
 atlas_subdir( VP1UtilsBase )
 
 # External dependencies:
-find_package( Qt5 COMPONENTS Core HINTS ${QT5_ROOT} )
+find_package( Qt5 COMPONENTS Core )
 
 # Component(s) in the package:
-atlas_add_library( VP1UtilsBase src/*.cxx
+atlas_add_library( VP1UtilsBase
+   VP1UtilsBase/*.h src/*.cxx
    PUBLIC_HEADERS VP1UtilsBase
    PRIVATE_LINK_LIBRARIES Qt5::Core )